diff --git a/html/src/app.js b/html/src/app.js index c97994f2..b97593ac 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -14649,6 +14649,12 @@ speechSynthesis.getVoices(); { prop: 'displayName', value: '' + }, + { + prop: 'type', + value: false, + filterFn: (row, filter) => + !(filter.value && row.type === 'Unfriend') } ], tableProps: { @@ -14856,7 +14862,9 @@ speechSynthesis.getVoices(); this.queueFriendLogNoty(friendLogHistory); this.friendLog.delete(id); database.deleteFriendLogCurrent(id); - this.notifyMenu('friendLog'); + if (!this.hideUnfriends) { + this.notifyMenu('friendLog'); + } this.updateSharedFeed(true); this.deleteFriend(id); } @@ -15653,6 +15661,11 @@ speechSynthesis.getVoices(); 'VRCX_hideUserMemos', false ); + $app.data.hideUnfriends = await configRepository.getBool( + 'VRCX_hideUnfriends', + false + ); + $app.data.friendLogTable.filters[2].value = $app.data.hideUnfriends; $app.methods.saveOpenVROption = async function () { await configRepository.setBool('openVR', this.openVR); await configRepository.setBool('openVRAlways', this.openVRAlways); @@ -15777,6 +15790,13 @@ speechSynthesis.getVoices(); this.hideUserMemos ); }; + $app.methods.saveFriendLogOptions = async function () { + await configRepository.setBool( + 'VRCX_hideUnfriends', + this.hideUnfriends + ); + this.friendLogTable.filters[2].value = this.hideUnfriends; + }; $app.data.TTSvoices = speechSynthesis.getVoices(); $app.methods.saveNotificationTTS = async function () { speechSynthesis.cancel(); diff --git a/html/src/index.pug b/html/src/index.pug index fa053dad..a42983be 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -460,13 +460,14 @@ html template(#content v-else) span - .detail - span.name(v-if="userDialog.unFriended") {{ $t('dialog.user.info.unfriended') }} + span.name(v-if="userDialog.unFriended && !hideUnfriends") {{ $t('dialog.user.info.unfriended') }} el-tooltip(v-if="!hideTooltips" placement="top" style="margin-left:5px" :content="$t('dialog.user.info.accuracy_notice')") i.el-icon-warning span.name(v-else) {{ $t('dialog.user.info.friended') }} el-tooltip(v-if="!hideTooltips" placement="top" style="margin-left:5px" :content="$t('dialog.user.info.accuracy_notice')") i.el-icon-warning - span.extra {{ userDialog.dateFriended | formatDate('long') }} + span.extra(v-if="!hideUnfriends") {{ userDialog.dateFriended | formatDate('long') }} + span.extra(v-else) - template(v-if="API.currentUser.id === userDialog.id") .x-friend-item(@click="toggleAvatarCopying") .detail diff --git a/html/src/localization/en/en.json b/html/src/localization/en/en.json index b6d4c6fe..08acd2b6 100644 --- a/html/src/localization/en/en.json +++ b/html/src/localization/en/en.json @@ -323,6 +323,10 @@ "user_colors": { "header": "User Colors", "random_colors_from_user_id": "Random Colors from User ID" + }, + "friend_log": { + "header": "Friend Log", + "hide_unfriends": "Hide Unfriends" } }, "notifications": { diff --git a/html/src/localization/es/en.json b/html/src/localization/es/en.json index 5d4e9d46..5543ff2a 100644 --- a/html/src/localization/es/en.json +++ b/html/src/localization/es/en.json @@ -323,6 +323,10 @@ "user_colors": { "header": "Colores de los Usuarios", "random_colors_from_user_id": "Colores Aleatorios a partir del ID de Usuario" + }, + "friend_log": { + "header": "Friend Log", + "hide_unfriends": "Hide Unfriends" } }, "notifications": { diff --git a/html/src/localization/fr/en.json b/html/src/localization/fr/en.json index 87ec8527..0cff440a 100644 --- a/html/src/localization/fr/en.json +++ b/html/src/localization/fr/en.json @@ -323,6 +323,10 @@ "user_colors": { "header": "Couleurs des utilisateurs", "random_colors_from_user_id": "Couleurs procedurales à partir de l'ID de l'utilisateur" + }, + "friend_log": { + "header": "Friend Log", + "hide_unfriends": "Hide Unfriends" } }, "notifications": { diff --git a/html/src/localization/hu/en.json b/html/src/localization/hu/en.json index 820d98bc..95462e07 100644 --- a/html/src/localization/hu/en.json +++ b/html/src/localization/hu/en.json @@ -323,6 +323,10 @@ "user_colors": { "header": "Felhasználói színek", "random_colors_from_user_id": "Random Colors from User ID" + }, + "friend_log": { + "header": "Friend Log", + "hide_unfriends": "Hide Unfriends" } }, "notifications": { diff --git a/html/src/localization/ja/en.json b/html/src/localization/ja/en.json index 1efb068f..b5910d74 100644 --- a/html/src/localization/ja/en.json +++ b/html/src/localization/ja/en.json @@ -323,6 +323,10 @@ "user_colors": { "header": "ユーザーの色", "random_colors_from_user_id": "ユーザーIDからランダムに色を生成" + }, + "friend_log": { + "header": "Friend Log", + "hide_unfriends": "Hide Unfriends" } }, "notifications": { diff --git a/html/src/localization/ko/en.json b/html/src/localization/ko/en.json index 4c23c47c..776fa27c 100644 --- a/html/src/localization/ko/en.json +++ b/html/src/localization/ko/en.json @@ -323,6 +323,10 @@ "user_colors": { "header": "유저 색상", "random_colors_from_user_id": "유저 ID별 무작위 색상 사용" + }, + "friend_log": { + "header": "Friend Log", + "hide_unfriends": "Hide Unfriends" } }, "notifications": { diff --git a/html/src/localization/pl/en.json b/html/src/localization/pl/en.json index c3374287..b81df8f2 100644 --- a/html/src/localization/pl/en.json +++ b/html/src/localization/pl/en.json @@ -323,6 +323,10 @@ "user_colors": { "header": "Kolory użytkowników", "random_colors_from_user_id": "Losowe kolory według ID Użytkownika" + }, + "friend_log": { + "header": "Friend Log", + "hide_unfriends": "Hide Unfriends" } }, "notifications": { diff --git a/html/src/localization/pt/en.json b/html/src/localization/pt/en.json index 20826940..808529b2 100644 --- a/html/src/localization/pt/en.json +++ b/html/src/localization/pt/en.json @@ -323,6 +323,10 @@ "user_colors": { "header": "Cores do Usuário", "random_colors_from_user_id": "Cores Aleatórias do ID do Usuário" + }, + "friend_log": { + "header": "Friend Log", + "hide_unfriends": "Hide Unfriends" } }, "notifications": { diff --git a/html/src/localization/ru/en.json b/html/src/localization/ru/en.json index 78ca0bee..07bd4d2f 100644 --- a/html/src/localization/ru/en.json +++ b/html/src/localization/ru/en.json @@ -323,6 +323,10 @@ "user_colors": { "header": "Пользовательские цвета", "random_colors_from_user_id": "Случайные цвета из ID пользователя" + }, + "friend_log": { + "header": "Friend Log", + "hide_unfriends": "Hide Unfriends" } }, "notifications": { diff --git a/html/src/localization/vi/en.json b/html/src/localization/vi/en.json index db2f4b2e..370642d4 100644 --- a/html/src/localization/vi/en.json +++ b/html/src/localization/vi/en.json @@ -323,6 +323,10 @@ "user_colors": { "header": "Màu của người dùng", "random_colors_from_user_id": "Màu ngẫu nhiên từ ID người dùng" + }, + "friend_log": { + "header": "Friend Log", + "hide_unfriends": "Hide Unfriends" } }, "notifications": { diff --git a/html/src/localization/zh-CN/en.json b/html/src/localization/zh-CN/en.json index 6b06e74e..56497912 100644 --- a/html/src/localization/zh-CN/en.json +++ b/html/src/localization/zh-CN/en.json @@ -323,6 +323,10 @@ "user_colors": { "header": "好友名称显示颜色", "random_colors_from_user_id": "从用户 ID 随机挑选颜色" + }, + "friend_log": { + "header": "Friend Log", + "hide_unfriends": "Hide Unfriends" } }, "notifications": { diff --git a/html/src/localization/zh-TW/en.json b/html/src/localization/zh-TW/en.json index 5b12aaf2..d25ba1a1 100644 --- a/html/src/localization/zh-TW/en.json +++ b/html/src/localization/zh-TW/en.json @@ -323,6 +323,10 @@ "user_colors": { "header": "玩家名稱顏色", "random_colors_from_user_id": "從玩家 ID 隨機挑選顏色" + }, + "friend_log": { + "header": "Friend Log", + "hide_unfriends": "Hide Unfriends" } }, "notifications": { diff --git a/html/src/mixins/tabs/settings.pug b/html/src/mixins/tabs/settings.pug index 2ae59285..d3d1d216 100644 --- a/html/src/mixins/tabs/settings.pug +++ b/html/src/mixins/tabs/settings.pug @@ -261,6 +261,12 @@ mixin settingsTab() div el-color-picker(v-model="trustColor.troll" @change="updatetrustColor" size="mini" :predefine="['#782f2f']") span.color-picker(slot="trigger" class="x-tag-troll") Nuisance + //- Appearance | Friend Log + div.options-container + span.header {{ $t('view.settings.appearance.friend_log.header') }} + div.options-container-item + span.name {{ $t('view.settings.appearance.friend_log.hide_unfriends') }} + el-switch(v-model="hideUnfriends" @change="saveFriendLogOptions") //- Notifications Tab el-tab-pane(:label="$t('view.settings.category.notifications')") //- Notifications | Notifications