rename

src/App.vue

@@ -25,7 +25,7 @@
     import { Toaster } from './components/ui/sonner';
     import { TooltipProvider } from './components/ui/tooltip';
     import { createGlobalStores } from './stores';
-    import { initNoty } from './plugin/noty';
+    import { initNoty } from './plugins/noty';
     import { getGameLogTable } from './coordinators/gameLogCoordinator';
     import { runCheckVRChatDebugLoggingFlow } from './coordinators/gameCoordinator';
 

src/api/__tests__/entityQuerySync.test.js

@@ -7,7 +7,7 @@ const mockApplyCurrentUser = vi.fn((json) => ({ id: json.id || 'usr_me', ...json
 const mockApplyUser = vi.fn((json) => ({ ...json }));
 const mockApplyWorld = vi.fn((json) => ({ ...json }));
 
-vi.mock('../../service/request', () => ({
+vi.mock('../../services/request', () => ({
     request: (...args) => mockRequest(...args)
 }));
 

src/api/__tests__/favoriteQuerySync.test.js

@@ -6,7 +6,7 @@ const mockHandleFavoriteAdd = vi.fn();
 const mockHandleFavoriteDelete = vi.fn();
 const mockHandleFavoriteGroupClear = vi.fn();
 
-vi.mock('../../service/request', () => ({
+vi.mock('../../services/request', () => ({
     request: (...args) => mockRequest(...args)
 }));
 

src/api/__tests__/friendQuerySync.test.js

@@ -4,7 +4,7 @@ const mockRequest = vi.fn();
 const mockInvalidateQueries = vi.fn().mockResolvedValue();
 const mockApplyUser = vi.fn((json) => json);
 
-vi.mock('../../service/request', () => ({
+vi.mock('../../services/request', () => ({
     request: (...args) => mockRequest(...args)
 }));
 

src/api/__tests__/groupQuerySync.test.js

@@ -4,7 +4,7 @@ const mockRequest = vi.fn();
 const mockInvalidateQueries = vi.fn().mockResolvedValue();
 const mockApplyGroup = vi.fn((json) => json);
 
-vi.mock('../../service/request', () => ({
+vi.mock('../../services/request', () => ({
     request: (...args) => mockRequest(...args)
 }));
 

src/api/__tests__/mediaQuerySync.test.js

@@ -4,7 +4,7 @@ const mockRequest = vi.fn();
 const mockInvalidateQueries = vi.fn().mockResolvedValue();
 const mockRemoveQueries = vi.fn();
 
-vi.mock('../../service/request', () => ({
+vi.mock('../../services/request', () => ({
     request: (...args) => mockRequest(...args)
 }));
 

src/api/auth.js

@@ -1,4 +1,4 @@
-import { request } from '../service/request';
+import { request } from '../services/request';
 import { handleConfig } from '../coordinators/userCoordinator';
 
 const loginReq = {

src/api/avatar.js

@@ -1,5 +1,5 @@
 import { patchAndRefetchActiveQuery, queryKeys } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
 import { useUserStore } from '../stores';
 import { applyCurrentUser } from '../coordinators/userCoordinator';
 

src/api/avatarModeration.js

@@ -1,4 +1,4 @@
-import { request } from '../service/request';
+import { request } from '../services/request';
 
 const avatarModerationReq = {
     getAvatarModerations() {

src/api/favorite.js

@@ -5,7 +5,7 @@ import {
     handleFavoriteGroupClear
 } from '../coordinators/favoriteCoordinator';
 import { queryClient } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
 
 /**
  *

src/api/friend.js

@@ -1,5 +1,5 @@
 import { queryClient } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
 import { useUserStore } from '../stores/user';
 import { applyUser } from '../coordinators/userCoordinator';
 

src/api/group.js

@@ -1,7 +1,7 @@
 import { useUserStore } from '../stores';
 import { applyGroup } from '../coordinators/groupCoordinator';
 import { queryClient } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
 
 /**
  *

src/api/image.js

@@ -1,6 +1,6 @@
 import { useAvatarStore, useWorldStore } from '../stores';
 import { applyWorld } from '../coordinators/worldCoordinator';
-import { request } from '../service/request';
+import { request } from '../services/request';
 
 const imageReq = {
     async uploadAvatarFailCleanup(id) {

src/api/index.js

@@ -3,7 +3,7 @@
  * Export all API requests from here
  */
 
-import { request } from '../service/request';
+import { request } from '../services/request';
 
 import authRequest from './auth';
 import avatarModerationRequest from './avatarModeration';

src/api/instance.js

@@ -1,7 +1,7 @@
 import { toast } from 'vue-sonner';
 
-import { i18n } from '../plugin/i18n';
-import { request } from '../service/request';
+import { i18n } from '../plugins/i18n';
+import { request } from '../services/request';
 import { useInstanceStore } from '../stores';
 
 const instanceReq = {

src/api/inventory.js

@@ -1,5 +1,5 @@
 import { queryClient } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
 
 /**
  *

src/api/inviteMessages.js

@@ -1,4 +1,4 @@
-import { request } from '../service/request';
+import { request } from '../services/request';
 import { useUserStore } from '../stores';
 
 function getCurrentUserId() {

src/api/misc.js

@@ -1,5 +1,5 @@
 import { queryClient, queryKeys } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
 import { useUserStore } from '../stores';
 
 /**

src/api/notification.js

@@ -1,4 +1,4 @@
-import { request } from '../service/request';
+import { request } from '../services/request';
 import { useGalleryStore } from '../stores';
 
 const notificationReq = {

src/api/playerModeration.js

@@ -1,4 +1,4 @@
-import { request } from '../service/request';
+import { request } from '../services/request';
 
 const playerModerationReq = {
     getPlayerModerations() {

src/api/prop.js

@@ -1,4 +1,4 @@
-import { request } from '../service/request';
+import { request } from '../services/request';
 
 const propReq = {
     /**

src/api/user.js

@@ -1,5 +1,5 @@
 import { patchAndRefetchActiveQuery, queryKeys } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
 import { useUserStore } from '../stores';
 import { applyUser, applyCurrentUser } from '../coordinators/userCoordinator';
 

src/api/vrcPlusIcon.js

@@ -1,5 +1,5 @@
 import { queryClient } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
 
 /**
  *

src/api/vrcPlusImage.js

@@ -1,5 +1,5 @@
 import { queryClient } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
 import { useUserStore } from '../stores';
 
 /**

src/api/world.js

@@ -1,5 +1,5 @@
 import { patchAndRefetchActiveQuery, queryKeys } from '../queries';
-import { request } from '../service/request';
+import { request } from '../services/request';
 import { applyWorld } from '../coordinators/worldCoordinator';
 
 const worldReq = {

src/app.js

@@ -7,7 +7,7 @@ import {
     initPlugins,
     initRouter,
     initSentry
-} from './plugin';
+} from './plugins';
 import { initPiniaPlugins, pinia } from './stores';
 import { queryClient } from './queries';
 

src/components/NavMenu.vue

@@ -399,7 +399,7 @@
     import { THEME_CONFIG, links, navDefinitions } from '../shared/constants';
     import { openExternalLink } from '../shared/utils';
 
-    import configRepository from '../service/config';
+    import configRepository from '../services/config';
 
     const CustomNavDialog = defineAsyncComponent(() => import('./dialogs/CustomNavDialog.vue'));
 

src/components/StatusBar.vue

@@ -284,7 +284,7 @@
     import { useIntervalFn, useNow } from '@vueuse/core';
     import { TooltipWrapper } from '@/components/ui/tooltip';
     import { useI18n } from 'vue-i18n';
-    import { wsState } from '@/service/websocket';
+    import { wsState } from '@/services/websocket';
 
     import dayjs from 'dayjs';
     import timezone from 'dayjs/plugin/timezone';
@@ -299,7 +299,7 @@
         parseClockOffset
     } from './statusBarUtils';
 
-    import configRepository from '../service/config';
+    import configRepository from '../services/config';
 
     dayjs.extend(utc);
     dayjs.extend(timezone);

src/components/__tests__/AvatarInfo.test.js

@@ -13,7 +13,7 @@ vi.mock('../../views/Feed/Feed.vue', () => ({
 vi.mock('../../views/Feed/columns.jsx', () => ({
     columns: []
 }));
-vi.mock('../../plugin/router', () => ({
+vi.mock('../../plugins/router', () => ({
     router: {
         beforeEach: vi.fn(),
         push: vi.fn(),
@@ -34,10 +34,10 @@ vi.mock('vue-router', async (importOriginal) => {
         }))
     };
 });
-vi.mock('../../plugin/interopApi', () => ({
+vi.mock('../../plugins/interopApi', () => ({
     initInteropApi: vi.fn()
 }));
-vi.mock('../../service/database', () => ({
+vi.mock('../../services/database', () => ({
     database: new Proxy(
         {},
         {
@@ -48,7 +48,7 @@ vi.mock('../../service/database', () => ({
         }
     )
 }));
-vi.mock('../../service/config', () => ({
+vi.mock('../../services/config', () => ({
     default: {
         init: vi.fn(),
         getString: vi
@@ -74,10 +74,10 @@ vi.mock('../../service/config', () => ({
         remove: vi.fn()
     }
 }));
-vi.mock('../../service/jsonStorage', () => ({
+vi.mock('../../services/jsonStorage', () => ({
     default: vi.fn()
 }));
-vi.mock('../../service/watchState', () => ({
+vi.mock('../../services/watchState', () => ({
     watchState: { isLoggedIn: false }
 }));
 

src/components/__tests__/Location.test.js

@@ -16,7 +16,7 @@ vi.mock('../../views/Feed/Feed.vue', () => ({
 vi.mock('../../views/Feed/columns.jsx', () => ({
     columns: []
 }));
-vi.mock('../../plugin/router', () => ({
+vi.mock('../../plugins/router', () => ({
     router: {
         beforeEach: vi.fn(),
         push: vi.fn(),
@@ -39,11 +39,11 @@ vi.mock('vue-router', async (importOriginal) => {
     };
 });
 
-vi.mock('../../plugin/interopApi', () => ({
+vi.mock('../../plugins/interopApi', () => ({
     initInteropApi: vi.fn()
 }));
 
-vi.mock('../../service/database', () => ({
+vi.mock('../../services/database', () => ({
     database: new Proxy(
         {},
         {
@@ -55,7 +55,7 @@ vi.mock('../../service/database', () => ({
     )
 }));
 
-vi.mock('../../service/config', () => ({
+vi.mock('../../services/config', () => ({
     default: {
         init: vi.fn(),
         getString: vi
@@ -81,10 +81,10 @@ vi.mock('../../service/config', () => ({
         remove: vi.fn()
     }
 }));
-vi.mock('../../service/jsonStorage', () => ({
+vi.mock('../../services/jsonStorage', () => ({
     default: vi.fn()
 }));
-vi.mock('../../service/watchState', () => ({
+vi.mock('../../services/watchState', () => ({
     watchState: { isLoggedIn: false }
 }));
 

src/components/__tests__/OtpDialogModal.test.js

@@ -12,7 +12,7 @@ vi.mock('../../views/Feed/Feed.vue', () => ({
     default: { template: '<div />' }
 }));
 vi.mock('../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../plugin/router', () => ({
+vi.mock('../../plugins/router', () => ({
     router: {
         beforeEach: vi.fn(),
         push: vi.fn(),
@@ -33,8 +33,8 @@ vi.mock('vue-router', async (importOriginal) => {
         }))
     };
 });
-vi.mock('../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../service/database', () => ({
+vi.mock('../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../services/database', () => ({
     database: new Proxy(
         {},
         {
@@ -45,7 +45,7 @@ vi.mock('../../service/database', () => ({
         }
     )
 }));
-vi.mock('../../service/config', () => ({
+vi.mock('../../services/config', () => ({
     default: {
         init: vi.fn(),
         getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -63,8 +63,8 @@ vi.mock('../../service/config', () => ({
         remove: vi.fn()
     }
 }));
-vi.mock('../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../service/watchState', () => ({
+vi.mock('../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../services/watchState', () => ({
     watchState: { isLoggedIn: false }
 }));
 

src/components/__tests__/StatusBar.test.js

@@ -9,7 +9,7 @@ import en from '../../localization/en.json';
 
 // --- Mocks ---
 
-vi.mock('../../service/config', () => ({
+vi.mock('../../services/config', () => ({
     default: {
         init: vi.fn(),
         getString: vi
@@ -36,14 +36,14 @@ vi.mock('../../service/config', () => ({
     }
 }));
 
-vi.mock('../../service/websocket', () => ({
+vi.mock('../../services/websocket', () => ({
     wsState: { connected: false, messageCount: 0, bytesReceived: 0 },
     initWebsocket: vi.fn(),
     closeWebSocket: vi.fn(),
     reconnectWebSocket: vi.fn()
 }));
 
-vi.mock('../../service/webapi', () => ({
+vi.mock('../../services/webapi', () => ({
     default: {
         execute: vi.fn().mockResolvedValue({
             status: 200,
@@ -62,13 +62,13 @@ vi.mock('worker-timers', () => ({
     clearTimeout: vi.fn()
 }));
 
-vi.mock('../../service/jsonStorage', () => ({
+vi.mock('../../services/jsonStorage', () => ({
     default: vi.fn()
 }));
-vi.mock('../../service/watchState', () => ({
+vi.mock('../../services/watchState', () => ({
     watchState: { isLoggedIn: false }
 }));
-vi.mock('../../service/database', () => ({
+vi.mock('../../services/database', () => ({
     database: new Proxy(
         {},
         {
@@ -79,7 +79,7 @@ vi.mock('../../service/database', () => ({
         }
     )
 }));
-vi.mock('../../plugin/router', () => ({
+vi.mock('../../plugins/router', () => ({
     router: {
         beforeEach: vi.fn(),
         push: vi.fn(),
@@ -100,7 +100,7 @@ vi.mock('vue-router', async (importOriginal) => {
         }))
     };
 });
-vi.mock('../../plugin/interopApi', () => ({
+vi.mock('../../plugins/interopApi', () => ({
     initInteropApi: vi.fn()
 }));
 

src/components/dialogs/AvatarDialog/AvatarDialog.vue

@@ -597,7 +597,7 @@
     } from '../../ui/dropdown-menu';
     import { Badge } from '../../ui/badge';
     import { avatarRequest } from '../../../api';
-    import { database } from '../../../service/database';
+    import { database } from '../../../services/database';
     import { formatJsonVars } from '../../../shared/utils/base/ui';
     import { handleImageUploadInput } from '../../../shared/utils/imageUpload';
     import { runDeleteVRChatCacheFlow as deleteVRChatCache } from '../../../coordinators/gameCoordinator';

src/components/dialogs/GroupDialog/__tests__/GroupDialogPhotosTab.test.js

@@ -15,7 +15,7 @@ vi.mock('vue-i18n', () => ({
     })
 }));
 
-vi.mock('../../../../plugin/router', () => {
+vi.mock('../../../../plugins/router', () => {
     const { ref } = require('vue');
     return {
         router: {
@@ -40,8 +40,8 @@ vi.mock('vue-router', async (importOriginal) => {
         }))
     };
 });
-vi.mock('../../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../../services/database', () => ({
     database: new Proxy(
         {},
         {
@@ -52,7 +52,7 @@ vi.mock('../../../../service/database', () => ({
         }
     )
 }));
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
     default: {
         init: vi.fn(),
         getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -70,11 +70,11 @@ vi.mock('../../../../service/config', () => ({
         remove: vi.fn()
     }
 }));
-vi.mock('../../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../../service/watchState', () => ({
+vi.mock('../../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../../services/watchState', () => ({
     watchState: { isLoggedIn: false }
 }));
-vi.mock('../../../../service/request', () => ({
+vi.mock('../../../../services/request', () => ({
     request: vi.fn().mockResolvedValue({ json: {} }),
     processBulk: vi.fn(),
     buildRequestInit: vi.fn(),

src/components/dialogs/GroupDialog/__tests__/GroupDialogPostsTab.test.js

@@ -19,7 +19,7 @@ vi.mock('vue-i18n', () => {
     };
 });
 
-vi.mock('../../../../plugin/router', () => {
+vi.mock('../../../../plugins/router', () => {
     const { ref } = require('vue');
     return {
         router: {
@@ -44,8 +44,8 @@ vi.mock('vue-router', async (importOriginal) => {
         }))
     };
 });
-vi.mock('../../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../../services/database', () => ({
     database: new Proxy(
         {},
         {
@@ -56,7 +56,7 @@ vi.mock('../../../../service/database', () => ({
         }
     )
 }));
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
     default: {
         init: vi.fn(),
         getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -74,11 +74,11 @@ vi.mock('../../../../service/config', () => ({
         remove: vi.fn()
     }
 }));
-vi.mock('../../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../../service/watchState', () => ({
+vi.mock('../../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../../services/watchState', () => ({
     watchState: { isLoggedIn: false }
 }));
-vi.mock('../../../../service/request', () => ({
+vi.mock('../../../../services/request', () => ({
     request: vi.fn().mockResolvedValue({ json: {} }),
     processBulk: vi.fn(),
     buildRequestInit: vi.fn(),

src/components/dialogs/GroupDialog/__tests__/useGroupMembers.test.js

@@ -10,7 +10,7 @@ vi.mock('../../../../api', () => ({
     },
     userRequest: {}
 }));
-vi.mock('../../../../plugin/router', () => {
+vi.mock('../../../../plugins/router', () => {
     const { ref } = require('vue');
     return {
         router: {
@@ -35,8 +35,8 @@ vi.mock('vue-router', async (importOriginal) => {
         }))
     };
 });
-vi.mock('../../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../../services/database', () => ({
     database: new Proxy(
         {},
         {
@@ -47,7 +47,7 @@ vi.mock('../../../../service/database', () => ({
         }
     )
 }));
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
     default: {
         init: vi.fn(),
         getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -65,11 +65,11 @@ vi.mock('../../../../service/config', () => ({
         remove: vi.fn()
     }
 }));
-vi.mock('../../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../../service/watchState', () => ({
+vi.mock('../../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../../services/watchState', () => ({
     watchState: { isLoggedIn: false }
 }));
-vi.mock('../../../../service/request', () => ({
+vi.mock('../../../../services/request', () => ({
     request: vi.fn().mockResolvedValue({ json: {} }),
     processBulk: vi.fn(),
     buildRequestInit: vi.fn(),

src/components/dialogs/GroupDialog/__tests__/useGroupModerationData.test.js

@@ -13,7 +13,7 @@ vi.mock('vue-i18n', () => ({
         install: vi.fn()
     })
 }));
-vi.mock('../../../../plugin/router', () => {
+vi.mock('../../../../plugins/router', () => {
     const { ref: vRef } = require('vue');
     return {
         router: {
@@ -38,8 +38,8 @@ vi.mock('vue-router', async (importOriginal) => {
         }))
     };
 });
-vi.mock('../../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../../services/database', () => ({
     database: new Proxy(
         {},
         {
@@ -50,7 +50,7 @@ vi.mock('../../../../service/database', () => ({
         }
     )
 }));
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
     default: {
         init: vi.fn(),
         getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -68,11 +68,11 @@ vi.mock('../../../../service/config', () => ({
         remove: vi.fn()
     }
 }));
-vi.mock('../../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../../service/watchState', () => ({
+vi.mock('../../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../../services/watchState', () => ({
     watchState: { isLoggedIn: false }
 }));
-vi.mock('../../../../service/request', () => ({
+vi.mock('../../../../services/request', () => ({
     request: vi.fn().mockResolvedValue({ json: {} }),
     processBulk: vi.fn(),
     buildRequestInit: vi.fn(),

src/components/dialogs/GroupDialog/groupMemberModerationBansColumns.jsx

@@ -1,5 +1,5 @@
 import { Checkbox } from '@/components/ui/checkbox';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
 import { formatDateFilter } from '@/shared/utils';
 import { Button } from '@/components/ui/button';
 import { ArrowUpDown } from 'lucide-vue-next';

src/components/dialogs/GroupDialog/groupMemberModerationBlockedColumns.jsx

@@ -1,5 +1,5 @@
 import { Checkbox } from '@/components/ui/checkbox';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
 import { ArrowUpDown } from 'lucide-vue-next';
 import { Button } from '@/components/ui/button';
 

src/components/dialogs/GroupDialog/groupMemberModerationInvitesColumns.jsx

@@ -1,5 +1,5 @@
 import { Checkbox } from '@/components/ui/checkbox';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
 import { ArrowUpDown } from 'lucide-vue-next';
 import { Button } from '@/components/ui/button';
 

src/components/dialogs/GroupDialog/groupMemberModerationJoinRequestsColumns.jsx

@@ -1,5 +1,5 @@
 import { Checkbox } from '@/components/ui/checkbox';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
 import { ArrowUpDown } from 'lucide-vue-next';
 import { Button } from '@/components/ui/button';
 

src/components/dialogs/GroupDialog/groupMemberModerationLogsColumns.jsx

@@ -1,5 +1,5 @@
 import Location from '@/components/Location.vue';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
 import { formatDateFilter } from '@/shared/utils';
 import { ArrowUpDown } from 'lucide-vue-next';
 import { Button } from '@/components/ui/button';

src/components/dialogs/GroupDialog/groupMemberModerationMembersColumns.jsx

@@ -1,5 +1,5 @@
 import { Checkbox } from '@/components/ui/checkbox';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
 import { formatDateFilter } from '@/shared/utils';
 import { ArrowUpDown } from 'lucide-vue-next';
 import { Button } from '@/components/ui/button';

src/components/dialogs/InviteDialog/sendInviteColumns.jsx

@@ -1,6 +1,6 @@
 import CountdownTimer from '@/components/CountdownTimer.vue';
 import { Button } from '@/components/ui/button';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
 import { SquarePen } from 'lucide-vue-next';
 
 const { t } = i18n.global;

src/components/dialogs/InviteGroupDialog.vue

@@ -101,7 +101,7 @@
     import { groupRequest, queryRequest } from '../../api';
     import { VirtualCombobox } from '../ui/virtual-combobox';
 
-    import configRepository from '../../service/config';
+    import configRepository from '../../services/config';
 
     const { vipFriends, onlineFriends, activeFriends, offlineFriends } = storeToRefs(useFriendStore());
     const { currentUserGroups, inviteGroupDialog } = storeToRefs(useGroupStore());

src/components/dialogs/LaunchDialog.vue

@@ -165,7 +165,7 @@
     import { instanceRequest, queryRequest } from '../../api';
 
     import InviteDialog from './InviteDialog/InviteDialog.vue';
-    import configRepository from '../../service/config';
+    import configRepository from '../../services/config';
 
     const { t } = useI18n();
 

src/components/dialogs/NewInstanceDialog.vue

@@ -585,7 +585,7 @@
     import { VirtualCombobox } from '../ui/virtual-combobox';
 
     import InviteDialog from './InviteDialog/InviteDialog.vue';
-    import configRepository from '../../service/config';
+    import configRepository from '../../services/config';
 
     const props = defineProps({
         newInstanceDialogLocationTag: {

src/components/dialogs/PreviousInstancesDialog/PreviousInstancesInfoDialog.vue

@@ -41,7 +41,7 @@
     import { DataTableLayout } from '../../ui/data-table';
     import { InputGroupField } from '../../../components/ui/input-group';
     import { createColumns } from './previousInstancesInfoColumns.jsx';
-    import { database } from '../../../service/database';
+    import { database } from '../../../services/database';
     import { useVrcxVueTable } from '../../../lib/table/useVrcxVueTable';
 import { lookupUser } from '../../../coordinators/userCoordinator';
 

src/components/dialogs/PreviousInstancesDialog/PreviousInstancesListDialog.vue

@@ -56,7 +56,7 @@
     } from '../../../shared/utils';
     import { DataTableLayout } from '../../ui/data-table';
     import { createPreviousInstancesColumns } from './previousInstancesColumns.jsx';
-    import { database } from '../../../service/database';
+    import { database } from '../../../services/database';
     import { useVrcxVueTable } from '../../../lib/table/useVrcxVueTable';
 
     const props = defineProps({

src/components/dialogs/PreviousInstancesDialog/previousInstancesColumns.jsx

@@ -4,7 +4,7 @@ import DisplayName from '../../DisplayName.vue';
 import Location from '../../Location.vue';
 import LocationWorld from '../../LocationWorld.vue';
 import { Button } from '../../ui/button';
-import { i18n } from '../../../plugin';
+import { i18n } from '../../../plugins';
 import { formatDateFilter } from '../../../shared/utils';
 
 const { t } = i18n.global;

src/components/dialogs/PreviousInstancesDialog/previousInstancesInfoColumns.jsx

@@ -1,7 +1,7 @@
 import { ArrowUpDown } from 'lucide-vue-next';
 
 import { Button } from '../../ui/button';
-import { i18n } from '../../../plugin';
+import { i18n } from '../../../plugins';
 import { formatDateFilter } from '../../../shared/utils';
 
 const { t } = i18n.global;

src/components/dialogs/UserDialog/UserDialogMutualFriendsTab.vue

@@ -67,8 +67,8 @@
         compareByLastActiveRef,
         userImage
     } from '../../../shared/utils';
-    import { database } from '../../../service/database';
-    import { processBulk } from '../../../service/request';
+    import { database } from '../../../services/database';
+    import { processBulk } from '../../../services/request';
     import { useOptionKeySelect } from '../../../composables/useOptionKeySelect';
     import { useUserStore } from '../../../stores';
     import { userDialogMutualFriendSortingOptions } from '../../../shared/constants';

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

@@ -19,7 +19,7 @@ vi.mock('vue-i18n', () => {
     };
 });
 
-vi.mock('../../../../plugin/router', () => {
+vi.mock('../../../../plugins/router', () => {
     const { ref } = require('vue');
     return {
         router: {
@@ -44,8 +44,8 @@ vi.mock('vue-router', async (importOriginal) => {
         }))
     };
 });
-vi.mock('../../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../../services/database', () => ({
     database: new Proxy(
         {},
         {
@@ -56,7 +56,7 @@ vi.mock('../../../../service/database', () => ({
         }
     )
 }));
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
     default: {
         init: vi.fn(),
         getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -74,8 +74,8 @@ vi.mock('../../../../service/config', () => ({
         remove: vi.fn()
     }
 }));
-vi.mock('../../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../../service/watchState', () => ({
+vi.mock('../../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../../services/watchState', () => ({
     watchState: { isLoggedIn: false }
 }));
 

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

@@ -16,7 +16,7 @@ vi.mock('vue-i18n', () => ({
     })
 }));
 
-vi.mock('../../../../plugin/router', () => {
+vi.mock('../../../../plugins/router', () => {
     const { ref } = require('vue');
     return {
         router: {
@@ -43,8 +43,8 @@ vi.mock('vue-router', async (importOriginal) => {
     };
 });
 
-vi.mock('../../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../../services/database', () => ({
     database: new Proxy(
         {},
         {
@@ -56,7 +56,7 @@ vi.mock('../../../../service/database', () => ({
     )
 }));
 
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
     default: {
         init: vi.fn(),
         getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -75,11 +75,11 @@ vi.mock('../../../../service/config', () => ({
     }
 }));
 
-vi.mock('../../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../../service/watchState', () => ({
+vi.mock('../../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../../services/watchState', () => ({
     watchState: { isLoggedIn: false }
 }));
-vi.mock('../../../../service/request', () => ({
+vi.mock('../../../../services/request', () => ({
     request: vi.fn().mockResolvedValue({ json: {} }),
     processBulk: vi.fn(),
     buildRequestInit: vi.fn(),

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

@@ -15,7 +15,7 @@ vi.mock('vue-i18n', () => ({
     })
 }));
 
-vi.mock('../../../../plugin/router', () => {
+vi.mock('../../../../plugins/router', () => {
     const { ref } = require('vue');
     return {
         router: {
@@ -40,8 +40,8 @@ vi.mock('vue-router', async (importOriginal) => {
         }))
     };
 });
-vi.mock('../../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../../services/database', () => ({
     database: new Proxy(
         {},
         {
@@ -52,7 +52,7 @@ vi.mock('../../../../service/database', () => ({
         }
     )
 }));
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
     default: {
         init: vi.fn(),
         getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -70,11 +70,11 @@ vi.mock('../../../../service/config', () => ({
         remove: vi.fn()
     }
 }));
-vi.mock('../../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../../service/watchState', () => ({
+vi.mock('../../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../../services/watchState', () => ({
     watchState: { isLoggedIn: false }
 }));
-vi.mock('../../../../service/request', () => ({
+vi.mock('../../../../services/request', () => ({
     request: vi.fn().mockResolvedValue({ json: {} }),
     processBulk: vi.fn(),
     buildRequestInit: vi.fn(),

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

@@ -19,7 +19,7 @@ vi.mock('vue-i18n', () => {
     };
 });
 
-vi.mock('../../../../plugin/router', () => {
+vi.mock('../../../../plugins/router', () => {
     const { ref } = require('vue');
     return {
         router: {
@@ -44,8 +44,8 @@ vi.mock('vue-router', async (importOriginal) => {
         }))
     };
 });
-vi.mock('../../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../../services/database', () => ({
     database: new Proxy(
         {},
         {
@@ -56,7 +56,7 @@ vi.mock('../../../../service/database', () => ({
         }
     )
 }));
-vi.mock('../../../../service/config', () => ({
+vi.mock('../../../../services/config', () => ({
     default: {
         init: vi.fn(),
         getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -74,11 +74,11 @@ vi.mock('../../../../service/config', () => ({
         remove: vi.fn()
     }
 }));
-vi.mock('../../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../../service/watchState', () => ({
+vi.mock('../../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../../services/watchState', () => ({
     watchState: { isLoggedIn: false }
 }));
-vi.mock('../../../../service/request', () => ({
+vi.mock('../../../../services/request', () => ({
     request: vi.fn().mockResolvedValue({ json: {} }),
     processBulk: vi.fn(),
     buildRequestInit: vi.fn(),

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

@@ -33,7 +33,7 @@ vi.mock('../../../../shared/utils', () => ({
     parseLocation: vi.fn(() => ({ worldId: 'wrld_test', tag: 'wrld_test~123' }))
 }));
 
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../services/database', () => ({
     database: {
         addFriendLogHistory: vi.fn()
     }
@@ -48,7 +48,7 @@ const {
     playerModerationRequest,
     miscRequest
 } = await import('../../../../api');
-const { database } = await import('../../../../service/database');
+const { database } = await import('../../../../services/database');
 
 function createMockUserDialog() {
     return ref({

src/components/dialogs/UserDialog/sendInviteRequestColumns.jsx

@@ -1,6 +1,6 @@
 import CountdownTimer from '@/components/CountdownTimer.vue';
 import { Button } from '@/components/ui/button';
-import { i18n } from '@/plugin';
+import { i18n } from '@/plugins';
 import { SquarePen } from 'lucide-vue-next';
 
 const { t } = i18n.global;

src/components/dialogs/UserDialog/useUserDialogCommands.js

@@ -9,7 +9,7 @@ import {
     queryRequest
 } from '../../../api';
 import { copyToClipboard, parseLocation } from '../../../shared/utils';
-import { database } from '../../../service/database';
+import { database } from '../../../services/database';
 
 /**
  * Composable for UserDialog command dispatch.

src/components/dialogs/WorldDialog/__tests__/useWorldDialogInfo.test.js

@@ -9,14 +9,14 @@ vi.mock('../../../../shared/utils', () => ({
     timeToText: vi.fn((ms) => `${Math.floor(ms / 1000)}s`)
 }));
 
-vi.mock('../../../../service/database', () => ({
+vi.mock('../../../../services/database', () => ({
     database: {
         setWorldMemo: vi.fn(),
         deleteWorldMemo: vi.fn()
     }
 }));
 
-const { database } = await import('../../../../service/database');
+const { database } = await import('../../../../services/database');
 const { compareUnityVersion } = await import('../../../../shared/utils');
 
 /**

src/components/dialogs/WorldDialog/useWorldDialogInfo.js

@@ -5,7 +5,7 @@ import {
     formatDateFilter,
     timeToText
 } from '../../../shared/utils';
-import { database } from '../../../service/database';
+import { database } from '../../../services/database';
 
 /**
  * Composable for WorldDialogInfoTab computed properties and actions.

src/components/dialogs/__tests__/DialogJsonTab.test.js

@@ -26,7 +26,7 @@ vi.mock('../../../views/Feed/Feed.vue', () => ({
     default: { template: '<div />' }
 }));
 vi.mock('../../../views/Feed/columns.jsx', () => ({ columns: [] }));
-vi.mock('../../../plugin/router', () => ({
+vi.mock('../../../plugins/router', () => ({
     router: {
         beforeEach: vi.fn(),
         push: vi.fn(),
@@ -47,8 +47,8 @@ vi.mock('vue-router', async (importOriginal) => {
         }))
     };
 });
-vi.mock('../../../plugin/interopApi', () => ({ initInteropApi: vi.fn() }));
-vi.mock('../../../service/database', () => ({
+vi.mock('../../../plugins/interopApi', () => ({ initInteropApi: vi.fn() }));
+vi.mock('../../../services/database', () => ({
     database: new Proxy(
         {},
         {
@@ -59,7 +59,7 @@ vi.mock('../../../service/database', () => ({
         }
     )
 }));
-vi.mock('../../../service/config', () => ({
+vi.mock('../../../services/config', () => ({
     default: {
         init: vi.fn(),
         getString: vi.fn().mockImplementation((_k, d) => d ?? '{}'),
@@ -77,8 +77,8 @@ vi.mock('../../../service/config', () => ({
         remove: vi.fn()
     }
 }));
-vi.mock('../../../service/jsonStorage', () => ({ default: vi.fn() }));
-vi.mock('../../../service/watchState', () => ({
+vi.mock('../../../services/jsonStorage', () => ({ default: vi.fn() }));
+vi.mock('../../../services/watchState', () => ({
     watchState: { isLoggedIn: false }
 }));
 

src/coordinators/authAutoLoginCoordinator.js

@@ -1,7 +1,7 @@
 import { toast } from 'vue-sonner';
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
 
-import { AppDebug } from '../service/appConfig';
+import { AppDebug } from '../services/appConfig';
 import { useAdvancedSettingsStore } from '../stores/settings/advanced';
 import { useAuthStore } from '../stores/auth';
 

src/coordinators/authCoordinator.js

@@ -1,8 +1,8 @@
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
 
 import Noty from 'noty';
 
-import { closeWebSocket, initWebsocket } from '../service/websocket';
+import { closeWebSocket, initWebsocket } from '../services/websocket';
 import { escapeTag } from '../shared/utils';
 import { queryClient } from '../queries';
 import { useAuthStore } from '../stores/auth';
@@ -10,10 +10,10 @@ import { useNotificationStore } from '../stores/notification';
 import { useUpdateLoopStore } from '../stores/updateLoop';
 import { useUserStore } from '../stores/user';
 import { applyCurrentUser } from './userCoordinator';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
 
-import configRepository from '../service/config';
-import webApiService from '../service/webapi';
+import configRepository from '../services/config';
+import webApiService from '../services/webapi';
 
 /**
  * Runs the shared logout side effects (including goodbye notification).

src/coordinators/avatarCoordinator.js

@@ -1,6 +1,6 @@
 import { nextTick } from 'vue';
 import { toast } from 'vue-sonner';
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
 
 import {
     createDefaultAvatarRef,
@@ -13,10 +13,10 @@ import {
     storeAvatarImage
 } from '../shared/utils';
 import { avatarRequest, miscRequest, queryRequest } from '../api';
-import { AppDebug } from '../service/appConfig';
-import { database } from '../service/database';
+import { AppDebug } from '../services/appConfig';
+import { database } from '../services/database';
 import { patchAvatarFromEvent } from '../queries';
-import { processBulk } from '../service/request';
+import { processBulk } from '../services/request';
 import { applyFavorite } from './favoriteCoordinator';
 import { refreshUserDialogAvatars, showUserDialog } from './userCoordinator';
 import { useAdvancedSettingsStore } from '../stores/settings/advanced';
@@ -28,7 +28,7 @@ import { useUiStore } from '../stores/ui';
 import { useUserStore } from '../stores/user';
 import { useVRCXUpdaterStore } from '../stores/vrcxUpdater';
 
-import webApiService from '../service/webapi';
+import webApiService from '../services/webapi';
 
 /**
  * @param {object} json

src/coordinators/favoriteCoordinator.js

@@ -10,10 +10,10 @@ import { useWorldStore } from '../stores/world';
 import { applyWorld } from './worldCoordinator';
 import { runUpdateFriendFlow } from './friendPresenceCoordinator';
 import { avatarRequest, favoriteRequest, queryRequest } from '../api';
-import { database } from '../service/database';
-import { i18n } from '../plugin/i18n';
-import { processBulk } from '../service/request';
-import { watchState } from '../service/watchState';
+import { database } from '../services/database';
+import { i18n } from '../plugins/i18n';
+import { processBulk } from '../services/request';
+import { watchState } from '../services/watchState';
 import {
     compareByName,
     createDefaultFavoriteCachedRef,

src/coordinators/friendPresenceCoordinator.js

@@ -1,13 +1,13 @@
 import { getGroupName, getWorldName, isRealInstance } from '../shared/utils';
-import { AppDebug } from '../service/appConfig';
-import { database } from '../service/database';
+import { AppDebug } from '../services/appConfig';
+import { database } from '../services/database';
 import { useFeedStore } from '../stores/feed';
 import { useFriendStore } from '../stores/friend';
 import { useNotificationStore } from '../stores/notification';
 import { useSharedFeedStore } from '../stores/sharedFeed';
 import { useUserStore } from '../stores/user';
 import { userRequest } from '../api';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
 
 /**
  * @param {object} ctx

src/coordinators/friendRelationshipCoordinator.js

@@ -1,6 +1,6 @@
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
 
-import { database } from '../service/database';
+import { database } from '../services/database';
 import { friendRequest, userRequest } from '../api';
 import { getNameColour } from '../shared/utils';
 import { handleFavoriteDelete } from './favoriteCoordinator';
@@ -12,9 +12,9 @@ import { useNotificationStore } from '../stores/notification';
 import { useSharedFeedStore } from '../stores/sharedFeed';
 import { useUiStore } from '../stores/ui';
 import { useUserStore } from '../stores/user';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
 
-import configRepository from '../service/config';
+import configRepository from '../services/config';
 
 /**
  * @param {object} args

src/coordinators/friendSyncCoordinator.js

@@ -1,16 +1,16 @@
 import { toast } from 'vue-sonner';
 
-import { AppDebug } from '../service/appConfig';
+import { AppDebug } from '../services/appConfig';
 import { migrateMemos } from '../shared/utils';
-import { reconnectWebSocket } from '../service/websocket';
+import { reconnectWebSocket } from '../services/websocket';
 import { useAuthStore } from '../stores/auth';
 import { useFriendStore } from '../stores/friend';
 import { useUpdateLoopStore } from '../stores/updateLoop';
 import { useUserStore } from '../stores/user';
 import { getCurrentUser } from './userCoordinator';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
 
-import configRepository from '../service/config';
+import configRepository from '../services/config';
 
 /**
  * Runs friend list refresh orchestration.

src/coordinators/gameCoordinator.js

@@ -4,7 +4,7 @@ import {
     deleteVRChatCache as _deleteVRChatCache,
     isRealInstance
 } from '../shared/utils';
-import { database } from '../service/database';
+import { database } from '../services/database';
 import { useAdvancedSettingsStore } from '../stores/settings/advanced';
 import { useAvatarStore } from '../stores/avatar';
 import { addAvatarWearTime } from './avatarCoordinator';
@@ -21,7 +21,7 @@ import { useUserStore } from '../stores/user';
 import { useVrStore } from '../stores/vr';
 import { useWorldStore } from '../stores/world';
 
-import configRepository from '../service/config';
+import configRepository from '../services/config';
 
 import * as workerTimers from 'worker-timers';
 

src/coordinators/gameLogCoordinator.js

@@ -11,13 +11,13 @@ import {
     parsePrintFromUrl,
     replaceBioSymbols
 } from '../shared/utils';
-import { i18n } from '../plugin/i18n';
-import { AppDebug } from '../service/appConfig';
-import { database } from '../service/database';
+import { i18n } from '../plugins/i18n';
+import { AppDebug } from '../services/appConfig';
+import { database } from '../services/database';
 import { runLastLocationResetFlow, runUpdateCurrentUserLocationFlow } from './locationCoordinator';
 import { getGroupName } from '../shared/utils';
 import { userRequest } from '../api';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
 import { toast } from 'vue-sonner';
 
 import { useAdvancedSettingsStore } from '../stores/settings/advanced';
@@ -36,7 +36,7 @@ import { useUserStore } from '../stores/user';
 import { useVrStore } from '../stores/vr';
 import { useVrcxStore } from '../stores/vrcx';
 
-import gameLogService from '../service/gameLog.js';
+import gameLogService from '../services/gameLog.js';
 
 import * as workerTimers from 'worker-timers';
 
@@ -579,4 +579,4 @@ export async function disableGameLogDialog() {
     }
 }
 
-import configRepository from '../service/config';
+import configRepository from '../services/config';

src/coordinators/groupCoordinator.js

@@ -1,6 +1,6 @@
 import { nextTick } from 'vue';
 import { toast } from 'vue-sonner';
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
 
 import {
     convertFileUrlToImageUrl,
@@ -9,7 +9,7 @@ import {
     replaceBioSymbols
 } from '../shared/utils';
 import { groupRequest, instanceRequest, queryRequest } from '../api';
-import { database } from '../service/database';
+import { database } from '../services/database';
 import { groupDialogFilterOptions } from '../shared/constants/';
 import { patchGroupFromEvent } from '../queries';
 import { useGameStore } from '../stores/game';
@@ -19,9 +19,9 @@ import { useNotificationStore } from '../stores/notification';
 import { useUiStore } from '../stores/ui';
 import { useUserStore } from '../stores/user';
 import { useGroupStore } from '../stores/group';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
 
-import configRepository from '../service/config';
+import configRepository from '../services/config';
 
 import * as workerTimers from 'worker-timers';
 

src/coordinators/inviteCoordinator.js

@@ -1,5 +1,5 @@
 import { toast } from 'vue-sonner';
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
 
 import { instanceRequest } from '../api';
 import { parseLocation } from '../shared/utils';

src/coordinators/locationCoordinator.js

@@ -4,7 +4,7 @@ import {
     isRealInstance,
     parseLocation
 } from '../shared/utils';
-import { database } from '../service/database';
+import { database } from '../services/database';
 import { useAdvancedSettingsStore } from '../stores/settings/advanced';
 import { useGameLogStore } from '../stores/gameLog';
 import { useGameStore } from '../stores/game';

src/coordinators/userCoordinator.js

@@ -1,6 +1,6 @@
 import { reactive } from 'vue';
 import { toast } from 'vue-sonner';
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
 
 import {
     arraysMatch,
@@ -22,11 +22,11 @@ import {
     queryRequest,
     userRequest
 } from '../api';
-import { processBulk, request } from '../service/request';
-import { AppDebug } from '../service/appConfig';
-import { database } from '../service/database';
+import { processBulk, request } from '../services/request';
+import { AppDebug } from '../services/appConfig';
+import { database } from '../services/database';
 import { patchUserFromEvent } from '../queries';
-import { watchState } from '../service/watchState';
+import { watchState } from '../services/watchState';
 import { applyAvatar, showAvatarDialog } from './avatarCoordinator';
 import { applyFavorite } from './favoriteCoordinator';
 import {

src/coordinators/userEventCoordinator.js

@@ -1,6 +1,6 @@
 import { getGroupName, getWorldName, parseLocation } from '../shared/utils';
-import { AppDebug } from '../service/appConfig';
-import { database } from '../service/database';
+import { AppDebug } from '../services/appConfig';
+import { database } from '../services/database';
 import { useAvatarStore } from '../stores/avatar';
 import { getAvatarName } from './avatarCoordinator';
 import { useFeedStore } from '../stores/feed';

src/coordinators/vrcxCoordinator.js

@@ -7,7 +7,7 @@ import { useInstanceStore } from '../stores/instance';
 import { useLocationStore } from '../stores/location';
 import { useUserStore } from '../stores/user';
 import { useWorldStore } from '../stores/world';
-import { failedGetRequests } from '../service/request';
+import { failedGetRequests } from '../services/request';
 
 /**
  * Clears caches across multiple stores while preserving data that is

src/coordinators/worldCoordinator.js

@@ -1,6 +1,6 @@
 import { nextTick } from 'vue';
 import { toast } from 'vue-sonner';
-import { i18n } from '../plugin/i18n';
+import { i18n } from '../plugins/i18n';
 
 import {
     checkVRChatCache,
@@ -14,9 +14,9 @@ import {
     sanitizeEntityJson
 } from '../shared/utils';
 import { instanceRequest, queryRequest, worldRequest } from '../api';
-import { database } from '../service/database';
+import { database } from '../services/database';
 import { patchWorldFromEvent } from '../queries';
-import { processBulk } from '../service/request';
+import { processBulk } from '../services/request';
 import { applyFavorite } from './favoriteCoordinator';
 import { useFavoriteStore } from '../stores/favorite';
 import { useInstanceStore } from '../stores/instance';

src/plugins/interopApi.js

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import InteropApi from '../ipc-electron/interopApi.js';
-import configRepository from '../service/config';
-import vrcxJsonStorage from '../service/jsonStorage';
+import configRepository from '../services/config.js';
+import vrcxJsonStorage from '../services/jsonStorage.js';
 
 export async function initInteropApi(isVrOverlay = false) {
     if (isVrOverlay) {

src/plugins/router.js

@@ -1,6 +1,6 @@
 import { createRouter, createWebHashHistory } from 'vue-router';
 
-import { watchState } from './../service/watchState';
+import { watchState } from '../services/watchState';
 
 import FavoritesAvatar from './../views/Favorites/FavoritesAvatar.vue';
 import FavoritesFriend from './../views/Favorites/FavoritesFriend.vue';

src/plugins/sentry.js

@@ -1,7 +1,7 @@
 import { router } from './router';
 import { startRendererMemoryThresholdReport } from './piniaActionTrail';
 
-import configRepository from '../service/config';
+import configRepository from '../services/config';
 
 export async function isSentryOptedIn() {
     return NIGHTLY && configRepository.getBool('VRCX_SentryEnabled', false);

src/plugins/ui.js

@@ -9,7 +9,7 @@ import {
 } from '../shared/utils/base/ui';
 import { i18n, loadLocalizedStrings } from './i18n';
 
-import configRepository from '../service/config';
+import configRepository from '../services/config';
 
 export async function initUi() {
     try {

src/services/__tests__/config.test.js

@@ -1,5 +1,5 @@
 // Mock router to avoid transitive i18n.global error from columns.jsx
-vi.mock('../../plugin/router.js', () => ({
+vi.mock('../../plugins/router.js', () => ({
     router: { beforeEach: vi.fn(), push: vi.fn() },
     initRouter: vi.fn()
 }));

src/services/__tests__/request.test.js

@@ -1,5 +1,5 @@
 // Mock router to avoid transitive i18n.global error from columns.jsx
-vi.mock('../../plugin/router.js', () => ({
+vi.mock('../../plugins/router.js', () => ({
     router: { beforeEach: vi.fn(), push: vi.fn() },
     initRouter: vi.fn()
 }));