MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-06 14:46:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

more fixes

Browse Source
This commit is contained in:
Natsumi
2020-12-01 18:52:04 +13:00
committed by pypy
parent 445e11ec6c
commit 934a27b4fc
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/src/index.pug
+1 -1
View File
@@ -509,7 +509,7 @@ html
div(style="font-size:12px;margin-top:5px") div(style="font-size:12px;margin-top:5px")
span(style="display:inline-block;min-width:150px") Minimal Feed Icons span(style="display:inline-block;min-width:150px") Minimal Feed Icons
el-switch(v-model="minimalFeed" :disabled="!openVR") el-switch(v-model="minimalFeed" :disabled="!openVR")
div(style="font-size:12px;margin-top:5px" :disabled="!openVR") div(style="font-size:12px;margin-top:5px")
span(style="display:inline-block;min-width:150px") Overlay Notifications span(style="display:inline-block;min-width:150px") Overlay Notifications
el-switch(v-model="overlayNotifications" :disabled="!openVR") el-switch(v-model="overlayNotifications" :disabled="!openVR")
div(style="font-size:12px;margin-top:5px") div(style="font-size:12px;margin-top:5px")
html/src/vr.js
+3 -6
View File
@@ -677,8 +677,7 @@ import webApiService from './service/webapi.js';
map[feed.displayName] < feed.created_at) { map[feed.displayName] < feed.created_at) {
map[feed.displayName] = feed.created_at; map[feed.displayName] = feed.created_at;
} }
} } else if (feed.type === 'invite' ||
if (feed.type === 'invite' ||
feed.type === 'requestInvite' || feed.type === 'requestInvite' ||
feed.type === 'friendRequest') { feed.type === 'friendRequest') {
if (!map[feed.senderUsername] || if (!map[feed.senderUsername] ||
@@ -704,8 +703,7 @@ import webApiService from './service/webapi.js';
notys.push(feed); notys.push(feed);
} }
} }
} } else if ((notificationJoinLeaveFilter === "Everyone") ||
if ((notificationJoinLeaveFilter === "Everyone") ||
((notificationJoinLeaveFilter === "Friends") && (feed.isFriend)) || ((notificationJoinLeaveFilter === "Friends") && (feed.isFriend)) ||
((notificationJoinLeaveFilter === "VIP") && (feed.isFavorite))) { ((notificationJoinLeaveFilter === "VIP") && (feed.isFavorite))) {
if (feed.type === 'OnPlayerJoined' || if (feed.type === 'OnPlayerJoined' ||
@@ -716,8 +714,7 @@ import webApiService from './service/webapi.js';
notys.push(feed); notys.push(feed);
} }
} }
} } else if (feed.type === 'invite' ||
if (feed.type === 'invite' ||
feed.type === 'requestInvite' || feed.type === 'requestInvite' ||
feed.type === 'friendRequest') { feed.type === 'friendRequest') {
if (!map[feed.senderUsername] || if (!map[feed.senderUsername] ||