From c05381e6aa5a913509d1769397104b15e7d7e8ef Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 13 May 2026 16:12:52 +0300 Subject: [PATCH] lint --- src/boot/after_store.js | 6 ++++-- src/components/about/about.js | 6 +++++- src/components/about/about.vue | 4 +++- .../basic_user_card/basic_user_card.js | 2 +- src/components/chat_title/chat_title.js | 2 ++ src/components/color_input/color_input.vue | 1 + src/components/drafts/drafts.js | 10 ++++++---- src/components/emoji_input/emoji_input.vue | 2 +- src/components/gallery/gallery.js | 2 +- .../mrf_transparency_panel.js | 10 +++------- .../post_status_form/post_status_form.js | 7 ++----- .../post_status_form/post_status_form.vue | 2 +- src/components/rich_content/rich_content.jsx | 8 +++++++- .../settings_modal/helpers/number_setting.vue | 14 +++++++------- .../settings_modal/tabs/developer_tab.js | 7 ++++++- .../status_action_buttons.vue | 2 +- src/components/user_card/user_card.js | 4 ++-- src/components/user_card/user_card.vue | 1 + .../user_list_popover/user_list_popover.js | 4 ++-- src/components/user_profile/user_profile.js | 2 +- src/modules/drafts.js | 2 +- .../notification_utils/notification_utils.js | 5 ++++- src/services/status_parser/status_parser.js | 18 +++++++++++++----- .../theme_data/theme_data_3.service.js | 5 +---- src/stores/sync_config.js | 4 +--- src/stores/user_highlight.js | 5 ++++- 26 files changed, 81 insertions(+), 54 deletions(-) diff --git a/src/boot/after_store.js b/src/boot/after_store.js index 678a5e7d1..e18cfa788 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -175,14 +175,16 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => { if (source === 'name') return if (INSTANCE_IDENTIY_EXTERNAL.has(source)) return useInstanceStore().set({ - value: config[source] ?? INSTANCE_IDENTITY_DEFAULT_DEFINITIONS[source].default, + value: + config[source] ?? INSTANCE_IDENTITY_DEFAULT_DEFINITIONS[source].default, path: `instanceIdentity.${source}`, }) }) Object.keys(INSTANCE_DEFAULT_CONFIG_DEFINITIONS).forEach((source) => useInstanceStore().set({ - value: config[source] ?? INSTANCE_DEFAULT_CONFIG_DEFINITIONS[source].default, + value: + config[source] ?? INSTANCE_DEFAULT_CONFIG_DEFINITIONS[source].default, path: `prefsStorage.${source}`, }), ) diff --git a/src/components/about/about.js b/src/components/about/about.js index dc6733491..e6a1067fe 100644 --- a/src/components/about/about.js +++ b/src/components/about/about.js @@ -27,7 +27,11 @@ const About = { frontendVersionLink() { return pleromaFeCommitUrl + this.frontendVersion }, - ...mapState(useInstanceStore, ['backendVersion', 'backendRepository', 'frontendVersion']), + ...mapState(useInstanceStore, [ + 'backendVersion', + 'backendRepository', + 'frontendVersion', + ]), showInstanceSpecificPanel() { return ( useInstanceStore().instanceIdentity.showInstanceSpecificPanel && diff --git a/src/components/about/about.vue b/src/components/about/about.vue index df395c7dd..f7bc0d00d 100644 --- a/src/components/about/about.vue +++ b/src/components/about/about.vue @@ -7,7 +7,9 @@
-
{{ $t('settings.version.title') }}
+
+ {{ $t('settings.version.title') }} +
diff --git a/src/components/basic_user_card/basic_user_card.js b/src/components/basic_user_card/basic_user_card.js index a42293cc1..722d459f3 100644 --- a/src/components/basic_user_card/basic_user_card.js +++ b/src/components/basic_user_card/basic_user_card.js @@ -29,7 +29,7 @@ const BasicUserCard = { allowNonSquareEmoji() { return useMergedConfigStore().mergedConfig.nonSquareEmoji }, - } + }, } export default BasicUserCard diff --git a/src/components/chat_title/chat_title.js b/src/components/chat_title/chat_title.js index 7ec4c81f1..54a31a6fe 100644 --- a/src/components/chat_title/chat_title.js +++ b/src/components/chat_title/chat_title.js @@ -3,6 +3,8 @@ import { defineAsyncComponent } from 'vue' import RichContent from 'src/components/rich_content/rich_content.jsx' import UserAvatar from '../user_avatar/user_avatar.vue' +import { useMergedConfigStore } from 'src/stores/merged_config.js' + export default { name: 'ChatTitle', components: { diff --git a/src/components/color_input/color_input.vue b/src/components/color_input/color_input.vue index 6f236d35f..07aed6b81 100644 --- a/src/components/color_input/color_input.vue +++ b/src/components/color_input/color_input.vue @@ -88,6 +88,7 @@ export default { label: { required: false, type: String, + default: '', }, // use unstyled, uh, style unstyled: { diff --git a/src/components/drafts/drafts.js b/src/components/drafts/drafts.js index 01a50759a..87c22138b 100644 --- a/src/components/drafts/drafts.js +++ b/src/components/drafts/drafts.js @@ -1,6 +1,6 @@ +import ConfirmModal from 'src/components/confirm_modal/confirm_modal.vue' import Draft from 'src/components/draft/draft.vue' import List from 'src/components/list/list.vue' -import ConfirmModal from 'src/components/confirm_modal/confirm_modal.vue' const Drafts = { components: { @@ -10,7 +10,7 @@ const Drafts = { }, data() { return { - showingConfirmDialog: false + showingConfirmDialog: false, } }, computed: { @@ -23,12 +23,14 @@ const Drafts = { this.showingConfirmDialog = true }, doAbandonAll() { - this.$store.dispatch('abandonAllDrafts').then(() => this.hideConfirmDialog()) + this.$store + .dispatch('abandonAllDrafts') + .then(() => this.hideConfirmDialog()) }, hideConfirmDialog() { this.showingConfirmDialog = false }, - } + }, } export default Drafts diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue index b362db32f..526f646ab 100644 --- a/src/components/emoji_input/emoji_input.vue +++ b/src/components/emoji_input/emoji_input.vue @@ -2,7 +2,7 @@
{ - const peek = attachments[i+1] + const peek = attachments[i + 1] const nextEnd = peek == null const nextWide = !nextEnd && !displayTypes.has(peek?.type) diff --git a/src/components/mrf_transparency_panel/mrf_transparency_panel.js b/src/components/mrf_transparency_panel/mrf_transparency_panel.js index d77a0a839..b2048984d 100644 --- a/src/components/mrf_transparency_panel/mrf_transparency_panel.js +++ b/src/components/mrf_transparency_panel/mrf_transparency_panel.js @@ -1,5 +1,6 @@ import { get } from 'lodash' import { mapState } from 'pinia' + import { useInstanceStore } from 'src/stores/instance.js' /** @@ -21,16 +22,11 @@ const MRFTransparencyPanel = { computed: { ...mapState(useInstanceStore, { federationPolicy: (state) => state.federationPolicy, - mrfPolicies: (state) => - get(state, 'federationPolicy.mrf_policies', []), + mrfPolicies: (state) => get(state, 'federationPolicy.mrf_policies', []), quarantineInstances: (state) => toInstanceReasonObject( get(state, 'federationPolicy.quarantined_instances', []), - get( - state, - 'federationPolicy.quarantined_instances_info', - [], - ), + get(state, 'federationPolicy.quarantined_instances_info', []), 'quarantined_instances', ), acceptInstances: (state) => diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 805b46745..6dfe48925 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -378,13 +378,10 @@ const PostStatusForm = { this.newStatus.hasQuote = value this.newStatus.quote.thread = value this.newStatus.quote.id = value ? this.replyTo : '' - } + }, }, defaultQuotable() { - if ( - !this.quotingAvailable || - !this.isReply - ) { + if (!this.quotingAvailable || !this.isReply) { return false } diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index 3d5e27d77..d37d0a90f 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -264,10 +264,10 @@ /> diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx index 95ab102c6..fc17a529f 100644 --- a/src/components/rich_content/rich_content.jsx +++ b/src/components/rich_content/rich_content.jsx @@ -328,7 +328,13 @@ export default { // slots updated -> rerender -> emit -> update up the tree -> rerender -> ... // at least until vue3? const result = ( - + {this.collapse ? pass2.map((x) => { if (!Array.isArray(x)) return x.replace(/\n/g, ' ') diff --git a/src/components/settings_modal/helpers/number_setting.vue b/src/components/settings_modal/helpers/number_setting.vue index 3a6434e9e..a53be93c3 100644 --- a/src/components/settings_modal/helpers/number_setting.vue +++ b/src/components/settings_modal/helpers/number_setting.vue @@ -9,13 +9,13 @@ class="setting-label" :class="{ 'faint': shouldBeDisabled }" > - - - {{ ' ' }} - + + + {{ ' ' }} + diff --git a/src/components/settings_modal/tabs/developer_tab.js b/src/components/settings_modal/tabs/developer_tab.js index 7558785f5..9a6258638 100644 --- a/src/components/settings_modal/tabs/developer_tab.js +++ b/src/components/settings_modal/tabs/developer_tab.js @@ -1,4 +1,5 @@ import { mapState } from 'pinia' + import BooleanSetting from '../helpers/boolean_setting.vue' import SharedComputedObject from '../helpers/shared_computed_object.js' @@ -17,7 +18,11 @@ const VersionTab = { frontendVersionLink() { return pleromaFeCommitUrl + this.frontendVersion }, - ...mapState(useInstanceStore, ['backendVersion', 'backendRepository', 'frontendVersion']), + ...mapState(useInstanceStore, [ + 'backendVersion', + 'backendRepository', + 'frontendVersion', + ]), ...SharedComputedObject(), }, methods: { diff --git a/src/components/status_action_buttons/status_action_buttons.vue b/src/components/status_action_buttons/status_action_buttons.vue index 6c0fab542..3837e6ae5 100644 --- a/src/components/status_action_buttons/status_action_buttons.vue +++ b/src/components/status_action_buttons/status_action_buttons.vue @@ -3,7 +3,7 @@ + > {{ isKnownTag ? $t('user_card.tags.' + tag) : tag }} diff --git a/src/components/user_list_popover/user_list_popover.js b/src/components/user_list_popover/user_list_popover.js index 8f8b09fb5..6f79939da 100644 --- a/src/components/user_list_popover/user_list_popover.js +++ b/src/components/user_list_popover/user_list_popover.js @@ -3,11 +3,11 @@ import { defineAsyncComponent } from 'vue' import RichContent from 'src/components/rich_content/rich_content.jsx' import UnicodeDomainIndicator from '../unicode_domain_indicator/unicode_domain_indicator.vue' +import { useMergedConfigStore } from 'src/stores/merged_config.js' + import { library } from '@fortawesome/fontawesome-svg-core' import { faCircleNotch } from '@fortawesome/free-solid-svg-icons' -import { useMergedConfigStore } from 'src/stores/merged_config.js' - library.add(faCircleNotch) const UserListPopover = { diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js index 5ae5b81a4..17d69f49b 100644 --- a/src/components/user_profile/user_profile.js +++ b/src/components/user_profile/user_profile.js @@ -10,9 +10,9 @@ import List from '../list/list.vue' import Timeline from '../timeline/timeline.vue' import UserCard from '../user_card/user_card.vue' -import { useMergedConfigStore } from 'src/stores/merged_config.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 { library } from '@fortawesome/fontawesome-svg-core' import { faCircleNotch } from '@fortawesome/free-solid-svg-icons' diff --git a/src/modules/drafts.js b/src/modules/drafts.js index 42bb3b313..3cde4f574 100644 --- a/src/modules/drafts.js +++ b/src/modules/drafts.js @@ -44,7 +44,7 @@ const saveDraftToStorage = async (draft) => { const deleteDraftFromStorage = async (ids) => { const currentData = await getStorageData() - ids.forEach(id => { + ids.forEach((id) => { delete currentData[id] }) await storage.setItem(storageKey, currentData) diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js index 1fbaf2a2c..921600094 100644 --- a/src/services/notification_utils/notification_utils.js +++ b/src/services/notification_utils/notification_utils.js @@ -81,7 +81,10 @@ export const maybeShowNotification = ( if (notification.seen) return if (!visibleTypes(notificationVisibility).includes(notification.type)) return - if (notification.type === 'mention' && isMutedNotification(muteFilters, notification)) + if ( + notification.type === 'mention' && + isMutedNotification(muteFilters, notification) + ) return const notificationObject = prepareNotificationObject( diff --git a/src/services/status_parser/status_parser.js b/src/services/status_parser/status_parser.js index c6ceb1f0a..a011fe265 100644 --- a/src/services/status_parser/status_parser.js +++ b/src/services/status_parser/status_parser.js @@ -10,7 +10,15 @@ export const muteFilterHits = (muteFilters, status) => { return muteFilters .toSorted((a, b) => b.order - a.order) .map((filter) => { - const { hide, expires, name, value, type, enabled, caseSensitive = false } = filter + const { + hide, + expires, + name, + value, + type, + enabled, + caseSensitive = false, + } = filter if (!enabled) return false if (value === '') return false if (expires !== null && expires < Date.now()) return false @@ -18,9 +26,7 @@ export const muteFilterHits = (muteFilters, status) => { case 'word': { let match = false if (caseSensitive) { - match = - statusText.includes(value) || - statusSummary.includes(value) + match = statusText.includes(value) || statusSummary.includes(value) } else { const lowercaseValue = value.toLowerCase() match = @@ -56,7 +62,9 @@ export const muteFilterHits = (muteFilters, status) => { match = poster.toLowerCase().includes(lowercaseValue) || replyToUser.toLowerCase().includes(lowercaseValue) || - mentions.some((mention) => mention.toLowerCase().includes(lowercaseValue)) + mentions.some((mention) => + mention.toLowerCase().includes(lowercaseValue), + ) } if (match) { return { hide, name } diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js index 7babbaf32..62666d5f8 100644 --- a/src/services/theme_data/theme_data_3.service.js +++ b/src/services/theme_data/theme_data_3.service.js @@ -499,10 +499,7 @@ export const init = ({ }), ) const lastVariantRule = variantRules[variantRules.length - 1] - const lastVariantSelector = ruleToSelector( - lastVariantRule, - true, - ) + const lastVariantSelector = ruleToSelector(lastVariantRule, true) if (lastVariantRule && lastVariantSelector !== selector) { inheritRule = lastVariantRule diff --git a/src/stores/sync_config.js b/src/stores/sync_config.js index 722dd7f16..1caa2b030 100644 --- a/src/stores/sync_config.js +++ b/src/stores/sync_config.js @@ -14,8 +14,8 @@ import { uniqWith, unset, } from 'lodash' -import { v4 as uuidv4 } from 'uuid' import { defineStore } from 'pinia' +import { v4 as uuidv4 } from 'uuid' import { toRaw } from 'vue' import { CURRENT_UPDATE_COUNTER } from 'src/components/update_notification/update_notification.js' @@ -684,8 +684,6 @@ export const useSyncConfigStore = defineStore('sync_config', { `Already migrated Values: ${[...migratedEntries].join() || '[none]'}`, ) - const { configMigration } = useSyncConfigStore().flagStorage - Object.entries(oldDefaultConfigSync).forEach(([key, value]) => { const oldValue = config[key] const defaultValue = value diff --git a/src/stores/user_highlight.js b/src/stores/user_highlight.js index 5ca13b6a9..f41c41628 100644 --- a/src/stores/user_highlight.js +++ b/src/stores/user_highlight.js @@ -292,7 +292,10 @@ export const useUserHighlightStore = defineStore('user_highlight', { ) } }) - storage.setItem('vuex-lz', { ...vuexState, config: { ...config, highlight } }) + storage.setItem('vuex-lz', { + ...vuexState, + config: { ...config, highlight }, + }) if (recent === null) { console.debug(