refactor: app.js (#1291)

* refactor: frontend * Fix avatar gallery sort * Update .NET dependencies * Update npm dependencies electron v37.1.0 * bulkRefreshFriends * fix dark theme * Remove crowdin * Fix config.json dialog not updating * VRCX log file fixes & add Cef log * Remove SharedVariable, fix startup * Revert init theme change * Logging date not working? Fix WinformThemer designer error * Add Cef request hander, no more escaping main page * clean * fix * fix * clean * uh * Apply thememode at startup, fixes random user colours * Split database into files * Instance info remove empty lines * Open external VRC links with VRCX * Electron fixes * fix userdialog style * ohhhh * fix store * fix store * fix: load all group members after kicking a user * fix: world dialog favorite button style * fix: Clear VRCX Cache Timer input value * clean * Fix VR overlay * Fix VR overlay 2 * Fix Discord discord rich presence for RPC worlds * Clean up age verified user tags * Fix playerList being occupied after program reload * no `this` * Fix login stuck loading * writable: false * Hide dialogs on logout * add flush sync option * rm LOGIN event * rm LOGOUT event * remove duplicate event listeners * remove duplicate event listeners * clean * remove duplicate event listeners * clean * fix theme style * fix t * clearable * clean * fix ipcEvent * Small changes * Popcorn Palace support * Remove checkActiveFriends * Clean up * Fix dragEnterCef * Block API requests when not logged in * Clear state on login & logout * Fix worldDialog instances not updating * use <script setup> * Fix avatar change event, CheckGameRunning at startup * Fix image dragging * fix * Remove PWI * fix updateLoop * add webpack-dev-server to dev environment * rm unnecessary chunks * use <script setup> * webpack-dev-server changes * use <script setup> * use <script setup> * Fix UGC text size * Split login event * t * use <script setup> * fix * Update .gitignore and enable checkJs in jsconfig * fix i18n t * use <script setup> * use <script setup> * clean * global types * fix * use checkJs for debugging * Add watchState for login watchers * fix .vue template * type fixes * rm Vue.filter * Cef v138.0.170, VC++ 2022 * Settings fixes * Remove 'USER:CURRENT' * clean up 2FA callbacks * remove userApply * rm i18n import * notification handling to use notification store methods * refactor favorite handling to use favorite store methods and clean up event emissions * refactor moderation handling to use dedicated functions for player moderation events * refactor friend handling to use dedicated functions for friend events * Fix program startup, move lang init * Fix friend state * Fix status change error * Fix user notes diff * fix * rm group event * rm auth event * rm avatar event * clean * clean * getUser * getFriends * getFavoriteWorlds, getFavoriteAvatars * AvatarGalleryUpload btn style & package.json update * Fix friend requests * Apply user * Apply world * Fix note diff * Fix VR overlay * Fixes * Update build scripts * Apply avatar * Apply instance * Apply group * update hidden VRC+ badge * Fix sameInstance "private" * fix 502/504 API errors * fix 502/504 API errors * clean * Fix friend in same instance on orange showing twice in friends list * Add back in broken friend state repair methods * add types --------- Co-authored-by: Natsumi <cmcooper123@hotmail.com>
2026-04-23 00:33:50 +02:00 · 2025-07-14 12:00:08 +09:00
parent 952fd77ed5
commit f4f78bb5ec
323 changed files with 47745 additions and 43326 deletions
--- a/src/views/Sidebar/components/GroupsSidebar.vue
+++ b/src/views/Sidebar/components/GroupsSidebar.vue
@@ -0,0 +1,106 @@
+<template>
+    <div class="x-friend-list" style="padding: 10px 5px">
+        <template v-for="(group, index) in groupedGroupInstances">
+            <div
+                :key="getGroupId(group)"
+                class="x-friend-group x-link"
+                :style="{ paddingTop: index === 0 ? '0px' : '10px' }">
+                <div @click="toggleGroupSidebarCollapse(getGroupId(group))" style="display: flex; align-items: center">
+                    <i
+                        class="el-icon-arrow-right"
+                        :style="{
+                            transform: groupInstancesCfg[getGroupId(group)].isCollapsed ? '' : 'rotate(90deg)',
+                            transition: 'transform 0.3s'
+                        }"></i>
+                    <span style="margin-left: 5px">{{ group[0].group.name }} – {{ group.length }}</span>
+                </div>
+            </div>
+
+            <template v-if="!groupInstancesCfg[getGroupId(group)].isCollapsed">
+                <div
+                    v-for="ref in group"
+                    :key="ref.instance.id"
+                    class="x-friend-item"
+                    @click="showGroupDialog(ref.instance.ownerId)">
+                    <template v-if="isAgeGatedInstancesVisible || !(ref.ageGate || ref.location?.includes('~ageGate'))">
+                        <div class="avatar">
+                            <img v-lazy="getSmallGroupIconUrl(ref.group.iconUrl)" />
+                        </div>
+                        <div class="detail">
+                            <span class="name">
+                                <span v-text="ref.group.name"></span>
+                                <span style="font-weight: normal; margin-left: 5px"
+                                    >({{ ref.instance.userCount }}/{{ ref.instance.capacity }})</span
+                                >
+                            </span>
+                            <Location class="extra" :location="ref.instance.location" :link="false" />
+                        </div>
+                    </template>
+                </div>
+            </template>
+        </template>
+    </div>
+</template>
+
+<script setup>
+    import { storeToRefs } from 'pinia';
+    import { computed, ref } from 'vue';
+    import { convertFileUrlToImageUrl } from '../../../shared/utils';
+    import { useAppearanceSettingsStore, useGroupStore } from '../../../stores';
+
+    const { isAgeGatedInstancesVisible } = storeToRefs(useAppearanceSettingsStore());
+    const { showGroupDialog, sortGroupInstancesByInGame } = useGroupStore();
+    const { groupInstances } = storeToRefs(useGroupStore());
+
+    defineProps({
+        groupOrder: {
+            type: Array,
+            default: () => []
+        }
+    });
+
+    const groupInstancesCfg = ref({});
+
+    const groupedGroupInstances = computed(() => {
+        const groupMap = new Map();
+
+        groupInstances.value.forEach((ref) => {
+            const groupId = ref.group.groupId;
+            if (!groupMap.has(groupId)) {
+                groupMap.set(groupId, []);
+            }
+            groupMap.get(groupId).push(ref);
+
+            if (!groupInstancesCfg.value[ref.group?.groupId]) {
+                groupInstancesCfg.value = {
+                    [ref.group.groupId]: {
+                        isCollapsed: false
+                    },
+                    ...groupInstancesCfg.value
+                };
+            }
+        });
+        return Array.from(groupMap.values()).sort(sortGroupInstancesByInGame);
+    });
+
+    function getSmallGroupIconUrl(url) {
+        return convertFileUrlToImageUrl(url);
+    }
+
+    function toggleGroupSidebarCollapse(groupId) {
+        groupInstancesCfg.value[groupId].isCollapsed = !groupInstancesCfg.value[groupId].isCollapsed;
+    }
+
+    function getGroupId(group) {
+        return group[0]?.group?.groupId || '';
+    }
+</script>
+
+<style scoped>
+    .x-link:hover {
+        text-decoration: none;
+    }
+    .x-link:hover span {
+        text-decoration: underline;
+    }
+</style>