From 08f7e7d9b35ed384671b1918c4b6d16fd1181f82 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Mon, 10 Mar 2025 10:51:54 +0900 Subject: [PATCH] refactor(frontend): rename pizzax fields --- ...lugin-unwind-css-module-class-name.test.ts | 4 +- packages/frontend/src/boot/common.ts | 12 +- packages/frontend/src/boot/main-boot.ts | 148 +++++++++--------- .../src/components/MkAutocomplete.vue | 6 +- .../frontend/src/components/MkCaptcha.vue | 2 +- packages/frontend/src/components/MkChart.vue | 2 +- .../frontend/src/components/MkCode.core.vue | 2 +- .../frontend/src/components/MkEmojiPicker.vue | 10 +- .../src/components/MkFollowButton.vue | 4 +- .../frontend/src/components/MkHeatmap.vue | 2 +- .../frontend/src/components/MkPostForm.vue | 8 +- .../src/components/MkRetentionHeatmap.vue | 2 +- .../src/components/MkRetentionLineChart.vue | 2 +- .../frontend/src/components/MkUrlPreview.vue | 2 +- .../src/components/MkUserSelectDialog.vue | 4 +- .../src/components/MkUserSetupDialog.vue | 2 +- .../MkVisitorDashboard.ActiveUsersChart.vue | 2 +- .../frontend/src/components/global/MkAd.vue | 4 +- .../src/components/global/MkFooterSpacer.vue | 2 +- packages/frontend/src/deck.ts | 92 +++++------ packages/frontend/src/pages/about-misskey.vue | 2 +- packages/frontend/src/pages/admin/abuses.vue | 2 +- .../src/pages/admin/overview.active-users.vue | 2 +- .../src/pages/admin/overview.ap-requests.vue | 2 +- .../src/pages/admin/overview.queue.chart.vue | 2 +- .../src/pages/admin/queue.chart.chart.vue | 2 +- .../src/pages/drop-and-fusion.game.vue | 2 +- .../src/pages/settings/emoji-picker.vue | 4 +- .../src/pages/settings/import-export.vue | 2 +- .../frontend/src/pages/settings/index.vue | 2 +- .../src/pages/settings/preferences.vue | 8 +- packages/frontend/src/pages/theme-editor.vue | 2 +- packages/frontend/src/pages/timeline.vue | 24 +-- .../src/pages/user/activity.following.vue | 2 +- .../src/pages/user/activity.notes.vue | 2 +- .../frontend/src/pages/user/activity.pv.vue | 2 +- packages/frontend/src/pizzax.ts | 45 +++--- packages/frontend/src/plugin.ts | 12 +- packages/frontend/src/preferences.ts | 2 +- packages/frontend/src/preferences/store.ts | 2 +- packages/frontend/src/preferences/utility.ts | 2 +- packages/frontend/src/ui/_common_/navbar.vue | 4 +- packages/frontend/src/ui/classic.sidebar.vue | 2 +- packages/frontend/src/ui/classic.vue | 4 +- packages/frontend/src/ui/deck.vue | 18 +-- packages/frontend/src/utility/emoji-picker.ts | 2 +- .../frontend/src/utility/get-note-menu.ts | 4 +- packages/frontend/src/utility/init-chart.ts | 2 +- .../frontend/src/utility/reaction-picker.ts | 2 +- packages/frontend/src/widgets/WidgetMemo.vue | 4 +- 50 files changed, 243 insertions(+), 236 deletions(-) diff --git a/packages/frontend/lib/rollup-plugin-unwind-css-module-class-name.test.ts b/packages/frontend/lib/rollup-plugin-unwind-css-module-class-name.test.ts index 884ae3afac..ccfa08575b 100644 --- a/packages/frontend/lib/rollup-plugin-unwind-css-module-class-name.test.ts +++ b/packages/frontend/lib/rollup-plugin-unwind-css-module-class-name.test.ts @@ -74,7 +74,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({ let fetching = ref(true); let images = ref([]); function thumbnail(image) { - return store.state.disableShowingAnimatedImages ? getStaticImageUrl(image.url) : image.thumbnailUrl; + return store.s.disableShowingAnimatedImages ? getStaticImageUrl(image.url) : image.thumbnailUrl; } onMounted(() => { const image = [ @@ -190,7 +190,7 @@ const index_photos = defineComponent({ let fetching = ref(true); let images = ref([]); function thumbnail(image) { - return store.state.disableShowingAnimatedImages ? getStaticImageUrl(image.url) : image.thumbnailUrl; + return store.s.disableShowingAnimatedImages ? getStaticImageUrl(image.url) : image.thumbnailUrl; } onMounted(() => { const image = ["image/jpeg", "image/webp", "image/avif", "image/png", "image/gif", "image/apng", "image/vnd.mozilla.apng"]; diff --git a/packages/frontend/src/boot/common.ts b/packages/frontend/src/boot/common.ts index efada79823..d09c6d39d2 100644 --- a/packages/frontend/src/boot/common.ts +++ b/packages/frontend/src/boot/common.ts @@ -154,26 +154,26 @@ export async function common(createVue: () => App) { //#endregion // NOTE: この処理は必ずクライアント更新チェック処理より後に来ること(テーマ再構築のため) - watch(store.reactiveState.darkMode, (darkMode) => { + watch(store.r.darkMode, (darkMode) => { applyTheme(darkMode ? (prefer.s.darkTheme ?? defaultDarkTheme) : (prefer.s.lightTheme ?? defaultLightTheme), ); }, { immediate: miLocalStorage.getItem('theme') == null }); - document.documentElement.dataset.colorScheme = store.state.darkMode ? 'dark' : 'light'; + document.documentElement.dataset.colorScheme = store.s.darkMode ? 'dark' : 'light'; const darkTheme = prefer.model('darkTheme'); const lightTheme = prefer.model('lightTheme'); watch(darkTheme, (theme) => { - if (store.state.darkMode) { + if (store.s.darkMode) { applyTheme(theme ?? defaultDarkTheme); } }); watch(lightTheme, (theme) => { - if (!store.state.darkMode) { + if (!store.s.darkMode) { applyTheme(theme ?? defaultLightTheme); } }); @@ -190,9 +190,9 @@ export async function common(createVue: () => App) { }); //#endregion - if (prefer.s.darkTheme && store.state.darkMode) { + if (prefer.s.darkTheme && store.s.darkMode) { if (miLocalStorage.getItem('themeId') !== prefer.s.darkTheme.id) applyTheme(prefer.s.darkTheme); - } else if (prefer.s.lightTheme && !store.state.darkMode) { + } else if (prefer.s.lightTheme && !store.s.darkMode) { if (miLocalStorage.getItem('themeId') !== prefer.s.lightTheme.id) applyTheme(prefer.s.lightTheme); } diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts index a64e14cc1a..411cf3f672 100644 --- a/packages/frontend/src/boot/main-boot.ts +++ b/packages/frontend/src/boot/main-boot.ts @@ -138,7 +138,7 @@ export async function mainBoot() { store.loaded.then(async () => { // prefereces migration // TODO: そのうち消す - if (store.state.menu.length > 0) { + if (store.s.menu.length > 0) { const themes = await misskeyApi('i/registry/get', { scope: ['client'], key: 'themes' }).catch(() => []); if (themes.length > 0) { prefer.set('themes', themes); @@ -152,84 +152,84 @@ export async function mainBoot() { prefer.set('lightTheme', ColdDeviceStorage.get('lightTheme')); prefer.set('darkTheme', ColdDeviceStorage.get('darkTheme')); prefer.set('syncDeviceDarkMode', ColdDeviceStorage.get('syncDeviceDarkMode')); - prefer.set('overridedDeviceKind', store.state.overridedDeviceKind); - prefer.set('widgets', store.state.widgets); - prefer.set('keepCw', store.state.keepCw); - prefer.set('collapseRenotes', store.state.collapseRenotes); - prefer.set('rememberNoteVisibility', store.state.rememberNoteVisibility); - prefer.set('uploadFolder', store.state.uploadFolder); - prefer.set('keepOriginalUploading', store.state.keepOriginalUploading); - prefer.set('menu', store.state.menu); - prefer.set('statusbars', store.state.statusbars); - prefer.set('pinnedUserLists', store.state.pinnedUserLists); - prefer.set('serverDisconnectedBehavior', store.state.serverDisconnectedBehavior); - prefer.set('nsfw', store.state.nsfw); - prefer.set('highlightSensitiveMedia', store.state.highlightSensitiveMedia); - prefer.set('animation', store.state.animation); - prefer.set('animatedMfm', store.state.animatedMfm); - prefer.set('advancedMfm', store.state.advancedMfm); - prefer.set('showReactionsCount', store.state.showReactionsCount); - prefer.set('enableQuickAddMfmFunction', store.state.enableQuickAddMfmFunction); - prefer.set('loadRawImages', store.state.loadRawImages); - prefer.set('imageNewTab', store.state.imageNewTab); - prefer.set('disableShowingAnimatedImages', store.state.disableShowingAnimatedImages); - prefer.set('emojiStyle', store.state.emojiStyle); - prefer.set('menuStyle', store.state.menuStyle); - prefer.set('useBlurEffectForModal', store.state.useBlurEffectForModal); - prefer.set('useBlurEffect', store.state.useBlurEffect); - prefer.set('showFixedPostForm', store.state.showFixedPostForm); - prefer.set('showFixedPostFormInChannel', store.state.showFixedPostFormInChannel); - prefer.set('enableInfiniteScroll', store.state.enableInfiniteScroll); - prefer.set('useReactionPickerForContextMenu', store.state.useReactionPickerForContextMenu); - prefer.set('showGapBetweenNotesInTimeline', store.state.showGapBetweenNotesInTimeline); - prefer.set('instanceTicker', store.state.instanceTicker); - prefer.set('emojiPickerScale', store.state.emojiPickerScale); - prefer.set('emojiPickerWidth', store.state.emojiPickerWidth); - prefer.set('emojiPickerHeight', store.state.emojiPickerHeight); - prefer.set('emojiPickerStyle', store.state.emojiPickerStyle); - prefer.set('reportError', store.state.reportError); - prefer.set('squareAvatars', store.state.squareAvatars); - prefer.set('showAvatarDecorations', store.state.showAvatarDecorations); - prefer.set('numberOfPageCache', store.state.numberOfPageCache); - prefer.set('showNoteActionsOnlyHover', store.state.showNoteActionsOnlyHover); - prefer.set('showClipButtonInNoteFooter', store.state.showClipButtonInNoteFooter); - prefer.set('reactionsDisplaySize', store.state.reactionsDisplaySize); - prefer.set('limitWidthOfReaction', store.state.limitWidthOfReaction); - prefer.set('forceShowAds', store.state.forceShowAds); - prefer.set('aiChanMode', store.state.aiChanMode); - prefer.set('devMode', store.state.devMode); - prefer.set('mediaListWithOneImageAppearance', store.state.mediaListWithOneImageAppearance); - prefer.set('notificationPosition', store.state.notificationPosition); - prefer.set('notificationStackAxis', store.state.notificationStackAxis); - prefer.set('enableCondensedLine', store.state.enableCondensedLine); - prefer.set('keepScreenOn', store.state.keepScreenOn); - prefer.set('disableStreamingTimeline', store.state.disableStreamingTimeline); - prefer.set('useGroupedNotifications', store.state.useGroupedNotifications); - prefer.set('dataSaver', store.state.dataSaver); - prefer.set('enableSeasonalScreenEffect', store.state.enableSeasonalScreenEffect); - prefer.set('enableHorizontalSwipe', store.state.enableHorizontalSwipe); - prefer.set('useNativeUiForVideoAudioPlayer', store.state.useNativeUIForVideoAudioPlayer); - prefer.set('keepOriginalFilename', store.state.keepOriginalFilename); - prefer.set('alwaysConfirmFollow', store.state.alwaysConfirmFollow); - prefer.set('confirmWhenRevealingSensitiveMedia', store.state.confirmWhenRevealingSensitiveMedia); - prefer.set('contextMenu', store.state.contextMenu); - prefer.set('skipNoteRender', store.state.skipNoteRender); - prefer.set('showSoftWordMutedWord', store.state.showSoftWordMutedWord); - prefer.set('confirmOnReact', store.state.confirmOnReact); - prefer.set('sound.masterVolume', store.state.sound_masterVolume); - prefer.set('sound.notUseSound', store.state.sound_notUseSound); - prefer.set('sound.useSoundOnlyWhenActive', store.state.sound_useSoundOnlyWhenActive); - prefer.set('sound.on.note', store.state.sound_note as any); - prefer.set('sound.on.noteMy', store.state.sound_noteMy as any); - prefer.set('sound.on.notification', store.state.sound_notification as any); - prefer.set('sound.on.reaction', store.state.sound_reaction as any); + prefer.set('overridedDeviceKind', store.s.overridedDeviceKind); + prefer.set('widgets', store.s.widgets); + prefer.set('keepCw', store.s.keepCw); + prefer.set('collapseRenotes', store.s.collapseRenotes); + prefer.set('rememberNoteVisibility', store.s.rememberNoteVisibility); + prefer.set('uploadFolder', store.s.uploadFolder); + prefer.set('keepOriginalUploading', store.s.keepOriginalUploading); + prefer.set('menu', store.s.menu); + prefer.set('statusbars', store.s.statusbars); + prefer.set('pinnedUserLists', store.s.pinnedUserLists); + prefer.set('serverDisconnectedBehavior', store.s.serverDisconnectedBehavior); + prefer.set('nsfw', store.s.nsfw); + prefer.set('highlightSensitiveMedia', store.s.highlightSensitiveMedia); + prefer.set('animation', store.s.animation); + prefer.set('animatedMfm', store.s.animatedMfm); + prefer.set('advancedMfm', store.s.advancedMfm); + prefer.set('showReactionsCount', store.s.showReactionsCount); + prefer.set('enableQuickAddMfmFunction', store.s.enableQuickAddMfmFunction); + prefer.set('loadRawImages', store.s.loadRawImages); + prefer.set('imageNewTab', store.s.imageNewTab); + prefer.set('disableShowingAnimatedImages', store.s.disableShowingAnimatedImages); + prefer.set('emojiStyle', store.s.emojiStyle); + prefer.set('menuStyle', store.s.menuStyle); + prefer.set('useBlurEffectForModal', store.s.useBlurEffectForModal); + prefer.set('useBlurEffect', store.s.useBlurEffect); + prefer.set('showFixedPostForm', store.s.showFixedPostForm); + prefer.set('showFixedPostFormInChannel', store.s.showFixedPostFormInChannel); + prefer.set('enableInfiniteScroll', store.s.enableInfiniteScroll); + prefer.set('useReactionPickerForContextMenu', store.s.useReactionPickerForContextMenu); + prefer.set('showGapBetweenNotesInTimeline', store.s.showGapBetweenNotesInTimeline); + prefer.set('instanceTicker', store.s.instanceTicker); + prefer.set('emojiPickerScale', store.s.emojiPickerScale); + prefer.set('emojiPickerWidth', store.s.emojiPickerWidth); + prefer.set('emojiPickerHeight', store.s.emojiPickerHeight); + prefer.set('emojiPickerStyle', store.s.emojiPickerStyle); + prefer.set('reportError', store.s.reportError); + prefer.set('squareAvatars', store.s.squareAvatars); + prefer.set('showAvatarDecorations', store.s.showAvatarDecorations); + prefer.set('numberOfPageCache', store.s.numberOfPageCache); + prefer.set('showNoteActionsOnlyHover', store.s.showNoteActionsOnlyHover); + prefer.set('showClipButtonInNoteFooter', store.s.showClipButtonInNoteFooter); + prefer.set('reactionsDisplaySize', store.s.reactionsDisplaySize); + prefer.set('limitWidthOfReaction', store.s.limitWidthOfReaction); + prefer.set('forceShowAds', store.s.forceShowAds); + prefer.set('aiChanMode', store.s.aiChanMode); + prefer.set('devMode', store.s.devMode); + prefer.set('mediaListWithOneImageAppearance', store.s.mediaListWithOneImageAppearance); + prefer.set('notificationPosition', store.s.notificationPosition); + prefer.set('notificationStackAxis', store.s.notificationStackAxis); + prefer.set('enableCondensedLine', store.s.enableCondensedLine); + prefer.set('keepScreenOn', store.s.keepScreenOn); + prefer.set('disableStreamingTimeline', store.s.disableStreamingTimeline); + prefer.set('useGroupedNotifications', store.s.useGroupedNotifications); + prefer.set('dataSaver', store.s.dataSaver); + prefer.set('enableSeasonalScreenEffect', store.s.enableSeasonalScreenEffect); + prefer.set('enableHorizontalSwipe', store.s.enableHorizontalSwipe); + prefer.set('useNativeUiForVideoAudioPlayer', store.s.useNativeUIForVideoAudioPlayer); + prefer.set('keepOriginalFilename', store.s.keepOriginalFilename); + prefer.set('alwaysConfirmFollow', store.s.alwaysConfirmFollow); + prefer.set('confirmWhenRevealingSensitiveMedia', store.s.confirmWhenRevealingSensitiveMedia); + prefer.set('contextMenu', store.s.contextMenu); + prefer.set('skipNoteRender', store.s.skipNoteRender); + prefer.set('showSoftWordMutedWord', store.s.showSoftWordMutedWord); + prefer.set('confirmOnReact', store.s.confirmOnReact); + prefer.set('sound.masterVolume', store.s.sound_masterVolume); + prefer.set('sound.notUseSound', store.s.sound_notUseSound); + prefer.set('sound.useSoundOnlyWhenActive', store.s.sound_useSoundOnlyWhenActive); + prefer.set('sound.on.note', store.s.sound_note as any); + prefer.set('sound.on.noteMy', store.s.sound_noteMy as any); + prefer.set('sound.on.notification', store.s.sound_notification as any); + prefer.set('sound.on.reaction', store.s.sound_reaction as any); store.set('deck.profile', deckStore.state.profile); store.set('deck.columns', deckStore.state.columns); store.set('deck.layout', deckStore.state.layout); store.set('menu', []); } - if (store.state.accountSetupWizard !== -1) { + if (store.s.accountSetupWizard !== -1) { const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkUserSetupDialog.vue')), {}, { closed: () => dispose(), }); @@ -502,7 +502,7 @@ export async function mainBoot() { post(); }, 'd': () => { - store.set('darkMode', !store.state.darkMode); + store.set('darkMode', !store.s.darkMode); }, 's': () => { mainRouter.push('/search'); diff --git a/packages/frontend/src/components/MkAutocomplete.vue b/packages/frontend/src/components/MkAutocomplete.vue index 912e2d65a5..7436d4f1b2 100644 --- a/packages/frontend/src/components/MkAutocomplete.vue +++ b/packages/frontend/src/components/MkAutocomplete.vue @@ -73,7 +73,7 @@ const emojiDb = computed(() => { url: char2path(x.char), })); - for (const index of Object.values(store.state.additionalUnicodeEmojiIndexes)) { + for (const index of Object.values(store.s.additionalUnicodeEmojiIndexes)) { for (const [emoji, keywords] of Object.entries(index)) { for (const k of keywords) { unicodeEmojiDB.push({ @@ -155,7 +155,7 @@ function complete(type: string, value: any) { emit('done', { type, value }); emit('closed'); if (type === 'emoji') { - let recents = store.state.recentlyUsedEmojis; + let recents = store.s.recentlyUsedEmojis; recents = recents.filter((emoji: any) => emoji !== value); recents.unshift(value); store.set('recentlyUsedEmojis', recents.splice(0, 32)); @@ -238,7 +238,7 @@ function exec() { } else if (props.type === 'emoji') { if (!props.q || props.q === '') { // 最近使った絵文字をサジェスト - emojis.value = store.state.recentlyUsedEmojis.map(emoji => emojiDb.value.find(dbEmoji => dbEmoji.emoji === emoji)).filter(x => x) as EmojiDef[]; + emojis.value = store.s.recentlyUsedEmojis.map(emoji => emojiDb.value.find(dbEmoji => dbEmoji.emoji === emoji)).filter(x => x) as EmojiDef[]; return; } diff --git a/packages/frontend/src/components/MkCaptcha.vue b/packages/frontend/src/components/MkCaptcha.vue index 05b8264a83..30eafb7a5b 100644 --- a/packages/frontend/src/components/MkCaptcha.vue +++ b/packages/frontend/src/components/MkCaptcha.vue @@ -154,7 +154,7 @@ async function requestRender() { captchaWidgetId.value = captcha.value.render(elem, { sitekey: props.sitekey, - theme: store.state.darkMode ? 'dark' : 'light', + theme: store.s.darkMode ? 'dark' : 'light', callback: callback, 'expired-callback': () => callback(undefined), 'error-callback': () => callback(undefined), diff --git a/packages/frontend/src/components/MkChart.vue b/packages/frontend/src/components/MkChart.vue index 4707d02ce9..c1a55906ae 100644 --- a/packages/frontend/src/components/MkChart.vue +++ b/packages/frontend/src/components/MkChart.vue @@ -161,7 +161,7 @@ const render = () => { chartInstance.destroy(); } - const vLineColor = store.state.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)'; + const vLineColor = store.s.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)'; const maxes = chartData.series.map((x, i) => Math.max(...x.data.map(d => d.y))); diff --git a/packages/frontend/src/components/MkCode.core.vue b/packages/frontend/src/components/MkCode.core.vue index 948419130e..8b39468d4c 100644 --- a/packages/frontend/src/components/MkCode.core.vue +++ b/packages/frontend/src/components/MkCode.core.vue @@ -22,7 +22,7 @@ const props = defineProps<{ }>(); const highlighter = await getHighlighter(); -const darkMode = store.reactiveState.darkMode; +const darkMode = store.r.darkMode; const codeLang = ref('js'); const [lightThemeName, darkThemeName] = await Promise.all([ diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue index 214b244802..384682277e 100644 --- a/packages/frontend/src/components/MkEmojiPicker.vue +++ b/packages/frontend/src/components/MkEmojiPicker.vue @@ -166,7 +166,7 @@ const { emojiPickerHeight, } = prefer.r; -const recentlyUsedEmojis = store.reactiveState.recentlyUsedEmojis; +const recentlyUsedEmojis = store.r.recentlyUsedEmojis; const recentlyUsedEmojisDef = computed(() => { return recentlyUsedEmojis.value.map(getDef); @@ -319,7 +319,7 @@ watch(q, () => { } if (matches.size >= max) return matches; - for (const index of Object.values(store.state.additionalUnicodeEmojiIndexes)) { + for (const index of Object.values(store.s.additionalUnicodeEmojiIndexes)) { for (const emoji of emojis) { if (keywords.every(keyword => index[emoji.char].some(k => k.includes(keyword)))) { matches.add(emoji); @@ -336,7 +336,7 @@ watch(q, () => { } if (matches.size >= max) return matches; - for (const index of Object.values(store.state.additionalUnicodeEmojiIndexes)) { + for (const index of Object.values(store.s.additionalUnicodeEmojiIndexes)) { for (const emoji of emojis) { if (index[emoji.char].some(k => k.startsWith(newQ))) { matches.add(emoji); @@ -353,7 +353,7 @@ watch(q, () => { } if (matches.size >= max) return matches; - for (const index of Object.values(store.state.additionalUnicodeEmojiIndexes)) { + for (const index of Object.values(store.s.additionalUnicodeEmojiIndexes)) { for (const emoji of emojis) { if (index[emoji.char].some(k => k.includes(newQ))) { matches.add(emoji); @@ -429,7 +429,7 @@ function chosen(emoji: string | Misskey.entities.EmojiSimple | UnicodeEmojiDef, // 最近使った絵文字更新 if (!pinned.value?.includes(key)) { - let recents = store.state.recentlyUsedEmojis; + let recents = store.s.recentlyUsedEmojis; recents = recents.filter((emoji) => emoji !== key); recents.unshift(key); store.set('recentlyUsedEmojis', recents.splice(0, 32)); diff --git a/packages/frontend/src/components/MkFollowButton.vue b/packages/frontend/src/components/MkFollowButton.vue index 64828699d6..3d5d0ec5ab 100644 --- a/packages/frontend/src/components/MkFollowButton.vue +++ b/packages/frontend/src/components/MkFollowButton.vue @@ -121,11 +121,11 @@ async function onClick() { } else { await misskeyApi('following/create', { userId: props.user.id, - withReplies: store.state.defaultWithReplies, + withReplies: store.s.defaultWithReplies, }); emit('update:user', { ...props.user, - withReplies: store.state.defaultWithReplies, + withReplies: store.s.defaultWithReplies, }); hasPendingFollowRequestFromYou.value = true; diff --git a/packages/frontend/src/components/MkHeatmap.vue b/packages/frontend/src/components/MkHeatmap.vue index 4c4ae86db3..8339e68b07 100644 --- a/packages/frontend/src/components/MkHeatmap.vue +++ b/packages/frontend/src/components/MkHeatmap.vue @@ -106,7 +106,7 @@ async function renderChart() { await nextTick(); - const color = store.state.darkMode ? '#b4e900' : '#86b300'; + const color = store.s.darkMode ? '#b4e900' : '#86b300'; // 視覚上の分かりやすさのため上から最も大きい3つの値の平均を最大値とする const max = values.slice().sort((a, b) => b - a).slice(0, 3).reduce((a, b) => a + b, 0) / 3; diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index 755e13279c..8dbb2a80d6 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -176,18 +176,18 @@ const text = ref(props.initialText ?? ''); const files = ref(props.initialFiles ?? []); const poll = ref(null); const useCw = ref(!!props.initialCw); -const showPreview = ref(store.state.showPreview); +const showPreview = ref(store.s.showPreview); watch(showPreview, () => store.set('showPreview', showPreview.value)); const showAddMfmFunction = ref(prefer.s.enableQuickAddMfmFunction); watch(showAddMfmFunction, () => prefer.set('enableQuickAddMfmFunction', showAddMfmFunction.value)); const cw = ref(props.initialCw ?? null); -const localOnly = ref(props.initialLocalOnly ?? (prefer.s.rememberNoteVisibility ? store.state.localOnly : prefer.s.defaultNoteLocalOnly)); -const visibility = ref(props.initialVisibility ?? (prefer.s.rememberNoteVisibility ? store.state.visibility : prefer.s.defaultNoteVisibility)); +const localOnly = ref(props.initialLocalOnly ?? (prefer.s.rememberNoteVisibility ? store.s.localOnly : prefer.s.defaultNoteLocalOnly)); +const visibility = ref(props.initialVisibility ?? (prefer.s.rememberNoteVisibility ? store.s.visibility : prefer.s.defaultNoteVisibility)); const visibleUsers = ref([]); if (props.initialVisibleUsers) { props.initialVisibleUsers.forEach(u => pushVisibleUser(u)); } -const reactionAcceptance = ref(store.state.reactionAcceptance); +const reactionAcceptance = ref(store.s.reactionAcceptance); const draghover = ref(false); const quoteId = ref(null); const hasNotSpecifiedMentions = ref(false); diff --git a/packages/frontend/src/components/MkRetentionHeatmap.vue b/packages/frontend/src/components/MkRetentionHeatmap.vue index 1dc1da0bc3..c53bf98f67 100644 --- a/packages/frontend/src/components/MkRetentionHeatmap.vue +++ b/packages/frontend/src/components/MkRetentionHeatmap.vue @@ -75,7 +75,7 @@ async function renderChart() { await nextTick(); - const color = store.state.darkMode ? '#b4e900' : '#86b300'; + const color = store.s.darkMode ? '#b4e900' : '#86b300'; const getYYYYMMDD = (date: Date) => { const y = date.getFullYear().toString().padStart(2, '0'); diff --git a/packages/frontend/src/components/MkRetentionLineChart.vue b/packages/frontend/src/components/MkRetentionLineChart.vue index dd4a8a1a6d..9e03be3e7f 100644 --- a/packages/frontend/src/components/MkRetentionLineChart.vue +++ b/packages/frontend/src/components/MkRetentionLineChart.vue @@ -42,7 +42,7 @@ const getDate = (ymd: string) => { onMounted(async () => { let raw = await misskeyApi('retention', { }); - const vLineColor = store.state.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)'; + const vLineColor = store.s.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)'; const accent = tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--MI_THEME-accent')); const color = accent.toHex(); diff --git a/packages/frontend/src/components/MkUrlPreview.vue b/packages/frontend/src/components/MkUrlPreview.vue index f8ac638e40..f20aee0ce3 100644 --- a/packages/frontend/src/components/MkUrlPreview.vue +++ b/packages/frontend/src/components/MkUrlPreview.vue @@ -34,7 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only sandbox="allow-popups allow-popups-to-escape-sandbox allow-scripts allow-same-origin" scrolling="no" :style="{ position: 'relative', width: '100%', height: `${tweetHeight}px`, border: 0 }" - :src="`https://platform.twitter.com/embed/index.html?embedId=${embedId}&hideCard=false&hideThread=false&lang=en&theme=${store.state.darkMode ? 'dark' : 'light'}&id=${tweetId}`" + :src="`https://platform.twitter.com/embed/index.html?embedId=${embedId}&hideCard=false&hideThread=false&lang=en&theme=${store.s.darkMode ? 'dark' : 'light'}&id=${tweetId}`" >
diff --git a/packages/frontend/src/components/MkUserSelectDialog.vue b/packages/frontend/src/components/MkUserSelectDialog.vue index 1dbc143f8f..e5c6df267b 100644 --- a/packages/frontend/src/components/MkUserSelectDialog.vue +++ b/packages/frontend/src/components/MkUserSelectDialog.vue @@ -128,7 +128,7 @@ async function ok() { dialogEl.value?.close(); // 最近使ったユーザー更新 - let recents = store.state.recentlyUsedUsers; + let recents = store.s.recentlyUsedUsers; recents = recents.filter(x => x !== selected.value?.id); recents.unshift(selected.value.id); store.set('recentlyUsedUsers', recents.splice(0, 16)); @@ -141,7 +141,7 @@ function cancel() { onMounted(() => { misskeyApi('users/show', { - userIds: store.state.recentlyUsedUsers, + userIds: store.s.recentlyUsedUsers, }).then(foundUsers => { let _users = foundUsers; _users = _users.filter((u) => { diff --git a/packages/frontend/src/components/MkUserSetupDialog.vue b/packages/frontend/src/components/MkUserSetupDialog.vue index cba6f6fd90..eb3a69217e 100644 --- a/packages/frontend/src/components/MkUserSetupDialog.vue +++ b/packages/frontend/src/components/MkUserSetupDialog.vue @@ -149,7 +149,7 @@ const emit = defineEmits<{ const dialog = shallowRef>(); // eslint-disable-next-line vue/no-setup-props-reactivity-loss -const page = ref(store.state.accountSetupWizard); +const page = ref(store.s.accountSetupWizard); watch(page, () => { store.set('accountSetupWizard', page.value); diff --git a/packages/frontend/src/components/MkVisitorDashboard.ActiveUsersChart.vue b/packages/frontend/src/components/MkVisitorDashboard.ActiveUsersChart.vue index 3aa76be0bc..872d4201bb 100644 --- a/packages/frontend/src/components/MkVisitorDashboard.ActiveUsersChart.vue +++ b/packages/frontend/src/components/MkVisitorDashboard.ActiveUsersChart.vue @@ -59,7 +59,7 @@ async function renderChart() { await nextTick(); - const vLineColor = store.state.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)'; + const vLineColor = store.s.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)'; const computedStyle = getComputedStyle(document.documentElement); const accent = tinycolor(computedStyle.getPropertyValue('--MI_THEME-accent')).toHexString(); diff --git a/packages/frontend/src/components/global/MkAd.vue b/packages/frontend/src/components/global/MkAd.vue index 4f9bfd02bd..c196519c15 100644 --- a/packages/frontend/src/components/global/MkAd.vue +++ b/packages/frontend/src/components/global/MkAd.vue @@ -67,7 +67,7 @@ const choseAd = (): Ad | null => { return props.specify; } - const allAds = instance.ads.map(ad => store.state.mutedAds.includes(ad.id) ? { + const allAds = instance.ads.map(ad => store.s.mutedAds.includes(ad.id) ? { ...ad, ratio: 0, } : ad); @@ -112,7 +112,7 @@ const shouldHide = ref(!prefer.s.forceShowAds && $i && $i.policies.canHideAds && function reduceFrequency(): void { if (chosen.value == null) return; - if (store.state.mutedAds.includes(chosen.value.id)) return; + if (store.s.mutedAds.includes(chosen.value.id)) return; store.push('mutedAds', chosen.value.id); os.success(); chosen.value = choseAd(); diff --git a/packages/frontend/src/components/global/MkFooterSpacer.vue b/packages/frontend/src/components/global/MkFooterSpacer.vue index d08645aaf3..45b415a7f6 100644 --- a/packages/frontend/src/components/global/MkFooterSpacer.vue +++ b/packages/frontend/src/components/global/MkFooterSpacer.vue @@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only -->