From d00ddf3f5bc1e2260cd05131340faf09097e53f0 Mon Sep 17 00:00:00 2001
From: Natsumi <cmcooper123@hotmail.com>
Date: Sun, 2 Nov 2025 00:44:05 +1100
Subject: [PATCH] Hide location when in same instance

---
 src/views/FriendLocation/FriendLocation.vue                | 6 ++++--
 src/views/FriendLocation/components/FriendLocationCard.vue | 6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/views/FriendLocation/FriendLocation.vue b/src/views/FriendLocation/FriendLocation.vue
index cf7a22b0..d34b7903 100644
--- a/src/views/FriendLocation/FriendLocation.vue
+++ b/src/views/FriendLocation/FriendLocation.vue
@@ -14,7 +14,7 @@
                         </div>
                     </template>
                     <div style="display: flex; justify-content: space-between; align-items: center">
-                        <span class="friend-view__settings-label">Show Same Instance</span>
+                        <span class="friend-view__settings-label">Separate Same Instance</span>
                         <el-switch v-model="showSameInstance" />
                     </div>
                     <div style="display: flex; justify-content: space-between; align-items: center">
@@ -93,7 +93,8 @@
                                 v-for="friend in group.friends"
                                 :key="friend.id ?? friend.userId ?? friend.displayName"
                                 :friend="friend"
-                                :card-scale="cardScale" />
+                                :card-scale="cardScale"
+                                :display-instance-info="false" />
                         </div>
                     </section>
                 </div>
@@ -735,6 +736,7 @@
         align-items: center;
         justify-content: space-between;
         padding: 4px 2px;
+        margin: 5px 10px;
         font-weight: 600;
         font-size: 13px;
         color: rgba(15, 23, 42, 0.75);
diff --git a/src/views/FriendLocation/components/FriendLocationCard.vue b/src/views/FriendLocation/components/FriendLocationCard.vue
index 1bce1be0..159ecbba 100644
--- a/src/views/FriendLocation/components/FriendLocationCard.vue
+++ b/src/views/FriendLocation/components/FriendLocationCard.vue
@@ -19,7 +19,7 @@
                 <i v-if="friend.ref?.statusDescription" class="ri-pencil-line" style="opacity: 0.7"></i>
                 {{ friend.ref?.statusDescription || '&nbsp;' }}
             </div>
-            <div class="friend-card__world" :title="friend.worldName">
+            <div v-if="displayInstanceInfo" class="friend-card__world" :title="friend.worldName">
                 <Location
                     class="friend-card__location"
                     :location="friend.ref?.location"
@@ -46,6 +46,10 @@
         cardScale: {
             type: Number,
             default: 1
+        },
+        displayInstanceInfo: {
+            type: Boolean,
+            default: true
         }
     });