From b05a501236399d4c00842a507e1ab445f3ed0af8 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 6 Jan 2026 16:23:17 +0200 Subject: [PATCH] biome check --write --- build/check-versions.mjs | 2 +- build/copy_plugin.js | 4 +- build/emojis_plugin.js | 4 +- build/msw_plugin.js | 2 +- build/service_worker_messages.js | 2 +- build/sw_plugin.js | 6 +- eslint.config.mjs | 2 +- src/App.js | 45 ++++---- src/boot/after_store.js | 38 +++---- src/boot/routes.js | 56 ++++----- src/components/about/about.js | 6 +- .../account_actions/account_actions.js | 12 +- src/components/announcement/announcement.js | 4 +- .../announcements_page/announcements_page.js | 2 +- src/components/attachment/attachment.js | 32 +++--- src/components/auth_form/auth_form.js | 4 +- src/components/avatar_list/avatar_list.js | 2 +- .../basic_user_card/basic_user_card.js | 6 +- .../bookmark_folder_edit.js | 6 +- .../bookmark_folders/bookmark_folders.js | 2 +- .../bookmark_folders_menu_content.js | 2 +- .../bubble_timeline/bubble_timeline.js | 1 + src/components/chat/chat.js | 20 ++-- src/components/chat_list/chat_list.js | 2 +- .../chat_list_item/chat_list_item.js | 8 +- src/components/chat_message/chat_message.js | 16 +-- src/components/chat_new/chat_new.js | 6 +- src/components/chat_title/chat_title.js | 2 +- src/components/color_input/color_input.vue | 7 +- .../component_preview/component_preview.js | 2 +- src/components/confirm_modal/mute_confirm.js | 5 +- .../contrast_ratio/contrast_ratio.vue | 3 +- src/components/conversation/conversation.js | 19 ++-- src/components/desktop_nav/desktop_nav.js | 20 ++-- src/components/draft/draft.js | 13 +-- .../edit_status_form/edit_status_form.js | 2 +- .../edit_status_modal/edit_status_modal.js | 4 +- src/components/emoji_input/emoji_input.js | 18 +-- src/components/emoji_picker/emoji_picker.js | 30 ++--- .../emoji_reactions/emoji_reactions.js | 6 +- .../extra_notifications.js | 12 +- src/components/flash/flash.js | 4 +- src/components/follow_button/follow_button.js | 2 +- src/components/follow_card/follow_card.js | 2 +- .../follow_request_card.js | 2 +- src/components/font_control/font_control.js | 11 +- .../friends_timeline/friends_timeline.js | 1 + src/components/gallery/gallery.js | 2 +- src/components/interactions/interactions.js | 2 +- .../interface_language_switcher.js | 6 +- src/components/lists_edit/lists_edit.js | 16 +-- .../lists_menu/lists_menu_content.js | 4 +- .../lists_timeline/lists_timeline.js | 1 + .../lists_user_search/lists_user_search.js | 2 +- src/components/login_form/login_form.js | 10 +- src/components/media_modal/media_modal.js | 16 +-- src/components/media_upload/media_upload.js | 6 +- src/components/mention_link/mention_link.js | 8 +- src/components/mfa_form/recovery_form.js | 10 +- src/components/mfa_form/totp_form.js | 10 +- src/components/mobile_nav/mobile_nav.js | 36 +++--- .../mobile_post_status_button.js | 2 +- .../mrf_transparency_panel.js | 2 +- src/components/mute_card/mute_card.js | 2 +- src/components/nav_panel/nav_panel.js | 42 ++++--- src/components/navigation/navigation_entry.js | 9 +- src/components/navigation/navigation_pins.js | 44 ++++---- src/components/notification/notification.js | 48 ++++---- .../notifications/notification_filters.vue | 2 +- src/components/notifications/notifications.js | 34 +++--- .../oauth_callback/oauth_callback.js | 2 +- .../palette_editor/palette_editor.vue | 11 +- .../password_reset/password_reset.js | 4 +- src/components/poll/poll.js | 6 +- src/components/poll/poll_form.js | 4 +- .../post_status_form/post_status_form.js | 54 +++++---- .../post_status_modal/post_status_modal.js | 4 +- .../public_and_external_timeline.js | 1 + .../public_timeline/public_timeline.js | 1 + .../quick_filter_settings.js | 6 +- .../quick_view_settings.js | 12 +- src/components/registration/registration.js | 6 +- src/components/report/report.js | 4 +- src/components/rich_content/rich_content.jsx | 16 +-- .../scope_selector/scope_selector.js | 2 +- src/components/search/search.js | 10 +- src/components/search_bar/search_bar.js | 2 +- .../selectable_list/selectable_list.js | 2 +- .../settings_modal/admin_tabs/auth_tab.js | 9 +- .../settings_modal/admin_tabs/emoji_tab.js | 27 +++-- .../admin_tabs/federation_tab.js | 9 +- .../admin_tabs/frontends_tab.js | 19 ++-- .../settings_modal/admin_tabs/http_tab.js | 11 +- .../settings_modal/admin_tabs/instance_tab.js | 10 +- .../admin_tabs/job_queues_tab.js | 9 +- .../settings_modal/admin_tabs/limits_tab.js | 3 +- .../settings_modal/admin_tabs/links_tab.js | 11 +- .../settings_modal/admin_tabs/mailer_tab.js | 9 +- .../admin_tabs/media_proxy_tab.js | 7 +- .../admin_tabs/monitoring_tab.js | 17 ++- .../settings_modal/admin_tabs/other_tab.js | 9 +- .../settings_modal/admin_tabs/posts_tab.js | 9 +- .../admin_tabs/registrations_tab.js | 9 +- .../settings_modal/admin_tabs/uploads_tab.js | 3 +- .../helpers/attachment_setting.js | 6 +- .../settings_modal/helpers/color_setting.js | 2 +- .../settings_modal/helpers/draft_buttons.vue | 2 +- .../helpers/emoji_editing_popover.vue | 4 +- .../settings_modal/helpers/help_indicator.vue | 2 +- .../helpers/modified_indicator.vue | 2 +- .../helpers/profile_setting_indicator.vue | 2 +- .../helpers/pwa_manifest_icons_setting.js | 7 +- .../settings_modal/helpers/setting.js | 4 +- .../helpers/vertical_tab_switcher.jsx | 8 +- .../settings_modal/settings_modal.js | 30 ++--- .../settings_modal_admin_content.js | 62 +++++----- .../settings_modal_user_content.js | 54 +++++---- .../settings_modal/tabs/appearance_tab.js | 35 +++--- .../settings_modal/tabs/clutter_tab.js | 20 ++-- .../settings_modal/tabs/composing_tab.js | 33 +++--- .../tabs/data_import_export_tab.js | 6 +- .../settings_modal/tabs/developer_tab.js | 4 +- .../settings_modal/tabs/filtering_tab.js | 32 +++--- .../settings_modal/tabs/general_tab.js | 10 +- .../settings_modal/tabs/layout_tab.js | 3 +- .../tabs/mutes_and_blocks_tab.js | 16 +-- .../tabs/old_theme_tab/old_theme_tab.js | 65 +++++------ .../tabs/old_theme_tab/theme_preview.vue | 8 +- .../settings_modal/tabs/posts_tab.js | 2 +- .../settings_modal/tabs/profile_tab.js | 15 ++- .../settings_modal/tabs/security_tab/mfa.js | 6 +- .../tabs/security_tab/mfa_totp.js | 2 +- .../tabs/security_tab/security_tab.js | 4 +- .../tabs/style_tab/style_tab.js | 106 +++++++++--------- .../tabs/style_tab/virtual_directives_tab.js | 5 +- .../shadow_control/shadow_control.js | 28 ++--- src/components/shout_panel/shout_panel.js | 2 +- src/components/side_drawer/side_drawer.js | 38 +++---- src/components/staff_panel/staff_panel.js | 2 +- src/components/status/status.js | 75 ++++++------- .../status_action_buttons/action_button.js | 37 +++--- .../action_button_container.js | 13 +-- .../status_action_buttons.js | 18 ++- src/components/status_body/status_body.js | 8 +- .../status_bookmark_folder_menu.js | 3 +- .../status_content/status_content.js | 14 +-- .../status_history_modal.js | 2 +- .../status_popover/status_popover.js | 2 +- .../still-image/still-image-emoji-popover.vue | 5 +- src/components/tab_switcher/tab_switcher.jsx | 5 +- src/components/thread_tree/thread_tree.js | 3 +- src/components/timeline/timeline.js | 22 ++-- src/components/timeline_menu/timeline_menu.js | 16 +-- .../update_notification.js | 7 +- src/components/user_avatar/user_avatar.js | 8 +- src/components/user_card/user_card.js | 71 ++++++------ src/components/user_link/user_link.vue | 2 +- .../user_list_menu/user_list_menu.js | 3 +- .../user_list_popover/user_list_popover.js | 7 +- src/components/user_panel/user_panel.js | 2 +- src/components/user_popover/user_popover.js | 2 +- src/components/user_profile/user_profile.js | 18 +-- .../user_reporting_modal.js | 10 +- .../user_timed_filter_modal.js | 2 +- .../who_to_follow_panel.js | 4 +- src/hocs/with_load_more/with_load_more.jsx | 5 +- .../with_subscription/with_subscription.jsx | 5 +- src/i18n/messages.js | 2 +- src/lib/persisted_state.js | 2 +- src/main.js | 13 +-- src/modules/adminSettings.js | 2 +- src/modules/api.js | 8 +- src/modules/chats.js | 4 +- src/modules/config.js | 8 +- src/modules/config_declaration.js | 1 + src/modules/index.js | 16 +-- src/modules/instance.js | 10 +- src/modules/notifications.js | 14 +-- src/modules/statuses.js | 22 ++-- src/modules/users.js | 31 +++-- src/services/api/api.service.js | 10 +- .../backend_interactor_service.js | 8 +- .../bookmark_folders_fetcher.service.js | 2 +- src/services/color_convert/color_convert.js | 2 +- src/services/completion/completion.js | 2 +- .../desktop_notification_utils.js | 5 +- .../entity_normalizer.service.js | 4 +- .../html_tree_converter.service.js | 2 +- src/services/locale/locale.service.js | 2 +- .../notification_utils/notification_utils.js | 9 +- src/services/poll/poll.service.js | 2 +- src/services/resettable_async_component.js | 2 +- src/services/style_setter/style_setter.js | 8 +- src/services/theme_data/iss_serializer.js | 2 +- src/services/theme_data/pleromafe.js | 2 +- .../theme_data/theme3_slot_functions.js | 2 +- src/services/theme_data/theme_data.service.js | 10 +- .../theme_data/theme_data_3.service.js | 23 ++-- .../timeline_fetcher.service.js | 3 +- .../user_highlighter/user_highlighter.js | 1 + src/stores/auth_flow.js | 2 +- src/stores/bookmark_folders.js | 2 +- src/stores/interface.js | 4 +- src/stores/lists.js | 3 +- src/stores/reports.js | 3 +- src/stores/serverSideStorage.js | 20 ++-- src/sw.js | 10 +- test/fixtures/mock_api.js | 4 +- test/fixtures/mock_store.js | 2 +- test/fixtures/setup_test.js | 4 +- test/unit/specs/boot/routes.spec.js | 2 +- test/unit/specs/components/draft.spec.js | 6 +- .../unit/specs/components/emoji_input.spec.js | 4 +- .../specs/components/user_profile.spec.js | 4 +- test/unit/specs/lib/persisted_state.spec.js | 4 +- .../specs/modules/serverSideStorage.spec.js | 12 +- test/unit/specs/modules/users.spec.js | 2 +- .../services/completion/completion.spec.js | 4 +- .../entity_normalizer.spec.js | 4 +- .../file_size_format/file_size_format.spec.js | 1 + .../services/html_converter/utility.spec.js | 2 +- .../theme_data/iss_deserializer.spec.js | 1 + test/unit/specs/stores/lists.spec.js | 2 +- test/unit/specs/stores/oauth.spec.js | 8 +- vite.config.js | 14 +-- 225 files changed, 1177 insertions(+), 1266 deletions(-) diff --git a/build/check-versions.mjs b/build/check-versions.mjs index 61f750e7b..8c5968a30 100644 --- a/build/check-versions.mjs +++ b/build/check-versions.mjs @@ -1,5 +1,5 @@ -import semver from 'semver' import chalk from 'chalk' +import semver from 'semver' import packageConfig from '../package.json' with { type: 'json' } diff --git a/build/copy_plugin.js b/build/copy_plugin.js index ad4d9617a..4f020f359 100644 --- a/build/copy_plugin.js +++ b/build/copy_plugin.js @@ -1,6 +1,6 @@ -import serveStatic from 'serve-static' -import { resolve } from 'node:path' import { cp } from 'node:fs/promises' +import { resolve } from 'node:path' +import serveStatic from 'serve-static' const getPrefix = (s) => { const padEnd = s.endsWith('/') ? s : s + '/' diff --git a/build/emojis_plugin.js b/build/emojis_plugin.js index 056da056e..4b3a2d33f 100644 --- a/build/emojis_plugin.js +++ b/build/emojis_plugin.js @@ -1,6 +1,6 @@ -import { resolve } from 'node:path' import { access } from 'node:fs/promises' -import { languages, langCodeToCldrName } from '../src/i18n/languages.js' +import { resolve } from 'node:path' +import { langCodeToCldrName, languages } from '../src/i18n/languages.js' const annotationsImportPrefix = '@kazvmoe-infra/unicode-emoji-json/annotations/' const specialAnnotationsLocale = { diff --git a/build/msw_plugin.js b/build/msw_plugin.js index 009546945..c4e9098c5 100644 --- a/build/msw_plugin.js +++ b/build/msw_plugin.js @@ -1,5 +1,5 @@ -import { resolve } from 'node:path' import { readFile } from 'node:fs/promises' +import { resolve } from 'node:path' const target = 'node_modules/msw/lib/mockServiceWorker.js' diff --git a/build/service_worker_messages.js b/build/service_worker_messages.js index 852963245..0ebd2b471 100644 --- a/build/service_worker_messages.js +++ b/build/service_worker_messages.js @@ -1,7 +1,7 @@ -import { languages, langCodeToJsonName } from '../src/i18n/languages.js' import { readFile } from 'node:fs/promises' import { dirname, resolve } from 'node:path' import { fileURLToPath } from 'node:url' +import { langCodeToJsonName, languages } from '../src/i18n/languages.js' const i18nDir = resolve( dirname(dirname(fileURLToPath(import.meta.url))), diff --git a/build/sw_plugin.js b/build/sw_plugin.js index c7f543e10..f9d17b376 100644 --- a/build/sw_plugin.js +++ b/build/sw_plugin.js @@ -1,8 +1,8 @@ -import { fileURLToPath } from 'node:url' -import { dirname, resolve } from 'node:path' import { readFile } from 'node:fs/promises' -import { build } from 'vite' +import { dirname, resolve } from 'node:path' +import { fileURLToPath } from 'node:url' import * as esbuild from 'esbuild' +import { build } from 'vite' import { generateServiceWorkerMessages, i18nFiles, diff --git a/eslint.config.mjs b/eslint.config.mjs index 9a670ccf9..60c36d246 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,5 +1,5 @@ -import vue from 'eslint-plugin-vue' import js from '@eslint/js' +import vue from 'eslint-plugin-vue' import globals from 'globals' export default [ diff --git a/src/App.js b/src/App.js index 91e6cbc4c..83e7f8ee5 100644 --- a/src/App.js +++ b/src/App.js @@ -1,27 +1,26 @@ -import UserPanel from './components/user_panel/user_panel.vue' -import NavPanel from './components/nav_panel/nav_panel.vue' -import InstanceSpecificPanel from './components/instance_specific_panel/instance_specific_panel.vue' -import FeaturesPanel from './components/features_panel/features_panel.vue' -import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_panel.vue' -import ShoutPanel from './components/shout_panel/shout_panel.vue' -import MediaModal from './components/media_modal/media_modal.vue' -import SideDrawer from './components/side_drawer/side_drawer.vue' -import MobilePostStatusButton from './components/mobile_post_status_button/mobile_post_status_button.vue' -import MobileNav from './components/mobile_nav/mobile_nav.vue' -import DesktopNav from './components/desktop_nav/desktop_nav.vue' -import UserReportingModal from './components/user_reporting_modal/user_reporting_modal.vue' -import EditStatusModal from './components/edit_status_modal/edit_status_modal.vue' -import PostStatusModal from './components/post_status_modal/post_status_modal.vue' -import StatusHistoryModal from './components/status_history_modal/status_history_modal.vue' -import GlobalNoticeList from './components/global_notice_list/global_notice_list.vue' -import { getOrCreateServiceWorker } from './services/sw/sw' -import { windowWidth, windowHeight } from './services/window_utils/window_utils' -import { mapGetters } from 'vuex' -import { defineAsyncComponent } from 'vue' -import { useShoutStore } from './stores/shout' -import { useInterfaceStore } from './stores/interface' - import { throttle } from 'lodash' +import { defineAsyncComponent } from 'vue' +import { mapGetters } from 'vuex' +import DesktopNav from './components/desktop_nav/desktop_nav.vue' +import EditStatusModal from './components/edit_status_modal/edit_status_modal.vue' +import FeaturesPanel from './components/features_panel/features_panel.vue' +import GlobalNoticeList from './components/global_notice_list/global_notice_list.vue' +import InstanceSpecificPanel from './components/instance_specific_panel/instance_specific_panel.vue' +import MediaModal from './components/media_modal/media_modal.vue' +import MobileNav from './components/mobile_nav/mobile_nav.vue' +import MobilePostStatusButton from './components/mobile_post_status_button/mobile_post_status_button.vue' +import NavPanel from './components/nav_panel/nav_panel.vue' +import PostStatusModal from './components/post_status_modal/post_status_modal.vue' +import ShoutPanel from './components/shout_panel/shout_panel.vue' +import SideDrawer from './components/side_drawer/side_drawer.vue' +import StatusHistoryModal from './components/status_history_modal/status_history_modal.vue' +import UserPanel from './components/user_panel/user_panel.vue' +import UserReportingModal from './components/user_reporting_modal/user_reporting_modal.vue' +import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_panel.vue' +import { getOrCreateServiceWorker } from './services/sw/sw' +import { windowHeight, windowWidth } from './services/window_utils/window_utils' +import { useInterfaceStore } from './stores/interface' +import { useShoutStore } from './stores/shout' export default { name: 'app', diff --git a/src/boot/after_store.js b/src/boot/after_store.js index c05fb7e55..1a2be5bd7 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -1,39 +1,39 @@ /* global process */ + +import vClickOutside from 'click-outside-vue3' import { createApp } from 'vue' import { createRouter, createWebHistory } from 'vue-router' -import vClickOutside from 'click-outside-vue3' import VueVirtualScroller from 'vue-virtual-scroller' import 'vue-virtual-scroller/dist/vue-virtual-scroller.css' +import { config } from '@fortawesome/fontawesome-svg-core' import { FontAwesomeIcon, FontAwesomeLayers, } from '@fortawesome/vue-fontawesome' -import { config } from '@fortawesome/fontawesome-svg-core' + config.autoAddCss = false -import App from '../App.vue' -import routes from './routes' import VBodyScrollLock from 'src/directives/body_scroll_lock' - import { - windowWidth, - windowHeight, -} from '../services/window_utils/window_utils' -import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js' -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 { useOAuthStore } from 'src/stores/oauth' -import { useI18nStore } from 'src/stores/i18n' -import { useInterfaceStore } from 'src/stores/interface' + instanceDefaultConfig, + staticOrApiConfigDefault, +} from 'src/modules/default_config_state.js' import { useAnnouncementsStore } from 'src/stores/announcements' import { useAuthFlowStore } from 'src/stores/auth_flow' +import { useI18nStore } from 'src/stores/i18n' +import { useInterfaceStore } from 'src/stores/interface' +import { useOAuthStore } from 'src/stores/oauth' +import App from '../App.vue' +import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js' +import FaviconService from '../services/favicon_service/favicon_service.js' +import { applyConfig } from '../services/style_setter/style_setter.js' +import { initServiceWorker, updateFocus } from '../services/sw/sw.js' import { - staticOrApiConfigDefault, - instanceDefaultConfig, -} from 'src/modules/default_config_state.js' + windowHeight, + windowWidth, +} from '../services/window_utils/window_utils' +import routes from './routes' let staticInitialResults = null diff --git a/src/boot/routes.js b/src/boot/routes.js index b0b90a8d7..c601531a9 100644 --- a/src/boot/routes.js +++ b/src/boot/routes.js @@ -1,35 +1,35 @@ -import PublicTimeline from 'components/public_timeline/public_timeline.vue' -import BubbleTimeline from 'components/bubble_timeline/bubble_timeline.vue' -import PublicAndExternalTimeline from 'components/public_and_external_timeline/public_and_external_timeline.vue' -import FriendsTimeline from 'components/friends_timeline/friends_timeline.vue' -import TagTimeline from 'components/tag_timeline/tag_timeline.vue' -import BookmarkTimeline from 'components/bookmark_timeline/bookmark_timeline.vue' -import ConversationPage from 'components/conversation-page/conversation-page.vue' -import Interactions from 'components/interactions/interactions.vue' -import DMs from 'components/dm_timeline/dm_timeline.vue' -import ChatList from 'components/chat_list/chat_list.vue' -import Chat from 'components/chat/chat.vue' -import UserProfile from 'components/user_profile/user_profile.vue' -import Search from 'components/search/search.vue' -import Registration from 'components/registration/registration.vue' -import PasswordReset from 'components/password_reset/password_reset.vue' -import FollowRequests from 'components/follow_requests/follow_requests.vue' -import OAuthCallback from 'components/oauth_callback/oauth_callback.vue' -import Notifications from 'components/notifications/notifications.vue' -import AuthForm from 'components/auth_form/auth_form.js' -import ShoutPanel from 'components/shout_panel/shout_panel.vue' -import WhoToFollow from 'components/who_to_follow/who_to_follow.vue' import About from 'components/about/about.vue' -import RemoteUserResolver from 'components/remote_user_resolver/remote_user_resolver.vue' -import Lists from 'components/lists/lists.vue' -import ListsTimeline from 'components/lists_timeline/lists_timeline.vue' -import ListsEdit from 'components/lists_edit/lists_edit.vue' -import NavPanel from 'src/components/nav_panel/nav_panel.vue' import AnnouncementsPage from 'components/announcements_page/announcements_page.vue' -import QuotesTimeline from '../components/quotes_timeline/quotes_timeline.vue' +import AuthForm from 'components/auth_form/auth_form.js' +import BookmarkTimeline from 'components/bookmark_timeline/bookmark_timeline.vue' +import BubbleTimeline from 'components/bubble_timeline/bubble_timeline.vue' +import Chat from 'components/chat/chat.vue' +import ChatList from 'components/chat_list/chat_list.vue' +import ConversationPage from 'components/conversation-page/conversation-page.vue' +import DMs from 'components/dm_timeline/dm_timeline.vue' import Drafts from 'components/drafts/drafts.vue' -import BookmarkFolders from '../components/bookmark_folders/bookmark_folders.vue' +import FollowRequests from 'components/follow_requests/follow_requests.vue' +import FriendsTimeline from 'components/friends_timeline/friends_timeline.vue' +import Interactions from 'components/interactions/interactions.vue' +import Lists from 'components/lists/lists.vue' +import ListsEdit from 'components/lists_edit/lists_edit.vue' +import ListsTimeline from 'components/lists_timeline/lists_timeline.vue' +import Notifications from 'components/notifications/notifications.vue' +import OAuthCallback from 'components/oauth_callback/oauth_callback.vue' +import PasswordReset from 'components/password_reset/password_reset.vue' +import PublicAndExternalTimeline from 'components/public_and_external_timeline/public_and_external_timeline.vue' +import PublicTimeline from 'components/public_timeline/public_timeline.vue' +import Registration from 'components/registration/registration.vue' +import RemoteUserResolver from 'components/remote_user_resolver/remote_user_resolver.vue' +import Search from 'components/search/search.vue' +import ShoutPanel from 'components/shout_panel/shout_panel.vue' +import TagTimeline from 'components/tag_timeline/tag_timeline.vue' +import UserProfile from 'components/user_profile/user_profile.vue' +import WhoToFollow from 'components/who_to_follow/who_to_follow.vue' +import NavPanel from 'src/components/nav_panel/nav_panel.vue' import BookmarkFolderEdit from '../components/bookmark_folder_edit/bookmark_folder_edit.vue' +import BookmarkFolders from '../components/bookmark_folders/bookmark_folders.vue' +import QuotesTimeline from '../components/quotes_timeline/quotes_timeline.vue' export default (store) => { const validateAuthenticatedRoute = (to, from, next) => { diff --git a/src/components/about/about.js b/src/components/about/about.js index 19ac8a7b6..d091dfd0a 100644 --- a/src/components/about/about.js +++ b/src/components/about/about.js @@ -1,8 +1,8 @@ -import InstanceSpecificPanel from '../instance_specific_panel/instance_specific_panel.vue' import FeaturesPanel from '../features_panel/features_panel.vue' -import TermsOfServicePanel from '../terms_of_service_panel/terms_of_service_panel.vue' -import StaffPanel from '../staff_panel/staff_panel.vue' +import InstanceSpecificPanel from '../instance_specific_panel/instance_specific_panel.vue' import MRFTransparencyPanel from '../mrf_transparency_panel/mrf_transparency_panel.vue' +import StaffPanel from '../staff_panel/staff_panel.vue' +import TermsOfServicePanel from '../terms_of_service_panel/terms_of_service_panel.vue' const About = { components: { diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js index 93b906bc0..184c2b623 100644 --- a/src/components/account_actions/account_actions.js +++ b/src/components/account_actions/account_actions.js @@ -1,12 +1,12 @@ -import { mapState } from 'vuex' -import ProgressButton from '../progress_button/progress_button.vue' -import Popover from '../popover/popover.vue' -import UserListMenu from 'src/components/user_list_menu/user_list_menu.vue' -import ConfirmModal from '../confirm_modal/confirm_modal.vue' -import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue' import { library } from '@fortawesome/fontawesome-svg-core' import { faEllipsisV } from '@fortawesome/free-solid-svg-icons' +import UserListMenu from 'src/components/user_list_menu/user_list_menu.vue' +import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue' import { useReportsStore } from 'src/stores/reports' +import { mapState } from 'vuex' +import ConfirmModal from '../confirm_modal/confirm_modal.vue' +import Popover from '../popover/popover.vue' +import ProgressButton from '../progress_button/progress_button.vue' library.add(faEllipsisV) diff --git a/src/components/announcement/announcement.js b/src/components/announcement/announcement.js index ffb646320..356852cff 100644 --- a/src/components/announcement/announcement.js +++ b/src/components/announcement/announcement.js @@ -1,8 +1,8 @@ +import { useAnnouncementsStore } from 'src/stores/announcements' import { mapState } from 'vuex' +import localeService from '../../services/locale/locale.service.js' 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 'src/stores/announcements' const Announcement = { components: { diff --git a/src/components/announcements_page/announcements_page.js b/src/components/announcements_page/announcements_page.js index 6d1671e83..d3429613c 100644 --- a/src/components/announcements_page/announcements_page.js +++ b/src/components/announcements_page/announcements_page.js @@ -1,7 +1,7 @@ +import { useAnnouncementsStore } from 'src/stores/announcements' import { mapState } from 'vuex' import Announcement from '../announcement/announcement.vue' import AnnouncementEditor from '../announcement_editor/announcement_editor.vue' -import { useAnnouncementsStore } from 'src/stores/announcements' const AnnouncementsPage = { components: { diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js index 22228d4af..8c7700c8a 100644 --- a/src/components/attachment/attachment.js +++ b/src/components/attachment/attachment.js @@ -1,24 +1,24 @@ -import StillImage from '../still-image/still-image.vue' -import Flash from '../flash/flash.vue' -import VideoAttachment from '../video_attachment/video_attachment.vue' -import nsfwImage from '../../assets/nsfw.png' -import fileTypeService from '../../services/file_type/file_type.service.js' -import { mapGetters } from 'vuex' import { library } from '@fortawesome/fontawesome-svg-core' import { - faFile, - faMusic, - faImage, - faVideo, - faPlayCircle, - faTimes, - faStop, - faSearchPlus, - faTrashAlt, - faPencilAlt, faAlignRight, + faFile, + faImage, + faMusic, + faPencilAlt, + faPlayCircle, + faSearchPlus, + faStop, + faTimes, + faTrashAlt, + faVideo, } from '@fortawesome/free-solid-svg-icons' import { useMediaViewerStore } from 'src/stores/media_viewer' +import { mapGetters } from 'vuex' +import nsfwImage from '../../assets/nsfw.png' +import fileTypeService from '../../services/file_type/file_type.service.js' +import Flash from '../flash/flash.vue' +import StillImage from '../still-image/still-image.vue' +import VideoAttachment from '../video_attachment/video_attachment.vue' library.add( faFile, diff --git a/src/components/auth_form/auth_form.js b/src/components/auth_form/auth_form.js index 5ebf5c418..1e9b86c57 100644 --- a/src/components/auth_form/auth_form.js +++ b/src/components/auth_form/auth_form.js @@ -1,9 +1,9 @@ +import { mapState } from 'pinia' +import { useAuthFlowStore } from 'src/stores/auth_flow' import { h, resolveComponent } from 'vue' import LoginForm from '../login_form/login_form.vue' import MFARecoveryForm from '../mfa_form/recovery_form.vue' import MFATOTPForm from '../mfa_form/totp_form.vue' -import { mapState } from 'pinia' -import { useAuthFlowStore } from 'src/stores/auth_flow' const AuthForm = { name: 'AuthForm', diff --git a/src/components/avatar_list/avatar_list.js b/src/components/avatar_list/avatar_list.js index 7ef42cf2b..aad157686 100644 --- a/src/components/avatar_list/avatar_list.js +++ b/src/components/avatar_list/avatar_list.js @@ -1,5 +1,5 @@ -import UserAvatar from '../user_avatar/user_avatar.vue' import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' +import UserAvatar from '../user_avatar/user_avatar.vue' const AvatarList = { props: ['users'], diff --git a/src/components/basic_user_card/basic_user_card.js b/src/components/basic_user_card/basic_user_card.js index 018c80065..cc4cbce44 100644 --- a/src/components/basic_user_card/basic_user_card.js +++ b/src/components/basic_user_card/basic_user_card.js @@ -1,8 +1,8 @@ -import UserPopover from '../user_popover/user_popover.vue' -import UserAvatar from '../user_avatar/user_avatar.vue' -import UserLink from '../user_link/user_link.vue' import RichContent from 'src/components/rich_content/rich_content.jsx' import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' +import UserAvatar from '../user_avatar/user_avatar.vue' +import UserLink from '../user_link/user_link.vue' +import UserPopover from '../user_popover/user_popover.vue' const BasicUserCard = { props: ['user'], diff --git a/src/components/bookmark_folder_edit/bookmark_folder_edit.js b/src/components/bookmark_folder_edit/bookmark_folder_edit.js index 822f47f3c..a658a0f40 100644 --- a/src/components/bookmark_folder_edit/bookmark_folder_edit.js +++ b/src/components/bookmark_folder_edit/bookmark_folder_edit.js @@ -1,7 +1,7 @@ -import EmojiPicker from '../emoji_picker/emoji_picker.vue' -import apiService from '../../services/api/api.service' -import { useInterfaceStore } from 'src/stores/interface' import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders' +import { useInterfaceStore } from 'src/stores/interface' +import apiService from '../../services/api/api.service' +import EmojiPicker from '../emoji_picker/emoji_picker.vue' const BookmarkFolderEdit = { data() { diff --git a/src/components/bookmark_folders/bookmark_folders.js b/src/components/bookmark_folders/bookmark_folders.js index 15d2c925c..8e09abb31 100644 --- a/src/components/bookmark_folders/bookmark_folders.js +++ b/src/components/bookmark_folders/bookmark_folders.js @@ -1,5 +1,5 @@ -import BookmarkFolderCard from '../bookmark_folder_card/bookmark_folder_card.vue' import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders' +import BookmarkFolderCard from '../bookmark_folder_card/bookmark_folder_card.vue' const BookmarkFolders = { data() { diff --git a/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js b/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js index 944484b74..cc8135334 100644 --- a/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js +++ b/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js @@ -1,6 +1,6 @@ import { mapState } from 'pinia' -import NavigationEntry from 'src/components/navigation/navigation_entry.vue' import { getBookmarkFolderEntries } from 'src/components/navigation/filter.js' +import NavigationEntry from 'src/components/navigation/navigation_entry.vue' import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders' export const BookmarkFoldersMenuContent = { diff --git a/src/components/bubble_timeline/bubble_timeline.js b/src/components/bubble_timeline/bubble_timeline.js index f4d3994db..d3835e0e8 100644 --- a/src/components/bubble_timeline/bubble_timeline.js +++ b/src/components/bubble_timeline/bubble_timeline.js @@ -1,4 +1,5 @@ import Timeline from '../timeline/timeline.vue' + const BubbleTimeline = { components: { Timeline, diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js index 77a80c8b9..2a0d91761 100644 --- a/src/components/chat/chat.js +++ b/src/components/chat/chat.js @@ -1,22 +1,22 @@ +import { library } from '@fortawesome/fontawesome-svg-core' +import { faChevronDown, faChevronLeft } from '@fortawesome/free-solid-svg-icons' import _ from 'lodash' -import { WSConnectionStatus } from '../../services/api/api.service.js' -import { mapGetters, mapState } from 'vuex' import { mapState as mapPiniaState } from 'pinia' -import ChatMessage from '../chat_message/chat_message.vue' -import PostStatusForm from '../post_status_form/post_status_form.vue' -import ChatTitle from '../chat_title/chat_title.vue' +import { useInterfaceStore } from 'src/stores/interface.js' +import { mapGetters, mapState } from 'vuex' +import { WSConnectionStatus } from '../../services/api/api.service.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' +import ChatMessage from '../chat_message/chat_message.vue' +import ChatTitle from '../chat_title/chat_title.vue' +import PostStatusForm from '../post_status_form/post_status_form.vue' import { - getScrollPosition, getNewTopPosition, + getScrollPosition, isBottomedOut, isScrollable, } from './chat_layout_utils.js' -import { library } from '@fortawesome/fontawesome-svg-core' -import { faChevronDown, faChevronLeft } from '@fortawesome/free-solid-svg-icons' -import { buildFakeMessage } from '../../services/chat_utils/chat_utils.js' -import { useInterfaceStore } from 'src/stores/interface.js' library.add(faChevronDown, faChevronLeft) diff --git a/src/components/chat_list/chat_list.js b/src/components/chat_list/chat_list.js index 65e8b02d6..8081d0670 100644 --- a/src/components/chat_list/chat_list.js +++ b/src/components/chat_list/chat_list.js @@ -1,4 +1,4 @@ -import { mapState, mapGetters } from 'vuex' +import { mapGetters, mapState } from 'vuex' import ChatListItem from '../chat_list_item/chat_list_item.vue' import ChatNew from '../chat_new/chat_new.vue' import List from '../list/list.vue' diff --git a/src/components/chat_list_item/chat_list_item.js b/src/components/chat_list_item/chat_list_item.js index 2fbc9bae8..ba8f5528b 100644 --- a/src/components/chat_list_item/chat_list_item.js +++ b/src/components/chat_list_item/chat_list_item.js @@ -1,10 +1,10 @@ -import { mapState } from 'vuex' -import StatusBody from '../status_content/status_content.vue' import fileType from 'src/services/file_type/file_type.service' -import UserAvatar from '../user_avatar/user_avatar.vue' +import { mapState } from 'vuex' import AvatarList from '../avatar_list/avatar_list.vue' -import Timeago from '../timeago/timeago.vue' import ChatTitle from '../chat_title/chat_title.vue' +import StatusBody from '../status_content/status_content.vue' +import Timeago from '../timeago/timeago.vue' +import UserAvatar from '../user_avatar/user_avatar.vue' const ChatListItem = { name: 'ChatListItem', diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js index 6b2315a82..0d3876ab6 100644 --- a/src/components/chat_message/chat_message.js +++ b/src/components/chat_message/chat_message.js @@ -1,16 +1,16 @@ -import { mapState, mapGetters } from 'vuex' +import { library } from '@fortawesome/fontawesome-svg-core' +import { faEllipsisH, faTimes } from '@fortawesome/free-solid-svg-icons' import { mapState as mapPiniaState } from 'pinia' -import Popover from '../popover/popover.vue' +import { useInterfaceStore } from 'src/stores/interface' +import { defineAsyncComponent } from 'vue' +import { mapGetters, mapState } from 'vuex' import Attachment from '../attachment/attachment.vue' -import UserAvatar from '../user_avatar/user_avatar.vue' +import ChatMessageDate from '../chat_message_date/chat_message_date.vue' import Gallery from '../gallery/gallery.vue' import LinkPreview from '../link-preview/link-preview.vue' +import Popover from '../popover/popover.vue' import StatusContent from '../status_content/status_content.vue' -import ChatMessageDate from '../chat_message_date/chat_message_date.vue' -import { defineAsyncComponent } from 'vue' -import { library } from '@fortawesome/fontawesome-svg-core' -import { faTimes, faEllipsisH } from '@fortawesome/free-solid-svg-icons' -import { useInterfaceStore } from 'src/stores/interface' +import UserAvatar from '../user_avatar/user_avatar.vue' library.add(faTimes, faEllipsisH) diff --git a/src/components/chat_new/chat_new.js b/src/components/chat_new/chat_new.js index 8e2a8dacb..d9f73193c 100644 --- a/src/components/chat_new/chat_new.js +++ b/src/components/chat_new/chat_new.js @@ -1,8 +1,8 @@ -import { mapState, mapGetters } from 'vuex' +import { library } from '@fortawesome/fontawesome-svg-core' +import { faChevronLeft, faSearch } from '@fortawesome/free-solid-svg-icons' +import { mapGetters, mapState } from 'vuex' import BasicUserCard from '../basic_user_card/basic_user_card.vue' import UserAvatar from '../user_avatar/user_avatar.vue' -import { library } from '@fortawesome/fontawesome-svg-core' -import { faSearch, faChevronLeft } from '@fortawesome/free-solid-svg-icons' library.add(faSearch, faChevronLeft) diff --git a/src/components/chat_title/chat_title.js b/src/components/chat_title/chat_title.js index 0d5ba93e0..7748f8973 100644 --- a/src/components/chat_title/chat_title.js +++ b/src/components/chat_title/chat_title.js @@ -1,6 +1,6 @@ -import UserAvatar from '../user_avatar/user_avatar.vue' import RichContent from 'src/components/rich_content/rich_content.jsx' import { defineAsyncComponent } from 'vue' +import UserAvatar from '../user_avatar/user_avatar.vue' export default { name: 'ChatTitle', diff --git a/src/components/color_input/color_input.vue b/src/components/color_input/color_input.vue index 8367908d9..76a00416c 100644 --- a/src/components/color_input/color_input.vue +++ b/src/components/color_input/color_input.vue @@ -64,12 +64,11 @@