refactor queryRequest

src/stores/instance.js

@@ -23,8 +23,8 @@ import {
     replaceBioSymbols
 } from '../shared/utils';
 import {
-    groupRequest,
     instanceRequest,
+    queryRequest,
     userRequest,
     worldRequest
 } from '../api';
@@ -33,7 +33,6 @@ import {
     instanceContentSettings
 } from '../shared/constants';
 import { database } from '../service/database';
-import { patchInstanceFromEvent } from '../queries';
 import { resolveRef } from '../shared/utils/resolveRef';
 import { useAppearanceSettingsStore } from './settings/appearance';
 import { useFriendStore } from './friend';
@@ -246,7 +245,7 @@ export const useInstanceStore = defineStore('Instance', () => {
             emptyDefault: { id: '', displayName: '' },
             idAlias: 'userId',
             nameKey: 'displayName',
-            fetchFn: (id) => userRequest.getCachedUser({ userId: id })
+            fetchFn: (id) => queryRequest.fetch('user', { userId: id })
         });
     }
 
@@ -259,7 +258,7 @@ export const useInstanceStore = defineStore('Instance', () => {
             emptyDefault: { id: '', name: '' },
             idAlias: 'worldId',
             nameKey: 'name',
-            fetchFn: (id) => worldRequest.getCachedWorld({ worldId: id })
+            fetchFn: (id) => queryRequest.fetch('world', { worldId: id })
         });
     }
 
@@ -272,7 +271,7 @@ export const useInstanceStore = defineStore('Instance', () => {
             emptyDefault: { id: '', name: '' },
             idAlias: 'groupId',
             nameKey: 'name',
-            fetchFn: (id) => groupRequest.getCachedGroup({ groupId: id })
+            fetchFn: (id) => queryRequest.fetch('group', { groupId: id })
         });
     }
 
@@ -340,8 +339,8 @@ export const useInstanceStore = defineStore('Instance', () => {
                 location.worldId &&
                 !worldStore.cachedWorlds.get(location.worldId)?.name
             ) {
-                worldRequest
-                    .getCachedWorld({ worldId: location.worldId })
+                queryRequest
+                    .fetch('world', { worldId: location.worldId })
                     .then((args) => {
                         uiStore.setDialogCrumbLabel(
                             'previous-instances-info',
@@ -467,8 +466,8 @@ export const useInstanceStore = defineStore('Instance', () => {
                     console.error('Error fetching world data:', error);
                 });
         } else {
-            worldRequest
-                .getCachedWorld({
+            queryRequest
+                .fetch('world', {
                     worldId: currentInstanceLocation.value.worldId
                 })
                 .then((args) => {
@@ -537,8 +536,8 @@ export const useInstanceStore = defineStore('Instance', () => {
         }
         ref.$location = parseLocation(ref.location);
         if (ref.world?.id) {
-            worldRequest
-                .getCachedWorld({
+            queryRequest
+                .fetch('world', {
                     worldId: ref.world.id
                 })
                 .then((args) => {
@@ -577,7 +576,6 @@ export const useInstanceStore = defineStore('Instance', () => {
             }
         }
         lastInstanceApplied.value = ref.id;
-        patchInstanceFromEvent(ref);
         return ref;
     }
 
@@ -591,7 +589,7 @@ export const useInstanceStore = defineStore('Instance', () => {
         const L = parseLocation(location);
         if (L.isRealInstance && L.worldId && L.instanceId) {
             try {
-                const args = await instanceRequest.getCachedInstance({
+                const args = await instanceRequest.getInstance({
                     worldId: L.worldId,
                     instanceId: L.instanceId
                 });