Veteran/Legend removal

html/src/app.js

@@ -1176,14 +1176,7 @@ speechSynthesis.getVoices();
         ) {
             ref.$isTroll = true;
         }
-        if (tags.includes('system_legend')) {
+        if (tags.includes('system_trust_veteran')) {
-            ref.$isLegend = true;
-        }
-        if (tags.includes('system_trust_legend')) {
-            ref.$trustLevel = 'Veteran User';
-            ref.$trustClass = 'x-tag-legend';
-            ref.$trustSortNum = 6;
-        } else if (tags.includes('system_trust_veteran')) {
             ref.$trustLevel = 'Trusted User';
             ref.$trustClass = 'x-tag-veteran';
             ref.$trustSortNum = 5;
@@ -1209,10 +1202,6 @@ speechSynthesis.getVoices();
             ref.$trustColor = 'x-tag-troll';
             ref.$trustSortNum += 0.1;
         }
-        if ($app.legendColorOverride && ref.$isLegend) {
-            ref.$trustColor = 'x-tag-legendary';
-            ref.$trustSortNum += 0.2;
-        }
         if (ref.$isModerator) {
             ref.$trustColor = 'x-tag-vip';
             ref.$trustSortNum += 0.3;
@@ -10736,6 +10725,7 @@ speechSynthesis.getVoices();
     };
 
     $app.methods.getFriendLog = async function () {
+        await database.cleanLegendFromFriendLog(); // fix dataebase spam crap
         var friendLogCurrentArray = await database.getFriendLogCurrent();
         for (var friend of friendLogCurrentArray) {
             this.friendLog.set(friend.userId, friend);
@@ -10898,6 +10888,21 @@ speechSynthesis.getVoices();
             ctx.trustLevel &&
             ctx.trustLevel !== ref.$trustLevel
         ) {
+            if (
+                (ctx.trustLevel === 'Trusted User' &&
+                    ref.$trustLevel === 'Veteran User') ||
+                (ctx.trustLevel === 'Veteran User' &&
+                    ref.$trustLevel === 'Trusted User')
+            ) {
+                var friendLogCurrent3 = {
+                    userId: ref.id,
+                    displayName: ref.displayName,
+                    trustLevel: ref.$trustLevel
+                };
+                this.friendLog.set(ref.id, friendLogCurrent3);
+                database.setFriendLogCurrent(friendLogCurrent3);
+                return;
+            }
             var friendLogHistoryTrustLevel = {
                 created_at: new Date().toJSON(),
                 type: 'TrustLevel',
@@ -11390,9 +11395,6 @@ speechSynthesis.getVoices();
     $app.data.vrBackgroundEnabled = configRepository.getBool(
         'VRCX_vrBackgroundEnabled'
     );
-    $app.data.legendColorOverride = configRepository.getBool(
-        'VRCX_legendColorOverride'
-    );
     $app.data.asideWidth = configRepository.getInt('VRCX_asidewidth');
     $app.data.autoUpdateVRCX = configRepository.getString(
         'VRCX_autoUpdateVRCX'
@@ -11472,15 +11474,6 @@ speechSynthesis.getVoices();
         this.updateVRLastLocation();
         AppApi.ExecuteVrOverlayFunction('notyClear', '');
     };
-    $app.methods.saveLegendColorOverride = function () {
-        configRepository.setBool(
-            'VRCX_legendColorOverride',
-            this.legendColorOverride
-        );
-        API.cachedUsers.forEach((ref) => {
-            API.applyUserTrustLevel(ref);
-        });
-    };
     $app.data.TTSvoices = speechSynthesis.getVoices();
     $app.methods.saveNotificationTTS = function () {
         speechSynthesis.cancel();
@@ -11643,13 +11636,6 @@ speechSynthesis.getVoices();
             $app.data.vrBackgroundEnabled
         );
     }
-    if (!configRepository.getBool('VRCX_legendColorOverride')) {
-        $app.data.legendColorOverride = false;
-        configRepository.setBool(
-            'VRCX_legendColorOverride',
-            $app.data.legendColorOverride
-        );
-    }
     if (!configRepository.getInt('VRCX_asidewidth')) {
         $app.data.asideWidth = 236;
         configRepository.setInt('VRCX_asidewidth', $app.data.asideWidth);
@@ -11808,8 +11794,6 @@ speechSynthesis.getVoices();
                 known: '#2BCF5C',
                 trusted: '#FF7B42',
                 veteran: '#B18FFF',
-                legend: '#FFD000',
-                legendary: '#FF69B4',
                 vip: '#FF2626',
                 troll: '#782F2F'
             })

html/src/index.pug

@@ -1017,24 +1017,17 @@ html
                             el-color-picker(v-model="trustColor.known" @change="updatetrustColor" size="mini" :predefine="['#2bcf5c']")
                             span.color-picker(slot="trigger" class="x-tag-known") User
                         div
-                            el-color-picker(v-model="trustColor.trusted" @change="updatetrustColor" size="mini" :predefine="['#ff7b42']")
+                                    el-color-picker(v-model="trustColor.trusted" @change="updatetrustColor" size="mini" :predefine="['#ff7b42']")
-                            span.color-picker(slot="trigger" class="x-tag-trusted") Known User
+                                    span.color-picker(slot="trigger" class="x-tag-trusted") Known User
-                        div
+                                div
-                            el-color-picker(v-model="trustColor.veteran" @change="updatetrustColor" size="mini" :predefine="['#b18fff', '#8143e6']")
+                                    el-color-picker(v-model="trustColor.veteran" @change="updatetrustColor" size="mini" :predefine="['#b18fff', '#8143e6', '#ff69b4', '#b52626', '#ffd000', '#abcdef']")
-                            span.color-picker(slot="trigger" class="x-tag-veteran") Trusted User
+                                    span.color-picker(slot="trigger" class="x-tag-veteran") Trusted User
-                        div
+                                div
-                            el-color-picker(v-model="trustColor.legend" @change="updatetrustColor" size="mini" :predefine="['#ffd000', '#abcdef']")
+                                    el-color-picker(v-model="trustColor.vip" @change="updatetrustColor" size="mini" :predefine="['#ff2626']")
-                            span.color-picker(slot="trigger" class="x-tag-legend") Veteran User
+                                    span.color-picker(slot="trigger" class="x-tag-vip") VRChat Team
-                        div
+                                div
-                            el-color-picker(v-model="trustColor.vip" @change="updatetrustColor" size="mini" :predefine="['#ff2626']")
+                                    el-color-picker(v-model="trustColor.troll" @change="updatetrustColor" size="mini" :predefine="['#782f2f']")
-                            span.color-picker(slot="trigger" class="x-tag-vip") VRChat Team
+                                    span.color-picker(slot="trigger" class="x-tag-troll") Nuisance
-                        div
-                            el-color-picker(v-model="trustColor.troll" @change="updatetrustColor" size="mini" :predefine="['#782f2f']")
-                            span.color-picker(slot="trigger" class="x-tag-troll") Nuisance
-                        div
-                                    el-color-picker(v-model="trustColor.legendary" @change="updatetrustColor" size="mini" :predefine="['#ff69b4', '#b52626']")
-                                    span.color-picker(slot="trigger" class="x-tag-legendary") Legend
-                                    el-switch(v-model="legendColorOverride" style="padding-bottom:21px;padding-left:6px" @change="saveLegendColorOverride")
                     el-tab-pane(label="Notifications")
                         div.options-container(style="margin-top:0")
                             span.header Notifications
@@ -1409,7 +1402,6 @@ html
                                     el-tag.name(type="info" effect="plain" size="mini" :class="userDialog.ref.$trustClass" v-text="userDialog.ref.$trustLevel" style="margin-right:5px;margin-top:5px")
                                     el-tag.x-tag-friend(v-if="userDialog.isFriend && userDialog.friend" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Friend No.{{userDialog.friend.no}}
                                     el-tag.x-tag-troll(v-if="userDialog.ref.$isTroll" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Nuisance
-                                    el-tag.x-tag-legendary(v-if="userDialog.ref.$isLegend" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Legend
                                     el-tag.x-tag-vip(v-if="userDialog.ref.$isModerator" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") VRChat Team
                                     el-tag.x-tag-vrcplus(v-if="userDialog.ref.$isVRCPlus" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") VRC+
                                     el-tag.x-tag-platform-pc(v-if="userDialog.ref.last_platform === 'standalonewindows'" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") PC

html/src/repository/database.js

@@ -1370,6 +1370,14 @@ class Database {
         );
         return data;
     }
+
+    async cleanLegendFromFriendLog() {
+        await sqliteService.executeNonQuery(
+            `DELETE FROM ${Database.userPrefix}_friend_log_history
+            WHERE type = 'TrustLevel' AND created_at > '2022-05-04T01:00:00.000Z'
+            AND ((trust_level = 'Veteran User' AND previous_trust_level = 'Trusted User') OR (trust_level = 'Trusted User' AND previous_trust_level = 'Veteran User'))`
+        );
+    }
 }
 
 var self = new Database();