Display All Friends When Grouped by Instance (#1119)

src/app.js

@@ -23309,20 +23309,12 @@ console.log(`isLinux: ${LINUX}`);
 
     //  - SidebarGroupByInstance
 
-    $app.methods.handleSwitchGroupByInstance = async function () {
-        this.isSidebarGroupByInstance = !this.isSidebarGroupByInstance;
-        await configRepository.setBool(
-            'VRCX_sidebarGroupByInstance',
-            this.isSidebarGroupByInstance
-        );
-    };
-
     $app.data.isSidebarGroupByInstance = await configRepository.getBool(
         'VRCX_sidebarGroupByInstance',
         true
     );
 
-    $app.methods.handleSwitchGroupByInstance = function () {
+    $app.methods.toggleGroupByInstance = function () {
         this.isSidebarGroupByInstance = !this.isSidebarGroupByInstance;
         configRepository.setBool(
             'VRCX_sidebarGroupByInstance',
@@ -23330,6 +23322,19 @@ console.log(`isLinux: ${LINUX}`);
         );
     };
 
+    $app.data.isHideFriendsInSameInstance = await configRepository.getBool(
+        'VRCX_hideFriendsInSameInstance',
+        false
+    );
+
+    $app.methods.toggleHideFriendsInSameInstance = function () {
+        this.isHideFriendsInSameInstance = !this.isHideFriendsInSameInstance;
+        configRepository.setBool(
+            'VRCX_hideFriendsInSameInstance',
+            this.isHideFriendsInSameInstance
+        );
+    };
+
     $app.data.isSidebarGroupByInstanceCollapsed =
         await configRepository.getBool(
             'VRCX_sidebarGroupByInstanceCollapsed',
@@ -23374,7 +23379,10 @@ console.log(`isLinux: ${LINUX}`);
     };
 
     $app.computed.onlineFriendsByGroupStatus = function () {
-        if (!this.isSidebarGroupByInstance) {
+        if (
+            !this.isSidebarGroupByInstance ||
+            (this.isSidebarGroupByInstance && !this.isHideFriendsInSameInstance)
+        ) {
             return this.onlineFriends;
         }
 
@@ -23390,7 +23398,10 @@ console.log(`isLinux: ${LINUX}`);
     };
 
     $app.computed.vipFriendsByGroupStatus = function () {
-        if (!this.isSidebarGroupByInstance) {
+        if (
+            !this.isSidebarGroupByInstance ||
+            (this.isSidebarGroupByInstance && !this.isHideFriendsInSameInstance)
+        ) {
             return this.vipFriends;
         }
 

src/localization/en/en.json

@@ -386,6 +386,8 @@
                     "width": "Width",
                     "group_by_instance": "Group by Instance",
                     "group_by_instance_tooltip": "Enabling this will group friends by instance when there is more than one friend in the same instance.",
+                    "hide_friends_in_same_instance": "Hide Friends in Same Instance",
+                    "hide_friends_in_same_instance_tooltip": "Hide Friends from Friend List When They Are in the Same Instance.",
                     "split_favorite_friends": "Split Favorite Friends",
                     "split_favorite_friends_tooltip": "Separate favorite friends into their individual groups."
                 },
@@ -635,7 +637,7 @@
         "friends": "Friends",
         "me": "ME",
         "favorite": "FAVORITES",
-        "same_instance": "Same Instance",
+        "same_instance": "SAME INSTANCE",
         "online": "ONLINE",
         "active": "ACTIVE",
         "offline": "OFFLINE",

src/mixins/tabs/settings.pug

@@ -414,13 +414,17 @@ mixin settingsTab
                             :min='200'
                             :max='500'
                             style='display: inline-block; width: 300px')
-                    .options-container-item
                     simple-switch(
                         :label='$t("view.settings.appearance.side_panel.group_by_instance")'
                         :value='isSidebarGroupByInstance'
-                            @change='handleSwitchGroupByInstance'
+                        @change='toggleGroupByInstance'
                         :tooltip='$t("view.settings.appearance.side_panel.group_by_instance_tooltip")')
-                    .options-container-item
+                    simple-switch(
+                        v-if='isSidebarGroupByInstance'
+                        :label='$t("view.settings.appearance.side_panel.hide_friends_in_same_instance")'
+                        :value='isHideFriendsInSameInstance'
+                        @change='toggleHideFriendsInSameInstance'
+                        :tooltip='$t("view.settings.appearance.side_panel.hide_friends_in_same_instance_tooltip")')
                     simple-switch(
                         :label='$t("view.settings.appearance.side_panel.split_favorite_friends")'
                         :value='isSidebarDivideByFriendGroup'