MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-06 06:46:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix something, I think

Browse Source
This commit is contained in:
Natsumi
2025-05-01 19:56:29 +10:00
parent 9017e3d01c
commit d94ef24a9a
1 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/SideBar/components/FriendsSidebar.vue
+25 -27
View File
@@ -226,19 +226,13 @@
const allFriends = [...this.vipFriends, ...this.onlineFriends]; const allFriends = [...this.vipFriends, ...this.onlineFriends];
allFriends.forEach((friend) => { allFriends.forEach((friend) => {
let locationTag; if (!friend.ref?.$location) {
return;
}
if (friend.ref?.$location.isRealInstance) { let locationTag = friend.ref.$location.tag;
locationTag = friend.ref.$location.tag; if (!friend.ref.$location.isRealInstance && this.lastLocation.friendList.has(friend.id)) {
} else if (this.lastLocation.friendList.has(friend.id)) { locationTag = this.lastLocation.location;
let $location = utils.parseLocation(this.lastLocation.location);
if ($location.isRealInstance) {
if ($location.tag === 'private') {
locationTag = this.lastLocation.name;
} else {
locationTag = $location.tag;
}
}
} }
if (!locationTag) { if (!locationTag) {
return; return;
@@ -260,30 +254,30 @@
return sortedFriendsList.sort((a, b) => b.length - a.length); return sortedFriendsList.sort((a, b) => b.length - a.length);
}, },
onlineFriendsByGroupStatus() { onlineFriendsByGroupStatus() {
if ( if (!this.isSidebarGroupByInstance || !this.isHideFriendsInSameInstance) {
!this.isSidebarGroupByInstance ||
(this.isSidebarGroupByInstance && !this.isHideFriendsInSameInstance)
) {
return this.onlineFriends; return this.onlineFriends;
} }
const sameInstanceTag = new Set( const sameInstanceTag = new Set();
this.friendsInSameInstance.flatMap((item) => item.map((friend) => friend.ref?.$location.tag)) for (const item of this.friendsInSameInstance) {
); for (const friend of item) {
sameInstanceTag.add(friend.ref?.$location.tag);
}
}
return this.onlineFriends.filter((item) => !sameInstanceTag.has(item.ref?.$location.tag)); return this.onlineFriends.filter((item) => !sameInstanceTag.has(item.ref?.$location.tag));
}, },
vipFriendsByGroupStatus() { vipFriendsByGroupStatus() {
if ( if (!this.isSidebarGroupByInstance || !this.isHideFriendsInSameInstance) {
!this.isSidebarGroupByInstance ||
(this.isSidebarGroupByInstance && !this.isHideFriendsInSameInstance)
) {
return this.vipFriends; return this.vipFriends;
} }
const sameInstanceTag = new Set( const sameInstanceTag = new Set();
this.friendsInSameInstance.flatMap((item) => item.map((friend) => friend.ref?.$location.tag)) for (const item of this.friendsInSameInstance) {
); for (const friend of item) {
sameInstanceTag.add(friend.ref?.$location.tag);
}
}
return this.vipFriends.filter((item) => !sameInstanceTag.has(item.ref?.$location.tag)); return this.vipFriends.filter((item) => !sameInstanceTag.has(item.ref?.$location.tag));
}, },
@@ -358,11 +352,15 @@
if (friend.ref?.location !== 'traveling') { if (friend.ref?.location !== 'traveling') {
return friend.ref.location; return friend.ref.location;
} }
}
for (const friend of friendsArr) {
if (utils.isRealInstance(friend.ref?.travelingToLocation)) { if (utils.isRealInstance(friend.ref?.travelingToLocation)) {
return friend.ref.travelingToLocation; return friend.ref.travelingToLocation;
} }
}
for (const friend of friendsArr) {
if (this.lastLocation.friendList.has(friend.id)) { if (this.lastLocation.friendList.has(friend.id)) {
return this.lastLocation.name; return this.lastLocation.location;
} }
} }
return friendsArr[0].ref?.location; return friendsArr[0].ref?.location;