src/services/api -> src/api

src/modules/api.js

@@ -1,6 +1,6 @@
 import { Socket } from 'phoenix'
 
-import { WSConnectionStatus } from '../services/api/public.js'
+import { WSConnectionStatus } from 'src/api/public.js'
 import { maybeShowChatNotification } from '../services/chat_utils/chat_utils.js'
 
 import { useInstanceStore } from 'src/stores/instance.js'
@@ -13,7 +13,7 @@ import {
   fetchTimeline,
   getMastodonSocketURI,
   ProcessedWS,
-} from 'src/services/api/public.js'
+} from 'src/api/public.js'
 import followRequestFetcher from 'src/services/follow_request_fetcher/follow_request_fetcher.service'
 import notificationsFetcher from 'src/services/notifications_fetcher/notifications_fetcher.service.js'
 import timelineFetcher from 'src/services/timeline_fetcher/timeline_fetcher.service.js'

src/modules/chats.js

@@ -11,7 +11,7 @@ import { promiseInterval } from '../services/promise_interval/promise_interval.j
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { chats, deleteChatMessage, readChat } from 'src/services/api/chats.js'
+import { chats, deleteChatMessage, readChat } from 'src/api/chats.js'
 
 const emptyChatList = () => ({
   data: [],

src/modules/notifications.js

@@ -1,4 +1,4 @@
-import { markNotificationsAsSeen } from '../services/api/user.js'
+import { markNotificationsAsSeen } from 'src/api/user.js'
 import {
   closeAllDesktopNotifications,
   closeDesktopNotification,
@@ -15,7 +15,7 @@ import { useOAuthStore } from 'src/stores/oauth.js'
 import { useReportsStore } from 'src/stores/reports.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
-import { dismissNotification } from 'src/services/api/user.js'
+import { dismissNotification } from 'src/api/user.js'
 
 const emptyNotifications = () => ({
   desktopNotificationSilence: true,

src/modules/profileConfig.js

@@ -5,7 +5,7 @@ import { useOAuthStore } from 'src/stores/oauth.js'
 import {
   updateNotificationSettings,
   updateProfile,
-} from 'src/services/api/user.js'
+} from 'src/api/user.js'
 
 const defaultApi = ({ rootState, commit }, { path, value }) => {
   const params = {}

src/modules/statuses.js

@@ -27,7 +27,7 @@ import {
   fetchStatusHistory,
   fetchStatusSource,
   search2,
-} from 'src/services/api/public.js'
+} from 'src/api/public.js'
 import {
   bookmarkStatus,
   deleteStatus,
@@ -42,7 +42,7 @@ import {
   unpinOwnStatus,
   unreactWithEmoji,
   unretweet,
-} from 'src/services/api/user.js'
+} from 'src/api/user.js'
 
 const emptyTl = (userId = 0) => ({
   statuses: [],

src/modules/users.js

@@ -9,7 +9,7 @@ import {
   uniq,
 } from 'lodash'
 
-import { register } from '../services/api/public.js'
+import { register } from 'src/api/public.js'
 import oauthApi from '../services/new_api/oauth.js'
 import {
   registerPushNotifications,
@@ -39,7 +39,7 @@ import {
   getCaptcha,
   searchUsers,
   verifyCredentials,
-} from 'src/services/api/public.js'
+} from 'src/api/public.js'
 import {
   fetchBlocks,
   fetchDomainMutes,
@@ -48,7 +48,7 @@ import {
   fetchUserRelationship,
   followUser,
   muteUser,
-} from 'src/services/api/user.js'
+} from 'src/api/user.js'
 
 // TODO: Unify with mergeOrAdd in statuses.js
 export const mergeOrAdd = (arr, obj, item) => {