api.service.js -> public.js

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/api.service.js'
+import { WSConnectionStatus } from '../../services/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'

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/api.service.js'
+import { WSConnectionStatus } from '../../services/api/public.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/api.service.js'
+import { fetchConversation, fetchStatus } from 'src/services/api/public.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {

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/api.service.js'
+import { fetchUser } from 'src/services/api/public.js'
 
 const RemoteUserResolver = {
   data: () => ({

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/api.service.js'
+import { fetchUser, suggestions } from 'src/services/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/api.service.js'
+import { fetchUser, suggestions } from 'src/services/api/public.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
 function showWhoToFollow(panel, reply) {

src/modules/api.js

@@ -1,6 +1,6 @@
 import { Socket } from 'phoenix'
 
-import { WSConnectionStatus } from '../services/api/api.service.js'
+import { WSConnectionStatus } from '../services/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/api.service.js'
+} from 'src/services/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/statuses.js

@@ -27,7 +27,7 @@ import {
   fetchStatusHistory,
   fetchStatusSource,
   search2,
-} from 'src/services/api/api.service.js'
+} from 'src/services/api/public.js'
 import {
   bookmarkStatus,
   deleteStatus,

src/modules/users.js

@@ -9,7 +9,7 @@ import {
   uniq,
 } from 'lodash'
 
-import { register } from '../services/api/api.service.js'
+import { register } from '../services/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/api.service.js'
+} from 'src/services/api/public.js'
 import {
   fetchBlocks,
   fetchDomainMutes,

src/services/api/user.js

@@ -7,8 +7,8 @@ import {
   parseStatus,
   parseUser,
 } from '../entity_normalizer/entity_normalizer.service.js'
-import { fetchFriends, MASTODON_STATUS_URL } from './api.service.js'
 import { paramsString, promisedRequest } from './helpers.js'
+import { fetchFriends, MASTODON_STATUS_URL } from './public.js'
 
 const MUTES_IMPORT_URL = '/api/pleroma/mutes_import'
 const BLOCKS_IMPORT_URL = '/api/pleroma/blocks_import'

src/services/notifications_fetcher/notifications_fetcher.service.js

@@ -1,4 +1,4 @@
-import { fetchTimeline } from '../api/api.service.js'
+import { fetchTimeline } from '../api/public.js'
 import { promiseInterval } from '../promise_interval/promise_interval.js'
 
 import { useInstanceStore } from 'src/stores/instance.js'

src/services/timeline_fetcher/timeline_fetcher.service.js

@@ -1,6 +1,6 @@
 import { camelCase } from 'lodash'
 
-import { fetchTimeline } from '../api/api.service.js'
+import { fetchTimeline } from '../api/public.js'
 import { promiseInterval } from '../promise_interval/promise_interval.js'
 
 import { useInstanceStore } from 'src/stores/instance.js'

src/stores/admin_settings.js

@@ -32,7 +32,7 @@ import {
   setUsersSuggestionStatus,
   setUsersTags,
 } from 'src/services/api/admin.js'
-import { listEmojiPacks } from 'src/services/api/api.service.js'
+import { listEmojiPacks } from 'src/services/api/public.js'
 import { parseStatus } from 'src/services/entity_normalizer/entity_normalizer.service.js'
 
 export const defaultState = {

src/stores/announcements.js

@@ -8,7 +8,7 @@ import {
   editAnnouncement,
   postAnnouncement,
 } from 'src/services/api/admin.js'
-import { getAnnouncements } from 'src/services/api/api.service.js'
+import { getAnnouncements } from 'src/services/api/public.js'
 import { dismissAnnouncement } from 'src/services/api/user.js'
 
 const FETCH_ANNOUNCEMENT_INTERVAL_MS = 1000 * 60 * 5

src/stores/emoji.js

@@ -5,7 +5,7 @@ import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 
 import { ensureFinalFallback } from 'src/i18n/languages.js'
-import { listEmojiPacks } from 'src/services/api/api.service.js'
+import { listEmojiPacks } from 'src/services/api/public.js'
 
 import { annotationsLoader } from 'virtual:pleroma-fe/emoji-annotations'
 

src/stores/instance.js

@@ -11,7 +11,7 @@ import {
   LOCAL_DEFAULT_CONFIG_DEFINITIONS,
   validateSetting,
 } from '../modules/default_config_state.js'
-import { fetchKnownDomains } from '../services/api/api.service.js'
+import { fetchKnownDomains } from '../services/api/public.js'
 
 import { useInterfaceStore } from 'src/stores/interface.js'
 

src/stores/polls.js

@@ -3,7 +3,7 @@ import { defineStore } from 'pinia'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { fetchPoll } from 'src/services/api/api.service.js'
+import { fetchPoll } from 'src/services/api/public.js'
 import { vote } from 'src/services/api/user.js'
 
 export const usePollsStore = defineStore('polls', {