src/services/api -> src/api

src/components/bookmark_folder_edit/bookmark_folder_edit.js

@@ -4,7 +4,7 @@ import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { fetchBookmarkFolders } from 'src/services/api/user.js'
+import { fetchBookmarkFolders } from 'src/api/user.js'
 
 const BookmarkFolderEdit = {
   data() {

src/components/chat/chat.js

@@ -5,7 +5,7 @@ import { mapGetters, mapState } from 'vuex'
 import ChatMessage from 'src/components/chat_message/chat_message.vue'
 import ChatTitle from 'src/components/chat_title/chat_title.vue'
 import PostStatusForm from 'src/components/post_status_form/post_status_form.vue'
-import { WSConnectionStatus } from '../../services/api/public.js'
+import { WSConnectionStatus } from 'src/api/public.js'
 import chatService from '../../services/chat_service/chat_service.js'
 import { buildFakeMessage } from '../../services/chat_utils/chat_utils.js'
 import { promiseInterval } from '../../services/promise_interval/promise_interval.js'
@@ -23,7 +23,7 @@ import {
   chatMessages,
   getOrCreateChat,
   sendChatMessage,
-} from 'src/services/api/chats.js'
+} from 'src/api/chats.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronDown, faChevronLeft } from '@fortawesome/free-solid-svg-icons'

src/components/chat_new/chat_new.js

@@ -5,7 +5,7 @@ import UserAvatar from 'src/components/user_avatar/user_avatar.vue'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { chats } from 'src/services/api/chats.js'
+import { chats } from 'src/api/chats.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronLeft, faSearch } from '@fortawesome/free-solid-svg-icons'

src/components/conversation/conversation.js

@@ -5,13 +5,13 @@ import { mapState } from 'vuex'
 import QuickFilterSettings from 'src/components/quick_filter_settings/quick_filter_settings.vue'
 import QuickViewSettings from 'src/components/quick_view_settings/quick_view_settings.vue'
 import ThreadTree from 'src/components/thread_tree/thread_tree.vue'
-import { WSConnectionStatus } from '../../services/api/public.js'
+import { WSConnectionStatus } from 'src/api/public.js'
 
+import { useOAuthStore } from 'src/stores/oauth.js'
 import { useInterfaceStore } from 'src/stores/interface'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { fetchConversation, fetchStatus } from 'src/services/api/public.js'
+import { fetchConversation, fetchStatus } from 'src/api/public.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {

src/components/follow_request_card/follow_request_card.js

@@ -6,7 +6,7 @@ import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { approveUser, denyUser } from 'src/services/api/user.js'
+import { approveUser, denyUser } from 'src/api/user.js'
 
 const FollowRequestCard = {
   props: ['user'],

src/components/notification/notification.js

@@ -18,7 +18,7 @@ import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useUserHighlightStore } from 'src/stores/user_highlight.js'
 
-import { approveUser, denyUser } from 'src/services/api/user.js'
+import { approveUser, denyUser } from 'src/api/user.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
 import { library } from '@fortawesome/fontawesome-svg-core'

src/components/remote_user_resolver/remote_user_resolver.js

@@ -1,6 +1,6 @@
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { fetchUser } from 'src/services/api/public.js'
+import { fetchUser } from 'src/api/public.js'
 
 const RemoteUserResolver = {
   data: () => ({

src/components/settings_modal/helpers/emoji_editing_popover.vue

@@ -159,7 +159,7 @@ import {
   addNewEmojiFile,
   deleteEmojiFile,
   updateEmojiFile,
-} from 'src/services/api/admin.js'
+} from 'src/api/admin.js'
 
 export default {
   components: {

src/components/settings_modal/tabs/appearance_tab.js

@@ -10,11 +10,11 @@ import SharedComputedObject from '../helpers/shared_computed_object.js'
 import UnitSetting from '../helpers/unit_setting.vue'
 import Preview from './old_theme_tab/theme_preview.vue'
 
+import { useOAuthStore } from 'src/stores/oauth.js'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { normalizeThemeData, useInterfaceStore } from 'src/stores/interface.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { updateProfileImages } from 'src/services/api/user.js'
+import { updateProfileImages } from 'src/api/user.js'
 import { newImporter } from 'src/services/export_import/export_import.js'
 import {
   adoptStyleSheets,

src/components/settings_modal/tabs/composing_tab.js

@@ -11,13 +11,13 @@ import IntegerSetting from '../helpers/integer_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import UnitSetting from '../helpers/unit_setting.vue'
 
+import { useOAuthStore } from 'src/stores/oauth.js'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
-import { updateProfile } from 'src/services/api/user.js'
+import { updateProfile } from 'src/api/user.js'
 import localeService from 'src/services/locale/locale.service.js'
 import { cacheKey, clearCache, emojiCacheKey } from 'src/services/sw/sw.js'
 

src/components/settings_modal/tabs/data_import_export_tab.js

@@ -16,7 +16,7 @@ import {
   importFollows,
   importMutes,
   listBackups,
-} from 'src/services/api/user.js'
+} from 'src/api/user.js'
 
 const DataImportExportTab = {
   data() {

src/components/settings_modal/tabs/general_tab.js

@@ -8,14 +8,14 @@ import FloatSetting from '../helpers/float_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import UnitSetting from '../helpers/unit_setting.vue'
 
+import { useOAuthStore } from 'src/stores/oauth.js'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useLocalConfigStore } from 'src/stores/local_config.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
-import { updateProfile } from 'src/services/api/user.js'
+import { updateProfile } from 'src/api/user.js'
 import localeService from 'src/services/locale/locale.service.js'
 
 const GeneralTab = {

src/components/settings_modal/tabs/mutes_and_blocks_tab.js

@@ -13,7 +13,7 @@ import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useOAuthTokensStore } from 'src/stores/oauth_tokens.js'
 
-import { importBlocks, importFollows } from 'src/services/api/user.js'
+import { importBlocks, importFollows } from 'src/api/user.js'
 
 const MutesAndBlocks = {
   data() {

src/components/settings_modal/tabs/notifications_tab.js

@@ -3,7 +3,7 @@ import SharedComputedObject from '../helpers/shared_computed_object.js'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { updateNotificationSettings } from 'src/services/api/user.js'
+import { updateNotificationSettings } from 'src/api/user.js'
 
 const NotificationsTab = {
   data() {

src/components/settings_modal/tabs/profile_tab.js

@@ -5,7 +5,7 @@ import SharedComputedObject from '../helpers/shared_computed_object.js'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { updateProfile } from 'src/services/api/user.js'
+import { updateProfile } from 'src/api/user.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {

src/components/settings_modal/tabs/security_tab/mfa.js

@@ -12,7 +12,7 @@ import {
   mfaConfirmOTP,
   mfaSetupOTP,
   settingsMFA,
-} from 'src/services/api/user.js'
+} from 'src/api/user.js'
 
 const Mfa = {
   data: () => ({

src/components/settings_modal/tabs/security_tab/mfa_totp.js

@@ -4,7 +4,7 @@ import Confirm from './confirm.vue'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { mfaDisableOTP } from 'src/services/api/user.js'
+import { mfaDisableOTP } from 'src/api/user.js'
 
 export default {
   props: ['settings'],

src/components/settings_modal/tabs/security_tab/security_tab.js

@@ -15,7 +15,7 @@ import {
   deleteAlias,
   listAliases,
   moveAccount,
-} from 'src/services/api/user.js'
+} from 'src/api/user.js'
 import localeService from 'src/services/locale/locale.service.js'
 
 const SecurityTab = {

src/components/user_card/user_card.js

@@ -26,7 +26,7 @@ import { useOAuthStore } from 'src/stores/oauth.js'
 import { usePostStatusStore } from 'src/stores/post_status'
 import { useUserHighlightStore } from 'src/stores/user_highlight.js'
 
-import { updateProfile } from 'src/services/api/user.js'
+import { updateProfile } from 'src/api/user.js'
 import { propsToNative } from 'src/services/attributes_helper/attributes_helper.service.js'
 import localeService from 'src/services/locale/locale.service.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'

src/components/user_reporting_modal/user_reporting_modal.js

@@ -8,7 +8,7 @@ import UserLink from 'src/components/user_link/user_link.vue'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useReportsStore } from 'src/stores/reports.js'
 
-import { reportUser } from 'src/services/api/user.js'
+import { reportUser } from 'src/api/user.js'
 
 const UserReportingModal = {
   components: {

src/components/who_to_follow/who_to_follow.js

@@ -3,7 +3,7 @@ import FollowCard from 'src/components/follow_card/follow_card.vue'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { fetchUser, suggestions } from 'src/services/api/public.js'
+import { fetchUser, suggestions } from 'src/api/public.js'
 
 const WhoToFollow = {
   components: {

src/components/who_to_follow_panel/who_to_follow_panel.js

@@ -4,7 +4,7 @@ import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { fetchUser, suggestions } from 'src/services/api/public.js'
+import { fetchUser, suggestions } from 'src/api/public.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
 function showWhoToFollow(panel, reply) {