commit: b94d389b7f090cf1f4dab33b7a2d738d26d8677c parent 7d19cc2d53639de166da331c28e2b2263e7f86f0 Author: Henry Jameson <me@hjkos.com> Date: Mon, 3 Feb 2025 13:02:14 +0200 use absolute paths for storesDiffstat:
52 files changed, 63 insertions(+), 62 deletions(-)diff --git a/src/boot/after_store.js b/src/boot/after_store.js@@ -17,9 +17,9 @@ import { applyConfig } from '../services/style_setter/style_setter.js' import FaviconService from '../services/favicon_service/favicon_service.js' import { initServiceWorker, updateFocus } from '../services/sw/sw.js' -import { useI18nStore } from '../stores/i18n' -import { useInterfaceStore } from '../stores/interface' -import { useAnnouncementsStore } from '../stores/announcements' +import { useI18nStore } from 'src/stores/i18n' +import { useInterfaceStore } from 'src/stores/interface' +import { useAnnouncementsStore } from 'src/stores/announcements' let staticInitialResults = nulldiff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js@@ -7,7 +7,7 @@ import { library } from '@fortawesome/fontawesome-svg-core' import { faEllipsisV } from '@fortawesome/free-solid-svg-icons' -import { useReportsStore } from '../../stores/reports' +import { useReportsStore } from 'src/stores/reports' library.add( faEllipsisVdiff --git a/src/components/announcement/announcement.js b/src/components/announcement/announcement.js@@ -2,7 +2,7 @@ import { mapState } from 'vuex' import AnnouncementEditor from '../announcement_editor/announcement_editor.vue' import RichContent from '../rich_content/rich_content.jsx' import localeService from '../../services/locale/locale.service.js' -import { useAnnouncementsStore } from '../../stores/announcements' +import { useAnnouncementsStore } from 'src/stores/announcements' const Announcement = { components: {diff --git a/src/components/announcements_page/announcements_page.js b/src/components/announcements_page/announcements_page.js@@ -1,7 +1,7 @@ import { mapState } from 'vuex' import Announcement from '../announcement/announcement.vue' import AnnouncementEditor from '../announcement_editor/announcement_editor.vue' -import { useAnnouncementsStore } from '../../stores/announcements' +import { useAnnouncementsStore } from 'src/stores/announcements' const AnnouncementsPage = { components: {diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js@@ -18,7 +18,7 @@ import { faPencilAlt, faAlignRight } from '@fortawesome/free-solid-svg-icons' -import { useMediaViewerStore } from '../../stores/media_viewer' +import { useMediaViewerStore } from 'src/stores/media_viewer' library.add( faFile,diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js@@ -14,7 +14,7 @@ import { faChevronLeft } from '@fortawesome/free-solid-svg-icons' import { buildFakeMessage } from '../../services/chat_utils/chat_utils.js' -import { useInterfaceStore } from '../../stores/interface.js' +import { useInterfaceStore } from 'src/stores/interface.js' library.add( faChevronDown,diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js@@ -13,7 +13,7 @@ import { faTimes, faEllipsisH } from '@fortawesome/free-solid-svg-icons' -import { useInterfaceStore } from '../../stores/interface' +import { useInterfaceStore } from 'src/stores/interface' library.add( faTimes,diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js@@ -14,7 +14,7 @@ import { faCog, faInfoCircle } from '@fortawesome/free-solid-svg-icons' -import { useInterfaceStore } from '../../stores/interface' +import { useInterfaceStore } from 'src/stores/interface' library.add( faSignInAlt,diff --git a/src/components/edit_status_modal/edit_status_modal.js b/src/components/edit_status_modal/edit_status_modal.js@@ -1,7 +1,7 @@ import EditStatusForm from '../edit_status_form/edit_status_form.vue' import Modal from '../modal/modal.vue' import get from 'lodash/get' -import { useEditStatusStore } from '../../stores/editStatus' +import { useEditStatusStore } from 'src/stores/editStatus' const EditStatusModal = { components: {diff --git a/src/components/extra_notifications/extra_notifications.js b/src/components/extra_notifications/extra_notifications.js@@ -1,6 +1,6 @@ import { mapGetters } from 'vuex' import { mapState as mapPiniaState } from 'pinia' -import { useAnnouncementsStore } from '../../stores/announcements' +import { useAnnouncementsStore } from 'src/stores/announcements' import { library } from '@fortawesome/fontawesome-svg-core' import { @@ -9,7 +9,7 @@ import { faBullhorn } from '@fortawesome/free-solid-svg-icons' -import { useInterfaceStore } from '../../stores/interface' +import { useInterfaceStore } from 'src/stores/interface' library.add( faUserPlus,diff --git a/src/components/gallery/gallery.js b/src/components/gallery/gallery.js@@ -1,4 +1,4 @@ -import { useMediaViewerStore } from '../../stores/media_viewer' +import { useMediaViewerStore } from 'src/stores/media_viewer' import Attachment from '../attachment/attachment.vue' import { sumBy, set } from 'lodash'diff --git a/src/components/global_notice_list/global_notice_list.js b/src/components/global_notice_list/global_notice_list.js@@ -2,7 +2,7 @@ import { library } from '@fortawesome/fontawesome-svg-core' import { faTimes } from '@fortawesome/free-solid-svg-icons' -import { useInterfaceStore } from '../../stores/interface' +import { useInterfaceStore } from 'src/stores/interface' library.add( faTimesdiff --git a/src/components/lists/lists.js b/src/components/lists/lists.js@@ -1,4 +1,4 @@ -import { useListsStore } from '../../stores/lists' +import { useListsStore } from 'src/stores/lists' import ListsCard from '../lists_card/lists_card.vue' const Lists = {diff --git a/src/components/lists_edit/lists_edit.js b/src/components/lists_edit/lists_edit.js@@ -10,8 +10,8 @@ import { faSearch, faChevronLeft } from '@fortawesome/free-solid-svg-icons' -import { useInterfaceStore } from '../../stores/interface' -import { useListsStore } from '../../stores/lists' +import { useInterfaceStore } from 'src/stores/interface' +import { useListsStore } from 'src/stores/lists' library.add( faSearch,diff --git a/src/components/lists_menu/lists_menu_content.js b/src/components/lists_menu/lists_menu_content.js@@ -2,7 +2,7 @@ import { mapState } from 'vuex' import { mapState as mapPiniaState } from 'pinia' import NavigationEntry from 'src/components/navigation/navigation_entry.vue' import { getListEntries } from 'src/components/navigation/filter.js' -import { useListsStore } from '../../stores/lists' +import { useListsStore } from 'src/stores/lists' export const ListsMenuContent = { props: [diff --git a/src/components/lists_timeline/lists_timeline.js b/src/components/lists_timeline/lists_timeline.js@@ -1,4 +1,4 @@ -import { useListsStore } from '../../stores/lists' +import { useListsStore } from 'src/stores/lists' import Timeline from '../timeline/timeline.vue' const ListsTimeline = { data () {diff --git a/src/components/media_modal/media_modal.js b/src/components/media_modal/media_modal.js@@ -13,7 +13,7 @@ import { faCircleNotch, faTimes } from '@fortawesome/free-solid-svg-icons' -import { useMediaViewerStore } from '../../stores/media_viewer' +import { useMediaViewerStore } from 'src/stores/media_viewer' library.add( faChevronLeft,diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js@@ -18,7 +18,7 @@ import { faMinus, faCheckDouble } from '@fortawesome/free-solid-svg-icons' -import { useAnnouncementsStore } from '../../stores/announcements' +import { useAnnouncementsStore } from 'src/stores/announcements' library.add( faTimes,diff --git a/src/components/mobile_post_status_button/mobile_post_status_button.js b/src/components/mobile_post_status_button/mobile_post_status_button.js@@ -3,7 +3,7 @@ import { library } from '@fortawesome/fontawesome-svg-core' import { faPen } from '@fortawesome/free-solid-svg-icons' -import { usePostStatusStore } from '../../stores/postStatus' +import { usePostStatusStore } from 'src/stores/postStatus' library.add( faPendiff --git a/src/components/navigation/navigation_entry.js b/src/components/navigation/navigation_entry.js@@ -4,7 +4,7 @@ import OptionalRouterLink from 'src/components/optional_router_link/optional_rou import { library } from '@fortawesome/fontawesome-svg-core' import { faThumbtack } from '@fortawesome/free-solid-svg-icons' import { mapStores } from 'pinia' -import { useAnnouncementsStore } from '../../stores/announcements' +import { useAnnouncementsStore } from 'src/stores/announcements' library.add(faThumbtack)diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js@@ -15,8 +15,8 @@ import { import FaviconService from '../../services/favicon_service/favicon_service.js' import { library } from '@fortawesome/fontawesome-svg-core' import { faCircleNotch, faArrowUp, faMinus } from '@fortawesome/free-solid-svg-icons' -import { useInterfaceStore } from '../../stores/interface' -import { useAnnouncementsStore } from '../../stores/announcements' +import { useInterfaceStore } from 'src/stores/interface' +import { useAnnouncementsStore } from 'src/stores/announcements' library.add( faCircleNotch,diff --git a/src/components/poll/poll.js b/src/components/poll/poll.js@@ -2,7 +2,7 @@ import Timeago from 'components/timeago/timeago.vue' import genRandomSeed from '../../services/random_seed/random_seed.service.js' import RichContent from 'components/rich_content/rich_content.jsx' import { forEach, map } from 'lodash' -import { usePollsStore } from '../../stores/polls' +import { usePollsStore } from 'src/stores/polls' export default { name: 'Poll',diff --git a/src/components/post_status_modal/post_status_modal.js b/src/components/post_status_modal/post_status_modal.js@@ -1,7 +1,7 @@ import PostStatusForm from '../post_status_form/post_status_form.vue' import Modal from '../modal/modal.vue' import get from 'lodash/get' -import { usePostStatusStore } from '../../stores/postStatus' +import { usePostStatusStore } from 'src/stores/postStatus' const PostStatusModal = { components: {diff --git a/src/components/quick_filter_settings/quick_filter_settings.js b/src/components/quick_filter_settings/quick_filter_settings.js@@ -3,7 +3,7 @@ import { mapGetters } from 'vuex' import { mapState } from 'pinia' import { library } from '@fortawesome/fontawesome-svg-core' import { faFilter, faFont, faWrench } from '@fortawesome/free-solid-svg-icons' -import { useInterfaceStore } from '../../stores/interface' +import { useInterfaceStore } from 'src/stores/interface' library.add( faFilter,diff --git a/src/components/quick_view_settings/quick_view_settings.js b/src/components/quick_view_settings/quick_view_settings.js@@ -4,7 +4,7 @@ import { mapGetters } from 'vuex' import { mapState } from 'pinia' import { library } from '@fortawesome/fontawesome-svg-core' import { faList, faFolderTree, faBars, faWrench } from '@fortawesome/free-solid-svg-icons' -import { useInterfaceStore } from '../../stores/interface' +import { useInterfaceStore } from 'src/stores/interface' library.add( faList,diff --git a/src/components/report/report.js b/src/components/report/report.js@@ -1,4 +1,4 @@ -import { useReportsStore } from '../../stores/reports' +import { useReportsStore } from 'src/stores/reports' import Select from '../select/select.vue' import StatusContent from '../status_content/status_content.vue' import Timeago from '../timeago/timeago.vue'diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js@@ -21,7 +21,7 @@ import { import { faWindowMinimize } from '@fortawesome/free-regular-svg-icons' -import { useInterfaceStore } from '../../stores/interface' +import { useInterfaceStore } from 'src/stores/interface' const PLEROMAFE_SETTINGS_MAJOR_VERSION = 1 const PLEROMAFE_SETTINGS_MINOR_VERSION = 0diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js@@ -21,7 +21,7 @@ import { faPlus, faCircleNotch } from '@fortawesome/free-solid-svg-icons' -import { useInterfaceStore } from '../../../stores/interface' +import { useInterfaceStore } from 'src/stores/interface' library.add( faTimes,diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.js b/src/components/settings_modal/tabs/theme_tab/theme_tab.js@@ -43,7 +43,7 @@ import Checkbox from 'src/components/checkbox/checkbox.vue' import Select from 'src/components/select/select.vue' import Preview from './theme_preview.vue' -import { useInterfaceStore } from '../../../../stores/interface' +import { useInterfaceStore } from 'src/stores/interface' // List of color values used in v1 const v1OnlyNames = [diff --git a/src/components/shout_panel/shout_panel.js b/src/components/shout_panel/shout_panel.js@@ -4,7 +4,7 @@ import { faBullhorn, faTimes } from '@fortawesome/free-solid-svg-icons' -import { useShoutStore } from '../../stores/shout' +import { useShoutStore } from 'src/stores/shout' library.add( faBullhorn,diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js@@ -21,9 +21,9 @@ import { faList, faFilePen } from '@fortawesome/free-solid-svg-icons' -import { useShoutStore } from '../../stores/shout' -import { useInterfaceStore } from '../../stores/interface' -import { useAnnouncementsStore } from '../../stores/announcements' +import { useShoutStore } from 'src/stores/shout' +import { useInterfaceStore } from 'src/stores/interface' +import { useAnnouncementsStore } from 'src/stores/announcements' library.add( faSignInAlt,diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js@@ -13,7 +13,7 @@ import { faLink, faPollH } from '@fortawesome/free-solid-svg-icons' -import { useMediaViewerStore } from '../../stores/media_viewer' +import { useMediaViewerStore } from 'src/stores/media_viewer' library.add( faCircleNotch,diff --git a/src/components/status_history_modal/status_history_modal.js b/src/components/status_history_modal/status_history_modal.js@@ -1,7 +1,7 @@ import { get } from 'lodash' import Modal from '../modal/modal.vue' import Status from '../status/status.vue' -import { useStatusHistoryStore } from '../../stores/statusHistory' +import { useStatusHistoryStore } from 'src/stores/statusHistory' const StatusHistoryModal = { components: {diff --git a/src/components/tab_switcher/tab_switcher.jsx b/src/components/tab_switcher/tab_switcher.jsx@@ -4,7 +4,7 @@ import { mapState } from 'pinia' import { FontAwesomeIcon as FAIcon } from '@fortawesome/vue-fontawesome' import './tab_switcher.scss' -import { useInterfaceStore } from '../../stores/interface' +import { useInterfaceStore } from 'src/stores/interface' const findFirstUsable = (slots) => slots.findIndex(_ => _.props)diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js@@ -8,7 +8,7 @@ import QuickViewSettings from '../quick_view_settings/quick_view_settings.vue' import { debounce, throttle, keyBy } from 'lodash' import { library } from '@fortawesome/fontawesome-svg-core' import { faCircleNotch, faCirclePlus, faCog, faMinus, faArrowUp, faCheck } from '@fortawesome/free-solid-svg-icons' -import { useInterfaceStore } from '../../stores/interface' +import { useInterfaceStore } from 'src/stores/interface' library.add( faCircleNotch,diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js@@ -9,8 +9,8 @@ import { filterNavigation } from 'src/components/navigation/filter.js' import { faChevronDown } from '@fortawesome/free-solid-svg-icons' -import { useInterfaceStore } from '../../stores/interface' -import { useListsStore } from '../../stores/lists' +import { useInterfaceStore } from 'src/stores/interface' +import { useListsStore } from 'src/stores/lists' library.add(faChevronDown)diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js@@ -11,7 +11,7 @@ import RichContent from 'src/components/rich_content/rich_content.jsx' import MuteConfirm from '../confirm_modal/mute_confirm.vue' import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' import { mapGetters } from 'vuex' -import { usePostStatusStore } from '../../stores/postStatus' +import { usePostStatusStore } from 'src/stores/postStatus' import { library } from '@fortawesome/fontawesome-svg-core' import { faBell, @@ -22,6 +22,7 @@ import { faTimes, faExpandAlt } from '@fortawesome/free-solid-svg-icons' + import { useMediaViewerStore } from '../../stores/media_viewer' import { useInterfaceStore } from '../../stores/interface'diff --git a/src/components/user_list_menu/user_list_menu.js b/src/components/user_list_menu/user_list_menu.js@@ -4,7 +4,7 @@ import { mapState } from 'pinia' import DialogModal from '../dialog_modal/dialog_modal.vue' import Popover from '../popover/popover.vue' -import { useListsStore } from '../../stores/lists' +import { useListsStore } from 'src/stores/lists' library.add(faChevronRight)diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js@@ -3,7 +3,7 @@ import List from '../list/list.vue' import Checkbox from '../checkbox/checkbox.vue' import Modal from '../modal/modal.vue' import UserLink from '../user_link/user_link.vue' -import { useReportsStore } from '../../stores/reports' +import { useReportsStore } from 'src/stores/reports' const UserReportingModal = { components: {diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js@@ -1,6 +1,6 @@ import merge from 'lodash.merge' import { each, get, set, cloneDeep } from 'lodash' -import { useInterfaceStore } from '../stores/interface' +import { useInterfaceStore } from 'src/stores/interface' import { storage } from './storage.js' let loaded = falsediff --git a/src/lib/push_notifications_plugin.js b/src/lib/push_notifications_plugin.js@@ -1,4 +1,4 @@ -import { useInterfaceStore } from '../stores/interface' +import { useInterfaceStore } from 'src/stores/interface' export default (store) => { store.subscribe((mutation, state) => {diff --git a/src/modules/api.js b/src/modules/api.js@@ -2,8 +2,8 @@ import backendInteractorService from '../services/backend_interactor_service/bac import { WSConnectionStatus } from '../services/api/api.service.js' import { maybeShowChatNotification } from '../services/chat_utils/chat_utils.js' import { Socket } from 'phoenix' -import { useShoutStore } from '../stores/shout.js' -import { useInterfaceStore } from '../stores/interface.js' +import { useShoutStore } from 'src/stores/shout.js' +import { useInterfaceStore } from 'src/stores/interface.js' const retryTimeout = (multiplier) => 1000 * multiplierdiff --git a/src/modules/config.js b/src/modules/config.js@@ -3,8 +3,8 @@ import { applyConfig } from '../services/style_setter/style_setter.js' import messages from '../i18n/messages' import { set } from 'lodash' import localeService from '../services/locale/locale.service.js' -import { useI18nStore } from '../stores/i18n.js' -import { useInterfaceStore } from '../stores/interface.js' +import { useI18nStore } from 'src/stores/i18n.js' +import { useInterfaceStore } from 'src/stores/interface.js' import { defaultState } from './default_config_state.js'diff --git a/src/modules/instance.js b/src/modules/instance.js@@ -1,7 +1,7 @@ import apiService from '../services/api/api.service.js' import { instanceDefaultProperties } from './config.js' import { langCodeToCldrName, ensureFinalFallback } from '../i18n/languages.js' -import { useInterfaceStore } from '../stores/interface.js' +import { useInterfaceStore } from 'src/stores/interface.js' const SORTED_EMOJI_GROUP_IDS = [ 'smileys-and-emotion',diff --git a/src/modules/notifications.js b/src/modules/notifications.js@@ -11,7 +11,7 @@ import { closeAllDesktopNotifications } from '../services/desktop_notification_utils/desktop_notification_utils.js' -import { useReportsStore } from '../stores/reports.js' +import { useReportsStore } from 'src/stores/reports.js' const emptyNotifications = () => ({ desktopNotificationSilence: true,diff --git a/src/modules/users.js b/src/modules/users.js@@ -3,7 +3,7 @@ import { windowWidth, windowHeight } from '../services/window_utils/window_utils import oauthApi from '../services/new_api/oauth.js' import { compact, map, each, mergeWith, last, concat, uniq, isArray } from 'lodash' import { registerPushNotifications, unregisterPushNotifications } from '../services/sw/sw.js' -import { useInterfaceStore } from '../stores/interface.js' +import { useInterfaceStore } from 'src/stores/interface.js' // TODO: Unify with mergeOrAdd in statuses.js export const mergeOrAdd = (arr, obj, item) => {diff --git a/src/services/lists_fetcher/lists_fetcher.service.js b/src/services/lists_fetcher/lists_fetcher.service.js@@ -1,4 +1,4 @@ -import { useListsStore } from '../../stores/lists.js' +import { useListsStore } from 'src/stores/lists.js' import apiService from '../api/api.service.js' import { promiseInterval } from '../promise_interval/promise_interval.js'diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js@@ -1,6 +1,6 @@ import { muteWordHits } from '../status_parser/status_parser.js' import { showDesktopNotification } from '../desktop_notification_utils/desktop_notification_utils.js' -import { useI18nStore } from '../../stores/i18n.js' +import { useI18nStore } from 'src/stores/i18n.js' import { useAnnouncementsStore } from 'src/stores/announcements' import FaviconService from 'src/services/favicon_service/favicon_service.js'diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js@@ -1,4 +1,4 @@ -import { useInterfaceStore } from '../../stores/interface.js' +import { useInterfaceStore } from 'src/stores/interface.js' import apiService from '../api/api.service.js' import { promiseInterval } from '../promise_interval/promise_interval.js'diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js@@ -2,7 +2,7 @@ import { camelCase } from 'lodash' import apiService from '../api/api.service.js' import { promiseInterval } from '../promise_interval/promise_interval.js' -import { useInterfaceStore } from '../../stores/interface.js' +import { useInterfaceStore } from 'src/stores/interface.js' const update = ({ store, statuses, timeline, showImmediately, userId, listId, pagination }) => { const ccTimeline = camelCase(timeline)diff --git a/src/stores/reports.js b/src/stores/reports.js@@ -1,7 +1,7 @@ import { defineStore } from 'pinia' import filter from 'lodash/filter' -import { useInterfaceStore } from '../stores/interface' +import { useInterfaceStore } from 'src/stores/interface' export const useReportsStore = defineStore('reports', { state: () => ({diff --git a/test/unit/specs/stores/lists.spec.js b/test/unit/specs/stores/lists.spec.js@@ -1,5 +1,5 @@ import { createPinia, setActivePinia } from 'pinia' -import { useListsStore } from '../../../../src/stores/lists.js' +import { useListsStore } from 'src/src/stores/lists.js' import { createStore } from 'vuex' import apiModule from '../../../../src/modules/api.js'