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

refactor friendsidebar same instance logic

Browse Source
This commit is contained in:
pa
2026-02-11 22:53:29 +09:00
parent 61a4176f47
commit b0bc6dd03c
1 changed files with 37 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/Sidebar/components/FriendsSidebar.vue
+37 -58
View File
@@ -142,56 +142,42 @@
loadFriendsGroupStates(); loadFriendsGroupStates();
const sameInstanceFriendId = computed(() => { const sameInstanceFriendId = computed(() => {
const sameInstanceFriendId = new Set(); const ids = new Set();
for (const item of friendsInSameInstance.value) { for (const item of friendsInSameInstance.value) {
for (const friend of item) { for (const friend of item) {
if (isRealInstance(friend.ref?.$location.tag) || lastLocation.value.friendList.has(friend.id)) { if (isRealInstance(friend.ref?.$location.tag) || lastLocation.value.friendList.has(friend.id)) {
sameInstanceFriendId.add(friend.id); ids.add(friend.id);
} }
} }
} }
return sameInstanceFriendId; return ids;
}); });
const onlineFriendsByGroupStatus = computed(() => { const shouldHideSameInstance = computed(() => isSidebarGroupByInstance.value && isHideFriendsInSameInstance.value);
if (!isSidebarGroupByInstance.value || !isHideFriendsInSameInstance.value) {
return onlineFriends.value; function excludeSameInstance(list) {
if (!shouldHideSameInstance.value) {
return list;
} }
return list.filter((item) => !sameInstanceFriendId.value.has(item.id));
}
return onlineFriends.value.filter((item) => !sameInstanceFriendId.value.has(item.id)); const onlineFriendsByGroupStatus = computed(() => excludeSameInstance(onlineFriends.value));
});
const vipFriendsByGroupStatus = computed(() => { const vipFriendsByGroupStatus = computed(() => excludeSameInstance(vipFriends.value));
if (!isSidebarGroupByInstance.value || !isHideFriendsInSameInstance.value) {
return vipFriends.value;
}
return vipFriends.value.filter((item) => !sameInstanceFriendId.value.has(item.id));
});
// VIP friends divide by group // VIP friends divide by group
const vipFriendsDivideByGroup = computed(() => { const vipFriendsDivideByGroup = computed(() => {
const vipFriendsByGroup = { ...groupedByGroupKeyFavoriteFriends.value }; const remoteFriendsByGroup = groupedByGroupKeyFavoriteFriends.value;
const result = [];
for (const key in vipFriendsByGroup) { // Build a normalized list of { key, groupName, memberIds }
if (Object.hasOwn(vipFriendsByGroup, key)) { const groups = [];
const groupFriends = vipFriendsByGroup[key];
// sort groupFriends using the order of vipFriends
// avoid unnecessary sorting
const filteredFriends = vipFriends.value.filter((friend) =>
groupFriends.some((item) => {
if (isSidebarGroupByInstance.value && isHideFriendsInSameInstance.value) {
return item.id === friend.id && !sameInstanceFriendId.value.has(item.id);
}
return item.id === friend.id;
})
);
if (filteredFriends.length > 0) { for (const key in remoteFriendsByGroup) {
const groupName = favoriteFriendGroups.value.find((item) => item.key === key)?.displayName || ''; if (Object.hasOwn(remoteFriendsByGroup, key)) {
result.push(filteredFriends.map((item) => ({ groupName, key, ...item }))); const groupName = favoriteFriendGroups.value.find((g) => g.key === key)?.displayName || '';
} const memberIds = new Set(remoteFriendsByGroup[key].map((f) => f.id));
groups.push({ key, groupName, memberIds });
} }
} }
@@ -199,33 +185,22 @@
if (selectedKey.startsWith('local:')) { if (selectedKey.startsWith('local:')) {
const groupName = selectedKey.slice(6); const groupName = selectedKey.slice(6);
const userIds = localFriendFavorites.value?.[groupName]; const userIds = localFriendFavorites.value?.[groupName];
if (userIds && userIds.length) { if (userIds?.length) {
const filteredFriends = vipFriends.value.filter((friend) => { groups.push({ key: selectedKey, groupName, memberIds: new Set(userIds) });
if (isSidebarGroupByInstance.value && isHideFriendsInSameInstance.value) {
return userIds.includes(friend.id) && !sameInstanceFriendId.value.has(friend.id);
}
return userIds.includes(friend.id);
});
if (filteredFriends.length > 0) {
result.push(
filteredFriends.map((item) => ({
groupName,
key: selectedKey,
...item
}))
);
}
} }
} }
} }
return result.sort((a, b) => a[0].key.localeCompare(b[0].key)); // Filter vipFriends per group, preserving vipFriends sort order
}); const result = [];
for (const { key, groupName, memberIds } of groups) {
const filteredFriends = excludeSameInstance(vipFriends.value.filter((friend) => memberIds.has(friend.id)));
if (filteredFriends.length > 0) {
result.push(filteredFriends.map((item) => ({ groupName, key, ...item })));
}
}
const vipFriendsDisplayNumber = computed(() => { return result.sort((a, b) => a[0].key.localeCompare(b[0].key));
return isSidebarDivideByFriendGroup.value
? vipFriendsDivideByGroup.value.length
: vipFriendsByGroupStatus.value.length;
}); });
const buildToggleRow = ({ const buildToggleRow = ({
@@ -286,12 +261,16 @@
rows.push({ type: 'me-item', key: `me:${currentUser.value?.id ?? 'me'}` }); rows.push({ type: 'me-item', key: `me:${currentUser.value?.id ?? 'me'}` });
} }
if (vipFriendsDisplayNumber.value) { const vipFriendCount = isSidebarDivideByFriendGroup.value
? vipFriendsDivideByGroup.value.length
: vipFriendsByGroupStatus.value.length;
if (vipFriendCount) {
rows.push( rows.push(
buildToggleRow({ buildToggleRow({
key: 'vip-header', key: 'vip-header',
label: t('side_panel.favorite'), label: t('side_panel.favorite'),
count: vipFriendsDisplayNumber.value, count: vipFriendCount,
expanded: isVIPFriends.value, expanded: isVIPFriends.value,
onClick: toggleVIPFriends onClick: toggleVIPFriends
}) })