-
{{ group.title }}
-
-
-
-
-
- {{ item.text }}
-
-
-
-
- {{ item.text }}
-
-
+
+
+
+
+
+
+
+
{{ group.title }}
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+ {{ item.parentLabels.join(' > ') }}
+
+ {{ item.label }}
+
+
+
-
+
@@ -58,10 +91,98 @@ export type SuperMenuDef = {
diff --git a/packages/frontend/src/components/global/SearchKeyword.vue b/packages/frontend/src/components/global/SearchKeyword.vue
new file mode 100644
index 0000000000..27a284faf0
--- /dev/null
+++ b/packages/frontend/src/components/global/SearchKeyword.vue
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/global/SearchLabel.vue b/packages/frontend/src/components/global/SearchLabel.vue
new file mode 100644
index 0000000000..27a284faf0
--- /dev/null
+++ b/packages/frontend/src/components/global/SearchLabel.vue
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/global/SearchMarker.vue b/packages/frontend/src/components/global/SearchMarker.vue
new file mode 100644
index 0000000000..c5ec626cf4
--- /dev/null
+++ b/packages/frontend/src/components/global/SearchMarker.vue
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/index.ts b/packages/frontend/src/components/index.ts
index 0252bf0252..ebbad3e5b8 100644
--- a/packages/frontend/src/components/index.ts
+++ b/packages/frontend/src/components/index.ts
@@ -3,8 +3,6 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
-import type { App } from 'vue';
-
import Mfm from './global/MkMfm.js';
import MkA from './global/MkA.vue';
import MkAcct from './global/MkAcct.vue';
@@ -26,6 +24,11 @@ import MkSpacer from './global/MkSpacer.vue';
import MkFooterSpacer from './global/MkFooterSpacer.vue';
import MkStickyContainer from './global/MkStickyContainer.vue';
import MkLazy from './global/MkLazy.vue';
+import SearchMarker from './global/SearchMarker.vue';
+import SearchLabel from './global/SearchLabel.vue';
+import SearchKeyword from './global/SearchKeyword.vue';
+
+import type { App } from 'vue';
export default function(app: App) {
for (const [key, value] of Object.entries(components)) {
@@ -55,6 +58,9 @@ export const components = {
MkFooterSpacer: MkFooterSpacer,
MkStickyContainer: MkStickyContainer,
MkLazy: MkLazy,
+ SearchMarker: SearchMarker,
+ SearchLabel: SearchLabel,
+ SearchKeyword: SearchKeyword,
};
declare module '@vue/runtime-core' {
@@ -80,5 +86,8 @@ declare module '@vue/runtime-core' {
MkFooterSpacer: typeof MkFooterSpacer;
MkStickyContainer: typeof MkStickyContainer;
MkLazy: typeof MkLazy;
+ SearchMarker: typeof SearchMarker;
+ SearchLabel: typeof SearchLabel;
+ SearchKeyword: typeof SearchKeyword;
}
}
diff --git a/packages/frontend/src/pages/settings/2fa.vue b/packages/frontend/src/pages/settings/2fa.vue
index 776f59dda3..806599e801 100644
--- a/packages/frontend/src/pages/settings/2fa.vue
+++ b/packages/frontend/src/pages/settings/2fa.vue
@@ -4,74 +4,82 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
- {{ i18n.ts['2fa'] }}
-
-
-
- {{ i18n.ts._2fa.backupCodeUsedWarning }}
-
-
- {{ i18n.ts._2fa.backupCodesExhaustedWarning }}
-
-
-
-
- {{ i18n.ts.totp }}
- {{ i18n.ts.totpDescription }}
-
-
-
-
-
- {{ i18n.ts._2fa.renewTOTP }}
- {{ i18n.ts._2fa.whyTOTPOnlyRenew }}
-
-
{{ i18n.ts.unregister }}
-
- {{ i18n.ts._2fa.registerTOTP }}
- {{ i18n.ts.learnMore }}
-
-
-
-
-
- {{ i18n.ts.securityKeyAndPasskey }}
-
-
- {{ i18n.ts._2fa.securityKeyInfo }}
-
-
-
- {{ i18n.ts._2fa.securityKeyNotSupported }}
-
-
-
- {{ i18n.ts._2fa.registerTOTPBeforeKey }}
-
-
-
- {{ i18n.ts._2fa.registerSecurityKey }}
-
- {{ key.name }}
-
-
- {{ i18n.ts.rename }}
- {{ i18n.ts.unregister }}
-
-
-
-
-
-
- {{ i18n.ts.passwordLessLogin }}
- {{ i18n.ts.passwordLessLoginDescription }}
-
-
+
+ {{ i18n.ts._2fa.backupCodeUsedWarning }}
+
+
+ {{ i18n.ts._2fa.backupCodesExhaustedWarning }}
+
+
+
+
+
+ {{ i18n.ts.totp }}
+ {{ i18n.ts.totpDescription }}
+
+
+
+
+
+ {{ i18n.ts._2fa.renewTOTP }}
+ {{ i18n.ts._2fa.whyTOTPOnlyRenew }}
+
+
{{ i18n.ts.unregister }}
+
+ {{ i18n.ts._2fa.registerTOTP }}
+ {{ i18n.ts.learnMore }}
+
+
+
+
+
+
+
+ {{ i18n.ts.securityKeyAndPasskey }}
+
+
+ {{ i18n.ts._2fa.securityKeyInfo }}
+
+
+
+ {{ i18n.ts._2fa.securityKeyNotSupported }}
+
+
+
+ {{ i18n.ts._2fa.registerTOTPBeforeKey }}
+
+
+
+ {{ i18n.ts._2fa.registerSecurityKey }}
+
+ {{ key.name }}
+
+
+ {{ i18n.ts.rename }}
+ {{ i18n.ts.unregister }}
+
+
+
+
+
+
+
+ {{ i18n.ts.passwordLessLogin }}
+ {{ i18n.ts.passwordLessLoginDescription }}
+
+
+
diff --git a/packages/frontend/src/pages/settings/appearance.vue b/packages/frontend/src/pages/settings/appearance.vue
new file mode 100644
index 0000000000..465c2a38c2
--- /dev/null
+++ b/packages/frontend/src/pages/settings/appearance.vue
@@ -0,0 +1,287 @@
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.useBlurEffect }}
+
+
+
+
+
+ {{ i18n.ts.useBlurEffectForModal }}
+
+
+
+
+
+ {{ i18n.ts.highlightSensitiveMedia }}
+
+
+
+
+
+ {{ i18n.ts.squareAvatars }}
+
+
+
+
+
+ {{ i18n.ts.showAvatarDecorations }}
+
+
+
+
+
+ {{ i18n.ts.showGapBetweenNotesInTimeline }}
+
+
+
+
+
+ {{ i18n.ts.useSystemFont }}
+
+
+
+
+
+ {{ i18n.ts.seasonalScreenEffect }}
+
+
+
+
+
+
+ {{ i18n.ts.menuStyle }}
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.emojiStyle }}
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.fontSize }}
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.displayOfNote }}
+
+
+
+
+ {{ i18n.ts.reactionsDisplaySize }}
+
+
+
+
+
+
+
+
+ {{ i18n.ts.limitWidthOfReaction }}
+
+
+
+
+
+ {{ i18n.ts.mediaListWithOneImageAppearance }}
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.instanceTicker }}
+
+
+
+
+
+
+
+
+ {{ i18n.ts.displayOfSensitiveMedia }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.notificationDisplay }}
+
+
+
+
+ {{ i18n.ts.position }}
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.stackAxis }}
+
+
+
+
+
+ {{ i18n.ts._notification.checkNotificationBehavior }}
+
+
+
+
+
+ {{ i18n.ts.customCss }}
+
+
+
+
diff --git a/packages/frontend/src/pages/settings/avatar-decoration.vue b/packages/frontend/src/pages/settings/avatar-decoration.vue
index 9fca306f9f..79be2b9b1e 100644
--- a/packages/frontend/src/pages/settings/avatar-decoration.vue
+++ b/packages/frontend/src/pages/settings/avatar-decoration.vue
@@ -4,44 +4,46 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
-
-
{{ i18n.tsx._profile.avatarDecorationMax({ max: $i.policies.avatarDecorationLimit }) }} ({{ i18n.tsx.remainingN({ n: $i.policies.avatarDecorationLimit - $i.avatarDecorations.length }) }})
-
-
-
-
-
{{ i18n.ts.inUse }}
+
+
+
+
{{ i18n.tsx._profile.avatarDecorationMax({ max: $i.policies.avatarDecorationLimit }) }} ({{ i18n.tsx.remainingN({ n: $i.policies.avatarDecorationLimit - $i.avatarDecorations.length }) }})
+
+
+
+
+
{{ i18n.ts.inUse }}
+
+
+
+
+
+
{{ i18n.ts.detachAll }}
+
-
-
{{ i18n.ts.detachAll }}
-
-
-
-
-
-
diff --git a/packages/frontend/src/pages/settings/import-export.vue b/packages/frontend/src/pages/settings/import-export.vue
index 5acbc50756..6b67a9a1a8 100644
--- a/packages/frontend/src/pages/settings/import-export.vue
+++ b/packages/frontend/src/pages/settings/import-export.vue
@@ -4,118 +4,143 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
-
- {{ i18n.ts._exportOrImport.allNotes }}
-
- {{ i18n.ts.export }}
-
- {{ i18n.ts.export }}
-
-
-
- {{ i18n.ts._exportOrImport.favoritedNotes }}
-
- {{ i18n.ts.export }}
-
- {{ i18n.ts.export }}
-
-
-
- {{ i18n.ts._exportOrImport.clips }}
-
- {{ i18n.ts.export }}
-
- {{ i18n.ts.export }}
-
-
-
- {{ i18n.ts._exportOrImport.followingList }}
-
-
- {{ i18n.ts.export }}
-
+
+
+
+
+ {{ i18n.ts._exportOrImport.allNotes }}
+
+ {{ i18n.ts.export }}
+
+ {{ i18n.ts.export }}
+
+
+
+
+
+
+ {{ i18n.ts._exportOrImport.favoritedNotes }}
+
+ {{ i18n.ts.export }}
+
+ {{ i18n.ts.export }}
+
+
+
+
+
+
+ {{ i18n.ts._exportOrImport.clips }}
+
+ {{ i18n.ts.export }}
+
+ {{ i18n.ts.export }}
+
+
+
+
+
+
+ {{ i18n.ts._exportOrImport.followingList }}
+
+
+ {{ i18n.ts.export }}
+
+
+
+ {{ i18n.ts._exportOrImport.excludeMutingUsers }}
+
+
+ {{ i18n.ts._exportOrImport.excludeInactiveUsers }}
+
+ {{ i18n.ts.export }}
+
+
+
+ {{ i18n.ts.import }}
+
+
+ {{ i18n.ts._exportOrImport.withReplies }}
+
+ {{ i18n.ts.import }}
+
+
+
+
+
+ {{ i18n.ts._exportOrImport.userLists }}
+
+
+ {{ i18n.ts.export }}
+
+ {{ i18n.ts.export }}
+
+
+ {{ i18n.ts.import }}
+
+ {{ i18n.ts.import }}
+
+
+
+
+
+
+
+ {{ i18n.ts._exportOrImport.muteList }}
+
+
+ {{ i18n.ts.export }}
+
+ {{ i18n.ts.export }}
+
+
+ {{ i18n.ts.import }}
+
+ {{ i18n.ts.import }}
+
+
+
+
+
+
+
+ {{ i18n.ts._exportOrImport.blockingList }}
+
+
+ {{ i18n.ts.export }}
+
+ {{ i18n.ts.export }}
+
+
+ {{ i18n.ts.import }}
+
+ {{ i18n.ts.import }}
+
+
+
+
+
+
+
+ {{ i18n.ts.antennas }}
-
- {{ i18n.ts._exportOrImport.excludeMutingUsers }}
-
-
- {{ i18n.ts._exportOrImport.excludeInactiveUsers }}
-
- {{ i18n.ts.export }}
+
+ {{ i18n.ts.export }}
+
+ {{ i18n.ts.export }}
+
+
+ {{ i18n.ts.import }}
+
+ {{ i18n.ts.import }}
+
-
-
- {{ i18n.ts.import }}
-
-
- {{ i18n.ts._exportOrImport.withReplies }}
-
- {{ i18n.ts.import }}
-
-
-
- {{ i18n.ts.export }}
-
- {{ i18n.ts.export }}
-
-
- {{ i18n.ts.import }}
-
- {{ i18n.ts.import }}
-
-
-
-
- {{ i18n.ts._exportOrImport.muteList }}
-
-
- {{ i18n.ts.export }}
-
- {{ i18n.ts.export }}
-
-
- {{ i18n.ts.import }}
-
- {{ i18n.ts.import }}
-
-
-
-
- {{ i18n.ts._exportOrImport.blockingList }}
-
-
- {{ i18n.ts.export }}
-
- {{ i18n.ts.export }}
-
-
- {{ i18n.ts.import }}
-
- {{ i18n.ts.import }}
-
-
-
-
- {{ i18n.ts.antennas }}
-
-
- {{ i18n.ts.export }}
-
- {{ i18n.ts.export }}
-
-
- {{ i18n.ts.import }}
-
- {{ i18n.ts.import }}
-
-
-
-
+
+
diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index 41e475eade..2e453aeb8f 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -8,11 +8,11 @@ SPDX-License-Identifier: AGPL-3.0-only
ref="buttonEl"
v-ripple="canToggle"
class="_button"
- :class="[$style.root, { [$style.reacted]: note.myReaction == reaction, [$style.canToggle]: canToggle, [$style.small]: defaultStore.state.reactionsDisplaySize === 'small', [$style.large]: defaultStore.state.reactionsDisplaySize === 'large' }]"
+ :class="[$style.root, { [$style.reacted]: note.myReaction == reaction, [$style.canToggle]: canToggle, [$style.small]: prefer.s.reactionsDisplaySize === 'small', [$style.large]: prefer.s.reactionsDisplaySize === 'large' }]"
@click="toggleReaction()"
@contextmenu.prevent.stop="menu"
>
-
+
{{ count }}
@@ -30,11 +30,11 @@ import { useTooltip } from '@/scripts/use-tooltip.js';
import { $i } from '@/account.js';
import MkReactionEffect from '@/components/MkReactionEffect.vue';
import { claimAchievement } from '@/scripts/achievements.js';
-import { defaultStore } from '@/store.js';
import { i18n } from '@/i18n.js';
import * as sound from '@/scripts/sound.js';
import { checkReactionPermissions } from '@/scripts/check-reaction-permissions.js';
import { customEmojisMap } from '@/custom-emojis.js';
+import { prefer } from '@/preferences.js';
const props = defineProps<{
reaction: string;
@@ -90,7 +90,7 @@ async function toggleReaction() {
}
});
} else {
- if (defaultStore.state.confirmOnReact) {
+ if (prefer.s.confirmOnReact) {
const confirm = await os.confirm({
type: 'question',
text: i18n.tsx.reactAreYouSure({ emoji: props.reaction.replace('@.', '') }),
@@ -135,7 +135,7 @@ async function menu(ev) {
}
function anime() {
- if (document.hidden || !defaultStore.state.animation || buttonEl.value == null) return;
+ if (document.hidden || !prefer.s.animation || buttonEl.value == null) return;
const rect = buttonEl.value.getBoundingClientRect();
const x = rect.left + 16;
diff --git a/packages/frontend/src/components/MkReactionsViewer.vue b/packages/frontend/src/components/MkReactionsViewer.vue
index 63b202f9f3..bb60db8d34 100644
--- a/packages/frontend/src/components/MkReactionsViewer.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.vue
@@ -5,11 +5,11 @@ SPDX-License-Identifier: AGPL-3.0-only
@@ -21,7 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-only
import * as Misskey from 'misskey-js';
import { inject, watch, ref } from 'vue';
import XReaction from '@/components/MkReactionsViewer.reaction.vue';
-import { defaultStore } from '@/store.js';
+import { prefer } from '@/preferences.js';
const props = withDefaults(defineProps<{
note: Misskey.entities.Note;
diff --git a/packages/frontend/src/components/MkRetentionHeatmap.vue b/packages/frontend/src/components/MkRetentionHeatmap.vue
index 64b573c4d3..3ca680d8f2 100644
--- a/packages/frontend/src/components/MkRetentionHeatmap.vue
+++ b/packages/frontend/src/components/MkRetentionHeatmap.vue
@@ -16,7 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-only
import { onMounted, nextTick, shallowRef, ref } from 'vue';
import { Chart } from 'chart.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
-import { defaultStore } from '@/store.js';
+import { store } from '@/store.js';
import { useChartTooltip } from '@/scripts/use-chart-tooltip.js';
import { alpha } from '@/scripts/color.js';
import { initChart } from '@/scripts/init-chart.js';
@@ -75,7 +75,7 @@ async function renderChart() {
await nextTick();
- const color = defaultStore.state.darkMode ? '#b4e900' : '#86b300';
+ const color = store.state.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 d41793b0fa..13cee1b1cd 100644
--- a/packages/frontend/src/components/MkRetentionLineChart.vue
+++ b/packages/frontend/src/components/MkRetentionLineChart.vue
@@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only
import { onMounted, shallowRef } from 'vue';
import { Chart } from 'chart.js';
import tinycolor from 'tinycolor2';
-import { defaultStore } from '@/store.js';
+import { store } from '@/store.js';
import { useChartTooltip } from '@/scripts/use-chart-tooltip.js';
import { chartVLine } from '@/scripts/chart-vline.js';
import { alpha } from '@/scripts/color.js';
@@ -42,7 +42,7 @@ const getDate = (ymd: string) => {
onMounted(async () => {
let raw = await misskeyApi('retention', { });
- const vLineColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
+ const vLineColor = store.state.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/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue
index 7bae240ddd..3cc9b69341 100644
--- a/packages/frontend/src/components/MkTimeline.vue
+++ b/packages/frontend/src/components/MkTimeline.vue
@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
v-if="paginationQuery"
ref="tlComponent"
:pagination="paginationQuery"
- :noGap="!defaultStore.state.showGapBetweenNotesInTimeline"
+ :noGap="!prefer.s.showGapBetweenNotesInTimeline"
@queue="emit('queue', $event)"
@status="prComponent?.setDisabled($event)"
/>
@@ -20,14 +20,14 @@ SPDX-License-Identifier: AGPL-3.0-only
import { computed, watch, onUnmounted, provide, ref, shallowRef } from 'vue';
import * as Misskey from 'misskey-js';
import type { BasicTimelineType } from '@/timelines.js';
+import type { Paging } from '@/components/MkPagination.vue';
import MkNotes from '@/components/MkNotes.vue';
import MkPullToRefresh from '@/components/MkPullToRefresh.vue';
import { useStream } from '@/stream.js';
import * as sound from '@/scripts/sound.js';
import { $i } from '@/account.js';
import { instance } from '@/instance.js';
-import { defaultStore } from '@/store.js';
-import type { Paging } from '@/components/MkPagination.vue';
+import { prefer } from '@/preferences.js';
const props = withDefaults(defineProps<{
src: BasicTimelineType | 'mentions' | 'directs' | 'list' | 'antenna' | 'channel' | 'role';
@@ -239,7 +239,7 @@ function updatePaginationQuery() {
}
function refreshEndpointAndChannel() {
- if (!defaultStore.state.disableStreamingTimeline) {
+ if (!prefer.s.disableStreamingTimeline) {
disconnectChannel();
connectChannel();
}
diff --git a/packages/frontend/src/components/MkToast.vue b/packages/frontend/src/components/MkToast.vue
index e256640649..ac795e312c 100644
--- a/packages/frontend/src/components/MkToast.vue
+++ b/packages/frontend/src/components/MkToast.vue
@@ -6,10 +6,10 @@ SPDX-License-Identifier: AGPL-3.0-only
@@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/components/MkVisitorDashboard.ActiveUsersChart.vue b/packages/frontend/src/components/MkVisitorDashboard.ActiveUsersChart.vue
index d098dad9a1..ac48b11c3f 100644
--- a/packages/frontend/src/components/MkVisitorDashboard.ActiveUsersChart.vue
+++ b/packages/frontend/src/components/MkVisitorDashboard.ActiveUsersChart.vue
@@ -18,7 +18,7 @@ import { Chart } from 'chart.js';
import gradient from 'chartjs-plugin-gradient';
import tinycolor from 'tinycolor2';
import { misskeyApi } from '@/scripts/misskey-api.js';
-import { defaultStore } from '@/store.js';
+import { store } from '@/store.js';
import { useChartTooltip } from '@/scripts/use-chart-tooltip.js';
import { chartVLine } from '@/scripts/chart-vline.js';
import { initChart } from '@/scripts/init-chart.js';
@@ -59,7 +59,7 @@ async function renderChart() {
await nextTick();
- const vLineColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
+ const vLineColor = store.state.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/MkWindow.vue b/packages/frontend/src/components/MkWindow.vue
index 2953f656d4..4759d217e8 100644
--- a/packages/frontend/src/components/MkWindow.vue
+++ b/packages/frontend/src/components/MkWindow.vue
@@ -5,10 +5,10 @@ SPDX-License-Identifier: AGPL-3.0-only
@@ -58,7 +58,7 @@ import type { MenuItem } from '@/types/menu.js';
import contains from '@/scripts/contains.js';
import * as os from '@/os.js';
import { i18n } from '@/i18n.js';
-import { defaultStore } from '@/store.js';
+import { prefer } from '@/preferences.js';
type WindowButton = {
title: string;
diff --git a/packages/frontend/src/components/MkYouTubePlayer.vue b/packages/frontend/src/components/MkYouTubePlayer.vue
index 1122976436..1c069d65fc 100644
--- a/packages/frontend/src/components/MkYouTubePlayer.vue
+++ b/packages/frontend/src/components/MkYouTubePlayer.vue
@@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
@@ -25,10 +25,10 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue
index fe718bfa69..2df621eaa6 100644
--- a/packages/frontend/src/pages/settings/preferences.vue
+++ b/packages/frontend/src/pages/settings/preferences.vue
@@ -33,30 +33,36 @@ SPDX-License-Identifier: AGPL-3.0-only
-
- {{ i18n.ts.showFixedPostForm }}
-
+
+
+ {{ i18n.ts.showFixedPostForm }}
+
+
-
- {{ i18n.ts.showFixedPostFormInChannel }}
-
+
+
+ {{ i18n.ts.showFixedPostFormInChannel }}
+
+
{{ i18n.ts.pinnedList }}
- {{ i18n.ts.add }}
+ {{ i18n.ts.add }}
{{ i18n.ts.remove }}
-
- {{ i18n.ts.enableQuickAddMfmFunction }}
-
+
+
+ {{ i18n.ts.enableQuickAddMfmFunction }}
+
+
@@ -68,40 +74,52 @@ SPDX-License-Identifier: AGPL-3.0-only
-
- {{ i18n.ts.collapseRenotes }}
- {{ i18n.ts.collapseRenotesDescription }}
-
+
+
+ {{ i18n.ts.collapseRenotes }}
+ {{ i18n.ts.collapseRenotesDescription }}
+
+
-
- {{ i18n.ts.showNoteActionsOnlyHover }}
-
+
+
+ {{ i18n.ts.showNoteActionsOnlyHover }}
+
+
-
- {{ i18n.ts.showClipButtonInNoteFooter }}
-
+
+
+ {{ i18n.ts.showClipButtonInNoteFooter }}
+
+
-
- {{ i18n.ts.enableAdvancedMfm }}
-
+
+
+ {{ i18n.ts.enableAdvancedMfm }}
+
+
-
- {{ i18n.ts.showReactionsCount }}
-
+
+
+ {{ i18n.ts.showReactionsCount }}
+
+
-
- {{ i18n.ts.loadRawImages }}
-
+
+
+ {{ i18n.ts.loadRawImages }}
+
+
@@ -114,9 +132,11 @@ SPDX-License-Identifier: AGPL-3.0-only
-
- {{ i18n.ts.useGroupedNotifications }}
-
+
+
+ {{ i18n.ts.useGroupedNotifications }}
+
+
@@ -129,62 +149,88 @@ SPDX-License-Identifier: AGPL-3.0-only
-
- {{ i18n.ts.openImageInNewTab }}
-
+
+
+ {{ i18n.ts.openImageInNewTab }}
+
+
-
- {{ i18n.ts.useReactionPickerForContextMenu }}
-
+
+
+ {{ i18n.ts.useReactionPickerForContextMenu }}
+
+
-
- {{ i18n.ts.enableInfiniteScroll }}
-
+
+
+ {{ i18n.ts.enableInfiniteScroll }}
+
+
-
- {{ i18n.ts.disableStreamingTimeline }}
-
+
+
+ {{ i18n.ts.disableStreamingTimeline }}
+
+
-
- {{ i18n.ts.alwaysConfirmFollow }}
-
+
+
+ {{ i18n.ts.alwaysConfirmFollow }}
+
+
-
- {{ i18n.ts.confirmWhenRevealingSensitiveMedia }}
-
+
+
+ {{ i18n.ts.confirmWhenRevealingSensitiveMedia }}
+
+
-
- {{ i18n.ts.confirmOnReact }}
-
+
+
+ {{ i18n.ts.confirmOnReact }}
+
+
+
+
+
+
+
+ {{ i18n.ts.keepCw }}
+
+
-
- {{ i18n.ts.whenServerDisconnected }}
-
-
-
-
+
+
+ {{ i18n.ts.whenServerDisconnected }}
+
+
+
+
+
-
- {{ i18n.ts.numberOfPageCache }}
- {{ i18n.ts.numberOfPageCacheDescription }}
-
+
+
+ {{ i18n.ts.numberOfPageCache }}
+ {{ i18n.ts.numberOfPageCacheDescription }}
+
+
@@ -229,18 +275,22 @@ SPDX-License-Identifier: AGPL-3.0-only
-
- {{ i18n.ts.forceShowAds }}
-
+
+
+ {{ i18n.ts.forceShowAds }}
+
+
-
- {{ i18n.ts.hemisphere }}
-
-
- {{ i18n.ts._hemisphere.caption }}
-
+
+
+ {{ i18n.ts.hemisphere }}
+
+
+ {{ i18n.ts._hemisphere.caption }}
+
+
@@ -248,8 +298,8 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.additionalEmojiDictionary }}
- {{ i18n.ts.remove }} ({{ getEmojiIndexLangName(lang) }})
- {{ getEmojiIndexLangName(lang) }}{{ defaultStore.reactiveState.additionalUnicodeEmojiIndexes.value[lang] ? ` (${ i18n.ts.installed })` : '' }}
+ {{ i18n.ts.remove }} ({{ getEmojiIndexLangName(lang) }})
+ {{ getEmojiIndexLangName(lang) }}{{ store.reactiveState.additionalUnicodeEmojiIndexes.value[lang] ? ` (${ i18n.ts.installed })` : '' }}
@@ -272,7 +322,6 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/pages/settings/statusbar.vue b/packages/frontend/src/pages/settings/statusbar.vue
index 1ae3de7994..068d28bc4e 100644
--- a/packages/frontend/src/pages/settings/statusbar.vue
+++ b/packages/frontend/src/pages/settings/statusbar.vue
@@ -22,11 +22,11 @@ import XStatusbar from './statusbar.statusbar.vue';
import MkFolder from '@/components/MkFolder.vue';
import MkButton from '@/components/MkButton.vue';
import { misskeyApi } from '@/scripts/misskey-api.js';
-import { defaultStore } from '@/store.js';
import { i18n } from '@/i18n.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';
+import { prefer } from '@/preferences.js';
-const statusbars = defaultStore.reactiveState.statusbars;
+const statusbars = prefer.r.statusbars;
const userLists = ref(null);
@@ -37,13 +37,13 @@ onMounted(() => {
});
async function add() {
- defaultStore.push('statusbars', {
+ prefer.set('statusbars', [...statusbars.value, {
id: uuid(),
type: null,
black: false,
size: 'medium',
props: {},
- });
+ }]);
}
const headerActions = computed(() => []);
diff --git a/packages/frontend/src/pages/settings/theme.install.vue b/packages/frontend/src/pages/settings/theme.install.vue
index 4f05d3784c..b19b12aaab 100644
--- a/packages/frontend/src/pages/settings/theme.install.vue
+++ b/packages/frontend/src/pages/settings/theme.install.vue
@@ -20,7 +20,7 @@ SPDX-License-Identifier: AGPL-3.0-only
import { ref, computed } from 'vue';
import MkCodeEditor from '@/components/MkCodeEditor.vue';
import MkButton from '@/components/MkButton.vue';
-import { parseThemeCode, previewTheme, installTheme } from '@/scripts/install-theme.js';
+import { parseThemeCode, previewTheme, installTheme } from '@/scripts/theme.js';
import * as os from '@/os.js';
import { i18n } from '@/i18n.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';
diff --git a/packages/frontend/src/pages/settings/theme.vue b/packages/frontend/src/pages/settings/theme.vue
index b0e4ce13d5..41de2aa6a6 100644
--- a/packages/frontend/src/pages/settings/theme.vue
+++ b/packages/frontend/src/pages/settings/theme.vue
@@ -75,6 +75,8 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
diff --git a/packages/frontend/src/ui/_common_/common.vue b/packages/frontend/src/ui/_common_/common.vue
index d145b9b6c6..51645f9676 100644
--- a/packages/frontend/src/ui/_common_/common.vue
+++ b/packages/frontend/src/ui/_common_/common.vue
@@ -17,18 +17,18 @@ SPDX-License-Identifier: AGPL-3.0-only
@@ -56,7 +56,7 @@ import * as sound from '@/scripts/sound.js';
import { $i } from '@/account.js';
import { useStream } from '@/stream.js';
import { i18n } from '@/i18n.js';
-import { defaultStore } from '@/store.js';
+import { prefer } from '@/preferences.js';
import { globalEvents } from '@/events.js';
const XStreamIndicator = defineAsyncComponent(() => import('./stream-indicator.vue'));
diff --git a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
index 44253e93bd..698e9d8d47 100644
--- a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
@@ -54,11 +54,11 @@ import { openInstanceMenu } from './common.js';
import * as os from '@/os.js';
import { navbarItemDef } from '@/navbar.js';
import { $i, openAccountMenu as openAccountMenu_ } from '@/account.js';
-import { defaultStore } from '@/store.js';
+import { prefer } from '@/preferences.js';
import { i18n } from '@/i18n.js';
import { instance } from '@/instance.js';
-const menu = toRef(defaultStore.state, 'menu');
+const menu = toRef(prefer.s, 'menu');
const otherMenuItemIndicated = computed(() => {
for (const def in navbarItemDef) {
if (menu.value.includes(def)) continue;
diff --git a/packages/frontend/src/ui/_common_/navbar.vue b/packages/frontend/src/ui/_common_/navbar.vue
index fec8666dc1..1fb99f9f22 100644
--- a/packages/frontend/src/ui/_common_/navbar.vue
+++ b/packages/frontend/src/ui/_common_/navbar.vue
@@ -94,20 +94,21 @@ import { openInstanceMenu } from './common.js';
import * as os from '@/os.js';
import { navbarItemDef } from '@/navbar.js';
import { $i, openAccountMenu as openAccountMenu_ } from '@/account.js';
-import { defaultStore } from '@/store.js';
+import { store } from '@/store.js';
import { i18n } from '@/i18n.js';
import { instance } from '@/instance.js';
import { getHTMLElementOrNull } from '@/scripts/get-dom-node-or-null.js';
import { useRouter } from '@/router/supplier.js';
+import { prefer } from '@/preferences.js';
const router = useRouter();
const forceIconOnly = ref(window.innerWidth <= 1279);
const iconOnly = computed(() => {
- return forceIconOnly.value || (defaultStore.reactiveState.menuDisplay.value === 'sideIcon');
+ return forceIconOnly.value || (store.reactiveState.menuDisplay.value === 'sideIcon');
});
-const menu = computed(() => defaultStore.state.menu);
+const menu = computed(() => prefer.s.menu);
const otherMenuItemIndicated = computed(() => {
for (const def in navbarItemDef) {
if (menu.value.includes(def)) continue;
@@ -122,12 +123,12 @@ function calcViewState() {
window.addEventListener('resize', calcViewState);
-watch(defaultStore.reactiveState.menuDisplay, () => {
+watch(store.reactiveState.menuDisplay, () => {
calcViewState();
});
function toggleIconOnly() {
- defaultStore.set('menuDisplay', iconOnly.value ? 'sideFull' : 'sideIcon');
+ store.set('menuDisplay', iconOnly.value ? 'sideFull' : 'sideIcon');
}
function openAccountMenu(ev: MouseEvent) {
diff --git a/packages/frontend/src/ui/_common_/statusbars.vue b/packages/frontend/src/ui/_common_/statusbars.vue
index ed881bef22..a8d87599e6 100644
--- a/packages/frontend/src/ui/_common_/statusbars.vue
+++ b/packages/frontend/src/ui/_common_/statusbars.vue
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
import { defineAsyncComponent } from 'vue';
import { instance } from '@/instance.js';
-import { defaultStore } from '@/store.js';
+import { prefer } from '@/preferences.js';
const XRss = defineAsyncComponent(() => import('./statusbar-rss.vue'));
const XFederation = defineAsyncComponent(() => import('./statusbar-federation.vue'));
const XUserList = defineAsyncComponent(() => import('./statusbar-user-list.vue'));
diff --git a/packages/frontend/src/ui/_common_/stream-indicator.vue b/packages/frontend/src/ui/_common_/stream-indicator.vue
index cc62a28b14..1eb809d198 100644
--- a/packages/frontend/src/ui/_common_/stream-indicator.vue
+++ b/packages/frontend/src/ui/_common_/stream-indicator.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
+
{{ i18n.ts.disconnectedFromServer }}
{{ i18n.ts.reload }}
@@ -19,7 +19,7 @@ import { useStream } from '@/stream.js';
import { i18n } from '@/i18n.js';
import MkButton from '@/components/MkButton.vue';
import * as os from '@/os.js';
-import { defaultStore } from '@/store.js';
+import { prefer } from '@/preferences.js';
const zIndex = os.claimZIndex('high');
diff --git a/packages/frontend/src/ui/classic.header.vue b/packages/frontend/src/ui/classic.header.vue
index f4633314ae..39b40754ff 100644
--- a/packages/frontend/src/ui/classic.header.vue
+++ b/packages/frontend/src/ui/classic.header.vue
@@ -53,15 +53,16 @@ import * as os from '@/os.js';
import { navbarItemDef } from '@/navbar.js';
import { openAccountMenu as openAccountMenu_, $i } from '@/account.js';
import MkButton from '@/components/MkButton.vue';
-import { defaultStore } from '@/store.js';
+import { store } from '@/store.js';
import { instance } from '@/instance.js';
import { i18n } from '@/i18n.js';
+import { prefer } from '@/preferences.js';
const WINDOW_THRESHOLD = 1400;
const settingsWindowed = ref(window.innerWidth > WINDOW_THRESHOLD);
-const menu = ref(defaultStore.state.menu);
-// const menuDisplay = computed(defaultStore.makeGetterSetter('menuDisplay'));
+const menu = ref(prefer.s.menu);
+// const menuDisplay = computed(store.makeGetterSetter('menuDisplay'));
const otherNavItemIndicated = computed(() => {
for (const def in navbarItemDef) {
if (menu.value.includes(def)) continue;
diff --git a/packages/frontend/src/ui/classic.sidebar.vue b/packages/frontend/src/ui/classic.sidebar.vue
index 5acef0bef8..c11771f028 100644
--- a/packages/frontend/src/ui/classic.sidebar.vue
+++ b/packages/frontend/src/ui/classic.sidebar.vue
@@ -59,14 +59,15 @@ import MkButton from '@/components/MkButton.vue';
// import { StickySidebar } from '@/scripts/sticky-sidebar.js';
// import { mainRouter } from '@/router.js';
//import MisskeyLogo from '@assets/client/misskey.svg';
-import { defaultStore } from '@/store.js';
+import { store } from '@/store.js';
import { instance } from '@/instance.js';
import { i18n } from '@/i18n.js';
+import { prefer } from '@/preferences.js';
const WINDOW_THRESHOLD = 1400;
-const menu = ref(defaultStore.state.menu);
-const menuDisplay = computed(defaultStore.makeGetterSetter('menuDisplay'));
+const menu = ref(prefer.s.menu);
+const menuDisplay = computed(store.makeGetterSetter('menuDisplay'));
const otherNavItemIndicated = computed(() => {
for (const def in navbarItemDef) {
if (menu.value.includes(def)) continue;
@@ -99,7 +100,7 @@ function openAccountMenu(ev: MouseEvent) {
}, ev);
}
-watch(defaultStore.reactiveState.menuDisplay, () => {
+watch(store.reactiveState.menuDisplay, () => {
calcViewState();
});
diff --git a/packages/frontend/src/ui/classic.vue b/packages/frontend/src/ui/classic.vue
index da5059bb59..63c60a3d6f 100644
--- a/packages/frontend/src/ui/classic.vue
+++ b/packages/frontend/src/ui/classic.vue
@@ -26,7 +26,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
-
+
-
+