diff --git a/html/src/app.js b/html/src/app.js index 222c04a9..a51f8069 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -3759,11 +3759,6 @@ speechSynthesis.getVoices(); noty: [], lastEntryDate: '' }, - playerModerationTable: { - wrist: [], - noty: [], - lastEntryDate: '' - }, pendingUpdate: false }; @@ -3789,15 +3784,14 @@ speechSynthesis.getVoices(); this.updateSharedFeedFeedTable(forceUpdate); this.updateSharedFeedNotificationTable(forceUpdate); this.updateSharedFeedFriendLogTable(forceUpdate); - //this.updateSharedFeedPlayerModerationTable(forceUpdate); var feeds = this.sharedFeed; if (!feeds.pendingUpdate) { return; } var wristFeed = []; - wristFeed = wristFeed.concat(feeds.gameLog.wrist, feeds.feedTable.wrist, feeds.notificationTable.wrist, feeds.friendLogTable.wrist, feeds.playerModerationTable.wrist); + wristFeed = wristFeed.concat(feeds.gameLog.wrist, feeds.feedTable.wrist, feeds.notificationTable.wrist, feeds.friendLogTable.wrist); var notyFeed = []; - notyFeed = notyFeed.concat(feeds.gameLog.noty, feeds.feedTable.noty, feeds.notificationTable.noty, feeds.friendLogTable.noty, feeds.playerModerationTable.noty); + notyFeed = notyFeed.concat(feeds.gameLog.noty, feeds.feedTable.noty, feeds.notificationTable.noty, feeds.friendLogTable.noty); // OnPlayerJoining var locationBias = Date.now() - 30000; //30 seconds if ((this.isGameRunning) && (this.lastLocation.date < locationBias) && @@ -4438,21 +4432,6 @@ speechSynthesis.getVoices(); case 'DisplayName': this.speak(`${noty.previousDisplayName} changed their name to ${noty.displayName}`); break; - case 'showAvatar': - this.speak(`${noty.sourceDisplayName} has shown your avatar`); - break; - case 'hideAvatar': - this.speak(`${noty.sourceDisplayName} has hidden your avatar`); - break; - case 'block': - this.speak(`${noty.sourceDisplayName} has blocked you`); - break; - case 'mute': - this.speak(`${noty.sourceDisplayName} has muted you`); - break; - case 'unmute': - this.speak(`${noty.sourceDisplayName} has unmuted you`); - break; case 'PortalSpawn': this.speak(`${noty.data} has spawned a portal`); break; @@ -4518,21 +4497,6 @@ speechSynthesis.getVoices(); case 'DisplayName': AppApi.XSNotification('VRCX', `${noty.previousDisplayName} changed their name to ${noty.displayName}`, timeout, image); break; - case 'showAvatar': - AppApi.XSNotification('VRCX', `${noty.sourceDisplayName} has shown your avatar`, timeout, image); - break; - case 'hideAvatar': - AppApi.XSNotification('VRCX', `${noty.sourceDisplayName} has hidden your avatar`, timeout, image); - break; - case 'block': - AppApi.XSNotification('VRCX', `${noty.sourceDisplayName} has blocked you`, timeout, image); - break; - case 'mute': - AppApi.XSNotification('VRCX', `${noty.sourceDisplayName} has muted you`, timeout, image); - break; - case 'unmute': - AppApi.XSNotification('VRCX', `${noty.sourceDisplayName} has unmuted you`, timeout, image); - break; case 'PortalSpawn': AppApi.XSNotification('VRCX', `${noty.data} has spawned a portal`, timeout, image); break; @@ -4597,21 +4561,6 @@ speechSynthesis.getVoices(); case 'DisplayName': AppApi.DesktopNotification(noty.previousDisplayName, `changed their name to ${noty.displayName}`, image); break; - case 'showAvatar': - AppApi.DesktopNotification(noty.sourceDisplayName, `has shown your avatar`, image); - break; - case 'hideAvatar': - AppApi.DesktopNotification(noty.sourceDisplayName, `has hidden your avatar`, image); - break; - case 'block': - AppApi.DesktopNotification(noty.sourceDisplayName, `has blocked you`, image); - break; - case 'mute': - AppApi.DesktopNotification(noty.sourceDisplayName, `has muted you`, image); - break; - case 'unmute': - AppApi.DesktopNotification(noty.sourceDisplayName, `has unmuted you`, image); - break; case 'PortalSpawn': AppApi.DesktopNotification(noty.data, `has spawned a portal`, image); break; @@ -7049,11 +6998,6 @@ speechSynthesis.getVoices(); Unfriend: 'On', DisplayName: 'VIP', TrustLevel: 'VIP', - showAvatar: 'On', - hideAvatar: 'On', - block: 'On', - mute: 'On', - unmute: 'On', PortalSpawn: 'Everyone', ItemDestroy: 'Off', Event: 'On', @@ -7077,11 +7021,6 @@ speechSynthesis.getVoices(); Unfriend: 'On', DisplayName: 'Friends', TrustLevel: 'Friends', - showAvatar: 'On', - hideAvatar: 'On', - block: 'On', - mute: 'On', - unmute: 'On', PortalSpawn: 'Everyone', ItemDestroy: 'Everyone', Event: 'On', diff --git a/html/src/index.pug b/html/src/index.pug index d47b5668..230c0341 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -1504,21 +1504,6 @@ html div span.toggle-name Trust Level toggle-switch(:options="toggleSwitchOptionsFriends" group="switchNotyGrouprequestTrustLevel" v-model="sharedFeedFilters.noty.TrustLevel" class="toggle-switch") - // div - // span.toggle-name Show Avatar - // toggle-switch(:options="toggleSwitchOptionsOn" group="switchNotyGrouprequestShowAvatar" v-model="sharedFeedFilters.noty.showAvatar" class="toggle-switch") - // div - // span.toggle-name Hide Avatar - // toggle-switch(:options="toggleSwitchOptionsOn" group="switchNotyGrouprequestHideAvatar" v-model="sharedFeedFilters.noty.hideAvatar" class="toggle-switch") - // div - // span.toggle-name Block - // toggle-switch(:options="toggleSwitchOptionsOn" group="switchNotyGrouprequestblock" v-model="sharedFeedFilters.noty.block" class="toggle-switch") - // div - // span.toggle-name Mute - // toggle-switch(:options="toggleSwitchOptionsOn" group="switchNotyGrouprequestmute" v-model="sharedFeedFilters.noty.mute" class="toggle-switch") - // div - // span.toggle-name Unmute - // toggle-switch(:options="toggleSwitchOptionsOn" group="switchNotyGrouprequestunmute" v-model="sharedFeedFilters.noty.unmute" class="toggle-switch") div span.toggle-name Portal Spawn toggle-switch(:options="toggleSwitchOptionsEveryone" group="switchNotyGrouprequestPortalSpawn" v-model="sharedFeedFilters.noty.PortalSpawn" class="toggle-switch") @@ -1586,21 +1571,6 @@ html div span.toggle-name Trust Level toggle-switch(:options="toggleSwitchOptionsFriends" group="switchWristGrouprequestTrustLevel" v-model="sharedFeedFilters.wrist.TrustLevel" class="toggle-switch") - // div - // span.toggle-name Show Avatar - // toggle-switch(:options="toggleSwitchOptionsOn" group="switchWristGrouprequestShowAvatar" v-model="sharedFeedFilters.wrist.showAvatar" class="toggle-switch") - // div - // span.toggle-name Hide Avatar - // toggle-switch(:options="toggleSwitchOptionsOn" group="switchWristGrouprequestHideAvatar" v-model="sharedFeedFilters.wrist.hideAvatar" class="toggle-switch") - // div - // span.toggle-name Block - // toggle-switch(:options="toggleSwitchOptionsOn" group="switchWristGrouprequestblock" v-model="sharedFeedFilters.wrist.block" class="toggle-switch") - // div - // span.toggle-name Mute - // toggle-switch(:options="toggleSwitchOptionsOn" group="switchWristGrouprequestmute" v-model="sharedFeedFilters.wrist.mute" class="toggle-switch") - // div - // span.toggle-name Unmute - // toggle-switch(:options="toggleSwitchOptionsOn" group="switchWristGrouprequestunmute" v-model="sharedFeedFilters.wrist.unmute" class="toggle-switch") div span.toggle-name Portal Spawn toggle-switch(:options="toggleSwitchOptionsEveryone" group="switchWristGrouprequestPortalSpawn" v-model="sharedFeedFilters.wrist.PortalSpawn" class="toggle-switch") diff --git a/html/src/vr.js b/html/src/vr.js index 387add21..c19cafe4 100644 --- a/html/src/vr.js +++ b/html/src/vr.js @@ -937,21 +937,6 @@ speechSynthesis.getVoices(); case 'DisplayName': text = `${noty.previousDisplayName} changed their name to ${noty.displayName}`; break; - case 'showAvatar': - text = `${noty.sourceDisplayName} has shown your avatar`; - break; - case 'hideAvatar': - text = `${noty.sourceDisplayName} has hidden your avatar`; - break; - case 'block': - text = `${noty.sourceDisplayName} has blocked you`; - break; - case 'mute': - text = `${noty.sourceDisplayName} has muted you`; - break; - case 'unmute': - text = `${noty.sourceDisplayName} has unmuted you`; - break; case 'PortalSpawn': text = `${noty.data} has spawned a portal`; break; diff --git a/html/src/vr.pug b/html/src/vr.pug index b8a4bc77..d194e82f 100644 --- a/html/src/vr.pug +++ b/html/src/vr.pug @@ -103,31 +103,6 @@ html span.extra span.time {{ feed.created_at | formatDate('HH:MI') }} | 🤝 #[span.name(v-text="feed.displayName")] {{ feed.previousTrustLevel }} #[i.el-icon-right] {{ feed.trustLevel }} - div(v-else-if="feed.type === 'showAvatar'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }") - .detail - span.extra - span.time {{ feed.created_at | formatDate('HH:MI') }} - | 👀 #[span.name(v-text="feed.sourceDisplayName")] - div(v-else-if="feed.type === 'hideAvatar'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }") - .detail - span.extra - span.time {{ feed.created_at | formatDate('HH:MI') }} - | 🙈 #[span.name(v-text="feed.sourceDisplayName")] - div(v-else-if="feed.type === 'block'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }") - .detail - span.extra - span.time {{ feed.created_at | formatDate('HH:MI') }} - | 🛑 #[span.name(v-text="feed.sourceDisplayName")] - div(v-else-if="feed.type === 'mute'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }") - .detail - span.extra - span.time {{ feed.created_at | formatDate('HH:MI') }} - | 🔇 #[span.name(v-text="feed.sourceDisplayName")] - div(v-else-if="feed.type === 'unmute'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }") - .detail - span.extra - span.time {{ feed.created_at | formatDate('HH:MI') }} - | 🎤 #[span.name(v-text="feed.sourceDisplayName")] div(v-else-if="feed.type === 'PortalSpawn'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }") .detail span.extra @@ -230,31 +205,6 @@ html span.extra span.time {{ feed.created_at | formatDate('HH:MI') }} | #[span.name(v-text="feed.displayName")] trust level is now {{ feed.trustLevel }} - div(v-else-if="feed.type === 'showAvatar'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }") - .detail - span.extra - span.time {{ feed.created_at | formatDate('HH:MI') }} - | #[span.name(v-text="feed.sourceDisplayName")] has shown your avatar - div(v-else-if="feed.type === 'hideAvatar'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }") - .detail - span.extra - span.time {{ feed.created_at | formatDate('HH:MI') }} - | #[span.name(v-text="feed.sourceDisplayName")] has hidden your avatar - div(v-else-if="feed.type === 'block'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }") - .detail - span.extra - span.time {{ feed.created_at | formatDate('HH:MI') }} - | #[span.name(v-text="feed.sourceDisplayName")] has blocked you - div(v-else-if="feed.type === 'mute'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }") - .detail - span.extra - span.time {{ feed.created_at | formatDate('HH:MI') }} - | #[span.name(v-text="feed.sourceDisplayName")] has muted you - div(v-else-if="feed.type === 'unmute'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }") - .detail - span.extra - span.time {{ feed.created_at | formatDate('HH:MI') }} - | #[span.name(v-text="feed.sourceDisplayName")] has unmuted you div(v-else-if="feed.type === 'PortalSpawn'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }") .detail span.extra