+
+
+
+
+
+
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.backupCodeUsedWarning }}
-
-
- {{ i18n.ts._2fa.backupCodesExhaustedWarning }}
-
+
+
+ {{ i18n.ts.passwordLessLogin }}
+ {{ i18n.ts.passwordLessLoginDescription }}
+
+
+
+
+
+ {{ i18n.ts._2fa.backupCodeUsedWarning }}
+
+
+ {{ i18n.ts._2fa.backupCodesExhaustedWarning }}
+
-
-
- {{ i18n.ts.totp }}
- {{ i18n.ts.totpDescription }}
-
+
+
+
+ {{ i18n.ts.totp }}
+ {{ i18n.ts.totpDescription }}
+
-
+
+
-
-
- {{ i18n.ts.securityKeyAndPasskey }}
-
+
-
- {{ i18n.ts.passwordLessLogin }}
- {{ i18n.ts.passwordLessLoginDescription }}
-
-
-
+
-
-
- {{ i18n.ts._2fa.renewTOTP }}
- {{ i18n.ts._2fa.whyTOTPOnlyRenew }}
-
- {{ i18n.ts.unregister }}
-
+
+
+
+ {{ i18n.ts._2fa.renewTOTP }}
+ {{ i18n.ts._2fa.whyTOTPOnlyRenew }}
+
+ {{ i18n.ts.unregister }}
+
-
- {{ i18n.ts._2fa.registerTOTP }}
- {{ i18n.ts.learnMore }}
-
-
+ {{ i18n.ts._2fa.registerTOTP }}
+ {{ i18n.ts.learnMore }}
+
+
-
- {{ i18n.ts._2fa.securityKeyInfo }}
-
+
+
+
+ {{ i18n.ts.securityKeyAndPasskey }}
+
+
+ {{ i18n.ts._2fa.registerSecurityKey }}
+
+ {{ key.name }}
+
+
+
+
+
+ {{ i18n.ts._2fa.securityKeyInfo }}
+
-
- {{ i18n.ts._2fa.securityKeyNotSupported }}
-
+
+ {{ i18n.ts._2fa.securityKeyNotSupported }}
+
-
- {{ i18n.ts._2fa.registerTOTPBeforeKey }}
-
+
+ {{ i18n.ts._2fa.registerTOTPBeforeKey }}
+
-
- {{ i18n.ts._2fa.registerSecurityKey }}
-
- {{ key.name }}
-
-
-
-
+
+
+
+
+
+ {{ i18n.ts.displayOfNote }}
+
+
+
+
+
+
+ {{ i18n.ts.notificationDisplay }}
+
+
+
+
+
+ {{ i18n.ts.customCss }}
+
+
+
+
+
+ {{ i18n.ts.menuStyle }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.fontSize }}
+
+
+
+
+
+
+
+
+
+
+ {{ 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.emojiStyle }}
+
+
+
+
+
+
+
+
+ {{ i18n.ts.reactionsDisplaySize }}
+
+
+
+
+
+
+
+
+ {{ i18n.ts.limitWidthOfReaction }}
+
+
+
+
+
+ {{ i18n.ts.mediaListWithOneImageAppearance }}
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.instanceTicker }}
+
+
+
+
+
+
+
+
+ {{ i18n.ts.displayOfSensitiveMedia }}
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.position }}
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.stackAxis }}
+
+
+
+
+
+ {{ i18n.ts._notification.checkNotificationBehavior }}
+
+
-
- {{ i18n.tsx._profile.avatarDecorationMax({ max: $i.policies.avatarDecorationLimit }) }} ({{ i18n.tsx.remainingN({ n: $i.policies.avatarDecorationLimit - $i.avatarDecorations.length }) }})
+
+
+
+ {{ i18n.tsx._profile.avatarDecorationMax({ max: $i.policies.avatarDecorationLimit }) }} ({{ i18n.tsx.remainingN({ n: $i.policies.avatarDecorationLimit - $i.avatarDecorations.length }) }})
-
+
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.detachAll }}
-
- {{ i18n.ts.inUse }}
+
+ {{ i18n.ts.detachAll }}
+
{{ i18n.ts.inUse }}
+
+
+
+
+
-
-
+
-
-
-
- {{ 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._exportOrImport.userLists }}
+
+
+
+
+
+ {{ i18n.ts._exportOrImport.muteList }}
+
+
+
+
+
+ {{ i18n.ts._exportOrImport.blockingList }}
+
+
+
+
+
+ {{ i18n.ts.antennas }}
+
+
+
+
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"
>
-
-
- {{ i18n.ts.export }}
-
+
+
- {{ i18n.ts._exportOrImport.userLists }}
-
-
- {{ i18n.ts._exportOrImport.muteList }}
-
-
- {{ i18n.ts._exportOrImport.blockingList }}
-
-
- {{ i18n.ts.antennas }}
-
-
+
+
+
+ {{ 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.import }}
-
-
- {{ i18n.ts._exportOrImport.withReplies }}
-
- {{ i18n.ts.import }}
-
-
-
-
-
- {{ i18n.ts._exportOrImport.excludeMutingUsers }}
-
-
- {{ i18n.ts._exportOrImport.excludeInactiveUsers }}
-
- {{ i18n.ts.export }}
+
+ {{ i18n.ts.export }}
+
+
+
+ {{ i18n.ts.import }}
+
+
+ {{ i18n.ts._exportOrImport.withReplies }}
+
+ {{ i18n.ts.import }}
+
-
-
+
+ {{ 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.export }}
-
- {{ i18n.ts.export }}
-
-
- {{ i18n.ts.import }}
-
- {{ i18n.ts.import }}
-
-
-
-
- {{ i18n.ts.export }}
-
- {{ i18n.ts.export }}
-
-
- {{ i18n.ts.import }}
-
- {{ i18n.ts.import }}
-
-
-
-
- {{ i18n.ts.export }}
-
- {{ i18n.ts.export }}
-
-
- {{ i18n.ts.import }}
-
- {{ i18n.ts.import }}
-
-
-
+
+ {{ i18n.ts.export }}
+
+ {{ i18n.ts.export }}
+
+
+ {{ i18n.ts.import }}
+
+ {{ i18n.ts.import }}
+
+
+
+
+ {{ i18n.ts.export }}
+
+ {{ i18n.ts.export }}
+
+
+ {{ i18n.ts.import }}
+
+ {{ i18n.ts.import }}
+
+
+
+
+ {{ i18n.ts.export }}
+
+ {{ i18n.ts.export }}
+
+
+ {{ i18n.ts.import }}
+
+ {{ i18n.ts.import }}
+
+
+
+
+ {{ i18n.ts.export }}
+
+ {{ i18n.ts.export }}
+
+
+ {{ i18n.ts.import }}
+
+ {{ i18n.ts.import }}
+
+
+
@@ -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 }}
@@ -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
(null);
async function install(code: string): Promise {
@@ -35,6 +37,8 @@ async function install(code: string): Promise {
type: 'success',
text: i18n.tsx._theme.installed({ name: theme.name }),
});
+ installThemeCode.value = null;
+ router.push('/settings/theme');
} catch (err) {
switch (err.message.toLowerCase()) {
case 'this theme is already installed':
diff --git a/packages/frontend/src/plugin.ts b/packages/frontend/src/plugin.ts
index 613e3a9df6..5e33d196c3 100644
--- a/packages/frontend/src/plugin.ts
+++ b/packages/frontend/src/plugin.ts
@@ -131,6 +131,10 @@ export async function installPlugin(code: string, meta?: AiScriptPluginMeta) {
realMeta = meta;
}
+ if (prefer.s.plugins.some(x => x.name === realMeta.name)) {
+ throw new Error('Plugin already installed');
+ }
+
const installId = uuid();
const plugin = {
@@ -161,8 +165,14 @@ export async function uninstallPlugin(plugin: Plugin) {
}
}
-const pluginContexts = new Map();
-export const pluginLogs = ref(new Map());
+const pluginContexts = new Map();
+
+export const pluginLogs = ref(new Map());
type HandlerDef = {
post_form_action: {
@@ -197,6 +207,11 @@ type PluginHandler = {
let pluginHandlers: PluginHandler[] = [];
function addPluginHandler(installId: Plugin['installId'], type: K, ctx: PluginHandler['ctx']) {
+ pluginLogs.value.get(installId)!.push({
+ at: Date.now(),
+ isSystem: true,
+ message: `Handler registered: ${type}`,
+ });
pluginHandlers.push({ pluginInstallId: installId, type, ctx });
}
@@ -215,6 +230,19 @@ async function launchPlugin(id: Plugin['installId']): Promise {
// 後方互換性のため
if (plugin.src == null) return;
+ pluginLogs.value.set(plugin.installId, []);
+
+ function systemLog(message: string, isError = false): void {
+ pluginLogs.value.get(plugin.installId)?.push({
+ at: Date.now(),
+ isSystem: true,
+ message,
+ isError,
+ });
+ }
+
+ systemLog('Starting plugin...');
+
await authorizePlugin(plugin);
const aiscript = new Interpreter(createPluginEnv({
@@ -223,26 +251,33 @@ async function launchPlugin(id: Plugin['installId']): Promise {
}), {
in: aiScriptReadline,
out: (value): void => {
- console.log(value);
- pluginLogs.value.get(plugin.installId).push(utils.reprValue(value));
+ pluginLogs.value.get(plugin.installId)!.push({
+ at: Date.now(),
+ message: utils.reprValue(value),
+ });
},
log: (): void => {
},
err: (err): void => {
- pluginLogs.value.get(plugin.installId).push(`${err}`);
+ pluginLogs.value.get(plugin.installId)!.push({
+ at: Date.now(),
+ message: `${err}`,
+ isError: true,
+ });
throw err; // install時のtry-catchに反応させる
},
});
pluginContexts.set(plugin.installId, aiscript);
- pluginLogs.value.set(plugin.installId, []);
aiscript.exec(parser.parse(plugin.src)).then(
() => {
console.info('Plugin installed:', plugin.name, 'v' + plugin.version);
+ systemLog('Plugin started');
},
(err) => {
console.error('Plugin install failed:', plugin.name, 'v' + plugin.version);
+ systemLog(`${err}`, true);
throw err;
},
);
@@ -300,16 +335,15 @@ function createPluginEnv(opts: { plugin: Plugin; storageKey: string }): Record(fn: (ctx: Interpreter) => T): T {
- console.log('withContext', id);
const ctx = pluginContexts.get(id);
if (!ctx) throw new Error('Plugin context not found');
return fn(ctx);
}
- return {
+ const env: Record = {
...createAiScriptEnv({ ...opts, token: store.state.pluginTokens[id] }),
- 'Plugin:register_post_form_action': values.FN_NATIVE(([title, handler]) => {
+ 'Plugin:register:post_form_action': values.FN_NATIVE(([title, handler]) => {
utils.assertString(title);
utils.assertFunction(handler);
addPluginHandler(id, 'post_form_action', {
@@ -325,7 +359,7 @@ function createPluginEnv(opts: { plugin: Plugin; storageKey: string }): Record {
+ 'Plugin:register:user_action': values.FN_NATIVE(([title, handler]) => {
utils.assertString(title);
utils.assertFunction(handler);
addPluginHandler(id, 'user_action', {
@@ -336,7 +370,7 @@ function createPluginEnv(opts: { plugin: Plugin; storageKey: string }): Record {
+ 'Plugin:register:note_action': values.FN_NATIVE(([title, handler]) => {
utils.assertString(title);
utils.assertFunction(handler);
addPluginHandler(id, 'note_action', {
@@ -347,7 +381,7 @@ function createPluginEnv(opts: { plugin: Plugin; storageKey: string }): Record {
+ 'Plugin:register:note_view_interruptor': values.FN_NATIVE(([handler]) => {
utils.assertFunction(handler);
addPluginHandler(id, 'note_view_interruptor', {
handler: withContext(ctx => async (note) => {
@@ -356,7 +390,7 @@ function createPluginEnv(opts: { plugin: Plugin; storageKey: string }): Record {
+ 'Plugin:register:note_post_interruptor': values.FN_NATIVE(([handler]) => {
utils.assertFunction(handler);
addPluginHandler(id, 'note_post_interruptor', {
handler: withContext(ctx => async (note) => {
@@ -365,7 +399,7 @@ function createPluginEnv(opts: { plugin: Plugin; storageKey: string }): Record {
+ 'Plugin:register:page_view_interruptor': values.FN_NATIVE(([handler]) => {
utils.assertFunction(handler);
addPluginHandler(id, 'page_view_interruptor', {
handler: withContext(ctx => async (page) => {
@@ -381,6 +415,16 @@ function createPluginEnv(opts: { plugin: Plugin; storageKey: string }): Record(type: K): HandlerDef[K][] {
From 6419af21797a6438bff714052e459bb3bbbe4c07 Mon Sep 17 00:00:00 2001
From: taichan <40626578+tai-cha@users.noreply.github.com>
Date: Mon, 10 Mar 2025 09:34:45 +0900
Subject: [PATCH 066/348] =?UTF-8?q?fix(frontend,=20dev):=20storybook?=
=?UTF-8?q?=E3=81=AE=E3=83=93=E3=83=AB=E3=83=89=E3=82=A8=E3=83=A9=E3=83=BC?=
=?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=81=AE=E3=81=9F=E3=82=81=E3=80=81as?=
=?UTF-8?q?=E6=A7=8B=E6=96=87=E3=81=AB=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF?=
=?UTF-8?q?=E3=82=BF=20(#15640)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/frontend/src/components/MkTokenGenerateWindow.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/frontend/src/components/MkTokenGenerateWindow.vue b/packages/frontend/src/components/MkTokenGenerateWindow.vue
index 73aef68964..31ecb15ab8 100644
--- a/packages/frontend/src/components/MkTokenGenerateWindow.vue
+++ b/packages/frontend/src/components/MkTokenGenerateWindow.vue
@@ -79,8 +79,8 @@ const adminPermissions = Misskey.permissions.filter(p => p.startsWith('read:admi
const dialog = shallowRef>();
const name = ref(props.initialName);
-const permissionSwitches = ref(>{});
-const permissionSwitchesForAdmin = ref(>{});
+const permissionSwitches = ref({} as Record<(typeof Misskey.permissions)[number], boolean>);
+const permissionSwitchesForAdmin = ref({} as Record<(typeof Misskey.permissions)[number], boolean>);
if (props.initialPermissions) {
for (const kind of props.initialPermissions) {
From 4df9083bf04b72f59b9cb09334c89412e8cb296c Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 10 Mar 2025 10:05:50 +0900
Subject: [PATCH 067/348] =?UTF-8?q?fix(frontend):=20=E3=83=86=E3=83=BC?=
=?UTF-8?q?=E3=83=9E=E5=88=87=E3=82=8A=E6=9B=BF=E3=81=88=E6=99=82=E3=81=AB?=
=?UTF-8?q?=E4=B8=80=E9=83=A8=E3=81=AE=E8=89=B2=E3=81=8C=E5=A4=89=E3=82=8F?=
=?UTF-8?q?=E3=82=89=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?=
=?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 1 +
.../src/components/global/MkPageHeader.vue | 10 +++----
.../src/directives/adaptive-border.ts | 27 ++++++++++++++-----
packages/frontend/src/events.ts | 1 +
.../frontend/src/pages/admin/_header_.vue | 6 ++---
packages/frontend/src/theme.ts | 5 +++-
6 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea6dbdb961..e0b47ff5e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
- Feat: 設定の管理が強化されました
- 自動でバックアップされるように
- Enhance: プラグインの管理が強化されました
+- Fix: テーマ切り替え時に一部の色が変わらない問題を修正
### Server
- Fix: プロフィール追加情報で無効なURLに入力された場合に照会エラーを出るのを修正
diff --git a/packages/frontend/src/components/global/MkPageHeader.vue b/packages/frontend/src/components/global/MkPageHeader.vue
index a7cf70745e..d3c64bf85a 100644
--- a/packages/frontend/src/components/global/MkPageHeader.vue
+++ b/packages/frontend/src/components/global/MkPageHeader.vue
@@ -43,14 +43,14 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/directives/adaptive-border.ts b/packages/frontend/src/directives/adaptive-border.ts
index af7deb5960..8072a1ffd9 100644
--- a/packages/frontend/src/directives/adaptive-border.ts
+++ b/packages/frontend/src/directives/adaptive-border.ts
@@ -5,17 +5,32 @@
import type { Directive } from 'vue';
import { getBgColor } from '@/utility/get-bg-color.js';
+import { globalEvents } from '@/events.js';
+
+const handlerMap = new WeakMap();
export default {
mounted(src, binding, vn) {
- const parentBg = getBgColor(src.parentElement) ?? 'transparent';
+ function calc() {
+ const parentBg = getBgColor(src.parentElement) ?? 'transparent';
- const myBg = window.getComputedStyle(src).backgroundColor;
+ const myBg = window.getComputedStyle(src).backgroundColor;
- if (parentBg === myBg) {
- src.style.borderColor = 'var(--MI_THEME-divider)';
- } else {
- src.style.borderColor = myBg;
+ if (parentBg === myBg) {
+ src.style.borderColor = 'var(--MI_THEME-divider)';
+ } else {
+ src.style.borderColor = myBg;
+ }
}
+
+ handlerMap.set(src, calc);
+
+ calc();
+
+ globalEvents.on('themeChanged', calc);
+ },
+
+ unmounted(src, binding, vn) {
+ globalEvents.off('themeChanged', handlerMap.get(src));
},
} as Directive;
diff --git a/packages/frontend/src/events.ts b/packages/frontend/src/events.ts
index d476aec04a..a74018223c 100644
--- a/packages/frontend/src/events.ts
+++ b/packages/frontend/src/events.ts
@@ -7,6 +7,7 @@ import { EventEmitter } from 'eventemitter3';
import * as Misskey from 'misskey-js';
export const globalEvents = new EventEmitter<{
+ themeChanging: () => void;
themeChanged: () => void;
clientNotification: (notification: Misskey.entities.Notification) => void;
requestClearPageCache: () => void;
diff --git a/packages/frontend/src/pages/admin/_header_.vue b/packages/frontend/src/pages/admin/_header_.vue
index 8ba35d65d5..d5dac40e86 100644
--- a/packages/frontend/src/pages/admin/_header_.vue
+++ b/packages/frontend/src/pages/admin/_header_.vue
@@ -35,8 +35,8 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/theme.ts b/packages/frontend/src/theme.ts
index 0f44d777f9..ed2f1d3164 100644
--- a/packages/frontend/src/theme.ts
+++ b/packages/frontend/src/theme.ts
@@ -72,6 +72,9 @@ export function applyTheme(theme: Theme, persist = true) {
timeout = window.setTimeout(() => {
document.documentElement.classList.remove('_themeChanging_');
+
+ // 色計算など再度行えるようにクライアント全体に通知
+ globalEvents.emit('themeChanged');
}, 1000);
const colorScheme = theme.base === 'dark' ? 'dark' : 'light';
@@ -108,7 +111,7 @@ export function applyTheme(theme: Theme, persist = true) {
}
// 色計算など再度行えるようにクライアント全体に通知
- globalEvents.emit('themeChanged');
+ globalEvents.emit('themeChanging');
}
function compile(theme: Theme): Record {
From 16ad6b3f6c861a5da4ce141381860973573bbee4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
Date: Mon, 10 Mar 2025 01:09:42 +0000
Subject: [PATCH 068/348] Bump version to 2025.3.2-alpha.4
---
package.json | 2 +-
packages/misskey-js/package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 731c426e15..73577833f8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "misskey",
- "version": "2025.3.2-alpha.3",
+ "version": "2025.3.2-alpha.4",
"codename": "nasubi",
"repository": {
"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index c04ade5533..d98d2f3ed1 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
{
"type": "module",
"name": "misskey-js",
- "version": "2025.3.2-alpha.3",
+ "version": "2025.3.2-alpha.4",
"description": "Misskey SDK for JavaScript",
"license": "MIT",
"main": "./built/index.js",
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 069/348] 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}`"
>
| undefined => {
return inject>(METADATA_KEY);
};
-export const definePageMetadata = (maybeRefOrGetterMetadata: MaybeRefOrGetter): void => {
+export const definePage = (maybeRefOrGetterMetadata: MaybeRefOrGetter): void => {
const metadataRef = ref(toValue(maybeRefOrGetterMetadata));
const metadataGetter = () => metadataRef.value;
const receiver = getReceiver();
diff --git a/packages/frontend/src/pages/_error_.vue b/packages/frontend/src/pages/_error_.vue
index 05fa8a8a6b..066980db1f 100644
--- a/packages/frontend/src/pages/_error_.vue
+++ b/packages/frontend/src/pages/_error_.vue
@@ -33,7 +33,7 @@ import MkLink from '@/components/MkLink.vue';
import { misskeyApi } from '@/utility/misskey-api.js';
import { unisonReload } from '@/utility/unison-reload.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { miLocalStorage } from '@/local-storage.js';
import { prefer } from '@/preferences.js';
import { serverErrorImageUrl } from '@/instance.js';
@@ -67,7 +67,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.error,
icon: 'ti ti-alert-triangle',
}));
diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index 5316398ba4..55d703b9ea 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -145,7 +145,7 @@ import { i18n } from '@/i18n.js';
import { instance } from '@/instance.js';
import { store } from '@/store.js';
import * as os from '@/os.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { claimAchievement, claimedAchievements } from '@/utility/achievements.js';
import { $i } from '@/account.js';
@@ -450,7 +450,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.aboutMisskey,
icon: null,
}));
diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue
index 11a2ed4062..d6833a3d97 100644
--- a/packages/frontend/src/pages/about.vue
+++ b/packages/frontend/src/pages/about.vue
@@ -28,7 +28,7 @@ import { computed, defineAsyncComponent, ref, watch } from 'vue';
import { instance } from '@/instance.js';
import { i18n } from '@/i18n.js';
import { claimAchievement } from '@/utility/achievements.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
const XOverview = defineAsyncComponent(() => import('@/pages/about.overview.vue'));
@@ -81,7 +81,7 @@ const headerTabs = computed(() => {
return items;
});
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.instanceInfo,
icon: 'ti ti-info-circle',
}));
diff --git a/packages/frontend/src/pages/achievements.vue b/packages/frontend/src/pages/achievements.vue
index f23046b476..53ce75f9bf 100644
--- a/packages/frontend/src/pages/achievements.vue
+++ b/packages/frontend/src/pages/achievements.vue
@@ -16,7 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-only
import { onActivated, onDeactivated, onMounted, onUnmounted } from 'vue';
import MkAchievements from '@/components/MkAchievements.vue';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { $i } from '@/account.js';
import { claimAchievement } from '@/utility/achievements.js';
@@ -48,7 +48,7 @@ onDeactivated(() => {
}
});
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.achievements,
icon: 'ti ti-medal',
}));
diff --git a/packages/frontend/src/pages/admin-file.vue b/packages/frontend/src/pages/admin-file.vue
index 46a5388e7e..0af28e94fa 100644
--- a/packages/frontend/src/pages/admin-file.vue
+++ b/packages/frontend/src/pages/admin-file.vue
@@ -85,7 +85,7 @@ import bytes from '@/filters/bytes.js';
import * as os from '@/os.js';
import { misskeyApi } from '@/utility/misskey-api.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { iAmAdmin, iAmModerator } from '@/account.js';
const tab = ref('overview');
@@ -161,7 +161,7 @@ const headerTabs = computed(() => [{
icon: 'ti ti-code',
}]);
-definePageMetadata(() => ({
+definePage(() => ({
title: file.value ? `${i18n.ts.file}: ${file.value.name}` : i18n.ts.file,
icon: 'ti ti-file',
}));
diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue
index e1da305b84..2efae999ce 100644
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@@ -231,7 +231,7 @@ import MkInfo from '@/components/MkInfo.vue';
import * as os from '@/os.js';
import { misskeyApi } from '@/utility/misskey-api.js';
import { acct } from '@/filters/user.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { i18n } from '@/i18n.js';
import { iAmAdmin, $i, iAmModerator } from '@/account.js';
import MkRolePreview from '@/components/MkRolePreview.vue';
@@ -545,7 +545,7 @@ const headerTabs = computed(() => isSystem.value ? [{
icon: 'ti ti-code',
}]);
-definePageMetadata(() => ({
+definePage(() => ({
title: user.value ? acct(user.value) : i18n.ts.userInfo,
icon: 'ti ti-user-exclamation',
}));
diff --git a/packages/frontend/src/pages/admin/_header_.vue b/packages/frontend/src/pages/admin/_header_.vue
index d5dac40e86..1382cad9a4 100644
--- a/packages/frontend/src/pages/admin/_header_.vue
+++ b/packages/frontend/src/pages/admin/_header_.vue
@@ -39,7 +39,7 @@ import { scrollToTop } from '@@/js/scroll.js';
import { popupMenu } from '@/os.js';
import MkButton from '@/components/MkButton.vue';
import { globalEvents } from '@/events.js';
-import { injectReactiveMetadata } from '@/utility/page-metadata.js';
+import { injectReactiveMetadata } from '@/page.js';
type Tab = {
key?: string | null;
diff --git a/packages/frontend/src/pages/admin/abuses.vue b/packages/frontend/src/pages/admin/abuses.vue
index 8b396c1821..e4119bb62d 100644
--- a/packages/frontend/src/pages/admin/abuses.vue
+++ b/packages/frontend/src/pages/admin/abuses.vue
@@ -65,7 +65,7 @@ import MkSelect from '@/components/MkSelect.vue';
import MkPagination from '@/components/MkPagination.vue';
import XAbuseReport from '@/components/MkAbuseReport.vue';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import MkButton from '@/components/MkButton.vue';
import MkInfo from '@/components/MkInfo.vue';
import { store } from '@/store.js';
@@ -100,7 +100,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.abuseReports,
icon: 'ti ti-exclamation-circle',
}));
diff --git a/packages/frontend/src/pages/admin/ads.vue b/packages/frontend/src/pages/admin/ads.vue
index d707e15c61..ebc3d23296 100644
--- a/packages/frontend/src/pages/admin/ads.vue
+++ b/packages/frontend/src/pages/admin/ads.vue
@@ -98,7 +98,7 @@ import FormSplit from '@/components/form/split.vue';
import * as os from '@/os.js';
import { misskeyApi } from '@/utility/misskey-api.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
const ads = ref([]);
@@ -255,7 +255,7 @@ const headerActions = computed(() => [{
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.ads,
icon: 'ti ti-ad',
}));
diff --git a/packages/frontend/src/pages/admin/announcements.vue b/packages/frontend/src/pages/admin/announcements.vue
index 48a072bc8a..f6b331455f 100644
--- a/packages/frontend/src/pages/admin/announcements.vue
+++ b/packages/frontend/src/pages/admin/announcements.vue
@@ -96,7 +96,7 @@ import MkInfo from '@/components/MkInfo.vue';
import * as os from '@/os.js';
import { misskeyApi } from '@/utility/misskey-api.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import MkFolder from '@/components/MkFolder.vue';
import MkTextarea from '@/components/MkTextarea.vue';
@@ -199,7 +199,7 @@ const headerActions = computed(() => [{
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.announcements,
icon: 'ti ti-speakerphone',
}));
diff --git a/packages/frontend/src/pages/admin/branding.vue b/packages/frontend/src/pages/admin/branding.vue
index 02f08ecc05..0ac45914e8 100644
--- a/packages/frontend/src/pages/admin/branding.vue
+++ b/packages/frontend/src/pages/admin/branding.vue
@@ -114,7 +114,7 @@ import * as os from '@/os.js';
import { misskeyApi } from '@/utility/misskey-api.js';
import { instance, fetchInstance } from '@/instance.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import MkButton from '@/components/MkButton.vue';
import MkColorInput from '@/components/MkColorInput.vue';
import { host } from '@@/js/config.js';
@@ -175,7 +175,7 @@ function save() {
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.branding,
icon: 'ti ti-paint',
}));
diff --git a/packages/frontend/src/pages/admin/custom-emojis-manager2.vue b/packages/frontend/src/pages/admin/custom-emojis-manager2.vue
index f75393baac..7667206fa8 100644
--- a/packages/frontend/src/pages/admin/custom-emojis-manager2.vue
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager2.vue
@@ -18,7 +18,7 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/pages/flash/flash-index.vue b/packages/frontend/src/pages/flash/flash-index.vue
index 688b5c2ac6..3cd7c46c1e 100644
--- a/packages/frontend/src/pages/flash/flash-index.vue
+++ b/packages/frontend/src/pages/flash/flash-index.vue
@@ -46,7 +46,7 @@ import MkPagination from '@/components/MkPagination.vue';
import MkButton from '@/components/MkButton.vue';
import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { useRouter } from '@/router/supplier.js';
const router = useRouter();
@@ -91,7 +91,7 @@ const headerTabs = computed(() => [{
icon: 'ti ti-heart',
}]);
-definePageMetadata(() => ({
+definePage(() => ({
title: 'Play',
icon: 'ti ti-player-play',
}));
diff --git a/packages/frontend/src/pages/flash/flash.vue b/packages/frontend/src/pages/flash/flash.vue
index e2e7cc6f74..6bce6689d4 100644
--- a/packages/frontend/src/pages/flash/flash.vue
+++ b/packages/frontend/src/pages/flash/flash.vue
@@ -73,7 +73,7 @@ import MkButton from '@/components/MkButton.vue';
import * as os from '@/os.js';
import { misskeyApi } from '@/utility/misskey-api.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import MkAsUi from '@/components/MkAsUi.vue';
import { registerAsUiLib } from '@/aiscript/ui.js';
import { aiScriptReadline, createAiScriptEnv } from '@/aiscript/api.js';
@@ -304,7 +304,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: flash.value ? flash.value.title : 'Play',
...flash.value ? {
avatar: flash.value.user,
diff --git a/packages/frontend/src/pages/follow-requests.vue b/packages/frontend/src/pages/follow-requests.vue
index 43532026fc..bd48b882d2 100644
--- a/packages/frontend/src/pages/follow-requests.vue
+++ b/packages/frontend/src/pages/follow-requests.vue
@@ -52,7 +52,7 @@ import MkButton from '@/components/MkButton.vue';
import { userPage, acct } from '@/filters/user.js';
import * as os from '@/os.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { infoImageUrl } from '@/instance.js';
import { $i } from '@/account.js';
import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
@@ -105,7 +105,7 @@ const headerTabs = computed(() => [
const tab = ref($i?.isLocked ? 'list' : 'sent');
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.followRequests,
icon: 'ti ti-user-plus',
}));
diff --git a/packages/frontend/src/pages/gallery/edit.vue b/packages/frontend/src/pages/gallery/edit.vue
index 974dd18224..9cd59d0aa5 100644
--- a/packages/frontend/src/pages/gallery/edit.vue
+++ b/packages/frontend/src/pages/gallery/edit.vue
@@ -48,7 +48,7 @@ import FormSuspense from '@/components/form/suspense.vue';
import { selectFiles } from '@/utility/select-file.js';
import * as os from '@/os.js';
import { misskeyApi } from '@/utility/misskey-api.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { i18n } from '@/i18n.js';
import { useRouter } from '@/router/supplier.js';
@@ -122,7 +122,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: props.postId ? i18n.ts.edit : i18n.ts.postToGallery,
icon: 'ti ti-pencil',
}));
diff --git a/packages/frontend/src/pages/gallery/index.vue b/packages/frontend/src/pages/gallery/index.vue
index 49b7e349e8..14b3f7bf3c 100644
--- a/packages/frontend/src/pages/gallery/index.vue
+++ b/packages/frontend/src/pages/gallery/index.vue
@@ -52,7 +52,7 @@ import MkFoldableSection from '@/components/MkFoldableSection.vue';
import MkPagination from '@/components/MkPagination.vue';
import MkGalleryPostPreview from '@/components/MkGalleryPostPreview.vue';
import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { i18n } from '@/i18n.js';
import { useRouter } from '@/router/supplier.js';
@@ -119,7 +119,7 @@ const headerTabs = computed(() => [{
icon: 'ti ti-edit',
}]);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.gallery,
icon: 'ti ti-icons',
}));
diff --git a/packages/frontend/src/pages/gallery/post.vue b/packages/frontend/src/pages/gallery/post.vue
index 81c63b0f4e..56ddb820cf 100644
--- a/packages/frontend/src/pages/gallery/post.vue
+++ b/packages/frontend/src/pages/gallery/post.vue
@@ -75,7 +75,7 @@ import MkPagination from '@/components/MkPagination.vue';
import MkGalleryPostPreview from '@/components/MkGalleryPostPreview.vue';
import MkFollowButton from '@/components/MkFollowButton.vue';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { prefer } from '@/preferences.js';
import { $i } from '@/account.js';
import { isSupportShare } from '@/utility/navigator.js';
@@ -208,7 +208,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: post.value ? post.value.title : i18n.ts.gallery,
...post.value ? {
avatar: post.value.user,
diff --git a/packages/frontend/src/pages/games.vue b/packages/frontend/src/pages/games.vue
index f6eb8a5d7e..48adead383 100644
--- a/packages/frontend/src/pages/games.vue
+++ b/packages/frontend/src/pages/games.vue
@@ -25,9 +25,9 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/pages/settings/mute-block.vue b/packages/frontend/src/pages/settings/mute-block.vue
index 6fa2b5e689..d9c190f546 100644
--- a/packages/frontend/src/pages/settings/mute-block.vue
+++ b/packages/frontend/src/pages/settings/mute-block.vue
@@ -178,7 +178,7 @@ import XWordMute from './mute-block.word-mute.vue';
import MkPagination from '@/components/MkPagination.vue';
import { userPage } from '@/filters/user.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import MkUserCardMini from '@/components/MkUserCardMini.vue';
import * as os from '@/os.js';
import { instance, infoImageUrl } from '@/instance.js';
@@ -287,7 +287,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.muteAndBlock,
icon: 'ti ti-ban',
}));
diff --git a/packages/frontend/src/pages/settings/navbar.vue b/packages/frontend/src/pages/settings/navbar.vue
index 28e6bcc161..706cb731eb 100644
--- a/packages/frontend/src/pages/settings/navbar.vue
+++ b/packages/frontend/src/pages/settings/navbar.vue
@@ -56,7 +56,7 @@ import { navbarItemDef } from '@/navbar.js';
import { store } from '@/store.js';
import { reloadAsk } from '@/utility/reload-ask.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { prefer } from '@/preferences.js';
import { PREF_DEF } from '@/preferences/def.js';
@@ -106,7 +106,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.navbar,
icon: 'ti ti-list',
}));
diff --git a/packages/frontend/src/pages/settings/notifications.vue b/packages/frontend/src/pages/settings/notifications.vue
index dfbcf91a3f..ca0de0b4b1 100644
--- a/packages/frontend/src/pages/settings/notifications.vue
+++ b/packages/frontend/src/pages/settings/notifications.vue
@@ -73,7 +73,7 @@ import * as os from '@/os.js';
import { signinRequired } from '@/account.js';
import { misskeyApi } from '@/utility/misskey-api.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import MkPushNotificationAllowButton from '@/components/MkPushNotificationAllowButton.vue';
import { notificationTypes } from '@@/js/const.js';
@@ -138,7 +138,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.notifications,
icon: 'ti ti-bell',
}));
diff --git a/packages/frontend/src/pages/settings/other.vue b/packages/frontend/src/pages/settings/other.vue
index f2d998579f..835739a6c6 100644
--- a/packages/frontend/src/pages/settings/other.vue
+++ b/packages/frontend/src/pages/settings/other.vue
@@ -120,7 +120,7 @@ import { misskeyApi } from '@/utility/misskey-api.js';
import { store } from '@/store.js';
import { signout, signinRequired } from '@/account.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { reloadAsk } from '@/utility/reload-ask.js';
import FormSection from '@/components/form/section.vue';
import { prefer } from '@/preferences.js';
@@ -175,7 +175,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.other,
icon: 'ti ti-dots',
}));
diff --git a/packages/frontend/src/pages/settings/plugin.install.vue b/packages/frontend/src/pages/settings/plugin.install.vue
index 915eb8031c..e984ed7f8a 100644
--- a/packages/frontend/src/pages/settings/plugin.install.vue
+++ b/packages/frontend/src/pages/settings/plugin.install.vue
@@ -24,7 +24,7 @@ import MkButton from '@/components/MkButton.vue';
import FormInfo from '@/components/MkInfo.vue';
import * as os from '@/os.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { installPlugin } from '@/plugin.js';
import { useRouter } from '@/router/supplier.js';
@@ -53,7 +53,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts._plugin.install,
icon: 'ti ti-download',
}));
diff --git a/packages/frontend/src/pages/settings/plugin.vue b/packages/frontend/src/pages/settings/plugin.vue
index 32c35e3670..93a0e8a850 100644
--- a/packages/frontend/src/pages/settings/plugin.vue
+++ b/packages/frontend/src/pages/settings/plugin.vue
@@ -99,7 +99,7 @@ import MkCode from '@/components/MkCode.vue';
import MkFolder from '@/components/MkFolder.vue';
import MkKeyValue from '@/components/MkKeyValue.vue';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { changePluginActive, configPlugin, pluginLogs, uninstallPlugin, reloadPlugin } from '@/plugin.js';
import { prefer } from '@/preferences.js';
import * as os from '@/os.js';
@@ -138,7 +138,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.plugins,
icon: 'ti ti-plug',
}));
diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue
index f3f52d0914..58e01df633 100644
--- a/packages/frontend/src/pages/settings/preferences.vue
+++ b/packages/frontend/src/pages/settings/preferences.vue
@@ -377,7 +377,7 @@ import * as os from '@/os.js';
import { misskeyApi } from '@/utility/misskey-api.js';
import { reloadAsk } from '@/utility/reload-ask.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { miLocalStorage } from '@/local-storage.js';
import { prefer } from '@/preferences.js';
import MkPreferenceContainer from '@/components/MkPreferenceContainer.vue';
@@ -521,7 +521,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.general,
icon: 'ti ti-adjustments',
}));
diff --git a/packages/frontend/src/pages/settings/privacy.vue b/packages/frontend/src/pages/settings/privacy.vue
index 7b69e91be9..d42dd323e0 100644
--- a/packages/frontend/src/pages/settings/privacy.vue
+++ b/packages/frontend/src/pages/settings/privacy.vue
@@ -182,7 +182,7 @@ import { misskeyApi } from '@/utility/misskey-api.js';
import { i18n } from '@/i18n.js';
import { instance } from '@/instance.js';
import { signinRequired } from '@/account.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import FormSlot from '@/components/form/slot.vue';
import { formatDateTimeString } from '@/utility/format-time-string.js';
import MkInput from '@/components/MkInput.vue';
@@ -263,7 +263,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.privacy,
icon: 'ti ti-lock-open',
}));
diff --git a/packages/frontend/src/pages/settings/profile.vue b/packages/frontend/src/pages/settings/profile.vue
index 5efd986ce7..1d85ba7834 100644
--- a/packages/frontend/src/pages/settings/profile.vue
+++ b/packages/frontend/src/pages/settings/profile.vue
@@ -166,7 +166,7 @@ import * as os from '@/os.js';
import { i18n } from '@/i18n.js';
import { signinRequired } from '@/account.js';
import { langmap } from '@/utility/langmap.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { claimAchievement } from '@/utility/achievements.js';
import { store } from '@/store.js';
import { globalEvents } from '@/events.js';
@@ -316,7 +316,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.profile,
icon: 'ti ti-user',
}));
diff --git a/packages/frontend/src/pages/settings/roles.vue b/packages/frontend/src/pages/settings/roles.vue
index 4b0daff7fa..c1cabad2c3 100644
--- a/packages/frontend/src/pages/settings/roles.vue
+++ b/packages/frontend/src/pages/settings/roles.vue
@@ -28,7 +28,7 @@ import FormSection from '@/components/form/section.vue';
import * as os from '@/os.js';
import { i18n } from '@/i18n.js';
import { signinRequired } from '@/account.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import MkRolePreview from '@/components/MkRolePreview.vue';
const $i = signinRequired();
@@ -37,7 +37,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.roles,
icon: 'ti ti-badges',
}));
diff --git a/packages/frontend/src/pages/settings/security.vue b/packages/frontend/src/pages/settings/security.vue
index fec760582c..9b664fa98a 100644
--- a/packages/frontend/src/pages/settings/security.vue
+++ b/packages/frontend/src/pages/settings/security.vue
@@ -58,7 +58,7 @@ import MkPagination from '@/components/MkPagination.vue';
import * as os from '@/os.js';
import { misskeyApi } from '@/utility/misskey-api.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
const pagination = {
endpoint: 'i/signin-history' as const,
@@ -112,7 +112,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.security,
icon: 'ti ti-lock',
}));
diff --git a/packages/frontend/src/pages/settings/sounds.vue b/packages/frontend/src/pages/settings/sounds.vue
index ea634646f6..0c447b1a67 100644
--- a/packages/frontend/src/pages/settings/sounds.vue
+++ b/packages/frontend/src/pages/settings/sounds.vue
@@ -65,7 +65,7 @@ import MkButton from '@/components/MkButton.vue';
import FormSection from '@/components/form/section.vue';
import MkFolder from '@/components/MkFolder.vue';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { operationTypes } from '@/utility/sound.js';
import MkSwitch from '@/components/MkSwitch.vue';
import MkPreferenceContainer from '@/components/MkPreferenceContainer.vue';
@@ -117,7 +117,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.sounds,
icon: 'ti ti-music',
}));
diff --git a/packages/frontend/src/pages/settings/statusbar.vue b/packages/frontend/src/pages/settings/statusbar.vue
index 7b09093c85..7e6a536216 100644
--- a/packages/frontend/src/pages/settings/statusbar.vue
+++ b/packages/frontend/src/pages/settings/statusbar.vue
@@ -23,7 +23,7 @@ import MkFolder from '@/components/MkFolder.vue';
import MkButton from '@/components/MkButton.vue';
import { misskeyApi } from '@/utility/misskey-api.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { prefer } from '@/preferences.js';
const statusbars = prefer.r.statusbars;
@@ -50,7 +50,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.statusbar,
icon: 'ti ti-list',
}));
diff --git a/packages/frontend/src/pages/settings/theme.install.vue b/packages/frontend/src/pages/settings/theme.install.vue
index 92f4893f1a..68e4bef5c4 100644
--- a/packages/frontend/src/pages/settings/theme.install.vue
+++ b/packages/frontend/src/pages/settings/theme.install.vue
@@ -23,7 +23,7 @@ import MkButton from '@/components/MkButton.vue';
import { parseThemeCode, previewTheme, installTheme } from '@/theme.js';
import * as os from '@/os.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { useRouter } from '@/router/supplier.js';
const router = useRouter();
@@ -63,7 +63,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts._theme.install,
icon: 'ti ti-download',
}));
diff --git a/packages/frontend/src/pages/settings/theme.manage.vue b/packages/frontend/src/pages/settings/theme.manage.vue
index cc730cf4f0..e2b48ea232 100644
--- a/packages/frontend/src/pages/settings/theme.manage.vue
+++ b/packages/frontend/src/pages/settings/theme.manage.vue
@@ -43,7 +43,7 @@ import { copyToClipboard } from '@/utility/copy-to-clipboard.js';
import * as os from '@/os.js';
import { getThemes, removeTheme } from '@/theme-store.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
const installedThemes = ref(getThemes());
const builtinThemes = getBuiltinThemesRef();
@@ -77,7 +77,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts._theme.manage,
icon: 'ti ti-tool',
}));
diff --git a/packages/frontend/src/pages/settings/theme.vue b/packages/frontend/src/pages/settings/theme.vue
index f536b92599..71dba777b7 100644
--- a/packages/frontend/src/pages/settings/theme.vue
+++ b/packages/frontend/src/pages/settings/theme.vue
@@ -91,7 +91,7 @@ import { i18n } from '@/i18n.js';
import { instance } from '@/instance.js';
import { uniqueBy } from '@/utility/array.js';
import { getThemes } from '@/theme-store.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { miLocalStorage } from '@/local-storage.js';
import { reloadAsk } from '@/utility/reload-ask.js';
import { prefer } from '@/preferences.js';
@@ -230,7 +230,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.theme,
icon: 'ti ti-palette',
}));
diff --git a/packages/frontend/src/pages/settings/webhook.edit.vue b/packages/frontend/src/pages/settings/webhook.edit.vue
index 83902fe6ba..2de948c69d 100644
--- a/packages/frontend/src/pages/settings/webhook.edit.vue
+++ b/packages/frontend/src/pages/settings/webhook.edit.vue
@@ -78,7 +78,7 @@ import MkButton from '@/components/MkButton.vue';
import * as os from '@/os.js';
import { misskeyApi } from '@/utility/misskey-api.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { useRouter } from '@/router/supplier.js';
const router = useRouter();
@@ -155,7 +155,7 @@ const headerActions = computed(() => []);
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: 'Edit webhook',
icon: 'ti ti-webhook',
}));
diff --git a/packages/frontend/src/pages/settings/webhook.new.vue b/packages/frontend/src/pages/settings/webhook.new.vue
index ef5b7393bb..e853f967cb 100644
--- a/packages/frontend/src/pages/settings/webhook.new.vue
+++ b/packages/frontend/src/pages/settings/webhook.new.vue
@@ -46,7 +46,7 @@ import MkSwitch from '@/components/MkSwitch.vue';
import MkButton from '@/components/MkButton.vue';
import * as os from '@/os.js';
import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
const name = ref('');
const url = ref('');
@@ -82,7 +82,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: 'Create new webhook',
icon: 'ti ti-webhook',
}));
diff --git a/packages/frontend/src/pages/settings/webhook.vue b/packages/frontend/src/pages/settings/webhook.vue
index 7f84d87973..bf8af8cdce 100644
--- a/packages/frontend/src/pages/settings/webhook.vue
+++ b/packages/frontend/src/pages/settings/webhook.vue
@@ -37,7 +37,7 @@ import { computed } from 'vue';
import MkPagination from '@/components/MkPagination.vue';
import FormSection from '@/components/form/section.vue';
import FormLink from '@/components/form/link.vue';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { i18n } from '@/i18n.js';
const pagination = {
@@ -50,7 +50,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: 'Webhook',
icon: 'ti ti-webhook',
}));
diff --git a/packages/frontend/src/pages/share.vue b/packages/frontend/src/pages/share.vue
index fc93f86a5b..abd84c8590 100644
--- a/packages/frontend/src/pages/share.vue
+++ b/packages/frontend/src/pages/share.vue
@@ -38,7 +38,7 @@ import MkButton from '@/components/MkButton.vue';
import MkPostForm from '@/components/MkPostForm.vue';
import * as os from '@/os.js';
import { misskeyApi } from '@/utility/misskey-api.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { postMessageToParentWindow } from '@/utility/post-message.js';
import { i18n } from '@/i18n.js';
@@ -199,7 +199,7 @@ const headerActions = computed(() => []);
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.share,
icon: 'ti ti-share',
}));
diff --git a/packages/frontend/src/pages/tag.vue b/packages/frontend/src/pages/tag.vue
index f7e0302ca7..1af69d82db 100644
--- a/packages/frontend/src/pages/tag.vue
+++ b/packages/frontend/src/pages/tag.vue
@@ -23,7 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only
import { computed, ref } from 'vue';
import MkNotes from '@/components/MkNotes.vue';
import MkButton from '@/components/MkButton.vue';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { i18n } from '@/i18n.js';
import { $i } from '@/account.js';
import { store } from '@/store.js';
@@ -68,7 +68,7 @@ const headerActions = computed(() => [{
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: props.tag,
icon: 'ti ti-hash',
}));
diff --git a/packages/frontend/src/pages/theme-editor.vue b/packages/frontend/src/pages/theme-editor.vue
index 43ac5f38d7..11971756f4 100644
--- a/packages/frontend/src/pages/theme-editor.vue
+++ b/packages/frontend/src/pages/theme-editor.vue
@@ -93,7 +93,7 @@ import { store } from '@/store.js';
import { addTheme } from '@/theme-store.js';
import { i18n } from '@/i18n.js';
import { useLeaveGuard } from '@/utility/use-leave-guard.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { prefer } from '@/preferences.js';
const bgColors = [
@@ -228,7 +228,7 @@ const headerActions = computed(() => [{
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.themeEditor,
icon: 'ti ti-palette',
}));
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index 8d64b0a974..0ac6979b05 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -49,7 +49,7 @@ import { misskeyApi } from '@/utility/misskey-api.js';
import { store } from '@/store.js';
import { i18n } from '@/i18n.js';
import { $i } from '@/account.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { antennasCache, userListsCache, favoritedChannelsCache } from '@/cache.js';
import { deviceKind } from '@/utility/device-kind.js';
import { deepMerge } from '@/utility/merge.js';
@@ -333,7 +333,7 @@ const headerTabsWhenNotLogin = computed(() => [...availableBasicTimelines().map(
iconOnly: true,
}))] as Tab[]);
-definePageMetadata(() => ({
+definePage(() => ({
title: i18n.ts.timeline,
icon: isBasicTimeline(src.value) ? basicTimelineIconClass(src.value) : 'ti ti-home',
}));
diff --git a/packages/frontend/src/pages/user-list-timeline.vue b/packages/frontend/src/pages/user-list-timeline.vue
index 7ab1c91975..d4c7c9386d 100644
--- a/packages/frontend/src/pages/user-list-timeline.vue
+++ b/packages/frontend/src/pages/user-list-timeline.vue
@@ -29,7 +29,7 @@ import * as Misskey from 'misskey-js';
import MkTimeline from '@/components/MkTimeline.vue';
import { scroll } from '@@/js/scroll.js';
import { misskeyApi } from '@/utility/misskey-api.js';
-import { definePageMetadata } from '@/utility/page-metadata.js';
+import { definePage } from '@/page.js';
import { i18n } from '@/i18n.js';
import { useRouter } from '@/router/supplier.js';
@@ -70,7 +70,7 @@ const headerActions = computed(() => list.value ? [{
const headerTabs = computed(() => []);
-definePageMetadata(() => ({
+definePage(() => ({
title: list.value ? list.value.name : i18n.ts.lists,
icon: 'ti ti-list',
}));
diff --git a/packages/frontend/src/pages/user-tag.vue b/packages/frontend/src/pages/user-tag.vue
index af543ac723..fc9ff92080 100644
--- a/packages/frontend/src/pages/user-tag.vue
+++ b/packages/frontend/src/pages/user-tag.vue
@@ -18,7 +18,7 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/pages/settings/theme.vue b/packages/frontend/src/pages/settings/theme.vue
index 71dba777b7..0e4f791f2c 100644
--- a/packages/frontend/src/pages/settings/theme.vue
+++ b/packages/frontend/src/pages/settings/theme.vue
@@ -5,7 +5,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
-->
-
@@ -24,7 +24,9 @@ import { parseThemeCode, previewTheme, installTheme } from '@/theme.js';
import * as os from '@/os.js';
import { i18n } from '@/i18n.js';
import { definePageMetadata } from '@/utility/page-metadata.js';
+import { useRouter } from '@/router/supplier.js';
+const router = useRouter();
const installThemeCode = ref
+
-
+
-
+
-
+
@@ -47,18 +47,19 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/components/MkModal.vue b/packages/frontend/src/components/MkModal.vue
index 521c851d8b..8b3086d55e 100644
--- a/packages/frontend/src/components/MkModal.vue
+++ b/packages/frontend/src/components/MkModal.vue
@@ -43,12 +43,12 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
diff --git a/packages/frontend/src/pages/settings/theme.install.vue b/packages/frontend/src/pages/settings/theme.install.vue
index c731f343e2..92f4893f1a 100644
--- a/packages/frontend/src/pages/settings/theme.install.vue
+++ b/packages/frontend/src/pages/settings/theme.install.vue
@@ -10,8 +10,8 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.disconnectedFromServer }}
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
-->
-
+
diff --git a/packages/frontend/src/pages/settings/statusbar.vue b/packages/frontend/src/pages/settings/statusbar.vue
index 2737af3aa4..7b09093c85 100644
--- a/packages/frontend/src/pages/settings/statusbar.vue
+++ b/packages/frontend/src/pages/settings/statusbar.vue
@@ -37,7 +37,7 @@ onMounted(() => {
});
async function add() {
- prefer.set('statusbars', [...statusbars.value, {
+ prefer.commit('statusbars', [...statusbars.value, {
id: uuid(),
type: null,
black: false,
diff --git a/packages/frontend/src/pages/settings/theme.vue b/packages/frontend/src/pages/settings/theme.vue
index 397c387af6..f536b92599 100644
--- a/packages/frontend/src/pages/settings/theme.vue
+++ b/packages/frontend/src/pages/settings/theme.vue
@@ -179,7 +179,7 @@ const darkThemeId = computed({
set(id) {
const t = themes.value.find(x => x.id === id);
if (t) { // テーマエディタでテーマを作成したときなどは、themesに反映されないため undefined になる
- prefer.set('darkTheme', t);
+ prefer.commit('darkTheme', t);
}
},
});
@@ -191,7 +191,7 @@ const lightThemeId = computed({
set(id) {
const t = themes.value.find(x => x.id === id);
if (t) { // テーマエディタでテーマを作成したときなどは、themesに反映されないため undefined になる
- prefer.set('lightTheme', t);
+ prefer.commit('lightTheme', t);
}
},
});
diff --git a/packages/frontend/src/pages/theme-editor.vue b/packages/frontend/src/pages/theme-editor.vue
index 64e16987a9..43ac5f38d7 100644
--- a/packages/frontend/src/pages/theme-editor.vue
+++ b/packages/frontend/src/pages/theme-editor.vue
@@ -201,9 +201,9 @@ async function saveAs() {
await addTheme(theme.value);
applyTheme(theme.value);
if (store.s.darkMode) {
- prefer.set('darkTheme', theme.value);
+ prefer.commit('darkTheme', theme.value);
} else {
- prefer.set('lightTheme', theme.value);
+ prefer.commit('lightTheme', theme.value);
}
changed.value = false;
os.alert({
diff --git a/packages/frontend/src/plugin.ts b/packages/frontend/src/plugin.ts
index 25d69cd727..1b51850e77 100644
--- a/packages/frontend/src/plugin.ts
+++ b/packages/frontend/src/plugin.ts
@@ -145,7 +145,7 @@ export async function installPlugin(code: string, meta?: AiScriptPluginMeta) {
src: code,
};
- prefer.set('plugins', prefer.s.plugins.concat(plugin));
+ prefer.commit('plugins', prefer.s.plugins.concat(plugin));
await authorizePlugin(plugin);
@@ -154,7 +154,7 @@ export async function installPlugin(code: string, meta?: AiScriptPluginMeta) {
export async function uninstallPlugin(plugin: Plugin) {
abortPlugin(plugin);
- prefer.set('plugins', prefer.s.plugins.filter(x => x.installId !== plugin.installId));
+ prefer.commit('plugins', prefer.s.plugins.filter(x => x.installId !== plugin.installId));
if (Object.hasOwn(store.s.pluginTokens, plugin.installId)) {
await os.apiWithDialog('i/revoke-token', {
token: store.s.pluginTokens[plugin.installId],
@@ -311,13 +311,13 @@ export async function configPlugin(plugin: Plugin) {
const { canceled, result } = await os.form(plugin.name, config);
if (canceled) return;
- prefer.set('plugins', prefer.s.plugins.map(x => x.installId === plugin.installId ? { ...x, configData: result } : x));
+ prefer.commit('plugins', prefer.s.plugins.map(x => x.installId === plugin.installId ? { ...x, configData: result } : x));
reloadPlugin(plugin);
}
export function changePluginActive(plugin: Plugin, active: boolean) {
- prefer.set('plugins', prefer.s.plugins.map(x => x.installId === plugin.installId ? { ...x, active } : x));
+ prefer.commit('plugins', prefer.s.plugins.map(x => x.installId === plugin.installId ? { ...x, active } : x));
if (active) {
launchPlugin(plugin.installId);
diff --git a/packages/frontend/src/preferences/profile.ts b/packages/frontend/src/preferences/profile.ts
index 1d03639d37..c1320b0dcc 100644
--- a/packages/frontend/src/preferences/profile.ts
+++ b/packages/frontend/src/preferences/profile.ts
@@ -222,7 +222,7 @@ export class ProfileManager extends EventEmitter<{
text: i18n.ts.resetToDefaultValue,
danger: true,
action: () => {
- this.store.set(key, PREF_DEF[key].default);
+ this.store.commit(key, PREF_DEF[key].default);
},
}, {
type: 'divider',
diff --git a/packages/frontend/src/preferences/store.ts b/packages/frontend/src/preferences/store.ts
index 58684ce024..e10afcc308 100644
--- a/packages/frontend/src/preferences/store.ts
+++ b/packages/frontend/src/preferences/store.ts
@@ -44,7 +44,7 @@ export class Store> extends EventEmitter(key: K, value: Data[K]) {
+ public commit(key: K, value: Data[K]) {
this.r[key].value = this.s[key] = value;
this.emit('updated', { key, value });
}
@@ -84,7 +84,7 @@ export class Store> extends EventEmitter {
const val = setter ? setter(value) : value;
- this.set(key, val);
+ this.commit(key, val);
valueRef.value = val;
},
});
diff --git a/packages/frontend/src/theme-store.ts b/packages/frontend/src/theme-store.ts
index c02005a15c..5d09ec27f9 100644
--- a/packages/frontend/src/theme-store.ts
+++ b/packages/frontend/src/theme-store.ts
@@ -23,11 +23,11 @@ export async function addTheme(theme: Theme): Promise {
if (themes.some(t => t.id === theme.id)) {
throw new Error('already exists');
}
- prefer.set('themes', [...themes, theme]);
+ prefer.commit('themes', [...themes, theme]);
}
export async function removeTheme(theme: Theme): Promise {
if ($i == null) return;
const themes = getThemes().filter(t => t.id !== theme.id);
- prefer.set('themes', themes);
+ prefer.commit('themes', themes);
}
diff --git a/packages/frontend/src/ui/classic.vue b/packages/frontend/src/ui/classic.vue
index 3d4e8ed19d..3faacc5125 100644
--- a/packages/frontend/src/ui/classic.vue
+++ b/packages/frontend/src/ui/classic.vue
@@ -144,7 +144,7 @@ if (window.innerWidth < 1024) {
document.documentElement.style.overflowY = 'scroll';
if (prefer.s.widgets.length === 0) {
- prefer.set('widgets', [{
+ prefer.commit('widgets', [{
name: 'calendar',
id: 'a', place: null, data: {},
}, {
diff --git a/packages/frontend/src/ui/universal.vue b/packages/frontend/src/ui/universal.vue
index 633eca7542..8d0015a046 100644
--- a/packages/frontend/src/ui/universal.vue
+++ b/packages/frontend/src/ui/universal.vue
@@ -178,7 +178,7 @@ if (window.innerWidth > 1024) {
}
if (prefer.s.widgets.length === 0) {
- prefer.set('widgets', [{
+ prefer.commit('widgets', [{
name: 'calendar',
id: 'a', place: 'right', data: {},
}, {
diff --git a/packages/frontend/src/ui/universal.widgets.vue b/packages/frontend/src/ui/universal.widgets.vue
index ea2b7f2cf2..1a6d62e19b 100644
--- a/packages/frontend/src/ui/universal.widgets.vue
+++ b/packages/frontend/src/ui/universal.widgets.vue
@@ -37,18 +37,18 @@ const widgets = computed(() => {
});
function addWidget(widget) {
- prefer.set('widgets', [{
+ prefer.commit('widgets', [{
...widget,
place: props.place,
}, ...prefer.s.widgets]);
}
function removeWidget(widget) {
- prefer.set('widgets', prefer.s.widgets.filter(w => w.id !== widget.id));
+ prefer.commit('widgets', prefer.s.widgets.filter(w => w.id !== widget.id));
}
function updateWidget({ id, data }) {
- prefer.set('widgets', prefer.s.widgets.map(w => w.id === id ? {
+ prefer.commit('widgets', prefer.s.widgets.map(w => w.id === id ? {
...w,
data,
place: props.place,
@@ -57,17 +57,17 @@ function updateWidget({ id, data }) {
function updateWidgets(thisWidgets) {
if (props.place === null) {
- prefer.set('widgets', thisWidgets);
+ prefer.commit('widgets', thisWidgets);
return;
}
if (props.place === 'left') {
- prefer.set('widgets', [
+ prefer.commit('widgets', [
...thisWidgets.map(w => ({ ...w, place: 'left' })),
...prefer.s.widgets.filter(w => w.place !== 'left' && !thisWidgets.some(t => w.id === t.id)),
]);
return;
}
- prefer.set('widgets', [
+ prefer.commit('widgets', [
...prefer.s.widgets.filter(w => w.place === 'left' && !thisWidgets.some(t => w.id === t.id)),
...thisWidgets.map(w => ({ ...w, place: 'right' })),
]);
From 7957ee51910bca040ee2c4c5fdf1b965bd1b43a8 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 10 Mar 2025 11:28:54 +0900
Subject: [PATCH 071/348] fix(frontend): rename pizzax fields
---
packages/frontend/src/boot/main-boot.ts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index 72b05ad05e..bf3ab12682 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -223,9 +223,9 @@ export async function mainBoot() {
prefer.commit('sound.on.noteMy', store.s.sound_noteMy as any);
prefer.commit('sound.on.notification', store.s.sound_notification as any);
prefer.commit('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('deck.profile', deckStore.s.profile);
+ store.set('deck.columns', deckStore.s.columns);
+ store.set('deck.layout', deckStore.s.layout);
store.set('menu', []);
}
From 6c9153300d8287fdea7b780500d298865ed728e8 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 10 Mar 2025 12:03:54 +0900
Subject: [PATCH 072/348] chore(frontend): tweak lockdown setting
---
locales/index.d.ts | 4 ++++
locales/ja-JP.yml | 1 +
packages/frontend/src/pages/settings/privacy.vue | 5 +++--
.../frontend/src/utility/autogen/settings-search-index.ts | 2 +-
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 344c3ccf9d..0cdd428c82 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -5395,6 +5395,10 @@ export interface Locale extends ILocale {
* リモートサーバーに連合されたノートには効果が及ばない場合があります。
*/
"mayNotEffectForFederatedNotes": string;
+ /**
+ * これらの制限は簡易的なものです。リモートサーバーでの閲覧やモデレーション時など、一部のシチュエーションでは適用されない場合があります。
+ */
+ "mayNotEffectSomeSituations": string;
/**
* 指定した時間を経過しているノート
*/
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 301b68e21d..1e41c43864 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1349,6 +1349,7 @@ _accountSettings:
makeNotesHiddenBefore: "過去のノートを非公開化する"
makeNotesHiddenBeforeDescription: "この機能が有効になっている間、設定された日時より過去、または設定された時間を経過しているノートが自分のみ表示可能(非公開化)になります。無効に戻すと、ノートの公開状態も元に戻ります。"
mayNotEffectForFederatedNotes: "リモートサーバーに連合されたノートには効果が及ばない場合があります。"
+ mayNotEffectSomeSituations: "これらの制限は簡易的なものです。リモートサーバーでの閲覧やモデレーション時など、一部のシチュエーションでは適用されない場合があります。"
notesHavePassedSpecifiedPeriod: "指定した時間を経過しているノート"
notesOlderThanSpecifiedDateAndTime: "指定した日時より前のノート"
diff --git a/packages/frontend/src/pages/settings/privacy.vue b/packages/frontend/src/pages/settings/privacy.vue
index 7660a591b4..7b69e91be9 100644
--- a/packages/frontend/src/pages/settings/privacy.vue
+++ b/packages/frontend/src/pages/settings/privacy.vue
@@ -123,7 +123,6 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._accountSettings.makeNotesFollowersOnlyBeforeDescription }}
- {{ i18n.ts._accountSettings.makeNotesHiddenBeforeDescription }}
- {{ i18n.ts._accountSettings.mayNotEffectSomeSituations }}
@@ -188,6 +188,7 @@ import { formatDateTimeString } from '@/utility/format-time-string.js';
import MkInput from '@/components/MkInput.vue';
import * as os from '@/os.js';
import MkDisableSection from '@/components/MkDisableSection.vue';
+import MkInfo from '@/components/MkInfo.vue';
const $i = signinRequired();
diff --git a/packages/frontend/src/utility/autogen/settings-search-index.ts b/packages/frontend/src/utility/autogen/settings-search-index.ts
index 8e2a896b17..66476672e3 100644
--- a/packages/frontend/src/utility/autogen/settings-search-index.ts
+++ b/packages/frontend/src/utility/autogen/settings-search-index.ts
@@ -253,7 +253,7 @@ export const searchIndexes: SearchIndexItem[] = [
keywords: ['follower', i18n.ts._accountSettings.makeNotesFollowersOnlyBeforeDescription],
},
{
- id: '2prkeWRSd',
+ id: 'ebJ9IUbik',
label: i18n.ts._accountSettings.makeNotesHiddenBefore,
keywords: ['hidden', i18n.ts._accountSettings.makeNotesHiddenBeforeDescription],
},
From 5ed1101bbda9d6e9c03d39c106e0da868e1d419b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Mar 2025 12:30:37 +0900
Subject: [PATCH 073/348] chore(deps): update [root] update dependencies
(#15624)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
package.json | 4 +-
pnpm-lock.yaml | 335 ++++++++++++++++++++++++++++---------------------
2 files changed, 196 insertions(+), 143 deletions(-)
diff --git a/package.json b/package.json
index 73577833f8..ff891ab9a4 100644
--- a/package.json
+++ b/package.json
@@ -65,12 +65,12 @@
},
"devDependencies": {
"@misskey-dev/eslint-plugin": "2.1.0",
- "@types/node": "22.13.9",
+ "@types/node": "22.13.10",
"@typescript-eslint/eslint-plugin": "8.26.0",
"@typescript-eslint/parser": "8.26.0",
"cross-env": "7.0.3",
"cypress": "14.1.0",
- "eslint": "9.21.0",
+ "eslint": "9.22.0",
"globals": "16.0.0",
"ncp": "2.0.0",
"pnpm": "10.6.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 46ce2bf978..4b70b273d0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -54,16 +54,16 @@ importers:
devDependencies:
'@misskey-dev/eslint-plugin':
specifier: 2.1.0
- version: 2.1.0(@eslint/compat@1.1.1)(@stylistic/eslint-plugin@2.13.0(eslint@9.21.0)(typescript@5.8.2))(@typescript-eslint/eslint-plugin@8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0)(typescript@5.8.2))(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0))(eslint@9.21.0)(globals@16.0.0)
+ version: 2.1.0(@eslint/compat@1.1.1)(@stylistic/eslint-plugin@2.13.0(eslint@9.22.0)(typescript@5.8.2))(@typescript-eslint/eslint-plugin@8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0)(typescript@5.8.2))(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0))(eslint@9.22.0)(globals@16.0.0)
'@types/node':
- specifier: 22.13.9
- version: 22.13.9
+ specifier: 22.13.10
+ version: 22.13.10
'@typescript-eslint/eslint-plugin':
specifier: 8.26.0
- version: 8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0)(typescript@5.8.2)
+ version: 8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0)(typescript@5.8.2)
'@typescript-eslint/parser':
specifier: 8.26.0
- version: 8.26.0(eslint@9.21.0)(typescript@5.8.2)
+ version: 8.26.0(eslint@9.22.0)(typescript@5.8.2)
cross-env:
specifier: 7.0.3
version: 7.0.3
@@ -71,8 +71,8 @@ importers:
specifier: 14.1.0
version: 14.1.0
eslint:
- specifier: 9.21.0
- version: 9.21.0
+ specifier: 9.22.0
+ version: 9.22.0
globals:
specifier: 16.0.0
version: 16.0.0
@@ -569,10 +569,10 @@ importers:
version: 8.5.14
'@typescript-eslint/eslint-plugin':
specifier: 8.24.0
- version: 8.24.0(@typescript-eslint/parser@8.24.0(eslint@9.21.0)(typescript@5.7.3))(eslint@9.21.0)(typescript@5.7.3)
+ version: 8.24.0(@typescript-eslint/parser@8.24.0(eslint@9.22.0)(typescript@5.7.3))(eslint@9.22.0)(typescript@5.7.3)
'@typescript-eslint/parser':
specifier: 8.24.0
- version: 8.24.0(eslint@9.21.0)(typescript@5.7.3)
+ version: 8.24.0(eslint@9.22.0)(typescript@5.7.3)
aws-sdk-client-mock:
specifier: 4.1.0
version: 4.1.0
@@ -581,7 +581,7 @@ importers:
version: 7.0.3
eslint-plugin-import:
specifier: 2.31.0
- version: 2.31.0(@typescript-eslint/parser@8.24.0(eslint@9.21.0)(typescript@5.7.3))(eslint@9.21.0)
+ version: 2.31.0(@typescript-eslint/parser@8.24.0(eslint@9.22.0)(typescript@5.7.3))(eslint@9.22.0)
execa:
specifier: 8.0.1
version: 8.0.1
@@ -973,10 +973,10 @@ importers:
version: 8.18.0
'@typescript-eslint/eslint-plugin':
specifier: 8.26.0
- version: 8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0)(typescript@5.8.2)
+ version: 8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0)(typescript@5.8.2)
'@typescript-eslint/parser':
specifier: 8.26.0
- version: 8.26.0(eslint@9.21.0)(typescript@5.8.2)
+ version: 8.26.0(eslint@9.22.0)(typescript@5.8.2)
'@vitest/coverage-v8':
specifier: 3.0.8
version: 3.0.8(vitest@3.0.8(@types/debug@4.1.12)(@types/node@22.13.9)(happy-dom@17.3.0)(jsdom@26.0.0(bufferutil@4.0.9)(canvas@3.1.0)(utf-8-validate@6.0.5))(msw@2.7.3(@types/node@22.13.9)(typescript@5.8.2))(sass@1.85.1)(terser@5.39.0)(tsx@4.19.3))
@@ -994,10 +994,10 @@ importers:
version: 14.1.0
eslint-plugin-import:
specifier: 2.31.0
- version: 2.31.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0)
+ version: 2.31.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0)
eslint-plugin-vue:
specifier: 10.0.0
- version: 10.0.0(eslint@9.21.0)(vue-eslint-parser@10.1.1(eslint@9.21.0))
+ version: 10.0.0(eslint@9.22.0)(vue-eslint-parser@10.1.1(eslint@9.22.0))
fast-glob:
specifier: 3.3.3
version: 3.3.3
@@ -1054,7 +1054,7 @@ importers:
version: 2.2.8
vue-eslint-parser:
specifier: 10.1.1
- version: 10.1.1(eslint@9.21.0)
+ version: 10.1.1(eslint@9.22.0)
vue-tsc:
specifier: 2.2.8
version: 2.2.8(typescript@5.8.2)
@@ -1166,10 +1166,10 @@ importers:
version: 8.18.0
'@typescript-eslint/eslint-plugin':
specifier: 8.26.0
- version: 8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0)(typescript@5.8.2)
+ version: 8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0)(typescript@5.8.2)
'@typescript-eslint/parser':
specifier: 8.26.0
- version: 8.26.0(eslint@9.21.0)(typescript@5.8.2)
+ version: 8.26.0(eslint@9.22.0)(typescript@5.8.2)
'@vitest/coverage-v8':
specifier: 3.0.8
version: 3.0.8(vitest@3.0.8(@types/debug@4.1.12)(@types/node@22.13.9)(happy-dom@17.3.0)(jsdom@26.0.0(bufferutil@4.0.9)(canvas@3.1.0)(utf-8-validate@6.0.5))(msw@2.7.3(@types/node@22.13.9)(typescript@5.8.2))(sass@1.85.1)(terser@5.39.0)(tsx@4.19.3))
@@ -1184,10 +1184,10 @@ importers:
version: 7.0.3
eslint-plugin-import:
specifier: 2.31.0
- version: 2.31.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0)
+ version: 2.31.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0)
eslint-plugin-vue:
specifier: 10.0.0
- version: 10.0.0(eslint@9.21.0)(vue-eslint-parser@10.1.1(eslint@9.21.0))
+ version: 10.0.0(eslint@9.22.0)(vue-eslint-parser@10.1.1(eslint@9.22.0))
fast-glob:
specifier: 3.3.3
version: 3.3.3
@@ -1220,7 +1220,7 @@ importers:
version: 2.2.8
vue-eslint-parser:
specifier: 10.1.1
- version: 10.1.1(eslint@9.21.0)
+ version: 10.1.1(eslint@9.22.0)
vue-tsc:
specifier: 2.2.8
version: 2.2.8(typescript@5.8.2)
@@ -1239,16 +1239,16 @@ importers:
version: 22.13.9
'@typescript-eslint/eslint-plugin':
specifier: 8.26.0
- version: 8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0)(typescript@5.8.2)
+ version: 8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0)(typescript@5.8.2)
'@typescript-eslint/parser':
specifier: 8.26.0
- version: 8.26.0(eslint@9.21.0)(typescript@5.8.2)
+ version: 8.26.0(eslint@9.22.0)(typescript@5.8.2)
esbuild:
specifier: 0.25.0
version: 0.25.0
eslint-plugin-vue:
specifier: 10.0.0
- version: 10.0.0(eslint@9.21.0)(vue-eslint-parser@10.1.1(eslint@9.21.0))
+ version: 10.0.0(eslint@9.22.0)(vue-eslint-parser@10.1.1(eslint@9.22.0))
nodemon:
specifier: 3.1.9
version: 3.1.9
@@ -1257,7 +1257,7 @@ importers:
version: 5.8.2
vue-eslint-parser:
specifier: 10.1.1
- version: 10.1.1(eslint@9.21.0)
+ version: 10.1.1(eslint@9.22.0)
packages/misskey-bubble-game:
dependencies:
@@ -1282,10 +1282,10 @@ importers:
version: 3.0.8
'@typescript-eslint/eslint-plugin':
specifier: 8.26.0
- version: 8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0)(typescript@5.8.2)
+ version: 8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0)(typescript@5.8.2)
'@typescript-eslint/parser':
specifier: 8.26.0
- version: 8.26.0(eslint@9.21.0)(typescript@5.8.2)
+ version: 8.26.0(eslint@9.22.0)(typescript@5.8.2)
esbuild:
specifier: 0.25.0
version: 0.25.0
@@ -1328,10 +1328,10 @@ importers:
version: 22.13.9
'@typescript-eslint/eslint-plugin':
specifier: 8.26.0
- version: 8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0)(typescript@5.8.2)
+ version: 8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0)(typescript@5.8.2)
'@typescript-eslint/parser':
specifier: 8.26.0
- version: 8.26.0(eslint@9.21.0)(typescript@5.8.2)
+ version: 8.26.0(eslint@9.22.0)(typescript@5.8.2)
esbuild:
specifier: 0.25.0
version: 0.25.0
@@ -1376,10 +1376,10 @@ importers:
version: 22.13.9
'@typescript-eslint/eslint-plugin':
specifier: 8.26.0
- version: 8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0)(typescript@5.8.2)
+ version: 8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0)(typescript@5.8.2)
'@typescript-eslint/parser':
specifier: 8.26.0
- version: 8.26.0(eslint@9.21.0)(typescript@5.8.2)
+ version: 8.26.0(eslint@9.22.0)(typescript@5.8.2)
openapi-types:
specifier: 12.1.3
version: 12.1.3
@@ -1407,10 +1407,10 @@ importers:
version: 22.13.9
'@typescript-eslint/eslint-plugin':
specifier: 8.26.0
- version: 8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0)(typescript@5.8.2)
+ version: 8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0)(typescript@5.8.2)
'@typescript-eslint/parser':
specifier: 8.26.0
- version: 8.26.0(eslint@9.21.0)(typescript@5.8.2)
+ version: 8.26.0(eslint@9.22.0)(typescript@5.8.2)
esbuild:
specifier: 0.25.0
version: 0.25.0
@@ -1441,13 +1441,13 @@ importers:
devDependencies:
'@typescript-eslint/parser':
specifier: 8.26.0
- version: 8.26.0(eslint@9.21.0)(typescript@5.8.2)
+ version: 8.26.0(eslint@9.22.0)(typescript@5.8.2)
'@typescript/lib-webworker':
specifier: npm:@types/serviceworker@0.0.74
version: '@types/serviceworker@0.0.74'
eslint-plugin-import:
specifier: 2.31.0
- version: 2.31.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0)
+ version: 2.31.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0)
nodemon:
specifier: 3.1.9
version: 3.1.9
@@ -2141,6 +2141,10 @@ packages:
resolution: {integrity: sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ '@eslint/config-helpers@0.1.0':
+ resolution: {integrity: sha512-kLrdPDJE1ckPo94kmPPf9Hfd0DU0Jw6oKYrhe+pwSC0iTUInmTa+w6fw8sGgcfkFJGNdWOUeOaDM4quW4a7OkA==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
'@eslint/core@0.12.0':
resolution: {integrity: sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -2149,8 +2153,8 @@ packages:
resolution: {integrity: sha512-yaVPAiNAalnCZedKLdR21GOGILMLKPyqSLWaAjQFvYA2i/ciDi8ArYVr69Anohb6cH2Ukhqti4aFnYyPm8wdwQ==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- '@eslint/js@9.21.0':
- resolution: {integrity: sha512-BqStZ3HX8Yz6LvsF5ByXYrtigrV5AXADWLAGc7PH/1SxOb7/FIYYMszZZWiUou/GB9P2lXWk2SV4d+Z8h0nknw==}
+ '@eslint/js@9.22.0':
+ resolution: {integrity: sha512-vLFajx9o8d1/oL2ZkpMYbkLv8nDB6yaIwFNt7nI4+I80U/z03SxmfOMsLbvWr3p7C+Wnoh//aOu2pQW8cS0HCQ==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
'@eslint/object-schema@2.1.6':
@@ -4198,6 +4202,9 @@ packages:
'@types/node-fetch@2.6.11':
resolution: {integrity: sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==}
+ '@types/node@22.13.10':
+ resolution: {integrity: sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==}
+
'@types/node@22.13.4':
resolution: {integrity: sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==}
@@ -6113,6 +6120,10 @@ packages:
resolution: {integrity: sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ eslint-scope@8.3.0:
+ resolution: {integrity: sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
eslint-visitor-keys@3.4.3:
resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -6121,8 +6132,8 @@ packages:
resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- eslint@9.21.0:
- resolution: {integrity: sha512-KjeihdFqTPhOMXTt7StsDxriV4n66ueuF/jfPNC3j/lduHwr/ijDwJMsF+wyMJethgiKi5wniIE243vi07d3pg==}
+ eslint@9.22.0:
+ resolution: {integrity: sha512-9V/QURhsRN40xuHXWjV64yvrzMjcz7ZyNoF2jJFmy9j/SLk0u1OLSZgXi28MrXjymnjEGSR80WCdab3RGMDveQ==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
hasBin: true
peerDependencies:
@@ -11850,9 +11861,9 @@ snapshots:
'@esbuild/win32-x64@0.25.0':
optional: true
- '@eslint-community/eslint-utils@4.4.0(eslint@9.21.0)':
+ '@eslint-community/eslint-utils@4.4.0(eslint@9.22.0)':
dependencies:
- eslint: 9.21.0
+ eslint: 9.22.0
eslint-visitor-keys: 3.4.3
'@eslint-community/regexpp@4.12.1': {}
@@ -11867,6 +11878,8 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ '@eslint/config-helpers@0.1.0': {}
+
'@eslint/core@0.12.0':
dependencies:
'@types/json-schema': 7.0.15
@@ -11885,7 +11898,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
- '@eslint/js@9.21.0': {}
+ '@eslint/js@9.22.0': {}
'@eslint/object-schema@2.1.6': {}
@@ -12165,7 +12178,7 @@ snapshots:
'@jest/console@29.7.0':
dependencies:
'@jest/types': 29.6.3
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
chalk: 4.1.2
jest-message-util: 29.7.0
jest-util: 29.7.0
@@ -12178,14 +12191,14 @@ snapshots:
'@jest/test-result': 29.7.0
'@jest/transform': 29.7.0
'@jest/types': 29.6.3
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
ansi-escapes: 4.3.2
chalk: 4.1.2
ci-info: 3.7.1
exit: 0.1.2
graceful-fs: 4.2.11
jest-changed-files: 29.7.0
- jest-config: 29.7.0(@types/node@22.13.9)
+ jest-config: 29.7.0(@types/node@22.13.10)
jest-haste-map: 29.7.0
jest-message-util: 29.7.0
jest-regex-util: 29.6.3
@@ -12214,7 +12227,7 @@ snapshots:
dependencies:
'@jest/fake-timers': 29.7.0
'@jest/types': 29.6.3
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
jest-mock: 29.7.0
'@jest/expect-utils@29.7.0':
@@ -12232,7 +12245,7 @@ snapshots:
dependencies:
'@jest/types': 29.6.3
'@sinonjs/fake-timers': 10.3.0
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
jest-message-util: 29.7.0
jest-mock: 29.7.0
jest-util: 29.7.0
@@ -12254,7 +12267,7 @@ snapshots:
'@jest/transform': 29.7.0
'@jest/types': 29.6.3
'@jridgewell/trace-mapping': 0.3.25
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
chalk: 4.1.2
collect-v8-coverage: 1.0.1
exit: 0.1.2
@@ -12324,7 +12337,7 @@ snapshots:
'@jest/schemas': 29.6.3
'@types/istanbul-lib-coverage': 2.0.4
'@types/istanbul-reports': 3.0.1
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/yargs': 17.0.19
chalk: 4.1.2
@@ -12434,14 +12447,14 @@ snapshots:
'@misskey-dev/browser-image-resizer@2024.1.0': {}
- '@misskey-dev/eslint-plugin@2.1.0(@eslint/compat@1.1.1)(@stylistic/eslint-plugin@2.13.0(eslint@9.21.0)(typescript@5.8.2))(@typescript-eslint/eslint-plugin@8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0)(typescript@5.8.2))(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0))(eslint@9.21.0)(globals@16.0.0)':
+ '@misskey-dev/eslint-plugin@2.1.0(@eslint/compat@1.1.1)(@stylistic/eslint-plugin@2.13.0(eslint@9.22.0)(typescript@5.8.2))(@typescript-eslint/eslint-plugin@8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0)(typescript@5.8.2))(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0))(eslint@9.22.0)(globals@16.0.0)':
dependencies:
'@eslint/compat': 1.1.1
- '@stylistic/eslint-plugin': 2.13.0(eslint@9.21.0)(typescript@5.8.2)
- '@typescript-eslint/eslint-plugin': 8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0)(typescript@5.8.2)
- '@typescript-eslint/parser': 8.26.0(eslint@9.21.0)(typescript@5.8.2)
- eslint: 9.21.0
- eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0)
+ '@stylistic/eslint-plugin': 2.13.0(eslint@9.22.0)(typescript@5.8.2)
+ '@typescript-eslint/eslint-plugin': 8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0)(typescript@5.8.2)
+ '@typescript-eslint/parser': 8.26.0(eslint@9.22.0)(typescript@5.8.2)
+ eslint: 9.22.0
+ eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0)
globals: 16.0.0
'@misskey-dev/sharp-read-bmp@1.2.0':
@@ -13975,10 +13988,10 @@ snapshots:
vue: 3.5.13(typescript@5.8.2)
vue-component-type-helpers: 2.2.8
- '@stylistic/eslint-plugin@2.13.0(eslint@9.21.0)(typescript@5.8.2)':
+ '@stylistic/eslint-plugin@2.13.0(eslint@9.22.0)(typescript@5.8.2)':
dependencies:
- '@typescript-eslint/utils': 8.26.0(eslint@9.21.0)(typescript@5.8.2)
- eslint: 9.21.0
+ '@typescript-eslint/utils': 8.26.0(eslint@9.22.0)(typescript@5.8.2)
+ eslint: 9.22.0
eslint-visitor-keys: 4.2.0
espree: 10.3.0
estraverse: 5.3.0
@@ -14228,7 +14241,7 @@ snapshots:
'@types/accepts@1.3.7':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/archiver@6.0.3':
dependencies:
@@ -14264,7 +14277,7 @@ snapshots:
'@types/body-parser@1.19.5':
dependencies:
'@types/connect': 3.4.35
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/braces@3.0.1': {}
@@ -14278,11 +14291,11 @@ snapshots:
'@types/connect@3.4.35':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/connect@3.4.36':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/content-disposition@0.5.8': {}
@@ -14307,7 +14320,7 @@ snapshots:
'@types/express-serve-static-core@4.17.33':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/qs': 6.9.7
'@types/range-parser': 1.2.4
@@ -14320,11 +14333,11 @@ snapshots:
'@types/fluent-ffmpeg@2.1.27':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/graceful-fs@4.1.6':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/hammerjs@2.0.46': {}
@@ -14338,7 +14351,7 @@ snapshots:
'@types/http-link-header@1.0.7':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/istanbul-lib-coverage@2.0.4': {}
@@ -14359,7 +14372,7 @@ snapshots:
'@types/jsdom@21.1.7':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/tough-cookie': 4.0.2
parse5: 7.2.1
@@ -14395,13 +14408,17 @@ snapshots:
'@types/mysql@2.15.26':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/node-fetch@2.6.11':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
form-data: 4.0.2
+ '@types/node@22.13.10':
+ dependencies:
+ undici-types: 6.20.0
+
'@types/node@22.13.4':
dependencies:
undici-types: 6.20.0
@@ -14412,7 +14429,7 @@ snapshots:
'@types/nodemailer@6.4.17':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/normalize-package-data@2.4.1': {}
@@ -14423,11 +14440,11 @@ snapshots:
'@types/oauth2orize@1.11.5':
dependencies:
'@types/express': 4.17.17
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/oauth@0.9.6':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/offscreencanvas@2019.3.0': {}
@@ -14439,13 +14456,13 @@ snapshots:
'@types/pg@8.11.11':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
pg-protocol: 1.7.0
pg-types: 4.0.1
'@types/pg@8.6.1':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
pg-protocol: 1.7.0
pg-types: 2.2.0
@@ -14457,7 +14474,7 @@ snapshots:
'@types/qrcode@1.5.5':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/qs@6.9.7': {}
@@ -14475,7 +14492,7 @@ snapshots:
'@types/readdir-glob@1.1.1':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/rename@1.0.7': {}
@@ -14496,7 +14513,7 @@ snapshots:
'@types/serve-static@1.15.1':
dependencies:
'@types/mime': 3.0.1
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/serviceworker@0.0.74': {}
@@ -14520,7 +14537,7 @@ snapshots:
'@types/tedious@4.0.14':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/throttle-debounce@5.0.2': {}
@@ -14538,19 +14555,19 @@ snapshots:
'@types/vary@1.1.3':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/web-push@3.6.4':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/ws@8.18.0':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/ws@8.5.14':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
'@types/yargs-parser@21.0.0': {}
@@ -14560,18 +14577,18 @@ snapshots:
'@types/yauzl@2.10.0':
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
optional: true
- '@typescript-eslint/eslint-plugin@8.24.0(@typescript-eslint/parser@8.24.0(eslint@9.21.0)(typescript@5.7.3))(eslint@9.21.0)(typescript@5.7.3)':
+ '@typescript-eslint/eslint-plugin@8.24.0(@typescript-eslint/parser@8.24.0(eslint@9.22.0)(typescript@5.7.3))(eslint@9.22.0)(typescript@5.7.3)':
dependencies:
'@eslint-community/regexpp': 4.12.1
- '@typescript-eslint/parser': 8.24.0(eslint@9.21.0)(typescript@5.7.3)
+ '@typescript-eslint/parser': 8.24.0(eslint@9.22.0)(typescript@5.7.3)
'@typescript-eslint/scope-manager': 8.24.0
- '@typescript-eslint/type-utils': 8.24.0(eslint@9.21.0)(typescript@5.7.3)
- '@typescript-eslint/utils': 8.24.0(eslint@9.21.0)(typescript@5.7.3)
+ '@typescript-eslint/type-utils': 8.24.0(eslint@9.22.0)(typescript@5.7.3)
+ '@typescript-eslint/utils': 8.24.0(eslint@9.22.0)(typescript@5.7.3)
'@typescript-eslint/visitor-keys': 8.24.0
- eslint: 9.21.0
+ eslint: 9.22.0
graphemer: 1.4.0
ignore: 5.3.1
natural-compare: 1.4.0
@@ -14580,15 +14597,15 @@ snapshots:
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/eslint-plugin@8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0)(typescript@5.8.2)':
+ '@typescript-eslint/eslint-plugin@8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0)(typescript@5.8.2)':
dependencies:
'@eslint-community/regexpp': 4.12.1
- '@typescript-eslint/parser': 8.26.0(eslint@9.21.0)(typescript@5.8.2)
+ '@typescript-eslint/parser': 8.26.0(eslint@9.22.0)(typescript@5.8.2)
'@typescript-eslint/scope-manager': 8.26.0
- '@typescript-eslint/type-utils': 8.26.0(eslint@9.21.0)(typescript@5.8.2)
- '@typescript-eslint/utils': 8.26.0(eslint@9.21.0)(typescript@5.8.2)
+ '@typescript-eslint/type-utils': 8.26.0(eslint@9.22.0)(typescript@5.8.2)
+ '@typescript-eslint/utils': 8.26.0(eslint@9.22.0)(typescript@5.8.2)
'@typescript-eslint/visitor-keys': 8.26.0
- eslint: 9.21.0
+ eslint: 9.22.0
graphemer: 1.4.0
ignore: 5.3.1
natural-compare: 1.4.0
@@ -14597,26 +14614,26 @@ snapshots:
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/parser@8.24.0(eslint@9.21.0)(typescript@5.7.3)':
+ '@typescript-eslint/parser@8.24.0(eslint@9.22.0)(typescript@5.7.3)':
dependencies:
'@typescript-eslint/scope-manager': 8.24.0
'@typescript-eslint/types': 8.24.0
'@typescript-eslint/typescript-estree': 8.24.0(typescript@5.7.3)
'@typescript-eslint/visitor-keys': 8.24.0
debug: 4.4.0(supports-color@8.1.1)
- eslint: 9.21.0
+ eslint: 9.22.0
typescript: 5.7.3
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2)':
+ '@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2)':
dependencies:
'@typescript-eslint/scope-manager': 8.26.0
'@typescript-eslint/types': 8.26.0
'@typescript-eslint/typescript-estree': 8.26.0(typescript@5.8.2)
'@typescript-eslint/visitor-keys': 8.26.0
debug: 4.4.0(supports-color@8.1.1)
- eslint: 9.21.0
+ eslint: 9.22.0
typescript: 5.8.2
transitivePeerDependencies:
- supports-color
@@ -14631,23 +14648,23 @@ snapshots:
'@typescript-eslint/types': 8.26.0
'@typescript-eslint/visitor-keys': 8.26.0
- '@typescript-eslint/type-utils@8.24.0(eslint@9.21.0)(typescript@5.7.3)':
+ '@typescript-eslint/type-utils@8.24.0(eslint@9.22.0)(typescript@5.7.3)':
dependencies:
'@typescript-eslint/typescript-estree': 8.24.0(typescript@5.7.3)
- '@typescript-eslint/utils': 8.24.0(eslint@9.21.0)(typescript@5.7.3)
+ '@typescript-eslint/utils': 8.24.0(eslint@9.22.0)(typescript@5.7.3)
debug: 4.4.0(supports-color@8.1.1)
- eslint: 9.21.0
+ eslint: 9.22.0
ts-api-utils: 2.0.1(typescript@5.7.3)
typescript: 5.7.3
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/type-utils@8.26.0(eslint@9.21.0)(typescript@5.8.2)':
+ '@typescript-eslint/type-utils@8.26.0(eslint@9.22.0)(typescript@5.8.2)':
dependencies:
'@typescript-eslint/typescript-estree': 8.26.0(typescript@5.8.2)
- '@typescript-eslint/utils': 8.26.0(eslint@9.21.0)(typescript@5.8.2)
+ '@typescript-eslint/utils': 8.26.0(eslint@9.22.0)(typescript@5.8.2)
debug: 4.4.0(supports-color@8.1.1)
- eslint: 9.21.0
+ eslint: 9.22.0
ts-api-utils: 2.0.1(typescript@5.8.2)
typescript: 5.8.2
transitivePeerDependencies:
@@ -14685,24 +14702,24 @@ snapshots:
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/utils@8.24.0(eslint@9.21.0)(typescript@5.7.3)':
+ '@typescript-eslint/utils@8.24.0(eslint@9.22.0)(typescript@5.7.3)':
dependencies:
- '@eslint-community/eslint-utils': 4.4.0(eslint@9.21.0)
+ '@eslint-community/eslint-utils': 4.4.0(eslint@9.22.0)
'@typescript-eslint/scope-manager': 8.24.0
'@typescript-eslint/types': 8.24.0
'@typescript-eslint/typescript-estree': 8.24.0(typescript@5.7.3)
- eslint: 9.21.0
+ eslint: 9.22.0
typescript: 5.7.3
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/utils@8.26.0(eslint@9.21.0)(typescript@5.8.2)':
+ '@typescript-eslint/utils@8.26.0(eslint@9.22.0)(typescript@5.8.2)':
dependencies:
- '@eslint-community/eslint-utils': 4.4.0(eslint@9.21.0)
+ '@eslint-community/eslint-utils': 4.4.0(eslint@9.22.0)
'@typescript-eslint/scope-manager': 8.26.0
'@typescript-eslint/types': 8.26.0
'@typescript-eslint/typescript-estree': 8.26.0(typescript@5.8.2)
- eslint: 9.21.0
+ eslint: 9.22.0
typescript: 5.8.2
transitivePeerDependencies:
- supports-color
@@ -16704,27 +16721,27 @@ snapshots:
transitivePeerDependencies:
- supports-color
- eslint-module-utils@2.12.0(@typescript-eslint/parser@8.24.0(eslint@9.21.0)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint@9.21.0):
+ eslint-module-utils@2.12.0(@typescript-eslint/parser@8.24.0(eslint@9.22.0)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint@9.22.0):
dependencies:
debug: 3.2.7(supports-color@8.1.1)
optionalDependencies:
- '@typescript-eslint/parser': 8.24.0(eslint@9.21.0)(typescript@5.7.3)
- eslint: 9.21.0
+ '@typescript-eslint/parser': 8.24.0(eslint@9.22.0)(typescript@5.7.3)
+ eslint: 9.22.0
eslint-import-resolver-node: 0.3.9
transitivePeerDependencies:
- supports-color
- eslint-module-utils@2.12.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint@9.21.0):
+ eslint-module-utils@2.12.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint@9.22.0):
dependencies:
debug: 3.2.7(supports-color@8.1.1)
optionalDependencies:
- '@typescript-eslint/parser': 8.26.0(eslint@9.21.0)(typescript@5.8.2)
- eslint: 9.21.0
+ '@typescript-eslint/parser': 8.26.0(eslint@9.22.0)(typescript@5.8.2)
+ eslint: 9.22.0
eslint-import-resolver-node: 0.3.9
transitivePeerDependencies:
- supports-color
- eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.24.0(eslint@9.21.0)(typescript@5.7.3))(eslint@9.21.0):
+ eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.24.0(eslint@9.22.0)(typescript@5.7.3))(eslint@9.22.0):
dependencies:
'@rtsao/scc': 1.1.0
array-includes: 3.1.8
@@ -16733,9 +16750,9 @@ snapshots:
array.prototype.flatmap: 1.3.2
debug: 3.2.7(supports-color@8.1.1)
doctrine: 2.1.0
- eslint: 9.21.0
+ eslint: 9.22.0
eslint-import-resolver-node: 0.3.9
- eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.24.0(eslint@9.21.0)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint@9.21.0)
+ eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.24.0(eslint@9.22.0)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint@9.22.0)
hasown: 2.0.2
is-core-module: 2.15.1
is-glob: 4.0.3
@@ -16747,13 +16764,13 @@ snapshots:
string.prototype.trimend: 1.0.8
tsconfig-paths: 3.15.0
optionalDependencies:
- '@typescript-eslint/parser': 8.24.0(eslint@9.21.0)(typescript@5.7.3)
+ '@typescript-eslint/parser': 8.24.0(eslint@9.22.0)(typescript@5.7.3)
transitivePeerDependencies:
- eslint-import-resolver-typescript
- eslint-import-resolver-webpack
- supports-color
- eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint@9.21.0):
+ eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0):
dependencies:
'@rtsao/scc': 1.1.0
array-includes: 3.1.8
@@ -16762,9 +16779,9 @@ snapshots:
array.prototype.flatmap: 1.3.2
debug: 3.2.7(supports-color@8.1.1)
doctrine: 2.1.0
- eslint: 9.21.0
+ eslint: 9.22.0
eslint-import-resolver-node: 0.3.9
- eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.26.0(eslint@9.21.0)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint@9.21.0)
+ eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.26.0(eslint@9.22.0)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint@9.22.0)
hasown: 2.0.2
is-core-module: 2.15.1
is-glob: 4.0.3
@@ -16776,21 +16793,21 @@ snapshots:
string.prototype.trimend: 1.0.8
tsconfig-paths: 3.15.0
optionalDependencies:
- '@typescript-eslint/parser': 8.26.0(eslint@9.21.0)(typescript@5.8.2)
+ '@typescript-eslint/parser': 8.26.0(eslint@9.22.0)(typescript@5.8.2)
transitivePeerDependencies:
- eslint-import-resolver-typescript
- eslint-import-resolver-webpack
- supports-color
- eslint-plugin-vue@10.0.0(eslint@9.21.0)(vue-eslint-parser@10.1.1(eslint@9.21.0)):
+ eslint-plugin-vue@10.0.0(eslint@9.22.0)(vue-eslint-parser@10.1.1(eslint@9.22.0)):
dependencies:
- '@eslint-community/eslint-utils': 4.4.0(eslint@9.21.0)
- eslint: 9.21.0
+ '@eslint-community/eslint-utils': 4.4.0(eslint@9.22.0)
+ eslint: 9.22.0
natural-compare: 1.4.0
nth-check: 2.1.1
postcss-selector-parser: 6.1.2
semver: 7.6.3
- vue-eslint-parser: 10.1.1(eslint@9.21.0)
+ vue-eslint-parser: 10.1.1(eslint@9.22.0)
xml-name-validator: 4.0.0
eslint-rule-docs@1.1.235: {}
@@ -16800,18 +16817,24 @@ snapshots:
esrecurse: 4.3.0
estraverse: 5.3.0
+ eslint-scope@8.3.0:
+ dependencies:
+ esrecurse: 4.3.0
+ estraverse: 5.3.0
+
eslint-visitor-keys@3.4.3: {}
eslint-visitor-keys@4.2.0: {}
- eslint@9.21.0:
+ eslint@9.22.0:
dependencies:
- '@eslint-community/eslint-utils': 4.4.0(eslint@9.21.0)
+ '@eslint-community/eslint-utils': 4.4.0(eslint@9.22.0)
'@eslint-community/regexpp': 4.12.1
'@eslint/config-array': 0.19.2
+ '@eslint/config-helpers': 0.1.0
'@eslint/core': 0.12.0
'@eslint/eslintrc': 3.3.0
- '@eslint/js': 9.21.0
+ '@eslint/js': 9.22.0
'@eslint/plugin-kit': 0.2.7
'@humanfs/node': 0.16.6
'@humanwhocodes/module-importer': 1.0.1
@@ -16823,7 +16846,7 @@ snapshots:
cross-spawn: 7.0.6
debug: 4.4.0(supports-color@8.1.1)
escape-string-regexp: 4.0.0
- eslint-scope: 8.2.0
+ eslint-scope: 8.3.0
eslint-visitor-keys: 4.2.0
espree: 10.3.0
esquery: 1.6.0
@@ -18127,7 +18150,7 @@ snapshots:
'@jest/expect': 29.7.0
'@jest/test-result': 29.7.0
'@jest/types': 29.6.3
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
chalk: 4.1.2
co: 4.6.0
dedent: 1.3.0
@@ -18185,6 +18208,36 @@ snapshots:
- supports-color
- ts-node
+ jest-config@29.7.0(@types/node@22.13.10):
+ dependencies:
+ '@babel/core': 7.23.5
+ '@jest/test-sequencer': 29.7.0
+ '@jest/types': 29.6.3
+ babel-jest: 29.7.0(@babel/core@7.23.5)
+ chalk: 4.1.2
+ ci-info: 3.7.1
+ deepmerge: 4.2.2
+ glob: 7.2.3
+ graceful-fs: 4.2.11
+ jest-circus: 29.7.0
+ jest-environment-node: 29.7.0
+ jest-get-type: 29.6.3
+ jest-regex-util: 29.6.3
+ jest-resolve: 29.7.0
+ jest-runner: 29.7.0
+ jest-util: 29.7.0
+ jest-validate: 29.7.0
+ micromatch: 4.0.8
+ parse-json: 5.2.0
+ pretty-format: 29.7.0
+ slash: 3.0.0
+ strip-json-comments: 3.1.1
+ optionalDependencies:
+ '@types/node': 22.13.10
+ transitivePeerDependencies:
+ - babel-plugin-macros
+ - supports-color
+
jest-config@29.7.0(@types/node@22.13.4):
dependencies:
'@babel/core': 7.23.5
@@ -18269,7 +18322,7 @@ snapshots:
'@jest/environment': 29.7.0
'@jest/fake-timers': 29.7.0
'@jest/types': 29.6.3
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
jest-mock: 29.7.0
jest-util: 29.7.0
@@ -18286,7 +18339,7 @@ snapshots:
dependencies:
'@jest/types': 29.6.3
'@types/graceful-fs': 4.1.6
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
anymatch: 3.1.3
fb-watchman: 2.0.2
graceful-fs: 4.2.11
@@ -18325,7 +18378,7 @@ snapshots:
jest-mock@29.7.0:
dependencies:
'@jest/types': 29.6.3
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
jest-util: 29.7.0
jest-pnp-resolver@1.2.3(jest-resolve@29.7.0):
@@ -18360,7 +18413,7 @@ snapshots:
'@jest/test-result': 29.7.0
'@jest/transform': 29.7.0
'@jest/types': 29.6.3
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
chalk: 4.1.2
emittery: 0.13.1
graceful-fs: 4.2.11
@@ -18388,7 +18441,7 @@ snapshots:
'@jest/test-result': 29.7.0
'@jest/transform': 29.7.0
'@jest/types': 29.6.3
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
chalk: 4.1.2
cjs-module-lexer: 1.2.2
collect-v8-coverage: 1.0.1
@@ -18434,7 +18487,7 @@ snapshots:
jest-util@29.7.0:
dependencies:
'@jest/types': 29.6.3
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
chalk: 4.1.2
ci-info: 3.7.1
graceful-fs: 4.2.11
@@ -18453,7 +18506,7 @@ snapshots:
dependencies:
'@jest/test-result': 29.7.0
'@jest/types': 29.6.3
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
ansi-escapes: 4.3.2
chalk: 4.1.2
emittery: 0.13.1
@@ -18467,7 +18520,7 @@ snapshots:
jest-worker@29.7.0:
dependencies:
- '@types/node': 22.13.9
+ '@types/node': 22.13.10
jest-util: 29.7.0
merge-stream: 2.0.0
supports-color: 8.1.1
@@ -21972,10 +22025,10 @@ snapshots:
vue: 3.5.13(typescript@5.8.2)
vue-inbrowser-compiler-independent-utils: 4.71.1(vue@3.5.13(typescript@5.8.2))
- vue-eslint-parser@10.1.1(eslint@9.21.0):
+ vue-eslint-parser@10.1.1(eslint@9.22.0):
dependencies:
debug: 4.4.0(supports-color@8.1.1)
- eslint: 9.21.0
+ eslint: 9.22.0
eslint-scope: 8.2.0
eslint-visitor-keys: 4.2.0
espree: 10.3.0
From 9998cb84e80c98a399c68dd79d553f0cdfca78c7 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 10 Mar 2025 13:47:38 +0900
Subject: [PATCH 074/348] refactor(frontend): page-metadata -> page
---
packages/frontend/src/components/MkPageWindow.vue | 4 ++--
packages/frontend/src/components/global/MkPageHeader.vue | 4 ++--
packages/frontend/src/{utility/page-metadata.ts => page.ts} | 2 +-
packages/frontend/src/pages/_error_.vue | 4 ++--
packages/frontend/src/pages/about-misskey.vue | 4 ++--
packages/frontend/src/pages/about.vue | 4 ++--
packages/frontend/src/pages/achievements.vue | 4 ++--
packages/frontend/src/pages/admin-file.vue | 4 ++--
packages/frontend/src/pages/admin-user.vue | 4 ++--
packages/frontend/src/pages/admin/_header_.vue | 2 +-
packages/frontend/src/pages/admin/abuses.vue | 4 ++--
packages/frontend/src/pages/admin/ads.vue | 4 ++--
packages/frontend/src/pages/admin/announcements.vue | 4 ++--
packages/frontend/src/pages/admin/branding.vue | 4 ++--
.../frontend/src/pages/admin/custom-emojis-manager2.vue | 4 ++--
packages/frontend/src/pages/admin/database.vue | 4 ++--
packages/frontend/src/pages/admin/email-settings.vue | 4 ++--
packages/frontend/src/pages/admin/external-services.vue | 4 ++--
packages/frontend/src/pages/admin/federation.vue | 4 ++--
packages/frontend/src/pages/admin/files.vue | 4 ++--
packages/frontend/src/pages/admin/index.vue | 6 +++---
packages/frontend/src/pages/admin/invites.vue | 4 ++--
packages/frontend/src/pages/admin/moderation.vue | 4 ++--
packages/frontend/src/pages/admin/modlog.vue | 4 ++--
packages/frontend/src/pages/admin/object-storage.vue | 4 ++--
packages/frontend/src/pages/admin/overview.vue | 4 ++--
packages/frontend/src/pages/admin/performance.vue | 4 ++--
packages/frontend/src/pages/admin/queue.vue | 4 ++--
packages/frontend/src/pages/admin/relays.vue | 4 ++--
packages/frontend/src/pages/admin/roles.edit.vue | 4 ++--
packages/frontend/src/pages/admin/roles.role.vue | 4 ++--
packages/frontend/src/pages/admin/roles.vue | 4 ++--
packages/frontend/src/pages/admin/security.vue | 4 ++--
packages/frontend/src/pages/admin/server-rules.vue | 4 ++--
packages/frontend/src/pages/admin/settings.vue | 4 ++--
packages/frontend/src/pages/admin/system-webhook.vue | 4 ++--
packages/frontend/src/pages/admin/users.vue | 4 ++--
packages/frontend/src/pages/ads.vue | 4 ++--
packages/frontend/src/pages/announcement.vue | 4 ++--
packages/frontend/src/pages/announcements.vue | 4 ++--
packages/frontend/src/pages/antenna-timeline.vue | 4 ++--
packages/frontend/src/pages/api-console.vue | 4 ++--
packages/frontend/src/pages/auth.vue | 4 ++--
packages/frontend/src/pages/avatar-decorations.vue | 4 ++--
packages/frontend/src/pages/channel-editor.vue | 4 ++--
packages/frontend/src/pages/channel.vue | 4 ++--
packages/frontend/src/pages/channels.vue | 4 ++--
packages/frontend/src/pages/clicker.vue | 4 ++--
packages/frontend/src/pages/clip.vue | 4 ++--
packages/frontend/src/pages/contact.vue | 4 ++--
packages/frontend/src/pages/custom-emojis-manager.vue | 4 ++--
packages/frontend/src/pages/drive.file.vue | 4 ++--
packages/frontend/src/pages/drive.vue | 4 ++--
packages/frontend/src/pages/drop-and-fusion.game.vue | 4 ++--
packages/frontend/src/pages/drop-and-fusion.vue | 4 ++--
packages/frontend/src/pages/explore.vue | 4 ++--
packages/frontend/src/pages/favorites.vue | 4 ++--
packages/frontend/src/pages/flash/flash-edit.vue | 4 ++--
packages/frontend/src/pages/flash/flash-index.vue | 4 ++--
packages/frontend/src/pages/flash/flash.vue | 4 ++--
packages/frontend/src/pages/follow-requests.vue | 4 ++--
packages/frontend/src/pages/gallery/edit.vue | 4 ++--
packages/frontend/src/pages/gallery/index.vue | 4 ++--
packages/frontend/src/pages/gallery/post.vue | 4 ++--
packages/frontend/src/pages/games.vue | 4 ++--
packages/frontend/src/pages/install-extensions.vue | 4 ++--
packages/frontend/src/pages/instance-info.vue | 4 ++--
packages/frontend/src/pages/invite.vue | 4 ++--
packages/frontend/src/pages/list.vue | 4 ++--
packages/frontend/src/pages/lookup.vue | 4 ++--
packages/frontend/src/pages/miauth.vue | 4 ++--
packages/frontend/src/pages/my-antennas/create.vue | 4 ++--
packages/frontend/src/pages/my-antennas/edit.vue | 4 ++--
packages/frontend/src/pages/my-antennas/index.vue | 4 ++--
packages/frontend/src/pages/my-clips/index.vue | 4 ++--
packages/frontend/src/pages/my-lists/index.vue | 4 ++--
packages/frontend/src/pages/my-lists/list.vue | 4 ++--
packages/frontend/src/pages/not-found.vue | 4 ++--
packages/frontend/src/pages/note.vue | 4 ++--
packages/frontend/src/pages/notifications.vue | 4 ++--
packages/frontend/src/pages/oauth.vue | 4 ++--
packages/frontend/src/pages/page-editor/page-editor.vue | 4 ++--
packages/frontend/src/pages/page.vue | 4 ++--
packages/frontend/src/pages/pages.vue | 4 ++--
packages/frontend/src/pages/preview.vue | 4 ++--
packages/frontend/src/pages/registry.keys.vue | 4 ++--
packages/frontend/src/pages/registry.value.vue | 4 ++--
packages/frontend/src/pages/registry.vue | 4 ++--
packages/frontend/src/pages/reset-password.vue | 4 ++--
packages/frontend/src/pages/reversi/game.vue | 4 ++--
packages/frontend/src/pages/reversi/index.vue | 4 ++--
packages/frontend/src/pages/role.vue | 4 ++--
packages/frontend/src/pages/scratchpad.vue | 4 ++--
packages/frontend/src/pages/search.vue | 4 ++--
packages/frontend/src/pages/settings/accessibility.vue | 4 ++--
packages/frontend/src/pages/settings/accounts.vue | 4 ++--
packages/frontend/src/pages/settings/api.vue | 4 ++--
packages/frontend/src/pages/settings/appearance.vue | 4 ++--
packages/frontend/src/pages/settings/apps.vue | 4 ++--
packages/frontend/src/pages/settings/avatar-decoration.vue | 4 ++--
packages/frontend/src/pages/settings/custom-css.vue | 4 ++--
packages/frontend/src/pages/settings/deck.vue | 4 ++--
packages/frontend/src/pages/settings/drive-cleaner.vue | 4 ++--
packages/frontend/src/pages/settings/drive.vue | 4 ++--
packages/frontend/src/pages/settings/email.vue | 4 ++--
packages/frontend/src/pages/settings/emoji-picker.vue | 4 ++--
packages/frontend/src/pages/settings/import-export.vue | 4 ++--
packages/frontend/src/pages/settings/index.vue | 6 +++---
packages/frontend/src/pages/settings/mute-block.vue | 4 ++--
packages/frontend/src/pages/settings/navbar.vue | 4 ++--
packages/frontend/src/pages/settings/notifications.vue | 4 ++--
packages/frontend/src/pages/settings/other.vue | 4 ++--
packages/frontend/src/pages/settings/plugin.install.vue | 4 ++--
packages/frontend/src/pages/settings/plugin.vue | 4 ++--
packages/frontend/src/pages/settings/preferences.vue | 4 ++--
packages/frontend/src/pages/settings/privacy.vue | 4 ++--
packages/frontend/src/pages/settings/profile.vue | 4 ++--
packages/frontend/src/pages/settings/roles.vue | 4 ++--
packages/frontend/src/pages/settings/security.vue | 4 ++--
packages/frontend/src/pages/settings/sounds.vue | 4 ++--
packages/frontend/src/pages/settings/statusbar.vue | 4 ++--
packages/frontend/src/pages/settings/theme.install.vue | 4 ++--
packages/frontend/src/pages/settings/theme.manage.vue | 4 ++--
packages/frontend/src/pages/settings/theme.vue | 4 ++--
packages/frontend/src/pages/settings/webhook.edit.vue | 4 ++--
packages/frontend/src/pages/settings/webhook.new.vue | 4 ++--
packages/frontend/src/pages/settings/webhook.vue | 4 ++--
packages/frontend/src/pages/share.vue | 4 ++--
packages/frontend/src/pages/tag.vue | 4 ++--
packages/frontend/src/pages/theme-editor.vue | 4 ++--
packages/frontend/src/pages/timeline.vue | 4 ++--
packages/frontend/src/pages/user-list-timeline.vue | 4 ++--
packages/frontend/src/pages/user-tag.vue | 4 ++--
packages/frontend/src/pages/user/followers.vue | 4 ++--
packages/frontend/src/pages/user/following.vue | 4 ++--
packages/frontend/src/pages/user/index.vue | 4 ++--
packages/frontend/src/pages/welcome.vue | 4 ++--
packages/frontend/src/ui/classic.vue | 4 ++--
packages/frontend/src/ui/deck/main-column.vue | 4 ++--
packages/frontend/src/ui/minimum.vue | 4 ++--
packages/frontend/src/ui/universal.vue | 4 ++--
packages/frontend/src/ui/visitor.vue | 4 ++--
packages/frontend/src/ui/zen.vue | 4 ++--
143 files changed, 286 insertions(+), 286 deletions(-)
rename packages/frontend/src/{utility/page-metadata.ts => page.ts} (95%)
diff --git a/packages/frontend/src/components/MkPageWindow.vue b/packages/frontend/src/components/MkPageWindow.vue
index 780b434456..5c0fa60847 100644
--- a/packages/frontend/src/components/MkPageWindow.vue
+++ b/packages/frontend/src/components/MkPageWindow.vue
@@ -32,14 +32,14 @@ SPDX-License-Identifier: AGPL-3.0-only
import { computed, onMounted, onUnmounted, provide, ref, shallowRef } from 'vue';
import { url } from '@@/js/config.js';
import { getScrollContainer } from '@@/js/scroll.js';
-import type { PageMetadata } from '@/utility/page-metadata.js';
+import type { PageMetadata } from '@/page.js';
import RouterView from '@/components/global/RouterView.vue';
import MkWindow from '@/components/MkWindow.vue';
import { popout as _popout } from '@/utility/popout.js';
import { copyToClipboard } from '@/utility/copy-to-clipboard.js';
import { useScrollPositionManager } from '@/nirax.js';
import { i18n } from '@/i18n.js';
-import { provideMetadataReceiver, provideReactiveMetadata } from '@/utility/page-metadata.js';
+import { provideMetadataReceiver, provideReactiveMetadata } from '@/page.js';
import { openingWindowsCount } from '@/os.js';
import { claimAchievement } from '@/utility/achievements.js';
import { useRouterFactory } from '@/router/supplier.js';
diff --git a/packages/frontend/src/components/global/MkPageHeader.vue b/packages/frontend/src/components/global/MkPageHeader.vue
index d3c64bf85a..728e37cf51 100644
--- a/packages/frontend/src/components/global/MkPageHeader.vue
+++ b/packages/frontend/src/components/global/MkPageHeader.vue
@@ -47,9 +47,9 @@ import { scrollToTop } from '@@/js/scroll.js';
import XTabs from './MkPageHeader.tabs.vue';
import type { Tab } from './MkPageHeader.tabs.vue';
import type { PageHeaderItem } from '@/types/page-header.js';
-import type { PageMetadata } from '@/utility/page-metadata.js';
+import type { PageMetadata } from '@/page.js';
import { globalEvents } from '@/events.js';
-import { injectReactiveMetadata } from '@/utility/page-metadata.js';
+import { injectReactiveMetadata } from '@/page.js';
import { $i, openAccountMenu as openAccountMenu_ } from '@/account.js';
const props = withDefaults(defineProps<{
diff --git a/packages/frontend/src/utility/page-metadata.ts b/packages/frontend/src/page.ts
similarity index 95%
rename from packages/frontend/src/utility/page-metadata.ts
rename to packages/frontend/src/page.ts
index 671751147c..f3ec09a16f 100644
--- a/packages/frontend/src/utility/page-metadata.ts
+++ b/packages/frontend/src/page.ts
@@ -35,7 +35,7 @@ const getMetadata = (): Ref {{ i18n.ts._accountSettings.mayNotEffectForFederatedNotes }}
@@ -161,10 +160,11 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._accountSettings.mayNotEffectForFederatedNotes }}
+
+
+
-
@@ -36,23 +36,149 @@ SPDX-License-Identifier: AGPL-3.0-only
-
@@ -77,12 +203,13 @@ import { computed, onActivated, ref, watch } from 'vue';
import JSON5 from 'json5';
import defaultLightTheme from '@@/themes/l-light.json5';
import defaultDarkTheme from '@@/themes/d-green-lime.json5';
-import type { MkSelectItem } from '@/components/MkSelect.vue';
+import type { Theme } from '@/theme.js';
import MkSwitch from '@/components/MkSwitch.vue';
-import MkSelect from '@/components/MkSelect.vue';
import FormSection from '@/components/form/section.vue';
import FormLink from '@/components/form/link.vue';
import MkButton from '@/components/MkButton.vue';
+import MkFolder from '@/components/MkFolder.vue';
+import MkThemePreview from '@/components/MkThemePreview.vue';
import { getBuiltinThemesRef } from '@/theme.js';
import { selectFile } from '@/utility/select-file.js';
import { isDeviceDarkmode } from '@/utility/is-device-darkmode.js';
@@ -99,79 +226,16 @@ import { prefer } from '@/preferences.js';
const installedThemes = ref(getThemes());
const builtinThemes = getBuiltinThemesRef();
-const instanceDarkTheme = computed(() => instance.defaultDarkTheme ? JSON5.parse(instance.defaultDarkTheme) : null);
+const instanceDarkTheme = computed(() => instance.defaultDarkTheme ? JSON5.parse(instance.defaultDarkTheme) : null);
const installedDarkThemes = computed(() => installedThemes.value.filter(t => t.base === 'dark' || t.kind === 'dark'));
const builtinDarkThemes = computed(() => builtinThemes.value.filter(t => t.base === 'dark' || t.kind === 'dark'));
-const instanceLightTheme = computed(() => instance.defaultLightTheme ? JSON5.parse(instance.defaultLightTheme) : null);
+const instanceLightTheme = computed(() => instance.defaultLightTheme ? JSON5.parse(instance.defaultLightTheme) : null);
const installedLightThemes = computed(() => installedThemes.value.filter(t => t.base === 'light' || t.kind === 'light'));
const builtinLightThemes = computed(() => builtinThemes.value.filter(t => t.base === 'light' || t.kind === 'light'));
const themes = computed(() => uniqueBy([instanceDarkTheme.value, instanceLightTheme.value, ...builtinThemes.value, ...installedThemes.value].filter(x => x != null), theme => theme.id));
-const lightThemeSelectorItems = computed(() => {
- const items = [] as MkSelectItem[];
- if (instanceLightTheme.value) {
- items.push({
- type: 'option',
- value: instanceLightTheme.value.id,
- label: instanceLightTheme.value.name,
- });
- }
- if (installedLightThemes.value.length > 0) {
- items.push({
- type: 'group',
- label: i18n.ts._theme.installedThemes,
- items: installedLightThemes.value.map(x => ({
- type: 'option',
- value: x.id,
- label: x.name,
- })),
- });
- }
- items.push({
- type: 'group',
- label: i18n.ts._theme.builtinThemes,
- items: builtinLightThemes.value.map(x => ({
- type: 'option',
- value: x.id,
- label: x.name,
- })),
- });
- return items;
-});
-
-const darkThemeSelectorItems = computed(() => {
- const items = [] as MkSelectItem[];
- if (instanceDarkTheme.value) {
- items.push({
- type: 'option',
- value: instanceDarkTheme.value.id,
- label: instanceDarkTheme.value.name,
- });
- }
- if (installedDarkThemes.value.length > 0) {
- items.push({
- type: 'group',
- label: i18n.ts._theme.installedThemes,
- items: installedDarkThemes.value.map(x => ({
- type: 'option',
- value: x.id,
- label: x.name,
- })),
- });
- }
- items.push({
- type: 'group',
- label: i18n.ts._theme.builtinThemes,
- items: builtinDarkThemes.value.map(x => ({
- type: 'option',
- value: x.id,
- label: x.name,
- })),
- });
- return items;
-});
-
const darkTheme = prefer.r.darkTheme;
+const darkThemeName = computed(() => darkTheme.value?.name ?? defaultDarkTheme.name);
const darkThemeId = computed({
get() {
return darkTheme.value ? darkTheme.value.id : defaultDarkTheme.id;
@@ -184,6 +248,7 @@ const darkThemeId = computed({
},
});
const lightTheme = prefer.r.lightTheme;
+const lightThemeName = computed(() => lightTheme.value?.name ?? defaultLightTheme.name);
const lightThemeId = computed({
get() {
return lightTheme.value ? lightTheme.value.id : defaultLightTheme.id;
@@ -236,6 +301,57 @@ definePage(() => ({
}));
+
+
diff --git a/packages/frontend/src/theme.ts b/packages/frontend/src/theme.ts
index ed2f1d3164..970d143b97 100644
--- a/packages/frontend/src/theme.ts
+++ b/packages/frontend/src/theme.ts
@@ -114,7 +114,7 @@ export function applyTheme(theme: Theme, persist = true) {
globalEvents.emit('themeChanging');
}
-function compile(theme: Theme): Record {
+export function compile(theme: Theme): Record {
function getColor(val: string): tinycolor.Instance {
if (val[0] === '@') { // ref (prop)
return getColor(theme.props[val.substring(1)]);
diff --git a/packages/frontend/src/utility/autogen/settings-search-index.ts b/packages/frontend/src/utility/autogen/settings-search-index.ts
index 66476672e3..db4459bf06 100644
--- a/packages/frontend/src/utility/autogen/settings-search-index.ts
+++ b/packages/frontend/src/utility/autogen/settings-search-index.ts
@@ -33,12 +33,12 @@ export const searchIndexes: SearchIndexItem[] = [
keywords: ['light', 'theme'],
},
{
- id: 'eLOwK5Ia2',
+ id: 'CsSVILKpX',
label: i18n.ts.themeForDarkMode,
keywords: ['dark', 'theme'],
},
{
- id: 'ujvMfyzUr',
+ id: '8wcoRp76b',
label: i18n.ts.setWallpaper,
keywords: ['wallpaper'],
},
From 794f360bc22a92746e14736fffa83e55962f0f49 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
Date: Mon, 10 Mar 2025 09:40:41 +0000
Subject: [PATCH 078/348] Bump version to 2025.3.2-alpha.5
---
package.json | 2 +-
packages/misskey-js/package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index ff891ab9a4..70ff19ad4d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "misskey",
- "version": "2025.3.2-alpha.4",
+ "version": "2025.3.2-alpha.5",
"codename": "nasubi",
"repository": {
"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index d98d2f3ed1..0ca8b36732 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
{
"type": "module",
"name": "misskey-js",
- "version": "2025.3.2-alpha.4",
+ "version": "2025.3.2-alpha.5",
"description": "Misskey SDK for JavaScript",
"license": "MIT",
"main": "./built/index.js",
From 6841cdfa76f1c18041c766247b61ba2f47f2dfec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?=
<66072112+r-ca@users.noreply.github.com>
Date: Mon, 10 Mar 2025 19:35:37 +0900
Subject: [PATCH 079/348] =?UTF-8?q?enhance(frontend):=20CW=E3=81=AE?=
=?UTF-8?q?=E6=B3=A8=E9=87=88=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=81=8C?=
=?UTF-8?q?=E5=85=A5=E5=8A=9B=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA?=
=?UTF-8?q?=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AFPost=E3=83=9C=E3=82=BF?=
=?UTF-8?q?=E3=83=B3=E3=82=92=E9=9D=9E=E3=82=A2=E3=82=AF=E3=83=86=E3=82=A3?=
=?UTF-8?q?=E3=83=96=E3=81=AB=20(#15639)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* add condition to disable post button when CW text is empty
* standardize condition by using 1<= inserted of 0<
* unify CW text length condition to improve readability
* add missing CW state check
* fix state check, add empty/null check, improve max length validation
* simplify CW validation by removing minimum length check
* Update CHANGELOG
* remove CW text validation in post()
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
CHANGELOG.md | 2 ++
packages/frontend/src/components/MkPostForm.vue | 16 +++++++---------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e3215dc6c..748f3aa8eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@
- Feat: 設定の管理が強化されました
- 自動でバックアップされるように
- Enhance: プラグインの管理が強化されました
+- Enhance: CWの注釈テキストが入力されていない場合, Postボタンを非アクティブに
+- Enhance: CWを無効にした場合, 注釈テキストが最大入力文字数を超えていても投稿できるように
- Enhance: テーマ設定画面のデザインを改善
- Fix: テーマ切り替え時に一部の色が変わらない問題を修正
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 6a72663157..5e379d08b7 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -265,7 +265,13 @@ const canPost = computed((): boolean => {
quoteId.value != null
) &&
(textLength.value <= maxTextLength.value) &&
- (cwTextLength.value <= maxCwTextLength) &&
+ (
+ useCw.value ?
+ (
+ cw.value != null && cw.value.trim() !== '' &&
+ cwTextLength.value <= maxCwTextLength
+ ) : true
+ ) &&
(files.value.length <= 16) &&
(!poll.value || poll.value.choices.length >= 2);
});
@@ -744,14 +750,6 @@ function isAnnoying(text: string): boolean {
}
async function post(ev?: MouseEvent) {
- if (useCw.value && (cw.value == null || cw.value.trim() === '')) {
- os.alert({
- type: 'error',
- text: i18n.ts.cwNotationRequired,
- });
- return;
- }
-
if (ev) {
const el = (ev.currentTarget ?? ev.target) as HTMLElement | null;
From a4ba096e2aa6897ba6782e4ad17262ac04f12b94 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 10 Mar 2025 21:42:17 +0900
Subject: [PATCH 080/348] chore(frontend): improve preference store stability
---
packages/frontend/src/preferences/store.ts | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/packages/frontend/src/preferences/store.ts b/packages/frontend/src/preferences/store.ts
index e10afcc308..e061021be3 100644
--- a/packages/frontend/src/preferences/store.ts
+++ b/packages/frontend/src/preferences/store.ts
@@ -45,12 +45,14 @@ export class Store> extends EventEmitter(key: K, value: Data[K]) {
- this.r[key].value = this.s[key] = value;
- this.emit('updated', { key, value });
+ const v = JSON.parse(JSON.stringify(value)); // deep copy 兼 vueのプロキシ解除
+ this.r[key].value = this.s[key] = v;
+ this.emit('updated', { key, value: v });
}
public rewrite(key: K, value: Data[K]) {
- this.r[key].value = this.s[key] = value;
+ const v = JSON.parse(JSON.stringify(value)); // deep copy 兼 vueのプロキシ解除
+ this.r[key].value = this.s[key] = v;
}
/**
From 1f345eb839ee69fc05bdf4362bec75d02042523a Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 11 Mar 2025 11:14:55 +0900
Subject: [PATCH 081/348] =?UTF-8?q?enhance(frontend):=20deck=E3=82=92prefe?=
=?UTF-8?q?rences=E7=AE=A1=E7=90=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/frontend/src/boot/main-boot.ts | 27 +-
packages/frontend/src/deck.ts | 323 +++++++++++--------
packages/frontend/src/preferences/def.ts | 9 +
packages/frontend/src/preferences/profile.ts | 2 +
packages/frontend/src/store.ts | 13 -
packages/frontend/src/ui/deck.vue | 70 +---
packages/frontend/src/ui/deck/column.vue | 2 +-
7 files changed, 231 insertions(+), 215 deletions(-)
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index bf3ab12682..86efd48c4e 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -6,9 +6,11 @@
import { createApp, defineAsyncComponent, markRaw } from 'vue';
import { ui } from '@@/js/config.js';
import * as Misskey from 'misskey-js';
+import { v4 as uuid } from 'uuid';
import { common } from './common.js';
import type { Component } from 'vue';
import type { Keymap } from '@/utility/hotkey.js';
+import type { DeckProfile } from '@/deck.js';
import { i18n } from '@/i18n.js';
import { alert, confirm, popup, post, toast } from '@/os.js';
import { useStream } from '@/stream.js';
@@ -143,12 +145,34 @@ export async function mainBoot() {
if (themes.length > 0) {
prefer.commit('themes', themes);
}
+
const plugins = ColdDeviceStorage.get('plugins');
prefer.commit('plugins', plugins.map(p => ({
...p,
installId: (p as any).id,
id: undefined,
})));
+
+ prefer.commit('deck.profile', deckStore.s.profile);
+ misskeyApi('i/registry/keys', {
+ scope: ['client', 'deck', 'profiles'],
+ }).then(async keys => {
+ const profiles: DeckProfile[] = [];
+ for (const key of keys) {
+ const deck = await misskeyApi('i/registry/get', {
+ scope: ['client', 'deck', 'profiles'],
+ key: key,
+ });
+ profiles.push({
+ id: uuid(),
+ name: key,
+ columns: deck.columns,
+ layout: deck.layout,
+ });
+ }
+ prefer.commit('deck.profiles', profiles);
+ });
+
prefer.commit('lightTheme', ColdDeviceStorage.get('lightTheme'));
prefer.commit('darkTheme', ColdDeviceStorage.get('darkTheme'));
prefer.commit('syncDeviceDarkMode', ColdDeviceStorage.get('syncDeviceDarkMode'));
@@ -223,9 +247,6 @@ export async function mainBoot() {
prefer.commit('sound.on.noteMy', store.s.sound_noteMy as any);
prefer.commit('sound.on.notification', store.s.sound_notification as any);
prefer.commit('sound.on.reaction', store.s.sound_reaction as any);
- store.set('deck.profile', deckStore.s.profile);
- store.set('deck.columns', deckStore.s.columns);
- store.set('deck.layout', deckStore.s.layout);
store.set('menu', []);
}
diff --git a/packages/frontend/src/deck.ts b/packages/frontend/src/deck.ts
index f158db2f85..9df56c52df 100644
--- a/packages/frontend/src/deck.ts
+++ b/packages/frontend/src/deck.ts
@@ -3,13 +3,23 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
-import { throttle } from 'throttle-debounce';
import { notificationTypes } from 'misskey-js';
+import { ref } from 'vue';
+import { v4 as uuid } from 'uuid';
+import { i18n } from './i18n.js';
import type { BasicTimelineType } from '@/timelines.js';
import type { SoundStore } from '@/preferences/def.js';
-import { misskeyApi } from '@/utility/misskey-api.js';
+import type { MenuItem } from '@/types/menu.js';
import { deepClone } from '@/utility/clone.js';
-import { store } from '@/store.js';
+import { prefer } from '@/preferences.js';
+import * as os from '@/os.js';
+
+export type DeckProfile = {
+ name: string;
+ id: string;
+ columns: Column[];
+ layout: Column['id'][][];
+};
type ColumnWidget = {
name: string;
@@ -53,127 +63,132 @@ export type Column = {
soundSetting?: SoundStore;
};
-export const loadDeck = async () => {
- let deck;
+const _currentProfile = prefer.s['deck.profiles'].find(p => p.name === prefer.s['deck.profile']);
+const __currentProfile = _currentProfile ? deepClone(_currentProfile) : null;
+export const columns = ref(__currentProfile ? __currentProfile.columns : []);
+export const layout = ref(__currentProfile ? __currentProfile.layout : []);
- try {
- deck = await misskeyApi('i/registry/get', {
- scope: ['client', 'deck', 'profiles'],
- key: store.s['deck.profile'],
- });
- } catch (err) {
- if (typeof err === 'object' && err != null && 'code' in err && err.code === 'NO_SUCH_KEY') {
- // 後方互換性のため
- if (store.s['deck.profile'] === 'default') {
- saveDeck();
- return;
- }
+if (prefer.s['deck.profile'] == null) {
+ addProfile('Main');
+}
- store.set('deck.columns', []);
- store.set('deck.layout', []);
- return;
- }
- throw err;
- }
+export function forceSaveCurrentDeckProfile() {
+ const currentProfile = prefer.s['deck.profiles'].find(p => p.name === prefer.s['deck.profile']);
+ if (currentProfile == null) return;
- store.set('deck.columns', deck.columns);
- store.set('deck.layout', deck.layout);
+ const newProfile = deepClone(currentProfile);
+ newProfile.columns = columns.value;
+ newProfile.layout = layout.value;
+
+ const newProfiles = prefer.s['deck.profiles'].filter(p => p.name !== prefer.s['deck.profile']);
+ newProfiles.push(newProfile);
+ prefer.commit('deck.profiles', newProfiles);
+}
+
+export const saveCurrentDeckProfile = () => {
+ forceSaveCurrentDeckProfile();
};
-export async function forceSaveDeck() {
- await misskeyApi('i/registry/set', {
- scope: ['client', 'deck', 'profiles'],
- key: store.s['deck.profile'],
- value: {
- columns: store.r['deck.columns'].value,
- layout: store.r['deck.layout'].value,
- },
- });
+function switchProfile(profile: DeckProfile) {
+ prefer.commit('deck.profile', profile.name);
+ const currentProfile = deepClone(profile);
+ columns.value = currentProfile.columns;
+ layout.value = currentProfile.layout;
+ forceSaveCurrentDeckProfile();
}
-// TODO: deckがloadされていない状態でsaveすると意図せず上書きが発生するので対策する
-export const saveDeck = throttle(1000, () => {
- forceSaveDeck();
-});
+function addProfile(name: string) {
+ if (name.trim() === '') return;
+ if (prefer.s['deck.profiles'].find(p => p.name === name)) return;
-export async function getProfiles(): Promise {
- return await misskeyApi('i/registry/keys', {
- scope: ['client', 'deck', 'profiles'],
- });
+ const newProfile: DeckProfile = {
+ id: uuid(),
+ name,
+ columns: [],
+ layout: [],
+ };
+ prefer.commit('deck.profiles', [...prefer.s['deck.profiles'], newProfile]);
+ switchProfile(newProfile);
}
-export async function deleteProfile(key: string): Promise {
- return await misskeyApi('i/registry/remove', {
- scope: ['client', 'deck', 'profiles'],
- key: key,
- });
+function createFirstProfile() {
+ addProfile('Main');
+}
+
+export function deleteProfile(name: string): void {
+ const newProfiles = prefer.s['deck.profiles'].filter(p => p.name !== name);
+ prefer.commit('deck.profiles', newProfiles);
+
+ if (prefer.s['deck.profiles'].length === 0) {
+ createFirstProfile();
+ } else {
+ switchProfile(prefer.s['deck.profiles'][0]);
+ }
}
export function addColumn(column: Column) {
if (column.name === undefined) column.name = null;
- store.push('deck.columns', column);
- store.push('deck.layout', [column.id]);
- saveDeck();
+ columns.value.push(column);
+ layout.value.push([column.id]);
+ saveCurrentDeckProfile();
}
export function removeColumn(id: Column['id']) {
- store.set('deck.columns', store.s['deck.columns'].filter(c => c.id !== id));
- store.set('deck.layout', store.s['deck.layout']
- .map(ids => ids.filter(_id => _id !== id))
- .filter(ids => ids.length > 0));
- saveDeck();
+ columns.value = columns.value.filter(c => c.id !== id);
+ layout.value = layout.value.map(ids => ids.filter(_id => _id !== id)).filter(ids => ids.length > 0);
+ saveCurrentDeckProfile();
}
export function swapColumn(a: Column['id'], b: Column['id']) {
- const aX = store.s['deck.layout'].findIndex(ids => ids.indexOf(a) !== -1);
- const aY = store.s['deck.layout'][aX].findIndex(id => id === a);
- const bX = store.s['deck.layout'].findIndex(ids => ids.indexOf(b) !== -1);
- const bY = store.s['deck.layout'][bX].findIndex(id => id === b);
- const layout = deepClone(store.s['deck.layout']);
- layout[aX][aY] = b;
- layout[bX][bY] = a;
- store.set('deck.layout', layout);
- saveDeck();
+ const aX = layout.value.findIndex(ids => ids.indexOf(a) !== -1);
+ const aY = layout.value[aX].findIndex(id => id === a);
+ const bX = layout.value.findIndex(ids => ids.indexOf(b) !== -1);
+ const bY = layout.value[bX].findIndex(id => id === b);
+ const newLayout = deepClone(layout.value);
+ newLayout[aX][aY] = b;
+ newLayout[bX][bY] = a;
+ layout.value = newLayout;
+ saveCurrentDeckProfile();
}
export function swapLeftColumn(id: Column['id']) {
- const layout = deepClone(store.s['deck.layout']);
- store.s['deck.layout'].some((ids, i) => {
+ const newLayout = deepClone(layout.value);
+ layout.value.some((ids, i) => {
if (ids.includes(id)) {
- const left = store.s['deck.layout'][i - 1];
+ const left = layout.value[i - 1];
if (left) {
- layout[i - 1] = store.s['deck.layout'][i];
- layout[i] = left;
- store.set('deck.layout', layout);
+ newLayout[i - 1] = layout.value[i];
+ newLayout[i] = left;
+ layout.value = newLayout;
}
return true;
}
return false;
});
- saveDeck();
+ saveCurrentDeckProfile();
}
export function swapRightColumn(id: Column['id']) {
- const layout = deepClone(store.s['deck.layout']);
- store.s['deck.layout'].some((ids, i) => {
+ const newLayout = deepClone(layout.value);
+ layout.value.some((ids, i) => {
if (ids.includes(id)) {
- const right = store.s['deck.layout'][i + 1];
+ const right = layout.value[i + 1];
if (right) {
- layout[i + 1] = store.s['deck.layout'][i];
- layout[i] = right;
- store.set('deck.layout', layout);
+ newLayout[i + 1] = layout.value[i];
+ newLayout[i] = right;
+ layout.value = newLayout;
}
return true;
}
return false;
});
- saveDeck();
+ saveCurrentDeckProfile();
}
export function swapUpColumn(id: Column['id']) {
- const layout = deepClone(store.s['deck.layout']);
- const idsIndex = store.s['deck.layout'].findIndex(ids => ids.includes(id));
- const ids = deepClone(store.s['deck.layout'][idsIndex]);
+ const newLayout = deepClone(layout.value);
+ const idsIndex = layout.value.findIndex(ids => ids.includes(id));
+ const ids = deepClone(layout.value[idsIndex]);
ids.some((x, i) => {
if (x === id) {
const up = ids[i - 1];
@@ -181,20 +196,20 @@ export function swapUpColumn(id: Column['id']) {
ids[i - 1] = id;
ids[i] = up;
- layout[idsIndex] = ids;
- store.set('deck.layout', layout);
+ newLayout[idsIndex] = ids;
+ layout.value = newLayout;
}
return true;
}
return false;
});
- saveDeck();
+ saveCurrentDeckProfile();
}
export function swapDownColumn(id: Column['id']) {
- const layout = deepClone(store.s['deck.layout']);
- const idsIndex = store.s['deck.layout'].findIndex(ids => ids.includes(id));
- const ids = deepClone(store.s['deck.layout'][idsIndex]);
+ const newLayout = deepClone(layout.value);
+ const idsIndex = layout.value.findIndex(ids => ids.includes(id));
+ const ids = deepClone(layout.value[idsIndex]);
ids.some((x, i) => {
if (x === id) {
const down = ids[i + 1];
@@ -202,105 +217,137 @@ export function swapDownColumn(id: Column['id']) {
ids[i + 1] = id;
ids[i] = down;
- layout[idsIndex] = ids;
- store.set('deck.layout', layout);
+ newLayout[idsIndex] = ids;
+ layout.value = newLayout;
}
return true;
}
return false;
});
- saveDeck();
+ saveCurrentDeckProfile();
}
export function stackLeftColumn(id: Column['id']) {
- let layout = deepClone(store.s['deck.layout']);
- const i = store.s['deck.layout'].findIndex(ids => ids.includes(id));
- layout = layout.map(ids => ids.filter(_id => _id !== id));
- layout[i - 1].push(id);
- layout = layout.filter(ids => ids.length > 0);
- store.set('deck.layout', layout);
- saveDeck();
+ let newLayout = deepClone(layout.value);
+ const i = layout.value.findIndex(ids => ids.includes(id));
+ newLayout = newLayout.map(ids => ids.filter(_id => _id !== id));
+ newLayout[i - 1].push(id);
+ newLayout = newLayout.filter(ids => ids.length > 0);
+ layout.value = newLayout;
+ saveCurrentDeckProfile();
}
export function popRightColumn(id: Column['id']) {
- let layout = deepClone(store.s['deck.layout']);
- const i = store.s['deck.layout'].findIndex(ids => ids.includes(id));
- const affected = layout[i];
- layout = layout.map(ids => ids.filter(_id => _id !== id));
- layout.splice(i + 1, 0, [id]);
- layout = layout.filter(ids => ids.length > 0);
- store.set('deck.layout', layout);
+ let newLayout = deepClone(layout.value);
+ const i = layout.value.findIndex(ids => ids.includes(id));
+ const affected = newLayout[i];
+ newLayout = newLayout.map(ids => ids.filter(_id => _id !== id));
+ newLayout.splice(i + 1, 0, [id]);
+ newLayout = newLayout.filter(ids => ids.length > 0);
+ layout.value = newLayout;
- const columns = deepClone(store.s['deck.columns']);
- for (const column of columns) {
+ const newColumns = deepClone(columns.value);
+ for (const column of newColumns) {
if (affected.includes(column.id)) {
column.active = true;
}
}
- store.set('deck.columns', columns);
+ columns.value = newColumns;
- saveDeck();
+ saveCurrentDeckProfile();
}
export function addColumnWidget(id: Column['id'], widget: ColumnWidget) {
- const columns = deepClone(store.s['deck.columns']);
- const columnIndex = store.s['deck.columns'].findIndex(c => c.id === id);
- const column = deepClone(store.s['deck.columns'][columnIndex]);
+ const newColumns = deepClone(columns.value);
+ const columnIndex = columns.value.findIndex(c => c.id === id);
+ const column = deepClone(columns.value[columnIndex]);
if (column == null) return;
if (column.widgets == null) column.widgets = [];
column.widgets.unshift(widget);
- columns[columnIndex] = column;
- store.set('deck.columns', columns);
- saveDeck();
+ newColumns[columnIndex] = column;
+ columns.value = newColumns;
+ saveCurrentDeckProfile();
}
export function removeColumnWidget(id: Column['id'], widget: ColumnWidget) {
- const columns = deepClone(store.s['deck.columns']);
- const columnIndex = store.s['deck.columns'].findIndex(c => c.id === id);
- const column = deepClone(store.s['deck.columns'][columnIndex]);
+ const newColumns = deepClone(columns.value);
+ const columnIndex = columns.value.findIndex(c => c.id === id);
+ const column = deepClone(columns.value[columnIndex]);
if (column == null) return;
if (column.widgets == null) column.widgets = [];
column.widgets = column.widgets.filter(w => w.id !== widget.id);
- columns[columnIndex] = column;
- store.set('deck.columns', columns);
- saveDeck();
+ newColumns[columnIndex] = column;
+ columns.value = newColumns;
+ saveCurrentDeckProfile();
}
export function setColumnWidgets(id: Column['id'], widgets: ColumnWidget[]) {
- const columns = deepClone(store.s['deck.columns']);
- const columnIndex = store.s['deck.columns'].findIndex(c => c.id === id);
- const column = deepClone(store.s['deck.columns'][columnIndex]);
+ const newColumns = deepClone(columns.value);
+ const columnIndex = columns.value.findIndex(c => c.id === id);
+ const column = deepClone(columns.value[columnIndex]);
if (column == null) return;
column.widgets = widgets;
- columns[columnIndex] = column;
- store.set('deck.columns', columns);
- saveDeck();
+ newColumns[columnIndex] = column;
+ columns.value = newColumns;
+ saveCurrentDeckProfile();
}
export function updateColumnWidget(id: Column['id'], widgetId: string, widgetData: any) {
- const columns = deepClone(store.s['deck.columns']);
- const columnIndex = store.s['deck.columns'].findIndex(c => c.id === id);
- const column = deepClone(store.s['deck.columns'][columnIndex]);
+ const newColumns = deepClone(columns.value);
+ const columnIndex = columns.value.findIndex(c => c.id === id);
+ const column = deepClone(columns.value[columnIndex]);
if (column == null) return;
if (column.widgets == null) column.widgets = [];
column.widgets = column.widgets.map(w => w.id === widgetId ? {
...w,
data: widgetData,
} : w);
- columns[columnIndex] = column;
- store.set('deck.columns', columns);
- saveDeck();
+ newColumns[columnIndex] = column;
+ columns.value = newColumns;
+ saveCurrentDeckProfile();
}
export function updateColumn(id: Column['id'], column: Partial) {
- const columns = deepClone(store.s['deck.columns']);
- const columnIndex = store.s['deck.columns'].findIndex(c => c.id === id);
- const currentColumn = deepClone(store.s['deck.columns'][columnIndex]);
+ const newColumns = deepClone(columns.value);
+ const columnIndex = columns.value.findIndex(c => c.id === id);
+ const currentColumn = deepClone(columns.value[columnIndex]);
if (currentColumn == null) return;
for (const [k, v] of Object.entries(column)) {
currentColumn[k] = v;
}
- columns[columnIndex] = currentColumn;
- store.set('deck.columns', columns);
- saveDeck();
+ newColumns[columnIndex] = currentColumn;
+ columns.value = newColumns;
+ saveCurrentDeckProfile();
+}
+
+export function switchProfileMenu(ev: MouseEvent) {
+ const items: MenuItem[] = prefer.s['deck.profile'] ? [{
+ text: prefer.s['deck.profile'],
+ active: true,
+ action: () => {},
+ }] : [];
+
+ const profiles = prefer.s['deck.profiles'];
+
+ items.push(...(profiles.filter(p => p.name !== prefer.s['deck.profile']).map(p => ({
+ text: p.name,
+ action: () => {
+ switchProfile(p);
+ },
+ }))), { type: 'divider' as const }, {
+ text: i18n.ts._deck.newProfile,
+ icon: 'ti ti-plus',
+ action: async () => {
+ const { canceled, result: name } = await os.inputText({
+ title: i18n.ts._deck.profile,
+ minLength: 1,
+ });
+
+ if (canceled || name == null || name.trim() === '') return;
+
+ addProfile(name);
+ },
+ });
+
+ os.popupMenu(items, ev.currentTarget ?? ev.target);
}
diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts
index 9ceea6b79b..68e0b08f92 100644
--- a/packages/frontend/src/preferences/def.ts
+++ b/packages/frontend/src/preferences/def.ts
@@ -9,6 +9,7 @@ import type { Theme } from '@/theme.js';
import type { SoundType } from '@/utility/sound.js';
import type { Plugin } from '@/plugin.js';
import type { DeviceKind } from '@/utility/device-kind.js';
+import type { Column, DeckProfile } from '@/deck.js';
import { DEFAULT_DEVICE_KIND } from '@/utility/device-kind.js';
/** サウンド設定 */
@@ -45,6 +46,14 @@ export const PREF_DEF = {
data: Record;
}[],
},
+ 'deck.profile': {
+ accountDependent: true,
+ default: null as string | null,
+ },
+ 'deck.profiles': {
+ accountDependent: true,
+ default: [] as DeckProfile[],
+ },
overridedDeviceKind: {
default: null as DeviceKind | null,
diff --git a/packages/frontend/src/preferences/profile.ts b/packages/frontend/src/preferences/profile.ts
index c1320b0dcc..defa2747eb 100644
--- a/packages/frontend/src/preferences/profile.ts
+++ b/packages/frontend/src/preferences/profile.ts
@@ -42,6 +42,8 @@ export type PreferencesProfile = {
syncByAccount: [Account, keyof PREF][],
};
+// TODO: 任意のプロパティをデバイス間で同期できるようにする？
+
export class ProfileManager extends EventEmitter<{
updated: (ctx: {
profile: PreferencesProfile
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 8f718ebcdf..738a57d233 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -10,7 +10,6 @@ import darkTheme from '@@/themes/d-green-lime.json5';
import { hemisphere } from '@@/js/intl-const.js';
import type { DeviceKind } from '@/utility/device-kind.js';
import type { Plugin } from '@/plugin.js';
-import type { Column } from '@/deck.js';
import { miLocalStorage } from '@/local-storage.js';
import { Storage } from '@/pizzax.js';
import { DEFAULT_DEVICE_KIND } from '@/utility/device-kind.js';
@@ -117,18 +116,6 @@ export const store = markRaw(new Storage('base', {
where: 'deviceAccount',
default: {} as Record, // plugin id, token
},
- 'deck.profile': {
- where: 'deviceAccount',
- default: 'default',
- },
- 'deck.columns': {
- where: 'deviceAccount',
- default: [] as Column[],
- },
- 'deck.layout': {
- where: 'deviceAccount',
- default: [] as Column['id'][][],
- },
enablePreferencesAutoCloudBackup: {
where: 'device',
diff --git a/packages/frontend/src/ui/deck.vue b/packages/frontend/src/ui/deck.vue
index 08f8ca4f65..337b0dac94 100644
--- a/packages/frontend/src/ui/deck.vue
+++ b/packages/frontend/src/ui/deck.vue
@@ -36,7 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
-
+
+
{{ i18n.ts.themeForLightMode }}
-
-
+ {{ lightThemeName }}
+
+
-
-
+
+ {{ i18n.ts._theme.instanceTheme }}
+
+
+
+ {{ i18n.ts._theme.installedThemes }}
+
+
+
+ {{ i18n.ts._theme.builtinThemes }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
{{ i18n.ts.themeForDarkMode }}
-
-
+ {{ darkThemeName }}
+
+
-
+
+
+ {{ i18n.ts._theme.instanceTheme }}
+
+
+
+ {{ i18n.ts._theme.installedThemes }}
+
+
+
+ {{ i18n.ts._theme.builtinThemes }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -95,7 +95,6 @@ SPDX-License-Identifier: AGPL-3.0-only
import { computed, defineAsyncComponent, ref, watch, shallowRef } from 'vue';
import { v4 as uuid } from 'uuid';
import XCommon from './_common_/common.vue';
-import type { MenuItem } from '@/types/menu.js';
import XSidebar from '@/ui/_common_/navbar.vue';
import XDrawerMenu from '@/ui/_common_/navbar-for-mobile.vue';
import MkButton from '@/components/MkButton.vue';
@@ -103,7 +102,6 @@ import * as os from '@/os.js';
import { navbarItemDef } from '@/navbar.js';
import { $i } from '@/account.js';
import { i18n } from '@/i18n.js';
-import { unisonReload } from '@/utility/unison-reload.js';
import { deviceKind } from '@/utility/device-kind.js';
import { prefer } from '@/preferences.js';
import XMainColumn from '@/ui/deck/main-column.vue';
@@ -117,8 +115,7 @@ import XMentionsColumn from '@/ui/deck/mentions-column.vue';
import XDirectColumn from '@/ui/deck/direct-column.vue';
import XRoleTimelineColumn from '@/ui/deck/role-timeline-column.vue';
import { mainRouter } from '@/router/main.js';
-import { store } from '@/store.js';
-import { columnTypes, forceSaveDeck, getProfiles, loadDeck, addColumn as addColumnToStore, deleteProfile as deleteProfile_ } from '@/deck.js';
+import { columns, layout, columnTypes, switchProfileMenu, addColumn as addColumnToStore, deleteProfile as deleteProfile_ } from '@/deck.js';
const XStatusBars = defineAsyncComponent(() => import('@/ui/_common_/statusbars.vue'));
const XAnnouncements = defineAsyncComponent(() => import('@/ui/_common_/announcements.vue'));
@@ -137,7 +134,7 @@ const columnComponents = {
mainRouter.navHook = (path, flag): boolean => {
if (flag === 'forcePage') return false;
- const noMainColumn = !store.s['deck.columns'].some(x => x.type === 'main');
+ const noMainColumn = !columns.value.some(x => x.type === 'main');
if (prefer.s['deck.navWindow'] || noMainColumn) {
os.pageWindow(path);
return true;
@@ -160,8 +157,6 @@ watch(route, () => {
});
*/
-const columns = store.r['deck.columns'];
-const layout = store.r['deck.layout'];
const menuIndicated = computed(() => {
if ($i == null) return false;
for (const def in navbarItemDef) {
@@ -210,65 +205,20 @@ function onWheel(ev: WheelEvent) {
document.documentElement.style.overflowY = 'hidden';
document.documentElement.style.scrollBehavior = 'auto';
-loadDeck();
-
-function changeProfile(ev: MouseEvent) {
- let items: MenuItem[] = [{
- text: store.s['deck.profile'],
- active: true,
- action: () => {},
- }];
- getProfiles().then(profiles => {
- items.push(...(profiles.filter(k => k !== store.s['deck.profile']).map(k => ({
- text: k,
- action: () => {
- store.set('deck.profile', k);
- unisonReload();
- },
- }))), { type: 'divider' as const }, {
- text: i18n.ts._deck.newProfile,
- icon: 'ti ti-plus',
- action: async () => {
- const { canceled, result: name } = await os.inputText({
- title: i18n.ts._deck.profile,
- minLength: 1,
- });
-
- if (canceled || name == null) return;
-
- os.promiseDialog((async () => {
- await store.set('deck.profile', name);
- await forceSaveDeck();
- })(), () => {
- unisonReload();
- });
- },
- });
- }).then(() => {
- os.popupMenu(items, ev.currentTarget ?? ev.target);
- });
-}
-
async function deleteProfile() {
+ if (prefer.s['deck.profile'] == null) return;
+
const { canceled } = await os.confirm({
type: 'warning',
- text: i18n.tsx.deleteAreYouSure({ x: store.s['deck.profile'] }),
+ text: i18n.tsx.deleteAreYouSure({ x: prefer.s['deck.profile'] }),
});
if (canceled) return;
- os.promiseDialog((async () => {
- if (store.s['deck.profile'] === 'default') {
- await store.set('deck.columns', []);
- await store.set('deck.layout', []);
- await forceSaveDeck();
- } else {
- await deleteProfile_(store.s['deck.profile']);
- }
- await store.set('deck.profile', 'default');
- })(), () => {
- unisonReload();
- });
+ await deleteProfile_(prefer.s['deck.profile']);
+
+ os.success();
}
+
diff --git a/packages/frontend/src/pages/settings/accessibility.vue b/packages/frontend/src/pages/settings/accessibility.vue
index f22e45ce1f..3dbb039a17 100644
--- a/packages/frontend/src/pages/settings/accessibility.vue
+++ b/packages/frontend/src/pages/settings/accessibility.vue
@@ -6,6 +6,10 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+ {{ i18n.ts._settings.accessibilityBanner }}
+
+
@@ -79,6 +83,7 @@ import { reloadAsk } from '@/utility/reload-ask.js';
import { i18n } from '@/i18n.js';
import { definePage } from '@/page.js';
import MkPreferenceContainer from '@/components/MkPreferenceContainer.vue';
+import MkFeatureBanner from '@/components/MkFeatureBanner.vue';
const reduceAnimation = prefer.model('animation', v => !v, v => !v);
const animatedMfm = prefer.model('animatedMfm');
diff --git a/packages/frontend/src/pages/settings/account-data.vue b/packages/frontend/src/pages/settings/account-data.vue
new file mode 100644
index 0000000000..8df545a2a3
--- /dev/null
+++ b/packages/frontend/src/pages/settings/account-data.vue
@@ -0,0 +1,277 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/pages/settings/api.vue b/packages/frontend/src/pages/settings/api.vue
deleted file mode 100644
index e41a7de0de..0000000000
--- a/packages/frontend/src/pages/settings/api.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
+
+ {{ i18n.ts._settings.accountDataBanner }}
+
+
+
+
+
+
+
+ {{ 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._exportOrImport.userLists }}
+
+
+
+
+
+
+ {{ i18n.ts._exportOrImport.muteList }}
+
+
+
+
+
+
+ {{ i18n.ts._exportOrImport.blockingList }}
+
+
+
+
+
+
+ {{ i18n.ts.antennas }}
+
+
+
+
+
+ {{ i18n.ts.export }}
+
+
+
+ {{ i18n.ts.import }}
+
+
+ {{ i18n.ts._exportOrImport.withReplies }}
+
+ {{ i18n.ts.import }}
+
+
+
+
+ {{ 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.export }}
+
+ {{ i18n.ts.export }}
+
+
+ {{ i18n.ts.import }}
+
+ {{ i18n.ts.import }}
+
+
+
+
+ {{ i18n.ts.export }}
+
+ {{ i18n.ts.export }}
+
+
+ {{ i18n.ts.import }}
+
+ {{ i18n.ts.import }}
+
+
+
+
+ {{ i18n.ts.export }}
+
+ {{ i18n.ts.export }}
+
+
+ {{ i18n.ts.import }}
+
+ {{ i18n.ts.import }}
+
+
+
- {{ i18n.ts.generateAccessToken }}
- {{ i18n.ts.manageAccessTokens }}
- API console
-
-
-
-
diff --git a/packages/frontend/src/pages/settings/appearance.vue b/packages/frontend/src/pages/settings/appearance.vue
index 6f8eb34d37..3fda5bc4c8 100644
--- a/packages/frontend/src/pages/settings/appearance.vue
+++ b/packages/frontend/src/pages/settings/appearance.vue
@@ -6,6 +6,10 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+ {{ i18n.ts._settings.appearanceBanner }}
+
+
@@ -227,6 +231,7 @@ import MkButton from '@/components/MkButton.vue';
import FormSection from '@/components/form/section.vue';
import { instance } from '@/instance.js';
import MkPreferenceContainer from '@/components/MkPreferenceContainer.vue';
+import MkFeatureBanner from '@/components/MkFeatureBanner.vue';
const fontSize = ref(miLocalStorage.getItem('fontSize'));
const useSystemFont = ref(miLocalStorage.getItem('useSystemFont') != null);
diff --git a/packages/frontend/src/pages/settings/connect.vue b/packages/frontend/src/pages/settings/connect.vue
new file mode 100644
index 0000000000..0dcd9062f0
--- /dev/null
+++ b/packages/frontend/src/pages/settings/connect.vue
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/pages/settings/drive.vue b/packages/frontend/src/pages/settings/drive.vue
index 8cc70f177f..34941d5af0 100644
--- a/packages/frontend/src/pages/settings/drive.vue
+++ b/packages/frontend/src/pages/settings/drive.vue
@@ -6,6 +6,10 @@ SPDX-License-Identifier: AGPL-3.0-only
From dca42fd6e67b4b7b4fe97428e792cc299d2afaa8 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 13:59:08 +0900
Subject: [PATCH 138/348] enhance(frontend): improve ux for touch devices
---
.../frontend-embed/src/pages/not-found.vue | 4 +--
.../frontend/src/components/MkChannelList.vue | 4 +--
.../frontend/src/components/MkFormDialog.vue | 2 +-
.../src/components/MkImgWithBlurhash.vue | 30 +++++++++++++++++--
packages/frontend/src/components/MkNotes.vue | 4 +--
.../src/components/MkNotifications.vue | 2 +-
.../frontend/src/components/MkPagination.vue | 2 +-
.../components/MkReactionsViewer.reaction.vue | 2 +-
.../frontend/src/components/MkUserList.vue | 4 +--
.../src/components/global/MkAvatar.vue | 2 ++
.../src/components/global/MkCustomEmoji.vue | 4 +++
.../src/components/global/MkError.vue | 2 +-
packages/frontend/src/pages/_error_.vue | 2 +-
.../frontend/src/pages/admin/roles.role.vue | 2 +-
.../frontend/src/pages/drive.file.info.vue | 2 +-
packages/frontend/src/pages/favorites.vue | 2 +-
.../frontend/src/pages/follow-requests.vue | 2 +-
packages/frontend/src/pages/invite.vue | 4 +--
packages/frontend/src/pages/list.vue | 2 +-
.../frontend/src/pages/my-antennas/index.vue | 2 +-
.../frontend/src/pages/my-lists/index.vue | 2 +-
packages/frontend/src/pages/not-found.vue | 2 +-
packages/frontend/src/pages/role.vue | 8 ++---
packages/frontend/src/pages/settings/apps.vue | 2 +-
.../src/pages/settings/mute-block.vue | 6 ++--
packages/frontend/src/style.scss | 5 ----
packages/frontend/src/ui/classic.header.vue | 2 +-
packages/frontend/src/ui/classic.sidebar.vue | 2 +-
.../src/widgets/WidgetBirthdayFollowings.vue | 2 +-
packages/frontend/src/widgets/WidgetRss.vue | 6 ++--
30 files changed, 72 insertions(+), 45 deletions(-)
diff --git a/packages/frontend-embed/src/pages/not-found.vue b/packages/frontend-embed/src/pages/not-found.vue
index bbb03b4e64..061254a39a 100644
--- a/packages/frontend-embed/src/pages/not-found.vue
+++ b/packages/frontend-embed/src/pages/not-found.vue
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
@@ -20,5 +20,5 @@ import { i18n } from '@/i18n.js';
const serverMetadata = inject(DI.serverMetadata)!;
-const notFoundImageUrl = computed(() => serverMetadata?.notFoundImageUrl ?? DEFAULT_NOT_FOUND_IMAGE_URL);
+const notFoundImageUrl = computed(() => serverMetadata.notFoundImageUrl ?? DEFAULT_NOT_FOUND_IMAGE_URL);
diff --git a/packages/frontend/src/components/MkChannelList.vue b/packages/frontend/src/components/MkChannelList.vue
index 23705f6ff8..fdb7d2a1c4 100644
--- a/packages/frontend/src/components/MkChannelList.vue
+++ b/packages/frontend/src/components/MkChannelList.vue
@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
diff --git a/packages/frontend/src/filters/number.ts b/packages/frontend/src/filters/number.ts
index 10fb64deb4..479afd58d4 100644
--- a/packages/frontend/src/filters/number.ts
+++ b/packages/frontend/src/filters/number.ts
@@ -5,4 +5,4 @@
import { numberFormat } from '@@/js/intl-const.js';
-export default n => n == null ? 'N/A' : numberFormat.format(n);
+export default (n?: number) => n == null ? 'N/A' : numberFormat.format(n);
diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index 43a97d49eb..c449b0e956 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -436,6 +436,10 @@ rt {
color: var(--MI_THEME-link);
}
+._love {
+ color: var(--MI_THEME-love);
+}
+
._caption {
font-size: 0.8em;
opacity: 0.7;
From 1c9e25470afd50e0776313476179b61a7d4986e2 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 14:15:09 +0900
Subject: [PATCH 141/348] refactor
---
packages/frontend/src/preferences/def.ts | 11 ++++++++++-
packages/frontend/src/ui/classic.vue | 13 -------------
packages/frontend/src/ui/universal.vue | 13 -------------
3 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts
index 048392ef49..9ad604ae72 100644
--- a/packages/frontend/src/preferences/def.ts
+++ b/packages/frontend/src/preferences/def.ts
@@ -46,7 +46,16 @@ export const PREF_DEF = {
},
widgets: {
accountDependent: true,
- default: [] as {
+ default: [{
+ name: 'calendar',
+ id: 'a', place: 'right', data: {},
+ }, {
+ name: 'notifications',
+ id: 'b', place: 'right', data: {},
+ }, {
+ name: 'trends',
+ id: 'c', place: 'right', data: {},
+ }] as {
name: string;
id: string;
place: string | null;
diff --git a/packages/frontend/src/ui/classic.vue b/packages/frontend/src/ui/classic.vue
index becb219c24..969e30b3a9 100644
--- a/packages/frontend/src/ui/classic.vue
+++ b/packages/frontend/src/ui/classic.vue
@@ -144,19 +144,6 @@ if (window.innerWidth < 1024) {
document.documentElement.style.overflowY = 'scroll';
-if (prefer.s.widgets.length === 0) {
- prefer.commit('widgets', [{
- name: 'calendar',
- id: 'a', place: null, data: {},
- }, {
- name: 'notifications',
- id: 'b', place: null, data: {},
- }, {
- name: 'trends',
- id: 'c', place: null, data: {},
- }]);
-}
-
onMounted(() => {
window.addEventListener('resize', () => {
isDesktop.value = (window.innerWidth >= DESKTOP_THRESHOLD);
diff --git a/packages/frontend/src/ui/universal.vue b/packages/frontend/src/ui/universal.vue
index 29248b2720..5b9fbb74ca 100644
--- a/packages/frontend/src/ui/universal.vue
+++ b/packages/frontend/src/ui/universal.vue
@@ -178,19 +178,6 @@ if (window.innerWidth > 1024) {
}
}
-if (prefer.s.widgets.length === 0) {
- prefer.commit('widgets', [{
- name: 'calendar',
- id: 'a', place: 'right', data: {},
- }, {
- name: 'notifications',
- id: 'b', place: 'right', data: {},
- }, {
- name: 'trends',
- id: 'c', place: 'right', data: {},
- }]);
-}
-
onMounted(() => {
if (!isDesktop.value) {
window.addEventListener('resize', () => {
From fbd9f4718261e249b8ec97202cb76fd94ac8fe8d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
Date: Sun, 16 Mar 2025 05:18:29 +0000
Subject: [PATCH 142/348] Bump version to 2025.3.2-beta.2
---
package.json | 2 +-
packages/misskey-js/package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 7b81c6a349..e2875ad54f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "misskey",
- "version": "2025.3.2-beta.1",
+ "version": "2025.3.2-beta.2",
"codename": "nasubi",
"repository": {
"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 439c04490a..b22f2c2a99 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
{
"type": "module",
"name": "misskey-js",
- "version": "2025.3.2-beta.1",
+ "version": "2025.3.2-beta.2",
"description": "Misskey SDK for JavaScript",
"license": "MIT",
"main": "./built/index.js",
From 32844e47753c9ced14072596ce9820e67d691a1c Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 14:56:27 +0900
Subject: [PATCH 143/348] =?UTF-8?q?=F0=9F=8E=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/frontend/src/components/MkAbuseReport.vue | 2 +-
packages/frontend/src/components/MkDrive.folder.vue | 2 +-
packages/frontend/src/components/MkMediaAudio.vue | 2 +-
packages/frontend/src/components/MkMediaImage.vue | 2 +-
packages/frontend/src/components/MkMediaVideo.vue | 2 +-
packages/frontend/src/components/MkPostFormAttaches.vue | 2 +-
packages/frontend/src/utility/get-drive-file-menu.ts | 2 +-
packages/frontend/src/utility/get-note-menu.ts | 2 +-
packages/frontend/src/utility/get-user-menu.ts | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/packages/frontend/src/components/MkAbuseReport.vue b/packages/frontend/src/components/MkAbuseReport.vue
index 8e37317779..6892435a65 100644
--- a/packages/frontend/src/components/MkAbuseReport.vue
+++ b/packages/frontend/src/components/MkAbuseReport.vue
@@ -135,7 +135,7 @@ function forward() {
function showMenu(ev: MouseEvent) {
os.popupMenu([{
- icon: 'ti ti-id',
+ icon: 'ti ti-hash',
text: 'Copy ID',
action: () => {
copyToClipboard(props.report.id);
diff --git a/packages/frontend/src/components/MkDrive.folder.vue b/packages/frontend/src/components/MkDrive.folder.vue
index 3bcd934f8a..9c72691d21 100644
--- a/packages/frontend/src/components/MkDrive.folder.vue
+++ b/packages/frontend/src/components/MkDrive.folder.vue
@@ -297,7 +297,7 @@ function onContextmenu(ev: MouseEvent) {
}];
if (prefer.s.devMode) {
menu = menu.concat([{ type: 'divider' }, {
- icon: 'ti ti-id',
+ icon: 'ti ti-hash',
text: i18n.ts.copyFolderId,
action: () => {
copyToClipboard(props.folder.id);
diff --git a/packages/frontend/src/components/MkMediaAudio.vue b/packages/frontend/src/components/MkMediaAudio.vue
index 096c51bbd6..28860d0cf6 100644
--- a/packages/frontend/src/components/MkMediaAudio.vue
+++ b/packages/frontend/src/components/MkMediaAudio.vue
@@ -242,7 +242,7 @@ function showMenu(ev: MouseEvent) {
if (prefer.s.devMode) {
menu.push({ type: 'divider' }, {
- icon: 'ti ti-id',
+ icon: 'ti ti-hash',
text: i18n.ts.copyFileId,
action: () => {
copyToClipboard(props.audio.id);
diff --git a/packages/frontend/src/components/MkMediaImage.vue b/packages/frontend/src/components/MkMediaImage.vue
index 20ac1a917e..8e0030c08d 100644
--- a/packages/frontend/src/components/MkMediaImage.vue
+++ b/packages/frontend/src/components/MkMediaImage.vue
@@ -168,7 +168,7 @@ function showMenu(ev: MouseEvent) {
if (prefer.s.devMode) {
menuItems.push({ type: 'divider' }, {
- icon: 'ti ti-id',
+ icon: 'ti ti-hash',
text: i18n.ts.copyFileId,
action: () => {
copyToClipboard(props.image.id);
diff --git a/packages/frontend/src/components/MkMediaVideo.vue b/packages/frontend/src/components/MkMediaVideo.vue
index 403ec61736..9674cb4461 100644
--- a/packages/frontend/src/components/MkMediaVideo.vue
+++ b/packages/frontend/src/components/MkMediaVideo.vue
@@ -267,7 +267,7 @@ function showMenu(ev: MouseEvent) {
if (prefer.s.devMode) {
menu.push({ type: 'divider' }, {
- icon: 'ti ti-id',
+ icon: 'ti ti-hash',
text: i18n.ts.copyFileId,
action: () => {
copyToClipboard(props.video.id);
diff --git a/packages/frontend/src/components/MkPostFormAttaches.vue b/packages/frontend/src/components/MkPostFormAttaches.vue
index c4926be53a..e8404cbd4f 100644
--- a/packages/frontend/src/components/MkPostFormAttaches.vue
+++ b/packages/frontend/src/components/MkPostFormAttaches.vue
@@ -201,7 +201,7 @@ function showFileMenu(file: Misskey.entities.DriveFile, ev: MouseEvent | Keyboar
if (prefer.s.devMode) {
menuItems.push({ type: 'divider' }, {
- icon: 'ti ti-id',
+ icon: 'ti ti-hash',
text: i18n.ts.copyFileId,
action: () => {
copyToClipboard(file.id);
diff --git a/packages/frontend/src/utility/get-drive-file-menu.ts b/packages/frontend/src/utility/get-drive-file-menu.ts
index 477043a342..0212a051ce 100644
--- a/packages/frontend/src/utility/get-drive-file-menu.ts
+++ b/packages/frontend/src/utility/get-drive-file-menu.ts
@@ -150,7 +150,7 @@ export function getDriveFileMenu(file: Misskey.entities.DriveFile, folder?: Miss
if (prefer.s.devMode) {
menuItems.push({ type: 'divider' }, {
- icon: 'ti ti-id',
+ icon: 'ti ti-hash',
text: i18n.ts.copyFileId,
action: () => {
copyToClipboard(file.id);
diff --git a/packages/frontend/src/utility/get-note-menu.ts b/packages/frontend/src/utility/get-note-menu.ts
index d2026de0b6..dea9bc39ad 100644
--- a/packages/frontend/src/utility/get-note-menu.ts
+++ b/packages/frontend/src/utility/get-note-menu.ts
@@ -512,7 +512,7 @@ export function getNoteMenu(props: {
if (prefer.s.devMode) {
menuItems.push({ type: 'divider' }, {
- icon: 'ti ti-id',
+ icon: 'ti ti-hash',
text: i18n.ts.copyNoteId,
action: () => {
copyToClipboard(appearNote.id);
diff --git a/packages/frontend/src/utility/get-user-menu.ts b/packages/frontend/src/utility/get-user-menu.ts
index b89c7537e2..496e021e99 100644
--- a/packages/frontend/src/utility/get-user-menu.ts
+++ b/packages/frontend/src/utility/get-user-menu.ts
@@ -401,7 +401,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
if (prefer.s.devMode) {
menuItems.push({ type: 'divider' }, {
- icon: 'ti ti-id',
+ icon: 'ti ti-hash',
text: i18n.ts.copyUserId,
action: () => {
copyToClipboard(user.id);
From 81a0cbd294bd6485fc47200b1bf63dbf2cbc8507 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 15:04:38 +0900
Subject: [PATCH 144/348] chore(frontend): use toast to show message when call
copyToClipboard
---
locales/index.d.ts | 4 ++++
locales/ja-JP.yml | 1 +
packages/frontend/src/components/MkCode.vue | 1 -
packages/frontend/src/components/MkEmbedCodeGenDialog.vue | 1 -
packages/frontend/src/components/MkInviteCode.vue | 1 -
packages/frontend/src/components/MkKeyValue.vue | 1 -
packages/frontend/src/components/global/MkCustomEmoji.vue | 1 -
packages/frontend/src/components/global/MkEmoji.vue | 1 -
packages/frontend/src/os.ts | 1 -
packages/frontend/src/pages/channel.vue | 1 -
packages/frontend/src/pages/clip.vue | 1 -
packages/frontend/src/pages/drop-and-fusion.game.vue | 1 -
packages/frontend/src/pages/emojis.emoji.vue | 3 +--
packages/frontend/src/pages/flash/flash.vue | 1 -
packages/frontend/src/pages/gallery/post.vue | 1 -
packages/frontend/src/pages/page.vue | 1 -
packages/frontend/src/pages/settings/theme.manage.vue | 3 +--
packages/frontend/src/utility/copy-to-clipboard.ts | 8 +++++++-
packages/frontend/src/utility/get-drive-file-menu.ts | 1 -
packages/frontend/src/utility/get-embed-code.ts | 5 ++---
packages/frontend/src/utility/get-note-menu.ts | 5 -----
21 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 3b56563149..0c6e73aac4 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -2810,6 +2810,10 @@ export interface Locale extends ILocale {
* コピー
*/
"copy": string;
+ /**
+ * クリップボードにコピーされました
+ */
+ "copiedToClipboard": string;
/**
* メトリクス
*/
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index ad96549160..d6af72ab57 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -698,6 +698,7 @@ userSaysSomethingAbout: "{name}が「{word}」について何かを言いまし
makeActive: "アクティブにする"
display: "表示"
copy: "コピー"
+copiedToClipboard: "クリップボードにコピーされました"
metrics: "メトリクス"
overview: "概要"
logs: "ログ"
diff --git a/packages/frontend/src/components/MkCode.vue b/packages/frontend/src/components/MkCode.vue
index 9708b78a30..d2d9f320ee 100644
--- a/packages/frontend/src/components/MkCode.vue
+++ b/packages/frontend/src/components/MkCode.vue
@@ -48,7 +48,6 @@ const XCode = defineAsyncComponent(() => import('@/components/MkCode.core.vue'))
function copy() {
copyToClipboard(props.code);
- os.success();
}
diff --git a/packages/frontend/src/components/MkEmbedCodeGenDialog.vue b/packages/frontend/src/components/MkEmbedCodeGenDialog.vue
index a53c9c7904..e038b84ba7 100644
--- a/packages/frontend/src/components/MkEmbedCodeGenDialog.vue
+++ b/packages/frontend/src/components/MkEmbedCodeGenDialog.vue
@@ -194,7 +194,6 @@ function generate() {
function doCopy() {
copyToClipboard(result.value);
- os.success();
}
//#endregion
diff --git a/packages/frontend/src/components/MkInviteCode.vue b/packages/frontend/src/components/MkInviteCode.vue
index 0f53d1573d..ab797459cc 100644
--- a/packages/frontend/src/components/MkInviteCode.vue
+++ b/packages/frontend/src/components/MkInviteCode.vue
@@ -90,7 +90,6 @@ function deleteCode() {
function copyInviteCode() {
copyToClipboard(props.invite.code);
- os.success();
}
diff --git a/packages/frontend/src/components/MkKeyValue.vue b/packages/frontend/src/components/MkKeyValue.vue
index 275b153e4a..b4185d2d0a 100644
--- a/packages/frontend/src/components/MkKeyValue.vue
+++ b/packages/frontend/src/components/MkKeyValue.vue
@@ -31,7 +31,6 @@ const props = withDefaults(defineProps<{
const copy_ = () => {
copyToClipboard(props.copy);
- os.success();
};
diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue
index 65d6e9a3f6..af8f1d035e 100644
--- a/packages/frontend/src/components/global/MkCustomEmoji.vue
+++ b/packages/frontend/src/components/global/MkCustomEmoji.vue
@@ -100,7 +100,6 @@ function onClick(ev: MouseEvent) {
icon: 'ti ti-copy',
action: () => {
copyToClipboard(`:${props.name}:`);
- os.success();
},
});
diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue
index 37df945233..ca67a28b70 100644
--- a/packages/frontend/src/components/global/MkEmoji.vue
+++ b/packages/frontend/src/components/global/MkEmoji.vue
@@ -50,7 +50,6 @@ function onClick(ev: MouseEvent) {
icon: 'ti ti-copy',
action: () => {
copyToClipboard(props.emoji);
- os.success();
},
});
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index a009a3f3d1..8e4c97e59f 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -63,7 +63,6 @@ export const apiWithDialog = ( {
return;
}
copyToClipboard(`${url}/channels/${channel.value.id}`);
- os.success();
},
});
diff --git a/packages/frontend/src/pages/clip.vue b/packages/frontend/src/pages/clip.vue
index 590a506a55..772ed6bd11 100644
--- a/packages/frontend/src/pages/clip.vue
+++ b/packages/frontend/src/pages/clip.vue
@@ -148,7 +148,6 @@ const headerActions = computed(() => clip.value && isOwned.value ? [{
text: i18n.ts.copyUrl,
action: () => {
copyToClipboard(`${url}/clips/${clip.value!.id}`);
- os.success();
},
}, {
icon: 'ti ti-code',
diff --git a/packages/frontend/src/pages/drop-and-fusion.game.vue b/packages/frontend/src/pages/drop-and-fusion.game.vue
index 364006e9ad..e30e381ce1 100644
--- a/packages/frontend/src/pages/drop-and-fusion.game.vue
+++ b/packages/frontend/src/pages/drop-and-fusion.game.vue
@@ -849,7 +849,6 @@ function exportLog() {
l: DropAndFusionGame.serializeLogs(logs),
});
copyToClipboard(data);
- os.success();
}
function updateSettings<
diff --git a/packages/frontend/src/pages/emojis.emoji.vue b/packages/frontend/src/pages/emojis.emoji.vue
index bedb0b64f9..d5570eb20a 100644
--- a/packages/frontend/src/pages/emojis.emoji.vue
+++ b/packages/frontend/src/pages/emojis.emoji.vue
@@ -25,7 +25,7 @@ import MkCustomEmojiDetailedDialog from '@/components/MkCustomEmojiDetailedDialo
import { $i } from '@/i.js';
const props = defineProps<{
- emoji: Misskey.entities.EmojiSimple;
+ emoji: Misskey.entities.EmojiSimple;
}>();
function menu(ev) {
@@ -38,7 +38,6 @@ function menu(ev) {
icon: 'ti ti-copy',
action: () => {
copyToClipboard(`:${props.emoji.name}:`);
- os.success();
},
}, {
text: i18n.ts.info,
diff --git a/packages/frontend/src/pages/flash/flash.vue b/packages/frontend/src/pages/flash/flash.vue
index 08ac913958..96e43b0205 100644
--- a/packages/frontend/src/pages/flash/flash.vue
+++ b/packages/frontend/src/pages/flash/flash.vue
@@ -129,7 +129,6 @@ function copyLink() {
if (!flash.value) return;
copyToClipboard(`${url}/play/${flash.value.id}`);
- os.success();
}
function shareWithNavigator() {
diff --git a/packages/frontend/src/pages/gallery/post.vue b/packages/frontend/src/pages/gallery/post.vue
index eb01aadbcc..6a9737e30f 100644
--- a/packages/frontend/src/pages/gallery/post.vue
+++ b/packages/frontend/src/pages/gallery/post.vue
@@ -111,7 +111,6 @@ function fetchPost() {
function copyLink() {
copyToClipboard(`${url}/gallery/${post.value.id}`);
- os.success();
}
function share() {
diff --git a/packages/frontend/src/pages/page.vue b/packages/frontend/src/pages/page.vue
index 00c664d2a0..523d443359 100644
--- a/packages/frontend/src/pages/page.vue
+++ b/packages/frontend/src/pages/page.vue
@@ -190,7 +190,6 @@ function copyLink() {
if (!page.value) return;
copyToClipboard(`${url}/@${page.value.user.username}/pages/${page.value.name}`);
- os.success();
}
function shareWithNote() {
diff --git a/packages/frontend/src/pages/settings/theme.manage.vue b/packages/frontend/src/pages/settings/theme.manage.vue
index e2b48ea232..c68c04bb44 100644
--- a/packages/frontend/src/pages/settings/theme.manage.vue
+++ b/packages/frontend/src/pages/settings/theme.manage.vue
@@ -33,12 +33,12 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
diff --git a/packages/frontend/src/filters/number.ts b/packages/frontend/src/filters/number.ts
index 479afd58d4..10fb64deb4 100644
--- a/packages/frontend/src/filters/number.ts
+++ b/packages/frontend/src/filters/number.ts
@@ -5,4 +5,4 @@
import { numberFormat } from '@@/js/intl-const.js';
-export default (n?: number) => n == null ? 'N/A' : numberFormat.format(n);
+export default n => n == null ? 'N/A' : numberFormat.format(n);
diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index c449b0e956..43a97d49eb 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -436,10 +436,6 @@ rt {
color: var(--MI_THEME-link);
}
-._love {
- color: var(--MI_THEME-love);
-}
-
._caption {
font-size: 0.8em;
opacity: 0.7;
From 22b0ace8b4fecb3a7a3d0c4a1e046dddaf692ec0 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 17:48:16 +0900
Subject: [PATCH 146/348] =?UTF-8?q?enhance(frontend):=20=E6=8A=95=E7=A8=BF?=
=?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0=E3=81=AE=E8=A8=AD=E5=AE=9A?=
=?UTF-8?q?=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=82=92=E6=94=B9=E8=89=AF?=
=?UTF-8?q?=20(=E6=94=B9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit a814395127aa1b4ea643fb40235e3e58c747b77f.
---
CHANGELOG.md | 3 +
locales/index.d.ts | 4 +
locales/ja-JP.yml | 1 +
packages/frontend/src/components/MkMenu.vue | 3 +
.../src/components/MkPostForm.TextCounter.vue | 95 +++++++++++++++++++
.../frontend/src/components/MkPostForm.vue | 54 +++++++++--
packages/frontend/src/filters/number.ts | 2 +-
packages/frontend/src/style.scss | 4 +
packages/frontend/src/types/menu.ts | 12 ++-
9 files changed, 166 insertions(+), 12 deletions(-)
create mode 100644 packages/frontend/src/components/MkPostForm.TextCounter.vue
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6fcbba1b5..cd8027b050 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,9 @@
- Enhance: CWの注釈テキストが入力されていない場合, Postボタンを非アクティブに
- Enhance: CWを無効にした場合, 注釈テキストが最大入力文字数を超えていても投稿できるように
- Enhance: テーマ設定画面のデザインを改善
+- Enhance: 投稿フォームの設定メニューを改良
+ - 投稿フォームをリセットできるように
+ - 文字数カウントを復活
- Fix: テーマ切り替え時に一部の色が変わらない問題を修正
### Server
diff --git a/locales/index.d.ts b/locales/index.d.ts
index f58a9bdf58..0c6e73aac4 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -5350,6 +5350,10 @@ export interface Locale extends ILocale {
* 投稿フォーム
*/
"postForm": string;
+ /**
+ * 文字数
+ */
+ "textCount": string;
"_emojiPalette": {
/**
* パレット
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index c794083756..d6af72ab57 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1333,6 +1333,7 @@ preferenceSyncConflictChoiceCancel: "同期の有効化をキャンセル"
paste: "ペースト"
emojiPalette: "絵文字パレット"
postForm: "投稿フォーム"
+textCount: "文字数"
_emojiPalette:
palettes: "パレット"
diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue
index aa53c19c33..e3c27c5f6e 100644
--- a/packages/frontend/src/components/MkMenu.vue
+++ b/packages/frontend/src/components/MkMenu.vue
@@ -35,6 +35,9 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
+
+
+ {{ i18n.ts._settings.serviceConnectionBanner }}
+
+
+
+
+ {{ i18n.ts._settings.api }}
+
+
+
+
+
+
+ {{ i18n.ts._settings.webhook }}
+
+
+
+
+
+ {{ i18n.ts.generateAccessToken }}
+ {{ i18n.ts.manageAccessTokens }}
+ API console
+
+
+
+ {{ i18n.ts._webhookSettings.createWebhook }}
+
+
+
+ {{ i18n.ts.manage }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ webhook.name || webhook.url }}
+
+
+
+
+
+
+ {{ i18n.ts._settings.driveBanner }}
+
+
{{ i18n.ts.usageAmount }}
@@ -103,6 +107,7 @@ import { definePage } from '@/page.js';
import { signinRequired } from '@/account.js';
import { prefer } from '@/preferences.js';
import MkPreferenceContainer from '@/components/MkPreferenceContainer.vue';
+import MkFeatureBanner from '@/components/MkFeatureBanner.vue';
const $i = signinRequired();
diff --git a/packages/frontend/src/pages/settings/import-export.vue b/packages/frontend/src/pages/settings/import-export.vue
deleted file mode 100644
index ad5529f1e7..0000000000
--- a/packages/frontend/src/pages/settings/import-export.vue
+++ /dev/null
@@ -1,263 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue
index d93fb176b5..26677a188f 100644
--- a/packages/frontend/src/pages/settings/index.vue
+++ b/packages/frontend/src/pages/settings/index.vue
@@ -156,20 +156,15 @@ const menuDef = computed(() => [{
to: '/settings/mute-block',
active: currentPage.value?.route.name === 'mute-block',
}, {
- icon: 'ti ti-api',
- text: 'API',
- to: '/settings/api',
- active: currentPage.value?.route.name === 'api',
- }, {
- icon: 'ti ti-webhook',
- text: 'Webhook',
- to: '/settings/webhook',
- active: currentPage.value?.route.name === 'webhook',
+ icon: 'ti ti-link',
+ text: i18n.ts._settings.serviceConnection,
+ to: '/settings/connect',
+ active: currentPage.value?.route.name === 'connect',
}, {
icon: 'ti ti-package',
- text: i18n.ts.importAndExport,
- to: '/settings/import-export',
- active: currentPage.value?.route.name === 'import-export',
+ text: i18n.ts._settings.accountData,
+ to: '/settings/account-data',
+ active: currentPage.value?.route.name === 'account-data',
}, {
icon: 'ti ti-dots',
text: i18n.ts.other,
diff --git a/packages/frontend/src/pages/settings/mute-block.vue b/packages/frontend/src/pages/settings/mute-block.vue
index d9c190f546..a5ab7caf99 100644
--- a/packages/frontend/src/pages/settings/mute-block.vue
+++ b/packages/frontend/src/pages/settings/mute-block.vue
@@ -6,167 +6,173 @@ 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._exportOrImport.userLists }}
-
-
-
-
-
- {{ i18n.ts._exportOrImport.muteList }}
-
-
-
-
-
- {{ i18n.ts._exportOrImport.blockingList }}
-
-
-
-
-
- {{ i18n.ts.antennas }}
-
-
-
-
-
- {{ i18n.ts.export }}
-
-
-
- {{ i18n.ts.import }}
-
-
- {{ i18n.ts._exportOrImport.withReplies }}
-
- {{ i18n.ts.import }}
-
-
-
-
- {{ 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.export }}
-
- {{ i18n.ts.export }}
-
-
- {{ i18n.ts.import }}
-
- {{ i18n.ts.import }}
-
-
-
-
- {{ i18n.ts.export }}
-
- {{ i18n.ts.export }}
-
-
- {{ i18n.ts.import }}
-
- {{ i18n.ts.import }}
-
-
-
-
- {{ i18n.ts.export }}
-
- {{ i18n.ts.export }}
-
-
- {{ i18n.ts.import }}
-
- {{ i18n.ts.import }}
-
-
-
-
-
-
- {{ i18n.ts.wordMute }}
+
+ {{ i18n.ts._settings.muteAndBlockBanner }}
+
- >,
},
- defaultWithReplies: {
- where: 'account',
- default: false,
- },
pluginTokens: {
where: 'deviceAccount',
default: {} as Record, // plugin id, token
@@ -119,6 +115,10 @@ export const store = markRaw(new Storage('base', {
},
//#region TODO: そのうち消す (preferに移行済み)
+ defaultWithReplies: {
+ where: 'account',
+ default: false,
+ },
reactions: {
where: 'account',
default: ['👍', '❤️', '😆', '🤔', '😮', '🎉', '💢', '😥', '😇', '🍮'],
diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index 48aacf10bc..fb2c805b1b 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -128,7 +128,7 @@ optgroup, option {
}
hr {
- margin: var(--MI-margin) 0 var(--MI-margin) 0;
+ margin: 0;
border: none;
height: 1px;
background: var(--MI_THEME-divider);
diff --git a/packages/frontend/src/utility/autogen/settings-search-index.ts b/packages/frontend/src/utility/autogen/settings-search-index.ts
index e44910e850..ebc67eb58d 100644
--- a/packages/frontend/src/utility/autogen/settings-search-index.ts
+++ b/packages/frontend/src/utility/autogen/settings-search-index.ts
@@ -482,44 +482,54 @@ export const searchIndexes: SearchIndexItem[] = [
},
{
id: '2E7vdIUQd',
+ label: i18n.ts.dataSaver,
+ keywords: ['datasaver'],
+ },
+ {
+ id: '6ZbRRIhA6',
children: [
{
- id: 'C2iXtZKb3',
+ id: 'soNZaKfiW',
label: i18n.ts.squareAvatars,
keywords: ['avatar', 'icon', 'square'],
},
{
- id: 'DCfJg0bva',
+ id: 'nhwHJJ2tl',
label: i18n.ts.seasonalScreenEffect,
keywords: ['effect', 'show'],
},
{
- id: 'AV0iGW0vg',
+ id: 'oMAVUuxTm',
label: i18n.ts.openImageInNewTab,
keywords: ['image', 'photo', 'picture', 'media', 'thumbnail', 'new', 'tab'],
},
{
- id: '5h8vhCX1S',
+ id: 'hSqX5JKM7',
+ label: i18n.ts.withRepliesByDefaultForNewlyFollowed,
+ keywords: ['follow', 'replies'],
+ },
+ {
+ id: 'fm98eqzke',
label: i18n.ts.whenServerDisconnected,
keywords: ['server', 'disconnect', 'reconnect', 'reload', 'streaming'],
},
{
- id: 'zZxyXHk3A',
+ id: '1rWDVig8Y',
label: i18n.ts.numberOfPageCache,
keywords: ['cache', 'page'],
},
{
- id: '7ix3kvMyU',
+ id: 'vXLtihtCp',
label: i18n.ts.forceShowAds,
keywords: ['ad', 'show'],
},
{
- id: '6RxgjmMLN',
+ id: '77YljFpiH',
label: i18n.ts.hemisphere,
keywords: [],
},
{
- id: '5iMpm5rES',
+ id: 'CZgDNPP1h',
label: i18n.ts.additionalEmojiDictionary,
keywords: ['emoji', 'dictionary', 'additional', 'extra'],
},
@@ -527,11 +537,6 @@ export const searchIndexes: SearchIndexItem[] = [
label: i18n.ts.other,
keywords: ['other'],
},
- {
- id: 'fnR7PRww5',
- label: i18n.ts.dataSaver,
- keywords: ['datasaver'],
- },
],
label: i18n.ts.preferences,
keywords: ['general', 'preferences', i18n.ts._settings.preferencesBanner],
@@ -549,32 +554,32 @@ export const searchIndexes: SearchIndexItem[] = [
id: 'F1uK9ssiY',
children: [
{
- id: 'msAcN6u3S',
+ id: 'E0ndmaP6Q',
label: i18n.ts._role.policies,
keywords: ['account', 'info'],
},
{
- id: 'pbTLsgRO7',
+ id: 'r5SjfwZJc',
label: i18n.ts.rolesAssignedToMe,
keywords: ['roles'],
},
{
- id: 'fQpvZyfLK',
+ id: 'cm7LrjgaW',
label: i18n.ts.accountMigration,
keywords: ['account', 'move', 'migration'],
},
{
- id: 'xhfur5m2z',
+ id: 'ozfqNviP3',
label: i18n.ts.closeAccount,
keywords: ['account', 'close', 'delete', i18n.ts._accountDelete.requestAccountDelete],
},
{
- id: 'oAXB8zm2U',
+ id: 'tpywgkpxy',
label: i18n.ts.experimentalFeatures,
keywords: ['experimental', 'feature', 'flags'],
},
{
- id: '95OjjGSo7',
+ id: '54wETGawJ',
label: i18n.ts.developer,
keywords: ['developer', 'mode', 'debug'],
},
From 8c9ec5827fa2040c8d705d2a01329da593d19fa3 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Thu, 13 Mar 2025 22:12:23 +0900
Subject: [PATCH 118/348] enhance(frontend): improve accounts management
---
packages/frontend/src/account.ts | 390 ------------------
packages/frontend/src/accounts.ts | 341 +++++++++++++++
packages/frontend/src/aiscript/api.ts | 2 +-
packages/frontend/src/boot/common.ts | 10 +-
packages/frontend/src/boot/main-boot.ts | 24 +-
.../src/components/MkAnnouncementDialog.vue | 5 +-
.../frontend/src/components/MkAuthConfirm.vue | 9 +-
.../frontend/src/components/MkClipPreview.vue | 2 +-
.../src/components/MkCropperDialog.vue | 2 +-
.../frontend/src/components/MkDrive.file.vue | 2 +-
.../frontend/src/components/MkEmojiPicker.vue | 2 +-
.../src/components/MkFollowButton.vue | 2 +-
.../src/components/MkInstanceStats.vue | 2 +-
.../frontend/src/components/MkMediaAudio.vue | 2 +-
.../frontend/src/components/MkMediaImage.vue | 2 +-
.../frontend/src/components/MkMediaVideo.vue | 2 +-
.../frontend/src/components/MkMention.vue | 2 +-
packages/frontend/src/components/MkNote.vue | 2 +-
.../src/components/MkNoteDetailed.vue | 2 +-
.../frontend/src/components/MkNoteSub.vue | 2 +-
.../src/components/MkNotification.vue | 2 +-
.../src/components/MkPasswordDialog.vue | 2 +-
.../frontend/src/components/MkPostForm.vue | 5 +-
.../frontend/src/components/MkPreview.vue | 2 +-
.../MkPushNotificationAllowButton.vue | 3 +-
.../components/MkReactionsViewer.reaction.vue | 2 +-
packages/frontend/src/components/MkSignin.vue | 5 +-
.../src/components/MkSignupDialog.form.vue | 4 +-
.../frontend/src/components/MkTimeline.vue | 2 +-
.../src/components/MkTokenGenerateWindow.vue | 2 +-
.../src/components/MkTutorialDialog.Note.vue | 2 +-
.../components/MkTutorialDialog.Sensitive.vue | 2 +-
.../frontend/src/components/MkUserInfo.vue | 2 +-
.../frontend/src/components/MkUserPopup.vue | 2 +-
.../src/components/MkUserSelectDialog.vue | 2 +-
.../components/MkUserSetupDialog.Profile.vue | 2 +-
.../frontend/src/components/global/MkAd.vue | 2 +-
.../src/components/global/MkCustomEmoji.vue | 2 +-
.../src/components/global/MkPageHeader.vue | 3 +-
packages/frontend/src/i.ts | 34 ++
packages/frontend/src/local-storage.ts | 1 -
packages/frontend/src/navbar.ts | 2 +-
packages/frontend/src/pages/about-misskey.vue | 2 +-
packages/frontend/src/pages/about.emojis.vue | 2 +-
packages/frontend/src/pages/achievements.vue | 2 +-
packages/frontend/src/pages/admin-file.vue | 2 +-
packages/frontend/src/pages/admin-user.vue | 2 +-
packages/frontend/src/pages/announcement.vue | 5 +-
packages/frontend/src/pages/announcements.vue | 5 +-
packages/frontend/src/pages/auth.vue | 3 +-
.../pages/avatar-decoration-edit-dialog.vue | 2 +-
.../frontend/src/pages/avatar-decorations.vue | 2 +-
packages/frontend/src/pages/channel.vue | 2 +-
packages/frontend/src/pages/clip.vue | 2 +-
.../src/pages/drop-and-fusion.game.vue | 2 +-
packages/frontend/src/pages/emojis.emoji.vue | 2 +-
packages/frontend/src/pages/flash/flash.vue | 2 +-
.../frontend/src/pages/follow-requests.vue | 2 +-
packages/frontend/src/pages/gallery/post.vue | 2 +-
packages/frontend/src/pages/instance-info.vue | 2 +-
packages/frontend/src/pages/invite.vue | 2 +-
.../frontend/src/pages/my-lists/index.vue | 2 +-
packages/frontend/src/pages/my-lists/list.vue | 2 +-
packages/frontend/src/pages/note.vue | 2 +-
.../src/pages/page-editor/page-editor.vue | 2 +-
packages/frontend/src/pages/page.vue | 2 +-
.../frontend/src/pages/reversi/game.board.vue | 2 +-
.../src/pages/reversi/game.setting.vue | 2 +-
packages/frontend/src/pages/reversi/game.vue | 2 +-
packages/frontend/src/pages/reversi/index.vue | 2 +-
packages/frontend/src/pages/scratchpad.vue | 2 +-
packages/frontend/src/pages/search.note.vue | 2 +-
.../src/pages/settings/2fa.qrdialog.vue | 2 +-
packages/frontend/src/pages/settings/2fa.vue | 5 +-
.../src/pages/settings/account-data.vue | 2 +-
.../frontend/src/pages/settings/accounts.vue | 103 ++---
.../settings/avatar-decoration.decoration.vue | 2 +-
.../settings/avatar-decoration.dialog.vue | 2 +-
.../src/pages/settings/avatar-decoration.vue | 2 +-
.../frontend/src/pages/settings/drive.vue | 2 +-
.../frontend/src/pages/settings/email.vue | 2 +-
.../frontend/src/pages/settings/index.vue | 3 +-
.../frontend/src/pages/settings/migration.vue | 2 +-
.../settings/mute-block.instance-mute.vue | 2 +-
.../src/pages/settings/mute-block.vue | 2 +-
.../src/pages/settings/notifications.vue | 2 +-
.../frontend/src/pages/settings/other.vue | 3 +-
.../frontend/src/pages/settings/privacy.vue | 2 +-
.../frontend/src/pages/settings/profile.vue | 2 +-
.../frontend/src/pages/signup-complete.vue | 2 +-
packages/frontend/src/pages/tag.vue | 2 +-
packages/frontend/src/pages/theme-editor.vue | 2 +-
packages/frontend/src/pages/timeline.vue | 2 +-
.../frontend/src/pages/user/achievements.vue | 2 +-
packages/frontend/src/pages/user/home.vue | 2 +-
packages/frontend/src/pages/user/index.vue | 2 +-
packages/frontend/src/pages/welcome.setup.vue | 2 +-
packages/frontend/src/pizzax.ts | 2 +-
packages/frontend/src/preferences.ts | 2 +-
packages/frontend/src/preferences/def.ts | 4 +
packages/frontend/src/preferences/manager.ts | 2 +-
packages/frontend/src/preferences/utility.ts | 2 +-
packages/frontend/src/router/definition.ts | 2 +-
packages/frontend/src/signout.ts | 54 +++
packages/frontend/src/store.ts | 4 +
packages/frontend/src/stream.ts | 2 +-
packages/frontend/src/theme-store.ts | 2 +-
packages/frontend/src/timelines.ts | 2 +-
.../src/ui/_common_/PreferenceRestore.vue | 2 +-
.../src/ui/_common_/announcements.vue | 2 +-
packages/frontend/src/ui/_common_/common.ts | 2 +-
packages/frontend/src/ui/_common_/common.vue | 2 +-
.../src/ui/_common_/navbar-for-mobile.vue | 3 +-
packages/frontend/src/ui/_common_/navbar.vue | 3 +-
.../frontend/src/ui/_common_/sw-inject.ts | 3 +-
packages/frontend/src/ui/classic.header.vue | 4 +-
packages/frontend/src/ui/classic.sidebar.vue | 3 +-
packages/frontend/src/ui/deck.vue | 2 +-
packages/frontend/src/ui/universal.vue | 2 +-
packages/frontend/src/use/use-note-capture.ts | 2 +-
packages/frontend/src/utility/achievements.ts | 2 +-
.../utility/autogen/settings-search-index.ts | 7 +
.../frontend/src/utility/check-permissions.ts | 2 +-
.../frontend/src/utility/get-note-menu.ts | 2 +-
.../frontend/src/utility/get-user-menu.ts | 2 +-
.../frontend/src/utility/isFfVisibleForMe.ts | 2 +-
packages/frontend/src/utility/misskey-api.ts | 2 +-
packages/frontend/src/utility/please-login.ts | 2 +-
.../frontend/src/utility/show-moved-dialog.ts | 2 +-
packages/frontend/src/utility/upload.ts | 2 +-
.../frontend/src/widgets/WidgetActivity.vue | 2 +-
.../frontend/src/widgets/WidgetAiscript.vue | 2 +-
.../src/widgets/WidgetAiscriptApp.vue | 2 +-
.../src/widgets/WidgetBirthdayFollowings.vue | 2 +-
.../frontend/src/widgets/WidgetButton.vue | 2 +-
.../frontend/src/widgets/WidgetProfile.vue | 2 +-
packages/frontend/test/aiscript/api.test.ts | 2 +-
137 files changed, 640 insertions(+), 622 deletions(-)
delete mode 100644 packages/frontend/src/account.ts
create mode 100644 packages/frontend/src/accounts.ts
create mode 100644 packages/frontend/src/i.ts
create mode 100644 packages/frontend/src/signout.ts
diff --git a/packages/frontend/src/account.ts b/packages/frontend/src/account.ts
deleted file mode 100644
index c90d4da5ec..0000000000
--- a/packages/frontend/src/account.ts
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { defineAsyncComponent, reactive, ref } from 'vue';
-import * as Misskey from 'misskey-js';
-import { apiUrl } from '@@/js/config.js';
-import type { MenuItem, MenuButton } from '@/types/menu.js';
-import { defaultMemoryStorage } from '@/memory-storage';
-import { showSuspendedDialog } from '@/utility/show-suspended-dialog.js';
-import { i18n } from '@/i18n.js';
-import { miLocalStorage } from '@/local-storage.js';
-import { del, get, set } from '@/utility/idb-proxy.js';
-import { waiting, popup, popupMenu, success, alert } from '@/os.js';
-import { misskeyApi } from '@/utility/misskey-api.js';
-import { unisonReload, reloadChannel } from '@/utility/unison-reload.js';
-
-// TODO: 他のタブと永続化されたstateを同期
-// TODO: accountsはpreferences管理にする(tokenは別管理)
-
-type Account = Misskey.entities.MeDetailed & { token: string };
-
-const accountData = miLocalStorage.getItem('account');
-
-// TODO: 外部からはreadonlyに
-export const $i = accountData ? reactive(JSON.parse(accountData) as Account) : null;
-
-export const iAmModerator = $i != null && ($i.isAdmin === true || $i.isModerator === true);
-export const iAmAdmin = $i != null && $i.isAdmin;
-
-export function signinRequired() {
- if ($i == null) throw new Error('signin required');
- return $i;
-}
-
-export let notesCount = $i == null ? 0 : $i.notesCount;
-export function incNotesCount() {
- notesCount++;
-}
-
-export async function signout() {
- if (!$i) return;
-
- defaultMemoryStorage.clear();
-
- waiting();
- document.cookie.split(';').forEach((cookie) => {
- const cookieName = cookie.split('=')[0].trim();
- if (cookieName === 'token') {
- document.cookie = `${cookieName}=; max-age=0; path=/`;
- }
- });
- miLocalStorage.removeItem('account');
- await removeAccount($i.id);
- const accounts = await getAccounts();
-
- //#region Remove service worker registration
- try {
- if (navigator.serviceWorker.controller) {
- const registration = await navigator.serviceWorker.ready;
- const push = await registration.pushManager.getSubscription();
- if (push) {
- await window.fetch(`${apiUrl}/sw/unregister`, {
- method: 'POST',
- body: JSON.stringify({
- i: $i.token,
- endpoint: push.endpoint,
- }),
- headers: {
- 'Content-Type': 'application/json',
- },
- });
- }
- }
-
- if (accounts.length === 0) {
- await navigator.serviceWorker.getRegistrations()
- .then(registrations => {
- return Promise.all(registrations.map(registration => registration.unregister()));
- });
- }
- } catch (err) {}
- //#endregion
-
- if (accounts.length > 0) login(accounts[0].token);
- else unisonReload('/');
-}
-
-export async function getAccounts(): Promise<{ id: Account['id'], token: Account['token'] }[]> {
- return (await get('accounts')) || [];
-}
-
-export async function addAccount(id: Account['id'], token: Account['token']) {
- const accounts = await getAccounts();
- if (!accounts.some(x => x.id === id)) {
- await set('accounts', accounts.concat([{ id, token }]));
- }
-}
-
-export async function removeAccount(idOrToken: Account['id']) {
- const accounts = await getAccounts();
- const i = accounts.findIndex(x => x.id === idOrToken || x.token === idOrToken);
- if (i !== -1) accounts.splice(i, 1);
-
- if (accounts.length > 0) {
- await set('accounts', accounts);
- } else {
- await del('accounts');
- }
-}
-
-function fetchAccount(token: string, id?: string, forceShowDialog?: boolean): Promise {
- document.cookie = 'token=; path=/; max-age=0';
- document.cookie = `token=${token}; path=/queue; max-age=86400; SameSite=Strict; Secure`; // bull dashboardの認証とかで使う
-
- return new Promise((done, fail) => {
- window.fetch(`${apiUrl}/i`, {
- method: 'POST',
- body: JSON.stringify({
- i: token,
- }),
- headers: {
- 'Content-Type': 'application/json',
- },
- })
- .then(res => new Promise }>((done2, fail2) => {
- if (res.status >= 500 && res.status < 600) {
- // サーバーエラー(5xx)の場合をrejectとする
- // （認証エラーなど4xxはresolve）
- return fail2(res);
- }
- res.json().then(done2, fail2);
- }))
- .then(async res => {
- if ('error' in res) {
- if (res.error.id === 'a8c724b3-6e9c-4b46-b1a8-bc3ed6258370') {
- // SUSPENDED
- if (forceShowDialog || $i && (token === $i.token || id === $i.id)) {
- await showSuspendedDialog();
- }
- } else if (res.error.id === 'e5b3b9f0-2b8f-4b9f-9c1f-8c5c1b2e1b1a') {
- // USER_IS_DELETED
- // アカウントが削除されている
- if (forceShowDialog || $i && (token === $i.token || id === $i.id)) {
- await alert({
- type: 'error',
- title: i18n.ts.accountDeleted,
- text: i18n.ts.accountDeletedDescription,
- });
- }
- } else if (res.error.id === 'b0a7f5f8-dc2f-4171-b91f-de88ad238e14') {
- // AUTHENTICATION_FAILED
- // トークンが無効化されていたりアカウントが削除されたりしている
- if (forceShowDialog || $i && (token === $i.token || id === $i.id)) {
- await alert({
- type: 'error',
- title: i18n.ts.tokenRevoked,
- text: i18n.ts.tokenRevokedDescription,
- });
- }
- } else {
- await alert({
- type: 'error',
- title: i18n.ts.failedToFetchAccountInformation,
- text: JSON.stringify(res.error),
- });
- }
-
- // rejectかつ理由がtrueの場合、削除対象であることを示す
- fail(true);
- } else {
- (res as Account).token = token;
- done(res as Account);
- }
- })
- .catch(fail);
- });
-}
-
-export function updateAccount(accountData: Account) {
- if (!$i) return;
- for (const key of Object.keys($i)) {
- delete $i[key];
- }
- for (const [key, value] of Object.entries(accountData)) {
- $i[key] = value;
- }
- miLocalStorage.setItem('account', JSON.stringify($i));
-}
-
-export function updateAccountPartial(accountData: Partial) {
- if (!$i) return;
- for (const [key, value] of Object.entries(accountData)) {
- $i[key] = value;
- }
- miLocalStorage.setItem('account', JSON.stringify($i));
-}
-
-export async function refreshAccount() {
- if (!$i) return;
- return fetchAccount($i.token, $i.id)
- .then(updateAccount, reason => {
- if (reason === true) return signout();
- return;
- });
-}
-
-export async function login(token: Account['token'], redirect?: string) {
- const showing = ref(true);
- const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkWaitingDialog.vue')), {
- success: false,
- showing: showing,
- }, {
- closed: () => dispose(),
- });
- if (_DEV_) console.log('logging as token ', token);
- const me = await fetchAccount(token, undefined, true)
- .catch(reason => {
- if (reason === true) {
- // 削除対象の場合
- removeAccount(token);
- }
-
- showing.value = false;
- throw reason;
- });
- miLocalStorage.setItem('account', JSON.stringify(me));
- await addAccount(me.id, token);
-
- if (redirect) {
- // 他のタブは再読み込みするだけ
- reloadChannel.postMessage(null);
- // このページはredirectで指定された先に移動
- location.href = redirect;
- return;
- }
-
- unisonReload();
-}
-
-export async function openAccountMenu(opts: {
- includeCurrentAccount?: boolean;
- withExtraOperation: boolean;
- active?: Misskey.entities.UserDetailed['id'];
- onChoose?: (account: Misskey.entities.UserDetailed) => void;
-}, ev: MouseEvent) {
- if (!$i) return;
-
- async function switchAccount(account: Misskey.entities.UserDetailed) {
- const storedAccounts = await getAccounts();
- const found = storedAccounts.find(x => x.id === account.id);
- if (found == null) return;
- switchAccountWithToken(found.token);
- }
-
- function switchAccountWithToken(token: string) {
- login(token);
- }
-
- const storedAccounts = await getAccounts().then(accounts => accounts.filter(x => x.id !== $i.id));
- const accountsPromise = misskeyApi('users/show', { userIds: storedAccounts.map(x => x.id) });
-
- function createItem(account: Misskey.entities.UserDetailed) {
- return {
- type: 'user' as const,
- user: account,
- active: opts.active != null ? opts.active === account.id : false,
- action: () => {
- if (opts.onChoose) {
- opts.onChoose(account);
- } else {
- switchAccount(account);
- }
- },
- };
- }
-
- const accountItemPromises = storedAccounts.map(a => new Promise | MenuButton>(res => {
- accountsPromise.then(accounts => {
- const account = accounts.find(x => x.id === a.id);
- if (account == null) return res({
- type: 'button' as const,
- text: a.id,
- action: () => {
- switchAccountWithToken(a.token);
- },
- });
-
- res(createItem(account));
- });
- }));
-
- const menuItems: MenuItem[] = [];
-
- if (opts.withExtraOperation) {
- menuItems.push({
- type: 'link',
- text: i18n.ts.profile,
- to: `/@${$i.username}`,
- avatar: $i,
- }, {
- type: 'divider',
- });
-
- if (opts.includeCurrentAccount) {
- menuItems.push(createItem($i));
- }
-
- menuItems.push(...accountItemPromises);
-
- menuItems.push({
- type: 'parent',
- icon: 'ti ti-plus',
- text: i18n.ts.addAccount,
- children: [{
- text: i18n.ts.existingAccount,
- action: () => {
- getAccountWithSigninDialog().then(res => {
- if (res != null) {
- success();
- }
- });
- },
- }, {
- text: i18n.ts.createAccount,
- action: () => {
- getAccountWithSignupDialog().then(res => {
- if (res != null) {
- switchAccountWithToken(res.token);
- }
- });
- },
- }],
- }, {
- type: 'link',
- icon: 'ti ti-users',
- text: i18n.ts.manageAccounts,
- to: '/settings/accounts',
- });
- } else {
- if (opts.includeCurrentAccount) {
- menuItems.push(createItem($i));
- }
-
- menuItems.push(...accountItemPromises);
- }
-
- popupMenu(menuItems, ev.currentTarget ?? ev.target, {
- align: 'left',
- });
-}
-
-export function getAccountWithSigninDialog(): Promise<{ id: string, token: string } | null> {
- return new Promise((resolve) => {
- const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {}, {
- done: async (res: Misskey.entities.SigninFlowResponse & { finished: true }) => {
- await addAccount(res.id, res.i);
- resolve({ id: res.id, token: res.i });
- },
- cancelled: () => {
- resolve(null);
- },
- closed: () => {
- dispose();
- },
- });
- });
-}
-
-export function getAccountWithSignupDialog(): Promise<{ id: string, token: string } | null> {
- return new Promise((resolve) => {
- const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSignupDialog.vue')), {}, {
- done: async (res: Misskey.entities.SignupResponse) => {
- await addAccount(res.id, res.token);
- resolve({ id: res.id, token: res.token });
- },
- cancelled: () => {
- resolve(null);
- },
- closed: () => {
- dispose();
- },
- });
- });
-}
-
-if (_DEV_) {
- (window as any).$i = $i;
-}
diff --git a/packages/frontend/src/accounts.ts b/packages/frontend/src/accounts.ts
new file mode 100644
index 0000000000..2382a8ec32
--- /dev/null
+++ b/packages/frontend/src/accounts.ts
@@ -0,0 +1,341 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { defineAsyncComponent, ref } from 'vue';
+import * as Misskey from 'misskey-js';
+import { apiUrl, host } from '@@/js/config.js';
+import type { MenuItem } from '@/types/menu.js';
+import { showSuspendedDialog } from '@/utility/show-suspended-dialog.js';
+import { i18n } from '@/i18n.js';
+import { miLocalStorage } from '@/local-storage.js';
+import { waiting, popup, popupMenu, success, alert } from '@/os.js';
+import { unisonReload, reloadChannel } from '@/utility/unison-reload.js';
+import { prefer } from '@/preferences.js';
+import { store } from '@/store.js';
+import { $i } from '@/i.js';
+import { signout } from '@/signout.js';
+
+// TODO: 他のタブと永続化されたstateを同期
+
+type AccountWithToken = Misskey.entities.MeDetailed & { token: string };
+
+export async function getAccounts(): Promise<{
+ host: string;
+ user: Misskey.entities.User;
+ token: string | null;
+}[]> {
+ const tokens = store.s.accountTokens;
+ const accounts = prefer.s.accounts;
+ return accounts.map(([host, user]) => ({
+ host,
+ user,
+ token: tokens[host + '/' + user.id] ?? null,
+ }));
+}
+
+async function addAccount(host: string, user: Misskey.entities.User, token: AccountWithToken['token']) {
+ if (!prefer.s.accounts.some(x => x[0] === host && x[1].id === user.id)) {
+ store.set('accountTokens', { ...store.s.accountTokens, [host + '/' + user.id]: token });
+ prefer.commit('accounts', [...prefer.s.accounts, [host, user]]);
+ }
+}
+
+export async function removeAccount(host: string, id: AccountWithToken['id']) {
+ const tokens = JSON.parse(JSON.stringify(store.s.accountTokens));
+ delete tokens[host + '/' + id];
+ store.set('accountTokens', tokens);
+ prefer.commit('accounts', prefer.s.accounts.filter(x => x[0] !== host || x[1].id !== id));
+}
+
+const isAccountDeleted = Symbol('isAccountDeleted');
+
+function fetchAccount(token: string, id?: string, forceShowDialog?: boolean): Promise {
+ return new Promise((done, fail) => {
+ window.fetch(`${apiUrl}/i`, {
+ method: 'POST',
+ body: JSON.stringify({
+ i: token,
+ }),
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ })
+ .then(res => new Promise }>((done2, fail2) => {
+ if (res.status >= 500 && res.status < 600) {
+ // サーバーエラー(5xx)の場合をrejectとする
+ // （認証エラーなど4xxはresolve）
+ return fail2(res);
+ }
+ res.json().then(done2, fail2);
+ }))
+ .then(async res => {
+ if ('error' in res) {
+ if (res.error.id === 'a8c724b3-6e9c-4b46-b1a8-bc3ed6258370') {
+ // SUSPENDED
+ if (forceShowDialog || $i && (token === $i.token || id === $i.id)) {
+ await showSuspendedDialog();
+ }
+ } else if (res.error.id === 'e5b3b9f0-2b8f-4b9f-9c1f-8c5c1b2e1b1a') {
+ // USER_IS_DELETED
+ // アカウントが削除されている
+ if (forceShowDialog || $i && (token === $i.token || id === $i.id)) {
+ await alert({
+ type: 'error',
+ title: i18n.ts.accountDeleted,
+ text: i18n.ts.accountDeletedDescription,
+ });
+ }
+ } else if (res.error.id === 'b0a7f5f8-dc2f-4171-b91f-de88ad238e14') {
+ // AUTHENTICATION_FAILED
+ // トークンが無効化されていたりアカウントが削除されたりしている
+ if (forceShowDialog || $i && (token === $i.token || id === $i.id)) {
+ await alert({
+ type: 'error',
+ title: i18n.ts.tokenRevoked,
+ text: i18n.ts.tokenRevokedDescription,
+ });
+ }
+ } else {
+ await alert({
+ type: 'error',
+ title: i18n.ts.failedToFetchAccountInformation,
+ text: JSON.stringify(res.error),
+ });
+ }
+
+ fail(isAccountDeleted);
+ } else {
+ done(res);
+ }
+ })
+ .catch(fail);
+ });
+}
+
+export function updateCurrentAccount(accountData: Misskey.entities.MeDetailed) {
+ if (!$i) return;
+ const token = $i.token;
+ for (const key of Object.keys($i)) {
+ delete $i[key];
+ }
+ for (const [key, value] of Object.entries(accountData)) {
+ $i[key] = value;
+ }
+ prefer.commit('accounts', prefer.s.accounts.map(([host, user]) => {
+ // TODO: $iのホストも比較したいけど通常null
+ if (user.id === $i.id) {
+ return [host, $i];
+ } else {
+ return [host, user];
+ }
+ }));
+ $i.token = token;
+ miLocalStorage.setItem('account', JSON.stringify($i));
+}
+
+export function updateCurrentAccountPartial(accountData: Partial) {
+ if (!$i) return;
+ for (const [key, value] of Object.entries(accountData)) {
+ $i[key] = value;
+ }
+ prefer.commit('accounts', prefer.s.accounts.map(([host, user]) => {
+ // TODO: $iのホストも比較したいけど通常null
+ if (user.id === $i.id) {
+ const newUser = JSON.parse(JSON.stringify($i));
+ for (const [key, value] of Object.entries(accountData)) {
+ newUser[key] = value;
+ }
+ return [host, newUser];
+ }
+ return [host, user];
+ }));
+ miLocalStorage.setItem('account', JSON.stringify($i));
+}
+
+export async function refreshCurrentAccount() {
+ if (!$i) return;
+ return fetchAccount($i.token, $i.id).then(updateCurrentAccount).catch(reason => {
+ if (reason === isAccountDeleted) {
+ removeAccount(host, $i.id);
+ if (Object.keys(store.s.accountTokens).length > 0) {
+ login(Object.values(store.s.accountTokens)[0]);
+ } else {
+ signout();
+ }
+ }
+ });
+}
+
+export async function login(token: AccountWithToken['token'], redirect?: string) {
+ const showing = ref(true);
+ const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkWaitingDialog.vue')), {
+ success: false,
+ showing: showing,
+ }, {
+ closed: () => dispose(),
+ });
+
+ const me = await fetchAccount(token, undefined, true).catch(reason => {
+ showing.value = false;
+ throw reason;
+ });
+
+ miLocalStorage.setItem('account', JSON.stringify({
+ ...me,
+ token,
+ }));
+
+ await addAccount(host, me, token);
+
+ if (redirect) {
+ // 他のタブは再読み込みするだけ
+ reloadChannel.postMessage(null);
+ // このページはredirectで指定された先に移動
+ location.href = redirect;
+ return;
+ }
+
+ unisonReload();
+}
+
+export async function switchAccount(host: string, id: string) {
+ const token = store.s.accountTokens[host + '/' + id];
+ if (token) {
+ login(token);
+ } else {
+ const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {}, {
+ done: async (res: Misskey.entities.SigninFlowResponse & { finished: true }) => {
+ store.set('accountTokens', { ...store.s.accountTokens, [host + '/' + res.id]: res.i });
+ login(res.i);
+ },
+ closed: () => {
+ dispose();
+ },
+ });
+ }
+}
+
+export async function openAccountMenu(opts: {
+ includeCurrentAccount?: boolean;
+ withExtraOperation: boolean;
+ active?: Misskey.entities.User['id'];
+ onChoose?: (account: Misskey.entities.User) => void;
+}, ev: MouseEvent) {
+ if (!$i) return;
+
+ function createItem(host: string, account: Misskey.entities.User): MenuItem {
+ return {
+ type: 'user' as const,
+ user: account,
+ active: opts.active != null ? opts.active === account.id : false,
+ action: async () => {
+ if (opts.onChoose) {
+ opts.onChoose(account);
+ } else {
+ switchAccount(host, account.id);
+ }
+ },
+ };
+ }
+
+ const menuItems: MenuItem[] = [];
+
+ // TODO: $iのホストも比較したいけど通常null
+ const accountItems = (await getAccounts().then(accounts => accounts.filter(x => x.user.id !== $i.id))).map(a => createItem(a.host, a.user));
+
+ if (opts.withExtraOperation) {
+ menuItems.push({
+ type: 'link',
+ text: i18n.ts.profile,
+ to: `/@${$i.username}`,
+ avatar: $i,
+ }, {
+ type: 'divider',
+ });
+
+ if (opts.includeCurrentAccount) {
+ menuItems.push(createItem(host, $i));
+ }
+
+ menuItems.push(...accountItems);
+
+ menuItems.push({
+ type: 'parent',
+ icon: 'ti ti-plus',
+ text: i18n.ts.addAccount,
+ children: [{
+ text: i18n.ts.existingAccount,
+ action: () => {
+ getAccountWithSigninDialog().then(res => {
+ if (res != null) {
+ success();
+ }
+ });
+ },
+ }, {
+ text: i18n.ts.createAccount,
+ action: () => {
+ getAccountWithSignupDialog().then(res => {
+ if (res != null) {
+ switchAccount(host, res.id);
+ }
+ });
+ },
+ }],
+ }, {
+ type: 'link',
+ icon: 'ti ti-users',
+ text: i18n.ts.manageAccounts,
+ to: '/settings/accounts',
+ });
+ } else {
+ if (opts.includeCurrentAccount) {
+ menuItems.push(createItem(host, $i));
+ }
+
+ menuItems.push(...accountItems);
+ }
+
+ popupMenu(menuItems, ev.currentTarget ?? ev.target, {
+ align: 'left',
+ });
+}
+
+export function getAccountWithSigninDialog(): Promise<{ id: string, token: string } | null> {
+ return new Promise((resolve) => {
+ const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {}, {
+ done: async (res: Misskey.entities.SigninFlowResponse & { finished: true }) => {
+ const user = await fetchAccount(res.i, res.id, true);
+ await addAccount(host, user, res.i);
+ resolve({ id: res.id, token: res.i });
+ },
+ cancelled: () => {
+ resolve(null);
+ },
+ closed: () => {
+ dispose();
+ },
+ });
+ });
+}
+
+export function getAccountWithSignupDialog(): Promise<{ id: string, token: string } | null> {
+ return new Promise((resolve) => {
+ const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSignupDialog.vue')), {}, {
+ done: async (res: Misskey.entities.SignupResponse) => {
+ const user = JSON.parse(JSON.stringify(res));
+ delete user.token;
+ await addAccount(host, user, res.token);
+ resolve({ id: res.id, token: res.token });
+ },
+ cancelled: () => {
+ resolve(null);
+ },
+ closed: () => {
+ dispose();
+ },
+ });
+ });
+}
diff --git a/packages/frontend/src/aiscript/api.ts b/packages/frontend/src/aiscript/api.ts
index 3acc1127c9..e7e396023d 100644
--- a/packages/frontend/src/aiscript/api.ts
+++ b/packages/frontend/src/aiscript/api.ts
@@ -9,7 +9,7 @@ import { url, lang } from '@@/js/config.js';
import { assertStringAndIsIn } from './common.js';
import * as os from '@/os.js';
import { misskeyApi } from '@/utility/misskey-api.js';
-import { $i } from '@/account.js';
+import { $i } from '@/i.js';
import { miLocalStorage } from '@/local-storage.js';
import { customEmojis } from '@/custom-emojis.js';
diff --git a/packages/frontend/src/boot/common.ts b/packages/frontend/src/boot/common.ts
index 122aa50ac0..73c4256c4b 100644
--- a/packages/frontend/src/boot/common.ts
+++ b/packages/frontend/src/boot/common.ts
@@ -15,7 +15,7 @@ import components from '@/components/index.js';
import { applyTheme } from '@/theme.js';
import { isDeviceDarkmode } from '@/utility/is-device-darkmode.js';
import { updateI18n, i18n } from '@/i18n.js';
-import { $i, refreshAccount, login } from '@/account.js';
+import { refreshCurrentAccount, login } from '@/accounts.js';
import { store } from '@/store.js';
import { fetchInstance, instance } from '@/instance.js';
import { deviceKind, updateDeviceKind } from '@/utility/device-kind.js';
@@ -29,6 +29,7 @@ import { fetchCustomEmojis } from '@/custom-emojis.js';
import { setupRouter } from '@/router/main.js';
import { createMainRouter } from '@/router/definition.js';
import { prefer } from '@/preferences.js';
+import { $i } from '@/i.js';
export async function common(createVue: () => App) {
console.info(`Misskey v${version}`);
@@ -38,11 +39,6 @@ export async function common(createVue: () => App) {
console.info(`vue ${vueVersion}`);
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- (window as any).$i = $i;
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- (window as any).$store = store;
-
window.addEventListener('error', event => {
console.error(event);
/*
@@ -244,7 +240,7 @@ export async function common(createVue: () => App) {
console.log('account cache found. refreshing...');
}
- refreshAccount();
+ refreshCurrentAccount();
}
//#endregion
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index be72eeb9e1..64e3a236e8 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -16,7 +16,7 @@ import { i18n } from '@/i18n.js';
import { alert, confirm, popup, post, toast } from '@/os.js';
import { useStream } from '@/stream.js';
import * as sound from '@/utility/sound.js';
-import { $i, signout, updateAccountPartial } from '@/account.js';
+import { $i } from '@/i.js';
import { instance } from '@/instance.js';
import { ColdDeviceStorage, store } from '@/store.js';
import { reactionPicker } from '@/utility/reaction-picker.js';
@@ -32,6 +32,8 @@ import { misskeyApi } from '@/utility/misskey-api.js';
import { deckStore } from '@/ui/deck/deck-store.js';
import { launchPlugins } from '@/plugin.js';
import { unisonReload } from '@/utility/unison-reload.js';
+import { updateCurrentAccountPartial } from '@/accounts.js';
+import { signout } from '@/signout.js';
export async function mainBoot() {
const { isClientUpdated, lastVersion } = await common(() => {
@@ -480,11 +482,11 @@ export async function mainBoot() {
// 自分の情報が更新されたとき
main.on('meUpdated', i => {
- updateAccountPartial(i);
+ updateCurrentAccountPartial(i);
});
main.on('readAllNotifications', () => {
- updateAccountPartial({
+ updateCurrentAccountPartial({
hasUnreadNotification: false,
unreadNotificationsCount: 0,
});
@@ -492,39 +494,39 @@ export async function mainBoot() {
main.on('unreadNotification', () => {
const unreadNotificationsCount = ($i?.unreadNotificationsCount ?? 0) + 1;
- updateAccountPartial({
+ updateCurrentAccountPartial({
hasUnreadNotification: true,
unreadNotificationsCount,
});
});
main.on('unreadMention', () => {
- updateAccountPartial({ hasUnreadMentions: true });
+ updateCurrentAccountPartial({ hasUnreadMentions: true });
});
main.on('readAllUnreadMentions', () => {
- updateAccountPartial({ hasUnreadMentions: false });
+ updateCurrentAccountPartial({ hasUnreadMentions: false });
});
main.on('unreadSpecifiedNote', () => {
- updateAccountPartial({ hasUnreadSpecifiedNotes: true });
+ updateCurrentAccountPartial({ hasUnreadSpecifiedNotes: true });
});
main.on('readAllUnreadSpecifiedNotes', () => {
- updateAccountPartial({ hasUnreadSpecifiedNotes: false });
+ updateCurrentAccountPartial({ hasUnreadSpecifiedNotes: false });
});
main.on('readAllAntennas', () => {
- updateAccountPartial({ hasUnreadAntenna: false });
+ updateCurrentAccountPartial({ hasUnreadAntenna: false });
});
main.on('unreadAntenna', () => {
- updateAccountPartial({ hasUnreadAntenna: true });
+ updateCurrentAccountPartial({ hasUnreadAntenna: true });
sound.playMisskeySfx('antenna');
});
main.on('readAllAnnouncements', () => {
- updateAccountPartial({ hasUnreadAnnouncement: false });
+ updateCurrentAccountPartial({ hasUnreadAnnouncement: false });
});
// 個人宛てお知らせが発行されたとき
diff --git a/packages/frontend/src/components/MkAnnouncementDialog.vue b/packages/frontend/src/components/MkAnnouncementDialog.vue
index 41fd2564d8..582bb137bc 100644
--- a/packages/frontend/src/components/MkAnnouncementDialog.vue
+++ b/packages/frontend/src/components/MkAnnouncementDialog.vue
@@ -29,7 +29,8 @@ import { misskeyApi } from '@/utility/misskey-api.js';
import MkModal from '@/components/MkModal.vue';
import MkButton from '@/components/MkButton.vue';
import { i18n } from '@/i18n.js';
-import { $i, updateAccountPartial } from '@/account.js';
+import { $i } from '@/i.js';
+import { updateCurrentAccountPartial } from '@/accounts.js';
const props = withDefaults(defineProps<{
announcement: Misskey.entities.Announcement;
@@ -51,7 +52,7 @@ async function ok() {
modal.value?.close();
misskeyApi('i/read-announcement', { announcementId: props.announcement.id });
- updateAccountPartial({
+ updateCurrentAccountPartial({
unreadAnnouncements: $i!.unreadAnnouncements.filter(a => a.id !== props.announcement.id),
});
}
diff --git a/packages/frontend/src/components/MkAuthConfirm.vue b/packages/frontend/src/components/MkAuthConfirm.vue
index 090c31044e..00bf8e68d9 100644
--- a/packages/frontend/src/components/MkAuthConfirm.vue
+++ b/packages/frontend/src/components/MkAuthConfirm.vue
@@ -117,10 +117,9 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/components/index.ts b/packages/frontend/src/components/index.ts
index ebbad3e5b8..66ac871f7d 100644
--- a/packages/frontend/src/components/index.ts
+++ b/packages/frontend/src/components/index.ts
@@ -21,7 +21,6 @@ import MkError from './global/MkError.vue';
import MkAd from './global/MkAd.vue';
import MkPageHeader from './global/MkPageHeader.vue';
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';
@@ -55,7 +54,6 @@ export const components = {
MkAd: MkAd,
MkPageHeader: MkPageHeader,
MkSpacer: MkSpacer,
- MkFooterSpacer: MkFooterSpacer,
MkStickyContainer: MkStickyContainer,
MkLazy: MkLazy,
SearchMarker: SearchMarker,
@@ -83,7 +81,6 @@ declare module '@vue/runtime-core' {
MkAd: typeof MkAd;
MkPageHeader: typeof MkPageHeader;
MkSpacer: typeof MkSpacer;
- MkFooterSpacer: typeof MkFooterSpacer;
MkStickyContainer: typeof MkStickyContainer;
MkLazy: typeof MkLazy;
SearchMarker: typeof SearchMarker;
diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue
index ba5957f06a..ef148dd9af 100644
--- a/packages/frontend/src/pages/settings/index.vue
+++ b/packages/frontend/src/pages/settings/index.vue
@@ -27,7 +27,6 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts.wordMuteDescription }}
+
+
+
+ {{ i18n.ts.hardWordMute }}
-
-
-
- {{ i18n.ts.instanceMute }}
+
+
-
-
+
+
+
+ {{ i18n.ts.instanceMute }}
-
-
-
- {{ i18n.ts.mutedUsers }} ({{ i18n.ts.renote }})
+
+
-
-
-
+
+
+ {{ i18n.ts.mutedUsers }} ({{ i18n.ts.renote }})
-
-
-
- {{ i18n.ts.dataSaver }}
+
-
-
-
- {{ i18n.ts.navbar }}
- {{ i18n.ts.statusbar }}
- {{ i18n.ts.deck }}
+
@@ -592,6 +604,7 @@ const nsfw = prefer.model('nsfw');
const emojiStyle = prefer.model('emojiStyle');
const useBlurEffectForModal = prefer.model('useBlurEffectForModal');
const useBlurEffect = prefer.model('useBlurEffect');
+const defaultFollowWithReplies = prefer.model('defaultFollowWithReplies');
watch(lang, () => {
miLocalStorage.setItem('lang', lang.value as string);
diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts
index 6a926c4b26..eb3d6eeac4 100644
--- a/packages/frontend/src/preferences/def.ts
+++ b/packages/frontend/src/preferences/def.ts
@@ -306,6 +306,9 @@ export const PREF_DEF = {
confirmOnReact: {
default: false,
},
+ defaultFollowWithReplies: {
+ default: false,
+ },
plugins: {
default: [] as Plugin[],
},
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 6eebcd1ead..9a61e63d0e 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -100,10 +100,6 @@ export const store = markRaw(new Storage('base', {
where: 'device',
default: {} as Record
+
+
+
+ {{ i18n.ts.wordMute }}
-
- {{ i18n.ts.showMutedWord }}
-
+
-
+
+ {{ i18n.ts.showMutedWord }}
+
-
-
-
- {{ i18n.ts.hardWordMute }}
+
+
+
-
+ {{ i18n.ts.wordMuteDescription }}
-
-
- {{ i18n.ts.hardWordMuteDescription }}
-
-
-
+
+ {{ i18n.ts.hardWordMuteDescription }}
+
+
- ![]()
-
-
+ {{ i18n.ts.noUsers }}
-
-
-
-
-
-
- {{ i18n.ts.mutedUsers }}
+
+
+
+ {{ i18n.ts.mutedUsers }}
-
-
-
+
+
@@ -477,43 +518,14 @@ SPDX-License-Identifier: AGPL-3.0-only
+
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
- Muted at:
+
+ ![]()
+
+
+
+
+ {{ i18n.ts.noUsers }}
+
+
-
+
+
+
+
+
+
+
+
Muted at:
+
- ![]()
-
-
+ {{ i18n.ts.noUsers }}
-
+ ![]()
+
+
-
- {{ i18n.ts.noUsers }}
+
- {{ i18n.ts.sendErrorReports }}{{ i18n.ts.sendErrorReportsDescription }}
-->
-
-
+
+ {{ i18n.ts.dataSaver }}
+
+
+
+
{{ i18n.ts.other }}
@@ -422,6 +455,14 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
+
+
+ {{ i18n.ts.withRepliesByDefaultForNewlyFollowed }}
+
+
+
-
-
-
- {{ i18n.ts.blockedUsers }}
+
+
+
+ {{ i18n.ts.blockedUsers }}
-
-
-
+
+
@@ -188,6 +194,7 @@ import MkFolder from '@/components/MkFolder.vue';
import MkSwitch from '@/components/MkSwitch.vue';
import { reloadAsk } from '@/utility/reload-ask.js';
import { prefer } from '@/preferences.js';
+import MkFeatureBanner from '@/components/MkFeatureBanner.vue';
const $i = signinRequired();
diff --git a/packages/frontend/src/pages/settings/notifications.vue b/packages/frontend/src/pages/settings/notifications.vue
index ca0de0b4b1..49910cdf4a 100644
--- a/packages/frontend/src/pages/settings/notifications.vue
+++ b/packages/frontend/src/pages/settings/notifications.vue
@@ -5,6 +5,10 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
+
+
+ {{ i18n.ts.dataSaver }}
+
+
+
+
+ {{ i18n.ts.navbar }}
+ {{ i18n.ts.statusbar }}
+ {{ i18n.ts.deck }}
+ {{ i18n.ts.customCss }}
@@ -366,6 +521,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
diff --git a/packages/frontend/src/router/definition.ts b/packages/frontend/src/router/definition.ts
index 62b13d22be..73920766d7 100644
--- a/packages/frontend/src/router/definition.ts
+++ b/packages/frontend/src/router/definition.ts
@@ -57,10 +57,6 @@ const routes: RouteDef[] = [{
path: '/avatar-decoration',
name: 'avatarDecoration',
component: page(() => import('@/pages/settings/avatar-decoration.vue')),
- }, {
- path: '/roles',
- name: 'roles',
- component: page(() => import('@/pages/settings/roles.vue')),
}, {
path: '/privacy',
name: 'privacy',
diff --git a/packages/frontend/src/utility/autogen/settings-search-index.ts b/packages/frontend/src/utility/autogen/settings-search-index.ts
index 734dc0c99c..e44910e850 100644
--- a/packages/frontend/src/utility/autogen/settings-search-index.ts
+++ b/packages/frontend/src/utility/autogen/settings-search-index.ts
@@ -271,55 +271,55 @@ export const searchIndexes: SearchIndexItem[] = [
id: '3yCAv0IsZ',
children: [
{
- id: 'kMJ5laK3n',
+ id: 'AKvDrxSj5',
children: [
{
- id: 'EC8J177N8',
+ id: 'cAszhShB0',
label: i18n.ts.uiLanguage,
keywords: ['language'],
},
{
- id: 'CHKy9gnrh',
+ id: 'apz9AutPm',
label: i18n.ts.overridedDeviceKind,
keywords: ['device', 'type', 'kind', 'smartphone', 'tablet', 'desktop'],
},
{
- id: 'snyCQ5oKE',
+ id: 'nqRVtw1xw',
label: i18n.ts.useBlurEffect,
keywords: ['blur'],
},
{
- id: '8j36S4Ev6',
+ id: 'EO5WHBeG8',
label: i18n.ts.useBlurEffectForModal,
keywords: ['blur', 'modal'],
},
{
- id: 'cytWLyF1V',
+ id: 'CWpyT9vLK',
label: i18n.ts.showAvatarDecorations,
keywords: ['avatar', 'icon', 'decoration', 'show'],
},
{
- id: 'odi1d2SWy',
+ id: '1wwACqQz1',
label: i18n.ts.alwaysConfirmFollow,
keywords: ['follow', 'confirm', 'always'],
},
{
- id: 'm43Eu3Ypg',
+ id: '1x3JNXj8N',
label: i18n.ts.highlightSensitiveMedia,
keywords: ['highlight', 'sensitive', 'nsfw', 'image', 'photo', 'picture', 'media', 'thumbnail'],
},
{
- id: 'cjfAtxMzP',
+ id: 'CfAg0Qekq',
label: i18n.ts.confirmWhenRevealingSensitiveMedia,
keywords: ['sensitive', 'nsfw', 'media', 'image', 'photo', 'picture', 'attachment', 'confirm'],
},
{
- id: 'aefexW9fD',
+ id: '4LxdiOMNh',
label: i18n.ts.emojiStyle,
keywords: ['emoji', 'style', 'native', 'system', 'fluent', 'twemoji'],
},
{
- id: 'p7aiLj6A0',
+ id: '67knC3FWp',
label: i18n.ts.pinnedList,
keywords: ['pinned', 'list'],
},
@@ -328,35 +328,35 @@ export const searchIndexes: SearchIndexItem[] = [
keywords: ['general'],
},
{
- id: 'khT3n6byY',
+ id: 'hDdVkBFJP',
children: [
{
- id: 'DftdlLbNu',
+ id: 'igFN7RIUa',
label: i18n.ts.showFixedPostForm,
keywords: ['post', 'form', 'timeline'],
},
{
- id: 'FbhoeuRAD',
+ id: '9uxocbLO0',
label: i18n.ts.showFixedPostFormInChannel,
keywords: ['post', 'form', 'timeline', 'channel'],
},
{
- id: 'rq69GTeB4',
+ id: 'eaT1O1Fao',
label: i18n.ts.collapseRenotes,
keywords: ['renote', i18n.ts.collapseRenotesDescription],
},
{
- id: 'omxZk3eET',
+ id: 'jC7LtTnmc',
label: i18n.ts.showGapBetweenNotesInTimeline,
keywords: ['note', 'timeline', 'gap'],
},
{
- id: 'epvi2Nv2G',
+ id: 'p2wlrnwLo',
label: i18n.ts.enableInfiniteScroll,
keywords: ['load', 'auto', 'more'],
},
{
- id: 'v26JSj9mH',
+ id: 'eqMBMY6LU',
label: i18n.ts.disableStreamingTimeline,
keywords: ['disable', 'streaming', 'timeline'],
},
@@ -365,65 +365,65 @@ export const searchIndexes: SearchIndexItem[] = [
keywords: ['timeline'],
},
{
- id: '7Uf8ksn3q',
+ id: '2LNjwv1cr',
children: [
{
- id: 'tLGyaQagB',
+ id: '6ylW3eIcD',
label: i18n.ts.showNoteActionsOnlyHover,
keywords: ['hover', 'show', 'footer', 'action'],
},
{
- id: '7W6g8Dcqz',
+ id: 'lBbtAg0Hm',
label: i18n.ts.showClipButtonInNoteFooter,
keywords: ['footer', 'action', 'clip', 'show'],
},
{
- id: 'uAOoH3LFF',
+ id: 'E9whefUtX',
label: i18n.ts.enableAdvancedMfm,
keywords: ['mfm', 'enable', 'show', 'advanced'],
},
{
- id: 'eCiyZLC8n',
+ id: 'iQaBbJBva',
label: i18n.ts.showReactionsCount,
keywords: ['reaction', 'count', 'show'],
},
{
- id: '68u9uRmFP',
+ id: 'hgEVGgJa1',
label: i18n.ts.confirmOnReact,
keywords: ['reaction', 'confirm'],
},
{
- id: 'rHWm4sXIe',
+ id: 'yxehrHZ6x',
label: i18n.ts.loadRawImages,
keywords: ['image', 'photo', 'picture', 'media', 'thumbnail', 'quality', 'raw', 'attachment'],
},
{
- id: '9L2XGJw7e',
+ id: 'DdoFLaSG8',
label: i18n.ts.useReactionPickerForContextMenu,
keywords: ['reaction', 'picker', 'contextmenu', 'open'],
},
{
- id: 'uIMCIK7kG',
+ id: 'fyod6U3QX',
label: i18n.ts.reactionsDisplaySize,
keywords: ['reaction', 'size', 'scale', 'display'],
},
{
- id: 'uMckjO9bz',
+ id: 'kmdsnVIQX',
label: i18n.ts.limitWidthOfReaction,
keywords: ['reaction', 'size', 'scale', 'display', 'width', 'limit'],
},
{
- id: 'yeghU4qiH',
+ id: 'hacQ9br20',
label: i18n.ts.mediaListWithOneImageAppearance,
keywords: ['attachment', 'image', 'photo', 'picture', 'media', 'thumbnail', 'list', 'size', 'height'],
},
{
- id: 'yYSOPoAKE',
+ id: 'vE7KeV4U4',
label: i18n.ts.instanceTicker,
keywords: ['ticker', 'information', 'label', 'instance', 'server', 'host', 'federation'],
},
{
- id: 'iOHiIu32L',
+ id: '3reoOxO26',
label: i18n.ts.displayOfSensitiveMedia,
keywords: ['attachment', 'image', 'photo', 'picture', 'media', 'thumbnail', 'nsfw', 'sensitive', 'display', 'show', 'hide', 'visibility'],
},
@@ -432,25 +432,25 @@ export const searchIndexes: SearchIndexItem[] = [
keywords: ['note'],
},
{
- id: 'zrJicawH9',
+ id: 'eROFRMtXv',
children: [
{
- id: 'iuEuPe6pa',
+ id: 'bezWaWd6M',
label: i18n.ts.keepCw,
keywords: ['remember', 'keep', 'note', 'cw'],
},
{
- id: '9WrGgANqN',
+ id: '90ngq28Nx',
label: i18n.ts.rememberNoteVisibility,
keywords: ['remember', 'keep', 'note', 'visibility'],
},
{
- id: 'Cu7ErCM7C',
+ id: 'ERGQVw6ml',
label: i18n.ts.enableQuickAddMfmFunction,
keywords: ['mfm', 'enable', 'show', 'advanced', 'picker', 'form', 'function', 'fn'],
},
{
- id: 'oQl8xwiyI',
+ id: 'g0otcvWv3',
label: i18n.ts.defaultNoteVisibility,
keywords: ['default', 'note', 'visibility'],
},
@@ -459,20 +459,20 @@ export const searchIndexes: SearchIndexItem[] = [
keywords: ['post', 'form'],
},
{
- id: 'xFmAg2tDe',
+ id: 'AWLIP02IT',
children: [
{
- id: 'mepqKL5Ow',
+ id: 'rDLJRu99',
label: i18n.ts.useGroupedNotifications,
keywords: ['group'],
},
{
- id: 'wUuUOEO1g',
+ id: '70WDijfPH',
label: i18n.ts.position,
keywords: ['position'],
},
{
- id: '27em8eC8R',
+ id: 'xKUzsSrKy',
label: i18n.ts.stackAxis,
keywords: ['stack', 'axis', 'direction'],
},
@@ -481,45 +481,45 @@ export const searchIndexes: SearchIndexItem[] = [
keywords: ['notification'],
},
{
- id: 'AzymHsnrp',
+ id: '2E7vdIUQd',
children: [
{
- id: 'DFUrEO2DI',
+ id: 'C2iXtZKb3',
label: i18n.ts.squareAvatars,
keywords: ['avatar', 'icon', 'square'],
},
{
- id: 'r9DX60AxL',
+ id: 'DCfJg0bva',
label: i18n.ts.seasonalScreenEffect,
keywords: ['effect', 'show'],
},
{
- id: 'sJ3fqncSD',
+ id: 'AV0iGW0vg',
label: i18n.ts.openImageInNewTab,
keywords: ['image', 'photo', 'picture', 'media', 'thumbnail', 'new', 'tab'],
},
{
- id: 'p7s0hwZ8A',
+ id: '5h8vhCX1S',
label: i18n.ts.whenServerDisconnected,
keywords: ['server', 'disconnect', 'reconnect', 'reload', 'streaming'],
},
{
- id: 'yCleENWNf',
+ id: 'zZxyXHk3A',
label: i18n.ts.numberOfPageCache,
keywords: ['cache', 'page'],
},
{
- id: 'omEy5Q3Ev',
+ id: '7ix3kvMyU',
label: i18n.ts.forceShowAds,
keywords: ['ad', 'show'],
},
{
- id: 'aWitQSBtD',
+ id: '6RxgjmMLN',
label: i18n.ts.hemisphere,
keywords: [],
},
{
- id: 'hUQAXl1H4',
+ id: '5iMpm5rES',
label: i18n.ts.additionalEmojiDictionary,
keywords: ['emoji', 'dictionary', 'additional', 'extra'],
},
@@ -528,7 +528,7 @@ export const searchIndexes: SearchIndexItem[] = [
keywords: ['other'],
},
{
- id: 'aSbKFHbOy',
+ id: 'fnR7PRww5',
label: i18n.ts.dataSaver,
keywords: ['datasaver'],
},
@@ -550,26 +550,31 @@ export const searchIndexes: SearchIndexItem[] = [
children: [
{
id: 'msAcN6u3S',
- label: i18n.ts.accountInfo,
+ label: i18n.ts._role.policies,
keywords: ['account', 'info'],
},
{
- id: 'ts8DgdnZV',
+ id: 'pbTLsgRO7',
+ label: i18n.ts.rolesAssignedToMe,
+ keywords: ['roles'],
+ },
+ {
+ id: 'fQpvZyfLK',
label: i18n.ts.accountMigration,
keywords: ['account', 'move', 'migration'],
},
{
- id: '4BG7nBECm',
+ id: 'xhfur5m2z',
label: i18n.ts.closeAccount,
keywords: ['account', 'close', 'delete', i18n.ts._accountDelete.requestAccountDelete],
},
{
- id: '2qI6ruPgi',
+ id: 'oAXB8zm2U',
label: i18n.ts.experimentalFeatures,
keywords: ['experimental', 'feature', 'flags'],
},
{
- id: 'cIeaax47o',
+ id: '95OjjGSo7',
label: i18n.ts.developer,
keywords: ['developer', 'mode', 'debug'],
},
From 44073736debda0210b77a53d0f61a68783d28e7c Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Thu, 13 Mar 2025 19:44:23 +0900
Subject: [PATCH 117/348] enhance(frontend): improve preferences
---
packages/frontend/src/boot/main-boot.ts | 1 +
.../src/components/MkFollowButton.vue | 5 +-
.../src/pages/settings/account-data.vue | 4 +-
.../frontend/src/pages/settings/other.vue | 180 ++++++++----------
.../src/pages/settings/preferences.vue | 83 ++++----
packages/frontend/src/preferences/def.ts | 3 +
packages/frontend/src/store.ts | 8 +-
packages/frontend/src/style.scss | 2 +-
.../utility/autogen/settings-search-index.ts | 43 +++--
9 files changed, 164 insertions(+), 165 deletions(-)
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index 0ad333b203..be72eeb9e1 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -191,6 +191,7 @@ export async function mainBoot() {
prefer.commit('skipNoteRender', store.s.skipNoteRender);
prefer.commit('showSoftWordMutedWord', store.s.showSoftWordMutedWord);
prefer.commit('confirmOnReact', store.s.confirmOnReact);
+ prefer.commit('defaultFollowWithReplies', store.s.defaultWithReplies);
prefer.commit('sound.masterVolume', store.s.sound_masterVolume);
prefer.commit('sound.notUseSound', store.s.sound_notUseSound);
prefer.commit('sound.useSoundOnlyWhenActive', store.s.sound_useSoundOnlyWhenActive);
diff --git a/packages/frontend/src/components/MkFollowButton.vue b/packages/frontend/src/components/MkFollowButton.vue
index 3d5d0ec5ab..a063854520 100644
--- a/packages/frontend/src/components/MkFollowButton.vue
+++ b/packages/frontend/src/components/MkFollowButton.vue
@@ -45,7 +45,6 @@ import { i18n } from '@/i18n.js';
import { claimAchievement } from '@/utility/achievements.js';
import { pleaseLogin } from '@/utility/please-login.js';
import { $i } from '@/account.js';
-import { store } from '@/store.js';
import { prefer } from '@/preferences.js';
const props = withDefaults(defineProps<{
@@ -121,11 +120,11 @@ async function onClick() {
} else {
await misskeyApi('following/create', {
userId: props.user.id,
- withReplies: store.s.defaultWithReplies,
+ withReplies: prefer.s.defaultFollowWithReplies,
});
emit('update:user', {
...props.user,
- withReplies: store.s.defaultWithReplies,
+ withReplies: prefer.s.defaultFollowWithReplies,
});
hasPendingFollowRequestFromYou.value = true;
diff --git a/packages/frontend/src/pages/settings/account-data.vue b/packages/frontend/src/pages/settings/account-data.vue
index 7e7036a8dc..ed5fe48821 100644
--- a/packages/frontend/src/pages/settings/account-data.vue
+++ b/packages/frontend/src/pages/settings/account-data.vue
@@ -168,12 +168,12 @@ import { selectFile } from '@/utility/select-file.js';
import { i18n } from '@/i18n.js';
import { definePage } from '@/page.js';
import { $i } from '@/account.js';
-import { store } from '@/store.js';
import MkFeatureBanner from '@/components/MkFeatureBanner.vue';
+import { prefer } from '@/preferences.js';
const excludeMutingUsers = ref(false);
const excludeInactiveUsers = ref(false);
-const withReplies = ref(store.s.defaultWithReplies);
+const withReplies = ref(prefer.s.defaultFollowWithReplies);
const onExportSuccess = () => {
os.alert({
diff --git a/packages/frontend/src/pages/settings/other.vue b/packages/frontend/src/pages/settings/other.vue
index b60db78071..62b0f5c941 100644
--- a/packages/frontend/src/pages/settings/other.vue
+++ b/packages/frontend/src/pages/settings/other.vue
@@ -16,112 +16,102 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
- Muted at:
- Period: {{ new Date(item.expiresAt).toLocaleString() }}
- Period: {{ i18n.ts.indefinitely }}
+
+
+
-
+
+
+
+
+
+
+
+
Muted at:
+ Period: {{ new Date(item.expiresAt).toLocaleString() }}
+ Period: {{ i18n.ts.indefinitely }}
+
- ![]()
-
-
+ {{ i18n.ts.noUsers }}
-
+ ![]()
+
+
-
- {{ i18n.ts.noUsers }}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ Blocked at:
- Period: {{ new Date(item.expiresAt).toLocaleString() }}
- Period: {{ i18n.ts.indefinitely }}
+
+
+
-
+
+
+
+
+
+
+
+
Blocked at:
+ Period: {{ new Date(item.expiresAt).toLocaleString() }}
+ Period: {{ i18n.ts.indefinitely }}
+
+
+ {{ i18n.ts._settings.notificationsBanner }}
+
+
{{ i18n.ts.notificationRecieveConfig }}
-
-
-
-
diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue
index debcd4bd3e..3b7c44fbfe 100644
--- a/packages/frontend/src/pages/settings/index.vue
+++ b/packages/frontend/src/pages/settings/index.vue
@@ -118,11 +118,6 @@ const menuDef = computed(() => [{
text: i18n.ts.emojiPalette,
to: '/settings/emoji-palette',
active: currentPage.value?.route.name === 'emoji-palette',
- }, {
- icon: 'ti ti-device-desktop',
- text: i18n.ts.appearance,
- to: '/settings/appearance',
- active: currentPage.value?.route.name === 'appearance',
}, {
icon: 'ti ti-music',
text: i18n.ts.sounds,
diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue
index 374477c510..b9a596067c 100644
--- a/packages/frontend/src/pages/settings/preferences.vue
+++ b/packages/frontend/src/pages/settings/preferences.vue
@@ -10,121 +10,174 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._settings.preferencesBanner }}
-
-
- {{ i18n.ts.uiLanguage }}
-
-
-
-
- Crowdin
-
-
-
-
-
-
-
-
- {{ i18n.ts.overridedDeviceKind }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ i18n.ts.note }}
+
+
+ {{ i18n.ts.general }}
+
+
+
+
+ {{ i18n.ts.timeline }}
+
+
+
+
+
+
+ {{ i18n.ts.note }}
+
+
-
-
-
-
- {{ i18n.ts.notifications }}
-
-
-
-
-
-
- {{ i18n.ts.behavior }}
-
-
+
+
+ {{ i18n.ts.postForm }}
+
+
+
+
+
+
+ {{ i18n.ts.notifications }}
+
+
+
+
+
+
+ {{ i18n.ts.other }}
+
+
-
-
-
-
- {{ i18n.ts.other }}
-
-
@@ -347,18 +473,47 @@ SPDX-License-Identifier: AGPL-3.0-only
-
- {{ i18n.ts.navbar }}
- {{ i18n.ts.statusbar }}
-
+
@@ -63,6 +67,7 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/router/definition.ts b/packages/frontend/src/router/definition.ts
index 7e0efa2e89..93dd081127 100644
--- a/packages/frontend/src/router/definition.ts
+++ b/packages/frontend/src/router/definition.ts
@@ -134,33 +134,29 @@ const routes: RouteDef[] = [{
name: 'plugin',
component: page(() => import('@/pages/settings/plugin.vue')),
}, {
- path: '/import-export',
- name: 'import-export',
- component: page(() => import('@/pages/settings/import-export.vue')),
+ path: '/account-data',
+ name: 'account-data',
+ component: page(() => import('@/pages/settings/account-data.vue')),
}, {
path: '/mute-block',
name: 'mute-block',
component: page(() => import('@/pages/settings/mute-block.vue')),
}, {
- path: '/api',
- name: 'api',
- component: page(() => import('@/pages/settings/api.vue')),
+ path: '/connect',
+ name: 'connect',
+ component: page(() => import('@/pages/settings/connect.vue')),
}, {
path: '/apps',
- name: 'api',
+ name: 'connect',
component: page(() => import('@/pages/settings/apps.vue')),
}, {
path: '/webhook/edit/:webhookId',
- name: 'webhook',
+ name: 'connect',
component: page(() => import('@/pages/settings/webhook.edit.vue')),
}, {
path: '/webhook/new',
- name: 'webhook',
+ name: 'connect',
component: page(() => import('@/pages/settings/webhook.new.vue')),
- }, {
- path: '/webhook',
- name: 'webhook',
- component: page(() => import('@/pages/settings/webhook.vue')),
}, {
path: '/deck',
name: 'deck',
diff --git a/packages/frontend/src/utility/autogen/settings-search-index.ts b/packages/frontend/src/utility/autogen/settings-search-index.ts
index db4459bf06..79310716e0 100644
--- a/packages/frontend/src/utility/autogen/settings-search-index.ts
+++ b/packages/frontend/src/utility/autogen/settings-search-index.ts
@@ -52,23 +52,23 @@ export const searchIndexes: SearchIndexItem[] = [
id: '6fFIRXUww',
children: [
{
- id: 'nO7NnzqiC',
+ id: 'EcwZE7dCl',
label: i18n.ts.notUseSound,
keywords: ['mute'],
},
{
- id: 'oALW4ja7U',
+ id: '9MxYVIf7k',
label: i18n.ts.useSoundOnlyWhenActive,
keywords: ['active', 'mute'],
},
{
- id: 'BbJK2SKT2',
+ id: '94afQxKat',
label: i18n.ts.masterVolume,
keywords: ['volume', 'master'],
},
],
label: i18n.ts.sounds,
- keywords: ['sounds'],
+ keywords: ['sounds', i18n.ts._settings.soundsBanner],
path: '/settings/sounds',
icon: 'ti ti-music',
},
@@ -76,10 +76,10 @@ export const searchIndexes: SearchIndexItem[] = [
id: '5BjnxMfYV',
children: [
{
- id: '3UqdSCaFw',
+ id: '75QPEg57v',
children: [
{
- id: '75QPEg57v',
+ id: 'CiHijRkGG',
label: i18n.ts.changePassword,
keywords: [],
},
@@ -111,7 +111,7 @@ export const searchIndexes: SearchIndexItem[] = [
},
],
label: i18n.ts.security,
- keywords: ['security'],
+ keywords: ['security', i18n.ts._settings.securityBanner],
path: '/settings/security',
icon: 'ti ti-lock',
},
@@ -195,65 +195,65 @@ export const searchIndexes: SearchIndexItem[] = [
id: '2rp9ka5Ht',
children: [
{
- id: 'qBUSKPxLW',
+ id: 'BhAQiHogN',
label: i18n.ts.makeFollowManuallyApprove,
keywords: ['follow', 'lock', i18n.ts.lockedAccountInfo],
},
{
- id: '3LZBlZCej',
+ id: '4DeWGsPaD',
label: i18n.ts.autoAcceptFollowed,
keywords: ['follow', 'auto', 'accept'],
},
{
- id: '9gOp28wKG',
+ id: 'iaM6zUmO9',
label: i18n.ts.makeReactionsPublic,
keywords: ['reaction', 'public', i18n.ts.makeReactionsPublicDescription],
},
{
- id: 'CjAkqMhct',
+ id: '5Q6uhghzV',
label: i18n.ts.followingVisibility,
keywords: ['following', 'visibility'],
},
{
- id: '4nEwI6LYt',
+ id: 'pZ9q65FX5',
label: i18n.ts.followersVisibility,
keywords: ['follower', 'visibility'],
},
{
- id: 'naMp37wTL',
+ id: 'DMS4yvAGg',
label: i18n.ts.hideOnlineStatus,
keywords: ['online', 'status', i18n.ts.hideOnlineStatusDescription],
},
{
- id: 'p0dCVR0UP',
+ id: '8rEsGuN8w',
label: i18n.ts.noCrawle,
keywords: ['crawle', 'index', 'search', i18n.ts.noCrawleDescription],
},
{
- id: 'aceURmNPq',
+ id: 's7LdSpiLn',
label: i18n.ts.preventAiLearning,
keywords: ['crawle', 'ai', i18n.ts.preventAiLearningDescription],
},
{
- id: 'ahABA0j7u',
+ id: 'l2Wf1s2ad',
label: i18n.ts.makeExplorable,
keywords: ['explore', i18n.ts.makeExplorableDescription],
},
{
- id: 'cyeDbLN8N',
+ id: '7vr04wKol',
children: [
{
- id: 'xEYlOghao',
+ id: 'Av7fAaHv8',
label: i18n.ts._accountSettings.requireSigninToViewContents,
keywords: ['login', 'signin'],
},
{
- id: 'sMmYFCS60',
+ id: 'lUtOQbnwi',
label: i18n.ts._accountSettings.makeNotesFollowersOnlyBefore,
keywords: ['follower', i18n.ts._accountSettings.makeNotesFollowersOnlyBeforeDescription],
},
{
- id: 'ebJ9IUbik',
+ id: '83WWcjwS9',
label: i18n.ts._accountSettings.makeNotesHiddenBefore,
keywords: ['hidden', i18n.ts._accountSettings.makeNotesHiddenBeforeDescription],
},
@@ -263,7 +263,7 @@ export const searchIndexes: SearchIndexItem[] = [
},
],
label: i18n.ts.privacy,
- keywords: ['privacy'],
+ keywords: ['privacy', i18n.ts._settings.privacyBanner],
path: '/settings/privacy',
icon: 'ti ti-lock-open',
},
@@ -271,75 +271,75 @@ export const searchIndexes: SearchIndexItem[] = [
id: '3yCAv0IsZ',
children: [
{
- id: 'x1GWSQnPw',
+ id: 'kMJ5laK3n',
label: i18n.ts.uiLanguage,
keywords: ['language'],
},
{
- id: 'EOSa4rtt3',
+ id: 'dlKebHH6k',
label: i18n.ts.overridedDeviceKind,
keywords: ['device', 'type', 'kind', 'smartphone', 'tablet', 'desktop'],
},
{
- id: 'm9LhX8BG8',
+ id: 'nxvMUir3T',
label: i18n.ts.showFixedPostForm,
keywords: ['post', 'form', 'timeline'],
},
{
- id: 'snyCQ5oKE',
+ id: '84MdeDWL1',
label: i18n.ts.showFixedPostFormInChannel,
keywords: ['post', 'form', 'timeline', 'channel'],
},
{
- id: '8j36S4Ev6',
+ id: 'dOig3ye4Z',
label: i18n.ts.pinnedList,
keywords: ['pinned', 'list'],
},
{
- id: 'CWpyT9vLK',
+ id: '4huRldNp5',
label: i18n.ts.enableQuickAddMfmFunction,
keywords: ['mfm', 'enable', 'show', 'advanced', 'picker', 'form', 'function', 'fn'],
},
{
- id: '1yhown1Xc',
+ id: '1x3JNXj8N',
label: i18n.ts.rememberNoteVisibility,
keywords: ['remember', 'keep', 'note', 'visibility'],
},
{
- id: 'wUeAI5QBV',
+ id: 'CfAg0Qekq',
label: i18n.ts.defaultNoteVisibility,
keywords: ['default', 'note', 'visibility'],
},
{
- id: '6kMj4HVOg',
+ id: 'tMm9kH9gy',
children: [
{
- id: 'DQIcvf64G',
+ id: 'hDdVkBFJP',
label: i18n.ts.collapseRenotes,
keywords: ['renote', i18n.ts.collapseRenotesDescription],
},
{
- id: 'igFN7RIUa',
+ id: 'uJJyDABGu',
label: i18n.ts.showNoteActionsOnlyHover,
keywords: ['hover', 'show', 'footer', 'action'],
},
{
- id: '9uxocbLO0',
+ id: 'ufc2X9voy',
label: i18n.ts.showClipButtonInNoteFooter,
keywords: ['footer', 'action', 'clip', 'show'],
},
{
- id: 'eaT1O1Fao',
+ id: '7Jwvu8bK6',
label: i18n.ts.enableAdvancedMfm,
keywords: ['mfm', 'enable', 'show', 'advanced'],
},
{
- id: 'omxZk3eET',
+ id: 'yb11lSY1G',
label: i18n.ts.showReactionsCount,
keywords: ['reaction', 'count', 'show'],
},
{
- id: 'epvi2Nv2G',
+ id: 'fL49Zxe9i',
label: i18n.ts.loadRawImages,
keywords: ['image', 'photo', 'picture', 'media', 'thumbnail', 'quality', 'raw', 'attachment'],
},
@@ -348,10 +348,10 @@ export const searchIndexes: SearchIndexItem[] = [
keywords: ['note'],
},
{
- id: 'jb3HUeyrx',
+ id: 'bUOs2UKY4',
children: [
{
- id: 'ykifk3NHS',
+ id: 'c8gA9Xj2a',
label: i18n.ts.useGroupedNotifications,
keywords: ['group'],
},
@@ -360,60 +360,60 @@ export const searchIndexes: SearchIndexItem[] = [
keywords: ['notification'],
},
{
- id: 'abEAdSpYY',
+ id: 'tjGzqy3qa',
children: [
{
- id: 'lBbtAg0Hm',
+ id: '3OeHscv45',
label: i18n.ts.openImageInNewTab,
keywords: ['image', 'photo', 'picture', 'media', 'thumbnail', 'new', 'tab'],
},
{
- id: 'E9whefUtX',
+ id: 'bFsNusspF',
label: i18n.ts.useReactionPickerForContextMenu,
keywords: ['reaction', 'picker', 'contextmenu', 'open'],
},
{
- id: 'iQaBbJBva',
+ id: '2h3rY1izt',
label: i18n.ts.enableInfiniteScroll,
keywords: ['load', 'auto', 'more'],
},
{
- id: 'hgEVGgJa1',
+ id: 'pkK3eeFKm',
label: i18n.ts.disableStreamingTimeline,
keywords: ['disable', 'streaming', 'timeline'],
},
{
- id: 'yxehrHZ6x',
+ id: 'y2v7CV9zs',
label: i18n.ts.alwaysConfirmFollow,
keywords: ['follow', 'confirm', 'always'],
},
{
- id: 'DdoFLaSG8',
+ id: 'A8a5hcLce',
label: i18n.ts.confirmWhenRevealingSensitiveMedia,
keywords: ['sensitive', 'nsfw', 'media', 'image', 'photo', 'picture', 'attachment', 'confirm'],
},
{
- id: 'uIMCIK7kG',
+ id: 'utFrfuW7X',
label: i18n.ts.confirmOnReact,
keywords: ['reaction', 'confirm'],
},
{
- id: 'zvM13vl26',
+ id: 'kmdsnVIQX',
label: i18n.ts.keepCw,
keywords: ['remember', 'keep', 'note', 'cw'],
},
{
- id: 'm75VEWI3S',
+ id: 'mNRK0pt8L',
label: i18n.ts.whenServerDisconnected,
keywords: ['server', 'disconnect', 'reconnect', 'reload', 'streaming'],
},
{
- id: 'bLO9vCyKW',
+ id: 'vE7KeV4U4',
label: i18n.ts.numberOfPageCache,
keywords: ['cache', 'page'],
},
{
- id: 'iQ7Er89l5',
+ id: 'eJ2jme16W',
label: i18n.ts.dataSaver,
keywords: ['datasaver'],
},
@@ -422,20 +422,20 @@ export const searchIndexes: SearchIndexItem[] = [
keywords: ['behavior'],
},
{
- id: 'C2WYcVM1d',
+ id: 'F3kpUNvSQ',
children: [
{
- id: 'Cu7ErCM7C',
+ id: '4bfFRM0UD',
label: i18n.ts.forceShowAds,
keywords: ['ad', 'show'],
},
{
- id: 'BBxwy4F6E',
+ id: '2pB0jWBHo',
label: i18n.ts.hemisphere,
keywords: [],
},
{
- id: '9YdUwDC8d',
+ id: 'eIvnR6Xxo',
label: i18n.ts.additionalEmojiDictionary,
keywords: ['emoji', 'dictionary', 'additional', 'extra'],
},
@@ -445,14 +445,14 @@ export const searchIndexes: SearchIndexItem[] = [
},
],
label: i18n.ts.preferences,
- keywords: ['general', 'preferences'],
+ keywords: ['general', 'preferences', i18n.ts._settings.preferencesBanner],
path: '/settings/preferences',
icon: 'ti ti-adjustments',
},
{
id: 'mwkwtw83Y',
label: i18n.ts.plugins,
- keywords: ['plugin'],
+ keywords: ['plugin', 'addon', 'extension', i18n.ts._settings.pluginBanner],
path: '/settings/plugin',
icon: 'ti ti-plug',
},
@@ -494,10 +494,10 @@ export const searchIndexes: SearchIndexItem[] = [
id: '3icEvyv2D',
children: [
{
- id: 'Tyt3gZTy',
+ id: 'lO3uFTkPN',
children: [
{
- id: '9b7ZURyAt',
+ id: '5JKaXRqyt',
label: i18n.ts.showMutedWord,
keywords: ['show'],
},
@@ -506,85 +506,36 @@ export const searchIndexes: SearchIndexItem[] = [
keywords: ['note', 'word', 'soft', 'mute', 'hide'],
},
{
- id: 'kdMk41II0',
+ id: 'fMkjL3dK4',
label: i18n.ts.hardWordMute,
keywords: ['note', 'word', 'hard', 'mute', 'hide'],
},
{
- id: 'mjORQamAK',
+ id: 'cimSzQXN0',
label: i18n.ts.instanceMute,
keywords: ['note', 'server', 'instance', 'host', 'federation', 'mute', 'hide'],
},
{
- id: '1ZT7S9FZd',
+ id: 'gq8rPy3Du',
label: `${i18n.ts.mutedUsers} (${ i18n.ts.renote })`,
keywords: ['renote', 'mute', 'hide', 'user'],
},
{
- id: 'ANrPit3kQ',
+ id: 'mh2r7EUbF',
label: i18n.ts.mutedUsers,
keywords: ['note', 'mute', 'hide', 'user'],
},
{
- id: 'bPAE4lfno',
+ id: 'AUS1OgHrn',
label: i18n.ts.blockedUsers,
keywords: ['block', 'user'],
},
],
label: i18n.ts.muteAndBlock,
- keywords: ['mute', 'block'],
+ keywords: ['mute', 'block', i18n.ts._settings.muteAndBlockBanner],
path: '/settings/mute-block',
icon: 'ti ti-ban',
},
- {
- id: 'qE2vLlMkF',
- children: [
- {
- id: 'hPPEzjvZC',
- label: i18n.ts._exportOrImport.allNotes,
- keywords: ['notes'],
- },
- {
- id: 'AFaeHsCUB',
- label: i18n.ts._exportOrImport.favoritedNotes,
- keywords: ['favorite', 'notes'],
- },
- {
- id: 'xyCPmQiRo',
- label: i18n.ts._exportOrImport.clips,
- keywords: ['clip', 'notes'],
- },
- {
- id: 'Ch7hWAGUy',
- label: i18n.ts._exportOrImport.followingList,
- keywords: ['following', 'users'],
- },
- {
- id: 'AwPgFboEx',
- label: i18n.ts._exportOrImport.userLists,
- keywords: ['user', 'lists'],
- },
- {
- id: 'nporiHshC',
- label: i18n.ts._exportOrImport.muteList,
- keywords: ['mute', 'users'],
- },
- {
- id: 'BsCzR7vNw',
- label: i18n.ts._exportOrImport.blockingList,
- keywords: ['block', 'users'],
- },
- {
- id: 'dvf4IgYrQ',
- label: i18n.ts.antennas,
- keywords: ['antennas'],
- },
- ],
- label: i18n.ts.importAndExport,
- keywords: ['import', 'export', 'data'],
- path: '/settings/import-export',
- icon: 'ti ti-package',
- },
{
id: '3Tcxw4Fwl',
children: [
@@ -613,46 +564,65 @@ export const searchIndexes: SearchIndexItem[] = [
id: 'tnYoppRiv',
children: [
{
- id: 'ncIq6TAR2',
+ id: 'cN3dsGNxu',
label: i18n.ts.usageAmount,
keywords: ['capacity', 'usage'],
},
{
- id: '2c4CQSvSr',
+ id: 'rOAOU2P6C',
label: i18n.ts.statistics,
keywords: ['statistics', 'usage'],
},
{
- id: 'pepHELHMt',
+ id: 'uXGlQXATx',
label: i18n.ts.uploadFolder,
keywords: ['default', 'upload', 'folder'],
},
{
- id: 'xqOWrABxV',
+ id: 'goQdtf3dD',
label: i18n.ts.keepOriginalUploading,
keywords: ['keep', 'original', 'raw', 'upload', i18n.ts.keepOriginalUploadingDescription],
},
{
- id: 'D8HUTGWE1',
+ id: '83xRo0XJl',
label: i18n.ts.keepOriginalFilename,
keywords: ['keep', 'original', 'filename', i18n.ts.keepOriginalFilenameDescription],
},
{
- id: '6xAvsWSZi',
+ id: 'wf77yRQQq',
label: i18n.ts.alwaysMarkSensitive,
keywords: ['always', 'default', 'mark', 'nsfw', 'sensitive', 'media', 'file'],
},
{
- id: 'csNNPF1KX',
+ id: '3pxwNB8e4',
label: i18n.ts.enableAutoSensitive,
keywords: ['auto', 'nsfw', 'sensitive', 'media', 'file', i18n.ts.enableAutoSensitiveDescription],
},
],
label: i18n.ts.drive,
- keywords: ['drive'],
+ keywords: ['drive', i18n.ts._settings.driveBanner],
path: '/settings/drive',
icon: 'ti ti-cloud',
},
+ {
+ id: 'BlJ2rsw9h',
+ children: [
+ {
+ id: '9bLU1nIjt',
+ label: i18n.ts._settings.api,
+ keywords: ['api', 'app', 'token', 'accessToken'],
+ },
+ {
+ id: '5VSGOVYR0',
+ label: i18n.ts.manage,
+ keywords: ['webhook'],
+ },
+ ],
+ label: i18n.ts._settings.serviceConnection,
+ keywords: ['app', 'service', 'connect', 'webhook', 'api', 'token', i18n.ts._settings.serviceConnectionBanner],
+ path: '/settings/connect',
+ icon: 'ti ti-link',
+ },
{
id: 'gtaOSdIJB',
label: i18n.ts.avatarDecorations,
@@ -664,85 +634,85 @@ export const searchIndexes: SearchIndexItem[] = [
id: 'AqPvMgn3A',
children: [
{
- id: 'j5gTtuMWP',
+ id: '1wtOIwAdm',
label: i18n.ts.useBlurEffect,
keywords: ['blur'],
},
{
- id: 'C05WQNSIJ',
+ id: '6fLNMTwNt',
label: i18n.ts.useBlurEffectForModal,
keywords: ['blur', 'modal'],
},
{
- id: 'snVKNr7Bw',
+ id: 'E0WXhhRB1',
label: i18n.ts.highlightSensitiveMedia,
keywords: ['highlight', 'sensitive', 'nsfw', 'image', 'photo', 'picture', 'media', 'thumbnail'],
},
{
- id: 'DsS2CwjYE',
+ id: '7iZsGkplG',
label: i18n.ts.squareAvatars,
keywords: ['avatar', 'icon', 'square'],
},
{
- id: 'xCcTDl651',
+ id: 'AfRMcC6IM',
label: i18n.ts.showAvatarDecorations,
keywords: ['avatar', 'icon', 'decoration', 'show'],
},
{
- id: '3dHw723VD',
+ id: 'i7aSaEWaT',
label: i18n.ts.showGapBetweenNotesInTimeline,
keywords: ['note', 'timeline', 'gap'],
},
{
- id: 'AWi72xbrl',
+ id: 'knj98Mx84',
label: i18n.ts.seasonalScreenEffect,
keywords: ['effect', 'show'],
},
{
- id: 'Ces8FsJws',
+ id: 'Bzg77rYNd',
label: i18n.ts.menuStyle,
keywords: ['menu', 'style', 'popup', 'drawer'],
},
{
- id: 'wDr9xSXCv',
+ id: '7AOZ1ZgDv',
label: i18n.ts.emojiStyle,
keywords: ['emoji', 'style', 'native', 'system', 'fluent', 'twemoji'],
},
{
- id: 'vFB0pLzck',
+ id: 'fDelHUrBi',
label: i18n.ts.fontSize,
keywords: ['font', 'size'],
},
{
- id: '23BhvYXPC',
+ id: 'siOW5aSwp',
label: i18n.ts.useSystemFont,
keywords: ['font', 'system', 'native'],
},
{
- id: 'EeNLndAOa',
+ id: 's05dHQ1dW',
children: [
{
- id: 'rAAPoaodS',
+ id: 'zoMbYCvP0',
label: i18n.ts.reactionsDisplaySize,
keywords: ['reaction', 'size', 'scale', 'display'],
},
{
- id: 'qTLAvNWsc',
+ id: 'lGFzLnWfB',
label: i18n.ts.limitWidthOfReaction,
keywords: ['reaction', 'size', 'scale', 'display', 'width', 'limit'],
},
{
- id: '2lWgzAm13',
+ id: '9E0v8VKIY',
label: i18n.ts.mediaListWithOneImageAppearance,
keywords: ['attachment', 'image', 'photo', 'picture', 'media', 'thumbnail', 'list', 'size', 'height'],
},
{
- id: 'EU7HbxOR5',
+ id: 'xB7MPEF4Q',
label: i18n.ts.instanceTicker,
keywords: ['ticker', 'information', 'label', 'instance', 'server', 'host', 'federation'],
},
{
- id: 'AEtM0FAp1',
+ id: '7siYCSodm',
label: i18n.ts.displayOfSensitiveMedia,
keywords: ['attachment', 'image', 'photo', 'picture', 'media', 'thumbnail', 'nsfw', 'sensitive', 'display', 'show', 'hide', 'visibility'],
},
@@ -751,15 +721,15 @@ export const searchIndexes: SearchIndexItem[] = [
keywords: ['note', 'display'],
},
{
- id: 'A1FMC2Zon',
+ id: 'uQfyiHMSs',
children: [
{
- id: 'CB37G5ZDo',
+ id: 'y3uTXsSQ6',
label: i18n.ts.position,
keywords: ['position'],
},
{
- id: 'gGS2i19hS',
+ id: 'PILAdkVM',
label: i18n.ts.stackAxis,
keywords: ['stack', 'axis', 'direction'],
},
@@ -769,51 +739,100 @@ export const searchIndexes: SearchIndexItem[] = [
},
],
label: i18n.ts.appearance,
- keywords: ['appearance'],
+ keywords: ['appearance', i18n.ts._settings.appearanceBanner],
path: '/settings/appearance',
icon: 'ti ti-device-desktop',
},
+ {
+ id: '330Q4mf8E',
+ children: [
+ {
+ id: 'eGSjUDIKu',
+ label: i18n.ts._exportOrImport.allNotes,
+ keywords: ['notes'],
+ },
+ {
+ id: 'iMDgUVgRu',
+ label: i18n.ts._exportOrImport.favoritedNotes,
+ keywords: ['favorite', 'notes'],
+ },
+ {
+ id: '3y6KgkVbT',
+ label: i18n.ts._exportOrImport.clips,
+ keywords: ['clip', 'notes'],
+ },
+ {
+ id: 'cKiHkj8HE',
+ label: i18n.ts._exportOrImport.followingList,
+ keywords: ['following', 'users'],
+ },
+ {
+ id: '3zzmQXn0t',
+ label: i18n.ts._exportOrImport.userLists,
+ keywords: ['user', 'lists'],
+ },
+ {
+ id: '3ZGXcEqWZ',
+ label: i18n.ts._exportOrImport.muteList,
+ keywords: ['mute', 'users'],
+ },
+ {
+ id: '84oL7B1Dr',
+ label: i18n.ts._exportOrImport.blockingList,
+ keywords: ['block', 'users'],
+ },
+ {
+ id: 'ckqi48Kbl',
+ label: i18n.ts.antennas,
+ keywords: ['antennas'],
+ },
+ ],
+ label: i18n.ts._settings.accountData,
+ keywords: ['import', 'export', 'data', i18n.ts._settings.accountDataBanner],
+ path: '/settings/account-data',
+ icon: 'ti ti-package',
+ },
{
id: 'f08Mi1Uwn',
children: [
{
- id: '7ov7ceoij',
+ id: 'C5dRH2Ypy',
label: i18n.ts.reduceUiAnimation,
keywords: ['animation', 'motion', 'reduce'],
},
{
- id: 'cXr3tFdpa',
+ id: '5mZxz2cru',
label: i18n.ts.disableShowingAnimatedImages,
keywords: ['disable', 'animation', 'image', 'photo', 'picture', 'media', 'thumbnail', 'gif'],
},
{
- id: 'Ok1UBwtP',
+ id: 'c0Iy5hL5o',
label: i18n.ts.enableAnimatedMfm,
keywords: ['mfm', 'enable', 'show', 'animated'],
},
{
- id: 'yPEpJigqY',
+ id: '4HYFjs2Nv',
label: i18n.ts.enableHorizontalSwipe,
keywords: ['swipe', 'horizontal', 'tab'],
},
{
- id: 'h7iZtdTU3',
+ id: 'kYVJ3SVNq',
label: i18n.ts.keepScreenOn,
keywords: ['keep', 'screen', 'display', 'on'],
},
{
- id: 'gP1BY3PDy',
+ id: 'w4Bv0meAt',
label: i18n.ts.useNativeUIForVideoAudioPlayer,
keywords: ['native', 'system', 'video', 'audio', 'player', 'media'],
},
{
- id: 'jnMK3M6rs',
+ id: '1fV9WINCQ',
label: i18n.ts._contextMenu.title,
keywords: ['contextmenu', 'system', 'native'],
},
],
label: i18n.ts.accessibility,
- keywords: ['accessibility'],
+ keywords: ['accessibility', i18n.ts._settings.accessibilityBanner],
path: '/settings/accessibility',
icon: 'ti ti-accessible',
},
From ddbc83b2e46de5c2931ea3ea421408b8182b25ba Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 11 Mar 2025 20:42:06 +0900
Subject: [PATCH 087/348] chore(frontend): tweak settings page
---
packages/frontend/src/pages/settings/index.vue | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue
index 26677a188f..7bbec82757 100644
--- a/packages/frontend/src/pages/settings/index.vue
+++ b/packages/frontend/src/pages/settings/index.vue
@@ -91,11 +91,6 @@ const menuDef = computed(() => [{
text: i18n.ts.emojiPicker,
to: '/settings/emoji-picker',
active: currentPage.value?.route.name === 'emojiPicker',
- }, {
- icon: 'ti ti-cloud',
- text: i18n.ts.drive,
- to: '/settings/drive',
- active: currentPage.value?.route.name === 'drive',
}, {
icon: 'ti ti-bell',
text: i18n.ts.notifications,
@@ -146,6 +141,11 @@ const menuDef = computed(() => [{
}],
}, {
items: [{
+ icon: 'ti ti-cloud',
+ text: i18n.ts.drive,
+ to: '/settings/drive',
+ active: currentPage.value?.route.name === 'drive',
+ }, {
icon: 'ti ti-badges',
text: i18n.ts.roles,
to: '/settings/roles',
From b03bcf26cd89183c86dea73dc8ef30ae68fe2eb2 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 12 Mar 2025 11:39:05 +0900
Subject: [PATCH 088/348] =?UTF-8?q?enhance(frontend):=20=E8=A8=AD=E5=AE=9A?=
=?UTF-8?q?=E5=80=A4=E3=81=AE=E5=90=8C=E6=9C=9F=E3=82=92=E5=AE=9F=E8=A3=85?=
=?UTF-8?q?(=E5=AE=9F=E9=A8=93=E7=9A=84)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 1 +
locales/index.d.ts | 24 ++
locales/ja-JP.yml | 6 +
.../src/components/MkPreferenceContainer.vue | 10 +-
packages/frontend/src/preferences.ts | 53 ++-
packages/frontend/src/preferences/def.ts | 1 +
packages/frontend/src/preferences/profile.ts | 321 ++++++++++++++----
packages/frontend/src/preferences/store.ts | 94 -----
packages/frontend/src/preferences/utility.ts | 20 +-
9 files changed, 343 insertions(+), 187 deletions(-)
delete mode 100644 packages/frontend/src/preferences/store.ts
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 748f3aa8eb..d02b37cbdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
### Client
- Feat: 設定の管理が強化されました
- 自動でバックアップされるように
+ - 任意の設定項目をデバイス間で同期できるように(実験的)
- Enhance: プラグインの管理が強化されました
- Enhance: CWの注釈テキストが入力されていない場合, Postボタンを非アクティブに
- Enhance: CWを無効にした場合, 注釈テキストが最大入力文字数を超えていても投稿できるように
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 409ad3835b..297b56e289 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -5310,6 +5310,30 @@ export interface Locale extends ILocale {
* 復元
*/
"restore": string;
+ /**
+ * デバイス間で同期
+ */
+ "syncBetweenDevices": string;
+ /**
+ * サーバーに設定値が存在します
+ */
+ "preferenceSyncConflictTitle": string;
+ /**
+ * 同期が有効にされた設定項目は設定値をサーバーに保存しますが、この設定項目のサーバーに保存された設定値が見つかりました。どちらの設定値で上書きしますか？
+ */
+ "preferenceSyncConflictText": string;
+ /**
+ * サーバーの設定値
+ */
+ "preferenceSyncConflictChoiceServer": string;
+ /**
+ * デバイスの設定値
+ */
+ "preferenceSyncConflictChoiceDevice": string;
+ /**
+ * 同期の有効化をキャンセル
+ */
+ "preferenceSyncConflictChoiceCancel": string;
"_settings": {
/**
* ドライブの管理と設定、使用量の確認、ファイルをアップロードする際の設定を行えます。
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 5d24282849..23aeb59863 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1323,6 +1323,12 @@ untitled: "無題"
noName: "名前はありません"
skip: "スキップ"
restore: "復元"
+syncBetweenDevices: "デバイス間で同期"
+preferenceSyncConflictTitle: "サーバーに設定値が存在します"
+preferenceSyncConflictText: "同期が有効にされた設定項目は設定値をサーバーに保存しますが、この設定項目のサーバーに保存された設定値が見つかりました。どちらの設定値で上書きしますか？"
+preferenceSyncConflictChoiceServer: "サーバーの設定値"
+preferenceSyncConflictChoiceDevice: "デバイスの設定値"
+preferenceSyncConflictChoiceCancel: "同期の有効化をキャンセル"
_settings:
driveBanner: "ドライブの管理と設定、使用量の確認、ファイルをアップロードする際の設定を行えます。"
diff --git a/packages/frontend/src/components/MkPreferenceContainer.vue b/packages/frontend/src/components/MkPreferenceContainer.vue
index 85fab462cd..7c9484a88c 100644
--- a/packages/frontend/src/components/MkPreferenceContainer.vue
+++ b/packages/frontend/src/components/MkPreferenceContainer.vue
@@ -9,6 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
+
+ {{ i18n.ts.menuStyle }}
+
+
+
+
+
+
+
@@ -70,6 +81,22 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
+
+ {{ i18n.ts.fontSize }}
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.useSystemFont }}
+
+
@@ -84,6 +111,8 @@ import { i18n } from '@/i18n.js';
import { definePage } from '@/page.js';
import MkPreferenceContainer from '@/components/MkPreferenceContainer.vue';
import MkFeatureBanner from '@/components/MkFeatureBanner.vue';
+import { miLocalStorage } from '@/local-storage.js';
+import MkRadios from '@/components/MkRadios.vue';
const reduceAnimation = prefer.model('animation', v => !v, v => !v);
const animatedMfm = prefer.model('animatedMfm');
@@ -92,10 +121,32 @@ const keepScreenOn = prefer.model('keepScreenOn');
const enableHorizontalSwipe = prefer.model('enableHorizontalSwipe');
const useNativeUiForVideoAudioPlayer = prefer.model('useNativeUiForVideoAudioPlayer');
const contextMenu = prefer.model('contextMenu');
+const menuStyle = prefer.model('menuStyle');
+
+const fontSize = ref(miLocalStorage.getItem('fontSize'));
+const useSystemFont = ref(miLocalStorage.getItem('useSystemFont') != null);
+
+watch(fontSize, () => {
+ if (fontSize.value == null) {
+ miLocalStorage.removeItem('fontSize');
+ } else {
+ miLocalStorage.setItem('fontSize', fontSize.value);
+ }
+});
+
+watch(useSystemFont, () => {
+ if (useSystemFont.value) {
+ miLocalStorage.setItem('useSystemFont', 't');
+ } else {
+ miLocalStorage.removeItem('useSystemFont');
+ }
+});
watch([
keepScreenOn,
contextMenu,
+ fontSize,
+ useSystemFont,
], async () => {
await reloadAsk({ reason: i18n.ts.reloadToApplySetting, unison: true });
});
diff --git a/packages/frontend/src/pages/settings/appearance.vue b/packages/frontend/src/pages/settings/appearance.vue
deleted file mode 100644
index 3fda5bc4c8..0000000000
--- a/packages/frontend/src/pages/settings/appearance.vue
+++ /dev/null
@@ -1,325 +0,0 @@
-
-
-
-
@@ -21,20 +22,21 @@ SPDX-License-Identifier: AGPL-3.0-only
import { ref } from 'vue';
import type { PREF_DEF } from '@/preferences/def.js';
import * as os from '@/os.js';
-import { profileManager } from '@/preferences.js';
+import { prefer } from '@/preferences.js';
const props = withDefaults(defineProps<{
k: keyof typeof PREF_DEF;
}>(), {
});
-const isAccountOverrided = ref(profileManager.isAccountOverrided(props.k));
+const isAccountOverrided = ref(prefer.isAccountOverrided(props.k));
+const isSyncEnabled = ref(prefer.isSyncEnabled(props.k));
function showMenu(ev: MouseEvent) {
const i = window.setInterval(() => {
- isAccountOverrided.value = profileManager.isAccountOverrided(props.k);
+ isAccountOverrided.value = prefer.isAccountOverrided(props.k);
}, 100);
- os.popupMenu(profileManager.getPerPrefMenu(props.k), ev.currentTarget ?? ev.target, {
+ os.popupMenu(prefer.getPerPrefMenu(props.k), ev.currentTarget ?? ev.target, {
onClosing: () => {
window.clearInterval(i);
},
diff --git a/packages/frontend/src/preferences.ts b/packages/frontend/src/preferences.ts
index a38f1a2a33..ab234a926a 100644
--- a/packages/frontend/src/preferences.ts
+++ b/packages/frontend/src/preferences.ts
@@ -4,16 +4,17 @@
*/
import { v4 as uuid } from 'uuid';
-import type { PreferencesProfile } from '@/preferences/profile.js';
+import type { PreferencesProfile, StorageProvider } from '@/preferences/profile.js';
import { cloudBackup } from '@/preferences/utility.js';
import { miLocalStorage } from '@/local-storage.js';
import { ProfileManager } from '@/preferences/profile.js';
import { store } from '@/store.js';
import { $i } from '@/account.js';
+import { misskeyApi } from '@/utility/misskey-api.js';
const TAB_ID = uuid();
-function createProfileManager() {
+function createProfileManager(storageProvider: StorageProvider) {
let profile: PreferencesProfile;
const savedProfileRaw = miLocalStorage.getItem('preferences');
@@ -24,15 +25,44 @@ function createProfileManager() {
profile = ProfileManager.normalizeProfile(JSON.parse(savedProfileRaw));
}
- return new ProfileManager(profile);
+ return new ProfileManager(profile, storageProvider);
}
-export const profileManager = createProfileManager();
-profileManager.addListener('updated', ({ profile: p }) => {
- miLocalStorage.setItem('preferences', JSON.stringify(p));
- miLocalStorage.setItem('latestPreferencesUpdate', `${TAB_ID}/${Date.now()}`);
-});
-export const prefer = profileManager.store;
+const storageProvider: StorageProvider = {
+ save: (ctx) => {
+ miLocalStorage.setItem('preferences', JSON.stringify(ctx.profile));
+ miLocalStorage.setItem('latestPreferencesUpdate', `${TAB_ID}/${Date.now()}`);
+ },
+ cloudGet: async (ctx) => {
+ // TODO: この取得方法だとアカウントが変わると保存場所も変わってしまうので改修する
+ // 例えば複数アカウントある場合でも設定値を保存するための「プライマリアカウント」を設定できるようにするとか
+ // TODO: keyのcondに応じた取得
+ try {
+ const value = await misskeyApi('i/registry/get', {
+ scope: ['client', 'preferences', 'sync'],
+ key: ctx.key,
+ });
+ return {
+ value,
+ };
+ } catch (err: any) {
+ if (err.code === 'NO_SUCH_KEY') {
+ return null;
+ } else {
+ throw err;
+ }
+ }
+ },
+ cloudSet: async (ctx) => {
+ await misskeyApi('i/registry/set', {
+ scope: ['client', 'preferences', 'sync'],
+ key: ctx.key,
+ value: ctx.value,
+ });
+ },
+};
+
+export const prefer = createProfileManager(storageProvider);
let latestSyncedAt = Date.now();
@@ -46,7 +76,7 @@ function syncBetweenTabs() {
if (latestTab === TAB_ID) return;
if (latestAt <= latestSyncedAt) return;
- profileManager.rewriteProfile(ProfileManager.normalizeProfile(JSON.parse(miLocalStorage.getItem('preferences')!)));
+ prefer.rewriteProfile(ProfileManager.normalizeProfile(JSON.parse(miLocalStorage.getItem('preferences')!)));
latestSyncedAt = Date.now();
@@ -67,7 +97,7 @@ window.setInterval(() => {
if ($i == null) return;
if (!store.s.enablePreferencesAutoCloudBackup) return;
if (document.visibilityState !== 'visible') return; // 同期されていない古い値がバックアップされるのを防ぐ
- if (profileManager.profile.modifiedAt <= latestBackupAt) return;
+ if (prefer.profile.modifiedAt <= latestBackupAt) return;
cloudBackup().then(() => {
latestBackupAt = Date.now();
@@ -75,7 +105,6 @@ window.setInterval(() => {
}, 1000 * 60 * 3);
if (_DEV_) {
- (window as any).profileManager = profileManager;
(window as any).prefer = prefer;
(window as any).cloudBackup = cloudBackup;
}
diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts
index 68e0b08f92..b75b99d6b5 100644
--- a/packages/frontend/src/preferences/def.ts
+++ b/packages/frontend/src/preferences/def.ts
@@ -327,4 +327,5 @@ export const PREF_DEF = {
} satisfies Record;
diff --git a/packages/frontend/src/preferences/profile.ts b/packages/frontend/src/preferences/profile.ts
index defa2747eb..fc8057540a 100644
--- a/packages/frontend/src/preferences/profile.ts
+++ b/packages/frontend/src/preferences/profile.ts
@@ -3,16 +3,16 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
-import { ref, watch } from 'vue';
+import { computed, onUnmounted, ref, watch } from 'vue';
import { v4 as uuid } from 'uuid';
import { host, version } from '@@/js/config.js';
-import { EventEmitter } from 'eventemitter3';
import { PREF_DEF } from './def.js';
-import { Store } from './store.js';
+import type { Ref, WritableComputedRef } from 'vue';
import type { MenuItem } from '@/types/menu.js';
import { $i } from '@/account.js';
import { copyToClipboard } from '@/utility/copy-to-clipboard.js';
import { i18n } from '@/i18n.js';
+import * as os from '@/os.js';
// NOTE: 明示的な設定値のひとつとして null もあり得るため、設定が存在しないかどうかを判定する目的で null で比較したり ?? を使ってはいけない
@@ -24,11 +24,41 @@ type PREF = typeof PREF_DEF;
type ValueOf = PREF[K]['default'];
type Account = string; // /
-type Cond = {
+type Cond = Partial<{
server: string | null; // 将来のため
account: Account | null;
device: string | null; // 将来のため
-};
+}>;
+
+type ValueMeta = Partial<{
+ sync: boolean;
+}>;
+
+type PrefRecord = [cond: Cond, value: ValueOf, meta: ValueMeta];
+
+function parseCond(cond: Cond): {
+ server: string | null;
+ account: Account | null;
+ device: string | null;
+} {
+ return {
+ server: cond.server ?? null,
+ account: cond.account ?? null,
+ device: cond.device ?? null,
+ };
+}
+
+function makeCond(cond: Partial<{
+ server: string | null;
+ account: Account | null;
+ device: string | null;
+}>): Cond {
+ const c = {} as Cond;
+ if (cond.server != null) c.server = cond.server;
+ if (cond.account != null) c.account = cond.account;
+ if (cond.device != null) c.device = cond.device;
+ return c;
+}
export type PreferencesProfile = {
id: string;
@@ -37,53 +67,119 @@ export type PreferencesProfile = {
modifiedAt: number;
name: string;
preferences: {
- [K in keyof PREF]: [Cond, ValueOf][];
+ [K in keyof PREF]: PrefRecord[];
};
- syncByAccount: [Account, keyof PREF][],
};
-// TODO: 任意のプロパティをデバイス間で同期できるようにする？
+export type StorageProvider = {
+ save: (ctx: { profile: PreferencesProfile; }) => void;
+ cloudGet: (ctx: { key: K; }) => Promise<{ value: ValueOf; } | null>;
+ cloudSet: (ctx: { key: K; value: ValueOf; }) => Promise;
+};
-export class ProfileManager extends EventEmitter<{
- updated: (ctx: {
- profile: PreferencesProfile
- }) => void;
-}> {
+export class ProfileManager {
+ private storageProvider: StorageProvider;
public profile: PreferencesProfile;
- public store: Store<{
- [K in keyof PREF]: ValueOf;
- }>;
- constructor(profile: PreferencesProfile) {
- super();
+ /**
+ * static / state の略 (static が予約語のため)
+ */
+ public s = {} as {
+ [K in keyof PREF]: ValueOf;
+ };
+
+ /**
+ * reactive の略
+ */
+ public r = {} as {
+ [K in keyof PREF]: Ref>;
+ };
+
+ constructor(profile: PreferencesProfile, storageProvider: StorageProvider) {
this.profile = profile;
+ this.storageProvider = storageProvider;
const states = this.genStates();
- this.store = new Store(states);
- this.store.addListener('updated', ({ key, value }) => {
- console.log('prefer:set', key, value);
+ for (const key in states) {
+ this.s[key] = states[key];
+ this.r[key] = ref(this.s[key]);
+ }
- const record = this.getMatchedRecord(key);
- if (record[0].account == null && PREF_DEF[key].accountDependent) {
- this.profile.preferences[key].push([{
- server: null,
- account: `${host}/${$i!.id}`,
- device: null,
- }, value]);
- this.save();
- return;
- }
+ this.fetchCloudValues();
- record[1] = value;
+ // TODO: 定期的にクラウドの値をフェッチ
+ }
+
+ private rewriteRawState(key: K, value: ValueOf) {
+ const v = JSON.parse(JSON.stringify(value)); // deep copy 兼 vueのプロキシ解除
+ this.r[key].value = this.s[key] = v;
+ }
+
+ public commit(key: K, value: ValueOf) {
+ console.log('prefer:commit', key, value);
+
+ this.rewriteRawState(key, value);
+
+ const record = this.getMatchedRecord(key);
+ if (parseCond(record[0]).account == null && PREF_DEF[key].accountDependent) {
+ this.profile.preferences[key].push([makeCond({
+ account: `${host}/${$i!.id}`,
+ }), value, {}]);
this.save();
+ return;
+ }
+
+ if (record[2].sync) {
+ // awaitの必要なし
+ // TODO: リクエストを間引く
+ this.storageProvider.cloudSet({ key, value });
+ }
+
+ record[1] = value;
+ this.save();
+ }
+
+ /**
+ * 特定のキーの、簡易的なcomputed refを作ります
+ * 主にvue上で設定コントロールのmodelとして使う用
+ */
+ public model = ValueOf>(
+ key: K,
+ getter?: (v: ValueOf) => V,
+ setter?: (v: V) => ValueOf,
+ ): WritableComputedRef {
+ const valueRef = ref(this.s[key]);
+
+ const stop = watch(this.r[key], val => {
+ valueRef.value = val;
+ });
+
+ // NOTE: vueコンポーネント内で呼ばれない限りは、onUnmounted は無意味なのでメモリリークする
+ onUnmounted(() => {
+ stop();
+ });
+
+ // TODO: VueのcustomRef使うと良い感じになるかも
+ return computed({
+ get: () => {
+ if (getter) {
+ return getter(valueRef.value);
+ } else {
+ return valueRef.value;
+ }
+ },
+ set: (value) => {
+ const val = setter ? setter(value) : value;
+ this.commit(key, val);
+ valueRef.value = val;
+ },
});
}
private genStates() {
const states = {} as { [K in keyof PREF]: ValueOf };
- let key: keyof PREF;
- for (key in PREF_DEF) {
+ for (const key in PREF_DEF) {
const record = this.getMatchedRecord(key);
states[key] = record[1];
}
@@ -91,15 +187,37 @@ export class ProfileManager extends EventEmitter<{
return states;
}
+ private fetchCloudValues() {
+ // TODO: 値の取得を1つのリクエストで済ませたい(バックエンド側でAPIの新設が必要)
+
+ const promises: Promise[] = [];
+ for (const key in PREF_DEF) {
+ const record = this.getMatchedRecord(key);
+ if (record[2].sync) {
+ const getting = this.storageProvider.cloudGet({ key });
+ promises.push(getting.then((res) => {
+ if (res == null) return;
+ const value = res.value;
+ if (value !== this.s[key]) {
+ this.rewriteRawState(key, value);
+ record[1] = value;
+ console.log('cloud fetched', key, value);
+ }
+ }));
+ }
+ }
+ Promise.all(promises).then(() => {
+ console.log('cloud fetched all');
+ this.save();
+
+ console.log(this.s.showFixedPostForm, this.r.showFixedPostForm.value);
+ });
+ }
+
public static newProfile(): PreferencesProfile {
const data = {} as PreferencesProfile['preferences'];
- let key: keyof PREF;
- for (key in PREF_DEF) {
- data[key] = [[{
- server: null,
- account: null,
- device: null,
- }, PREF_DEF[key].default]];
+ for (const key in PREF_DEF) {
+ data[key] = [[makeCond({}), PREF_DEF[key].default, {}]];
}
return {
id: uuid(),
@@ -108,29 +226,31 @@ export class ProfileManager extends EventEmitter<{
modifiedAt: Date.now(),
name: '',
preferences: data,
- syncByAccount: [],
};
}
- public static normalizeProfile(profile: any): PreferencesProfile {
+ public static normalizeProfile(profileLike: any): PreferencesProfile {
const data = {} as PreferencesProfile['preferences'];
- let key: keyof PREF;
- for (key in PREF_DEF) {
- const records = profile.preferences[key];
+ for (const key in PREF_DEF) {
+ const records = profileLike.preferences[key];
if (records == null || records.length === 0) {
- data[key] = [[{
- server: null,
- account: null,
- device: null,
- }, PREF_DEF[key].default]];
+ data[key] = [[makeCond({}), PREF_DEF[key].default, {}]];
continue;
} else {
data[key] = records;
+
+ // alpha段階ではmetaが無かったのでマイグレート
+ // TODO: そのうち消す
+ for (const record of data[key] as any[][]) {
+ if (record.length === 2) {
+ record.push({});
+ }
+ }
}
}
return {
- ...profile,
+ ...profileLike,
preferences: data,
};
}
@@ -138,24 +258,24 @@ export class ProfileManager extends EventEmitter<{
public save() {
this.profile.modifiedAt = Date.now();
this.profile.version = version;
- this.emit('updated', { profile: this.profile });
+ this.storageProvider.save({ profile: this.profile });
}
- public getMatchedRecord(key: K): [Cond, ValueOf] {
+ public getMatchedRecord(key: K): PrefRecord {
const records = this.profile.preferences[key];
- if ($i == null) return records.find(([cond, v]) => cond.account == null)!;
+ if ($i == null) return records.find(([cond, v]) => parseCond(cond).account == null)!;
- const accountOverrideRecord = records.find(([cond, v]) => cond.account === `${host}/${$i!.id}`);
+ const accountOverrideRecord = records.find(([cond, v]) => parseCond(cond).account === `${host}/${$i!.id}`);
if (accountOverrideRecord) return accountOverrideRecord;
- const record = records.find(([cond, v]) => cond.account == null);
+ const record = records.find(([cond, v]) => parseCond(cond).account == null);
return record!;
}
public isAccountOverrided(key: K): boolean {
if ($i == null) return false;
- return this.profile.preferences[key].some(([cond, v]) => cond.account === `${host}/${$i!.id}`) ?? false;
+ return this.profile.preferences[key].some(([cond, v]) => parseCond(cond).account === `${host}/${$i!.id}`) ?? false;
}
public setAccountOverride(key: K) {
@@ -164,11 +284,9 @@ export class ProfileManager extends EventEmitter<{
if (this.isAccountOverrided(key)) return;
const records = this.profile.preferences[key];
- records.push([{
- server: null,
+ records.push([makeCond({
account: `${host}/${$i!.id}`,
- device: null,
- }, this.store.s[key]]);
+ }), this.s[key], {}]);
this.save();
}
@@ -179,16 +297,67 @@ export class ProfileManager extends EventEmitter<{
const records = this.profile.preferences[key];
- const index = records.findIndex(([cond, v]) => cond.account === `${host}/${$i!.id}`);
+ const index = records.findIndex(([cond, v]) => parseCond(cond).account === `${host}/${$i!.id}`);
if (index === -1) return;
records.splice(index, 1);
- this.store.rewrite(key, this.getMatchedRecord(key)[1]);
+ this.rewriteRawState(key, this.getMatchedRecord(key)[1]);
this.save();
}
+ public isSyncEnabled(key: K): boolean {
+ return this.getMatchedRecord(key)[2].sync ?? false;
+ }
+
+ public async enableSync(key: K): Promise<{ enabled: boolean; } | null> {
+ if (this.isSyncEnabled(key)) return Promise.resolve(null);
+
+ const existing = await this.storageProvider.cloudGet({ key });
+ if (existing != null) {
+ const { canceled, result } = await os.select({
+ title: i18n.ts.preferenceSyncConflictTitle,
+ text: i18n.ts.preferenceSyncConflictText,
+ items: [{
+ text: i18n.ts.preferenceSyncConflictChoiceServer,
+ value: 'remote',
+ }, {
+ text: i18n.ts.preferenceSyncConflictChoiceDevice,
+ value: 'local',
+ }, {
+ text: i18n.ts.preferenceSyncConflictChoiceCancel,
+ value: null,
+ }],
+ default: 'remote',
+ });
+ if (canceled || result == null) return { enabled: false };
+
+ if (result === 'remote') {
+ this.commit(key, existing.value);
+ } else if (result === 'local') {
+ // nop
+ }
+ }
+
+ const record = this.getMatchedRecord(key);
+ record[2].sync = true;
+ this.save();
+
+ // awaitの必要性は無い
+ this.storageProvider.cloudSet({ key, value: this.s[key] });
+
+ return { enabled: true };
+ }
+
+ public disableSync(key: K) {
+ if (!this.isSyncEnabled(key)) return;
+
+ const record = this.getMatchedRecord(key);
+ delete record[2].sync;
+ this.save();
+ }
+
public renameProfile(name: string) {
this.profile.name = name;
this.save();
@@ -198,13 +367,14 @@ export class ProfileManager extends EventEmitter<{
this.profile = profile;
const states = this.genStates();
for (const key in states) {
- this.store.rewrite(key, states[key]);
+ this.rewriteRawState(key, states[key]);
}
+
+ this.fetchCloudValues();
}
public getPerPrefMenu(key: K): MenuItem[] {
const overrideByAccount = ref(this.isAccountOverrided(key));
-
watch(overrideByAccount, () => {
if (overrideByAccount.value) {
this.setAccountOverride(key);
@@ -213,6 +383,18 @@ export class ProfileManager extends EventEmitter<{
}
});
+ const sync = ref(this.isSyncEnabled(key));
+ watch(sync, () => {
+ if (sync.value) {
+ this.enableSync(key).then((res) => {
+ if (res == null) return;
+ if (!res.enabled) sync.value = false;
+ });
+ } else {
+ this.disableSync(key);
+ }
+ });
+
return [{
icon: 'ti ti-copy',
text: i18n.ts.copyPreferenceId,
@@ -224,7 +406,7 @@ export class ProfileManager extends EventEmitter<{
text: i18n.ts.resetToDefaultValue,
danger: true,
action: () => {
- this.store.commit(key, PREF_DEF[key].default);
+ this.commit(key, PREF_DEF[key].default);
},
}, {
type: 'divider',
@@ -233,6 +415,11 @@ export class ProfileManager extends EventEmitter<{
icon: 'ti ti-user-cog',
text: i18n.ts.overrideByAccount,
ref: overrideByAccount,
+ }, {
+ type: 'switch',
+ icon: 'ti ti-cloud-cog',
+ text: i18n.ts.syncBetweenDevices,
+ ref: sync,
}];
}
}
diff --git a/packages/frontend/src/preferences/store.ts b/packages/frontend/src/preferences/store.ts
deleted file mode 100644
index e061021be3..0000000000
--- a/packages/frontend/src/preferences/store.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { computed, onUnmounted, ref, watch } from 'vue';
-import { EventEmitter } from 'eventemitter3';
-import type { Ref, WritableComputedRef } from 'vue';
-
-// NOTE: 明示的な設定値のひとつとして null もあり得るため、設定が存在しないかどうかを判定する目的で null で比較したり ?? を使ってはいけない
-
-//type DottedToNested> = {
-// [K in keyof T as K extends string ? K extends `${infer A}.${infer B}` ? A : K : K]: K extends `${infer A}.${infer B}` ? DottedToNested<{ [key in B]: T[K] }> : T[K];
-//};
-
-type StoreEvent> = {
- updated: (ctx: {
- key: K;
- value: Data[K];
- }) => void;
-};
-
-export class Store> extends EventEmitter> {
- /**
- * static / state の略 (static が予約語のため)
- */
- public s = {} as {
- [K in keyof Data]: Data[K];
- };
-
- /**
- * reactive の略
- */
- public r = {} as {
- [K in keyof Data]: Ref;
- };
-
- constructor(data: { [K in keyof Data]: Data[K] }) {
- super();
-
- for (const key in data) {
- this.s[key] = data[key];
- this.r[key] = ref(this.s[key]);
- }
- }
-
- public commit(key: K, value: Data[K]) {
- const v = JSON.parse(JSON.stringify(value)); // deep copy 兼 vueのプロキシ解除
- this.r[key].value = this.s[key] = v;
- this.emit('updated', { key, value: v });
- }
-
- public rewrite(key: K, value: Data[K]) {
- const v = JSON.parse(JSON.stringify(value)); // deep copy 兼 vueのプロキシ解除
- this.r[key].value = this.s[key] = v;
- }
-
- /**
- * 特定のキーの、簡易的なcomputed refを作ります
- * 主にvue上で設定コントロールのmodelとして使う用
- */
- public model(
- key: K,
- getter?: (v: Data[K]) => V,
- setter?: (v: V) => Data[K],
- ): WritableComputedRef {
- const valueRef = ref(this.s[key]);
-
- const stop = watch(this.r[key], val => {
- valueRef.value = val;
- });
-
- // NOTE: vueコンポーネント内で呼ばれない限りは、onUnmounted は無意味なのでメモリリークする
- onUnmounted(() => {
- stop();
- });
-
- // TODO: VueのcustomRef使うと良い感じになるかも
- return computed({
- get: () => {
- if (getter) {
- return getter(valueRef.value);
- } else {
- return valueRef.value;
- }
- },
- set: (value) => {
- const val = setter ? setter(value) : value;
- this.commit(key, val);
- valueRef.value = val;
- },
- });
- }
-}
diff --git a/packages/frontend/src/preferences/utility.ts b/packages/frontend/src/preferences/utility.ts
index 64b2bde4de..fc6eff5f49 100644
--- a/packages/frontend/src/preferences/utility.ts
+++ b/packages/frontend/src/preferences/utility.ts
@@ -9,7 +9,7 @@ import type { MenuItem } from '@/types/menu.js';
import { copyToClipboard } from '@/utility/copy-to-clipboard.js';
import { i18n } from '@/i18n.js';
import { miLocalStorage } from '@/local-storage.js';
-import { prefer, profileManager } from '@/preferences.js';
+import { prefer } from '@/preferences.js';
import * as os from '@/os.js';
import { store } from '@/store.js';
import { $i } from '@/account.js';
@@ -17,7 +17,7 @@ import { misskeyApi } from '@/utility/misskey-api.js';
import { unisonReload } from '@/utility/unison-reload.js';
function canAutoBackup() {
- return profileManager.profile.name != null && profileManager.profile.name.trim() !== '';
+ return prefer.profile.name != null && prefer.profile.name.trim() !== '';
}
export function getPreferencesProfileMenu(): MenuItem[] {
@@ -42,7 +42,7 @@ export function getPreferencesProfileMenu(): MenuItem[] {
const menu: MenuItem[] = [{
type: 'label',
- text: profileManager.profile.name || `(${i18n.ts.noName})`,
+ text: prefer.profile.name || `(${i18n.ts.noName})`,
}, {
text: i18n.ts.rename,
icon: 'ti ti-pencil',
@@ -83,7 +83,7 @@ export function getPreferencesProfileMenu(): MenuItem[] {
text: 'Copy profile as text',
icon: 'ti ti-clipboard',
action: () => {
- copyToClipboard(JSON.stringify(profileManager.profile, null, '\t'));
+ copyToClipboard(JSON.stringify(prefer.profile, null, '\t'));
},
});
}
@@ -95,16 +95,16 @@ async function renameProfile() {
const { canceled, result: name } = await os.inputText({
title: i18n.ts._preferencesProfile.profileName,
text: i18n.ts._preferencesProfile.profileNameDescription + '\n' + i18n.ts._preferencesProfile.profileNameDescription2,
- placeholder: profileManager.profile.name || null,
- default: profileManager.profile.name || null,
+ placeholder: prefer.profile.name || null,
+ default: prefer.profile.name || null,
});
if (canceled || name == null || name.trim() === '') return;
- profileManager.renameProfile(name);
+ prefer.renameProfile(name);
}
function exportCurrentProfile() {
- const p = profileManager.profile;
+ const p = prefer.profile;
const txtBlob = new Blob([JSON.stringify(p)], { type: 'text/plain' });
const dummya = document.createElement('a');
dummya.href = URL.createObjectURL(txtBlob);
@@ -140,8 +140,8 @@ export async function cloudBackup() {
await misskeyApi('i/registry/set', {
scope: ['client', 'preferences', 'backups'],
- key: profileManager.profile.name,
- value: profileManager.profile,
+ key: prefer.profile.name,
+ value: prefer.profile,
});
}
From ffade9740ea759150e4a0f6c50d7928331f358e9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
Date: Wed, 12 Mar 2025 03:03:37 +0000
Subject: [PATCH 089/348] Bump version to 2025.3.2-alpha.7
---
package.json | 2 +-
packages/misskey-js/package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index d6324ca38c..591aa2a573 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "misskey",
- "version": "2025.3.2-alpha.6",
+ "version": "2025.3.2-alpha.7",
"codename": "nasubi",
"repository": {
"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index d9d7429e9a..d44e70c4f9 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
{
"type": "module",
"name": "misskey-js",
- "version": "2025.3.2-alpha.6",
+ "version": "2025.3.2-alpha.7",
"description": "Misskey SDK for JavaScript",
"license": "MIT",
"main": "./built/index.js",
From caab1ec7c3fbd6b8924a23afb1d934838b28e8ad Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 12 Mar 2025 13:04:41 +0900
Subject: [PATCH 090/348] =?UTF-8?q?=F0=9F=8E=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/frontend/src/components/MkButton.vue | 12 ++++++------
packages/frontend/src/components/MkMenu.vue | 10 +++++-----
.../src/components/MkPreferenceContainer.vue | 1 +
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/packages/frontend/src/components/MkButton.vue b/packages/frontend/src/components/MkButton.vue
index 311facb4aa..667e624853 100644
--- a/packages/frontend/src/components/MkButton.vue
+++ b/packages/frontend/src/components/MkButton.vue
@@ -220,28 +220,28 @@ function onMousedown(evt: MouseEvent): void {
background: linear-gradient(90deg, var(--MI_THEME-buttonGradateA), var(--MI_THEME-buttonGradateB));
&:not(:disabled):hover {
- background: linear-gradient(90deg, hsl(from var(--MI_THEME-accent) h s calc(l + 5)), hsl(from var(--MI_THEME-accent) h s calc(l + 5)));
+ background: linear-gradient(90deg, hsl(from var(--MI_THEME-buttonGradateA) h s calc(l + 5)), hsl(from var(--MI_THEME-buttonGradateB) h s calc(l + 5)));
}
&:not(:disabled):active {
- background: linear-gradient(90deg, hsl(from var(--MI_THEME-accent) h s calc(l + 5)), hsl(from var(--MI_THEME-accent) h s calc(l + 5)));
+ background: linear-gradient(90deg, hsl(from var(--MI_THEME-buttonGradateA) h s calc(l + 5)), hsl(from var(--MI_THEME-buttonGradateB) h s calc(l + 5)));
}
}
&.danger {
font-weight: bold;
- color: #ff2a2a;
+ color: var(--MI_THEME-error);
&.primary {
color: #fff;
- background: #ff2a2a;
+ background: var(--MI_THEME-error);
&:not(:disabled):hover {
- background: #ff4242;
+ background: hsl(from var(--MI_THEME-error) h s calc(l + 10));
}
&:not(:disabled):active {
- background: #d42e2e;
+ background: hsl(from var(--MI_THEME-error) h s calc(l - 10));
}
}
}
diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue
index 61b3fa2fee..aa53c19c33 100644
--- a/packages/frontend/src/components/MkMenu.vue
+++ b/packages/frontend/src/components/MkMenu.vue
@@ -177,12 +177,12 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/preferences.ts b/packages/frontend/src/preferences.ts
index ab234a926a..474abe22ab 100644
--- a/packages/frontend/src/preferences.ts
+++ b/packages/frontend/src/preferences.ts
@@ -7,7 +7,7 @@ import { v4 as uuid } from 'uuid';
import type { PreferencesProfile, StorageProvider } from '@/preferences/profile.js';
import { cloudBackup } from '@/preferences/utility.js';
import { miLocalStorage } from '@/local-storage.js';
-import { ProfileManager } from '@/preferences/profile.js';
+import { isSameCond, ProfileManager } from '@/preferences/profile.js';
import { store } from '@/store.js';
import { $i } from '@/account.js';
import { misskeyApi } from '@/utility/misskey-api.js';
@@ -28,22 +28,27 @@ function createProfileManager(storageProvider: StorageProvider) {
return new ProfileManager(profile, storageProvider);
}
+const syncGroup = 'default';
+
const storageProvider: StorageProvider = {
save: (ctx) => {
miLocalStorage.setItem('preferences', JSON.stringify(ctx.profile));
miLocalStorage.setItem('latestPreferencesUpdate', `${TAB_ID}/${Date.now()}`);
},
+
cloudGet: async (ctx) => {
// TODO: この取得方法だとアカウントが変わると保存場所も変わってしまうので改修する
// 例えば複数アカウントある場合でも設定値を保存するための「プライマリアカウント」を設定できるようにするとか
// TODO: keyのcondに応じた取得
try {
- const value = await misskeyApi('i/registry/get', {
+ const cloudData = await misskeyApi('i/registry/get', {
scope: ['client', 'preferences', 'sync'],
- key: ctx.key,
- });
+ key: syncGroup + ':' + ctx.key,
+ }) as [any, any][];
+ const target = cloudData.find(([cond]) => isSameCond(cond, ctx.cond));
+ if (target == null) return null;
return {
- value,
+ value: target[1],
};
} catch (err: any) {
if (err.code === 'NO_SUCH_KEY') {
@@ -53,11 +58,34 @@ const storageProvider: StorageProvider = {
}
}
},
+
cloudSet: async (ctx) => {
+ let cloudData: [any, any][] = [];
+ try {
+ cloudData = await misskeyApi('i/registry/get', {
+ scope: ['client', 'preferences', 'sync'],
+ key: syncGroup + ':' + ctx.key,
+ }) as [any, any][];
+ } catch (err: any) {
+ if (err.code === 'NO_SUCH_KEY') {
+ cloudData = [];
+ } else {
+ throw err;
+ }
+ }
+
+ const i = cloudData.findIndex(([cond]) => isSameCond(cond, ctx.cond));
+
+ if (i === -1) {
+ cloudData.push([ctx.cond, ctx.value]);
+ } else {
+ cloudData[i] = [ctx.cond, ctx.value];
+ }
+
await misskeyApi('i/registry/set', {
scope: ['client', 'preferences', 'sync'],
- key: ctx.key,
- value: ctx.value,
+ key: syncGroup + ':' + ctx.key,
+ value: cloudData,
});
},
};
diff --git a/packages/frontend/src/preferences/profile.ts b/packages/frontend/src/preferences/profile.ts
index fc8057540a..de1c674e5c 100644
--- a/packages/frontend/src/preferences/profile.ts
+++ b/packages/frontend/src/preferences/profile.ts
@@ -60,6 +60,12 @@ function makeCond(cond: Partial<{
return c;
}
+export function isSameCond(a: Cond, b: Cond): boolean {
+ // null と undefined (キー無し) は区別したくないので == で比較
+ // eslint-disable-next-line eqeqeq
+ return a.server == b.server && a.account == b.account && a.device == b.device;
+}
+
export type PreferencesProfile = {
id: string;
version: string;
@@ -73,8 +79,8 @@ export type PreferencesProfile = {
export type StorageProvider = {
save: (ctx: { profile: PreferencesProfile; }) => void;
- cloudGet: (ctx: { key: K; }) => Promise<{ value: ValueOf; } | null>;
- cloudSet: (ctx: { key: K; value: ValueOf; }) => Promise;
+ cloudGet: (ctx: { key: K; cond: Cond; }) => Promise<{ value: ValueOf; } | null>;
+ cloudSet: (ctx: { key: K; cond: Cond; value: ValueOf; }) => Promise;
};
export class ProfileManager {
@@ -121,7 +127,7 @@ export class ProfileManager {
this.rewriteRawState(key, value);
- const record = this.getMatchedRecord(key);
+ const record = this.getMatchedRecordOf(key);
if (parseCond(record[0]).account == null && PREF_DEF[key].accountDependent) {
this.profile.preferences[key].push([makeCond({
account: `${host}/${$i!.id}`,
@@ -130,14 +136,14 @@ export class ProfileManager {
return;
}
+ record[1] = value;
+ this.save();
+
if (record[2].sync) {
// awaitの必要なし
// TODO: リクエストを間引く
- this.storageProvider.cloudSet({ key, value });
+ this.storageProvider.cloudSet({ key, cond: record[0], value: record[1] });
}
-
- record[1] = value;
- this.save();
}
/**
@@ -180,7 +186,7 @@ export class ProfileManager {
private genStates() {
const states = {} as { [K in keyof PREF]: ValueOf };
for (const key in PREF_DEF) {
- const record = this.getMatchedRecord(key);
+ const record = this.getMatchedRecordOf(key);
states[key] = record[1];
}
@@ -192,9 +198,9 @@ export class ProfileManager {
const promises: Promise[] = [];
for (const key in PREF_DEF) {
- const record = this.getMatchedRecord(key);
+ const record = this.getMatchedRecordOf(key);
if (record[2].sync) {
- const getting = this.storageProvider.cloudGet({ key });
+ const getting = this.storageProvider.cloudGet({ key, cond: record[0] });
promises.push(getting.then((res) => {
if (res == null) return;
const value = res.value;
@@ -261,7 +267,7 @@ export class ProfileManager {
this.storageProvider.save({ profile: this.profile });
}
- public getMatchedRecord(key: K): PrefRecord {
+ public getMatchedRecordOf(key: K): PrefRecord {
const records = this.profile.preferences[key];
if ($i == null) return records.find(([cond, v]) => parseCond(cond).account == null)!;
@@ -302,19 +308,21 @@ export class ProfileManager {
records.splice(index, 1);
- this.rewriteRawState(key, this.getMatchedRecord(key)[1]);
+ this.rewriteRawState(key, this.getMatchedRecordOf(key)[1]);
this.save();
}
public isSyncEnabled(key: K): boolean {
- return this.getMatchedRecord(key)[2].sync ?? false;
+ return this.getMatchedRecordOf(key)[2].sync ?? false;
}
public async enableSync(key: K): Promise<{ enabled: boolean; } | null> {
if (this.isSyncEnabled(key)) return Promise.resolve(null);
- const existing = await this.storageProvider.cloudGet({ key });
+ const record = this.getMatchedRecordOf(key);
+
+ const existing = await this.storageProvider.cloudGet({ key, cond: record[0] });
if (existing != null) {
const { canceled, result } = await os.select({
title: i18n.ts.preferenceSyncConflictTitle,
@@ -340,12 +348,11 @@ export class ProfileManager {
}
}
- const record = this.getMatchedRecord(key);
record[2].sync = true;
this.save();
// awaitの必要性は無い
- this.storageProvider.cloudSet({ key, value: this.s[key] });
+ this.storageProvider.cloudSet({ key, cond: record[0], value: this.s[key] });
return { enabled: true };
}
@@ -353,7 +360,7 @@ export class ProfileManager {
public disableSync(key: K) {
if (!this.isSyncEnabled(key)) return;
- const record = this.getMatchedRecord(key);
+ const record = this.getMatchedRecordOf(key);
delete record[2].sync;
this.save();
}
From a36972179101b2132a27b836d87ff73ae8cc2f87 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 12 Mar 2025 14:35:22 +0900
Subject: [PATCH 092/348] remove todo
---
packages/frontend/src/preferences.ts | 1 -
1 file changed, 1 deletion(-)
diff --git a/packages/frontend/src/preferences.ts b/packages/frontend/src/preferences.ts
index 474abe22ab..27c61349a4 100644
--- a/packages/frontend/src/preferences.ts
+++ b/packages/frontend/src/preferences.ts
@@ -39,7 +39,6 @@ const storageProvider: StorageProvider = {
cloudGet: async (ctx) => {
// TODO: この取得方法だとアカウントが変わると保存場所も変わってしまうので改修する
// 例えば複数アカウントある場合でも設定値を保存するための「プライマリアカウント」を設定できるようにするとか
- // TODO: keyのcondに応じた取得
try {
const cloudData = await misskeyApi('i/registry/get', {
scope: ['client', 'preferences', 'sync'],
From e594fb0037f440f589c36c01e0108f011545a681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
<67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Wed, 12 Mar 2025 14:37:57 +0900
Subject: [PATCH 093/348] =?UTF-8?q?enhance(dev):=20frontend=E3=81=AE?=
=?UTF-8?q?=E6=A4=9C=E7=B4=A2=E3=82=A4=E3=83=B3=E3=83=87=E3=83=83=E3=82=AF?=
=?UTF-8?q?=E3=82=B9=E4=BD=9C=E6=88=90=E3=82=92=E5=8D=98=E7=8B=AC=E3=81=AE?=
=?UTF-8?q?=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E3=81=A7=E8=A1=8C=E3=81=88?=
=?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(#15653)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 1 +
.../lib/vite-plugin-create-search-index.ts | 31 +++++++++++--------
packages/frontend/package.json | 2 ++
.../frontend/scripts/generate-search-index.ts | 15 +++++++++
packages/frontend/vite-node.config.ts | 3 ++
packages/frontend/vite.config.ts | 19 ++++++++----
pnpm-lock.yaml | 3 ++
7 files changed, 55 insertions(+), 19 deletions(-)
create mode 100644 packages/frontend/scripts/generate-search-index.ts
create mode 100644 packages/frontend/vite-node.config.ts
diff --git a/package.json b/package.json
index 591aa2a573..7142e1f660 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
"build": "pnpm build-pre && pnpm -r build && pnpm build-assets",
"build-storybook": "pnpm --filter frontend build-storybook",
"build-misskey-js-with-types": "pnpm build-pre && pnpm --filter backend... --filter=!misskey-js build && pnpm --filter backend generate-api-json --no-build && ncp packages/backend/built/api.json packages/misskey-js/generator/api.json && pnpm --filter misskey-js update-autogen-code && pnpm --filter misskey-js build && pnpm --filter misskey-js api",
+ "build-frontend-search-index": "pnpm --filter frontend build-search-index",
"start": "pnpm check:connect && cd packages/backend && node ./built/boot/entry.js",
"start:test": "ncp ./.github/misskey/test.yml ./.config/test.yml && cd packages/backend && cross-env NODE_ENV=test node ./built/boot/entry.js",
"init": "pnpm migrate",
diff --git a/packages/frontend/lib/vite-plugin-create-search-index.ts b/packages/frontend/lib/vite-plugin-create-search-index.ts
index e194872640..d506e84bb6 100644
--- a/packages/frontend/lib/vite-plugin-create-search-index.ts
+++ b/packages/frontend/lib/vite-plugin-create-search-index.ts
@@ -1428,6 +1428,23 @@ async function processVueFile(
};
}
+export async function generateSearchIndex(options: Options, transformedCodeCache: Record = {}) {
+ const filePaths = options.targetFilePaths.reduce((acc, filePathPattern) => {
+ const matchedFiles = glob.sync(filePathPattern);
+ return [...acc, ...matchedFiles];
+ }, []);
+
+ for (const filePath of filePaths) {
+ const id = path.resolve(filePath); // 絶対パスに変換
+ const code = fs.readFileSync(filePath, 'utf-8'); // ファイル内容を読み込む
+ const { transformedCodeCache: newCache } = await processVueFile(code, id, options, transformedCodeCache); // processVueFile 関数を呼び出す
+ transformedCodeCache = newCache; // キャッシュを更新
+ }
+
+ await analyzeVueProps({ ...options, transformedCodeCache }); // 開発サーバー起動時にも analyzeVueProps を実行
+
+ return transformedCodeCache; // キャッシュを返す
+}
// Rollup プラグインとして export
export default function pluginCreateSearchIndex(options: Options): Plugin {
@@ -1445,19 +1462,7 @@ export default function pluginCreateSearchIndex(options: Options): Plugin {
return;
}
- const filePaths = options.targetFilePaths.reduce((acc, filePathPattern) => {
- const matchedFiles = glob.sync(filePathPattern);
- return [...acc, ...matchedFiles];
- }, []);
-
- for (const filePath of filePaths) {
- const id = path.resolve(filePath); // 絶対パスに変換
- const code = fs.readFileSync(filePath, 'utf-8'); // ファイル内容を読み込む
- const { transformedCodeCache: newCache } = await processVueFile(code, id, options, transformedCodeCache); // processVueFile 関数を呼び出す
- transformedCodeCache = newCache; // キャッシュを更新
- }
-
- await analyzeVueProps({ ...options, transformedCodeCache }); // 開発サーバー起動時にも analyzeVueProps を実行
+ transformedCodeCache = await generateSearchIndex(options, transformedCodeCache);
},
async transform(code, id) {
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 946a0be48f..d829a34804 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -5,6 +5,7 @@
"scripts": {
"watch": "vite",
"build": "vite build",
+ "build-search-index": "vite-node --config \"./vite-node.config.ts\" \"./scripts/generate-search-index.ts\"",
"storybook-dev": "nodemon --verbose --watch src --ext \"mdx,ts,vue\" --ignore \"*.stories.ts\" --exec \"pnpm build-storybook-pre && pnpm exec storybook dev -p 6006 --ci\"",
"build-storybook-pre": "(tsc -p .storybook || echo done.) && node .storybook/generate.js && node .storybook/preload-locale.js && node .storybook/preload-theme.js",
"build-storybook": "pnpm build-storybook-pre && storybook build --webpack-stats-json storybook-static",
@@ -133,6 +134,7 @@
"start-server-and-test": "2.0.10",
"storybook": "8.6.4",
"storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme",
+ "vite-node": "3.0.8",
"vite-plugin-turbosnap": "1.0.3",
"vitest": "3.0.8",
"vitest-fetch-mock": "0.4.5",
diff --git a/packages/frontend/scripts/generate-search-index.ts b/packages/frontend/scripts/generate-search-index.ts
new file mode 100644
index 0000000000..cbb4bb8c51
--- /dev/null
+++ b/packages/frontend/scripts/generate-search-index.ts
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { searchIndexes } from '../vite.config.js';
+import { generateSearchIndex } from '../lib/vite-plugin-create-search-index.js';
+
+async function main() {
+ for (const searchIndex of searchIndexes) {
+ await generateSearchIndex(searchIndex);
+ }
+}
+
+main();
diff --git a/packages/frontend/vite-node.config.ts b/packages/frontend/vite-node.config.ts
new file mode 100644
index 0000000000..c049f46e10
--- /dev/null
+++ b/packages/frontend/vite-node.config.ts
@@ -0,0 +1,3 @@
+import { defineConfig } from 'vite';
+
+export default defineConfig({});
diff --git a/packages/frontend/vite.config.ts b/packages/frontend/vite.config.ts
index a28fc553f4..ec80e71ae4 100644
--- a/packages/frontend/vite.config.ts
+++ b/packages/frontend/vite.config.ts
@@ -1,7 +1,8 @@
import path from 'path';
import pluginReplace from '@rollup/plugin-replace';
import pluginVue from '@vitejs/plugin-vue';
-import { type UserConfig, defineConfig } from 'vite';
+import { defineConfig } from 'vite';
+import type { UserConfig } from 'vite';
import * as yaml from 'js-yaml';
import { promises as fsp } from 'fs';
@@ -11,12 +12,22 @@ import packageInfo from './package.json' with { type: 'json' };
import pluginUnwindCssModuleClassName from './lib/rollup-plugin-unwind-css-module-class-name.js';
import pluginJson5 from './vite.json5.js';
import pluginCreateSearchIndex from './lib/vite-plugin-create-search-index.js';
+import type { Options as SearchIndexOptions } from './lib/vite-plugin-create-search-index.js';
const url = process.env.NODE_ENV === 'development' ? yaml.load(await fsp.readFile('../../.config/default.yml', 'utf-8')).url : null;
const host = url ? (new URL(url)).hostname : undefined;
const extensions = ['.ts', '.tsx', '.js', '.jsx', '.mjs', '.json', '.json5', '.svg', '.sass', '.scss', '.css', '.vue'];
+/**
+ * 検索インデックスの生成設定
+ */
+export const searchIndexes = [{
+ targetFilePaths: ['src/pages/settings/*.vue'],
+ exportFilePath: './src/utility/autogen/settings-search-index.ts',
+ verbose: process.env.FRONTEND_SEARCH_INDEX_VERBOSE === 'true',
+}] satisfies SearchIndexOptions[];
+
/**
* Misskeyのフロントエンドにバンドルせず、CDNなどから別途読み込むリソースを記述する。
* CDNを使わずにバンドルしたい場合、以下の配列から該当要素を削除orコメントアウトすればOK
@@ -84,11 +95,7 @@ export function getConfig(): UserConfig {
},
plugins: [
- pluginCreateSearchIndex({
- targetFilePaths: ['src/pages/settings/*.vue'],
- exportFilePath: './src/utility/autogen/settings-search-index.ts',
- verbose: process.env.FRONTEND_SEARCH_INDEX_VERBOSE === 'true',
- }),
+ ...searchIndexes.map(options => pluginCreateSearchIndex(options)),
pluginVue(),
pluginUnwindCssModuleClassName(),
pluginJson5(),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4b70b273d0..681cf6fb18 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1040,6 +1040,9 @@ importers:
storybook-addon-misskey-theme:
specifier: github:misskey-dev/storybook-addon-misskey-theme
version: https://codeload.github.com/misskey-dev/storybook-addon-misskey-theme/tar.gz/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@8.6.4(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(storybook@8.6.4(bufferutil@4.0.9)(prettier@3.5.3)(utf-8-validate@6.0.5)))(@storybook/components@8.6.4(storybook@8.6.4(bufferutil@4.0.9)(prettier@3.5.3)(utf-8-validate@6.0.5)))(@storybook/core-events@8.6.4(storybook@8.6.4(bufferutil@4.0.9)(prettier@3.5.3)(utf-8-validate@6.0.5)))(@storybook/manager-api@8.6.4(storybook@8.6.4(bufferutil@4.0.9)(prettier@3.5.3)(utf-8-validate@6.0.5)))(@storybook/preview-api@8.6.4(storybook@8.6.4(bufferutil@4.0.9)(prettier@3.5.3)(utf-8-validate@6.0.5)))(@storybook/theming@8.6.4(storybook@8.6.4(bufferutil@4.0.9)(prettier@3.5.3)(utf-8-validate@6.0.5)))(@storybook/types@8.6.4(storybook@8.6.4(bufferutil@4.0.9)(prettier@3.5.3)(utf-8-validate@6.0.5)))(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+ vite-node:
+ specifier: 3.0.8
+ version: 3.0.8(@types/node@22.13.9)(sass@1.85.1)(terser@5.39.0)(tsx@4.19.3)
vite-plugin-turbosnap:
specifier: 1.0.3
version: 1.0.3
From 8508c4dadc51fa597884655195b6fe80ca2d4e08 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 12 Mar 2025 15:07:45 +0900
Subject: [PATCH 094/348] refactor
---
packages/frontend/src/preferences.ts | 15 +++++++
packages/frontend/src/preferences/profile.ts | 42 +++++++++++---------
2 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/packages/frontend/src/preferences.ts b/packages/frontend/src/preferences.ts
index 27c61349a4..bfcd8b8dd7 100644
--- a/packages/frontend/src/preferences.ts
+++ b/packages/frontend/src/preferences.ts
@@ -87,6 +87,21 @@ const storageProvider: StorageProvider = {
value: cloudData,
});
},
+
+ cloudGets: async (ctx) => {
+ // TODO: 値の取得を1つのリクエストで済ませたい(バックエンド側でAPIの新設が必要)
+ const fetchings = ctx.needs.map(need => storageProvider.cloudGet(need).then(res => [need.key, res] as const));
+ const cloudDatas = await Promise.all(fetchings);
+
+ const res = {} as Partial>;
+ for (const cloudData of cloudDatas) {
+ if (cloudData[1] != null) {
+ res[cloudData[0]] = cloudData[1].value;
+ }
+ }
+
+ return res;
+ },
};
export const prefer = createProfileManager(storageProvider);
diff --git a/packages/frontend/src/preferences/profile.ts b/packages/frontend/src/preferences/profile.ts
index de1c674e5c..2ac4e58d14 100644
--- a/packages/frontend/src/preferences/profile.ts
+++ b/packages/frontend/src/preferences/profile.ts
@@ -79,6 +79,7 @@ export type PreferencesProfile = {
export type StorageProvider = {
save: (ctx: { profile: PreferencesProfile; }) => void;
+ cloudGets: (ctx: { needs: { key: K; cond: Cond; }[] }) => Promise>>>;
cloudGet: (ctx: { key: K; cond: Cond; }) => Promise<{ value: ValueOf; } | null>;
cloudSet: (ctx: { key: K; cond: Cond; value: ValueOf; }) => Promise;
};
@@ -193,31 +194,34 @@ export class ProfileManager {
return states;
}
- private fetchCloudValues() {
- // TODO: 値の取得を1つのリクエストで済ませたい(バックエンド側でAPIの新設が必要)
-
- const promises: Promise[] = [];
+ private async fetchCloudValues() {
+ const needs = [] as { key: keyof PREF; cond: Cond; }[];
for (const key in PREF_DEF) {
const record = this.getMatchedRecordOf(key);
if (record[2].sync) {
- const getting = this.storageProvider.cloudGet({ key, cond: record[0] });
- promises.push(getting.then((res) => {
- if (res == null) return;
- const value = res.value;
- if (value !== this.s[key]) {
- this.rewriteRawState(key, value);
- record[1] = value;
- console.log('cloud fetched', key, value);
- }
- }));
+ needs.push({
+ key,
+ cond: record[0],
+ });
}
}
- Promise.all(promises).then(() => {
- console.log('cloud fetched all');
- this.save();
- console.log(this.s.showFixedPostForm, this.r.showFixedPostForm.value);
- });
+ const cloudValues = await this.storageProvider.cloudGets({ needs });
+
+ for (const key in PREF_DEF) {
+ const record = this.getMatchedRecordOf(key);
+ if (record[2].sync && Object.hasOwn(cloudValues, key) && cloudValues[key] !== undefined) {
+ const cloudValue = cloudValues[key];
+ if (cloudValue !== this.s[key]) {
+ this.rewriteRawState(key, cloudValue);
+ record[1] = cloudValue;
+ console.log('cloud fetched', key, cloudValue);
+ }
+ }
+ }
+
+ this.save();
+ console.log('cloud fetch completed');
}
public static newProfile(): PreferencesProfile {
From 15685be4cc02a7bc1b15028cdd498de52e35a5ba Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
Date: Wed, 12 Mar 2025 06:10:35 +0000
Subject: [PATCH 095/348] Bump version to 2025.3.2-alpha.8
---
package.json | 2 +-
packages/misskey-js/package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 7142e1f660..8f89108665 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "misskey",
- "version": "2025.3.2-alpha.7",
+ "version": "2025.3.2-alpha.8",
"codename": "nasubi",
"repository": {
"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index d44e70c4f9..021c5a54bd 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
{
"type": "module",
"name": "misskey-js",
- "version": "2025.3.2-alpha.7",
+ "version": "2025.3.2-alpha.8",
"description": "Misskey SDK for JavaScript",
"license": "MIT",
"main": "./built/index.js",
From aa1cc2f817b0980609ca44715d72bf341f3c2e91 Mon Sep 17 00:00:00 2001
From: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
Date: Wed, 12 Mar 2025 16:51:10 +0900
Subject: [PATCH 096/348] fix(storybook): use type-only imports in generated
stories (#15654)
---
packages/frontend/.storybook/generate.tsx | 61 ++++++++++++++++++++---
1 file changed, 53 insertions(+), 8 deletions(-)
diff --git a/packages/frontend/.storybook/generate.tsx b/packages/frontend/.storybook/generate.tsx
index 3cd08191f5..89d4214141 100644
--- a/packages/frontend/.storybook/generate.tsx
+++ b/packages/frontend/.storybook/generate.tsx
@@ -17,8 +17,52 @@ interface SatisfiesExpression extends estree.BaseExpression {
reference: estree.Identifier;
}
+interface ImportDeclaration extends estree.ImportDeclaration {
+ kind?: 'type';
+}
+
const generator = {
...GENERATOR,
+ ImportDeclaration(node: ImportDeclaration, state: State) {
+ state.write('import ');
+ if (node.kind === 'type') state.write('type ');
+ const { specifiers } = node;
+ if (specifiers.length > 0) {
+ let i = 0;
+ for (; i < specifiers.length; i++) {
+ if (i > 0) {
+ state.write(', ');
+ }
+ const specifier = specifiers[i]!;
+ if (specifier.type === 'ImportDefaultSpecifier') {
+ state.write(specifier.local.name, specifier);
+ } else if (specifier.type === 'ImportNamespaceSpecifier') {
+ state.write(`* as ${specifier.local.name}`, specifier);
+ } else {
+ break;
+ }
+ }
+ if (i < specifiers.length) {
+ state.write('{');
+ for (; i < specifiers.length; i++) {
+ const specifier = specifiers[i]! as estree.ImportSpecifier;
+ const { name } = specifier.imported as estree.Identifier;
+ state.write(name, specifier);
+ if (name !== specifier.local.name) {
+ state.write(` as ${specifier.local.name}`);
+ }
+ if (i < specifiers.length - 1) {
+ state.write(', ');
+ }
+ }
+ state.write('}');
+ }
+ state.write(' from ');
+ }
+ this.Literal(node.source, state);
+
+ state.write(';');
+ },
SatisfiesExpression(node: SatisfiesExpression, state: State) {
switch (node.expression.type) {
case 'ArrowFunctionExpression': {
@@ -62,7 +106,7 @@ type ToKebab = T extends readonly [
: T extends readonly [
infer XH extends string,
...infer XR extends readonly string[]
- ]
+ ]
? `${XH}${XR extends readonly string[] ? `-${ToKebab}` : ''}`
: '';
@@ -132,7 +176,7 @@ function toStories(component: string): Promise {
kind={'init' as const}
shorthand
/> as estree.Property,
- ]
+ ]
: []),
]}
/> as estree.ObjectExpression;
@@ -155,7 +199,8 @@ function toStories(component: string): Promise {
/> as estree.ImportSpecifier,
]),
]}
- /> as estree.ImportDeclaration,
+ kind={'type'}
+ /> as ImportDeclaration,
...(hasMsw
? [
{
local={ {
specifiers={[
{
local={
Date: Wed, 12 Mar 2025 18:54:36 +0900
Subject: [PATCH 097/348] add todo
---
packages/frontend/src/preferences.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/frontend/src/preferences.ts b/packages/frontend/src/preferences.ts
index bfcd8b8dd7..ab73fe2b77 100644
--- a/packages/frontend/src/preferences.ts
+++ b/packages/frontend/src/preferences.ts
@@ -50,7 +50,7 @@ const storageProvider: StorageProvider = {
value: target[1],
};
} catch (err: any) {
- if (err.code === 'NO_SUCH_KEY') {
+ if (err.code === 'NO_SUCH_KEY') { // TODO: いちいちエラーキャッチするのは面倒なのでキーが無くてもエラーにならない maybe-get のようなエンドポイントをバックエンドに実装する
return null;
} else {
throw err;
@@ -66,7 +66,7 @@ const storageProvider: StorageProvider = {
key: syncGroup + ':' + ctx.key,
}) as [any, any][];
} catch (err: any) {
- if (err.code === 'NO_SUCH_KEY') {
+ if (err.code === 'NO_SUCH_KEY') { // TODO: いちいちエラーキャッチするのは面倒なのでキーが無くてもエラーにならない maybe-get のようなエンドポイントをバックエンドに実装する
cloudData = [];
} else {
throw err;
From 3129fcf164369ecd1ed7fd26e17e0806ada4e435 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 12 Mar 2025 20:17:54 +0900
Subject: [PATCH 098/348] fix(frontend): fix type errors
---
packages/frontend/src/preferences.ts | 4 +--
packages/frontend/src/preferences/def.ts | 9 ++----
.../preferences/{profile.ts => manager.ts} | 30 ++++++++++++++-----
packages/frontend/src/preferences/utility.ts | 2 +-
4 files changed, 28 insertions(+), 17 deletions(-)
rename packages/frontend/src/preferences/{profile.ts => manager.ts} (92%)
diff --git a/packages/frontend/src/preferences.ts b/packages/frontend/src/preferences.ts
index ab73fe2b77..7d1821b72b 100644
--- a/packages/frontend/src/preferences.ts
+++ b/packages/frontend/src/preferences.ts
@@ -4,10 +4,10 @@
*/
import { v4 as uuid } from 'uuid';
-import type { PreferencesProfile, StorageProvider } from '@/preferences/profile.js';
+import type { PreferencesProfile, StorageProvider } from '@/preferences/manager.js';
import { cloudBackup } from '@/preferences/utility.js';
import { miLocalStorage } from '@/local-storage.js';
-import { isSameCond, ProfileManager } from '@/preferences/profile.js';
+import { isSameCond, ProfileManager } from '@/preferences/manager.js';
import { store } from '@/store.js';
import { $i } from '@/account.js';
import { misskeyApi } from '@/utility/misskey-api.js';
diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts
index b75b99d6b5..47d0ab5cbc 100644
--- a/packages/frontend/src/preferences/def.ts
+++ b/packages/frontend/src/preferences/def.ts
@@ -9,7 +9,8 @@ import type { Theme } from '@/theme.js';
import type { SoundType } from '@/utility/sound.js';
import type { Plugin } from '@/plugin.js';
import type { DeviceKind } from '@/utility/device-kind.js';
-import type { Column, DeckProfile } from '@/deck.js';
+import type { DeckProfile } from '@/deck.js';
+import type { PreferencesDefinition } from './manager.js';
import { DEFAULT_DEVICE_KIND } from '@/utility/device-kind.js';
/** サウンド設定 */
@@ -324,8 +325,4 @@ export const PREF_DEF = {
sfxVolume: 1,
},
},
-} satisfies Record;
+} satisfies PreferencesDefinition;
diff --git a/packages/frontend/src/preferences/profile.ts b/packages/frontend/src/preferences/manager.ts
similarity index 92%
rename from packages/frontend/src/preferences/profile.ts
rename to packages/frontend/src/preferences/manager.ts
index 2ac4e58d14..9866227d93 100644
--- a/packages/frontend/src/preferences/profile.ts
+++ b/packages/frontend/src/preferences/manager.ts
@@ -84,6 +84,12 @@ export type StorageProvider = {
cloudSet: (ctx: { key: K; cond: Cond; value: ValueOf; }) => Promise;
};
+export type PreferencesDefinition = Record;
+
export class ProfileManager {
private storageProvider: StorageProvider;
public profile: PreferencesProfile;
@@ -118,6 +124,10 @@ export class ProfileManager {
// TODO: 定期的にクラウドの値をフェッチ
}
+ private isAccountDependentKey(key: K): boolean {
+ return (PREF_DEF as PreferencesDefinition)[key].accountDependent === true;
+ }
+
private rewriteRawState(key: K, value: ValueOf) {
const v = JSON.parse(JSON.stringify(value)); // deep copy 兼 vueのプロキシ解除
this.r[key].value = this.s[key] = v;
@@ -129,7 +139,7 @@ export class ProfileManager {
this.rewriteRawState(key, value);
const record = this.getMatchedRecordOf(key);
- if (parseCond(record[0]).account == null && PREF_DEF[key].accountDependent) {
+ if (parseCond(record[0]).account == null && this.isAccountDependentKey(key)) {
this.profile.preferences[key].push([makeCond({
account: `${host}/${$i!.id}`,
}), value, {}]);
@@ -186,9 +196,10 @@ export class ProfileManager {
private genStates() {
const states = {} as { [K in keyof PREF]: ValueOf };
- for (const key in PREF_DEF) {
+ for (const _key in PREF_DEF) {
+ const key = _key as keyof PREF;
const record = this.getMatchedRecordOf(key);
- states[key] = record[1];
+ (states[key] as any) = record[1];
}
return states;
@@ -196,7 +207,8 @@ export class ProfileManager {
private async fetchCloudValues() {
const needs = [] as { key: keyof PREF; cond: Cond; }[];
- for (const key in PREF_DEF) {
+ for (const _key in PREF_DEF) {
+ const key = _key as keyof PREF;
const record = this.getMatchedRecordOf(key);
if (record[2].sync) {
needs.push({
@@ -208,7 +220,8 @@ export class ProfileManager {
const cloudValues = await this.storageProvider.cloudGets({ needs });
- for (const key in PREF_DEF) {
+ for (const _key in PREF_DEF) {
+ const key = _key as keyof PREF;
const record = this.getMatchedRecordOf(key);
if (record[2].sync && Object.hasOwn(cloudValues, key) && cloudValues[key] !== undefined) {
const cloudValue = cloudValues[key];
@@ -290,7 +303,7 @@ export class ProfileManager {
public setAccountOverride(key: K) {
if ($i == null) return;
- if (PREF_DEF[key].accountDependent) throw new Error('already account-dependent');
+ if (this.isAccountDependentKey(key)) throw new Error('already account-dependent');
if (this.isAccountOverrided(key)) return;
const records = this.profile.preferences[key];
@@ -303,7 +316,7 @@ export class ProfileManager {
public clearAccountOverride(key: K) {
if ($i == null) return;
- if (PREF_DEF[key].accountDependent) throw new Error('cannot clear override for this account-dependent property');
+ if (this.isAccountDependentKey(key)) throw new Error('cannot clear override for this account-dependent property');
const records = this.profile.preferences[key];
@@ -377,7 +390,8 @@ export class ProfileManager {
public rewriteProfile(profile: PreferencesProfile) {
this.profile = profile;
const states = this.genStates();
- for (const key in states) {
+ for (const _key in states) {
+ const key = _key as keyof PREF;
this.rewriteRawState(key, states[key]);
}
diff --git a/packages/frontend/src/preferences/utility.ts b/packages/frontend/src/preferences/utility.ts
index fc6eff5f49..c37dbcf96b 100644
--- a/packages/frontend/src/preferences/utility.ts
+++ b/packages/frontend/src/preferences/utility.ts
@@ -4,7 +4,7 @@
*/
import { ref, watch } from 'vue';
-import type { PreferencesProfile } from './profile.js';
+import type { PreferencesProfile } from './manager.js';
import type { MenuItem } from '@/types/menu.js';
import { copyToClipboard } from '@/utility/copy-to-clipboard.js';
import { i18n } from '@/i18n.js';
From a06b9eefaa550b2fa67ad661384d431cc842bfc2 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 12 Mar 2025 21:05:39 +0900
Subject: [PATCH 099/348] enhance(frontend): suppress needless confirmation
when turn on pref sync
---
packages/frontend/src/preferences/manager.ts | 3 +-
packages/frontend/src/utility/deep-equal.ts | 29 ++++++++++++++++++++
2 files changed, 31 insertions(+), 1 deletion(-)
create mode 100644 packages/frontend/src/utility/deep-equal.ts
diff --git a/packages/frontend/src/preferences/manager.ts b/packages/frontend/src/preferences/manager.ts
index 9866227d93..3f3eba6389 100644
--- a/packages/frontend/src/preferences/manager.ts
+++ b/packages/frontend/src/preferences/manager.ts
@@ -13,6 +13,7 @@ import { $i } from '@/account.js';
import { copyToClipboard } from '@/utility/copy-to-clipboard.js';
import { i18n } from '@/i18n.js';
import * as os from '@/os.js';
+import { deepEqual } from '@/utility/deep-equal.js';
// NOTE: 明示的な設定値のひとつとして null もあり得るため、設定が存在しないかどうかを判定する目的で null で比較したり ?? を使ってはいけない
@@ -340,7 +341,7 @@ export class ProfileManager {
const record = this.getMatchedRecordOf(key);
const existing = await this.storageProvider.cloudGet({ key, cond: record[0] });
- if (existing != null) {
+ if (existing != null && !deepEqual(existing.value, record[1])) {
const { canceled, result } = await os.select({
title: i18n.ts.preferenceSyncConflictTitle,
text: i18n.ts.preferenceSyncConflictText,
diff --git a/packages/frontend/src/utility/deep-equal.ts b/packages/frontend/src/utility/deep-equal.ts
new file mode 100644
index 0000000000..c64d82c6cc
--- /dev/null
+++ b/packages/frontend/src/utility/deep-equal.ts
@@ -0,0 +1,29 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export function deepEqual(a: any, b: any): boolean {
+ if (a === b) return true;
+
+ if (a === null) return b === null;
+
+ if (Array.isArray(a) && Array.isArray(b)) {
+ if (a.length !== b.length) return false;
+ for (let i = 0; i < a.length; i++) {
+ if (!deepEqual(a[i], b[i])) return false;
+ }
+ return true;
+ } else if (((typeof a) === 'object') && ((typeof b) === 'object')) {
+ const aks = Object.keys(a);
+ const bks = Object.keys(b);
+ if (aks.length !== bks.length) return false;
+ for (let i = 0; i < aks.length; i++) {
+ const k = aks[i];
+ if (!deepEqual(a[k], b[k])) return false;
+ }
+ return true;
+ }
+
+ return false;
+}
From 4a73feb041a554e813e490cc5cd63c105e142623 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 12 Mar 2025 21:12:08 +0900
Subject: [PATCH 100/348] enhance(frontend): make deck profiles syncable
---
locales/index.d.ts | 4 ++
locales/ja-JP.yml | 1 +
packages/frontend/src/pages/settings/deck.vue | 40 ++++++++++++++-----
.../utility/autogen/settings-search-index.ts | 7 ++++
4 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 297b56e289..a4233cf7c8 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -9848,6 +9848,10 @@ export interface Locale extends ILocale {
* 幅を自動調整
*/
"flexible": string;
+ /**
+ * プロファイル情報のデバイス間同期を有効にする
+ */
+ "enableSyncBetweenDevicesForProfiles": string;
"_columns": {
/**
* メイン
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 23aeb59863..c45553817d 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2603,6 +2603,7 @@ _deck:
useSimpleUiForNonRootPages: "非ルートページは簡易UIで表示"
usedAsMinWidthWhenFlexible: "「幅を自動調整」が有効の場合、これが幅の最小値となります"
flexible: "幅を自動調整"
+ enableSyncBetweenDevicesForProfiles: "プロファイル情報のデバイス間同期を有効にする"
_columns:
main: "メイン"
diff --git a/packages/frontend/src/pages/settings/deck.vue b/packages/frontend/src/pages/settings/deck.vue
index e7c5c942e9..2c4ec01344 100644
--- a/packages/frontend/src/pages/settings/deck.vue
+++ b/packages/frontend/src/pages/settings/deck.vue
@@ -4,23 +4,27 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
+
+
+
+
+
+
diff --git a/packages/frontend/src/pages/settings/emoji-picker.vue b/packages/frontend/src/pages/settings/emoji-picker.vue
deleted file mode 100644
index d8f27078ae..0000000000
--- a/packages/frontend/src/pages/settings/emoji-picker.vue
+++ /dev/null
@@ -1,288 +0,0 @@
-
-
-
-(() => [{
text: i18n.ts.privacy,
to: '/settings/privacy',
active: currentPage.value?.route.name === 'privacy',
- }, {
- icon: 'ti ti-mood-happy',
- text: i18n.ts.emojiPicker,
- to: '/settings/emoji-picker',
- active: currentPage.value?.route.name === 'emojiPicker',
}, {
icon: 'ti ti-bell',
text: i18n.ts.notifications,
@@ -118,6 +113,11 @@ const menuDef = computed(() => [{
text: i18n.ts.theme,
to: '/settings/theme',
active: currentPage.value?.route.name === 'theme',
+ }, {
+ icon: 'ti ti-mood-happy',
+ text: i18n.ts.emojiPalette,
+ to: '/settings/emoji-palette',
+ active: currentPage.value?.route.name === 'emoji-palette',
}, {
icon: 'ti ti-device-desktop',
text: i18n.ts.appearance,
diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts
index 47d0ab5cbc..6a926c4b26 100644
--- a/packages/frontend/src/preferences/def.ts
+++ b/packages/frontend/src/preferences/def.ts
@@ -29,6 +29,8 @@ export type SoundStore = {
volume: number;
};
+// NOTE: デフォルト値は他の設定の状態に依存してはならない(依存していた場合、ユーザーがその設定項目単体で「初期値にリセット」した場合不具合の原因になる)
+
export const PREF_DEF = {
pinnedUserLists: {
accountDependent: true,
@@ -56,6 +58,27 @@ export const PREF_DEF = {
default: [] as DeckProfile[],
},
+ emojiPalettes: {
+ serverDependent: true,
+ default: [{
+ id: 'a',
+ name: '',
+ emojis: ['👍', '❤️', '😆', '🤔', '😮', '🎉', '💢', '😥', '😇', '🍮'],
+ }] as {
+ id: string;
+ name: string;
+ emojis: string[];
+ }[],
+ },
+ emojiPaletteForReaction: {
+ serverDependent: true,
+ default: null as string | null,
+ },
+ emojiPaletteForMain: {
+ serverDependent: true,
+ default: null as string | null,
+ },
+
overridedDeviceKind: {
default: null as DeviceKind | null,
},
@@ -180,13 +203,13 @@ export const PREF_DEF = {
default: 'remote' as 'none' | 'remote' | 'always',
},
emojiPickerScale: {
- default: 1,
+ default: 2,
},
emojiPickerWidth: {
- default: 1,
+ default: 2,
},
emojiPickerHeight: {
- default: 2,
+ default: 3,
},
emojiPickerStyle: {
default: 'auto' as 'auto' | 'popup' | 'drawer',
diff --git a/packages/frontend/src/router/definition.ts b/packages/frontend/src/router/definition.ts
index 93dd081127..752356497e 100644
--- a/packages/frontend/src/router/definition.ts
+++ b/packages/frontend/src/router/definition.ts
@@ -66,9 +66,9 @@ const routes: RouteDef[] = [{
name: 'privacy',
component: page(() => import('@/pages/settings/privacy.vue')),
}, {
- path: '/emoji-picker',
- name: 'emojiPicker',
- component: page(() => import('@/pages/settings/emoji-picker.vue')),
+ path: '/emoji-palette',
+ name: 'emoji-palette',
+ component: page(() => import('@/pages/settings/emoji-palette.vue')),
}, {
path: '/drive',
name: 'drive',
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 738a57d233..6eebcd1ead 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -39,14 +39,6 @@ export const store = markRaw(new Storage('base', {
where: 'account',
default: null,
},
- reactions: {
- where: 'account',
- default: ['👍', '❤️', '😆', '🤔', '😮', '🎉', '💢', '😥', '😇', '🍮'],
- },
- pinnedEmojis: {
- where: 'account',
- default: [],
- },
reactionAcceptance: {
where: 'account',
default: 'nonSensitiveOnly' as 'likeOnly' | 'likeOnlyForRemote' | 'nonSensitiveOnly' | 'nonSensitiveOnlyForLocalLikeOnlyForRemote' | null,
@@ -127,6 +119,14 @@ export const store = markRaw(new Storage('base', {
},
//#region TODO: そのうち消す (preferに移行済み)
+ reactions: {
+ where: 'account',
+ default: ['👍', '❤️', '😆', '🤔', '😮', '🎉', '💢', '😥', '😇', '🍮'],
+ },
+ pinnedEmojis: {
+ where: 'account',
+ default: [],
+ },
widgets: {
where: 'account',
default: [] as {
diff --git a/packages/frontend/src/utility/autogen/settings-search-index.ts b/packages/frontend/src/utility/autogen/settings-search-index.ts
index 52100ab639..4f1a94f266 100644
--- a/packages/frontend/src/utility/autogen/settings-search-index.ts
+++ b/packages/frontend/src/utility/autogen/settings-search-index.ts
@@ -536,6 +536,57 @@ export const searchIndexes: SearchIndexItem[] = [
path: '/settings/mute-block',
icon: 'ti ti-ban',
},
+ {
+ id: 'yR1OSyLiT',
+ children: [
+ {
+ id: 'yMJzyzOUk',
+ label: i18n.ts._emojiPalette.enableSyncBetweenDevicesForPalettes,
+ keywords: ['sync', 'palettes', 'devices'],
+ },
+ {
+ id: 'wCE09vgZr',
+ label: i18n.ts._emojiPalette.paletteForMain,
+ keywords: ['main', 'palette'],
+ },
+ {
+ id: 'uCzRPrSNx',
+ label: i18n.ts._emojiPalette.paletteForReaction,
+ keywords: ['reaction', 'palette'],
+ },
+ {
+ id: 'hgQr28WUk',
+ children: [
+ {
+ id: 'fY04NIHSQ',
+ label: i18n.ts.size,
+ keywords: ['emoji', 'picker', 'scale', 'size'],
+ },
+ {
+ id: '3j7vlaL7t',
+ label: i18n.ts.numberOfColumn,
+ keywords: ['emoji', 'picker', 'width', 'column', 'size'],
+ },
+ {
+ id: 'zPX8z1Bcy',
+ label: i18n.ts.height,
+ keywords: ['emoji', 'picker', 'height', 'size'],
+ },
+ {
+ id: '2CSkZa4tl',
+ label: i18n.ts.style,
+ keywords: ['emoji', 'picker', 'style'],
+ },
+ ],
+ label: i18n.ts.emojiPickerDisplay,
+ keywords: ['emoji', 'picker', 'display'],
+ },
+ ],
+ label: i18n.ts.emojiPalette,
+ keywords: ['emoji', 'palette'],
+ path: '/settings/emoji-palette',
+ icon: 'ti ti-mood-happy',
+ },
{
id: '3Tcxw4Fwl',
children: [
@@ -608,23 +659,28 @@ export const searchIndexes: SearchIndexItem[] = [
id: 'FfZdOs8y',
children: [
{
- id: 'lVlkdP4zN',
+ id: 'B1ZU6Ur54',
+ label: i18n.ts._deck.enableSyncBetweenDevicesForProfiles,
+ keywords: ['sync', 'profiles', 'devices'],
+ },
+ {
+ id: 'iEF0gqNAo',
label: i18n.ts._deck.useSimpleUiForNonRootPages,
keywords: ['ui', 'root', 'page'],
},
{
- id: 'avgxEYgsi',
+ id: 'BNdSeWxZn',
label: i18n.ts.defaultNavigationBehaviour,
keywords: ['default', 'navigation', 'behaviour', 'window'],
},
{
- id: 'ma7OSw5JK',
+ id: 'zT9pGm8DF',
label: i18n.ts._deck.alwaysShowMainColumn,
keywords: ['always', 'show', 'main', 'column'],
},
{
- id: 'jjTlUDhJH',
- label: 'Unnamed marker',
+ id: '5dk2xv1vc',
+ label: i18n.ts._deck.columnAlign,
keywords: ['column', 'align'],
},
],
diff --git a/packages/frontend/src/utility/emoji-picker.ts b/packages/frontend/src/utility/emoji-picker.ts
index e7275b86f2..6279786b2d 100644
--- a/packages/frontend/src/utility/emoji-picker.ts
+++ b/packages/frontend/src/utility/emoji-picker.ts
@@ -3,10 +3,10 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
-import { defineAsyncComponent, ref } from 'vue';
+import { defineAsyncComponent, ref, watch } from 'vue';
import type { Ref } from 'vue';
import { popup } from '@/os.js';
-import { store } from '@/store.js';
+import { prefer } from '@/preferences.js';
/**
* 絵文字ピッカーを表示する。
@@ -25,7 +25,14 @@ class EmojiPicker {
}
public async init() {
- const emojisRef = store.r.pinnedEmojis;
+ const emojisRef = ref([]);
+
+ watch([prefer.r.emojiPaletteForMain, prefer.r.emojiPalettes], () => {
+ emojisRef.value = prefer.s.emojiPaletteForMain == null ? prefer.s.emojiPalettes[0].emojis : prefer.s.emojiPalettes.find(palette => palette.id === prefer.s.emojiPaletteForMain)?.emojis ?? [];
+ }, {
+ immediate: true,
+ });
+
await popup(defineAsyncComponent(() => import('@/components/MkEmojiPickerDialog.vue')), {
src: this.src,
pinnedEmojis: emojisRef,
diff --git a/packages/frontend/src/utility/reaction-picker.ts b/packages/frontend/src/utility/reaction-picker.ts
index 200fb0b686..7c159fa2da 100644
--- a/packages/frontend/src/utility/reaction-picker.ts
+++ b/packages/frontend/src/utility/reaction-picker.ts
@@ -4,10 +4,10 @@
*/
import * as Misskey from 'misskey-js';
-import { defineAsyncComponent, ref } from 'vue';
+import { defineAsyncComponent, ref, watch } from 'vue';
import type { Ref } from 'vue';
import { popup } from '@/os.js';
-import { store } from '@/store.js';
+import { prefer } from '@/preferences.js';
class ReactionPicker {
private src: Ref = ref(null);
@@ -21,7 +21,14 @@ class ReactionPicker {
}
public async init() {
- const reactionsRef = store.r.reactions;
+ const reactionsRef = ref([]);
+
+ watch([prefer.r.emojiPaletteForReaction, prefer.r.emojiPalettes], () => {
+ reactionsRef.value = prefer.s.emojiPaletteForReaction == null ? prefer.s.emojiPalettes[0].emojis : prefer.s.emojiPalettes.find(palette => palette.id === prefer.s.emojiPaletteForReaction)?.emojis ?? [];
+ }, {
+ immediate: true,
+ });
+
await popup(defineAsyncComponent(() => import('@/components/MkEmojiPickerDialog.vue')), {
src: this.src,
pinnedEmojis: reactionsRef,
From 5d228fb0f32aca9337c8b8a9ea9544f28d981f34 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Thu, 13 Mar 2025 17:39:53 +0900
Subject: [PATCH 112/348] enhance(frontend): re-organize settings page
---
locales/index.d.ts | 4 +
locales/ja-JP.yml | 1 +
.../src/pages/settings/accessibility.vue | 51 ++
.../src/pages/settings/appearance.vue | 325 ---------
.../frontend/src/pages/settings/index.vue | 5 -
.../src/pages/settings/preferences.vue | 668 ++++++++++++------
packages/frontend/src/router/definition.ts | 4 -
.../utility/autogen/settings-search-index.ts | 423 ++++++-----
8 files changed, 702 insertions(+), 779 deletions(-)
delete mode 100644 packages/frontend/src/pages/settings/appearance.vue
diff --git a/locales/index.d.ts b/locales/index.d.ts
index b814bb70e1..f579aadb5d 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -5342,6 +5342,10 @@ export interface Locale extends ILocale {
* 絵文字パレット
*/
"emojiPalette": string;
+ /**
+ * 投稿フォーム
+ */
+ "postForm": string;
"_emojiPalette": {
/**
* パレット
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index b51a839715..2151a06611 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1331,6 +1331,7 @@ preferenceSyncConflictChoiceDevice: "デバイスの設定値"
preferenceSyncConflictChoiceCancel: "同期の有効化をキャンセル"
paste: "ペースト"
emojiPalette: "絵文字パレット"
+postForm: "投稿フォーム"
_emojiPalette:
palettes: "パレット"
diff --git a/packages/frontend/src/pages/settings/accessibility.vue b/packages/frontend/src/pages/settings/accessibility.vue
index 3dbb039a17..f7b1e7d2a0 100644
--- a/packages/frontend/src/pages/settings/accessibility.vue
+++ b/packages/frontend/src/pages/settings/accessibility.vue
@@ -60,6 +60,17 @@ SPDX-License-Identifier: AGPL-3.0-only
+
- {{ i18n.ts._deck.useSimpleUiForNonRootPages }}
+
+ {{ i18n.ts._deck.alwaysShowMainColumn }}
+
+
+ {{ i18n.ts._deck.columnAlign }}
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/pages/settings/emoji-palette.vue b/packages/frontend/src/pages/settings/emoji-palette.vue
new file mode 100644
index 0000000000..398228e226
--- /dev/null
+++ b/packages/frontend/src/pages/settings/emoji-palette.vue
@@ -0,0 +1,251 @@
+
+
+
+
+ {{ i18n.ts._deck.enableSyncBetweenDevicesForProfiles }}
- {{ i18n.ts.defaultNavigationBehaviour }}: {{ i18n.ts.openInWindow }}
+ {{ i18n.ts._deck.useSimpleUiForNonRootPages }}
- {{ i18n.ts._deck.alwaysShowMainColumn }}
+ {{ i18n.ts.defaultNavigationBehaviour }}: {{ i18n.ts.openInWindow }}
-
- {{ i18n.ts._deck.columnAlign }}
-
-
-
-
+
+
+ {{ i18n.ts._emojiPalette.palettes }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.emojiPickerDisplay }}
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts._emojiPalette.enableSyncBetweenDevicesForPalettes }}
+
+
+
+
+
+
+
+ {{ i18n.ts._emojiPalette.paletteForMain }}
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts._emojiPalette.paletteForReaction }}
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.size }}
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.numberOfColumn }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.height }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.style }}
+ {{ i18n.ts.needReloadToApply }}
+
+
+
+
+
+
+
+ {{ i18n.ts.preview }}
+
+
-
-
- {{ i18n.ts.pinned }} ({{ i18n.ts.reaction }})
- {{ i18n.ts.pinnedEmojisForReactionSettingDescription }}
-
-
-
-
-
- {{ i18n.ts.pinned }} ({{ i18n.ts.general }})
- {{ i18n.ts.pinnedEmojisSettingDescription }}
-
-
-
-
- {{ i18n.ts.emojiPickerDisplay }}
-
-
-
-
-
-
-
-
diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue
index 7bbec82757..debcd4bd3e 100644
--- a/packages/frontend/src/pages/settings/index.vue
+++ b/packages/frontend/src/pages/settings/index.vue
@@ -86,11 +86,6 @@ const menuDef = computed
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ i18n.ts.reactionSettingDescription2 }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ i18n.ts.reactionSettingDescription2 }}
-
-
-
- {{ i18n.ts.size }}
-
-
-
-
-
-
-
-
- {{ i18n.ts.numberOfColumn }}
-
-
-
-
-
-
-
-
-
-
- {{ i18n.ts.height }}
-
-
-
-
-
-
-
-
-
- {{ i18n.ts.style }}
- {{ i18n.ts.needReloadToApply }}
-
-
-
-
-
-
-
-
- {{ i18n.ts._settings.appearanceBanner }}
-
-
-
-
-
-
-
- {{ i18n.ts.displayOfNote }}
-
-
-
-
-
-
- {{ i18n.ts.notificationDisplay }}
-
-
-
-
-
- {{ i18n.ts.customCss }}
-
-
-
-
-
-
- {{ i18n.ts.menuStyle }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ i18n.ts.fontSize }}
-
-
-
-
-
-
-
-
-
- {{ i18n.ts.useSystemFont }}
-
-
-
-
-
-
-
- {{ i18n.ts.useBlurEffect }}
-
-
-
-
-
-
-
- {{ i18n.ts.useBlurEffectForModal }}
-
-
-
-
-
-
-
- {{ i18n.ts.highlightSensitiveMedia }}
-
-
-
-
-
-
-
- {{ i18n.ts.squareAvatars }}
-
-
-
-
-
-
-
- {{ i18n.ts.showAvatarDecorations }}
-
-
-
-
-
-
-
- {{ i18n.ts.showGapBetweenNotesInTimeline }}
-
-
-
-
-
-
-
- {{ i18n.ts.seasonalScreenEffect }}
-
-
-
-
-
-
-
- {{ i18n.ts.emojiStyle }}
-
-
-
-
-
-
-
-
-
- {{ i18n.ts.reactionsDisplaySize }}
-
-
-
-
-
-
-
-
-
-
- {{ i18n.ts.limitWidthOfReaction }}
-
-
-
-
-
-
-
- {{ i18n.ts.mediaListWithOneImageAppearance }}
-
-
-
-
-
-
-
-
-
-
-
- {{ i18n.ts.instanceTicker }}
-
-
-
-
-
-
-
-
-
-
- {{ i18n.ts.displayOfSensitiveMedia }}
-
-
-
-
-
-
-
-
-
-
-
- {{ i18n.ts.position }}
-
-
-
-
-
-
-
-
-
-
-
- {{ i18n.ts.stackAxis }}
-
-
-
-
-
-
- {{ i18n.ts._notification.checkNotificationBehavior }}
-
-
-
-
-
- {{ i18n.ts.showFixedPostForm }}
-
-
-
-
-
-
-
- {{ i18n.ts.showFixedPostFormInChannel }}
-
-
-
-
-
-
- {{ i18n.ts.pinnedList }}
-
- {{ i18n.ts.add }}
- {{ i18n.ts.remove }}
-
-
-
-
-
-
- {{ i18n.ts.enableQuickAddMfmFunction }}
-
-
-
-
-
-
-
-
- {{ i18n.ts.rememberNoteVisibility }}
-
-
-
-
-
-
-
- {{ i18n.ts.defaultNoteVisibility }}
- {{ i18n.ts._visibility.public }}
- {{ i18n.ts._visibility.home }}
- {{ i18n.ts._visibility.followers }}
- {{ i18n.ts._visibility.specified }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ i18n.ts._visibility.disableFederation }}
-
-
-
+
+
+ {{ i18n.ts.uiLanguage }}
+
+
+
+
+ Crowdin
+
+
+
+
+
+
+
+
+ {{ i18n.ts.overridedDeviceKind }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.pinnedList }}
+
+ {{ i18n.ts.add }}
+ {{ i18n.ts.remove }}
+
+
+
+
-
-
-
- {{ i18n.ts.collapseRenotes }}
- {{ i18n.ts.collapseRenotesDescription }}
+
+
+
+ {{ i18n.ts.useBlurEffect }}
+
+
+
+ {{ i18n.ts.useBlurEffectForModal }}
+
+
+
+
+
+
+
+ {{ i18n.ts.showAvatarDecorations }}
+
+
+
+
+
+
+
+ {{ i18n.ts.alwaysConfirmFollow }}
+
+
+
+
+
+
+
+ {{ i18n.ts.highlightSensitiveMedia }}
+
+
+
+
+
+
+
+ {{ i18n.ts.confirmWhenRevealingSensitiveMedia }}
+
+
+
+
+
+
+
+ {{ i18n.ts.emojiStyle }}
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.showFixedPostForm }}
+
+
+
+
+
+
+
+ {{ i18n.ts.showFixedPostFormInChannel }}
+
+
+
+
+
+
+
+ {{ i18n.ts.collapseRenotes }}
+ {{ i18n.ts.collapseRenotesDescription }}
+
+
+
+
+
+
+
+ {{ i18n.ts.showGapBetweenNotesInTimeline }}
+
+
+
+
+
+
+
+ {{ i18n.ts.enableInfiniteScroll }}
+
+
+
+
+
+
+
+ {{ i18n.ts.disableStreamingTimeline }}
+
+
+
+
+
+
@@ -157,6 +210,14 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
+
+ {{ i18n.ts.confirmOnReact }}
+
+
+
+
@@ -164,40 +225,6 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
-
-
-
-
- {{ i18n.ts.useGroupedNotifications }}
-
-
-
-
-
-
-
-
- {{ i18n.ts.enableInfiniteScroll }}
-
-
-
+
+
+
+ {{ i18n.ts.reactionsDisplaySize }}
+
+
+
+
+
+
-
-
-
- {{ i18n.ts.disableStreamingTimeline }}
-
-
-
+
+
+
+ {{ i18n.ts.limitWidthOfReaction }}
+
+
+
-
-
-
- {{ i18n.ts.alwaysConfirmFollow }}
-
-
-
+
+
+
+ {{ i18n.ts.mediaListWithOneImageAppearance }}
+
+
+
+
+
+
+
-
-
-
- {{ i18n.ts.confirmWhenRevealingSensitiveMedia }}
-
-
-
+
+
+
+ {{ i18n.ts.instanceTicker }}
+
+
+
+
+
+
-
-
-
- {{ i18n.ts.confirmOnReact }}
-
-
-
+
+
+
+ {{ i18n.ts.displayOfSensitiveMedia }}
+
+
+
+
+
+
+
+
+
-
-
-
- {{ i18n.ts.openImageInNewTab }}
-
-
-
@@ -206,47 +233,70 @@ SPDX-License-Identifier: AGPL-3.0-only
+
-
+
@@ -254,6 +304,123 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
+
+
+ {{ i18n.ts.rememberNoteVisibility }}
+
+
+
+
+
+
+
+ {{ i18n.ts.enableQuickAddMfmFunction }}
+
+
+
+
+
+
+
+
+ {{ i18n.ts.defaultNoteVisibility }}
+ {{ i18n.ts._visibility.public }}
+ {{ i18n.ts._visibility.home }}
+ {{ i18n.ts._visibility.followers }}
+ {{ i18n.ts._visibility.specified }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts._visibility.disableFederation }}
+
+
+
+
+
+
+ {{ i18n.ts.useGroupedNotifications }}
+
+
+
+
+
+
+
+ {{ i18n.ts.position }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts.stackAxis }}
+
+
+
+
+
+
+ {{ i18n.ts._notification.checkNotificationBehavior }}
+
+
+
@@ -276,47 +443,6 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
- {{ i18n.ts.dataSaver }}
-
-
-
-
-
+
+
+
+ {{ i18n.ts.squareAvatars }}
+
+
+
+
+
+
+
+ {{ i18n.ts.seasonalScreenEffect }}
+
+
+
+
+
+
+
+ {{ i18n.ts.openImageInNewTab }}
+
+
+
- {{ i18n.ts.reloadRequiredToApplySettings }}
-
-
-
-
-
- {{ i18n.ts._dataSaver._media.title }}
- {{ i18n.ts._dataSaver._media.description }}
-
-
- {{ i18n.ts._dataSaver._avatar.title }}
- {{ i18n.ts._dataSaver._avatar.description }}
-
-
- {{ i18n.ts._dataSaver._urlPreview.title }}
- {{ i18n.ts._dataSaver._urlPreview.description }}
-
-
- {{ i18n.ts._dataSaver._code.title }}
- {{ i18n.ts._dataSaver._code.description }}
-
-
-
- {{ i18n.ts.deck }}
-
-
+ {{ i18n.ts.reloadRequiredToApplySettings }}
+
+
+
+
+
+ {{ i18n.ts._dataSaver._media.title }}
+ {{ i18n.ts._dataSaver._media.description }}
+
+
+ {{ i18n.ts._dataSaver._avatar.title }}
+ {{ i18n.ts._dataSaver._avatar.description }}
+
+
+ {{ i18n.ts._dataSaver._urlPreview.title }}
+ {{ i18n.ts._dataSaver._urlPreview.description }}
+
+
+ {{ i18n.ts._dataSaver._code.title }}
+ {{ i18n.ts._dataSaver._code.description }}
+
+
+
-
-
-
- {{ i18n.ts.accountInfo }}
+
- {{ i18n.ts.registry }}
-
+
-
-
+ {{ i18n.ts.registry }}
@@ -137,7 +127,6 @@ import MkKeyValue from '@/components/MkKeyValue.vue';
import MkButton from '@/components/MkButton.vue';
import * as os from '@/os.js';
import { misskeyApi } from '@/utility/misskey-api.js';
-import { store } from '@/store.js';
import { signout, signinRequired } from '@/account.js';
import { i18n } from '@/i18n.js';
import { definePage } from '@/page.js';
@@ -152,7 +141,6 @@ const reportError = prefer.model('reportError');
const enableCondensedLine = prefer.model('enableCondensedLine');
const skipNoteRender = prefer.model('skipNoteRender');
const devMode = prefer.model('devMode');
-const defaultWithReplies = computed(store.makeGetterSetter('defaultWithReplies'));
watch(skipNoteRender, async () => {
await reloadAsk({ reason: i18n.ts.reloadToApplySetting, unison: true });
@@ -182,16 +170,6 @@ async function deleteAccount() {
await signout();
}
-async function updateRepliesAll(withReplies: boolean) {
- const { canceled } = await os.confirm({
- type: 'warning',
- text: withReplies ? i18n.ts.confirmShowRepliesAll : i18n.ts.confirmHideRepliesAll,
- });
- if (canceled) return;
-
- misskeyApi('following/update-all', { withReplies });
-}
-
const headerActions = computed(() => []);
const headerTabs = computed(() => []);
diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue
index 94d154e9c7..87d80602ad 100644
--- a/packages/frontend/src/pages/settings/preferences.vue
+++ b/packages/frontend/src/pages/settings/preferences.vue
@@ -393,6 +393,39 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
+
+
+ {{ i18n.ts.accountInfo }}
-
+
+
-
-
- ID
- {{ $i.id }}
-
+
-
-
- {{ i18n.ts.rolesAssignedToMe }}
+
+
+
+ {{ i18n.ts.rolesAssignedToMe }}
-
-
+
+
-
-
-
- {{ i18n.ts.accountMigration }}
+
+
+
+ {{ i18n.ts.accountMigration }}
-
-
+
+
-
-
-
- {{ i18n.ts.closeAccount }}
+
+
+
+ {{ i18n.ts.closeAccount }}
-
-
+
+
-
-
-
- {{ i18n.ts.experimentalFeatures }}
+
+
+
+ {{ i18n.ts.experimentalFeatures }}
-
-
+
+
-
-
-
- {{ i18n.ts.developer }}
+
+
+
+ {{ i18n.ts.developer }}
-
-
-
-
+
+
+ ID
+ {{ $i.id }}
+
-
- {{ i18n.ts.registeredDate }}
-
+
+ {{ i18n.ts.registeredDate }}
+
-
-
- {{ i18n.ts._role.policies }}
+
+
+ {{ i18n.ts._role.policies }}
-
+
+
+
-
-
+
- {{ policy }} ... {{ $i.policies[policy] }}
-
+
+
-
-
+
+ {{ policy }} ... {{ $i.policies[policy] }}
-
-
- {{ i18n.ts._accountDelete.mayTakeTime }}
- {{ i18n.ts._accountDelete.sendEmail }}
- {{ i18n.ts._accountDelete.requestAccountDelete }} {{ i18n.ts._accountDelete.inProgress }}
-
-
+ {{ i18n.ts._accountDelete.mayTakeTime }}
+ {{ i18n.ts._accountDelete.sendEmail }}
+ {{ i18n.ts._accountDelete.requestAccountDelete }} {{ i18n.ts._accountDelete.inProgress }}
+
+
-
- Enable condensed line
-
-
- Enable note render skipping
-
-
-
+
+ Enable condensed line
+
+
+ Enable note render skipping
+
+
+
-
- {{ i18n.ts.devMode }}
-
-
-
+
+ {{ i18n.ts.devMode }}
+
+
+ -
- {{ i18n.ts.withRepliesByDefaultForNewlyFollowed }}
- {{ i18n.ts.showRepliesToOthersInTimelineAll }}
- {{ i18n.ts.hideRepliesToOthersInTimelineAll }}
-
-
+ {{ i18n.ts.reloadRequiredToApplySettings }}
+
+
+
+
+
+ {{ i18n.ts._dataSaver._media.title }}
+ {{ i18n.ts._dataSaver._media.description }}
+
+
+ {{ i18n.ts._dataSaver._avatar.title }}
+ {{ i18n.ts._dataSaver._avatar.description }}
+
+
+ {{ i18n.ts._dataSaver._urlPreview.title }}
+ {{ i18n.ts._dataSaver._urlPreview.description }}
+
+
+ {{ i18n.ts._dataSaver._code.title }}
+ {{ i18n.ts._dataSaver._code.description }}
+
+
+ -
- {{ i18n.ts.reloadRequiredToApplySettings }}
-
-
-
-
-
- {{ i18n.ts._dataSaver._media.title }}
- {{ i18n.ts._dataSaver._media.description }}
-
-
- {{ i18n.ts._dataSaver._avatar.title }}
- {{ i18n.ts._dataSaver._avatar.description }}
-
-
- {{ i18n.ts._dataSaver._urlPreview.title }}
- {{ i18n.ts._dataSaver._urlPreview.description }}
-
-
- {{ i18n.ts._dataSaver._code.title }}
- {{ i18n.ts._dataSaver._code.description }}
-
-
-
+ {{ i18n.ts.navbar }}
+ {{ i18n.ts.statusbar }}
+ {{ i18n.ts.deck }}
{{ i18n.ts.customCss }}
- ![]()
+ ![]()
{{ i18n.ts.notFoundDescription }}
- ![]()
+ ![]()
@@ -19,9 +19,9 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.notFound }}
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index d57300f647..eb278a0d7e 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -20,7 +20,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.textCount }}
+
+
+
+{{ number(textLength) }} / {{ number(maxTextLength) }}
+
-
-