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-21 07:43: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/api/user.js
+++ b/src/api/user.js
@@ -1,13 +1,19 @@
-// #region | API: User
+import { request } from '../service/request';
+import { useUserStore } from '../stores';
+
+function getCurrentUserId() {
+    return useUserStore().currentUser.id;
+}

 const userReq = {
    /**
     * Fetch user from API.
-     * @param {{ userId: string }} params identifier of registered user
-     * @returns {Promise<{json: any, params}>}
+     * identifier of registered user
+     * @type {import('../types/user').getUser}
     */
    getUser(params) {
-        return window.API.call(`users/${params.userId}`, {
+        const userStore = useUserStore();
+        return request(`users/${params.userId}`, {
            method: 'GET'
        }).then((json) => {
            if (!json) {
@@ -19,7 +25,7 @@ const userReq = {
                json,
                params
            };
-            window.API.$emit('USER', args);
+            args.ref = userStore.applyUser(json);
            return args;
        });
    },
@@ -30,10 +36,17 @@ const userReq = {
     * @returns {Promise<{json: any, params}>}
     */
    getCachedUser(params) {
+        const userStore = useUserStore();
        return new Promise((resolve, reject) => {
-            const ref = window.API.cachedUsers.get(params.userId);
+            const ref = userStore.cachedUsers.get(params.userId);
            if (typeof ref === 'undefined') {
-                userReq.getUser(params).catch(reject).then(resolve);
+                userReq
+                    .getUser(params)
+                    .catch(reject)
+                    .then((args) => {
+                        args.ref = userStore.applyUser(args.json);
+                        resolve(args);
+                    });
            } else {
                resolve({
                    cache: true,
@@ -59,7 +72,7 @@ const userReq = {
     * @returns {Promise<{json: any, params}>}
     */
    getUsers(params) {
-        return window.API.call('users', {
+        return request('users', {
            method: 'GET',
            params
        }).then((json) => {
@@ -67,7 +80,6 @@ const userReq = {
                json,
                params
            };
-            window.API.$emit('USER:LIST', args);
            return args;
        });
    },
@@ -77,7 +89,8 @@ const userReq = {
     * @returns {Promise<{json: any, params}>}
     */
    addUserTags(params) {
-        return window.API.call(`users/${window.API.currentUser.id}/addTags`, {
+        const userStore = useUserStore();
+        return request(`users/${getCurrentUserId()}/addTags`, {
            method: 'POST',
            params
        }).then((json) => {
@@ -85,7 +98,7 @@ const userReq = {
                json,
                params
            };
-            window.API.$emit('USER:CURRENT:SAVE', args);
+            userStore.applyCurrentUser(json);
            return args;
        });
    },
@@ -95,18 +108,16 @@ const userReq = {
     * @returns {Promise<{json: any, params}>}
     */
    removeUserTags(params) {
-        return window.API.call(
-            `users/${window.API.currentUser.id}/removeTags`,
-            {
-                method: 'POST',
-                params
-            }
-        ).then((json) => {
+        const userStore = useUserStore();
+        return request(`users/${getCurrentUserId()}/removeTags`, {
+            method: 'POST',
+            params
+        }).then((json) => {
            const args = {
                json,
                params
            };
-            window.API.$emit('USER:CURRENT:SAVE', args);
+            userStore.applyCurrentUser(json);
            return args;
        });
    },
@@ -116,7 +127,7 @@ const userReq = {
     * @returns {Promise<{json: any, params}>}
     */
    getUserFeedback(params) {
-        return window.API.call(`users/${params.userId}/feedback`, {
+        return request(`users/${params.userId}/feedback`, {
            method: 'GET',
            params: {
                n: 100
@@ -126,7 +137,6 @@ const userReq = {
                json,
                params
            };
-            // window.API.$emit('USER:FEEDBACK', args);
            return args;
        });
    },
@@ -144,15 +154,16 @@ const userReq = {
     * @returns {Promise<{json: any, params}>}
     */
    saveCurrentUser(params) {
-        return window.API.call(`users/${window.API.currentUser.id}`, {
+        const userStore = useUserStore();
+        return request(`users/${getCurrentUserId()}`, {
            method: 'PUT',
            params
        }).then((json) => {
-            var args = {
+            const args = {
                json,
                params
            };
-            window.API.$emit('USER:CURRENT:SAVE', args);
+            userStore.applyCurrentUser(json);
            return args;
        });
    },
@@ -162,7 +173,7 @@ const userReq = {
     * @returns {Promise<{json: any, params}>}
     */
    getUserNotes(params) {
-        return window.API.call(`userNotes`, {
+        return request(`userNotes`, {
            method: 'GET',
            params
        }).then((json) => {
@@ -170,11 +181,9 @@ const userReq = {
                json,
                params
            };
-            // window.API.$emit('USER:NOTES', args);
            return args;
        });
    }
 };
-// #endregion

 export default userReq;