refactor queryRequest

src/components/dialogs/AvatarDialog/SetAvatarStylesDialog.vue

@@ -90,8 +90,8 @@
     import { watch } from 'vue';
 
     import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../../ui/select';
+    import { avatarRequest, queryRequest } from '../../../api';
     import { arraysMatch } from '../../../shared/utils';
-    import { avatarRequest } from '../../../api';
     import { useAvatarStore } from '../../../stores';
 
     const props = defineProps({
@@ -133,7 +133,7 @@
      */
     async function getAvatarStyles() {
         try {
-            const ref = await avatarRequest.getAvailableAvatarStyles();
+            const ref = await queryRequest.fetch('avatarStyles');
             const styles = [];
             const stylesMap = new Map();
             for (const style of ref.json) {

src/components/dialogs/GroupDialog/GroupDialog.vue

@@ -408,6 +408,7 @@
     } from '../../../shared/utils';
     import { useGalleryStore, useGroupStore, useModalStore, useUserStore } from '../../../stores';
     import { groupRequest, queryRequest } from '../../../api';
+    import { queryKeys, refetchActiveEntityQuery } from '../../../queries';
     import { Badge } from '../../ui/badge';
     import { formatJsonVars } from '../../../shared/utils/base/ui';
 
@@ -497,8 +498,6 @@
         }
     );
 
-
-
     /**
      *
      * @param groupId
@@ -536,6 +535,7 @@
                     });
                     getGroupDialogGroup(groupId);
                 }
+                refetchActiveEntityQuery(queryKeys.representedGroup(currentUser.value.id));
             });
     }
 
@@ -604,8 +604,6 @@
      * @param gallery
      */
 
-
-
     /**
      *
      * @param id

src/components/dialogs/UserDialog/UserDialogFavoriteWorldsTab.vue

@@ -76,7 +76,7 @@
     import DeprecationAlert from '@/components/DeprecationAlert.vue';
 
     import { useFavoriteStore, useUserStore, useWorldStore } from '../../../stores';
-    import { queryRequest } from '../../../api';
+    import { favoriteRequest } from '../../../api';
 
     const { t } = useI18n();
 
@@ -121,7 +121,7 @@
         favoriteWorldsTab.value = '0';
         userDialog.value.userFavoriteWorlds = [];
         const worldLists = [];
-        const groupArgs = await queryRequest.fetch('favoriteGroups', {
+        const groupArgs = await favoriteRequest.getFavoriteGroups({
             ownerId: userId,
             n: 100,
             offset: 0
@@ -145,7 +145,7 @@
                 tag: list.name
             };
             try {
-                const args = await queryRequest.fetch('favoriteWorlds', params);
+                const args = await favoriteRequest.getFavoriteWorlds(params);
                 handleFavoriteWorldList(args);
                 return [list.displayName, list.visibility, args.json];
             } catch (err) {

src/components/dialogs/UserDialog/UserDialogInfoTab.vue

@@ -475,7 +475,6 @@
     import { storeToRefs } from 'pinia';
     import { toast } from 'vue-sonner';
     import { useI18n } from 'vue-i18n';
-    import InstanceActionBar from '../../InstanceActionBar.vue';
 
     import {
         copyToClipboard,
@@ -502,7 +501,9 @@
         useUserStore,
         useWorldStore
     } from '../../../stores';
-    import { miscRequest, userRequest } from '../../../api';
+    import { queryRequest, userRequest } from '../../../api';
+
+    import InstanceActionBar from '../../InstanceActionBar.vue';
 
     const EditNoteAndMemoDialog = defineAsyncComponent(() => import('./EditNoteAndMemoDialog.vue'));
 
@@ -681,7 +682,7 @@
      *
      */
     function getVRChatCredits() {
-        miscRequest.getVRChatCredits().then((args) => (vrchatCredit.value = args.json?.balance));
+        queryRequest.fetch('vrchatCredits').then((args) => (vrchatCredit.value = args.json?.balance));
     }
 
     defineExpose({

src/components/dialogs/UserDialog/__tests__/useUserDialogCommands.test.js

@@ -25,11 +25,7 @@ vi.mock('../../../../api', () => ({
         sendPlayerModeration: vi.fn(),
         deletePlayerModeration: vi.fn()
     },
-    worldRequest: {
-        getCachedWorld: vi.fn(() =>
-            Promise.resolve({ ref: { name: 'TestWorld' } })
-        )
-    }
+    worldRequest: {}
 }));
 
 vi.mock('../../../../shared/utils', () => ({