From 11204eeb43fd02ed48e1099e07f07ee419a7e671 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Mon, 1 Sep 2025 09:50:36 +0900 Subject: [PATCH 1/5] refactor --- packages/frontend/.storybook/fakes.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/frontend/.storybook/fakes.ts b/packages/frontend/.storybook/fakes.ts index 9cd8ac474c..ed29c63471 100644 --- a/packages/frontend/.storybook/fakes.ts +++ b/packages/frontend/.storybook/fakes.ts @@ -207,6 +207,7 @@ export function federationInstance(): entities.FederationInstance { isSuspended: false, suspensionState: 'none', isBlocked: false, + isMediaSilenced: false, softwareName: 'misskey', softwareVersion: '2024.5.0', openRegistrations: false, @@ -311,6 +312,8 @@ export function userDetailed(id = 'someuserid', username = 'miskist', host: enti alsoKnownAs: null, notify: 'none', memo: null, + canChat: true, + chatScope: 'everyone', }; } @@ -378,6 +381,7 @@ export function role(params: { asBadge: params.asBadge ?? true, canEditMembersByModerator: params.canEditMembersByModerator ?? false, usersCount: params.usersCount ?? 10, + preserveAssignmentOnMoveAccount: false, condFormula: { id: '', type: 'or', From 18e42cc83d929f3029d893fdae24916ed60fde56 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Mon, 1 Sep 2025 09:53:38 +0900 Subject: [PATCH 2/5] refactoe --- packages/frontend/src/pages/drop-and-fusion.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/pages/drop-and-fusion.vue b/packages/frontend/src/pages/drop-and-fusion.vue index bc957ff38a..c1a8b992b7 100644 --- a/packages/frontend/src/pages/drop-and-fusion.vue +++ b/packages/frontend/src/pages/drop-and-fusion.vue @@ -48,8 +48,8 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.tsx.lastNDays({ n: 7 }) }} {{ i18n.ts.ranking }} ({{ gameMode.toUpperCase() }})
- - + + {{ r.score.toLocaleString() }} {{ getScoreUnit(gameMode) }}
@@ -87,6 +87,7 @@ SPDX-License-Identifier: AGPL-3.0-only diff --git a/packages/frontend/src/components/grid/MkDataCell.vue b/packages/frontend/src/components/grid/MkDataCell.vue index 0f326b14ca..6f1dae8398 100644 --- a/packages/frontend/src/components/grid/MkDataCell.vue +++ b/packages/frontend/src/components/grid/MkDataCell.vue @@ -48,6 +48,7 @@ SPDX-License-Identifier: AGPL-3.0-only
import('./index.timeline.vue')); const props = withDefaults(defineProps<{ user: Misskey.entities.UserDetailed; /** Test only; MkNotesTimeline currently causes problems in vitest */ - disableNotes: boolean; + disableNotes?: boolean; }>(), { disableNotes: false, }); From bdec4bf87a546efd07b7c0076d9205f690ce021f Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Mon, 1 Sep 2025 10:16:33 +0900 Subject: [PATCH 4/5] refactor --- packages/frontend/src/pages/user/activity.following.vue | 1 - packages/frontend/src/pages/user/activity.notes.vue | 1 - packages/frontend/src/pages/user/activity.pv.vue | 1 - packages/frontend/src/plugin.ts | 4 ++-- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/frontend/src/pages/user/activity.following.vue b/packages/frontend/src/pages/user/activity.following.vue index 882b45080e..d1cfa5356b 100644 --- a/packages/frontend/src/pages/user/activity.following.vue +++ b/packages/frontend/src/pages/user/activity.following.vue @@ -117,7 +117,6 @@ async function renderChart() { offset: true, stacked: true, time: { - stepSize: 1, unit: 'day', displayFormats: { day: 'M/d', diff --git a/packages/frontend/src/pages/user/activity.notes.vue b/packages/frontend/src/pages/user/activity.notes.vue index 39c9fd7950..1cf7a00716 100644 --- a/packages/frontend/src/pages/user/activity.notes.vue +++ b/packages/frontend/src/pages/user/activity.notes.vue @@ -116,7 +116,6 @@ async function renderChart() { offset: true, stacked: true, time: { - stepSize: 1, unit: 'day', displayFormats: { day: 'M/d', diff --git a/packages/frontend/src/pages/user/activity.pv.vue b/packages/frontend/src/pages/user/activity.pv.vue index 9e1b92058b..2539a6777b 100644 --- a/packages/frontend/src/pages/user/activity.pv.vue +++ b/packages/frontend/src/pages/user/activity.pv.vue @@ -117,7 +117,6 @@ async function renderChart() { offset: true, stacked: true, time: { - stepSize: 1, unit: 'day', displayFormats: { day: 'M/d', diff --git a/packages/frontend/src/plugin.ts b/packages/frontend/src/plugin.ts index 346e275575..657197d1b3 100644 --- a/packages/frontend/src/plugin.ts +++ b/packages/frontend/src/plugin.ts @@ -205,13 +205,13 @@ type HandlerDef = { handler: (note: Misskey.entities.Note) => void; }; note_view_interruptor: { - handler: (note: Misskey.entities.Note) => unknown; + handler: (note: Misskey.entities.Note) => Misskey.entities.Note; }; note_post_interruptor: { handler: (note: FIXME) => unknown; }; page_view_interruptor: { - handler: (page: Misskey.entities.Page) => unknown; + handler: (page: Misskey.entities.Page) => Misskey.entities.Page; }; }; From 08ecf7ca79812cb904d2861ec82a67260a6819bf Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Mon, 1 Sep 2025 10:19:14 +0900 Subject: [PATCH 5/5] refactor --- packages/frontend/src/pages/admin/security.vue | 2 +- packages/frontend/src/pages/channel-editor.vue | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/pages/admin/security.vue b/packages/frontend/src/pages/admin/security.vue index 27e35c7e69..fa93124daa 100644 --- a/packages/frontend/src/pages/admin/security.vue +++ b/packages/frontend/src/pages/admin/security.vue @@ -194,7 +194,7 @@ const sensitiveMediaDetectionForm = useForm({ state.sensitiveMediaDetectionSensitivity === 2 ? 'medium' : state.sensitiveMediaDetectionSensitivity === 3 ? 'high' : state.sensitiveMediaDetectionSensitivity === 4 ? 'veryHigh' : - 0, + null as never, setSensitiveFlagAutomatically: state.setSensitiveFlagAutomatically, enableSensitiveMediaDetectionForVideos: state.enableSensitiveMediaDetectionForVideos, }); diff --git a/packages/frontend/src/pages/channel-editor.vue b/packages/frontend/src/pages/channel-editor.vue index ce26a26109..251f5d557d 100644 --- a/packages/frontend/src/pages/channel-editor.vue +++ b/packages/frontend/src/pages/channel-editor.vue @@ -138,9 +138,10 @@ async function addPinnedNote() { const { canceled, result: value } = await os.inputText({ title: i18n.ts.noteIdOrUrl, }); - if (canceled) return; + if (canceled || value == null) return; + const fromUrl = value.includes('/') ? value.split('/').pop() : null; const note = await os.apiWithDialog('notes/show', { - noteId: value.includes('/') ? value.split('/').pop() : value, + noteId: fromUrl ?? value, }); pinnedNotes.value = [{ id: note.id,