From d3db5d57e814aa05fe6014951f2a4719c9bd3802 Mon Sep 17 00:00:00 2001
From: 1673beta <rekishinomori@gmail.com>
Date: Thu, 21 Mar 2024 01:06:55 +0900
Subject: [PATCH 1/6] fix

---
 packages/frontend/src/components/MkTimeline.vue | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue
index ce6162ee15..34e0e83126 100644
--- a/packages/frontend/src/components/MkTimeline.vue
+++ b/packages/frontend/src/components/MkTimeline.vue
@@ -31,7 +31,7 @@ import { vibrate } from '@/scripts/vibrate.js';
 import { globalEvents } from '@/events.js';
 
 const props = withDefaults(defineProps<{
-	src: 'home' | 'local' | 'social' | 'global' | 'mentions' | 'directs' | 'list' | 'antenna' | 'channel' | 'role';
+	src: 'home' | 'local' | 'social' | 'global' | 'media' | 'mentions' | 'directs' | 'list' | 'antenna' | 'channel' | 'role';
 	list?: string;
 	antenna?: string;
 	channel?: string;
@@ -124,11 +124,9 @@ function connectChannel() {
 			withReplies: props.withReplies,
 			withFiles: true,
 			withCats: props.onlyCats,
-		}
+		},
 		);
-	}
-
-	else if (props.src === 'social') {
+	} else if (props.src === 'social') {
 		connection = stream.useChannel('hybridTimeline', {
 			withRenotes: props.withRenotes,
 			withReplies: props.withReplies,
@@ -211,9 +209,7 @@ function updatePaginationQuery() {
 			withFiles: true,
 			withCats: props.onlyCats,
 		};
-	}
-
-	else if (props.src === 'social') {
+	} else if (props.src === 'social') {
 		endpoint = 'notes/hybrid-timeline';
 		query = {
 			withRenotes: props.withRenotes,

From d0ca340aba7e903ac43ad38a64b6476b96dc7846 Mon Sep 17 00:00:00 2001
From: 1673beta <rekishinomori@gmail.com>
Date: Thu, 21 Mar 2024 18:31:02 +0900
Subject: [PATCH 2/6] =?UTF-8?q?Revert=20"enhance(frontend):=20=E3=83=AA?=
 =?UTF-8?q?=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE=E7=B7=8F?=
 =?UTF-8?q?=E6=95=B0=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=20(#13532)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7ead98cbe592e6911e4a54550cb7bb507e782d7c.
---
 CHANGELOG.md                                  |  6 --
 locales/index.d.ts                            |  4 -
 locales/ja-JP.yml                             |  1 -
 .../src/core/entities/NoteEntityService.ts    |  1 -
 .../backend/src/models/json-schema/note.ts    |  4 -
 packages/cherrypick-js/src/autogen/types.ts   |  1 -
 packages/frontend/src/components/MkNote.vue   | 64 +++++----------
 .../src/components/MkNoteDetailed.vue         | 77 +++++--------------
 .../src/components/MkNotification.vue         | 27 +++----
 .../src/components/MkTutorialDialog.Note.vue  |  1 -
 .../components/MkTutorialDialog.PostNote.vue  |  1 -
 .../components/MkTutorialDialog.Sensitive.vue |  1 -
 .../frontend/src/scripts/use-note-capture.ts  |  2 -
 packages/frontend/src/style.scss              | 13 ----
 14 files changed, 49 insertions(+), 154 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1bdcf5fbe..e62998a479 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,12 +5,6 @@
 
 ### Client
 - Enhance: 自分のノートの添付ファイルから直接ファイルの詳細ページに飛べるように
-- Enhance: 広告がMisskeyと同一ドメインの場合はRouterで遷移するように
-- Enhance: リアクション・いいねの総数を表示するように
-- Enhance: リアクション受け入れが「いいねのみ」の場合はリアクション絵文字一覧を表示しないように
-- Enhance: 設定>プラグインのページからプラグインの簡易的なログやエラーを見られるように
-  - 実装の都合により、プラグインは１つエラーを起こした時に即時停止するようになりました
-- Enhance: ページのデザインを変更	
 - Fix: 一部のページ内リンクが正しく動作しない問題を修正
 - Fix: 周年の実績が閏年を考慮しない問題を修正
 - Fix: ローカルURLのプレビューポップアップが左上に表示される
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 894cae710e..5484d4ffc1 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -10175,10 +10175,6 @@ export interface Locale extends ILocale {
          * {n}人がリアクションしました
          */
         "reactedBySomeUsers": ParameterizedString<"n">;
-        /**
-         * {n}人がいいねしました
-         */
-        "likedBySomeUsers": ParameterizedString<"n">;
         /**
          * {n}人がリノートしました
          */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 51bf23f254..4d30e90b94 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2688,7 +2688,6 @@ _notification:
   sendTestNotification: "テスト通知を送信する"
   notificationWillBeDisplayedLikeThis: "通知はこのように表示されます"
   reactedBySomeUsers: "{n}人がリアクションしました"
-  likedBySomeUsers: "{n}人がいいねしました"
   renotedBySomeUsers: "{n}人がリノートしました"
   followedBySomeUsers: "{n}人にフォローされました"
   flushNotification: "通知の履歴をリセットする"
diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index 43cc3fc010..5fda736b15 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -352,7 +352,6 @@ export class NoteEntityService implements OnModuleInit {
 			disableRightClick: note.disableRightClick || undefined,
 			renoteCount: note.renoteCount,
 			repliesCount: note.repliesCount,
-			reactionCount: Object.values(note.reactions).reduce((a, b) => a + b, 0),
 			reactions: this.reactionService.convertLegacyReactions(note.reactions),
 			reactionEmojis: this.customEmojiService.populateEmojis(reactionEmojiNames, host),
 			reactionAndUserPairCache: opts.withReactionAndUserPairCache ? note.reactionAndUserPairCache : undefined,
diff --git a/packages/backend/src/models/json-schema/note.ts b/packages/backend/src/models/json-schema/note.ts
index 4fe44ce0b6..00c2eac310 100644
--- a/packages/backend/src/models/json-schema/note.ts
+++ b/packages/backend/src/models/json-schema/note.ts
@@ -249,10 +249,6 @@ export const packedNoteSchema = {
 				}],
 			},
 		},
-		reactionCount: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
 		renoteCount: {
 			type: 'number',
 			optional: false, nullable: false,
diff --git a/packages/cherrypick-js/src/autogen/types.ts b/packages/cherrypick-js/src/autogen/types.ts
index b8d267fc19..1d24037a39 100644
--- a/packages/cherrypick-js/src/autogen/types.ts
+++ b/packages/cherrypick-js/src/autogen/types.ts
@@ -4322,7 +4322,6 @@ export type components = {
       reactions: {
         [key: string]: number;
       };
-      reactionCount: number;
       renoteCount: number;
       repliesCount: number;
       uri?: string;
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index ed3d000fd2..9bfbfcf11d 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -100,33 +100,22 @@ SPDX-License-Identifier: AGPL-3.0-only
 							</div>
 						</div>
 					</div>
-					<div v-if="viewTextSource">
-						<hr style="margin: 10px 0;">
-						<pre style="margin: initial;"><small>{{ appearNote.text }}</small></pre>
-						<button class="_button" style="padding-top: 5px; color: var(--accent);" @click.stop="viewTextSource = false"><small>{{ i18n.ts.close }}</small></button>
+					<div v-if="appearNote.files && appearNote.files.length > 0">
+						<MkMediaList :mediaList="appearNote.files"/>
 					</div>
+					<MkPoll v-if="appearNote.poll" :noteId="appearNote.id" :poll="appearNote.poll" :class="$style.poll"/>
+					<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" :class="$style.urlPreview"/>
+					<div v-if="appearNote.renote" :class="$style.quote"><MkNoteSimple :note="appearNote.renote" :class="$style.quoteNote"/></div>
+					<button v-if="isLong && collapsed" :class="$style.collapsed" class="_button" @click="collapsed = false">
+						<span :class="$style.collapsedLabel">{{ i18n.ts.showMore }}</span>
+					</button>
+					<button v-else-if="isLong && !collapsed" :class="$style.showLess" class="_button" @click="collapsed = true">
+						<span :class="$style.showLessLabel">{{ i18n.ts.showLess }}</span>
+					</button>
 				</div>
-				<div v-if="appearNote.files && appearNote.files.length > 0">
-					<MkMediaList v-if="appearNote.disableRightClick" :mediaList="appearNote.files" @click.stop @contextmenu.prevent/>
-					<MkMediaList v-else :mediaList="appearNote.files" @click.stop/>
-				</div>
-				<MkPoll v-if="appearNote.poll" :noteId="appearNote.id" :poll="appearNote.poll" :class="$style.poll" @click.stop/>
-				<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" :class="$style.urlPreview"/>
-				<button v-if="(isLong || (isMFM && defaultStore.state.collapseDefault) || (appearNote.files.length > 0 && defaultStore.state.allMediaNoteCollapse)) && collapsed" v-vibrate="defaultStore.state.vibrateSystem ? 5 : []" :class="$style.collapsed" class="_button" @click.stop="collapsed = false">
-					<span :class="$style.collapsedLabel">
-						{{ i18n.ts.showMore }}
-						<span v-if="appearNote.files.length > 0" :class="$style.label">({{ collapseLabel }})</span>
-					</span>
-				</button>
-				<button v-else-if="(isLong || (isMFM && defaultStore.state.collapseDefault) || (appearNote.files.length > 0 && defaultStore.state.allMediaNoteCollapse)) && !collapsed" v-vibrate="defaultStore.state.vibrateSystem ? 5 : []" :class="$style.showLess" class="_button" @click.stop="collapsed = true">
-					<span :class="$style.showLessLabel">{{ i18n.ts.showLess }}</span>
-				</button>
+				<MkA v-if="appearNote.channel && !inChannel" :class="$style.channel" :to="`/channels/${appearNote.channel.id}`"><i class="ti ti-device-tv"></i> {{ appearNote.channel.name }}</MkA>
 			</div>
-			<MkA v-if="appearNote.channel && !inChannel" :class="$style.channel" :to="`/channels/${appearNote.channel.id}`"><i class="ti ti-device-tv"></i> {{ appearNote.channel.name }}</MkA>
-		</div>
-		<div v-if="appearNote.renote" :class="$style.quote"><MkNoteSimple :note="appearNote.renote" :class="$style.quoteNote"/></div>
-		<div>
-			<MkReactionsViewer v-if="appearNote.reactionAcceptance !== 'likeOnly'" :note="appearNote" :maxNumber="16" @click.stop @contextmenu.prevent.stop @mockUpdateMyReaction="emitUpdReaction">
+			<MkReactionsViewer :note="appearNote" :maxNumber="16" @mockUpdateMyReaction="emitUpdReaction">
 				<template #more>
 					<div :class="$style.reactionOmitted">{{ i18n.ts.more }}</div>
 				</template>
@@ -136,9 +125,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<i class="ti ti-arrow-back-up"></i>
 					<p v-if="appearNote.repliesCount > 0" :class="$style.footerButtonCount">{{ number(appearNote.repliesCount) }}</p>
 				</button>
-				<button v-else :class="$style.footerButton" class="_button" disabled>
-					<i class="ti ti-ban"></i>
-				</button>
 				<button
 					v-if="canRenote"
 					ref="renoteButton"
@@ -149,20 +135,17 @@ SPDX-License-Identifier: AGPL-3.0-only
 					@click.stop="defaultStore.state.renoteQuoteButtonSeparation && ((!defaultStore.state.renoteVisibilitySelection && !appearNote.channel) || (appearNote.channel && !appearNote.channel.allowRenoteToExternal) || appearNote.visibility === 'followers') ? renoteOnly() : renote()"
 				>
 					<i class="ti ti-repeat"></i>
-					<p v-if="appearNote.renoteCount > 0" :class="$style.footerButtonCount">{{ number(appearNote.renoteCount) }}</p>
+					<p v-if="appearNote.renoteCount > 0" :class="$style.footerButtonCount">{{ appearNote.renoteCount }}</p>
 				</button>
 				<button v-else :class="$style.footerButton" class="_button" disabled>
 					<i class="ti ti-ban"></i>
 				</button>
-				<button v-if="appearNote.reactionAcceptance !== 'likeOnly' && appearNote.myReaction == null" ref="heartReactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" v-tooltip="i18n.ts.like" :class="$style.footerButton" class="_button" @click.stop="heartReact()">
-					<i class="ti ti-heart"></i>
+				<button v-if="appearNote.myReaction == null" ref="reactButton" :class="$style.footerButton" class="_button" @mousedown="react()">
+					<i v-if="appearNote.reactionAcceptance === 'likeOnly'" class="ti ti-heart"></i>
+					<i v-else class="ti ti-plus"></i>
 				</button>
-				<button ref="reactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" :class="$style.footerButton" class="_button" @click.stop="toggleReact()">
-					<i v-if="appearNote.reactionAcceptance === 'likeOnly' && appearNote.myReaction != null" class="ti ti-heart-filled" style="color: var(--eventReactionHeart);"></i>
-					<i v-else-if="appearNote.myReaction != null" class="ti ti-mood-edit" style="color: var(--accent);"></i>
-					<i v-else-if="appearNote.reactionAcceptance === 'likeOnly'" class="ti ti-heart"></i>
-					<i v-else class="ti ti-mood-plus"></i>
-					<p v-if="(appearNote.reactionAcceptance === 'likeOnly' || defaultStore.state.showReactionsCount) && appearNote.reactionCount > 0" :class="$style.footerButtonCount">{{ number(appearNote.reactionCount) }}</p>
+				<button v-if="appearNote.myReaction != null" ref="reactButton" :class="$style.footerButton" class="_button" @click="undoReact(appearNote)">
+					<i class="ti ti-minus"></i>
 				</button>
 				<button v-if="canRenote && defaultStore.state.renoteQuoteButtonSeparation" ref="quoteButton" v-vibrate="defaultStore.state.vibrateSystem ? 5 : []" v-tooltip="i18n.ts.quote" class="_button" :class="$style.footerButton" @click.stop="quote()">
 					<i class="ti ti-quote"></i>
@@ -222,7 +205,6 @@ import { pleaseLogin } from '@/scripts/please-login.js';
 import { focusPrev, focusNext } from '@/scripts/focus.js';
 import { checkWordMute } from '@/scripts/check-word-mute.js';
 import { userPage } from '@/filters/user.js';
-import number from '@/filters/number.js';
 import * as os from '@/os.js';
 import * as sound from '@/scripts/sound.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
@@ -598,14 +580,6 @@ function undoReact(targetNote: Misskey.entities.Note): void {
 	});
 }
 
-function toggleReact() {
-	if (appearNote.value.myReaction != null && appearNote.value.reactionAcceptance === 'likeOnly') {
-		undoReact(appearNote.value);
-	} else {
-		react();
-	}
-}
-
 function onContextmenu(ev: MouseEvent): void {
 	if (props.mock) {
 		return;
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 5ef9ee6b78..280cfab023 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -144,14 +144,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkTime :class="$style.time" :time="appearNote.createdAt" mode="detail" colored/>
 				</MkA>
 			</div>
-			<MkReactionsViewer v-if="appearNote.reactionAcceptance !== 'likeOnly'" ref="reactionsViewer" :note="appearNote"/>
-			<button v-if="!note.isHidden" v-vibrate="defaultStore.state.vibrateSystem ? 5 : []" v-tooltip="i18n.ts.reply" class="_button" :class="$style.noteFooterButton" @click="reply()">
+			<MkReactionsViewer ref="reactionsViewer" :note="appearNote"/>
+			<button class="_button" :class="$style.noteFooterButton" @click="reply()">
 				<i class="ti ti-arrow-back-up"></i>
 				<p v-if="appearNote.repliesCount > 0" :class="$style.noteFooterButtonCount">{{ number(appearNote.repliesCount) }}</p>
 			</button>
-			<button v-else class="_button" :class="$style.noteFooterButton" disabled>
-				<i class="ti ti-ban"></i>
-			</button>
 			<button
 				v-if="canRenote"
 				ref="renoteButton"
@@ -162,20 +159,17 @@ SPDX-License-Identifier: AGPL-3.0-only
 				@click.stop="defaultStore.state.renoteQuoteButtonSeparation && ((!defaultStore.state.renoteVisibilitySelection && !appearNote.channel) || (appearNote.channel && !appearNote.channel.allowRenoteToExternal) || appearNote.visibility === 'followers') ? renoteOnly() : renote()"
 			>
 				<i class="ti ti-repeat"></i>
-				<p v-if="appearNote.renoteCount > 0" :class="$style.noteFooterButtonCount">{{ number(appearNote.renoteCount) }}</p>
+				<p v-if="appearNote.renoteCount > 0" :class="$style.noteFooterButtonCount">{{ appearNote.renoteCount }}</p>
 			</button>
 			<button v-else class="_button" :class="$style.noteFooterButton" disabled>
 				<i class="ti ti-ban"></i>
 			</button>
-			<button v-if="appearNote.reactionAcceptance !== 'likeOnly' && appearNote.myReaction == null" ref="heartReactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" v-tooltip="i18n.ts.like" :class="$style.noteFooterButton" class="_button" @click="heartReact()">
-				<i class="ti ti-heart"></i>
+			<button v-if="appearNote.myReaction == null" ref="reactButton" :class="$style.noteFooterButton" class="_button" @mousedown="react()">
+				<i v-if="appearNote.reactionAcceptance === 'likeOnly'" class="ti ti-heart"></i>
+				<i v-else class="ti ti-plus"></i>
 			</button>
-			<button ref="reactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" :class="$style.noteFooterButton" class="_button" @click.stop="toggleReact()">
-				<i v-if="appearNote.reactionAcceptance === 'likeOnly' && appearNote.myReaction != null" class="ti ti-heart-filled" style="color: var(--eventReactionHeart);"></i>
-				<i v-else-if="appearNote.myReaction != null" class="ti ti-mood-edit" style="color: var(--accent);"></i>
-				<i v-else-if="appearNote.reactionAcceptance === 'likeOnly'" class="ti ti-heart"></i>
-				<i v-else class="ti ti-mood-plus"></i>
-				<p v-if="(appearNote.reactionAcceptance === 'likeOnly' || defaultStore.state.showReactionsCount) && appearNote.reactionCount > 0" :class="$style.noteFooterButtonCount">{{ number(appearNote.reactionCount) }}</p>
+			<button v-if="appearNote.myReaction != null" ref="reactButton" class="_button" :class="[$style.noteFooterButton, $style.reacted]" @click="undoReact(appearNote)">
+				<i class="ti ti-minus"></i>
 			</button>
 			<button v-if="canRenote && defaultStore.state.renoteQuoteButtonSeparation" ref="quoteButton" v-vibrate="defaultStore.state.vibrateSystem ? 5 : []" v-tooltip="i18n.ts.quote" class="_button" :class="$style.noteFooterButton" @click="quote()">
 				<i class="ti ti-quote"></i>
@@ -293,7 +287,6 @@ import { pleaseLogin } from '@/scripts/please-login.js';
 import { checkWordMute } from '@/scripts/check-word-mute.js';
 import { userPage } from '@/filters/user.js';
 import { notePage } from '@/filters/note.js';
-import number from '@/filters/number.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import * as sound from '@/scripts/sound.js';
@@ -540,57 +533,27 @@ async function toggleReaction(reaction) {
 	} else {
 		sound.playMisskeySfx('reaction');
 
-		misskeyApi('notes/reactions/create', {
-			noteId: appearNote.value.id,
-			reaction: reaction,
+			misskeyApi('notes/reactions/create', {
+				noteId: appearNote.value.id,
+				reaction: reaction,
+			});
+			if (appearNote.value.text && appearNote.value.text.length > 100 && (Date.now() - new Date(appearNote.value.createdAt).getTime() < 1000 * 3)) {
+				claimAchievement('reactWithoutRead');
+			}
+		}, () => {
+			focus();
 		});
 	}
-
-	if (appearNote.value.text && appearNote.value.text.length > 100 && (Date.now() - new Date(appearNote.value.createdAt).getTime() < 1000 * 3)) {
-		claimAchievement('reactWithoutRead');
-	}
-}
-
-function heartReact(): void {
-	pleaseLogin();
-	showMovedDialog();
-
-	sound.playMisskeySfx('reaction');
-
-	misskeyApi('notes/reactions/create', {
-		noteId: appearNote.value.id,
-		reaction: '❤️',
-	});
-
-	if (appearNote.value.text && appearNote.value.text.length > 100 && (Date.now() - new Date(appearNote.value.createdAt).getTime() < 1000 * 3)) {
-		claimAchievement('reactWithoutRead');
-	}
-
-	const el = heartReactButton.value;
-	if (el) {
-		const rect = el.getBoundingClientRect();
-		const x = rect.left + (el.offsetWidth / 2);
-		const y = rect.top + (el.offsetHeight / 2);
-		os.popup(MkRippleEffect, { x, y }, {}, 'end');
-	}
 }
 
-function undoReact(targetNote: Misskey.entities.Note): void {
-	const oldReaction = targetNote.myReaction;
+function undoReact(note): void {
+	const oldReaction = note.myReaction;
 	if (!oldReaction) return;
 	misskeyApi('notes/reactions/delete', {
-		noteId: targetNote.id,
+		noteId: note.id,
 	});
 }
 
-function toggleReact() {
-	if (appearNote.value.myReaction != null && appearNote.value.reactionAcceptance === 'likeOnly') {
-		undoReact(appearNote.value);
-	} else {
-		react();
-	}
-}
-
 function onContextmenu(ev: MouseEvent): void {
 	const isLink = (el: HTMLElement): boolean => {
 		if (el.tagName === 'A') return true;
diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue
index 43b6ca2fb6..3cca7a507e 100644
--- a/packages/frontend/src/components/MkNotification.vue
+++ b/packages/frontend/src/components/MkNotification.vue
@@ -8,7 +8,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<div :class="$style.head">
 		<MkAvatar v-if="['pollEnded', 'note'].includes(notification.type) && notification.note" :class="$style.icon" :user="notification.note.user" link preview/>
 		<MkAvatar v-else-if="['roleAssigned', 'achievementEarned'].includes(notification.type)" :class="$style.icon" :user="$i" link preview/>
-		<div v-else-if="notification.type === 'reaction:grouped' && notification.note.reactionAcceptance === 'likeOnly'" :class="[$style.icon, $style.icon_reactionGroupHeart]"><i class="ti ti-heart" style="line-height: 1;"></i></div>
 		<div v-else-if="notification.type === 'reaction:grouped'" :class="[$style.icon, $style.icon_reactionGroup]"><i class="ti ti-plus" style="line-height: 1;"></i></div>
 		<div v-else-if="notification.type === 'renote:grouped'" :class="[$style.icon, $style.icon_renoteGroup]"><i class="ti ti-repeat" style="line-height: 1;"></i></div>
 		<img v-else-if="notification.type === 'test'" :class="$style.icon" :src="infoImageUrl"/>
@@ -60,7 +59,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<span v-else-if="notification.type === 'achievementEarned'">{{ i18n.ts._notification.achievementEarned }}</span>
 			<span v-else-if="notification.type === 'test'">{{ i18n.ts._notification.testNotification }}</span>
 			<MkA v-else-if="notification.type === 'follow' || notification.type === 'mention' || notification.type === 'reply' || notification.type === 'renote' || notification.type === 'quote' || notification.type === 'reaction' || notification.type === 'receiveFollowRequest' || notification.type === 'followRequestAccepted'" v-user-preview="notification.user.id" :class="$style.headerName" :to="userPage(notification.user)"><MkUserName :user="notification.user"/></MkA>
-			<span v-else-if="notification.type === 'reaction:grouped' && notification.note.reactionAcceptance === 'likeOnly'">{{ i18n.tsx._notification.likedBySomeUsers({ n: notification.reactions.length }) }}</span>
 			<span v-else-if="notification.type === 'reaction:grouped'">{{ i18n.tsx._notification.reactedBySomeUsers({ n: notification.reactions.length }) }}</span>
 			<span v-else-if="notification.type === 'renote:grouped'">{{ i18n.tsx._notification.renotedBySomeUsers({ n: notification.users.length }) }}</span>
 			<span v-else-if="notification.type === 'app'">{{ notification.header }}</span>
@@ -226,7 +224,6 @@ const rejectGroupInvitation = () => {
 }
 
 .icon_reactionGroup,
-.icon_reactionGroupHeart,
 .icon_renoteGroup {
 	display: grid;
 	align-items: center;
@@ -239,15 +236,11 @@ const rejectGroupInvitation = () => {
 }
 
 .icon_reactionGroup {
-	background: var(--eventReaction);
-}
-
-.icon_reactionGroupHeart {
-	background: var(--eventReactionHeart);
+	background: #e99a0b;
 }
 
 .icon_renoteGroup {
-	background: var(--eventRenote);
+	background: #36d298;
 }
 
 .icon_app {
@@ -276,49 +269,49 @@ const rejectGroupInvitation = () => {
 
 .t_follow, .t_followRequestAccepted, .t_receiveFollowRequest, .t_groupInvited {
 	padding: 3px;
-	background: var(--eventFollow);
+	background: #36aed2;
 	pointer-events: none;
 }
 
 .t_renote {
 	padding: 3px;
-	background: var(--eventRenote);
+	background: #36d298;
 	pointer-events: none;
 }
 
 .t_quote {
 	padding: 3px;
-	background: var(--eventRenote);
+	background: #36d298;
 	pointer-events: none;
 }
 
 .t_reply {
 	padding: 3px;
-	background: var(--eventReply);
+	background: #007aff;
 	pointer-events: none;
 }
 
 .t_mention {
 	padding: 3px;
-	background: var(--eventOther);
+	background: #88a6b7;
 	pointer-events: none;
 }
 
 .t_pollEnded {
 	padding: 3px;
-	background: var(--eventOther);
+	background: #88a6b7;
 	pointer-events: none;
 }
 
 .t_achievementEarned {
 	padding: 3px;
-	background: var(--eventAchievement);
+	background: #cb9a11;
 	pointer-events: none;
 }
 
 .t_roleAssigned {
 	padding: 3px;
-	background: var(--eventOther);
+	background: #88a6b7;
 	pointer-events: none;
 }
 
diff --git a/packages/frontend/src/components/MkTutorialDialog.Note.vue b/packages/frontend/src/components/MkTutorialDialog.Note.vue
index 55b7639520..07bdfa2b08 100644
--- a/packages/frontend/src/components/MkTutorialDialog.Note.vue
+++ b/packages/frontend/src/components/MkTutorialDialog.Note.vue
@@ -65,7 +65,6 @@ const exampleNote = reactive<Misskey.entities.Note>({
 	reactionAcceptance: null,
 	renoteCount: 0,
 	repliesCount: 1,
-	reactionCount: 0,
 	reactions: {},
 	reactionEmojis: {},
 	fileIds: [],
diff --git a/packages/frontend/src/components/MkTutorialDialog.PostNote.vue b/packages/frontend/src/components/MkTutorialDialog.PostNote.vue
index 7a52c32e77..87b24bc8fb 100644
--- a/packages/frontend/src/components/MkTutorialDialog.PostNote.vue
+++ b/packages/frontend/src/components/MkTutorialDialog.PostNote.vue
@@ -68,7 +68,6 @@ const exampleCWNote = reactive<Misskey.entities.Note>({
 	reactionAcceptance: null,
 	renoteCount: 0,
 	repliesCount: 1,
-	reactionCount: 0,
 	reactions: {},
 	reactionEmojis: {},
 	fileIds: [],
diff --git a/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue b/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue
index de251b3c59..9d976c4c6d 100644
--- a/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue
+++ b/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue
@@ -58,7 +58,6 @@ const exampleNote = reactive<Misskey.entities.Note>({
 	reactionAcceptance: null,
 	renoteCount: 0,
 	repliesCount: 1,
-	reactionCount: 0,
 	reactions: {},
 	reactionEmojis: {},
 	fileIds: ['0000000002'],
diff --git a/packages/frontend/src/scripts/use-note-capture.ts b/packages/frontend/src/scripts/use-note-capture.ts
index c371cebb45..14be1f4553 100644
--- a/packages/frontend/src/scripts/use-note-capture.ts
+++ b/packages/frontend/src/scripts/use-note-capture.ts
@@ -35,7 +35,6 @@ export function useNoteCapture(props: {
 				const currentCount = (note.value.reactions || {})[reaction] || 0;
 
 				note.value.reactions[reaction] = currentCount + 1;
-				note.value.reactionCount += 1;
 
 				if ($i && (body.userId === $i.id)) {
 					note.value.myReaction = reaction;
@@ -50,7 +49,6 @@ export function useNoteCapture(props: {
 				const currentCount = (note.value.reactions || {})[reaction] || 0;
 
 				note.value.reactions[reaction] = Math.max(0, currentCount - 1);
-				note.value.reactionCount = Math.max(0, note.value.reactionCount - 1);
 				if (note.value.reactions[reaction] === 0) delete note.value.reactions[reaction];
 
 				if ($i && (body.userId === $i.id)) {
diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index 85c81429e4..6d83f09602 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -48,19 +48,6 @@ $code-monospace-font: "JetBrains Mono", "Pretendard JP", Pretendard, Consolas, M
 	}
 
 	//--ad: rgb(255 169 0 / 10%);
-	--eventFollow: #36aed2;
-	--eventRenote: #36d298;
-	--eventReply: #007aff;
-	--eventReactionHeart: #dd2e44;
-	--eventReaction: #e99a0b;
-	--eventAchievement: #cb9a11;
-	--eventOther: #88a6b7;
-
-	--cherry: rgb(255, 188, 220);
-	--pick: rgb(177, 211, 255);
-	--misskey: rgb(134, 179, 0);
-	--cast: rgb(181, 151, 246);
-	--ella: rgb(150, 198, 234);
 }
 
 ::selection {

From 0cfcde5ef1c9f7e09c13271551d592d0bc6c3ea7 Mon Sep 17 00:00:00 2001
From: 1673beta <rekishinomori@gmail.com>
Date: Thu, 21 Mar 2024 21:17:01 +0900
Subject: [PATCH 3/6] =?UTF-8?q?Revert=20"Revert=20"enhance(frontend):=20?=
 =?UTF-8?q?=E3=83=AA=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE?=
 =?UTF-8?q?=E7=B7=8F=E6=95=B0=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=20(#13532)""?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d0ca340aba7e903ac43ad38a64b6476b96dc7846.
---
 CHANGELOG.md                                  |  6 ++
 locales/index.d.ts                            |  4 +
 locales/ja-JP.yml                             |  1 +
 .../src/core/entities/NoteEntityService.ts    |  1 +
 .../backend/src/models/json-schema/note.ts    |  4 +
 packages/cherrypick-js/src/autogen/types.ts   |  1 +
 packages/frontend/src/components/MkNote.vue   | 64 ++++++++++-----
 .../src/components/MkNoteDetailed.vue         | 77 ++++++++++++++-----
 .../src/components/MkNotification.vue         | 27 ++++---
 .../src/components/MkTutorialDialog.Note.vue  |  1 +
 .../components/MkTutorialDialog.PostNote.vue  |  1 +
 .../components/MkTutorialDialog.Sensitive.vue |  1 +
 .../frontend/src/scripts/use-note-capture.ts  |  2 +
 packages/frontend/src/style.scss              | 13 ++++
 14 files changed, 154 insertions(+), 49 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e62998a479..f1bdcf5fbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@
 
 ### Client
 - Enhance: 自分のノートの添付ファイルから直接ファイルの詳細ページに飛べるように
+- Enhance: 広告がMisskeyと同一ドメインの場合はRouterで遷移するように
+- Enhance: リアクション・いいねの総数を表示するように
+- Enhance: リアクション受け入れが「いいねのみ」の場合はリアクション絵文字一覧を表示しないように
+- Enhance: 設定>プラグインのページからプラグインの簡易的なログやエラーを見られるように
+  - 実装の都合により、プラグインは１つエラーを起こした時に即時停止するようになりました
+- Enhance: ページのデザインを変更	
 - Fix: 一部のページ内リンクが正しく動作しない問題を修正
 - Fix: 周年の実績が閏年を考慮しない問題を修正
 - Fix: ローカルURLのプレビューポップアップが左上に表示される
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 5484d4ffc1..894cae710e 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -10175,6 +10175,10 @@ export interface Locale extends ILocale {
          * {n}人がリアクションしました
          */
         "reactedBySomeUsers": ParameterizedString<"n">;
+        /**
+         * {n}人がいいねしました
+         */
+        "likedBySomeUsers": ParameterizedString<"n">;
         /**
          * {n}人がリノートしました
          */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 4d30e90b94..51bf23f254 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2688,6 +2688,7 @@ _notification:
   sendTestNotification: "テスト通知を送信する"
   notificationWillBeDisplayedLikeThis: "通知はこのように表示されます"
   reactedBySomeUsers: "{n}人がリアクションしました"
+  likedBySomeUsers: "{n}人がいいねしました"
   renotedBySomeUsers: "{n}人がリノートしました"
   followedBySomeUsers: "{n}人にフォローされました"
   flushNotification: "通知の履歴をリセットする"
diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index 5fda736b15..43cc3fc010 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -352,6 +352,7 @@ export class NoteEntityService implements OnModuleInit {
 			disableRightClick: note.disableRightClick || undefined,
 			renoteCount: note.renoteCount,
 			repliesCount: note.repliesCount,
+			reactionCount: Object.values(note.reactions).reduce((a, b) => a + b, 0),
 			reactions: this.reactionService.convertLegacyReactions(note.reactions),
 			reactionEmojis: this.customEmojiService.populateEmojis(reactionEmojiNames, host),
 			reactionAndUserPairCache: opts.withReactionAndUserPairCache ? note.reactionAndUserPairCache : undefined,
diff --git a/packages/backend/src/models/json-schema/note.ts b/packages/backend/src/models/json-schema/note.ts
index 00c2eac310..4fe44ce0b6 100644
--- a/packages/backend/src/models/json-schema/note.ts
+++ b/packages/backend/src/models/json-schema/note.ts
@@ -249,6 +249,10 @@ export const packedNoteSchema = {
 				}],
 			},
 		},
+		reactionCount: {
+			type: 'number',
+			optional: false, nullable: false,
+		},
 		renoteCount: {
 			type: 'number',
 			optional: false, nullable: false,
diff --git a/packages/cherrypick-js/src/autogen/types.ts b/packages/cherrypick-js/src/autogen/types.ts
index 1d24037a39..b8d267fc19 100644
--- a/packages/cherrypick-js/src/autogen/types.ts
+++ b/packages/cherrypick-js/src/autogen/types.ts
@@ -4322,6 +4322,7 @@ export type components = {
       reactions: {
         [key: string]: number;
       };
+      reactionCount: number;
       renoteCount: number;
       repliesCount: number;
       uri?: string;
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 9bfbfcf11d..ed3d000fd2 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -100,22 +100,33 @@ SPDX-License-Identifier: AGPL-3.0-only
 							</div>
 						</div>
 					</div>
-					<div v-if="appearNote.files && appearNote.files.length > 0">
-						<MkMediaList :mediaList="appearNote.files"/>
+					<div v-if="viewTextSource">
+						<hr style="margin: 10px 0;">
+						<pre style="margin: initial;"><small>{{ appearNote.text }}</small></pre>
+						<button class="_button" style="padding-top: 5px; color: var(--accent);" @click.stop="viewTextSource = false"><small>{{ i18n.ts.close }}</small></button>
 					</div>
-					<MkPoll v-if="appearNote.poll" :noteId="appearNote.id" :poll="appearNote.poll" :class="$style.poll"/>
-					<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" :class="$style.urlPreview"/>
-					<div v-if="appearNote.renote" :class="$style.quote"><MkNoteSimple :note="appearNote.renote" :class="$style.quoteNote"/></div>
-					<button v-if="isLong && collapsed" :class="$style.collapsed" class="_button" @click="collapsed = false">
-						<span :class="$style.collapsedLabel">{{ i18n.ts.showMore }}</span>
-					</button>
-					<button v-else-if="isLong && !collapsed" :class="$style.showLess" class="_button" @click="collapsed = true">
-						<span :class="$style.showLessLabel">{{ i18n.ts.showLess }}</span>
-					</button>
 				</div>
-				<MkA v-if="appearNote.channel && !inChannel" :class="$style.channel" :to="`/channels/${appearNote.channel.id}`"><i class="ti ti-device-tv"></i> {{ appearNote.channel.name }}</MkA>
+				<div v-if="appearNote.files && appearNote.files.length > 0">
+					<MkMediaList v-if="appearNote.disableRightClick" :mediaList="appearNote.files" @click.stop @contextmenu.prevent/>
+					<MkMediaList v-else :mediaList="appearNote.files" @click.stop/>
+				</div>
+				<MkPoll v-if="appearNote.poll" :noteId="appearNote.id" :poll="appearNote.poll" :class="$style.poll" @click.stop/>
+				<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" :class="$style.urlPreview"/>
+				<button v-if="(isLong || (isMFM && defaultStore.state.collapseDefault) || (appearNote.files.length > 0 && defaultStore.state.allMediaNoteCollapse)) && collapsed" v-vibrate="defaultStore.state.vibrateSystem ? 5 : []" :class="$style.collapsed" class="_button" @click.stop="collapsed = false">
+					<span :class="$style.collapsedLabel">
+						{{ i18n.ts.showMore }}
+						<span v-if="appearNote.files.length > 0" :class="$style.label">({{ collapseLabel }})</span>
+					</span>
+				</button>
+				<button v-else-if="(isLong || (isMFM && defaultStore.state.collapseDefault) || (appearNote.files.length > 0 && defaultStore.state.allMediaNoteCollapse)) && !collapsed" v-vibrate="defaultStore.state.vibrateSystem ? 5 : []" :class="$style.showLess" class="_button" @click.stop="collapsed = true">
+					<span :class="$style.showLessLabel">{{ i18n.ts.showLess }}</span>
+				</button>
 			</div>
-			<MkReactionsViewer :note="appearNote" :maxNumber="16" @mockUpdateMyReaction="emitUpdReaction">
+			<MkA v-if="appearNote.channel && !inChannel" :class="$style.channel" :to="`/channels/${appearNote.channel.id}`"><i class="ti ti-device-tv"></i> {{ appearNote.channel.name }}</MkA>
+		</div>
+		<div v-if="appearNote.renote" :class="$style.quote"><MkNoteSimple :note="appearNote.renote" :class="$style.quoteNote"/></div>
+		<div>
+			<MkReactionsViewer v-if="appearNote.reactionAcceptance !== 'likeOnly'" :note="appearNote" :maxNumber="16" @click.stop @contextmenu.prevent.stop @mockUpdateMyReaction="emitUpdReaction">
 				<template #more>
 					<div :class="$style.reactionOmitted">{{ i18n.ts.more }}</div>
 				</template>
@@ -125,6 +136,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<i class="ti ti-arrow-back-up"></i>
 					<p v-if="appearNote.repliesCount > 0" :class="$style.footerButtonCount">{{ number(appearNote.repliesCount) }}</p>
 				</button>
+				<button v-else :class="$style.footerButton" class="_button" disabled>
+					<i class="ti ti-ban"></i>
+				</button>
 				<button
 					v-if="canRenote"
 					ref="renoteButton"
@@ -135,17 +149,20 @@ SPDX-License-Identifier: AGPL-3.0-only
 					@click.stop="defaultStore.state.renoteQuoteButtonSeparation && ((!defaultStore.state.renoteVisibilitySelection && !appearNote.channel) || (appearNote.channel && !appearNote.channel.allowRenoteToExternal) || appearNote.visibility === 'followers') ? renoteOnly() : renote()"
 				>
 					<i class="ti ti-repeat"></i>
-					<p v-if="appearNote.renoteCount > 0" :class="$style.footerButtonCount">{{ appearNote.renoteCount }}</p>
+					<p v-if="appearNote.renoteCount > 0" :class="$style.footerButtonCount">{{ number(appearNote.renoteCount) }}</p>
 				</button>
 				<button v-else :class="$style.footerButton" class="_button" disabled>
 					<i class="ti ti-ban"></i>
 				</button>
-				<button v-if="appearNote.myReaction == null" ref="reactButton" :class="$style.footerButton" class="_button" @mousedown="react()">
-					<i v-if="appearNote.reactionAcceptance === 'likeOnly'" class="ti ti-heart"></i>
-					<i v-else class="ti ti-plus"></i>
+				<button v-if="appearNote.reactionAcceptance !== 'likeOnly' && appearNote.myReaction == null" ref="heartReactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" v-tooltip="i18n.ts.like" :class="$style.footerButton" class="_button" @click.stop="heartReact()">
+					<i class="ti ti-heart"></i>
 				</button>
-				<button v-if="appearNote.myReaction != null" ref="reactButton" :class="$style.footerButton" class="_button" @click="undoReact(appearNote)">
-					<i class="ti ti-minus"></i>
+				<button ref="reactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" :class="$style.footerButton" class="_button" @click.stop="toggleReact()">
+					<i v-if="appearNote.reactionAcceptance === 'likeOnly' && appearNote.myReaction != null" class="ti ti-heart-filled" style="color: var(--eventReactionHeart);"></i>
+					<i v-else-if="appearNote.myReaction != null" class="ti ti-mood-edit" style="color: var(--accent);"></i>
+					<i v-else-if="appearNote.reactionAcceptance === 'likeOnly'" class="ti ti-heart"></i>
+					<i v-else class="ti ti-mood-plus"></i>
+					<p v-if="(appearNote.reactionAcceptance === 'likeOnly' || defaultStore.state.showReactionsCount) && appearNote.reactionCount > 0" :class="$style.footerButtonCount">{{ number(appearNote.reactionCount) }}</p>
 				</button>
 				<button v-if="canRenote && defaultStore.state.renoteQuoteButtonSeparation" ref="quoteButton" v-vibrate="defaultStore.state.vibrateSystem ? 5 : []" v-tooltip="i18n.ts.quote" class="_button" :class="$style.footerButton" @click.stop="quote()">
 					<i class="ti ti-quote"></i>
@@ -205,6 +222,7 @@ import { pleaseLogin } from '@/scripts/please-login.js';
 import { focusPrev, focusNext } from '@/scripts/focus.js';
 import { checkWordMute } from '@/scripts/check-word-mute.js';
 import { userPage } from '@/filters/user.js';
+import number from '@/filters/number.js';
 import * as os from '@/os.js';
 import * as sound from '@/scripts/sound.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
@@ -580,6 +598,14 @@ function undoReact(targetNote: Misskey.entities.Note): void {
 	});
 }
 
+function toggleReact() {
+	if (appearNote.value.myReaction != null && appearNote.value.reactionAcceptance === 'likeOnly') {
+		undoReact(appearNote.value);
+	} else {
+		react();
+	}
+}
+
 function onContextmenu(ev: MouseEvent): void {
 	if (props.mock) {
 		return;
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 280cfab023..5ef9ee6b78 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -144,11 +144,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkTime :class="$style.time" :time="appearNote.createdAt" mode="detail" colored/>
 				</MkA>
 			</div>
-			<MkReactionsViewer ref="reactionsViewer" :note="appearNote"/>
-			<button class="_button" :class="$style.noteFooterButton" @click="reply()">
+			<MkReactionsViewer v-if="appearNote.reactionAcceptance !== 'likeOnly'" ref="reactionsViewer" :note="appearNote"/>
+			<button v-if="!note.isHidden" v-vibrate="defaultStore.state.vibrateSystem ? 5 : []" v-tooltip="i18n.ts.reply" class="_button" :class="$style.noteFooterButton" @click="reply()">
 				<i class="ti ti-arrow-back-up"></i>
 				<p v-if="appearNote.repliesCount > 0" :class="$style.noteFooterButtonCount">{{ number(appearNote.repliesCount) }}</p>
 			</button>
+			<button v-else class="_button" :class="$style.noteFooterButton" disabled>
+				<i class="ti ti-ban"></i>
+			</button>
 			<button
 				v-if="canRenote"
 				ref="renoteButton"
@@ -159,17 +162,20 @@ SPDX-License-Identifier: AGPL-3.0-only
 				@click.stop="defaultStore.state.renoteQuoteButtonSeparation && ((!defaultStore.state.renoteVisibilitySelection && !appearNote.channel) || (appearNote.channel && !appearNote.channel.allowRenoteToExternal) || appearNote.visibility === 'followers') ? renoteOnly() : renote()"
 			>
 				<i class="ti ti-repeat"></i>
-				<p v-if="appearNote.renoteCount > 0" :class="$style.noteFooterButtonCount">{{ appearNote.renoteCount }}</p>
+				<p v-if="appearNote.renoteCount > 0" :class="$style.noteFooterButtonCount">{{ number(appearNote.renoteCount) }}</p>
 			</button>
 			<button v-else class="_button" :class="$style.noteFooterButton" disabled>
 				<i class="ti ti-ban"></i>
 			</button>
-			<button v-if="appearNote.myReaction == null" ref="reactButton" :class="$style.noteFooterButton" class="_button" @mousedown="react()">
-				<i v-if="appearNote.reactionAcceptance === 'likeOnly'" class="ti ti-heart"></i>
-				<i v-else class="ti ti-plus"></i>
+			<button v-if="appearNote.reactionAcceptance !== 'likeOnly' && appearNote.myReaction == null" ref="heartReactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" v-tooltip="i18n.ts.like" :class="$style.noteFooterButton" class="_button" @click="heartReact()">
+				<i class="ti ti-heart"></i>
 			</button>
-			<button v-if="appearNote.myReaction != null" ref="reactButton" class="_button" :class="[$style.noteFooterButton, $style.reacted]" @click="undoReact(appearNote)">
-				<i class="ti ti-minus"></i>
+			<button ref="reactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" :class="$style.noteFooterButton" class="_button" @click.stop="toggleReact()">
+				<i v-if="appearNote.reactionAcceptance === 'likeOnly' && appearNote.myReaction != null" class="ti ti-heart-filled" style="color: var(--eventReactionHeart);"></i>
+				<i v-else-if="appearNote.myReaction != null" class="ti ti-mood-edit" style="color: var(--accent);"></i>
+				<i v-else-if="appearNote.reactionAcceptance === 'likeOnly'" class="ti ti-heart"></i>
+				<i v-else class="ti ti-mood-plus"></i>
+				<p v-if="(appearNote.reactionAcceptance === 'likeOnly' || defaultStore.state.showReactionsCount) && appearNote.reactionCount > 0" :class="$style.noteFooterButtonCount">{{ number(appearNote.reactionCount) }}</p>
 			</button>
 			<button v-if="canRenote && defaultStore.state.renoteQuoteButtonSeparation" ref="quoteButton" v-vibrate="defaultStore.state.vibrateSystem ? 5 : []" v-tooltip="i18n.ts.quote" class="_button" :class="$style.noteFooterButton" @click="quote()">
 				<i class="ti ti-quote"></i>
@@ -287,6 +293,7 @@ import { pleaseLogin } from '@/scripts/please-login.js';
 import { checkWordMute } from '@/scripts/check-word-mute.js';
 import { userPage } from '@/filters/user.js';
 import { notePage } from '@/filters/note.js';
+import number from '@/filters/number.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import * as sound from '@/scripts/sound.js';
@@ -533,27 +540,57 @@ async function toggleReaction(reaction) {
 	} else {
 		sound.playMisskeySfx('reaction');
 
-			misskeyApi('notes/reactions/create', {
-				noteId: appearNote.value.id,
-				reaction: reaction,
-			});
-			if (appearNote.value.text && appearNote.value.text.length > 100 && (Date.now() - new Date(appearNote.value.createdAt).getTime() < 1000 * 3)) {
-				claimAchievement('reactWithoutRead');
-			}
-		}, () => {
-			focus();
+		misskeyApi('notes/reactions/create', {
+			noteId: appearNote.value.id,
+			reaction: reaction,
 		});
 	}
+
+	if (appearNote.value.text && appearNote.value.text.length > 100 && (Date.now() - new Date(appearNote.value.createdAt).getTime() < 1000 * 3)) {
+		claimAchievement('reactWithoutRead');
+	}
+}
+
+function heartReact(): void {
+	pleaseLogin();
+	showMovedDialog();
+
+	sound.playMisskeySfx('reaction');
+
+	misskeyApi('notes/reactions/create', {
+		noteId: appearNote.value.id,
+		reaction: '❤️',
+	});
+
+	if (appearNote.value.text && appearNote.value.text.length > 100 && (Date.now() - new Date(appearNote.value.createdAt).getTime() < 1000 * 3)) {
+		claimAchievement('reactWithoutRead');
+	}
+
+	const el = heartReactButton.value;
+	if (el) {
+		const rect = el.getBoundingClientRect();
+		const x = rect.left + (el.offsetWidth / 2);
+		const y = rect.top + (el.offsetHeight / 2);
+		os.popup(MkRippleEffect, { x, y }, {}, 'end');
+	}
 }
 
-function undoReact(note): void {
-	const oldReaction = note.myReaction;
+function undoReact(targetNote: Misskey.entities.Note): void {
+	const oldReaction = targetNote.myReaction;
 	if (!oldReaction) return;
 	misskeyApi('notes/reactions/delete', {
-		noteId: note.id,
+		noteId: targetNote.id,
 	});
 }
 
+function toggleReact() {
+	if (appearNote.value.myReaction != null && appearNote.value.reactionAcceptance === 'likeOnly') {
+		undoReact(appearNote.value);
+	} else {
+		react();
+	}
+}
+
 function onContextmenu(ev: MouseEvent): void {
 	const isLink = (el: HTMLElement): boolean => {
 		if (el.tagName === 'A') return true;
diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue
index 3cca7a507e..43b6ca2fb6 100644
--- a/packages/frontend/src/components/MkNotification.vue
+++ b/packages/frontend/src/components/MkNotification.vue
@@ -8,6 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<div :class="$style.head">
 		<MkAvatar v-if="['pollEnded', 'note'].includes(notification.type) && notification.note" :class="$style.icon" :user="notification.note.user" link preview/>
 		<MkAvatar v-else-if="['roleAssigned', 'achievementEarned'].includes(notification.type)" :class="$style.icon" :user="$i" link preview/>
+		<div v-else-if="notification.type === 'reaction:grouped' && notification.note.reactionAcceptance === 'likeOnly'" :class="[$style.icon, $style.icon_reactionGroupHeart]"><i class="ti ti-heart" style="line-height: 1;"></i></div>
 		<div v-else-if="notification.type === 'reaction:grouped'" :class="[$style.icon, $style.icon_reactionGroup]"><i class="ti ti-plus" style="line-height: 1;"></i></div>
 		<div v-else-if="notification.type === 'renote:grouped'" :class="[$style.icon, $style.icon_renoteGroup]"><i class="ti ti-repeat" style="line-height: 1;"></i></div>
 		<img v-else-if="notification.type === 'test'" :class="$style.icon" :src="infoImageUrl"/>
@@ -59,6 +60,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<span v-else-if="notification.type === 'achievementEarned'">{{ i18n.ts._notification.achievementEarned }}</span>
 			<span v-else-if="notification.type === 'test'">{{ i18n.ts._notification.testNotification }}</span>
 			<MkA v-else-if="notification.type === 'follow' || notification.type === 'mention' || notification.type === 'reply' || notification.type === 'renote' || notification.type === 'quote' || notification.type === 'reaction' || notification.type === 'receiveFollowRequest' || notification.type === 'followRequestAccepted'" v-user-preview="notification.user.id" :class="$style.headerName" :to="userPage(notification.user)"><MkUserName :user="notification.user"/></MkA>
+			<span v-else-if="notification.type === 'reaction:grouped' && notification.note.reactionAcceptance === 'likeOnly'">{{ i18n.tsx._notification.likedBySomeUsers({ n: notification.reactions.length }) }}</span>
 			<span v-else-if="notification.type === 'reaction:grouped'">{{ i18n.tsx._notification.reactedBySomeUsers({ n: notification.reactions.length }) }}</span>
 			<span v-else-if="notification.type === 'renote:grouped'">{{ i18n.tsx._notification.renotedBySomeUsers({ n: notification.users.length }) }}</span>
 			<span v-else-if="notification.type === 'app'">{{ notification.header }}</span>
@@ -224,6 +226,7 @@ const rejectGroupInvitation = () => {
 }
 
 .icon_reactionGroup,
+.icon_reactionGroupHeart,
 .icon_renoteGroup {
 	display: grid;
 	align-items: center;
@@ -236,11 +239,15 @@ const rejectGroupInvitation = () => {
 }
 
 .icon_reactionGroup {
-	background: #e99a0b;
+	background: var(--eventReaction);
+}
+
+.icon_reactionGroupHeart {
+	background: var(--eventReactionHeart);
 }
 
 .icon_renoteGroup {
-	background: #36d298;
+	background: var(--eventRenote);
 }
 
 .icon_app {
@@ -269,49 +276,49 @@ const rejectGroupInvitation = () => {
 
 .t_follow, .t_followRequestAccepted, .t_receiveFollowRequest, .t_groupInvited {
 	padding: 3px;
-	background: #36aed2;
+	background: var(--eventFollow);
 	pointer-events: none;
 }
 
 .t_renote {
 	padding: 3px;
-	background: #36d298;
+	background: var(--eventRenote);
 	pointer-events: none;
 }
 
 .t_quote {
 	padding: 3px;
-	background: #36d298;
+	background: var(--eventRenote);
 	pointer-events: none;
 }
 
 .t_reply {
 	padding: 3px;
-	background: #007aff;
+	background: var(--eventReply);
 	pointer-events: none;
 }
 
 .t_mention {
 	padding: 3px;
-	background: #88a6b7;
+	background: var(--eventOther);
 	pointer-events: none;
 }
 
 .t_pollEnded {
 	padding: 3px;
-	background: #88a6b7;
+	background: var(--eventOther);
 	pointer-events: none;
 }
 
 .t_achievementEarned {
 	padding: 3px;
-	background: #cb9a11;
+	background: var(--eventAchievement);
 	pointer-events: none;
 }
 
 .t_roleAssigned {
 	padding: 3px;
-	background: #88a6b7;
+	background: var(--eventOther);
 	pointer-events: none;
 }
 
diff --git a/packages/frontend/src/components/MkTutorialDialog.Note.vue b/packages/frontend/src/components/MkTutorialDialog.Note.vue
index 07bdfa2b08..55b7639520 100644
--- a/packages/frontend/src/components/MkTutorialDialog.Note.vue
+++ b/packages/frontend/src/components/MkTutorialDialog.Note.vue
@@ -65,6 +65,7 @@ const exampleNote = reactive<Misskey.entities.Note>({
 	reactionAcceptance: null,
 	renoteCount: 0,
 	repliesCount: 1,
+	reactionCount: 0,
 	reactions: {},
 	reactionEmojis: {},
 	fileIds: [],
diff --git a/packages/frontend/src/components/MkTutorialDialog.PostNote.vue b/packages/frontend/src/components/MkTutorialDialog.PostNote.vue
index 87b24bc8fb..7a52c32e77 100644
--- a/packages/frontend/src/components/MkTutorialDialog.PostNote.vue
+++ b/packages/frontend/src/components/MkTutorialDialog.PostNote.vue
@@ -68,6 +68,7 @@ const exampleCWNote = reactive<Misskey.entities.Note>({
 	reactionAcceptance: null,
 	renoteCount: 0,
 	repliesCount: 1,
+	reactionCount: 0,
 	reactions: {},
 	reactionEmojis: {},
 	fileIds: [],
diff --git a/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue b/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue
index 9d976c4c6d..de251b3c59 100644
--- a/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue
+++ b/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue
@@ -58,6 +58,7 @@ const exampleNote = reactive<Misskey.entities.Note>({
 	reactionAcceptance: null,
 	renoteCount: 0,
 	repliesCount: 1,
+	reactionCount: 0,
 	reactions: {},
 	reactionEmojis: {},
 	fileIds: ['0000000002'],
diff --git a/packages/frontend/src/scripts/use-note-capture.ts b/packages/frontend/src/scripts/use-note-capture.ts
index 14be1f4553..c371cebb45 100644
--- a/packages/frontend/src/scripts/use-note-capture.ts
+++ b/packages/frontend/src/scripts/use-note-capture.ts
@@ -35,6 +35,7 @@ export function useNoteCapture(props: {
 				const currentCount = (note.value.reactions || {})[reaction] || 0;
 
 				note.value.reactions[reaction] = currentCount + 1;
+				note.value.reactionCount += 1;
 
 				if ($i && (body.userId === $i.id)) {
 					note.value.myReaction = reaction;
@@ -49,6 +50,7 @@ export function useNoteCapture(props: {
 				const currentCount = (note.value.reactions || {})[reaction] || 0;
 
 				note.value.reactions[reaction] = Math.max(0, currentCount - 1);
+				note.value.reactionCount = Math.max(0, note.value.reactionCount - 1);
 				if (note.value.reactions[reaction] === 0) delete note.value.reactions[reaction];
 
 				if ($i && (body.userId === $i.id)) {
diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index 6d83f09602..85c81429e4 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -48,6 +48,19 @@ $code-monospace-font: "JetBrains Mono", "Pretendard JP", Pretendard, Consolas, M
 	}
 
 	//--ad: rgb(255 169 0 / 10%);
+	--eventFollow: #36aed2;
+	--eventRenote: #36d298;
+	--eventReply: #007aff;
+	--eventReactionHeart: #dd2e44;
+	--eventReaction: #e99a0b;
+	--eventAchievement: #cb9a11;
+	--eventOther: #88a6b7;
+
+	--cherry: rgb(255, 188, 220);
+	--pick: rgb(177, 211, 255);
+	--misskey: rgb(134, 179, 0);
+	--cast: rgb(181, 151, 246);
+	--ella: rgb(150, 198, 234);
 }
 
 ::selection {

From 4dfd2e8e5e82ed3a2d8e65cd0cfc62cfd9f73780 Mon Sep 17 00:00:00 2001
From: 1673beta <rekishinomori@gmail.com>
Date: Fri, 22 Mar 2024 14:00:54 +0900
Subject: [PATCH 4/6] Revert "Merge branch 'develop' of
 https://github.com/1673beta/cherrypick into develop"

This reverts commit b9e6e2821db03409780b22aa682731947b24e70f, reversing
changes made to d3db5d57e814aa05fe6014951f2a4719c9bd3802.
---
 .config/example.yml                           |    2 +-
 .devcontainer/devcontainer.json               |    1 +
 .github/workflows/check-spdx-license-id.yml   |   75 -
 .github/workflows/release-edit-with-push.yml  |   40 -
 .github/workflows/release-with-dispatch.yml   |  122 -
 .github/workflows/release-with-ready.yml      |   38 -
 .vscode/extensions.json                       |    2 +
 .vscode/settings.json                         |    2 +-
 CHANGELOG.md                                  |   63 +-
 CHANGELOG_CHERRYPICK.md                       |   14 -
 CHANGELOG_engawa.md                           |    7 -
 CONTRIBUTING.md                               |   92 -
 README.md                                     |   41 +-
 cypress/e2e/{basic.cy.ts => basic.cy.js}      |    5 -
 cypress/e2e/{router.cy.ts => router.cy.js}    |    5 -
 cypress/e2e/{widgets.cy.ts => widgets.cy.js}  |    5 -
 cypress/support/{commands.ts => commands.js}  |    2 +-
 cypress/support/{e2e.ts => e2e.js}            |    0
 cypress/support/index.ts                      |   19 -
 cypress/tsconfig.json                         |    8 -
 locales/ar-SA.yml                             |    1 -
 locales/ca-ES.yml                             |    1 -
 locales/cs-CZ.yml                             |    1 -
 locales/de-DE.yml                             |    1 -
 locales/en-US.yml                             |   32 -
 locales/es-ES.yml                             |    1 -
 locales/fr-FR.yml                             |   58 +-
 locales/id-ID.yml                             |    1 -
 locales/index.d.ts                            |  100 +-
 locales/it-IT.yml                             |   18 +-
 locales/ja-JP.yml                             |   27 +-
 locales/ja-KS.yml                             |    2 -
 locales/ko-GS.yml                             |    1 -
 locales/ko-KR.yml                             |   13 +-
 locales/no-NO.yml                             |    1 -
 locales/pt-PT.yml                             |    1 -
 locales/ru-RU.yml                             |    1 -
 locales/th-TH.yml                             |  382 +--
 locales/vi-VN.yml                             |    1 -
 locales/zh-CN.yml                             |   51 +-
 locales/zh-TW.yml                             |   34 +-
 package.json                                  |   21 +-
 packages/backend/generate_api_json.js         |    7 +-
 .../1689325027964-UserBlacklistAnntena.js     |    5 -
 .../1690417561185-fix-renote-muting.js        |    5 -
 ...417561186-ChangeCacheRemoteFilesDefault.js |    5 -
 .../backend/migration/1690417561187-Fix.js    |    5 -
 .../1690569881926-user-2fa-backup-codes.js    |    5 -
 .../1691649257651-refine-announcement.js      |    5 -
 .../1691657412740-refine-announcement-2.js    |    5 -
 .../migration/1695260774117-verified-links.js |    5 -
 .../1695288787870-following-notify.js         |    5 -
 .../migration/1695440131671-short-name.js     |    5 -
 .../1695605508898-mutingNotificationTypes.js  |    5 -
 .../1695901659683-note-updated-at.js          |    5 -
 .../1696323464251-user-list-membership.js     |    5 -
 .../migration/1696331570827-hibernation.js    |    5 -
 .../backend/migration/1696332072038-clean.js  |    5 -
 .../migration/1696604572677-poll-vote-poll.js |    5 -
 .../1697737204579-deleteCreatedAt.js          |    5 -
 .../1699432324194-remoteAvaterDecoration.js   |    5 -
 .../migration/1700383825690-hard-mute.js      |    5 -
 .../1704185628000-note-updated-at2.js         |    5 -
 .../1708399372194-per-instance-mod-note.js    |   16 -
 packages/backend/package.json                 |   64 +-
 .../backend/src/core/AccountMoveService.ts    |    4 +-
 packages/backend/src/core/CacheService.ts     |    5 +-
 .../src/core/ChannelFollowingService.ts       |    5 -
 packages/backend/src/core/CoreModule.ts       |    6 -
 .../backend/src/core/CustomEmojiService.ts    |    5 -
 .../backend/src/core/DeleteAccountService.ts  |    4 -
 .../src/core/FetchInstanceMetadataService.ts  |   28 +-
 packages/backend/src/core/FileInfoService.ts  |    9 +-
 .../backend/src/core/GlobalEventService.ts    |    3 -
 .../backend/src/core/NoteCreateService.ts     |   37 +-
 packages/backend/src/core/NoteReadService.ts  |   63 +-
 .../backend/src/core/NotificationService.ts   |   19 -
 .../src/core/PushNotificationService.ts       |    7 -
 packages/backend/src/core/ReactionService.ts  |   49 +-
 packages/backend/src/core/RoleService.ts      |   22 +-
 .../backend/src/core/UserFollowingService.ts  |   49 +-
 packages/backend/src/core/UtilityService.ts   |   14 -
 packages/backend/src/core/WebAuthnService.ts  |    2 +-
 .../src/core/activitypub/ApAudienceService.ts |    3 +-
 .../src/core/activitypub/ApInboxService.ts    |    7 +-
 .../src/core/activitypub/ApRendererService.ts |    2 +-
 .../activitypub/models/ApMentionService.ts    |    3 +-
 .../core/activitypub/models/ApNoteService.ts  |   66 +-
 .../activitypub/models/ApPersonService.ts     |    3 +-
 .../activitypub/models/ApQuestionService.ts   |    3 +-
 .../src/core/activitypub/models/tag.ts        |    3 +-
 packages/backend/src/core/chart/core.ts       |   14 +-
 .../core/entities/DriveFileEntityService.ts   |    4 +-
 .../core/entities/InstanceEntityService.ts    |    9 +-
 .../src/core/entities/MetaEntityService.ts    |  155 -
 .../src/core/entities/NoteEntityService.ts    |    1 -
 .../entities/NoteReactionEntityService.ts     |   15 -
 .../entities/NotificationEntityService.ts     |  298 +-
 .../src/core/entities/PageEntityService.ts    |    3 +-
 .../src/core/entities/UserEntityService.ts    |  232 +-
 packages/backend/src/misc/FileWriterStream.ts |   36 -
 packages/backend/src/misc/JsonArrayStream.ts  |   35 -
 packages/backend/src/misc/cache.ts            |    8 -
 .../backend/src/misc/fastify-hook-handlers.ts |    5 -
 packages/backend/src/misc/is-not-null.ts      |    4 +-
 packages/backend/src/misc/is-pure-renote.ts   |    5 -
 packages/backend/src/misc/json-schema.ts      |   10 -
 packages/backend/src/misc/loader.ts           |    5 -
 packages/backend/src/models/Instance.ts       |    5 -
 packages/backend/src/models/Notification.ts   |   10 +-
 packages/backend/src/models/ReversiGame.ts    |    5 -
 packages/backend/src/models/Role.ts           |    6 -
 packages/backend/src/models/UserProfile.ts    |    2 -
 .../models/json-schema/federation-instance.ts |    4 -
 .../backend/src/models/json-schema/meta.ts    |  332 --
 .../backend/src/models/json-schema/note.ts    |    4 -
 .../src/models/json-schema/notification.ts    |   15 -
 .../backend/src/models/json-schema/role.ts    |   27 -
 .../backend/src/models/json-schema/signin.ts  |    5 -
 .../backend/src/models/json-schema/user.ts    |    5 +-
 .../processors/ExportNotesProcessorService.ts |  167 +-
 .../queue/processors/InboxProcessorService.ts |   13 +-
 .../backend/src/server/api/EndpointsModule.ts |    5 -
 packages/backend/src/server/api/endpoints.ts  |    2 -
 .../server/api/endpoints/admin/emoji/add.ts   |    5 +-
 .../server/api/endpoints/admin/emoji/adds.ts  |    5 +-
 .../api/endpoints/admin/emoji/update.ts       |   27 +-
 .../admin/federation/update-instance.ts       |   15 +-
 .../server/api/endpoints/admin/show-user.ts   |    1 -
 .../server/api/endpoints/antennas/notes.ts    |    4 +-
 .../server/api/endpoints/antennas/update.ts   |   12 +-
 .../api/endpoints/federation/show-instance.ts |    2 +-
 .../src/server/api/endpoints/flash/create.ts  |    2 -
 .../src/server/api/endpoints/flash/update.ts  |   12 +-
 .../server/api/endpoints/following/create.ts  |   13 +-
 .../api/endpoints/gallery/posts/create.ts     |    3 +-
 .../api/endpoints/gallery/posts/update.ts     |    3 +-
 .../server/api/endpoints/hashtags/search.ts   |    2 +-
 .../api/endpoints/i/notifications-grouped.ts  |   15 +-
 .../server/api/endpoints/i/notifications.ts   |    2 +-
 .../src/server/api/endpoints/i/update.ts      |    7 +-
 .../backend/src/server/api/endpoints/meta.ts  |  424 ++-
 .../src/server/api/endpoints/notes/create.ts  |   24 +-
 .../api/endpoints/notifications/flush.ts      |   33 -
 .../src/server/api/endpoints/pinned-users.ts  |    3 +-
 .../src/server/api/endpoints/sw/register.ts   |    4 -
 .../src/server/api/endpoints/sw/unregister.ts |    7 -
 .../api/endpoints/sw/update-registration.ts   |    5 -
 .../server/api/endpoints/users/reactions.ts   |    2 +-
 .../server/api/endpoints/users/relation.ts    |    8 +-
 .../api/stream/channels/home-timeline.ts      |   10 +-
 .../src/server/web/ClientServerService.ts     |   26 +-
 packages/backend/src/server/web/boot.js       |    4 +-
 .../backend/src/server/web/views/base.pug     |    3 -
 .../backend/src/server/web/views/note.pug     |    4 +-
 .../backend/src/server/web/views/user.pug     |    2 +-
 packages/backend/src/types.ts                 |   21 +-
 packages/backend/test/e2e/2fa.ts              |   96 +-
 packages/backend/test/e2e/antennas.ts         |  118 +-
 packages/backend/test/e2e/api-visibility.ts   |   74 +-
 packages/backend/test/e2e/api.ts              |   43 +-
 packages/backend/test/e2e/block.ts            |   19 +-
 packages/backend/test/e2e/clips.ts            |  298 +-
 packages/backend/test/e2e/drive.ts            |   12 +-
 packages/backend/test/e2e/endpoints.ts        |  273 +-
 packages/backend/test/e2e/exports.ts          |   38 +-
 packages/backend/test/e2e/fetch-resource.ts   |   18 +-
 packages/backend/test/e2e/ff-visibility.ts    |  206 +-
 packages/backend/test/e2e/move.ts             |  186 +-
 packages/backend/test/e2e/mute.ts             |  221 +-
 packages/backend/test/e2e/note.ts             |  387 +--
 packages/backend/test/e2e/renote-mute.ts      |    6 +-
 packages/backend/test/e2e/streaming.ts        |  111 +-
 packages/backend/test/e2e/thread-mute.ts      |   18 +-
 packages/backend/test/e2e/timelines.ts        |  354 +-
 packages/backend/test/e2e/user-notes.ts       |    8 +-
 packages/backend/test/e2e/users.ts            |  469 +--
 packages/backend/test/global.d.ts             |    7 -
 packages/backend/test/jest.setup.ts           |    5 -
 .../backend/test/prelude/get-api-validator.ts |    4 +-
 packages/backend/test/tsconfig.json           |    3 +-
 .../backend/test/unit/AnnouncementService.ts  |    2 +-
 packages/backend/test/unit/ApMfmService.ts    |    5 -
 .../test/unit/FetchInstanceMetadataService.ts |   43 +-
 packages/backend/test/unit/ReactionService.ts |   41 -
 packages/backend/test/unit/RelayService.ts    |    3 +-
 packages/backend/test/unit/RoleService.ts     |   31 -
 .../test/unit/entities/UserEntityService.ts   |  528 ---
 packages/backend/test/unit/misc/loader.ts     |    5 -
 packages/backend/test/utils.ts                |   67 +-
 .../cherrypick-js/etc/cherrypick-js.api.md    |   32 +-
 packages/cherrypick-js/package.json           |   18 +-
 .../src/autogen/apiClientJSDoc.ts             |   11 -
 .../cherrypick-js/src/autogen/endpoint.ts     |    7 +-
 .../cherrypick-js/src/autogen/entities.ts     |    2 -
 packages/cherrypick-js/src/autogen/models.ts  |    4 -
 packages/cherrypick-js/src/autogen/types.ts   |  433 +--
 packages/cherrypick-js/src/consts.ts          |    7 -
 packages/cherrypick-js/src/entities.ts        |    3 -
 packages/cherrypick-js/src/streaming.types.ts |    1 -
 packages/frontend/.storybook/generate.tsx     |    4 +-
 .../frontend/.storybook/preview-head.html     |    5 -
 packages/frontend/package.json                |   86 +-
 packages/frontend/src/account.ts              |    2 +-
 packages/frontend/src/boot/common.ts          |    3 -
 packages/frontend/src/boot/main-boot.ts       |   84 +-
 .../src/components/MkAutocomplete.vue         |  100 +-
 .../frontend/src/components/MkCode.core.vue   |   12 +-
 packages/frontend/src/components/MkDialog.vue |   29 +-
 .../src/components/MkDriveSelectDialog.vue    |    8 +-
 .../src/components/MkEmojiPicker.section.vue  |    7 +-
 .../frontend/src/components/MkEmojiPicker.vue |   93 +-
 .../src/components/MkEmojiPickerDialog.vue    |    4 +-
 .../src/components/MkEmojiPickerWindow.vue    |   49 +
 .../frontend/src/components/MkFormDialog.vue  |   56 +-
 packages/frontend/src/components/MkLink.vue   |    4 +-
 .../frontend/src/components/MkMediaAudio.vue  |   15 +-
 .../frontend/src/components/MkMediaImage.vue  |    9 +-
 .../frontend/src/components/MkMediaVideo.vue  |   15 +-
 .../src/components/MkMfmCheatSheetDialog.vue  |    5 -
 packages/frontend/src/components/MkNote.vue   |   29 +-
 .../src/components/MkNoteDetailed.vue         |   29 +-
 .../src/components/MkNotification.vue         |   31 +-
 .../src/components/MkNotifications.vue        |    5 +-
 .../frontend/src/components/MkPostForm.vue    |    3 +-
 .../src/components/MkReactionIcon.vue         |    2 +-
 .../components/MkReactionsViewer.details.vue  |    2 +-
 .../components/MkReactionsViewer.reaction.vue |   15 +-
 .../src/components/MkSubNoteContent.vue       |   25 +-
 .../src/components/MkTutorialDialog.Note.vue  |    1 -
 .../components/MkTutorialDialog.PostNote.vue  |    1 -
 .../components/MkTutorialDialog.Sensitive.vue |    1 -
 .../src/components/MkVisibilityPicker.vue     |    7 +-
 .../src/components/MkWelcomeToast.vue         |    5 -
 .../frontend/src/components/global/I18n.vue   |    5 -
 .../src/components/global/MkA.stories.impl.ts |    4 +-
 .../frontend/src/components/global/MkA.vue    |    8 +-
 .../frontend/src/components/global/MkAd.vue   |   21 +-
 .../global/MkCustomEmoji.stories.impl.ts      |   15 -
 .../src/components/global/MkCustomEmoji.vue   |    9 +-
 .../src/components/global/MkEmoji.vue         |    5 +-
 .../global/MkMisskeyFlavoredMarkdown.ts       |    1 -
 .../components/global/MkTime.stories.impl.ts  |    5 +-
 .../frontend/src/components/global/MkUrl.vue  |    2 +-
 .../src/components/page/page.image.vue        |   24 +-
 .../src/components/page/page.note.vue         |   13 +-
 .../src/components/page/page.text.vue         |    8 +-
 .../frontend/src/components/page/page.vue     |    2 +-
 packages/frontend/src/const.ts                |    3 +-
 .../frontend/src/directives/user-preview.ts   |    1 +
 packages/frontend/src/filters/kmg.ts          |    5 -
 packages/frontend/src/index.html              |    2 +-
 packages/frontend/src/instance.ts             |   30 +-
 packages/frontend/src/local-storage.ts        |    1 -
 packages/frontend/src/nirax.ts                |   20 +-
 packages/frontend/src/os.ts                   |  302 +-
 packages/frontend/src/pages/about-misskey.vue |   13 +-
 .../src/pages/admin/RolesEditorFormula.vue    |    9 -
 .../src/pages/admin/bot-protection.vue        |    2 +-
 .../frontend/src/pages/admin/branding.vue     |    2 +-
 .../src/pages/admin/email-settings.vue        |    2 +-
 .../src/pages/admin/external-services.vue     |    2 +-
 .../src/pages/admin/instance-block.vue        |    2 +-
 .../frontend/src/pages/admin/moderation.vue   |    2 +-
 .../src/pages/admin/modlog.ModLog.vue         |    6 -
 packages/frontend/src/pages/admin/modlog.vue  |    2 +
 .../src/pages/admin/object-storage.vue        |    2 +-
 .../src/pages/admin/other-settings.vue        |    2 +-
 .../src/pages/admin/proxy-account.vue         |    2 +-
 .../frontend/src/pages/admin/roles.editor.vue |   19 -
 packages/frontend/src/pages/admin/roles.vue   |    7 -
 .../frontend/src/pages/admin/security.vue     |    2 +-
 .../frontend/src/pages/admin/server-rules.vue |    2 +-
 .../frontend/src/pages/admin/settings.vue     |    2 +-
 .../src/pages/drop-and-fusion.game.vue        |  120 +-
 .../frontend/src/pages/drop-and-fusion.vue    |   56 +-
 .../frontend/src/pages/emoji-edit-dialog.vue  |    2 +-
 .../frontend/src/pages/flash/flash-edit.vue   |   14 +-
 packages/frontend/src/pages/instance-info.vue |   12 +-
 packages/frontend/src/pages/notifications.vue |    4 +-
 .../page-editor/els/page-editor.el.note.vue   |    2 +-
 .../src/pages/page-editor/page-editor.vue     |    4 +-
 packages/frontend/src/pages/page.vue          |  374 +--
 .../frontend/src/pages/reversi/game.board.vue |   19 +-
 .../frontend/src/pages/settings/drive.vue     |    2 +-
 .../src/pages/settings/emoji-picker.vue       |    6 +-
 .../frontend/src/pages/settings/general.vue   |    4 +-
 .../notifications.notification-config.vue     |    1 -
 .../src/pages/settings/notifications.vue      |   13 -
 .../frontend/src/pages/settings/plugin.vue    |   20 +-
 .../pages/settings/preferences-backups.vue    |    3 -
 .../frontend/src/pages/welcome.entrance.a.vue |   34 +-
 packages/frontend/src/plugin.ts               |   25 +-
 .../add-dividers-between-menu-sections.ts     |    5 -
 packages/frontend/src/scripts/autocomplete.ts |    2 +-
 .../src/scripts/check-reaction-permissions.ts |   11 +-
 packages/frontend/src/scripts/clear-cache.ts  |    9 -
 .../frontend/src/scripts/code-highlighter.ts  |   23 +-
 .../frontend/src/scripts/detect-language.ts   |    5 -
 packages/frontend/src/scripts/emojilist.ts    |   25 +-
 packages/frontend/src/scripts/form.ts         |   17 +-
 .../frontend/src/scripts/media-has-audio.ts   |    5 -
 packages/frontend/src/scripts/search-emoji.ts |  106 -
 .../frontend/src/scripts/snowfall-effect.ts   |    4 +-
 packages/frontend/src/scripts/sound.ts        |    2 +-
 packages/frontend/src/scripts/theme.ts        |    4 +-
 .../frontend/src/scripts/use-note-capture.ts  |    2 -
 packages/frontend/src/store.ts                |    5 +-
 packages/frontend/src/stream.ts               |   22 +-
 packages/frontend/src/style.scss              |   41 -
 packages/frontend/src/type.ts                 |    5 -
 packages/frontend/src/ui/deck.vue             |   20 +-
 .../frontend/src/ui/deck/channel-column.vue   |    2 +-
 .../frontend/src/widgets/WidgetSlideshow.vue  |    4 +-
 packages/frontend/test/autocomplete.test.ts   |   34 -
 packages/frontend/test/scroll.test.ts         |    6 +-
 packages/frontend/vite.config.local-dev.ts    |    3 -
 packages/frontend/vite.config.ts              |   35 +-
 packages/misskey-bubble-game/package.json     |    6 +-
 packages/misskey-reversi/package.json         |    6 +-
 packages/sw/package.json                      |    6 +-
 pnpm-lock.yaml                                | 2872 ++++++++---------
 scripts/changelog-checker/src/checker.ts      |    5 -
 scripts/changelog-checker/src/index.ts        |    5 -
 scripts/changelog-checker/src/parser.ts       |    5 -
 .../changelog-checker/test/checker.test.ts    |    7 +-
 scripts/tarball.mjs                           |    5 -
 327 files changed, 4835 insertions(+), 8779 deletions(-)
 delete mode 100644 .github/workflows/check-spdx-license-id.yml
 delete mode 100644 .github/workflows/release-edit-with-push.yml
 delete mode 100644 .github/workflows/release-with-dispatch.yml
 delete mode 100644 .github/workflows/release-with-ready.yml
 rename cypress/e2e/{basic.cy.ts => basic.cy.js} (98%)
 rename cypress/e2e/{router.cy.ts => router.cy.js} (91%)
 rename cypress/e2e/{widgets.cy.ts => widgets.cy.js} (95%)
 rename cypress/support/{commands.ts => commands.js} (98%)
 rename cypress/support/{e2e.ts => e2e.js} (100%)
 delete mode 100644 cypress/support/index.ts
 delete mode 100644 cypress/tsconfig.json
 delete mode 100644 packages/backend/migration/1708399372194-per-instance-mod-note.js
 delete mode 100644 packages/backend/src/core/entities/MetaEntityService.ts
 delete mode 100644 packages/backend/src/misc/FileWriterStream.ts
 delete mode 100644 packages/backend/src/misc/JsonArrayStream.ts
 delete mode 100644 packages/backend/src/models/json-schema/meta.ts
 delete mode 100644 packages/backend/src/server/api/endpoints/notifications/flush.ts
 delete mode 100644 packages/backend/test/global.d.ts
 delete mode 100644 packages/backend/test/unit/entities/UserEntityService.ts
 create mode 100644 packages/frontend/src/components/MkEmojiPickerWindow.vue
 delete mode 100644 packages/frontend/src/scripts/search-emoji.ts
 delete mode 100644 packages/frontend/test/autocomplete.test.ts

diff --git a/.config/example.yml b/.config/example.yml
index 45c7dd8032..39f1322131 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -38,7 +38,7 @@
 # Option 3: If neither of the above applies to you.
 #           (In this case, the source code should be published
 #           on the CherryPick interface.  IT IS NOT ENOUGH TO
-#           DISCLOSE THE SOURCE CODE WHEN A USER REQUESTS IT BY
+#           DISCLOSE THE SOURCE CODE WEHN A USER REQUESTS IT BY
 #           E-MAIL OR OTHER MEANS.  If you are not satisfied
 #           with this, it is recommended that you read the
 #           license again carefully.  Anyway, enabling this
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 52fb1fabbc..6ea82e6d0c 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -19,6 +19,7 @@
 				"editorconfig.editorconfig",
 				"dbaeumer.vscode-eslint",
 				"Vue.volar",
+				"Vue.vscode-typescript-vue-plugin",
 				"Orta.vscode-jest",
 				"dbaeumer.vscode-eslint",
 				"mrmlnc.vscode-json5"
diff --git a/.github/workflows/check-spdx-license-id.yml b/.github/workflows/check-spdx-license-id.yml
deleted file mode 100644
index 6cd8bf60d5..0000000000
--- a/.github/workflows/check-spdx-license-id.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-name: Check SPDX-License-Identifier
-
-on:
-  push:
-    branches:
-      - master
-      - develop
-  pull_request:
-
-jobs:
-  check-spdx-license-id:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-      - name: Check
-        run: |
-          counter=0
-
-          search() {
-            local directory="$1"
-            find "$directory" -type f \
-              '(' \
-                -name "*.cjs" -and -not -name '*.config.cjs' -o \
-                -name "*.html" -o \
-                -name "*.js" -and -not -name '*.config.js' -o \
-                -name "*.mjs" -and -not -name '*.config.mjs' -o \
-                -name "*.scss" -o \
-                -name "*.ts" -and -not -name '*.config.ts' -o \
-                -name "*.vue" \
-              ')' -and \
-              -not -name '*eslint*'
-          }
-
-          check() {
-            local file="$1"
-            if ! (
-              grep -q "SPDX-FileCopyrightText: syuilo and misskey-project" "$file" ||
-              grep -q "SPDX-License-Identifier: AGPL-3.0-only" "$file"
-            ); then
-              echo "Missing: $file"
-              ((counter++))
-            fi
-          }
-
-          directories=(
-            "cypress/e2e"
-            "packages/backend/migration"
-            "packages/backend/src"
-            "packages/backend/test"
-            "packages/frontend/.storybook"
-            "packages/frontend/@types"
-            "packages/frontend/lib"
-            "packages/frontend/public"
-            "packages/frontend/src"
-            "packages/frontend/test"
-            "packages/misskey-bubble-game/src"
-            "packages/misskey-reversi/src"
-            "packages/sw/src"
-            "scripts"
-          )
-
-          for directory in "${directories[@]}"; do
-            for file in $(search $directory); do
-              check "$file"
-            done
-          done
-
-          if [ $counter -gt 0 ]; then
-            echo "SPDX-License-Identifier is missing in $counter files."
-            exit 1
-          else
-            echo "SPDX-License-Identifier is certainly described in all target files!"
-            exit 0
-          fi
diff --git a/.github/workflows/release-edit-with-push.yml b/.github/workflows/release-edit-with-push.yml
deleted file mode 100644
index 944b98eb7c..0000000000
--- a/.github/workflows/release-edit-with-push.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: "Release Manager: sync changelog with PR"
-
-on:
-  push:
-    branches:
-      - release/**
-    paths:
-      - 'CHANGELOG.md'
-
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-permissions:
-  contents: write
-  issues: write
-  pull-requests: write
-
-jobs:
-  edit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      # headがrelease/かつopenのPRを1つ取得
-      - name: Get PR
-        run: |
-          echo "pr_number=$(gh pr list --limit 1 --head "${{ github.ref_name }}" --json number  --jq '.[] | .number')" >> $GITHUB_OUTPUT
-        id: get_pr
-      - name: Get target version
-        uses: misskey-dev/release-manager-actions/.github/actions/get-target-version@v1
-        id: v
-      # CHANGELOG.mdの内容を取得
-      - name: Get changelog
-        uses: misskey-dev/release-manager-actions/.github/actions/get-changelog@v1
-        with:
-          version: ${{ steps.v.outputs.target_version }}
-        id: changelog
-      # PRのnotesを更新
-      - name: Update PR
-        run: |
-          gh pr edit ${{ steps.get_pr.outputs.pr_number }} --body "${{ steps.changelog.outputs.changelog }}"
diff --git a/.github/workflows/release-with-dispatch.yml b/.github/workflows/release-with-dispatch.yml
deleted file mode 100644
index 1a954739d9..0000000000
--- a/.github/workflows/release-with-dispatch.yml
+++ /dev/null
@@ -1,122 +0,0 @@
-name: "Release Manager [Dispatch]"
-
-on:
-  workflow_dispatch:
-    inputs:
-      ## Specify the type of the next release.
-      #version_increment_type:
-      #  type: choice
-      #  description: 'VERSION INCREMENT TYPE'
-      #  default: 'patch'
-      #  required: false
-      #  options:
-      #    - 'major'
-      #    - 'minor'
-      #    - 'patch'
-      merge:
-        type: boolean
-        description: 'MERGE RELEASE BRANCH TO MAIN'
-        default: false
-
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-permissions:
-  contents: write
-  issues: write
-  pull-requests: write
-
-jobs:
-  get-pr:
-    runs-on: ubuntu-latest
-    outputs:
-      pr_number: ${{ steps.get_pr.outputs.pr_number }}
-    steps:
-      - uses: actions/checkout@v4
-      # headがrelease/かつopenのPRを1つ取得
-      - name: Get PRs
-        run: |
-          echo "pr_number=$(gh pr list --limit 1 --search "head:release/ is:open" --json number  --jq '.[] | .number')" >> $GITHUB_OUTPUT
-        id: get_pr
-
-  merge:
-    uses: misskey-dev/release-manager-actions/.github/workflows/merge.yml@v1
-    needs: get-pr
-    if: ${{ needs.get-pr.outputs.pr_number != '' && inputs.merge == true }}
-    with:
-      pr_number: ${{ needs.get-pr.outputs.pr_number }}
-      package_jsons_to_rewrite: ${{ vars.PACKAGE_JSONS_TO_REWRITE }}
-      # Text to prepend to the changelog
-      # The first line must be `## Unreleased`
-      changes_template: |
-        ## Unreleased
-
-        ### General
-        -
-
-        ### Client
-        -
-
-        ### Server
-        -
-
-      use_external_app_to_release: ${{ vars.USE_RELEASE_APP == 'true' }}
-    secrets:
-      RELEASE_APP_ID: ${{ secrets.RELEASE_APP_ID }}
-      RELEASE_APP_PRIVATE_KEY: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
-      RULESET_EDIT_APP_ID: ${{ secrets.RULESET_EDIT_APP_ID }}
-      RULESET_EDIT_APP_PRIVATE_KEY: ${{ secrets.RULESET_EDIT_APP_PRIVATE_KEY }}
-
-  create-prerelease:
-    uses: misskey-dev/release-manager-actions/.github/workflows/create-prerelease.yml@v1
-    needs: get-pr
-    if: ${{ needs.get-pr.outputs.pr_number != '' && inputs.merge != true  }}
-    with:
-      pr_number: ${{ needs.get-pr.outputs.pr_number }}
-      package_jsons_to_rewrite: ${{ vars.PACKAGE_JSONS_TO_REWRITE }}
-      use_external_app_to_release: ${{ vars.USE_RELEASE_APP == 'true' }}
-    secrets:
-      RELEASE_APP_ID: ${{ secrets.RELEASE_APP_ID }}
-      RELEASE_APP_PRIVATE_KEY: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
-
-  create-target:
-    uses: misskey-dev/release-manager-actions/.github/workflows/create-target.yml@v1
-    needs: get-pr
-    if: ${{ needs.get-pr.outputs.pr_number == '' }}
-    with:
-      # The script for version increment.
-      # process.env.CURRENT_VERSION: The current version.
-      #
-      # Misskey calender versioning (yyyy.MM.patch) example
-      version_increment_script: |
-        const now = new Date();
-        const year = now.toLocaleDateString('en-US', { year: 'numeric', timeZone: 'Asia/Tokyo' });
-        const month = now.toLocaleDateString('en-US', { month: 'numeric', timeZone: 'Asia/Tokyo' });
-        const [major, minor, _patch] = process.env.CURRENT_VERSION.split('.');
-        const patch = Number(_patch.split('-')[0]);
-        if (Number.isNaN(patch)) {
-          console.error('Invalid patch version', year, month, process.env.CURRENT_VERSION, major, minor, _patch);
-          throw new Error('Invalid patch version');
-        }
-        if (year !== major || month !== minor) {
-          return `${year}.${month}.0`;
-        } else {
-          return `${major}.${minor}.${patch + 1}`;
-        }
-      ##Semver example
-      #version_increment_script: |
-      #  const [major, minor, patch] = process.env.CURRENT_VERSION.split('.');
-      #  if ("${{ inputs.version_increment_type }}" === "major") {
-      #    return `${Number(major) + 1}.0.0`;
-      #  } else if ("${{ inputs.version_increment_type }}" === "minor") {
-      #    return `${major}.${Number(minor) + 1}.0`;
-      #  } else {
-      #    return `${major}.${minor}.${Number(patch) + 1}`;
-      #  }
-      package_jsons_to_rewrite: ${{ vars.PACKAGE_JSONS_TO_REWRITE }}
-      use_external_app_to_release: ${{ vars.USE_RELEASE_APP == 'true' }}
-    secrets:
-      RELEASE_APP_ID: ${{ secrets.RELEASE_APP_ID }}
-      RELEASE_APP_PRIVATE_KEY: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
-      RULESET_EDIT_APP_ID: ${{ secrets.RULESET_EDIT_APP_ID }}
-      RULESET_EDIT_APP_PRIVATE_KEY: ${{ secrets.RULESET_EDIT_APP_PRIVATE_KEY }}
diff --git a/.github/workflows/release-with-ready.yml b/.github/workflows/release-with-ready.yml
deleted file mode 100644
index b64ed20791..0000000000
--- a/.github/workflows/release-with-ready.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: "Release Manager: release RC when ready for review"
-
-on:
-  pull_request:
-    types: [ready_for_review]
-
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-permissions:
-  contents: write
-  issues: write
-  pull-requests: write
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    outputs:
-      ref: ${{ steps.get_pr.outputs.ref }}
-    steps:
-      - uses: actions/checkout@v4
-      # PR情報を取得
-      - name: Get PR
-        run: |
-          pr_json=$(gh pr view ${{ github.event.pull_request.number }} --json isDraft,headRefName)
-          echo "ref=$(echo $pr_json | jq -r '.headRefName')" >> $GITHUB_OUTPUT
-        id: get_pr
-  release:
-    uses: misskey-dev/release-manager-actions/.github/workflows/create-prerelease.yml@v1
-    needs: check
-    if: startsWith(needs.check.outputs.ref, 'release/')
-    with:
-      pr_number: ${{ github.event.pull_request.number }}
-      package_jsons_to_rewrite: ${{ vars.PACKAGE_JSONS_TO_REWRITE }}
-      use_external_app_to_release: ${{ vars.USE_RELEASE_APP == 'true' }}
-    secrets:
-      RELEASE_APP_ID: ${{ secrets.RELEASE_APP_ID }}
-      RELEASE_APP_PRIVATE_KEY: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 3cdf81e339..baca8db246 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -3,7 +3,9 @@
 		"editorconfig.editorconfig",
 		"dbaeumer.vscode-eslint",
 		"Vue.volar",
+		"Vue.vscode-typescript-vue-plugin",
 		"Orta.vscode-jest",
+		"dbaeumer.vscode-eslint",
 		"mrmlnc.vscode-json5"
 	]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0ceec23acd..e2a82b1ffe 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,7 +7,7 @@
 		"*.test.ts": "typescript"
 	},
 	"jest.jestCommandLine": "pnpm run jest",
-	"jest.runMode": "on-demand",
+	"jest.autoRun": "off",
 	"editor.codeActionsOnSave": {
 		"source.fixAll": "explicit"
 	},
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1bdcf5fbe..6bd93080f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,57 +1,19 @@
-## Unreleased
-
-### General
-- Fix: Play作成時に設定した公開範囲が機能していない問題を修正
-
-### Client
-- Enhance: 自分のノートの添付ファイルから直接ファイルの詳細ページに飛べるように
-- Enhance: 広告がMisskeyと同一ドメインの場合はRouterで遷移するように
-- Enhance: リアクション・いいねの総数を表示するように
-- Enhance: リアクション受け入れが「いいねのみ」の場合はリアクション絵文字一覧を表示しないように
-- Enhance: 設定>プラグインのページからプラグインの簡易的なログやエラーを見られるように
-  - 実装の都合により、プラグインは１つエラーを起こした時に即時停止するようになりました
-- Enhance: ページのデザインを変更	
-- Fix: 一部のページ内リンクが正しく動作しない問題を修正
-- Fix: 周年の実績が閏年を考慮しない問題を修正
-- Fix: ローカルURLのプレビューポップアップが左上に表示される
-- Fix: WebGL2をサポートしないブラウザで「季節に応じた画面の演出」が有効になっているとき、Misskeyが起動できなくなる問題を修正  
-  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/459)
-- Fix: ページタイトルでローカルユーザーとリモートユーザーの区別がつかない問題を修正  
-  (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/528)
-- Fix: コードブロックのシンタックスハイライトで使用される定義ファイルをCDNから取得するように #13177
-  - CDNから取得せずMisskey本体にバンドルする場合は`pacakges/frontend/vite.config.ts`を修正してください。
-
-### Server
-- Enhance: エンドポイント`antennas/update`の必須項目を`antennaId`のみに
-- Fix: フォローリクエストを作成する際に既存のものは削除するように  
-  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/440)
-
-## 2024.3.1
+<!--
+## 202x.x.x (unreleased)
 
 ### General
 -
 
 ### Client
-- Fix: 絵文字関係の不具合を修正 (#13485)
-  - 履歴に残っている or ピン留めされた絵文字がコントロールパネルより削除されていた際にリアクションデッキが表示できなくなる
-  - Unicode絵文字が履歴に残っている or ピン留めされているとリアクションデッキが表示できなくなる
-- Fix: カスタム絵文字の画像読み込みに失敗した際はテキストではなくダミー画像を表示 #13487
+- 
 
 ### Server
 -
 
-## 2024.3.0
+-->
+## 202x.x.x (unreleased)
 
 ### General
-- Enhance: 投稿者のロールに応じて、一つのノートに含むことのできるメンションとダイレクト投稿の宛先の人数に上限を設定できるように
-  * デフォルトのメンション上限は20アカウントに設定されます。（管理者はベースロールの設定で変更可能です。）
-  * 連合の問い合わせに応答しないサーバーのリモートユーザーへのメンションは、上限の人数に含めない実装になっています。
-- Enhance: 通知がミュート、凍結を考慮するようになりました
-- Enhance: サーバーごとにモデレーションノートを残せるように
-- Enhance: コンディショナルロールの条件に「マニュアルロールへのアサイン」を追加
-- Enhance: 通知の受信設定に「フォロー中またはフォロワー」を追加
-- Enhance: 通知の履歴をリセットできるように
-- Fix: ダイレクトなノートに対してはダイレクトでしか返信できないように
 
 ### Client
 - Enhance: ノート作成画面のファイル添付メニューの区切り線の位置を調整
@@ -59,24 +21,9 @@
 - Fix: MFMのオートコンプリートが出るべき状況で出ないことがある問題を修正
 - Fix: チャートのラベルが消えている問題を修正
 - Fix: 画面表示後最初の音声再生が爆音になることがある問題を修正
-- Fix: 設定のバックアップ作成時に名前を入力しなかった場合、ローカライゼーションがおかしくなる問題を修正
-- Fix: ページ`/admin/emojis`の絵文字編集ダイアログで「リアクションとして使えるロール」を追加する際に何も選択せずOKを押下すると画面が固まる問題を修正
-- Fix: 絵文字サジェストの順位で、絵文字自体の名前が同じものよりもタグで一致しているものが優先されてしまう問題を修正
-- Fix: ユーザの情報のポップアップが消えなくなることがある問題を修正
 
 ### Server
-- Enhance: エンドポイント`flash/update`の`flashId`以外のパラメータは必須ではなくなりました
 - Fix: nodeinfoにenableMcaptchaとenableTurnstileが無いのを修正
-- Fix: 破損した通知をクライアントに送信しないように
-	* 通知欄が無限にリロードされる問題が改善する可能性があります
-- Fix: 禁止キーワードを含むノートがDelayed Queueに追加されて再処理される問題を修正
-- Fix: 自分がフォローしていないアカウントのフォロワー限定ノートが閲覧できることがある問題を修正
-- Fix: タイムラインのオプションで「リノートを表示」を無効にしている際、投票のみの引用リノートが流れてこない問題を修正
-- Fix: エンドポイント`admin/emoji/update`の各種修正
-  - 必須パラメータを`id`または`name`のいずれかのみに
-  - `id`の代わりに`name`で絵文字を指定可能に（`id`・`name`両指定時は従来通り`name`を変更する挙動）
-  - `category`および`licence`が指定なしの時勝手にnullに上書きされる挙動を修正
-- Fix: 通知の受信設定で「相互フォロー」が正しく動作しない問題を修正
 
 ## 2024.2.0
 
diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index a13d2a929c..d7b4e58856 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -23,19 +23,6 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE
 # 릴리즈 노트
 이 문서는 CherryPick의 변경 사항만 포함합니다.
 
-## 4.x.x
-출시일: unreleased<br>
-기반 Misskey 버전: 2024.x.x<br>
-Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGELOG.md#2024xx) 문서를 참고하십시오.
-
-### Client
-- Fix: 노트를 내보낼 때 노트의 편집 기록을 포함
-
-### Server
-- Enhance: 디버깅을 보다 편하게 할 수 있도록 vite 생성 파일의 이름 개선
-
----
-
 ## 4.7.0
 출시일: 2024/3/19<br>
 기반 Misskey 버전: 2024.2.0<br>
@@ -52,7 +39,6 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#202420](CHANGE
 - Fix: 노트 자세히 보기에서 노트 작성 폼을 클릭하면 내용이 초기화될 수 있음 (kokonect-link/cherrypick#410)
 - Fix: '설정 - 타임라인' 페이지가 표시되지 않음
 - Fix: '노트 - 리액션 목록' 기능이 작동하지 않음
-- Fix: oswithdialogをMkNotification.vueで使わないように。
 
 ---
 
diff --git a/CHANGELOG_engawa.md b/CHANGELOG_engawa.md
index c745cbf106..521df42b49 100644
--- a/CHANGELOG_engawa.md
+++ b/CHANGELOG_engawa.md
@@ -15,13 +15,6 @@
 ### Misc
 
 -->
-## 0.3.1
-
-### Release Date
-- 一部不具合を修正
-- Misskey 2023.3.1に対応
-
-
 ## 0.3.0
 
 ### Release Date
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 93038ad9ed..854f8e5f77 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -316,98 +316,6 @@ export const handlers = [
 
 Don't forget to re-run the `.storybook/generate.js` script after adding, editing, or removing the above files.
 
-## Nest
-
-### Nest Service Circular dependency / Nestでサービスの循環参照でエラーが起きた場合
-
-#### forwardRef
-まずは簡単に`forwardRef`を試してみる
-
-```typescript
-export class FooService {
-	constructor(
-		@Inject(forwardRef(() => BarService))
-		private barService: BarService
-	) {
-	}
-}
-```
-
-#### OnModuleInit
-できなければ`OnModuleInit`を使う
-
-```typescript
-import { Injectable, OnModuleInit } from '@nestjs/common';
-import { ModuleRef } from '@nestjs/core';
-import { BarService } from '@/core/BarService';
-
-@Injectable()
-export class FooService implements OnModuleInit {
-	private barService: BarService // constructorから移動してくる
-
-	constructor(
-		private moduleRef: ModuleRef,
-	) {
-	}
-
-	async onModuleInit() {
-		this.barService = this.moduleRef.get(BarService.name);
-	}
-
-	public async niceMethod() {
-		return await this.barService.incredibleMethod({ hoge: 'fuga' });
-	}
-}
-```
-
-##### Service Unit Test
-テストで`onModuleInit`を呼び出す必要がある
-
-```typescript
-// import ...
-
-describe('test', () => {
-	let app: TestingModule;
-	let fooService: FooService; // for test case
-	let barService: BarService; // for test case
-
-	beforeEach(async () => {
-		app = await Test.createTestingModule({
-			imports: ...,
-			providers: [
-				FooService,
-				{ // mockする (mockは必須ではないかもしれない)
-					provide: BarService,
-					useFactory: () => ({
-						incredibleMethod: jest.fn(),
-					}),
-				},
-				{ // Provideにする
-					provide: BarService.name,
-					useExisting: BarService,
-				},
-			],
-		})
-			.useMocker(...
-			.compile();
-	
-		fooService = app.get<FooService>(FooService);
-		barService = app.get<BarService>(BarService) as jest.Mocked<BarService>;
-
-		// onModuleInitを実行する
-		await fooService.onModuleInit();
-	});
-
-	test('nice', () => {
-		await fooService.niceMethod();
-
-		expect(barService.incredibleMethod).toHaveBeenCalled();
-		expect(barService.incredibleMethod.mock.lastCall![0])
-			.toEqual({ hoge: 'fuga' });
-	});
-})
-```
-
 ## Notes
 
 ### Misskeyのドメイン固有の概念は`Mi`をprefixする
diff --git a/README.md b/README.md
index 111b5eeda6..839faf85b7 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,9 @@
 <div align="center">
 <a href="https://misskey-hub.net">
-	<img src="./assets/title_float_cherrypick.svg" alt="CherryPick logo" style="border-radius:50%" width="300"/>
+	<img src="./assets/title_float_cherrypick.svg" alt="CherryPick logo" width="400"/>
 </a>
 
-**🌎 **CherryPick** is an open source, federated social media platform that's free forever! 🚀**
-
-[Learn more](https://misskey-hub.net/)
+**🌎 **[CherryPick](https://misskey-hub.net/)** is an open source, decentralized social media platform that's free forever! 🚀**
 
 ---
 
@@ -24,6 +22,41 @@
 <a href="https://www.patreon.com/noridev">
 		<img src="https://custom-icon-badges.herokuapp.com/badge/become_a-patron-F96854?logoColor=F96854&style=for-the-badge&logo=patreon&labelColor=363B40" alt="become a patron"/></a>
 
+---
+
+[![codecov](https://codecov.io/gh/kokonect-link/cherrypick/branch/develop/graph/badge.svg?token=3BRDXE34O0)](https://codecov.io/gh/kokonect-link/cherrypick)
+
+</div>
+
+<div>
+
+<a href="https://xn--931a.moe/"><img src="https://github.com/kokonect-link/cherrypick/blob/develop/assets/ai.png?raw=true" align="right" height="320px"/></a>
+
+## ✨ Features
+- **ActivityPub support**\
+Not on CherryPick? No problem! Not only can CherryPick instances talk to each other, but you can make friends with people on other networks like Mastodon and Misskey and Pixelfed!
+- **Reactions**\
+You can add emoji reactions to any post! No longer are you bound by a like button, show everyone exactly how you feel with the tap of a button.
+- **Drive**\
+With CherryPick's built in drive, you get cloud storage right in your social media, where you can upload any files, make folders, and find media from posts you've made!
+- **Rich Web UI**\
+	CherryPick has a rich and easy to use Web UI!
+	It is highly customizable, from changing the layout and adding widgets to making custom themes.
+	Furthermore, plugins can be created using AiScript, an original programming language.
+- And much more...
+
+</div>
+
+<div style="clear: both;"></div>
+
+## Documentation
+
+CherryPick Documentation can be found at [Misskey Hub](https://misskey-hub.net/docs/), some of the links and graphics above also lead to specific portions of it.
+
+## Sponsors
+
+<div align="center">
+	<a class="rss3" title="RSS3" href="https://rss3.io/" target="_blank"><img src="https://rss3.mypinata.cloud/ipfs/QmUG6H3Z7D5P511shn7sB4CPmpjH5uZWu4m5mWX7U3Gqbu" alt="RSS3" height="60"></a>
 </div>
 
 ## Thanks
diff --git a/cypress/e2e/basic.cy.ts b/cypress/e2e/basic.cy.js
similarity index 98%
rename from cypress/e2e/basic.cy.ts
rename to cypress/e2e/basic.cy.js
index f0ea7a3d44..6531c9f1b4 100644
--- a/cypress/e2e/basic.cy.ts
+++ b/cypress/e2e/basic.cy.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 describe('Before setup instance', () => {
 	beforeEach(() => {
 		cy.resetState();
diff --git a/cypress/e2e/router.cy.ts b/cypress/e2e/router.cy.js
similarity index 91%
rename from cypress/e2e/router.cy.ts
rename to cypress/e2e/router.cy.js
index 8d8fb3af31..6de27be5f4 100644
--- a/cypress/e2e/router.cy.ts
+++ b/cypress/e2e/router.cy.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 describe('Router transition', () => {
 	describe('Redirect', () => {
 		// サーバの初期化。ルートのテストに関しては各describeごとに1度だけ実行で十分だと思う（使いまわした方が早い）
diff --git a/cypress/e2e/widgets.cy.ts b/cypress/e2e/widgets.cy.js
similarity index 95%
rename from cypress/e2e/widgets.cy.ts
rename to cypress/e2e/widgets.cy.js
index 847801a69f..df6ec8357d 100644
--- a/cypress/e2e/widgets.cy.ts
+++ b/cypress/e2e/widgets.cy.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 /* flaky
 describe('After user signed in', () => {
 	beforeEach(() => {
diff --git a/cypress/support/commands.ts b/cypress/support/commands.js
similarity index 98%
rename from cypress/support/commands.ts
rename to cypress/support/commands.js
index c2d92e1663..91a4d7abe6 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.js
@@ -30,7 +30,7 @@ Cypress.Commands.add('visitHome', () => {
 })
 
 Cypress.Commands.add('resetState', () => {
-	cy.window().then(win => {
+	cy.window(win => {
 		win.indexedDB.deleteDatabase('keyval-store');
 	});
 	cy.request('POST', '/api/reset-db', {}).as('reset');
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.js
similarity index 100%
rename from cypress/support/e2e.ts
rename to cypress/support/e2e.js
diff --git a/cypress/support/index.ts b/cypress/support/index.ts
deleted file mode 100644
index c1bed21979..0000000000
--- a/cypress/support/index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-declare global {
-	namespace Cypress {
-		interface Chainable {
-			login(username: string, password: string): Chainable<void>;
-
-			registerUser(
-				username: string,
-				password: string,
-				isAdmin?: boolean
-			): Chainable<void>;
-
-			resetState(): Chainable<void>;
-
-			visitHome(): Chainable<void>;
-		}
-	}
-}
-
-export {}
diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
deleted file mode 100644
index 6fe7f32cc4..0000000000
--- a/cypress/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"compilerOptions": {
-		"lib": ["dom", "es5"],
-		"target": "es5",
-		"types": ["cypress", "node"]
-	},
-	"include": ["./**/*.ts"]
-}
diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index a0e68be172..38f6a21d62 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -1028,7 +1028,6 @@ renotes: "أعد النشر"
 sourceCode: "الشفرة المصدرية"
 flip: "اقلب"
 lastNDays: "آخر {n} أيام"
-surrender: "ألغِ"
 _initialAccountSetting:
   accountCreated: "نجح إنشاء حسابك!"
   letsStartAccountSetup: "إذا كنت جديدًا لنعدّ حسابك الشخصي."
diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index 8733add3d9..5fdac14f69 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -1210,7 +1210,6 @@ hemisphere: "Geolocalització"
 withSensitive: "Incloure notes amb fitxers sensibles"
 userSaysSomethingSensitive: "La publicació de {name} conte material sensible"
 enableHorizontalSwipe: "Lliscar per canviar de pestanya"
-surrender: "Cancel·lar "
 _bubbleGame:
   howToPlay: "Com es juga"
   _howToPlay:
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index df38695694..44a104a2d5 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -1098,7 +1098,6 @@ renotes: "Přeposlat"
 sourceCode: "Zdrojový kód"
 flip: "Otočit"
 lastNDays: "Posledních {n} dnů"
-surrender: "Zrušit"
 _initialAccountSetting:
   accountCreated: "Váš účet byl úspěšně vytvořen!"
   letsStartAccountSetup: "Pro začátek si nastavte svůj profil."
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 0d6761d0ea..8b4c21f36a 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -1198,7 +1198,6 @@ decorate: "Dekorieren"
 addMfmFunction: "MFM hinzufügen"
 sfx: "Soundeffekte"
 lastNDays: "Letzten {n} Tage"
-surrender: "Abbrechen"
 _announcement:
   forExistingUsers: "Nur für existierende Nutzer"
   forExistingUsersDescription: "Ist diese Option aktiviert, wird diese Ankündigung nur Nutzern angezeigt, die zum Zeitpunkt der Ankündigung bereits registriert sind. Ist sie deaktiviert, wird sie auch Nutzern, die sich nach dessen Veröffentlichung registrieren, angezeigt."
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 2f85f23684..1dadf0de0a 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1096,7 +1096,6 @@ neverShow: "Don't show again"
 remindMeLater: "Maybe later"
 didYouLikeMisskey: "Have you taken a liking to CherryPick?"
 pleaseDonate: "{host} uses the free software, CherryPick. We would highly appreciate your donations so development of CherryPick can continue!"
-correspondingSourceIsAvailable: "The corresponding source code is available at {anchor}"
 roles: "Roles"
 role: "Role"
 noRole: "Role not found"
@@ -1148,8 +1147,6 @@ resetPasswordConfirm: "Really reset your password?"
 sensitiveWords: "Sensitive words"
 sensitiveWordsDescription: "The visibility of all notes containing any of the configured words will be set to \"Home\" automatically. You can list multiple by separating them via line breaks."
 sensitiveWordsDescription2: "Using spaces will create AND expressions and surrounding keywords with slashes will turn them into a regular expression."
-prohibitedWords: "Prohibited words"
-prohibitedWordsDescription: "Enables an error when attempting to post a note containing the set word(s). Multiple words can be set, separated by a new line."
 prohibitedWordsDescription2: "Using spaces will create AND expressions and surrounding keywords with slashes will turn them into a regular expression."
 hiddenTags: "Hidden hashtags"
 hiddenTagsDescription: "Select tags which will not shown on trend list.\nMultiple tags could be registered by lines."
@@ -1272,7 +1269,6 @@ showRenotes: "Show renotes"
 edited: "Edited"
 notificationRecieveConfig: "Notification Settings"
 mutualFollow: "Mutual follow"
-followingOrFollower: "Following or follower"
 fileAttachedOnly: "Only notes with files"
 showRepliesToOthersInTimeline: "Show replies to others in timeline"
 hideRepliesToOthersInTimeline: "Hide replies to others from timeline"
@@ -1282,12 +1278,6 @@ confirmShowRepliesAll: "This operation is irreversible. Would you really like to
 confirmHideRepliesAll: "This operation is irreversible. Would you really like to hide replies to others from everyone you follow in your timeline?"
 externalServices: "External Services"
 sourceCode: "Source code"
-sourceCodeIsNotYetProvided: "Source code is not yet available. Contact the administrator to fix this problem."
-repositoryUrl: "Repository URL"
-repositoryUrlDescription: "If you are using CherryPick as is (without any changes to the source code), enter https://github.com/kokonect-link/cherrypick"
-repositoryUrlOrTarballRequired: "If you have not published a repository, you must provide a tarball instead. See .config/example.yml for more information."
-feedback: "Feedback"
-feedbackUrl: "Feedback URL"
 impressum: "Impressum"
 impressumUrl: "Impressum URL"
 impressumDescription: "In some countries, like germany, the inclusion of operator contact information (an Impressum) is legally required for commercial websites."
@@ -1324,8 +1314,6 @@ soundWillBePlayed: "Sound will be played"
 showReplay: "View Replay"
 replay: "Replay"
 replaying: "Showing replay"
-endReplay: "Exit Replay"
-copyReplayData: "Copy replay data"
 ranking: "Ranking"
 lastNDays: "Last {n} days"
 backToTitle: "Go back to title"
@@ -1333,9 +1321,6 @@ hemisphere: "Where are you located"
 withSensitive: "Include notes with sensitive files"
 userSaysSomethingSensitive: "Post by {name} contains sensitive content"
 enableHorizontalSwipe: "Swipe to switch tabs"
-loading: "Loading"
-surrender: "Cancel"
-gameRetry: "Retry"
 showUnreadNotificationsCount: "Show the number of unread notifications"
 showCatOnly: "Show only cats"
 additionalPermissionsForFlash: "Allow to add permission to Play"
@@ -1360,15 +1345,6 @@ _messaging:
   direct: "Direct Message"
 _bubbleGame:
   howToPlay: "How to play"
-  hold: "Hold"
-  _score:
-    score: "Score"
-    scoreYen: "Amount of money earned"
-    highScore: "High score"
-    maxChain: "Maximum number of chains"
-    yen: "{yen} Yen"
-    estimatedQty: "{qty} Pieces"
-    scoreSweets: "{onigiriQtyWithUnit} Onigiri"
   _howToPlay:
     section1: "Adjust the position and drop the object into the box."
     section2: "When two objects of the same type touch each other, they will change into a different object and you score points."
@@ -1875,7 +1851,6 @@ _role:
     ltlAvailable: "Can view the local timeline"
     canPublicNote: "Can send public notes"
     canEditNote: "Note editing"
-    mentionMax: "Maximum number of mentions in a note"
     canInvite: "Can create instance invite codes"
     inviteLimit: "Invite limit"
     inviteLimitCycle: "Invite limit cooldown"
@@ -1899,7 +1874,6 @@ _role:
     canUseTranslator: "Translator usage"
     avatarDecorationLimit: "Maximum number of avatar decorations that can be applied"
   _condition:
-    roleAssignedTo: "Assigned to manual roles"
     isLocal: "Local user"
     isRemote: "Remote user"
     createdLessThan: "Less than X has passed since account creation"
@@ -2004,8 +1978,6 @@ _aboutMisskey:
   contributors: "Main contributors"
   allContributors: "All contributors"
   source: "Source code"
-  original: "Original"
-  thisIsModifiedVersion: "{name} uses a modified version of the original Misskey."
   translation: "Translate Misskey"
   donate: "Donate to Misskey"
   morePatrons: "We also appreciate the support of many other helpers not listed here. Thank you! 🥰"
@@ -2619,7 +2591,6 @@ _notification:
   reactedBySomeUsers: "{n} users reacted"
   renotedBySomeUsers: "Renote from {n} users"
   followedBySomeUsers: "Followed by {n} users"
-  flushNotification: "Clear notifications"
   _types:
     all: "All"
     note: "New notes"
@@ -2718,7 +2689,6 @@ _moderationLogTypes:
   resetPassword: "Password reset"
   suspendRemoteInstance: "Remote instance suspended"
   unsuspendRemoteInstance: "Remote instance unsuspended"
-  updateRemoteInstanceNote: "Moderation note updated for remote instance."
   markSensitiveDriveFile: "File marked as sensitive"
   unmarkSensitiveDriveFile: "File unmarked as sensitive"
   resolveAbuseReport: "Report resolved"
@@ -2839,8 +2809,6 @@ _reversi:
   opponentHasSettingsChanged: "The opponent has changed their settings."
   allowIrregularRules: "Irregular rules (completely free)"
   disallowIrregularRules: "No irregular rules"
-  showBoardLabels: "Display row and column numbering on the board"
-  useAvatarAsStone: "Turn stones into user avatars"
 _offlineScreen:
   title: "Offline - cannot connect to the server"
   header: "Unable to connect to the server"
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 664927e8a5..7fd6b05f52 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -1223,7 +1223,6 @@ hemisphere: "Región"
 withSensitive: "Mostrar notas que contengan material sensible"
 userSaysSomethingSensitive: "La publicación de {name} contiene material sensible"
 enableHorizontalSwipe: "Deslice para cambiar de pestaña"
-surrender: "detener"
 _bubbleGame:
   howToPlay: "Cómo jugar"
   _howToPlay:
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index 1cc57c8ca8..80038714be 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -380,11 +380,8 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "Activer hCaptcha"
 hcaptchaSiteKey: "Clé du site"
 hcaptchaSecretKey: "Clé secrète"
-mcaptcha: "mCaptcha"
-enableMcaptcha: "Activer mCaptcha"
 mcaptchaSiteKey: "Clé du site"
 mcaptchaSecretKey: "Clé secrète"
-mcaptchaInstanceUrl: "URL de l'instance de mCaptcha"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Activer reCAPTCHA"
 recaptchaSiteKey: "Clé du site"
@@ -538,7 +535,7 @@ hideThisNote: "Masquer cette note"
 showFeaturedNotesInTimeline: "Afficher les notes des Tendances dans le fil d'actualité"
 objectStorage: "Stockage d'objets"
 useObjectStorage: "Utiliser le stockage d'objets"
-objectStorageBaseUrl: "URL de base"
+objectStorageBaseUrl: "Base URL"
 objectStorageBaseUrlDesc: "Préfixe d’URL utilisé pour construire l’URL vers le référencement d’objet (média). Spécifiez son URL si vous utilisez un CDN ou un proxy, sinon spécifiez l’adresse accessible au public selon le guide de service que vous allez utiliser. P.ex. 'https://<bucket>.s3.amazonaws.com' pour AWS S3 et 'https://storage.googleapis.com/<bucket>' pour GCS."
 objectStorageBucket: "Bucket"
 objectStorageBucketDesc: "Veuillez spécifier le nom du compartiment utilisé sur le service configuré."
@@ -642,8 +639,7 @@ large: "Grand"
 medium: "Moyen"
 small: "Petit"
 generateAccessToken: "Générer un jeton d'accès"
-permission: "Autorisations "
-adminPermission: "Droits de l'administrateur"
+permission: "Autorisations "
 enableAll: "Tout activer"
 disableAll: "Tout désactiver"
 tokenRequested: "Autoriser l'accès au compte"
@@ -1049,18 +1045,12 @@ nonSensitiveOnlyForLocalLikeOnlyForRemote: "Non sensibles seulement (mentions j'
 rolesAssignedToMe: "Rôles attribués à moi"
 resetPasswordConfirm: "Souhaitez-vous réinitialiser votre mot de passe ?"
 sensitiveWords: "Mots sensibles"
-sensitiveWordsDescription2: "Séparer par une espace pour créer une expression AND ; entourer de barres obliques pour créer une expression régulière."
-prohibitedWords: "Mots interdits"
-prohibitedWordsDescription2: "Séparer par une espace pour créer une expression AND ; entourer de barres obliques pour créer une expression régulière."
 hiddenTags: "Hashtags cachés"
 hiddenTagsDescription: "Les hashtags définis ne s'afficheront pas dans les tendances. Vous pouvez définir plusieurs hashtags en faisant un saut de ligne."
 notesSearchNotAvailable: "La recherche de notes n'est pas disponible."
 license: "Licence"
-unfavoriteConfirm: "Vraiment supprimer des favoris ?"
 myClips: "Mes clips"
 drivecleaner: "Nettoyeur du Disque"
-retryAllQueuesNow: "Réessayer tous les fils d'attente immédiatement"
-retryAllQueuesConfirmTitle: "Vraiment réessayer ?"
 retryAllQueuesConfirmText: "Cela peut augmenter temporairement la charge du serveur."
 enableChartsForRemoteUser: "Générer les graphiques pour les utilisateurs distants"
 enableChartsForFederatedInstances: "Générer les graphiques pour les instances distantes"
@@ -1070,8 +1060,6 @@ limitWidthOfReaction: "Limiter la largeur maximale des réactions et les affiche
 noteIdOrUrl: "Identifiant de la note ou URL"
 video: "Vidéo"
 videos: "Vidéos"
-audio: "Audio"
-audioFiles: "Fichiers audio"
 dataSaver: "Économiseur de données"
 accountMigration: "Migration de compte"
 accountMoved: "Cet·te utilisateur·rice a migré son compte vers :"
@@ -1110,10 +1098,7 @@ specifyUser: "Spécifier l'utilisateur·rice"
 failedToPreviewUrl: "Aperçu d'URL échoué"
 update: "Mettre à jour"
 rolesThatCanBeUsedThisEmojiAsReaction: "Rôles qui peuvent utiliser cet émoji comme réaction"
-rolesThatCanBeUsedThisEmojiAsReactionEmptyDescription: "Si aucun rôle n'est spécifié, tout le monde peut utiliser cet émoji comme réaction."
-rolesThatCanBeUsedThisEmojiAsReactionPublicRoleWarn: "Il faut un rôle public."
 cancelReactionConfirm: "Supprimez la réaction ?"
-changeReactionConfirm: "Changer la réaction ?"
 later: "Plus tard"
 goToMisskey: "Retour vers CherryPick"
 additionalEmojiDictionary: "Dictionnaires d'émojis additionnels"
@@ -1139,13 +1124,11 @@ used: "Utilisé"
 expired: "Expiré"
 doYouAgree: "Êtes-vous d’accord ?"
 beSureToReadThisAsItIsImportant: "Assurez-vous de le lire ; c'est important."
-iHaveReadXCarefullyAndAgree: "J'ai lu le contenu de « {x} » et donne mon accord."
 dialog: "Dialogue"
 icon: "Avatar"
 forYou: "Pour vous"
 currentAnnouncements: "Annonces actuelles"
 pastAnnouncements: "Annonces passées"
-youHaveUnreadAnnouncements: "Il y a des annonces non lues."
 replies: "Réponses"
 renotes: "Renotes"
 loadReplies: "Inclure les réponses"
@@ -1160,7 +1143,6 @@ showRenotes: "Afficher les renotes"
 edited: "Modifié"
 notificationRecieveConfig: "Paramètres des notifications"
 mutualFollow: "Abonnement mutuel"
-fileAttachedOnly: "Avec fichiers joints seulement"
 showRepliesToOthersInTimeline: "Afficher les réponses aux autres dans le fil"
 hideRepliesToOthersInTimeline: "Masquer les réponses aux autres dans le fil"
 showRepliesToOthersInTimelineAll: "Afficher les réponses de toutes les personnes que vous suivez dans le fil"
@@ -1169,11 +1151,6 @@ confirmShowRepliesAll: "Cette opération est irréversible. Voulez-vous vraiment
 confirmHideRepliesAll: "Cette opération est irréversible. Voulez-vous vraiment masquer les réponses de toutes les personnes que vous suivez dans le fil ?"
 externalServices: "Services externes"
 sourceCode: "Code source"
-sourceCodeIsNotYetProvided: "Le code source n'est pas encore disponible. Veuillez signaler ce problème aux administrateurs."
-repositoryUrl: "URL du dépôt"
-repositoryUrlDescription: "Entrez l'URL du dépôt où se trouve le code source ici. Si vous utilisez CherryPick tel quel (sans changer le code source), entrez https://github.com/kokonect-link/cherrypick"
-feedback: "Commentaires"
-feedbackUrl: "URL pour les commentaires"
 impressum: "Impressum"
 impressumUrl: "URL de l'impressum"
 impressumDescription: "Dans certains pays comme l'Allemagne, il est obligatoire d'afficher les informations sur l'opérateur d'un site (un impressum)."
@@ -1201,32 +1178,7 @@ remainingN: "Restants : {n}"
 overwriteContentConfirm: "Voulez-vous remplacer le contenu actuel ?"
 seasonalScreenEffect: "Effet d'écran saisonnier"
 decorate: "Décorer"
-addMfmFunction: "Insérer MFM"
-enableQuickAddMfmFunction: "Afficher le sélecteur de MFM avancé"
-bubbleGame: "Jeu de bulles"
-sfx: "Effets sonores"
-soundWillBePlayed: "Le son sera joué"
-showReplay: "Voir le replay"
-replay: "Rediffusion"
-replaying: "En cours de rediffusion"
-endReplay: "Arrêter la rediffusion"
-copyReplayData: "Copier les données de la rediffusion"
-ranking: "Classement"
 lastNDays: "Derniers {n} jours"
-backToTitle: "Retourner au titre"
-hemisphere: "Votre région"
-enableHorizontalSwipe: "Glisser pour changer d'onglet"
-loading: "Chargement en cours"
-surrender: "Annuler"
-gameRetry: "Réessayer"
-_bubbleGame:
-  howToPlay: "Comment jouer"
-  hold: "Réserver"
-  _score:
-    score: "Score"
-    scoreYen: "Montant gagné"
-    highScore: "Meilleur score"
-    yen: "{yen} yens"
 _announcement:
   forExistingUsers: "Pour les utilisateurs existants seulement"
   readConfirmTitle: "Marquer comme lu ?"
@@ -1364,13 +1316,10 @@ _achievements:
       title: "Régulier III"
       description: "Se connecter pour un total de 400 jours"
     _login500:
-      title: "Expert I"
       description: "Se connecter pour un total de 500 jours"
     _login600:
-      title: "Expert II"
       description: "Se connecter pour un total de 600 jours"
     _login700:
-      title: "Expert III"
       description: "Se connecter pour un total de 700 jours"
     _login800:
       description: "Se connecter pour un total de 800 jours"
@@ -1467,12 +1416,9 @@ _role:
   description: "Description du rôle"
   permission: "Rôle et autorisations"
   assignTarget: "Attribuer"
-  manual: "Manuel"
   manualRoles: "Rôles manuels"
-  conditional: "Conditionnel"
   conditionalRoles: "Rôles conditionnels"
   condition: "Condition"
-  isConditionalRole: "Ceci est un rôle conditionnel."
   isPublic: "Rôle public"
   options: "Options"
   policies: "Stratégies"
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index 22469815e7..547c554bf5 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -1223,7 +1223,6 @@ hemisphere: "Letak kamu tinggal"
 withSensitive: "Lampirkan catatan dengan berkas sensitif"
 userSaysSomethingSensitive: "Postingan oleh {name} mengandung konten sensitif"
 enableHorizontalSwipe: "Geser untuk mengganti tab"
-surrender: "Batalkan"
 _bubbleGame:
   howToPlay: "Cara bermain"
   _howToPlay:
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 894cae710e..39f0b80fdf 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -2370,10 +2370,6 @@ export interface Locale extends ILocale {
      * ノートのアクションをホバー時のみ表示する
      */
     "showNoteActionsOnlyHover": string;
-    /**
-     * ノートのリアクション数を表示する
-     */
-    "showReactionsCount": string;
     /**
      * 履歴はありません
      */
@@ -5115,10 +5111,6 @@ export interface Locale extends ILocale {
      * 相互フォロー
      */
     "mutualFollow": string;
-    /**
-     * フォロー中またはフォロワー
-     */
-    "followingOrFollower": string;
     /**
      * ファイル付きのみ
      */
@@ -5323,14 +5315,6 @@ export interface Locale extends ILocale {
      * リプレイ中
      */
     "replaying": string;
-    /**
-     * リプレイを終了
-     */
-    "endReplay": string;
-    /**
-     * リプレイデータをコピー
-     */
-    "copyReplayData": string;
     /**
      * ランキング
      */
@@ -5359,18 +5343,6 @@ export interface Locale extends ILocale {
      * スワイプしてタブを切り替える
      */
     "enableHorizontalSwipe": string;
-    /**
-     * 読み込み中
-     */
-    "loading": string;
-    /**
-     * やめる
-     */
-    "surrender": string;
-    /**
-     * リトライ
-     */
-    "gameRetry": string;
     /**
      * 未読の通知の数を表示する
      */
@@ -5456,40 +5428,6 @@ export interface Locale extends ILocale {
          * 遊び方
          */
         "howToPlay": string;
-        /**
-         * ホールド
-         */
-        "hold": string;
-        "_score": {
-            /**
-             * スコア
-             */
-            "score": string;
-            /**
-             * 稼いだ金額
-             */
-            "scoreYen": string;
-            /**
-             * ハイスコア
-             */
-            "highScore": string;
-            /**
-             * 最大チェーン数
-             */
-            "maxChain": string;
-            /**
-             * {yen}円
-             */
-            "yen": ParameterizedString<"yen">;
-            /**
-             * {qty}個分
-             */
-            "estimatedQty": ParameterizedString<"qty">;
-            /**
-             * おにぎり {onigiriQtyWithUnit}
-             */
-            "scoreSweets": ParameterizedString<"onigiriQtyWithUnit">;
-        };
         "_howToPlay": {
             /**
              * 位置を調整してハコにモノを落とします。
@@ -7310,10 +7248,6 @@ export interface Locale extends ILocale {
              * ノートの編集
              */
             "canEditNote": string;
-            /**
-             * ノート内の最大メンション数
-             */
-            "mentionMax": string;
             /**
              * サーバー招待コードの発行
              */
@@ -7404,10 +7338,6 @@ export interface Locale extends ILocale {
             "avatarDecorationLimit": string;
         };
         "_condition": {
-            /**
-             * マニュアルロールにアサイン済み
-             */
-            "roleAssignedTo": string;
             /**
              * ローカルユーザー
              */
@@ -7685,10 +7615,6 @@ export interface Locale extends ILocale {
          * ソースを表示
          */
         "viewSource": string;
-        /**
-         * ログを表示
-         */
-        "viewLog": string;
     };
     "_preferencesBackups": {
         /**
@@ -9881,10 +9807,6 @@ export interface Locale extends ILocale {
          * 説明
          */
         "summary": string;
-        /**
-         * 非公開に設定するとプロフィールに表示されなくなりますが、URLを知っている人は引き続きアクセスできます。
-         */
-        "visibilityDescription": string;
     };
     "_pages": {
         /**
@@ -10175,10 +10097,6 @@ export interface Locale extends ILocale {
          * {n}人がリアクションしました
          */
         "reactedBySomeUsers": ParameterizedString<"n">;
-        /**
-         * {n}人がいいねしました
-         */
-        "likedBySomeUsers": ParameterizedString<"n">;
         /**
          * {n}人がリノートしました
          */
@@ -10187,10 +10105,6 @@ export interface Locale extends ILocale {
          * {n}人にフォローされました
          */
         "followedBySomeUsers": ParameterizedString<"n">;
-        /**
-         * 通知の履歴をリセットする
-         */
-        "flushNotification": string;
         "_types": {
             /**
              * すべて
@@ -10516,7 +10430,7 @@ export interface Locale extends ILocale {
          */
         "updateServerSettings": string;
         /**
-         * ユーザーのモデレーションノート更新
+         * モデレーションノート更新
          */
         "updateUserNote": string;
         /**
@@ -10563,10 +10477,6 @@ export interface Locale extends ILocale {
          * リモートサーバーを再開
          */
         "unsuspendRemoteInstance": string;
-        /**
-         * リモートサーバーのモデレーションノート更新
-         */
-        "updateRemoteInstanceNote": string;
         /**
          * ファイルをセンシティブ付与
          */
@@ -11007,14 +10917,6 @@ export interface Locale extends ILocale {
          * 変則なし
          */
         "disallowIrregularRules": string;
-        /**
-         * 盤面に行・列番号を表示
-         */
-        "showBoardLabels": string;
-        /**
-         * 石をアイコンにする
-         */
-        "useAvatarAsStone": string;
     };
     "_offlineScreen": {
         /**
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index 83abacba64..3ae8cab0c2 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -1005,7 +1005,6 @@ neverShow: "Non mostrare più"
 remindMeLater: "Rimanda"
 didYouLikeMisskey: "Ti piace CherryPick?"
 pleaseDonate: "CherryPick è il software libero utilizzato su {host}. Offrendo una donazione è più facile continuare a svilupparlo!"
-correspondingSourceIsAvailable: ""
 roles: "Ruoli"
 role: "Ruolo"
 noRole: "Ruolo non trovato"
@@ -1183,12 +1182,6 @@ confirmShowRepliesAll: "Questa è una attività irreversibile. Vuoi davvero incl
 confirmHideRepliesAll: "Questa è una attività irreversibile. Vuoi davvero escludere tutte le risposte dei following in TL?"
 externalServices: "Servizi esterni"
 sourceCode: "Codice sorgente"
-sourceCodeIsNotYetProvided: ""
-repositoryUrl: "URL della repository"
-repositoryUrlDescription: "Se esiste un repository il cui il codice sorgente è disponibile pubblicamente, inserisci il suo URL. Se stai utilizzando CherryPick così com'è (senza alcuna modifica al codice sorgente), inserisci https://github.com/kokonect-link/cherrypick."
-repositoryUrlOrTarballRequired: "Se non disponi di un repository pubblico, dovrai fornire un file tarball (tar). Vedere .config/example.yml per i dettagli."
-feedback: "Feedback"
-feedbackUrl: "URL di feedback"
 impressum: "Dichiarazione di proprietà"
 impressumUrl: "URL della dichiarazione di proprietà"
 impressumDescription: "La dichiarazione di proprietà, è obbligatoria in alcuni paesi come la Germania (Impressum)."
@@ -1220,7 +1213,7 @@ addMfmFunction: "Aggiungi decorazioni"
 enableQuickAddMfmFunction: "Attiva il selettore di funzioni MFM"
 bubbleGame: "Bubble Game"
 sfx: "Effetti sonori"
-soundWillBePlayed: "Con musica ed effetti sonori"
+soundWillBePlayed: "Verrà riprodotto il suono"
 showReplay: "Vedi i replay"
 replay: "Replay"
 replaying: "Replay in corso"
@@ -1231,13 +1224,12 @@ hemisphere: "Geolocalizzazione"
 withSensitive: "Mostra le Note con allegati espliciti"
 userSaysSomethingSensitive: "Note da {name} con allegati espliciti"
 enableHorizontalSwipe: "Trascina per invertire i tab"
-surrender: "Annulla"
 _bubbleGame:
   howToPlay: "Come giocare"
   _howToPlay:
-    section1: "Scegli la posizione e rilascia l'oggetto nel contenitore."
-    section2: "Se due oggetti dello stesso tipo si toccano, si trasformano in un oggetto diverso, aumentando il punteggio."
-    section3: "Se gli oggetti escono dal limite superiore del contenitore, il gioco finisce. Cerca di ottenere un punteggio elevato fondendo gli oggetti, evitando che escano dal contenitore!"
+    section1: "Regola la posizione e rilascia l'oggetto nella casella."
+    section2: "Ottieni un punteggio, quando due oggetti dello stesso tipo si toccano e si trasformano in un oggetto diverso."
+    section3: "Se gli oggetti traboccano dalla scatola, il gioco finisce. Cerca di ottenere un punteggio elevato fondendo gli oggetti, evitando che escano dalla scatola!"
 _announcement:
   forExistingUsers: "Solo ai profili attuali"
   forExistingUsersDescription: "L'annuncio sarà visibile solo ai profili esistenti in questo momento. Se disabilitato, sarà visibile anche ai profili che verranno creati dopo la pubblicazione di questo annuncio."
@@ -1781,8 +1773,6 @@ _aboutMisskey:
   contributors: "Principali sostenitori"
   allContributors: "Tutti i sostenitori"
   source: "Codice sorgente"
-  original: "Originale"
-  thisIsModifiedVersion: "{name} sta usando una versione modificata diversa da CherryPick originale."
   translation: "Tradurre Misskey"
   donate: "Sostieni Misskey"
   morePatrons: "Apprezziamo sinceramente il supporto di tante altre persone. Grazie mille! 🥰"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 51bf23f254..9a25d81d0f 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -587,7 +587,6 @@ disableDrawer: "メニューをドロワーで表示しない"
 youHaveNoGroups: "グループがありません"
 joinOrCreateGroup: "既存のグループに招待してもらうか、新しくグループを作成してください。"
 showNoteActionsOnlyHover: "ノートのアクションをホバー時のみ表示する"
-showReactionsCount: "ノートのリアクション数を表示する"
 noHistory: "履歴はありません"
 signinHistory: "ログイン履歴"
 enableAdvancedMfm: "高度なMFMを有効にする"
@@ -1273,7 +1272,6 @@ showRenotes: "リノートを表示"
 edited: "編集済み"
 notificationRecieveConfig: "通知の受信設定"
 mutualFollow: "相互フォロー"
-followingOrFollower: "フォロー中またはフォロワー"
 fileAttachedOnly: "ファイル付きのみ"
 showRepliesToOthersInTimeline: "TLに他の人への返信を含める"
 hideRepliesToOthersInTimeline: "TLに他の人への返信を含めない"
@@ -1325,8 +1323,6 @@ soundWillBePlayed: "サウンドが再生されます"
 showReplay: "リプレイを見る"
 replay: "リプレイ"
 replaying: "リプレイ中"
-endReplay: "リプレイを終了"
-copyReplayData: "リプレイデータをコピー"
 ranking: "ランキング"
 lastNDays: "直近{n}日"
 backToTitle: "タイトルへ"
@@ -1334,9 +1330,6 @@ hemisphere: "お住まいの地域"
 withSensitive: "センシティブなファイルを含むノートを表示"
 userSaysSomethingSensitive: "{name}のセンシティブなファイルを含む投稿"
 enableHorizontalSwipe: "スワイプしてタブを切り替える"
-loading: "読み込み中"
-surrender: "やめる"
-gameRetry: "リトライ"
 showUnreadNotificationsCount: "未読の通知の数を表示する"
 showCatOnly: "ネコミミ付きのみ"
 additionalPermissionsForFlash: "Playへの追加許可"
@@ -1366,15 +1359,6 @@ _messaging:
 
 _bubbleGame:
   howToPlay: "遊び方"
-  hold: "ホールド"
-  _score:
-    score: "スコア"
-    scoreYen: "稼いだ金額"
-    highScore: "ハイスコア"
-    maxChain: "最大チェーン数"
-    yen: "{yen}円"
-    estimatedQty: "{qty}個分"
-    scoreSweets: "おにぎり {onigiriQtyWithUnit}"
   _howToPlay:
     section1: "位置を調整してハコにモノを落とします。"
     section2: "同じ種類のモノがくっつくと別のモノに変化して、スコアが得られます。"
@@ -1895,7 +1879,6 @@ _role:
     ltlAvailable: "ローカルタイムラインの閲覧"
     canPublicNote: "パブリック投稿の許可"
     canEditNote: "ノートの編集"
-    mentionMax: "ノート内の最大メンション数"
     canInvite: "サーバー招待コードの発行"
     inviteLimit: "招待コードの作成可能数"
     inviteLimitCycle: "招待コードの発行間隔"
@@ -1919,7 +1902,6 @@ _role:
     canUseTranslator: "翻訳機能の利用"
     avatarDecorationLimit: "アイコンデコレーションの最大取付個数"
   _condition:
-    roleAssignedTo: "マニュアルロールにアサイン済み"
     isLocal: "ローカルユーザー"
     isRemote: "リモートユーザー"
     createdLessThan: "アカウント作成から～以内"
@@ -2006,7 +1988,6 @@ _plugin:
   installWarn: "信頼できないプラグインはインストールしないでください。"
   manage: "プラグインの管理"
   viewSource: "ソースを表示"
-  viewLog: "ログを表示"
 
 _preferencesBackups:
   list: "作成したバックアップ"
@@ -2608,7 +2589,6 @@ _play:
   title: "タイトル"
   script: "スクリプト"
   summary: "説明"
-  visibilityDescription: "非公開に設定するとプロフィールに表示されなくなりますが、URLを知っている人は引き続きアクセスできます。"
 
 _pages:
   newPage: "ページの作成"
@@ -2688,10 +2668,8 @@ _notification:
   sendTestNotification: "テスト通知を送信する"
   notificationWillBeDisplayedLikeThis: "通知はこのように表示されます"
   reactedBySomeUsers: "{n}人がリアクションしました"
-  likedBySomeUsers: "{n}人がいいねしました"
   renotedBySomeUsers: "{n}人がリノートしました"
   followedBySomeUsers: "{n}人にフォローされました"
-  flushNotification: "通知の履歴をリセットする"
 
   _types:
     all: "すべて"
@@ -2787,7 +2765,7 @@ _moderationLogTypes:
   updateCustomEmoji: "カスタム絵文字更新"
   deleteCustomEmoji: "カスタム絵文字削除"
   updateServerSettings: "サーバー設定更新"
-  updateUserNote: "ユーザーのモデレーションノート更新"
+  updateUserNote: "モデレーションノート更新"
   deleteDriveFile: "ファイルを削除"
   deleteNote: "ノートを削除"
   createGlobalAnnouncement: "全体のお知らせを作成"
@@ -2799,7 +2777,6 @@ _moderationLogTypes:
   resetPassword: "パスワードをリセット"
   suspendRemoteInstance: "リモートサーバーを停止"
   unsuspendRemoteInstance: "リモートサーバーを再開"
-  updateRemoteInstanceNote: "リモートサーバーのモデレーションノート更新"
   markSensitiveDriveFile: "ファイルをセンシティブ付与"
   unmarkSensitiveDriveFile: "ファイルをセンシティブ解除"
   resolveAbuseReport: "通報を解決"
@@ -2926,8 +2903,6 @@ _reversi:
   opponentHasSettingsChanged: "相手が設定を変更しました"
   allowIrregularRules: "変則許可 (完全フリー)"
   disallowIrregularRules: "変則なし"
-  showBoardLabels: "盤面に行・列番号を表示"
-  useAvatarAsStone: "石をアイコンにする"
 
 _offlineScreen:
   title: "オフライン - サーバーに接続できません"
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index 9caf6c29aa..e8870c42bf 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -1005,7 +1005,6 @@ neverShow: "今後表示しない"
 remindMeLater: "また後で"
 didYouLikeMisskey: "CherryPick気に入ってくれた？"
 pleaseDonate: "CherryPickは{host}が使うとる無料のソフトウェアやで。これからも開発を続けれるように、寄付したってな～。"
-correspondingSourceIsAvailable: "{anchor}"
 roles: "ロール"
 role: "ロール"
 noRole: "ロールはありまへん"
@@ -1223,7 +1222,6 @@ hemisphere: "住んでる地域"
 withSensitive: "センシティブなファイルを含むノートを表示"
 userSaysSomethingSensitive: "{name}のセンシティブなファイルを含む投稿"
 enableHorizontalSwipe: "スワイプしてタブを切り替える"
-surrender: "やめとく"
 _bubbleGame:
   howToPlay: "遊び方"
   _howToPlay:
diff --git a/locales/ko-GS.yml b/locales/ko-GS.yml
index d31990fe52..c99f9ffb3c 100644
--- a/locales/ko-GS.yml
+++ b/locales/ko-GS.yml
@@ -640,7 +640,6 @@ icon: "아바타"
 replies: "답하기"
 renotes: "리노트"
 attach: "옇기"
-surrender: "아이예"
 _initialAccountSetting:
   startTutorial: "길라잡이 하기"
 _initialTutorial:
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 307bfac2b5..acbc41a785 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1096,7 +1096,6 @@ neverShow: "다시 보지 않기"
 remindMeLater: "나중에 알림"
 didYouLikeMisskey: "CherryPick이 마음에 드시나요?"
 pleaseDonate: "CherryPick은 {host}에서 사용하는 무료 소프트웨어에요. 후원을 통해 앞으로도 개발을 계속할 수 있게 도와주세요!"
-correspondingSourceIsAvailable: "소스 코드는 {anchor}에서 받으실 수 있어요."
 roles: "역할"
 role: "역할"
 noRole: "역할이 없어요"
@@ -1281,12 +1280,6 @@ confirmShowRepliesAll: "이 조작은 되돌릴 수 없어요! 정말로 타임
 confirmHideRepliesAll: "이 조작은 되돌릴 수 없어요! 정말로 타임라인에 현재 팔로우 중인 모든 사람의 답글을 표시하지 않도록 설정할까요?"
 externalServices: "외부 서비스"
 sourceCode: "소스 코드"
-sourceCodeIsNotYetProvided: "소스 코드를 아직 제공하지 않았어요. 이 문제를 해결하려면 관리자에게 문의해 주세요."
-repositoryUrl: "저장소 URL"
-repositoryUrlDescription: "소스 코드를 공개한 저장소가 있는 경우 그 URL을 적어주세요. CherryPick을 원본 그대로(소스 코드를 어떤 식으로도 변경하지 않고) 사용하는 경우, https://github.com/kokonect-link/cherrypick 라고 적어주세요."
-repositoryUrlOrTarballRequired: "저장소를 공개하지 않는 경우, 대신 tarball을 제공해야 해요. 자세한 내용은 .config/example.yml을 참조해 주세요."
-feedback: "피드백"
-feedbackUrl: "피드백 URL"
 impressum: "운영자 정보"
 impressumUrl: "운영자 정보 URL"
 impressumDescription: "독일 등의 일부 나라와 지역에서는 꼭 표시해야 해요(Impressum)."
@@ -1329,7 +1322,6 @@ hemisphere: "거주 지역"
 withSensitive: "민감한 파일이 포함된 노트 표시"
 userSaysSomethingSensitive: "{name}님의 민감한 파일이 포함된 게시물"
 enableHorizontalSwipe: "밀어서 탭 전환"
-surrender: "그만두기"
 showUnreadNotificationsCount: "읽지 않은 알림 수 표시"
 showCatOnly: "고양이만 보기"
 additionalPermissionsForFlash: "Play에 대한 추가 권한"
@@ -1987,8 +1979,6 @@ _aboutMisskey:
   contributors: "주요 기여자"
   allContributors: "모든 기여자"
   source: "소스 코드"
-  original: "원본"
-  thisIsModifiedVersion: "{name}에서는 원본 CherryPick을 수정해서 사용하고 있어요."
   translation: "Misskey를 번역하기"
   donate: "Misskey에 기부하기"
   morePatrons: "이 외에도 다른 많은 분들이 도움을 주시고 계십니다. 감사합니다🥰"
@@ -2699,10 +2689,9 @@ _moderationLogTypes:
   resetPassword: "비밀번호 재설정"
   suspendRemoteInstance: "리모트 서버를 정지"
   unsuspendRemoteInstance: "리모트 서버의 정지를 해제"
-  updateRemoteInstanceNote: "리모트 서버의 조정 기록 갱신"
   markSensitiveDriveFile: "파일을 열람 주의로 설정"
   unmarkSensitiveDriveFile: "파일의 열람 주의를 해제"
-  resolveAbuseReport: "신고 처리"
+  resolveAbuseReport: "신고 해결"
   createInvitation: "초대 코드 생성"
   createAd: "광고 생성"
   deleteAd: "광고 삭제"
diff --git a/locales/no-NO.yml b/locales/no-NO.yml
index 0da1ce8e4d..205a7dc188 100644
--- a/locales/no-NO.yml
+++ b/locales/no-NO.yml
@@ -463,7 +463,6 @@ options: "Alternativ"
 icon: "Avatar"
 replies: "Svar"
 renotes: "Renote"
-surrender: "Avbryt"
 _initialAccountSetting:
   theseSettingsCanEditLater: "Du kan endre disse innstillingene senere."
 _achievements:
diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml
index 0940948519..d0fd50a384 100644
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@@ -1011,7 +1011,6 @@ renotes: "Repostar"
 keepScreenOn: "Manter a tela do dispositivo sempre ligada"
 flip: "Inversão"
 lastNDays: "Últimos {n} dias"
-surrender: "Cancelar"
 _initialAccountSetting:
   followUsers: "Siga usuários que lhe interessam para criar a sua linha do tempo."
 _serverSettings:
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index d8db08a9ce..360ee71a63 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -1099,7 +1099,6 @@ loadReplies: "Показать ответы"
 sourceCode: "Исходный код"
 flip: "Переворот"
 lastNDays: "Последние {n} сут"
-surrender: "Этот пост не может быть отменен."
 _initialAccountSetting:
   accountCreated: "Аккаунт успешно создан!"
   letsStartAccountSetup: "Давайте настроим вашу учётную запись."
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index 09c3cc8943..bae55a0cee 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -8,12 +8,12 @@ search: "ค้นหา"
 notifications: "การเเจ้งเตือน"
 username: "ชื่อผู้ใช้"
 password: "รหัสผ่าน"
-forgotPassword: "ลืมรหัสผ่าน"
+forgotPassword: "ลืมรหัสผ่านใช่ไหม"
 fetchingAsApObject: "กำลังดึงข้อมูลจากสหพันธ์..."
 ok: "ตกลง"
 gotIt: "เข้าใจแล้ว !"
 cancel: "ยกเลิก"
-noThankYou: "ไม่เอาดีกว่า"
+noThankYou: "ไม่เป็นไร"
 enterUsername: "กรอกชื่อผู้ใช้"
 renotedBy: "รีโน้ตโดย {user}"
 noNotes: "ไม่มีโน้ต"
@@ -31,16 +31,16 @@ login: "เข้าสู่ระบบ"
 loggingIn: "กำลังเข้าสู่ระบบ"
 logout: "ออกจากระบบ"
 signup: "สร้างบัญชีผู้ใช้"
-uploading: "กำลังอัปโหลด"
+uploading: "กำลังอัพโหลด..."
 save: "บันทึก"
 users: "ผู้ใช้งาน"
 addUser: "เพิ่มผู้ใช้"
 favorite: "รายการโปรด"
 favorites: "รายการโปรด"
 unfavorite: "ลบออกจากรายการโปรด"
-favorited: "เพิ่มลงรายการโปรดแล้ว"
-alreadyFavorited: "เพิ่มลงรายการโปรดอยู่แล้ว"
-cantFavorite: "ไม่สามารถเพิ่มลงรายการโปรดได้"
+favorited: "เพิ่มแล้วในรายการโปรด"
+alreadyFavorited: "เพิ่มในรายการโปรดอยู่แล้ว"
+cantFavorite: "ไม่สามารถเพิ่มในรายการโปรดได้"
 pin: "ปักหมุด"
 unpin: "เลิกปักหมุด"
 copyContent: "คัดลอกเนื้อหา"
@@ -65,18 +65,18 @@ loadMore: "แสดงเพิ่มเติม"
 showMore: "แสดงเพิ่มเติม"
 showLess: "ปิด"
 youGotNewFollower: "ได้ติดตามคุณ"
-receiveFollowRequest: "มีคำขอติดตามส่งมาหา"
-followRequestAccepted: "การติดตามได้รับการอนุมัติแล้ว"
+receiveFollowRequest: "คำขอผู้ติดตามที่ได้รับ"
+followRequestAccepted: "อนุมัติการติดตามแล้ว"
 mention: "กล่าวถึง"
 mentions: "พูดถึง"
-directNotes: "โพสต์แบบไดเร็กต์"
+directNotes: "ไดเร็คโน้ต"
 importAndExport: "นำเข้า / ส่งออก"
 import: "นำเข้า"
 export: "ส่งออก"
 files: "ไฟล์"
 download: "ดาวน์โหลด"
-driveFileDeleteConfirm: "ต้องการลบไฟล์ “{name}” ใช่ไหม? โน้ตที่แนบมากับไฟล์นี้ก็จะถูกลบไปด้วย"
-unfollowConfirm: "ต้องการเลิกติดตาม {name} ใช่ไหม?"
+driveFileDeleteConfirm: "ต้องการลบไฟล์ “{name}” ใช่หรือไม่? โน้ตที่แนบมากับไฟล์นี้ก็จะถูกลบไปด้วย"
+unfollowConfirm: "ต้องการเลิกติดตาม {name}?"
 exportRequested: "คุณได้ร้องขอการส่งออก อาจใช้เวลาสักครู่ และจะถูกเพิ่มในไดรฟ์ของคุณเมื่อเสร็จสิ้นแล้ว"
 importRequested: "คุณได้ร้องขอการนำเข้า การดำเนินการนี้อาจใช้เวลาสักครู่"
 lists: "รายชื่อ"
@@ -128,9 +128,9 @@ emojiPickerDisplay: "แสดงตัวจิ้มเอโมจิ"
 overwriteFromPinnedEmojisForReaction: "เขียนทับการตั้งค่ารีแอคชั่น"
 overwriteFromPinnedEmojis: "เขียนทับการตั้งค่าทั่วไป"
 reactionSettingDescription2: "ลากเพื่อจัดลำดับใหม่ คลิกที่เอโมจินั้นเพื่อลบ กด “+” เพื่อเพิ่ม"
-rememberNoteVisibility: "จำการตั้งค่าการมองเห็นโน้ต"
-attachCancel: "ยกเลิกแนบไฟล์"
-deleteFile: "ลบไฟล์ออก"
+rememberNoteVisibility: "จดจำการตั้งค่าการมองเห็นตัวโน้ต"
+attachCancel: "ลบไฟล์ออกที่แนบมา"
+deleteFile: "ลบไฟล์ออกแล้ว"
 markAsSensitive: "ทำเครื่องหมายว่ามีเนื้อหาละเอียดอ่อน"
 unmarkAsSensitive: "ยกเลิกทำเครื่องหมายว่ามีเนื้อหาละเอียดอ่อน"
 enterFileName: "พิมพ์ชื่อไฟล์"
@@ -138,14 +138,14 @@ mute: "ปิดเสียง"
 unmute: "ยกเลิกการปิดเสียง"
 renoteMute: "ปิดเสียงรีโน้ต"
 renoteUnmute: "เปิดเสียง รีโน้ต"
-block: "บล็อก"
-unblock: "เลิกบล็อก"
-suspend: "ระงับ"
-unsuspend: "เลิกระงับ"
-blockConfirm: "ต้องการบล็อกบัญชีนี้ใช่ไหม?"
-unblockConfirm: "ต้องการเลิกบล็อกบัญชีนี้ใช่ไหม?"
-suspendConfirm: "ต้องการระงับบัญชีนี้ใช่ไหม?"
-unsuspendConfirm: "ต้องการยกเลิกการระงับบัญชีนี้ใช่ไหม?"
+block: "บล็อค"
+unblock: "เลิกปิดกั้น"
+suspend: "ถูกระงับ"
+unsuspend: "ยกเลิกระงับ"
+blockConfirm: "ต้องการบล็อกบัญชีนี้?"
+unblockConfirm: "ต้องการปลดบล็อคบัญชีนี้?"
+suspendConfirm: "ต้องการระงับบัญชีนี้?"
+unsuspendConfirm: "ต้องการยกเลิกการระงับบัญชีนี้?"
 selectList: "เลือกรายชื่อ"
 editList: "แก้ไขรายชื่อ"
 selectChannel: "เลือกช่อง"
@@ -162,13 +162,13 @@ emojiUrl: "URL ของเอโมจิ"
 addEmoji: "แทรกเอโมจิ"
 settingGuide: "การตั้งค่าที่แนะนำ"
 cacheRemoteFiles: "แคชไฟล์ระยะไกล"
-cacheRemoteFilesDescription: "หากเปิดใช้งาน ไฟล์ระยะไกลจะถูกแคชไว้ ทำให้แสดงภาพเร็วขึ้น แต่ก็ใช้พื้นที่เก็บข้อมูลของเซิร์ฟเวอร์มากขึ้นเช่นกัน สำหรับขีดจำกัดที่ผู้ใช้ระยะไกลถูกแคชไว้จะขึ้นอยู่กับความจุไดรฟ์ตามบทบาทของเขา เมื่อเกินแล้วไฟล์เก่าจะถูกลบออกและเก็บเป็นลิงก์แทน หากปิดใช้งาน ไฟล์ระยะไกลจะถูกเก็บเป็นลิงก์ตั้งแต่ต้น เราแนะนำให้ตั้งค่า proxyRemoteFiles ใน default.yml เป็น true เพื่อสร้างธัมบ์เนลและปกป้องความเป็นส่วนตัวของผู้ใช้"
+cacheRemoteFilesDescription: "เมื่อปิดใช้งานการตั้งค่านี้ ไฟล์ระยะไกลนั้นจะถูกโหลดโดยตรงจากอินสแตนซ์ระยะไกล แต่กรณีการปิดใช้งานนี้จะช่วยลดปริมาณการใช้พื้นที่จัดเก็บข้อมูล แต่เพิ่มปริมาณการใช้งาน เพราะเนื่องจากจะไม่มีการสร้างภาพขนาดย่อ"
 youCanCleanRemoteFilesCache: "คุณสามารถล้างแคชได้โดยคลิกที่ปุ่ม 🗑️ ในมุมมองการจัดการไฟล์"
-cacheRemoteSensitiveFiles: "แคชไฟล์ระยะไกลที่มีเนื้อหาละเอียดอ่อน"
+cacheRemoteSensitiveFiles: "แคชไฟล์ระยะไกลที่มีเครื่องหมายว่ามีเนื้อหาละเอียดอ่อน"
 cacheRemoteSensitiveFilesDescription: "เมื่อปิดการใช้งานการตั้งค่านี้ ไฟล์ระยะไกลที่มีเครื่องหมายว่ามีเนื้อหาละเอียดอ่อนนั้นจะถูกโหลดโดยตรงจากอินสแตนซ์ระยะไกลโดยที่ไม่มีการแคช"
-flagAsBot: "ทำเครื่องหมายบอกว่าบัญชีนี้เป็นบอต"
+flagAsBot: "ทำเครื่องหมายบอกว่าบัญชีนี้เป็นบอท"
 flagAsBotDescription: "การเปิดใช้งานตัวเลือกนี้หากบัญชีนี้ถูกควบคุมโดยนักเขียนโปรแกรม หรือ ถ้าหากเปิดใช้งาน มันจะทำหน้าที่เป็นแฟล็กสำหรับนักพัฒนารายอื่นๆ และเพื่อป้องกันการโต้ตอบแบบไม่มีที่สิ้นสุดกับบอทตัวอื่นๆ และยังสามารถปรับเปลี่ยนระบบภายในของ CherryPick เพื่อปฏิบัติต่อบัญชีนี้เป็นบอท"
-flagAsCat: "เมี้ยววววววววววววววว!!!!!!!!!!!"
+flagAsCat: "เมี้ยววววววว!!!!!!!!!!! (ทำเครื่องหมายว่าบัญชีนี้เป็นแมว)"
 flagAsCatDescription: "เหมียวเหมียวเมี้ยว??"
 flagShowTimelineReplies: "แสดงตอบกลับ ในไทม์ไลน์"
 flagShowTimelineRepliesDescription: "แสดงการตอบกลับของผู้ใช้งานไปยังโน้ตของผู้ใช้งานรายอื่นๆในไทม์ไลน์หากได้เปิดเอาไว้"
@@ -180,7 +180,7 @@ showOnRemote: "ดูบนอินสแตนซ์ระยะไกล"
 general: "ทั่วไป"
 wallpaper: "ภาพพื้นหลัง"
 setWallpaper: "ตั้งค่าภาพพื้นหลัง"
-removeWallpaper: "นำภาพพื้นหลังออก"
+removeWallpaper: "น้ำภาพพื้นหลังออก"
 searchWith: "ค้นหา: {q}"
 youHaveNoLists: "คุณไม่มีรายชื่อใดๆ "
 followConfirm: "ต้องการติดตาม {name} ใช่ไหม?"
@@ -189,11 +189,11 @@ proxyAccountDescription: "บัญชีพร็อกซี่ คือ บ
 host: "โฮสต์"
 selectUser: "เลือกผู้ใช้งาน"
 recipient: "ผู้รับ"
-annotation: "หมายเหตุประกอบ"
+annotation: "ความคิดเห็น"
 federation: "สหพันธ์"
 instances: "อินสแตนซ์"
-registeredAt: "วันที่ลงทะเบียน"
-latestRequestReceivedAt: "คำขอล่าสุดที่ได้รับ"
+registeredAt: "จดทะเบียนที่"
+latestRequestReceivedAt: "ได้รับคำขอล่าสุดไปแล้ว"
 latestStatus: "สถานะล่าสุด"
 storageUsage: "พื้นที่จัดเก็บข้อมูลที่ใช้ไป"
 charts: "โดดเด่น"
@@ -215,10 +215,10 @@ disk: "ดิสก์"
 instanceInfo: "ข้อมูลอินสแตนซ์"
 statistics: "สถิติการใช้งาน"
 clearQueue: "ล้างคิว"
-clearQueueConfirmTitle: "ต้องการล้างคิวใช่ไหม?"
+clearQueueConfirmTitle: "คุณแน่ใจแล้วหรอว่าต้องการที่จะล้างคิว?"
 clearQueueConfirmText: "โพสต์ที่ยังค้างในคิวจะไม่ถูกจัดส่งอีกต่อไป โดยปกติแล้วการดำเนินการนี้ไม่จำเป็น"
 clearCachedFiles: "ล้างแคช"
-clearCachedFilesConfirm: "ต้องการลบไฟล์ระยะไกลที่แคชไว้ทั้งหมดใช่ไหม?"
+clearCachedFilesConfirm: "ต้องการลบไฟล์ระยะไกลที่แคชไว้ทั้งหมด?"
 blockedInstances: "อินสแตนซ์ที่ถูกบล็อก"
 blockedInstancesDescription: "ระบุชื่อโฮสต์ของอินสแตนซ์ที่คุณต้องการบล็อก อินสแตนซ์ที่อยู่ในรายการนั้นจะไม่สามารถพูดคุยกับอินสแตนซ์นี้ได้อีกต่อไป"
 silencedInstances: "ปิดปากอินสแตนซ์นี้แล้ว"
@@ -228,7 +228,7 @@ mutedUsers: "ผู้ใช้ที่ถูกปิดเสียง"
 blockedUsers: "ผู้ใช้ที่ถูกบล็อก"
 noUsers: "ไม่พบผู้ใช้งาน"
 editProfile: "แก้ไขโปรไฟล์"
-noteDeleteConfirm: "ต้องการลบโน้ตนี้ใช่ไหม?"
+noteDeleteConfirm: "ต้องการลบโน้ตนี้?"
 pinLimitExceeded: "คุณไม่สามารถปักหมุดโน้ตเพิ่มเติมใดๆได้อีก"
 intro: "การติดตั้ง CherryPick เสร็จสิ้นแล้วนะ! โปรดสร้างผู้ใช้งานที่เป็นผู้ดูแลระบบ"
 done: "เสร็จสิ้น"
@@ -237,7 +237,7 @@ preview: "แสดงตัวอย่าง"
 default: "ค่าเริ่มต้น"
 defaultValueIs: "ค่าเริ่มต้น: {value}"
 noCustomEmojis: "ไม่มีเอโมจิ"
-noJobs: "ไม่มีงาน"
+noJobs: "ไม่มีชิ้นงาน"
 federating: "สหพันธ์"
 blocked: "ถูกบล็อก"
 suspended: "ถูกระงับ"
@@ -261,11 +261,11 @@ usernameOrUserId: "ชื่อผู้ใช้หรือรหัสผู
 noSuchUser: "ไม่พบผู้ใช้"
 lookup: "การค้นหา"
 announcements: "ประกาศ"
-imageUrl: "URL รูปภาพ"
+imageUrl: "url รูปภาพ"
 remove: "ลบ"
 removed: "ถูกลบไปแล้ว"
-removeAreYouSure: "ต้องการลบ “{x}” ใช่ไหม?"
-deleteAreYouSure: "ต้องการลบ “{x}” ใช่ไหม?"
+removeAreYouSure: "ต้องการที่จะลบ “{x}” ออก?"
+deleteAreYouSure: "ต้องการลบ {x} หรือไม่คะ?"
 resetAreYouSure: "รีเซ็ตเลยไหม?"
 areYouSure: "แน่ใจแล้วใช่ไหมคะ?"
 saved: "บันทึกแล้ว"
@@ -275,7 +275,7 @@ keepOriginalUploading: "เก็บภาพต้นฉบับ"
 keepOriginalUploadingDescription: "เก็บภาพต้นฉบับไว้เมื่ออัปโหลดภาพ หากปิด รูปภาพสำหรับการเผยแพร่ทางเว็บจะถูกสร้างขึ้นในเบราว์เซอร์เมื่อทำการอัปโหลด"
 fromDrive: "จากไดรฟ์"
 fromUrl: "จาก URL"
-uploadFromUrl: "อัปโหลดจาก URL"
+uploadFromUrl: "อัพโหลดจาก URL"
 uploadFromUrlDescription: "URL ของไฟล์ที่คุณต้องการอัปโหลด"
 uploadFromUrlRequested: "ร้องขอการอัปโหลดแล้ว"
 uploadFromUrlMayTakeTime: "การอัปโหลดอาจใช้เวลาสักครู่จึงจะเสร็จสมบูรณ์"
@@ -289,7 +289,7 @@ agree: "ยอมรับ"
 agreeBelow: "ฉันยอมรับถึงด้านล่าง"
 basicNotesBeforeCreateAccount: "หมายเหตุสำคัญ"
 termsOfService: "เงื่อนไขการให้บริการ"
-start: "เริ่ม"
+start: "เริ่มต้น​ใช้งาน​"
 home: "หน้าแรก"
 remoteUserCaution: "ข้อมูลอาจไม่สมบูรณ์เนื่องจากผู้ใช้รายนี้มาจากอินสแตนซ์ระยะไกล"
 activity: "กิจกรรม"
@@ -333,11 +333,11 @@ rename: "เปลี่ยนชื่อ"
 avatar: "ไอคอน"
 banner: "แบนเนอร์"
 displayOfSensitiveMedia: "แสดงสื่อที่มีเนื้อหาละเอียดอ่อน"
-whenServerDisconnected: "เมื่อสูญเสียการเชื่อมต่อกับเซิร์ฟเวอร์"
-disconnectedFromServer: "การเชื่อมต่อเซิร์ฟเวอร์ถูกตัด"
+whenServerDisconnected: "สูญเสียการเชื่อมต่อกับเซิร์ฟเวอร์"
+disconnectedFromServer: "ถูกตัดการเชื่อมต่อออกจากเซิร์ฟเวอร์"
 reload: "รีโหลด"
 doNothing: "เมิน"
-reloadConfirm: "รีโหลดเลยไหม?"
+reloadConfirm: "นายต้องการรีเฟรชไทม์ไลน์หรือป่าว?"
 watch: "ดู"
 unwatch: "หยุดดู"
 accept: "ยอมรับ"
@@ -347,7 +347,7 @@ instanceName: "ชื่ออินสแตนซ์"
 instanceDescription: "คำอธิบายอินสแตนซ์"
 maintainerName: "ผู้ดูแล"
 maintainerEmail: "อีเมลผู้ดูแลระบบ"
-tosUrl: "URL เงื่อนไขการให้บริการ"
+tosUrl: "เงื่อนไขการให้บริการ URL"
 thisYear: "ปีนี้"
 thisMonth: "เดือนนี้"
 today: "วันนี้"
@@ -370,7 +370,7 @@ inMb: "เป็นเมกะไบต์"
 bannerUrl: "URL รูปภาพแบนเนอร์"
 backgroundImageUrl: "URL ภาพพื้นหลัง"
 basicInfo: "ข้อมูลเบื้องต้น"
-pinnedUsers: "ผู้ใช้ที่ถูกปักหมุด"
+pinnedUsers: "ผู้ใช้งานที่ได้รับการปักหมุด"
 pinnedUsersDescription: "ป้อนชื่อผู้ใช้ที่คุณต้องการปักหมุดในหน้า “ค้นพบ” ฯลฯ คั่นด้วยการขึ้นบรรทัดใหม่"
 pinnedPages: "หน้าเพจที่ปักหมุด"
 pinnedPagesDescription: "ป้อนเส้นทางของหน้าเพจที่คุณต้องการปักหมุดไว้ที่หน้าแรกของอินสแตนซ์นี้ คั่นด้วยขึ้นบรรทัดใหม่"
@@ -409,16 +409,16 @@ caseSensitive: "อักษรพิมพ์ใหญ่-พิมพ์เล
 withReplies: "รวมตอบกลับ"
 connectedTo: "บัญชีดังต่อไปนี้มีการเชื่อมต่อกัน"
 notesAndReplies: "โพสต์และการตอบกลับ"
-withFiles: "มีไฟล์"
+withFiles: "รวบรวมไฟล์"
 silence: "ถูกปิดปาก"
-silenceConfirm: "ต้องการปิดปากผู้ใช้รายนี้ใช่ไหม?"
+silenceConfirm: "ต้องการที่จะ ปิดปาก ผู้ใช้รายนี้?"
 unsilence: "ยกเลิกการปิดปาก"
-unsilenceConfirm: "ต้องการเลิกปิดปากผู้ใช้รายนี้ใช่ไหม?"
+unsilenceConfirm: "ต้องการยกเลิกปิดปากผู้ใช้รายนี้?"
 popularUsers: "ผู้ใช้ที่เป็นที่นิยม"
 recentlyUpdatedUsers: "ผู้ใช้ที่เพิ่งใช้งานล่าสุด"
 recentlyRegisteredUsers: "ผู้ใช้ที่เข้าร่วมใหม่"
 recentlyDiscoveredUsers: "ผู้ใช้ที่เพิ่งค้นพบใหม่"
-exploreUsersCount: "มีผู้ใช้ {count} ราย"
+exploreUsersCount: "มีผู้ใช้ {จำนวน} ราย"
 exploreFediverse: "สำรวจสหพันธ์"
 popularTags: "แท็กยอดนิยม"
 userList: "ลิสต์"
@@ -435,7 +435,7 @@ moderation: "การกลั่นกรอง"
 moderationNote: "โน้ตการกลั่นกรอง"
 addModerationNote: "เพิ่มโน้ตการกลั่นกรอง"
 moderationLogs: "ปูมการแก้ไข"
-nUsersMentioned: "กล่าวถึงโดยผู้ใช้ {n} ราย"
+nUsersMentioned: "กล่าวถึงโดยผู้ใช้ {n} รายนี้"
 securityKeyAndPasskey: "ความปลอดภัยและรหัสผ่าน"
 securityKey: "กุญแจความปลอดภัย"
 lastUsed: "ใช้ล่าสุด"
@@ -449,7 +449,7 @@ reduceUiAnimation: "ลดภาพเคลื่อนไหว UI"
 share: "แบ่งปัน"
 notFound: "ไม่พบหน้าที่ต้องการ"
 notFoundDescription: "ไม่พบหน้าตาม URL ที่ระบุ"
-uploadFolder: "โฟลเดอร์เริ่มต้นสำหรับอัปโหลด"
+uploadFolder: "โฟลเดอร์เริ่มต้นสำหรับอัพโหลด"
 markAsReadAllNotifications: "ทำเครื่องหมายการแจ้งเตือนทั้งหมดว่าอ่านแล้ว"
 markAsReadAllUnreadNotes: "ทำเครื่องหมายโน้ตทั้งหมดว่าอ่านแล้ว"
 markAsReadAllTalkMessages: "ทำเครื่องหมายข้อความทั้งหมดว่าอ่านแล้ว"
@@ -472,7 +472,7 @@ text: "ข้อความ"
 enable: "เปิดใช้งาน"
 next: "ถัด​ไป"
 retype: "พิมพ์รหัสอีกครั้ง"
-noteOf: "โน้ตของ {user}"
+noteOf: "โน้ต โดย {user}"
 inviteToGroup: "ชวนเข้ากลุ่ม"
 quoteAttached: "อ้างอิง"
 quoteQuestion: "ต้องการที่จะแนบมันเพื่ออ้างอิงใช่ไหม?"
@@ -481,7 +481,7 @@ newMessageExists: "คุณมีข้อความใหม่"
 onlyOneFileCanBeAttached: "สามารถแนบไฟล์ได้เพียงไฟล์เดียวต่อ 1 ข้อความ"
 signinRequired: "กรุณาลงทะเบียนหรือลงชื่อเข้าใช้ก่อนดำเนินการต่อ"
 invitations: "คำเชิญ"
-invitationCode: "รหัสเชิญ"
+invitationCode: "รหัสคำเชิญ"
 checking: "Checking"
 available: "พร้อมใช้งาน"
 unavailable: "ไม่พร้อมใช้"
@@ -569,7 +569,7 @@ popout: "ป๊อปเอาต์"
 volume: "ระดับเสียง"
 masterVolume: "ระดับเสียงหลัก"
 notUseSound: "ไม่ใช้เสียง"
-useSoundOnlyWhenActive: "มีเสียงออกเฉพาะตอนกำลังใช้ CherryPick อยู่เท่านั้น"
+useSoundOnlyWhenActive: "มีเสียงออกเฉพาะเมื่อ CherryPick ทำงานอยู่"
 details: "รายละเอียด"
 chooseEmoji: "เลือกเอโมจิ"
 unableToProcess: "ไม่สามารถดำเนินการให้เสร็จสิ้นได้"
@@ -582,8 +582,8 @@ installedDate: "วันที่ติดตั้ง"
 lastUsedDate: "ใช้งานครั้งล่าสุด"
 state: "สถานะ"
 sort: "เรียงลำดับ"
-ascendingOrder: "เรียงลำดับขึ้น"
-descendingOrder: "เรียงลำดับลง"
+ascendingOrder: "เรียงจากน้อยไปมาก"
+descendingOrder: "เรียงจากมากไปน้อย"
 scratchpad: "Scratchpad"
 scratchpadDescription: "Scratchpad เป็นการจัดเตรียมสภาพแวดล้อมสำหรับการทดลอง AiScript แต่คุณสามารถเขียน ดำเนินการ และตรวจสอบผลลัพธ์ของการโต้ตอบกับ CherryPick มันได้ด้วยนะ"
 output: "เอาท์พุต"
@@ -591,15 +591,15 @@ script: "สคริปต์"
 disablePagesScript: "ปิดการใช้งาน AiScript บนเพจ"
 updateRemoteUser: "อัปเดตข้อมูลผู้ใช้งานระยะไกล"
 unsetUserAvatar: "เลิกตั้งอวตาร"
-unsetUserAvatarConfirm: "ต้องการเลิกตั้งอวตารใข่ไหม?"
+unsetUserAvatarConfirm: "ต้องการเลิกตั้งอวตาร?"
 unsetUserBanner: "เลิกตั้งแบนเนอร์"
 unsetUserBannerConfirm: "ต้องการเลิกตั้งแบนเนอร์?"
 deleteAllFiles: "ลบไฟล์ทั้งหมด"
-deleteAllFilesConfirm: "ต้องการลบไฟล์ทั้งหมดใช่ไหม?"
+deleteAllFilesConfirm: "ต้องการลบไฟล์ทั้งหมดหรือไม่?"
 removeAllFollowing: "เลิกติดตามผู้ใช้ที่ติดตามทั้งหมด"
 removeAllFollowingDescription: "เลิกติดตามทั้งหมดจาก {host} โปรดเรียกใช้สิ่งนี้เมื่ออินสแตนซ์ดังกล่าวได้สูญหายตายจากไปแล้ว"
 userSuspended: "ผู้ใช้รายนี้ถูกระงับการใช้งาน"
-userSilenced: "ผู้ใช้รายนี้ถูกปิดปากอยู่"
+userSilenced: "ผู้ใช้รายนี้กำลังถูกปิดกั้น"
 yourAccountSuspendedTitle: "บัญชีนี้นั้นถูกระงับ"
 yourAccountSuspendedDescription: "บัญชีนี้ถูกระงับ เนื่องจากละเมิดข้อกำหนดในการให้บริการของเซิร์ฟเวอร์หรืออาจจะละเมิดหลักเกณฑ์ชุมชน หรือ อาจจะโดนร้องเรียนเรื่องการละเมิดลิขสิทธิ์และอื่นๆอย่างต่อเนื่องซ้ำๆ หากคุณคิดว่าไม่ได้ทำผิดจริงๆหรือตัดสินผิดพลาด ได้โปรดกรุณาติดต่อผู้ดูแลระบบหากคุณต้องการทราบเหตุผลโดยละเอียดเพิ่มเติม และขอความกรุณาอย่าสร้างบัญชีใหม่"
 tokenRevoked: "โทเค็นไม่ถูกต้อง"
@@ -612,7 +612,7 @@ addItem: "เพิ่มรายการ"
 rearrange: "จัดใหม่"
 relays: "รีเลย์"
 addRelay: "เพิ่มรีเลย์"
-inboxUrl: "URL ของอินบ็อกซ์"
+inboxUrl: "อินบ็อกซ์ URL"
 addedRelays: "เพิ่มรีเลย์แล้ว"
 serviceworkerInfo: "ต้องเปิดใช้งานสำหรับการแจ้งเตือนแบบพุช"
 deletedNote: "โน้ตที่ถูกลบ"
@@ -629,7 +629,7 @@ description: "รายละเอียด"
 describeFile: "เพิ่มแคปชั่น"
 enterFileDescription: "ใส่แคปชั่น"
 author: "ผู้เขียน"
-leaveConfirm: "มีการเปลี่ยนแปลงที่ยังไม่ได้บันทึก ต้องการละทิ้งมันใช่ไหม?"
+leaveConfirm: "คุณมีการเปลี่ยนแปลงที่ไม่ได้บันทึกนะ นายต้องการทิ้งการเปลี่ยนแปลงเหล่านั้นหรอ?"
 manage: "การจัดการ"
 plugins: "ปลั๊กอิน"
 preferencesBackups: "ตั้งค่าการสำรองข้อมูล"
@@ -676,7 +676,7 @@ display: "แสดงผล"
 copy: "คัดลอก"
 metrics: "เมตริก"
 overview: "ภาพรวม"
-logs: "ปูม"
+logs: "บันทึกข้อมูลระบบ"
 delayed: "ดีเลย์"
 database: "ฐานข้อมูล"
 channel: "ช่อง"
@@ -684,26 +684,26 @@ create: "สร้าง"
 notificationSetting: "ตั้งค่าการแจ้งเตือน"
 notificationSettingDesc: "เลือกประเภทการแจ้งเตือนที่ต้องการจะแสดง"
 useGlobalSetting: "ใช้การตั้งค่าส่วนกลาง"
-useGlobalSettingDesc: "เมื่อเปิดใช้งาน ใช้การตั้งค่าการแจ้งเตือนจากบัญชีคุณ เมื่อปิดใช้งาน สามารถตั้งค่าได้อย่างอิสระ"
+useGlobalSettingDesc: "หากเปิดไว้ ระบบจะใช้การตั้งค่าการแจ้งเตือนของบัญชีของคุณ หากปิดอยู่ สามารถทำการกำหนดค่าแต่ละรายการได้นะ"
 other: "อื่น ๆ"
 regenerateLoginToken: "สร้างโทเค็นการเข้าสู่ระบบอีกครั้ง"
 regenerateLoginTokenDescription: "สร้างโทเค็นใหม่ที่ใช้ภายในระหว่างการเข้าสู่ระบบ โดยตามหลักปกติแล้วการดำเนินการนี้ไม่จำเป็น หากสร้างใหม่ อุปกรณ์ทั้งหมดจะถูกออกจากระบบนะ"
-theKeywordWhenSearchingForCustomEmoji: "คีย์เวิร์ดสำหรับใช้ค้นหาเอโมจิที่กำหนดเอง"
+theKeywordWhenSearchingForCustomEmoji: "คีย์เวิร์ดสำหรับใช้ค้นหาอีโมจิที่กำหนดเอง"
 setMultipleBySeparatingWithSpace: "คั่นหลายรายการด้วยช่องว่าง"
-fileIdOrUrl: "ID ของไฟล์ หรือ URL"
+fileIdOrUrl: "ไฟล์ ID หรือ URL"
 behavior: "พฤติกรรม"
 sample: "ตัวอย่าง"
 abuseReports: "รายงาน"
 reportAbuse: "รายงาน"
 reportAbuseRenote: "รายงานรีโน้ต"
-reportAbuseOf: "รายงาน {name}"
+reportAbuseOf: "รายงาน {ชื่อ}"
 fillAbuseReportDescription: "กรุณากรอกรายละเอียดเกี่ยวกับรายงานนี้ หากเป็นเรื่องเกี่ยวกับโน้ตโดยเฉพาะ ได้โปรดระบุ URL"
 abuseReported: "เราได้ส่งรายงานของคุณไปแล้ว ขอบคุณมากๆนะ"
-reporter: "ผู้รายงาน"
+reporter: "นักข่าว"
 reporteeOrigin: "รายงานต้นทาง"
-reporterOrigin: "แหล่งผู้รายงาน"
+reporterOrigin: "นักข่าวต้นทาง"
 forwardReport: "ส่งต่อรายงานไปยังอินสแตนซ์ระยะไกล"
-forwardReportIsAnonymous: "ข้อมูลของคุณจะไม่ปรากฏบนอินสแตนซ์ระยะไกลและปรากฏเป็นบัญชีระบบที่ไม่ระบุชื่อ"
+forwardReportIsAnonymous: "แทนที่จะเป็นบัญชีของคุณ บัญชีระบบที่ไม่ระบุตัวตนจะแสดงเป็นนักข่าวที่อินสแตนซ์ระยะไกล"
 send: "ส่ง"
 abuseMarkAsResolved: "ทำเครื่องหมายรายงานว่าแก้ไขแล้ว"
 openInNewTab: "เปิดในแท็บใหม่"
@@ -711,7 +711,7 @@ openInSideView: "เปิดในมุมมองด้านข้าง"
 defaultNavigationBehaviour: "พฤติกรรมการนำทางที่เป็นค่าเริ่มต้น"
 editTheseSettingsMayBreakAccount: "การแก้ไขการตั้งค่าเหล่านี้อาจทำให้บัญชีของคุณเสียหายนะ"
 instanceTicker: "ข้อมูลอินสแตนซ์ของโน้ต"
-waitingFor: "กำลังรอ {x}"
+waitingFor: "กำลังรอคอย {x}"
 random: "สุ่มค่า"
 system: "ระบบ"
 switchUi: "สลับ UI"
@@ -721,7 +721,7 @@ createNew: "สร้างใหม่"
 optional: "ไม่บังคับ"
 createNewClip: "สร้างคลิปใหม่"
 unclip: "ลบคลิป"
-confirmToUnclipAlreadyClippedNote: "โน้ตนี้เป็นส่วนหนึ่งของคลิป “{name}” อยู่แล้ว ต้องการนำมันออกจากคลิปใช่ไหม?"
+confirmToUnclipAlreadyClippedNote: "โน้ตนี้เป็นส่วนหนึ่งของคลิป \"{name}\" แล้ว คุณต้องการลบออกจากคลิปนี้แทนอย่างงั้นหรอ?"
 public: "สาธารณะ"
 private: "ส่วนตัว"
 i18nInfo: "CherryPick กำลังได้รับการแปลเป็นภาษาต่างๆ โดยอาสาสมัคร คุณสามารถช่วยเหลือได้ที่ {link}"
@@ -744,7 +744,7 @@ driveFilesCount: "จำนวนไฟล์ไดรฟ์"
 driveUsage: "การใช้พื้นที่ไดรฟ์"
 noCrawle: "ปฏิเสธการจัดทำดัชนีของโปรแกรมรวบรวมข้อมูล"
 noCrawleDescription: "ขอให้เครื่องมือค้นหาไม่จัดทำดัชนีหน้าโปรไฟล์ โน้ต หน้าเพจ ฯลฯ"
-lockedAccountInfo: "แม้ว่าการอนุมัติการติดตามถูกเปิดใช้งานอยู่ทุกคนก็ยังคงสามารถเห็นโน้ตของคุณได้ เว้นแต่ว่าคุณจะเปลี่ยนการเปิดเผยโน้ตของคุณเป็น  “เฉพาะผู้ติดตาม”"
+lockedAccountInfo: "เว้นแต่ว่าคุณจะต้องตั้งค่าการเปิดเผยโน้ตเป็น \"ผู้ติดตามเท่านั้น\" โน้ตย่อของคุณจะปรากฏแก่ทุกคน ถึงแม้ว่าคุณจะเป็นกำหนดให้ผู้ติดตามต้องได้รับการอนุมัติด้วยตนเองก็ตาม"
 alwaysMarkSensitive: "ทำเครื่องหมายว่ามีเนื้อหาละเอียดอ่อนเป็นค่าเริ่มต้น"
 loadRawImages: "โหลดภาพต้นฉบับแทนการแสดงภาพขนาดย่อ"
 disableShowingAnimatedImages: "ไม่ต้องเล่นภาพเคลื่อนไหว"
@@ -780,29 +780,29 @@ nNotes: "{n} โน้ต"
 sendErrorReports: "ส่งรายงานว่าข้อผิดพลาด"
 sendErrorReportsDescription: "เมื่อเปิดใช้งาน ข้อมูลข้อผิดพลาดโดยรายละเอียดนั้นจะถูกแชร์ให้กับ CherryPick เมื่อเกิดปัญหา ซึ่งช่วยปรับปรุงคุณภาพของ CherryPick\nซึ่งจะรวมถึงข้อมูล เช่น เวอร์ชั่นของระบบปฏิบัติการ เบราว์เซอร์ที่คุณใช้ กิจกรรมของคุณใน CherryPick เป็นต้น"
 myTheme: "ธีมของฉัน"
-backgroundColor: "สีพื้นหลัง"
-accentColor: "สีหลัก"
+backgroundColor: "ภาพพื้นหลัง"
+accentColor: "รูปแบบสี"
 textColor: "สีข้อความ"
 saveAs: "บันทึกเป็น..."
 advanced: "ขั้นสูง"
 advancedSettings: "การตั้งค่าขั้นสูง"
 value: "ค่า"
 createdAt: "สร้างเมื่อ"
-updatedAt: "อัปเดตล่าสุด"
+updatedAt: "อัพเดทล่าสุด"
 saveConfirm: "บันทึกเปลี่ยนแปลงมั้ย?"
 deleteConfirm: "ลบจริงๆเหรอ?"
 invalidValue: "ค่านี้ไม่ถูกต้อง"
 registry: "ทะเบียน"
 closeAccount: "ปิด บัญชี"
 currentVersion: "เวอร์ชั่นปัจจุบัน"
-latestVersion: "เวอร์ชั่นล่าสุด"
+latestVersion: "รุ่นปัจจุบัน"
 youAreRunningUpToDateClient: "คุณกำลังใช้ไคลเอ็นต์เวอร์ชันใหม่ล่าสุดนะ"
 newVersionOfClientAvailable: "มีไคลเอ็นต์เวอร์ชันใหม่กว่าของคุณพร้อมใช้งานนะ"
 usageAmount: "การใช้งาน"
 capacity: "ความจุ"
 inUse: "ใช้แล้ว"
 editCode: "แก้ไขโค้ด"
-apply: "นำไปใช้"
+apply: "ตกลง"
 receiveAnnouncementFromInstance: "รับการแจ้งเตือนจากอินสแตนซ์นี้"
 emailNotification: "การแจ้งเตือนทางอีเมล"
 publish: "เผยแพร่"
@@ -814,7 +814,7 @@ showingPastTimeline: "กำลังแสดงผลไทม์ไลน์
 clear: "ล้าง"
 markAllAsRead: "ทำเครื่องหมายทั้งหมดว่าอ่านแล้ว"
 goBack: "ย้อนกลับ"
-unlikeConfirm: "ต้องการเลิกถูกใจใช่ไหม?"
+unlikeConfirm: "เลิกถูกใจจริงๆ หรือ?"
 fullView: "มุมมองแบบเต็ม"
 quitFullView: "ออกจากมุมมองแบบเต็ม"
 addDescription: "เพิ่มคำอธิบาย"
@@ -825,12 +825,12 @@ userInfo: "ข้อมูลผู้ใช้"
 unknown: "ไม่ทราบสถานะ"
 onlineStatus: "สถานะออนไลน์"
 hideOnlineStatus: "ซ่อนสถานะออนไลน์"
-hideOnlineStatusDescription: "การซ่อนสถานะออนไลน์อาจทำให้ฟังก์ชันบางอย่าง เช่น การค้นหา สะดวกน้อยลง"
+hideOnlineStatusDescription: "การซ่อนสถานะออนไลน์ของคุณช่วยลดความสะดวกของคุณสมบัติบางอย่าง เช่น การค้นหา อ่ะนะ"
 online: "ออนไลน์"
 active: "ใช้งานอยู่"
 offline: "ออฟไลน์"
 notRecommended: "ไม่แนะนำ"
-botProtection: "การป้องกัน Bot"
+botProtection: "การป้องกัน Bot (or AI)"
 instanceBlocking: "อินสแตนซ์ที่ถูกบล็อก"
 selectAccount: "เลือกบัญชี"
 switchAccount: "สลับบัญชีผู้ใช้"
@@ -892,7 +892,7 @@ itsOff: "ปิดใช้งาน"
 on: "เปิด"
 off: "ปิด"
 emailRequiredForSignup: "จำเป็นต้องการใช้ที่อยู่อีเมลสำหรับการสมัคร"
-unread: "ยังไม่ได้อ่าน"
+unread: "ไม่ได้อ่าน"
 filter: "กรอง"
 controlPanel: "แผงควบคุม"
 manageAccounts: "จัดการบัญชี"
@@ -900,13 +900,13 @@ makeReactionsPublic: "ตั้งค่าประวัติการรี
 makeReactionsPublicDescription: "การทำเช่นนี้จะทำให้รายการรีแอคชั่นของคุณที่ผ่านมาทั้งหมดปรากฏต่อสาธารณะ"
 classic: "คลาสสิค"
 muteThread: "ปิดเสียงเธรด"
-unmuteThread: "เลิกปิดเสียงเธรด"
+unmuteThread: "เปิดเสียงเธรด"
 followingVisibility: "การมองเห็นที่เรากำลังติดตาม"
 followersVisibility: "การมองเห็นผู้ที่กำลังติดตามเรา"
 continueThread: "ดูความต่อเนื่องเธรด"
 deleteAccountConfirm: "การดำเนินการนี้จะลบบัญชีของคุณอย่างถาวรเลยนะ แน่ใจหรอดำเนินการ?"
 incorrectPassword: "รหัสผ่านไม่ถูกต้อง"
-voteConfirm: "ต้องการโหวต “{choice}” ใช่ไหม?"
+voteConfirm: "ยืนยันการโหวต “{choice}” ไหม?"
 hide: "ซ่อน"
 leaveGroup: "ออกจากกลุ่ม"
 leaveGroupConfirm: "คุณแน่ใจหรอว่าต้องการออกจาก \"{name}\""
@@ -955,13 +955,13 @@ deleteAccount: "ลบบัญชี"
 document: "เอกสาร"
 numberOfPageCache: "จำนวนหน้าเพจที่แคช"
 numberOfPageCacheDescription: "การเพิ่มจำนวนนี้จะช่วยเพิ่มความสะดวกให้กับผู้ใช้งาน แต่จะทำให้เซิร์ฟเวอร์โหลดมากขึ้นและต้องใช้หน่วยความจำมากขึ้นอีกด้วย"
-logoutConfirm: "ต้องการออกจากระบบใช่ไหม?"
-lastActiveDate: "ใช้งานล่าสุดเมื่อ"
+logoutConfirm: "ต้องการออกจากระบบ?"
+lastActiveDate: "ใช้งานล่าสุดที่"
 statusbar: "แถบสถานะ"
 pleaseSelect: "ตัวเลือก"
-reverse: "พลิก"
+reverse: "ย้อนกลับ"
 colored: "สี"
-refreshInterval: "ความถี่ในการอัปเดต"
+refreshInterval: "รอบการอัพเดต"
 label: "ป้ายชื่อ"
 type: "รูปแบบ"
 speed: "ความเร็ว"
@@ -988,8 +988,8 @@ unsubscribePushNotification: "ปิดการแจ้งเตือนแ
 pushNotificationAlreadySubscribed: "การแจ้งเตือนแบบพุชได้เปิดใช้งานแล้ว"
 pushNotificationNotSupported: "เบราว์เซอร์หรืออินสแตนซ์ของคุณนั้นไม่รองรับการแจ้งเตือนแบบพุช"
 sendPushNotificationReadMessage: "ลบการแจ้งเตือนแบบพุชเมื่ออ่านการแจ้งเตือนหรือข้อความที่เกี่ยวข้องแล้ว"
-sendPushNotificationReadMessageCaption: "อาจทำให้อุปกรณ์ของคุณใช้พลังงานมากขึ้น"
-windowMaximize: "ขยายใหญ่สุด"
+sendPushNotificationReadMessageCaption: "การแจ้งเตือนที่มีข้อความ \"{emptyPushNotificationMessage}\" จะแสดงขึ้นมาในช่วงระยะเวลาสั้นๆ การดำเนินการนี้อาจทำให้เพิ่มการใช้งานแบตเตอรี่ของอุปกรณ์ถ้าหากมีนะ"
+windowMaximize: "ขยายใหญ่สุดแล้ว"
 windowMinimize: "ย่อเล็กที่สุด"
 windowRestore: "เลิกทำ"
 caption: "คำอธิบาย"
@@ -1005,7 +1005,6 @@ neverShow: "ไม่ต้องแสดงข้อความนี้อ
 remindMeLater: "ไว้ครั้งหน้าแล้วกัน"
 didYouLikeMisskey: "คุณชอบ CherryPick ไหม?"
 pleaseDonate: "CherryPick เป็นซอฟต์แวร์ฟรีที่ใช้งานโดย {host} เราขอขอบคุณการสนับสนุนของคุณอย่างสูงเพื่อให้การพัฒนา CherryPick สามารถดำเนินต่อไปได้!"
-correspondingSourceIsAvailable: "ซอร์สโค้ดที่เกี่ยวข้องมีอยู่ที่ {anchor}"
 roles: "บทบาท"
 role: "บทบาท"
 noRole: "ไม่พบบทบาท"
@@ -1074,7 +1073,7 @@ enableChartsForFederatedInstances: "สร้างแผนภูมิข้
 showClipButtonInNoteFooter: "เพิ่ม “คลิป” ไปยังเมนูสั่งการของโน้ต"
 reactionsDisplaySize: "ขนาดของรีแอคชั่น"
 limitWidthOfReaction: "จำกัดความกว้างสูงสุดของรีแอคชั่นและแสดงให้เล็กลง"
-noteIdOrUrl: "ID ของโน้ต หรือ URL"
+noteIdOrUrl: "โน้ต ID หรือ URL"
 video: "วีดีโอ"
 videos: "วีดีโอ"
 audio: "เสียง"
@@ -1096,7 +1095,7 @@ leftBottom: "ล่างซ้าย"
 rightBottom: "ล่างขวา"
 stackAxis: "ทิศทางการซ้อน"
 vertical: "แนวตั้ง"
-horizontal: "แนวนอน"
+horizontal: "ด้านข้าง"
 position: "ตำแหน่ง"
 serverRules: "กฎของเซิร์ฟเวอร์"
 pleaseConfirmBelowBeforeSignup: "โปรดยืนยันที่ด้านล่างก่อนสมัครใช้งาน"
@@ -1112,17 +1111,17 @@ thisChannelArchived: "ช่องนี้ถูกเก็บถาวรแ
 displayOfNote: "การแสดงโน้ต"
 initialAccountSetting: "ตั้งค่าโปรไฟล์"
 youFollowing: "ติดตามแล้ว"
-preventAiLearning: "ปฏิเสธการเรียนรู้ด้วย generative AI"
-preventAiLearningDescription: "ส่งคำร้องขอไม่ให้ใช้ ข้อความในโน้ตที่โพสต์, หรือเนื้อหารูปภาพ ฯลฯ ในการเรียนรู้ของเครื่อง(machine learning) / Predictive AI / Generative AI โดยการเพิ่มแฟล็ก “noai” ลง HTML-Response ให้กับเนื้อหาที่เกี่ยวข้อง แต่ทั้งนี้ ไม่ได้ป้องกัน AI จากการเรียนรู้ได้อย่างสมบูรณ์ เนื่องจากมี AI บางตัวเท่านั้นที่จะเคารพคำขอดังกล่าว"
+preventAiLearning: "ปฏิเสธการใช้งาน ในการเรียนรู้ของเครื่อง (Generative AI)"
+preventAiLearningDescription: "การส่งคำร้องขอโปรแกรมรวบรวมข้อมูลไม่ให้ใช้ข้อความที่โพสต์หรือรูปภาพ ฯลฯ ในชุดข้อมูลแมชชีนเลิร์นนิง (Predictive / Generative AI) สิ่งนี้นั้นทำได้โดยการเพิ่มแฟล็กการตอบสนอง \"noai\" HTML ให้กับเนื้อหาที่เกี่ยวข้อง แต่อย่างไรก็ตามแล้ว การป้องกันโดยสมบูรณ์นั้นไม่สามารถทำได้ผ่านแฟล็กนี้เนื่องจากอาจจะทำให้ถูกเพิกเฉยได้"
 options: "ตัวเลือกบทบาท"
 specifyUser: "ผู้ใช้เฉพาะ"
 failedToPreviewUrl: "ไม่สามารถดูตัวอย่างได้"
 update: "อัปเดต"
 rolesThatCanBeUsedThisEmojiAsReaction: "บทบาทที่สามารถใช้เอโมจินี้เป็นรีแอคชั่นได้"
-rolesThatCanBeUsedThisEmojiAsReactionEmptyDescription: "ถ้าหากไม่ได้ระบุบทบาท ใคร ๆ ก็สามารถใช้เอโมจินี้เพื่อรีแอคชั่นได้"
+rolesThatCanBeUsedThisEmojiAsReactionEmptyDescription: "ถ้าหากไม่ได้ระบุบทบาท ทุกคนนั้นก็สามารถใช้เอโมจินี้เพื่อรีแอคชั่นได้นะ"
 rolesThatCanBeUsedThisEmojiAsReactionPublicRoleWarn: "บทบาทเหล่านี้ต้องเป็นสาธารณะ"
-cancelReactionConfirm: "ต้องการลบรีแอคชั่นใช่ไหม?"
-changeReactionConfirm: "ต้องการเปลี่ยนรีแอคชั่นใช่ไหม?"
+cancelReactionConfirm: "ต้องการลบรีแอคชั่นของคุณจริงๆหรอ?"
+changeReactionConfirm: "ต้องการเปลี่ยนรีแอคชั่นของคุณจริงๆหรอ?"
 later: "ไว้ทีหลัง"
 goToMisskey: "ถึง CherryPick"
 additionalEmojiDictionary: "พจนานุกรมเอโมจิเพิ่มเติม"
@@ -1131,20 +1130,20 @@ branding: "แบรนดิ้ง"
 enableServerMachineStats: "เผยแพร่สถานะฮาร์ดแวร์ของเซิร์ฟเวอร์"
 enableIdenticonGeneration: "เปิดใช้งานผู้ใช้สร้างตัวระบุ"
 turnOffToImprovePerformance: "การปิดส่วนนี้สามารถเพิ่มประสิทธิภาพได้"
-createInviteCode: "สร้างรหัสเชิญ"
+createInviteCode: "สร้างคำเชิญ"
 createWithOptions: "สร้างด้วยตัวเลือก"
-createCount: "จำนวนรหัสเชิญ"
-inviteCodeCreated: "สร้างรหัสเชิญแล้ว"
-inviteLimitExceeded: "จำนวนรหัสเชิญที่สามารถสร้างได้ถึงขีดจำกัดแล้ว"
-createLimitRemaining: "รหัสเชิญที่สามารถสร้างได้: เหลืออยู่ {limit} รหัส"
-inviteLimitResetCycle: "สามารถสร้างรหัสเชิญได้อีกสูงสุด {limit} รหัส ภายใน {time}"
+createCount: "จำนวนการเชิญ"
+inviteCodeCreated: "สร้างคำเชิญแล้ว"
+inviteLimitExceeded: "คุณสร้างคำเชิญเกินถึงขีดจำกัดแล้วนะ"
+createLimitRemaining: "ขีดจำกัดการเชิญ: {limit} ที่เหลืออยู่"
+inviteLimitResetCycle: "ขีดจำกัดนี้จะถูกรีเซ็ตเป็น {limit} ที่ {time}."
 expirationDate: "วันที่หมดอายุ"
 noExpirationDate: "ไม่มีหมดอายุ"
-inviteCodeUsedAt: "วันเวลาที่ใช้รหัสเชิญ"
-registeredUserUsingInviteCode: "ผู้ใช้ที่ใช้รหัสเชิญ"
+inviteCodeUsedAt: "รหัสคำเชิญใช้แล้วที่"
+registeredUserUsingInviteCode: "ใช้คำเชิญแล้วโดย"
 waitingForMailAuth: "กำลังรอการยืนยันอีเมล"
-inviteCodeCreator: "ผู้ใช้ที่สร้างรหัสเชิญ"
-usedAt: "วันเวลาที่ถูกใช้"
+inviteCodeCreator: "สร้างการเชิญแล้วโดย"
+usedAt: "ใช้แล้วที่"
 unused: "ยังไม่ได้ใช้"
 used: "ถูกใช้แล้ว"
 expired: "หมดอายุแล้ว"
@@ -1163,7 +1162,7 @@ renotes: "รีโน้ต"
 loadReplies: "แสดงการตอบกลับ"
 loadConversation: "แสดงบทสนทนา"
 pinnedList: "รายชื่อที่ปักหมุดไว้"
-keepScreenOn: "เปิดหน้าจออุปกรณ์ค้างไว้"
+keepScreenOn: "เปิดหน้าจอไว้"
 verifiedLink: "ความเป็นเจ้าของลิงก์ได้รับการยืนยันแล้ว"
 notifyNotes: "แจ้งเตือนเกี่ยวกับโพสต์ใหม่"
 unnotifyNotes: "หยุดการแจ้งเตือนเกี่ยวกับโน้ตใหม่"
@@ -1174,7 +1173,6 @@ showRenotes: "แสดงรีโน้ต"
 edited: "แก้ไขแล้ว"
 notificationRecieveConfig: "การตั้งค่าการแจ้งเตือน"
 mutualFollow: "ติดตามซึ่งกันและกัน"
-followingOrFollower: "กำลังติดตามหรือผู้ติดตาม"
 fileAttachedOnly: "เฉพาะโน้ตที่มีไฟล์เท่านั้น"
 showRepliesToOthersInTimeline: "แสดงการตอบกลับผู้อื่นลงในไทม์ไลน์"
 hideRepliesToOthersInTimeline: "ไม่แสดงการตอบกลับผู้อื่นลงในไทม์ไลน์"
@@ -1184,12 +1182,6 @@ confirmShowRepliesAll: "การดำเนินการนี้ไม่
 confirmHideRepliesAll: "การดำเนินการนี้ไม่สามารถย้อนกลับได้ คุณต้องการซ่อนการตอบกลับผู้อื่นจากผู้ใช้ทุกคนที่คุณติดตามอยู่ในไทม์ไลน์ของคุณหรือไม่?"
 externalServices: "บริการภายนอก"
 sourceCode: "ซอร์สโค้ด"
-sourceCodeIsNotYetProvided: "ซอร์สโค้ดยังไม่พร้อมใช้งาน โปรดติดต่อผู้ดูแลระบบของคุณเพื่อแก้ไขปัญหานี้"
-repositoryUrl: "URL ของ repository"
-repositoryUrlDescription: "หากมีที่เก็บซอร์สโค้ดที่เปิดเผยต่อสาธารณะ ให้ป้อน URL ที่เก็บซอร์สโค้ดนั้น แต่หากคุณใช้ CherryPick ตามต้นฉบับ (ไม่มีการเปลี่ยนแปลงซอร์สโค้ด) ให้ป้อน https://github.com/kokonect-link/cherrypick"
-repositoryUrlOrTarballRequired: "หากคุณไม่มี repository สาธารณะ คุณจะต้องจัดเตรียม tarball แทน ดู .config/example.yml สำหรับรายละเอียด"
-feedback: "ฟีดแบ็ก"
-feedbackUrl: "URLของฟีดแบ็ก"
 impressum: "อิมเพรสชั่น"
 impressumUrl: "URL อิมเพรสชั่น"
 impressumDescription: "การติดป้ายกำกับ (Impressum) มีผลบังคับใช้ในบางประเทศและภูมิภาค เช่น ประเทศเยอรมนี"
@@ -1201,7 +1193,7 @@ attach: "แนบ"
 detach: "นำออก"
 detachAll: "เอาออกทั้งหมด"
 angle: "แองเกิล"
-flip: "พลิก"
+flip: "ย้อนกลับ"
 showAvatarDecorations: "แสดงตกแต่งอวตาร"
 releaseToRefresh: "ปล่อยเพื่อรีเฟรช"
 refreshing: "กำลังรีเฟรช..."
@@ -1225,29 +1217,15 @@ soundWillBePlayed: "จะมีการเล่นเอฟเฟกต์เ
 showReplay: "ดูรีเพลย์"
 replay: "รีเพลย์"
 replaying: "กำลังรีเพลย์"
-endReplay: "ออกจากรีเพลย์"
-copyReplayData: "คัดลอกข้อมูลรีเพลย์"
 ranking: "อันดับ"
 lastNDays: "ล่าสุด {n} วันที่แล้ว"
 backToTitle: "กลับไปหน้าไตเติ้ล"
 hemisphere: "พื้นที่ที่อาศัยอยู่"
-withSensitive: "แสดงโน้ตที่มีไฟล์เนื้อหาละเอียดอ่อน"
+withSensitive: "แสดงโน้ตที่มีไฟล์ที่ระบุว่ามีเนื้อหาละเอียดอ่อน"
 userSaysSomethingSensitive: "โพสต์ที่มีไฟล์เนื้อหาละเอียดอ่อนของ {name}"
 enableHorizontalSwipe: "ปัดเพื่อสลับแท็บ"
-loading: "กำลังโหลด"
-surrender: "ยอมแพ้"
-gameRetry: "เริ่มเกมใหม่"
 _bubbleGame:
   howToPlay: "วิธีเล่น"
-  hold: "หยุดชั่วคราว"
-  _score:
-    score: "คะแนน"
-    scoreYen: "จำนวนเงินที่ได้รับ"
-    highScore: "คะแนนสูงสุด"
-    maxChain: "จำนวน chain สูงสุด"
-    yen: "{yen} เยน"
-    estimatedQty: "{qty} อัน"
-    scoreSweets: "โอนิงิริ {onigiriQtyWithUnit}"
   _howToPlay:
     section1: "ขยับตำแหน่งและวางวัตถุลงในกล่อง"
     section2: "เมื่อวัตถุประเภทเดียวกันมารวมกัน พวกมันจะกลายเป็นวัตถุใหม่และคุณจะได้รับคะแนน"
@@ -1255,16 +1233,16 @@ _bubbleGame:
 _announcement:
   forExistingUsers: "ผู้ใช้งานที่มีอยู่เท่านั้น"
   forExistingUsersDescription: "การประกาศนี้จะแสดงต่อผู้ใช้ที่มีอยู่ ณ จุดที่เผยแพร่นั้นๆถ้าหากเปิดใช้งาน ถ้าหากปิดใช้งานผู้ที่กำลังสมัครใหม่หลังจากโพสต์แล้วนั้นก็จะเห็นเช่นกัน"
-  needConfirmationToRead: "จำเป็นต้องยืนยันว่าอ่านแล้ว"
-  needConfirmationToReadDescription: "กล่องโต้ตอบการยืนยันจะปรากฏขึ้นเมื่อจะทำเครื่องหมายว่าอ่านแล้ว นอกจากนี้ยังทำให้ประกาศนี้ยังไม่ถูกอ่านเมื่อใช้ฟังก์ชั่น “ทำเครื่องหมายฯ ทั้งหมดว่าอ่านแล้ว”"
+  needConfirmationToRead: "จำเป็นต้องยืนยันเพื่อทำเครื่องหมายบอกว่าอ่านแล้ว"
+  needConfirmationToReadDescription: "ข้อความแจ้งแยก ถ้าหากต้องการเพื่อยืนยันว่ากำลังทำเครื่องหมายประกาศนี้ว่าอ่านแล้วจะแสดงขึ้นถ้าหากเปิดใช้งาน การประกาศนั้นจะไม่รวมอยู่ในฟังก์ชั่นว่า \"ทำเครื่องหมายทั้งหมดว่าอ่านแล้ว\""
   end: "เก็บประกาศ"
   tooManyActiveAnnouncementDescription: "การมีประกาศที่ใช้งานมากเกินไปนั้นอาจจะทำให้ประสบการณ์ของผู้ใช้งานนั้นดูแย่ลง โปรดกรุณาพิจารณาการเก็บประกาศที่ล้าสมัยด้วยนะค่ะ"
-  readConfirmTitle: "ทำเครื่องหมายว่าอ่านแล้วเลยไหม?"
-  readConfirmText: "จะทำเครื่องหมายใส่ “{title}” ว่าอ่านแล้ว"
+  readConfirmTitle: "ทำเครื่องหมายบอกว่าอ่านแล้วเลยมั้ย?"
+  readConfirmText: "การดำเนินการนี้จะทำเครื่องหมายเนื้อหาของ \"{title}\" บอกว่าอ่านแล้วนะ"
   shouldNotBeUsedToPresentPermanentInfo: "เราขอแนะนำให้ใช้ประกาศเพื่อโพสต์ข้อมูลแบบ flow มากกว่าข้อมูลแบบ stock เนื่องจากมีแนวโน้มที่จะส่งผลเสียต่อ UX โดยเฉพาะสำหรับผู้ใช้ใหม่"
   dialogAnnouncementUxWarn: "เราขอแนะนำให้ใช้ด้วยความระมัดระวัง เนื่องจากการแจ้งเตือนแบบกล่องโต้ตอบตั้งแต่ 2 รายการขึ้นไปพร้อมกันอาจส่งผลเสียต่อ UX ได้อย่างมาก"
   silence: "ไม่มีการแจ้งเตือน"
-  silenceDescription: "หากเปิดใช้งาน จะไม่มีการแจ้งเตือนประกาศนี้ และผู้ใช้จะไม่จำเป็นต้องทำเครื่องหมายว่าอ่านแล้ว"
+  silenceDescription: "หากเปิดใช้งาน จะไม่ได้แจ้งเตือนประกาศนี้  และผู้ใช้จะไม่จำเป็นต้องอ่าน"
 _initialAccountSetting:
   accountCreated: "คุณได้สร้างบัญชีของคุณสำเร็จเรียบร้อยแล้ว!"
   letsStartAccountSetup: "สำหรับผู้เริ่มต้นมาตั้งค่าโปรไฟล์ของคุณกันเถอะ"
@@ -1351,7 +1329,7 @@ _timelineDescription:
 _serverRules:
   description: "ชุดของกฎที่จะแสดงก่อนการลงทะเบียนเราขอแนะนำให้ตั้งค่าสรุปข้อกำหนดในการให้บริการ"
 _serverSettings:
-  iconUrl: "URL ไอคอน"
+  iconUrl: "ไอคอน URL"
   appIconDescription: "ระบุไอคอนที่จะใช้เมื่อ {host} แสดงเป็นแอป"
   appIconUsageExample: "E.g. เป็น PWA หรือเมื่อแสดงผลเป็นบุ๊กมาร์กหน้าจอหลักบนโทรศัพท์"
   appIconStyleRecommendation: "เนื่องจากไอคอนอาจถูกครอบตัดเป็นสี่เหลี่ยมจัตุรัสหรือวงกลม จึงแนะนำให้ใช้ไอคอนที่มีขอบสีรอบๆ เนื้อหา"
@@ -1642,7 +1620,7 @@ _role:
   assignTarget: "มอบหมาย"
   descriptionOfAssignTarget: "แบบ<b>ปรับเอง</b> เพิ่มถอนบทบาทนี้แก่ผู้ใช้ด้วยตัวเอง\nแบบ<b>มีเงื่อนไข</b> เพิ่มถอนบทบาทนี้แก่ผู้ใช้โดยอัตโนมัติหากเข้าเงื่อนไขใดต่อไปนี้"
   manual: "ปรับเอง"
-  manualRoles: "บทบาทแบบทำมือ"
+  manualRoles: "บทบาทแบบทำเอง"
   conditional: "มีเงื่อนไข"
   conditionalRoles: "บทบาทแบบมีเงื่อนไข"
   condition: "เงื่อนไข"
@@ -1654,13 +1632,13 @@ _role:
   baseRole: "เทมเพลตบทบาท"
   useBaseValue: "ใช้ตามเทมเพลตบทบาท"
   chooseRoleToAssign: "เลือกบทบาทที่ต้องการกำหนด"
-  iconUrl: "URL ไอคอน"
+  iconUrl: "ไอคอน URL"
   asBadge: "แสดงเป็นตรา"
   descriptionOfAsBadge: "เมื่อเปิดใช้งาน ไอคอนบทบาทจะปรากฏถัดจากชื่อผู้ใช้"
   isExplorable: "ค้นหาผู้ใช้ได้ง่ายขึ้นโดยดูจากบทบาท"
   descriptionOfIsExplorable: "เมื่อเปิดใช้งาน ไทมไลน์บทบาทนี้และสมาชิกที่มีบทบาทนี้จะเปิดเผยเป็นสาธารณะ"
-  displayOrder: "ลำดับการแสดงผล"
-  descriptionOfDisplayOrder: "เลขที่สูงกว่าจะแสดงบน UI ก่อน"
+  displayOrder: "ตำแหน่ง"
+  descriptionOfDisplayOrder: "ยิ่งตัวเลขสูง ตำแหน่ง UI ก็ยิ่งสูงขึ้นนะ"
   canEditMembersByModerator: "อนุญาตให้ผู้ควบคุมแก้ไขสมาชิก"
   descriptionOfCanEditMembersByModerator: "เมื่อเปิดใช้ นอกเหนือจากผู้ควบคุมและผู้ดูแลระบบแล้ว จะสามารถเพิ่มถอนบทบาทนี้แก่ผู้ใช้ได้ แต่เมื่อปิดใช้ จะมีเฉพาะผู้ดูแลระบบเท่านั้นที่จะสามารถดำเนินการได้"
   priority: "ลำดับความสำคัญ"
@@ -1673,7 +1651,6 @@ _role:
     ltlAvailable: "การดูไทม์ไลน์ในท้องถิ่น"
     canPublicNote: "สามารถโพสต์แบบสาธารณะ"
     canEditNote: "กำลังแก้ไขโน้ต"
-    mentionMax: "จำนวนการกล่าวถึงสูงสุดต่อโน้ต"
     canInvite: "สร้างรหัสเชิญอินสแตนซ์"
     inviteLimit: "จำกัดการเชิญ"
     inviteLimitCycle: "คูลดาวน์ในการเชิญ"
@@ -1697,7 +1674,6 @@ _role:
     canUseTranslator: "การใช้งานแปล"
     avatarDecorationLimit: "จำนวนการตกแต่งไอคอนสูงสุดที่สามารถติดตั้งได้"
   _condition:
-    roleAssignedTo: "มอบหมายให้มีบทบาทแบบทำมือ"
     isLocal: "ผู้ใช้ในพื้นที่"
     isRemote: "ผู้ใช้ระยะไกล"
     createdLessThan: "สร้างน้อยกว่า"
@@ -1727,13 +1703,13 @@ _emailUnavailable:
   smtp: "เซิร์ฟเวอร์อีเมลนี้ไม่มีการตอบสนอง"
   banned: "คุณไม่สามารถลงทะเบียนด้วยที่อยู่อีเมลนี้ได้"
 _ffVisibility:
-  public: "สาธารณะ"
+  public: "เผยแพร่"
   followers: "ปรากฏให้แก่ผู้ติดตามเท่านั้น"
   private: "ส่วนตัว"
 _signup:
   almostThere: "เกือบจะเสร็จแล้ว"
   emailAddressInfo: "กรุณากรอกที่อยู่อีเมลที่คุณใช้ ที่อยู่อีเมลของคุณจะไม่ถูกเผยแพร่สู่สาธารณชน"
-  emailSent: "อีเมลยืนยันได้ถูกส่งไปยังที่อยู่อีเมลที่คุณป้อน ({email}) แล้ว กรุณาติดตามลิงก์ในอีเมลเพื่อสร้างบัญชีให้เสร็จสมบูรณ์ ลิงก์ที่ให้ไว้จะหมดอายุใน 30 นาที"
+  emailSent: "เราได้ส่งอีเมลยืนยันไปยังที่อยู่อีเมลของคุณแล้วนะ ({email}) โปรดคลิกลิงก์ที่รวมไว้เพื่อสร้างบัญชีให้เสร็จสิ้น"
 _accountDelete:
   accountDelete: "ลบบัญชีผู้ใช้"
   mayTakeTime: "เนื่องจากการลบบัญชีนี้จะเป็นกระบวนการที่ต้องใช้ทรัพยากรมาก จึงอาจจะต้องใช้เวลาสักครู่ถึงจะเสร็จสมบูรณ์ ทั้งนี้ขึ้นอยู่กับจำนวนเนื้อหาที่คุณสร้างและจำนวนไฟล์ที่คุณอัปโหลดนะ"
@@ -1771,7 +1747,7 @@ _plugin:
   viewSource: "ดูต้นฉบับ"
 _preferencesBackups:
   list: "สร้างการสำรองข้อมูล"
-  saveNew: "บันทึกข้อมูลสำรองใหม่"
+  saveNew: "บันทึกใหม่"
   loadFile: "โหลดจากไฟล์"
   apply: "นำไปใช้กับอุปกรณ์นี้"
   save: "บันทึก"
@@ -1781,8 +1757,8 @@ _preferencesBackups:
   applyConfirm: "คุณต้องการใช้ข้อมูลสำรอง \"{name}\" กับอุปกรณ์นี้อย่างงั้นจริงหรอ การตั้งค่าที่มีอยู่ของอุปกรณ์นี้จะถูกเขียนทับนะ"
   saveConfirm: "บันทึกข้อมูลสำรองเป็น {name} มั้ย?"
   deleteConfirm: "ลบข้อมูลสำรอง {name} มั้ย?"
-  renameConfirm: "ต้องการเปลี่ยนชื่อข้อมูลสำรองจาก “{old}” เป็น “{new}” ใช่ไหม?"
-  noBackups: "ไม่มีข้อมูลสำรอง สามารถบันทึกการตั้งค่าไคลเอนต์ปัจจุบันไปยังเซิร์ฟเวอร์ด้วย “บันทึกข้อมูลสำรองใหม่”"
+  renameConfirm: "เปลี่ยนชื่อข้อมูลสำรองนี้จาก \"{old}\" เป็น \"{new}\" หรือไม่?"
+  noBackups: "ไม่มีข้อมูลสำรองนะ คุณสามารถสำรองข้อมูลการตั้งค่าไคลเอนต์ของคุณบนเซิร์ฟเวอร์นี้โดยใช้ \"สร้างการสำรองข้อมูลใหม่\"ได้นะ"
   createdAt: "สร้างเมื่อ: {date} {time}"
   updatedAt: "อัปเดตเมื่อ: {date} {time}"
   cannotLoad: "การโหลดล้มเหลว"
@@ -1798,16 +1774,14 @@ _aboutMisskey:
   contributors: "ผู้สนับสนุนหลัก"
   allContributors: "ผู้มีส่วนร่วมทั้งหมด"
   source: "ซอร์สโค้ด"
-  original: "ต้นฉบับ"
-  thisIsModifiedVersion: "{name} ใช้ CherryPick เวอร์ชันดัดแปลง"
   translation: "แปลภาษา Misskey"
   donate: "บริจาคให้กับ Misskey"
-  morePatrons: "และอีกหลายท่านที่ไม่ได้เอ่ยนาม ขอบคุณที่ร่วมช่วยเหลือตลอดมานะคะ 🥰"
-  patrons: "ผู้อุปถัมภ์"
+  morePatrons: " ขอบคุณทุกท่านที่ร่วมกันช่วยเหลือตลอดมานะคะ 🥰"
+  patrons: "สมาชิกพันธมิตร"
   projectMembers: "สมาชิกในโครงการ"
 _displayOfSensitiveMedia:
-  respect: "ซ่อนสื่อที่มีเนื้อหาละเอียดอ่อน"
-  ignore: "แสดงสื่อที่มีเนื้อหาละเอียดอ่อน"
+  respect: "ซ่อนสื่อที่ทำเครื่องหมายว่ามีเนื้อหาละเอียดอ่อน"
+  ignore: "แสดงสื่อที่ทำเครื่องหมายว่ามีเนื้อหาละเอียดอ่อน"
   force: "ซ่อนสื่อทั้งหมด"
 _mfm:
   cheatSheet: "โค้ด MFM Cheat Sheet"
@@ -1941,8 +1915,8 @@ _theme:
   importInfo: "ถ้าหากต้องการป้อนโค้ดที่นี่ คุณยังสามารถนำเข้าไปยังโปรแกรมแก้ไขธีมได้"
   deleteConstantConfirm: "คุณต้องการลบค่าคงที่ {const} หรือป่าว?"
   keys:
-    accent: "สีหลัก"
-    bg: "พื้นหลัง"
+    accent: "เน้น"
+    bg: "ภาพพื้นหลัง"
     fg: "ข้อความ"
     focus: "โฟกัส"
     indicator: "ตัวบ่งชี้"
@@ -1978,11 +1952,11 @@ _theme:
     wallpaperOverlay: "วอลล์เปเปอร์ซ้อนทับ"
     badge: "ตรา"
     messageBg: "พื้นหลังแชท"
-    accentDarken: "สีหลัก (มืด)"
-    accentLighten: "สีหลัก (สว่าง)"
+    accentDarken: "เน้น (มืด)"
+    accentLighten: "เน้น (สว่าง)"
     fgHighlighted: "ข้อความที่ไฮไลต์"
 _sfx:
-  note: "โน้ต"
+  note: "หมายเหตุ"
   noteMy: "โน้ตของตัวเอง"
   notification: "การเเจ้งเตือน"
   chat: "แชท"
@@ -2071,7 +2045,7 @@ _permissions:
   "read:reactions": "ดูรีแอคชั่นของคุณ"
   "write:reactions": "แก้ไขรีแอคชั่นของคุณ"
   "write:votes": "โหวตบนสำรวจความคิดเห็น"
-  "read:pages": "ดูหน้าเพจ"
+  "read:pages": "ดหน้าเพจ"
   "write:pages": "แก้ไขหรือลบเพจของคุณ"
   "read:page-likes": "ดูรายการเพจที่ถูกใจไว้"
   "write:page-likes": "แก้ไขรายการเพจที่ถูกใจ"
@@ -2083,8 +2057,8 @@ _permissions:
   "write:gallery": "แก้ไขแกลเลอรี่ของคุณ"
   "read:gallery-likes": "ดูรายการโพสต์แกลเลอรีที่ถูกใจไว้"
   "write:gallery-likes": "แก้ไขรายการโพสต์แกลเลอรีที่ถูกใจไว้"
-  "read:flash": "ดู Play"
-  "write:flash": "แก้ไข Play"
+  "read:flash": "วิว เพลย์"
+  "write:flash": "แก้ไขเพลย์"
   "read:flash-likes": "ดูรายการ  play ที่ถูกใจไว้"
   "write:flash-likes": "แก้ไขรายการ play ที่ถูกใจไว้"
   "read:admin:abuse-user-reports": "ดูรายงานจากผู้ใช้"
@@ -2111,8 +2085,8 @@ _permissions:
   "read:admin:roles": "ดูบทบาท"
   "write:admin:relays": "จัดการรีเลย์"
   "read:admin:relays": "ดูรีเลย์"
-  "write:admin:invite-codes": "จัดการรหัสเชิญ"
-  "read:admin:invite-codes": "ดูรหัสเชิญ"
+  "write:admin:invite-codes": "จัดการคำเชิญ"
+  "read:admin:invite-codes": "ดูรหัสคำเชิญ"
   "write:admin:announcements": "จัดการประกาศ"
   "read:admin:announcements": "ดูประกาศ"
   "write:admin:avatar-decorations": "จัดการการตกแต่งอวตาร"
@@ -2130,7 +2104,7 @@ _permissions:
   "read:admin:stream": "ใช้ Websocket API สำหรับผู้ดูแลระบบ"
   "write:admin:ad": "จัดการโฆษณา"
   "read:admin:ad": "ดูโฆษณา"
-  "write:invite-codes": "สร้างรหัสเชิญ"
+  "write:invite-codes": "สร้างรหัสคำเชิญ"
   "read:invite-codes": "รับรหัสเชิญ"
   "write:clip-favorite": "ควบคุมการถูกใจของคลิป"
   "read:clip-favorite": "ดูการถูกใจของคลิป"
@@ -2184,8 +2158,8 @@ _widgets:
   onlineUsers: "ผู้ใช้ที่ออนไลน์"
   jobQueue: "คิวงาน"
   serverMetric: "ตัวชี้วัดเซิร์ฟเวอร์"
-  aiscript: " คอนโซล AiScript"
-  aiscriptApp: "แอป AiScript"
+  aiscript: "AiScript คอนโซล"
+  aiscriptApp: "AiScript แอพ"
   aichan: "ไอ"
   userList: "รายชื่อผู้ใช้"
   _userList:
@@ -2199,15 +2173,15 @@ _cw:
   files: "{count} ไฟล์"
 _poll:
   noOnlyOneChoice: "จำเป็นต้องมีอย่างน้อยสองตัวเลือก"
-  choiceN: "ตัวเลือกที่ {n}"
-  noMore: "เพิ่มตัวเลือกอีกไม่ได้แล้ว"
+  choiceN: "ตัวเลือก {n}"
+  noMore: "คุณไม่สามารถเพิ่มตัวเลือกอื่นได้"
   canMultipleVote: "สามารถตอบได้หลายคำตอบ"
-  expiration: "สิ้นสุดโพล"
-  infinite: "ไม่กำหนดระยะเวลา"
-  at: "ระบุวันเวลา"
-  after: "ระบุระยะเวลา"
+  expiration: "สิ้นสุดการสำรวจความคิดเห็น"
+  infinite: "ไม่ต้องเลย"
+  at: "จบที่..."
+  after: "สิ้นสุดหลัง..."
   deadlineDate: "วันสิ้นสุด"
-  deadlineTime: "เวลา"
+  deadlineTime: "ชั่วโมง"
   duration: "ระยะเวลา"
   votesCount: "{n} คะแนนเสียง"
   totalVotes: "{n} คะแนนเสียงทั้งหมด"
@@ -2215,17 +2189,17 @@ _poll:
   showResult: "ดูผลลัพธ์"
   voted: "โหวตแล้ว"
   closed: "สิ้นสุดแล้ว"
-  remainingDays: "เหลืออีก {d} วัน {h} ชั่วโมง"
-  remainingHours: "เหลืออีก {h} ชั่วโมง {m} นาที"
-  remainingMinutes: "เหลืออีก {m} นาที {s} วินาที"
-  remainingSeconds: "เหลืออีก {s} วินาที"
+  remainingDays: "จะเสร็จสิ้นในอีก {d} วัน {h} ชั่วโมง"
+  remainingHours: "{h} ชั่วโมง(s) {m} นาที(s) ที่เหลืออยู่"
+  remainingMinutes: "{m} นาที(s) {s} วินาที(s) ที่เหลืออยู่"
+  remainingSeconds: "{s} นาที(s) ที่เหลืออยู่"
 _visibility:
   public: "สาธารณะ"
   publicDescription: "โน้ตของคุณจะปรากฏแก่ผู้ใช้ทุกคน"
   home: "หน้าแรก"
   homeDescription: "โพสลงไทม์ไลน์ที่บ้านเท่านั้น"
   followers: "ผู้ติดตาม"
-  followersDescription: "เฉพาะผู้ติดตามเท่านั้นที่มองเห็นได้"
+  followersDescription: "ทำให้ผู้ติดตามนั้นมองเห็นแค่คุณเท่านั้น"
   specified: "ไดเร็ค"
   specifiedDescription: "ทำให้มองเห็นได้เฉพาะผู้ใช้ที่ระบุเท่านั้น"
   disableFederation: "ไม่มีสหพันธ์"
@@ -2235,11 +2209,11 @@ _postForm:
   quotePlaceholder: "อ้างโน้ตนี้..."
   channelPlaceholder: "โพสต์ลงช่อง..."
   _placeholders:
-    a: "ตอนนี้เป็นยังไงบ้าง?"
-    b: "มีอะไรเกิดขึ้นหรือเปล่า?"
-    c: "กำลังคิดอะไรอยู่?"
-    d: "ต้องการจะพูดอะไรไหม?"
-    e: "มาเขียนกันเถอะ"
+    a: "คุณเป็นอะไรไปหรอ?"
+    b: "เกิดอะไรขึ้นรอบตัวคุณ?"
+    c: "คุณกำลังคิดอะไรอยู่?"
+    d: "คุณต้องการจะพูดอะไร?"
+    e: "เริ่มเขียน..."
     f: "กำลังรอให้คุณเขียน..."
 _profile:
   name: "ชื่อ"
@@ -2253,11 +2227,11 @@ _profile:
   metadataContent: "เนื้อหา"
   changeAvatar: "เปลี่ยนอวาตาร์"
   changeBanner: "เปลี่ยนแบนเนอร์"
-  verifiedLinkDescription: "หากป้อน URL ที่มีลิงก์ไปยังโปรไฟล์ของคุณ ไอคอนการยืนยันความเป็นเจ้าของจะแสดงถัดจากฟิลด์นั้น ๆ"
+  verifiedLinkDescription: "โดยการป้อน URL ที่มีลิงก์ไปยังโปรไฟล์ของคุณตรงนี้ ส่วนไอคอนการยืนยันความเป็นเจ้าของนั้นก็สามารถแสดงถัดจากฟิลด์ได้นะ"
   avatarDecorationMax: "คุณสามารถเพิ่มการตกแต่งได้สูงสุด {max}"
 _exportOrImport:
   allNotes: "โน้ตทั้งหมด"
-  favoritedNotes: "โน้ตที่ถูกใจไว้"
+  favoritedNotes: "บันทึกที่ชื่นชอบ"
   clips: "คลิป"
   followingList: "กำลังติดตาม"
   muteList: "ปิดเสียง"
@@ -2341,7 +2315,7 @@ _pages:
   summary: "สรุปเพจ"
   alignCenter: "เซ็นเตอร์"
   hideTitleWhenPinned: "ซ่อนชื่อหน้าเพจเมื่อปักหมุดไว้ที่โปรไฟล์"
-  font: "แบบอักษร"
+  font: "ตัวอักษร"
   fontSerif: "Serif"
   fontSansSerif: "Sans Serif"
   eyeCatchingImageSet: "ตั้งค่าภาพขนาดย่อ"
@@ -2367,29 +2341,28 @@ _relayStatus:
   accepted: "ได้รับการอนุมัติ"
   rejected: "ถูกปฏิเสธ"
 _notification:
-  fileUploaded: "ไฟล์ถูกอัปโหลดแล้ว"
+  fileUploaded: "ไฟล์ถูกอัพโหลดแล้วน่ะ"
   youGotMention: "{name} กล่าวถึงคุณ"
   youGotReply: "{name} ตอบกลับถึงคุณ"
-  youGotQuote: "{name} อ้างอิงคุณ"
+  youGotQuote: "{name} อ้างถึงคุณ"
   youRenoted: "รีโน้ตจาก {name}"
   youWereFollowed: "ได้ติดตามคุณ"
-  youReceivedFollowRequest: "ได้รับคำขอติดตาม"
-  yourFollowRequestAccepted: "คำขอติดตามได้รับการอนุมัติแล้ว"
+  youReceivedFollowRequest: "คุณมีคำขอติดตามใหม่น่ะ"
+  yourFollowRequestAccepted: "คำขอติดตามของคุณได้รับการยอมรับแล้วน่ะ"
   youWereInvitedToGroup: "{userName} ได้เชิญคุณเข้ากลุ่ม"
-  pollEnded: "ผลโพลออกมาแล้ว"
+  pollEnded: "โพลสำรวจความคิดเห็นผลลัพธ์มีพร้อมใช้งาน"
   newNote: "โพสต์ใหม่"
   unreadAntennaNote: "เสาอากาศ {name}"
   roleAssigned: "ได้รับบทบาท"
-  emptyPushNotificationMessage: "อัปเดตการแจ้งเตือนแบบพุชแล้ว"
+  emptyPushNotificationMessage: "การแจ้งเตือนแบบพุชได้รับการอัพเดทแล้ว"
   achievementEarned: "รับความสำเร็จ"
   testNotification: "ทดสอบการแจ้งเตือน"
   checkNotificationBehavior: "กดเพื่อดูลักษณะการแจ้งเตือน"
   sendTestNotification: "ส่งทดสอบการแจ้งเตือน"
   notificationWillBeDisplayedLikeThis: "การแจ้งเตือนมีลักษณะแบบนี้"
   reactedBySomeUsers: "ถูกรีแอคชั่นโดยผู้ใช้ {n} ราย"
-  renotedBySomeUsers: "รีโน้ตจากผู้ใช้ {n} ราย"
+  renotedBySomeUsers: "Renote จากผู้ใช้จำนวน {n} ราย"
   followedBySomeUsers: "มีผู้ติดตาม {n} ราย"
-  flushNotification: "ล้างประวัติการแจ้งเตือน"
   _types:
     all: "ทั้งหมด"
     note: "โน้ตใหม่"
@@ -2399,9 +2372,9 @@ _notification:
     renote: "รีโน้ต"
     quote: "อ้างคำพูด"
     reaction: "รีแอคชั่น"
-    pollEnded: "โพลสิ้นสุดแล้ว"
-    receiveFollowRequest: "ได้รับคำร้องขอติดตาม"
-    followRequestAccepted: "อนุมัติให้ติดตามแล้ว"
+    pollEnded: "โพลนี้สิ้นสุดลงแล้ว"
+    receiveFollowRequest: "ได้รับคำขอติดตาม\n"
+    followRequestAccepted: "ยอมรับคำขอติดตาม"
     groupInvited: "ได้รับคำเชิญเข้ากลุ่ม"
     roleAssigned: "ให้บทบาท"
     achievementEarned: "ปลดล็อกความสำเร็จแล้ว"
@@ -2439,7 +2412,7 @@ _deck:
     list: "รายการ"
     channel: "ช่อง"
     mentions: "พูดถึง"
-    direct: "ไดเร็กต์"
+    direct: "ไดเร็ค"
     roleTimeline: "บทบาทไทม์ไลน์"
 _dialog:
   charactersExceeded: "คุณกำลังมีตัวอักขระเกินขีดจำกัดสูงสุดแล้วนะ! ปัจจุบันอยู่ที่ {current} จาก {max}"
@@ -2470,8 +2443,8 @@ _moderationLogTypes:
   updateRole: "อัปเดตบทบาทแล้ว"
   assignRole: "ได้รับมอบหมายบทบาท"
   unassignRole: "ถอดออกจากบทบาทแล้ว"
-  suspend: "ระงับ"
-  unsuspend: "เลิกระงับ"
+  suspend: "ถูกระงับ"
+  unsuspend: "เลิกถูกระงับ"
   addCustomEmoji: "เพิ่มเอโมจิที่กำหนดเองแล้ว"
   updateCustomEmoji: "อัปเดตเอโมจิที่กำหนดเองแล้ว"
   deleteCustomEmoji: "ลบเอโมจิที่กำหนดเองออกแล้ว"
@@ -2486,13 +2459,12 @@ _moderationLogTypes:
   deleteGlobalAnnouncement: "ลบประกาศทั่วโลกออกแล้ว"
   deleteUserAnnouncement: "ลบประกาศผู้ใช้ออกแล้ว"
   resetPassword: "รีเซ็ตรหัสผ่าน"
-  suspendRemoteInstance: "ระงับอินสแตนซ์ระยะไกล"
-  unsuspendRemoteInstance: "เลิกระงับอินสแตนซ์ระยะไกล"
-  updateRemoteInstanceNote: "อัปเดตโน้ตการกลั่นกรองของอินสแตนซ์ระยะไกลแล้ว"
+  suspendRemoteInstance: "อินสแตนซ์ระยะไกลถูกระงับ"
+  unsuspendRemoteInstance: "อินสแตนซ์ระยะไกลเลิกการระงับ"
   markSensitiveDriveFile: "ทำเครื่องหมายไฟล์ว่ามีเนื้อหาละเอียดอ่อน"
   unmarkSensitiveDriveFile: "ยกเลิกทำเครื่องหมายไฟล์ว่ามีเนื้อหาละเอียดอ่อน"
   resolveAbuseReport: "รายงานได้รับการแก้ไขแล้ว"
-  createInvitation: "สร้างรหัสเชิญ"
+  createInvitation: "สร้างคำเชิญ"
   createAd: "สร้างโฆษณาแล้ว"
   deleteAd: "ลบโฆษณาออกแล้ว"
   updateAd: "อัปเดตโฆษณาแล้ว"
@@ -2609,8 +2581,6 @@ _reversi:
   opponentHasSettingsChanged: "อีกฝ่ายเปลี่ยนการตั้งค่า"
   allowIrregularRules: "อนุญาตกฎที่ไม่ปรกติ (โหมดฟรีทุกอย่าง)"
   disallowIrregularRules: "ไม่อนุญาตกฎที่ไม่ปรกติ"
-  showBoardLabels: "แสดงหมายเลขแถว/คอลัมน์บนกระดาน"
-  useAvatarAsStone: "ใช้รูปอวตารเป็นหมาก"
 _offlineScreen:
   title: "ออฟไลน์ - ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ได้"
   header: "ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ได้"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index 931c0cdd2f..e50c3b7896 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -1062,7 +1062,6 @@ verifiedLink: "Chúng tôi đã xác nhận bạn là chủ sở hữu của đ
 sourceCode: "Mã nguồn"
 flip: "Lật"
 lastNDays: "{n} ngày trước"
-surrender: "Từ chối"
 _announcement:
   forExistingUsers: "Chỉ những người dùng đã tồn tại"
   forExistingUsersDescription: "Nếu được bật, thông báo này sẽ chỉ hiển thị với những người dùng đã tồn tại vào lúc thông báo được tạo. Nếu tắt đi, những tài khoản mới đăng ký sau khi thông báo được đăng lên cũng sẽ thấy nó."
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 66ce859eea..e77cec3907 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -336,7 +336,7 @@ displayOfSensitiveMedia: "显示敏感媒体"
 whenServerDisconnected: "与服务器连接中断时"
 disconnectedFromServer: "已和服务器断开连接"
 reload: "重新加载"
-doNothing: "关闭"
+doNothing: "关闭弹窗"
 reloadConfirm: "确定要重新加载吗？"
 watch: "关注"
 unwatch: "取消关注"
@@ -1005,7 +1005,6 @@ neverShow: "不再显示"
 remindMeLater: "稍后提醒我"
 didYouLikeMisskey: "您喜欢 CherryPick 吗？"
 pleaseDonate: "CherryPick 是 {host} 所使用的免费软件。为了今后也能够维持 CherryPick 的开发，请在有余力的情况下进行捐助！"
-correspondingSourceIsAvailable: "对应的源代码可在{anchor}找到"
 roles: "角色"
 role: "角色"
 noRole: "角色不存在"
@@ -1057,7 +1056,6 @@ sensitiveWords: "敏感词"
 sensitiveWordsDescription: "将包含设置词的帖子的可见范围设置为首页。可以通过用换行符分隔来设置多个。"
 sensitiveWordsDescription2: "AND 条件用空格分隔，正则表达式用斜线包裹。"
 prohibitedWords: "禁用词"
-prohibitedWordsDescription: "发布包含设定词汇的帖子时将出错。可用换行设定多个关键字"
 prohibitedWordsDescription2: "AND 条件用空格分隔，正则表达式用斜线包裹。"
 hiddenTags: "隐藏标签"
 hiddenTagsDescription: "设定的标签将不会在时间线上显示。可使用换行来设置多个标签。"
@@ -1131,7 +1129,7 @@ branding: "品牌"
 enableServerMachineStats: "公开服务器硬件统计信息"
 enableIdenticonGeneration: "启用生成用户 Identicon"
 turnOffToImprovePerformance: "关闭该选项可以提高性能。"
-createInviteCode: "生成邀请码"
+createInviteCode: "发行邀请码"
 createWithOptions: "使用选项来创建"
 createCount: "发行数"
 inviteCodeCreated: "已创建邀请码"
@@ -1143,7 +1141,7 @@ noExpirationDate: "不设置有效日期"
 inviteCodeUsedAt: "邀请码被使用的日期和时间"
 registeredUserUsingInviteCode: "使用了邀请码的用户"
 waitingForMailAuth: "等待验证电子邮件"
-inviteCodeCreator: "生成邀请码的用户"
+inviteCodeCreator: "发行邀请码的用户"
 usedAt: "使用时间"
 unused: "未使用"
 used: "已使用"
@@ -1174,7 +1172,6 @@ showRenotes: "显示转帖"
 edited: "已编辑"
 notificationRecieveConfig: "通知接收设置"
 mutualFollow: "互相关注"
-followingOrFollower: "关注中或关注者"
 fileAttachedOnly: "仅限媒体"
 showRepliesToOthersInTimeline: "在时间线中包含给别人的回复"
 hideRepliesToOthersInTimeline: "在时间线中隐藏给别人的回复"
@@ -1184,12 +1181,6 @@ confirmShowRepliesAll: "此操作不可撤销。确认要在时间线中包含
 confirmHideRepliesAll: "此操作不可撤销。确认要在时间线中隐藏现在关注的所有人的回复吗？"
 externalServices: "外部服务"
 sourceCode: "源代码"
-sourceCodeIsNotYetProvided: "还未提供源代码。要解决此问题请联系管理员。"
-repositoryUrl: "仓库地址"
-repositoryUrlDescription: "若源代码所在的仓库是公开的，请填入对应的 URL。若是按原样使用 CherryPick（并未追加或者修改代码）的情况请填入 https://github.com/kokonect-link/cherrypick。"
-repositoryUrlOrTarballRequired: "若仓库并未公开，则需要提供 tarball 作为替代。详情请看 .config/example.yml。"
-feedback: "反馈"
-feedbackUrl: "反馈地址"
 impressum: "运营商信息"
 impressumUrl: "运营商信息地址"
 impressumDescription: "德国等国家和地区有义务展示此类信息（Impressum）。"
@@ -1219,14 +1210,11 @@ seasonalScreenEffect: "应景的画面效果"
 decorate: "装饰"
 addMfmFunction: "添加装饰"
 enableQuickAddMfmFunction: "显示高级 MFM 选择器"
-bubbleGame: "泡泡游戏"
 sfx: "音效"
 soundWillBePlayed: "声音将会播放"
-showReplay: "观看回放"
+showReplay: "查看重播"
 replay: "重播"
 replaying: "重播中"
-endReplay: "结束回放"
-copyReplayData: "复制回放数据"
 ranking: "排行榜"
 lastNDays: "最近 {n} 天"
 backToTitle: "返回标题"
@@ -1234,19 +1222,8 @@ hemisphere: "居住地区"
 withSensitive: "显示包含敏感媒体的帖子"
 userSaysSomethingSensitive: "含 {name} 敏感文件的帖子"
 enableHorizontalSwipe: "滑动切换标签页"
-loading: "读取中"
-surrender: "取消"
-gameRetry: "重试"
 _bubbleGame:
   howToPlay: "游戏说明"
-  hold: "抓住"
-  _score:
-    score: "得分"
-    scoreYen: "赚到的钱"
-    highScore: "最高分"
-    maxChain: "最高连击数"
-    yen: "{yen} 日元"
-    estimatedQty: "约 {qty} 个"
   _howToPlay:
     section1: "对准位置将Emoji投入盒子。"
     section2: "相同的Emoji相互接触合成后会得到新的Emoji，以此获得分数。"
@@ -1335,8 +1312,8 @@ _initialTutorial:
     description: "对于服务器方针所要求要求的，又或者不适合直接展示的附件，请添加「敏感」标记。\n"
     tryThisFile: "试试看，将附加到此窗口的图像标注为敏感！"
     _exampleNote:
-      note: "拆纳豆包装时出错了…"
-    method: "要标注附件为敏感内容，请单击该文件以打开菜单，然后单击“标记为敏感内容”。"
+      note: "不该打开纳豆的盖子的……"
+    method: "要标注附件为敏感内容，请单击该文件以打开菜单，然后单击“设置为敏感”。"
     sensitiveSucceeded: "附加文件时，请遵循服务器的条款来设置正确敏感设定。\n"
     doItToContinue: "将图像标记为敏感后才能够继续"
   _done:
@@ -1671,9 +1648,8 @@ _role:
     ltlAvailable: "查看本地时间线"
     canPublicNote: "允许公开发帖"
     canEditNote: "编辑帖子"
-    mentionMax: "帖子内最多提及数"
     canInvite: "发放服务器邀请码"
-    inviteLimit: "可生成邀请码的数量"
+    inviteLimit: "可发行邀请码的数量"
     inviteLimitCycle: "邀请码的发行间隔"
     inviteExpirationTime: "邀请码的有效日期"
     canManageCustomEmojis: "管理自定义表情符号"
@@ -1695,7 +1671,6 @@ _role:
     canUseTranslator: "使用翻译功能"
     avatarDecorationLimit: "可添加头像挂件的最大个数"
   _condition:
-    roleAssignedTo: "已分配给手动角色"
     isLocal: "是本地用户"
     isRemote: "是远程用户"
     createdLessThan: "账户创建时间少于"
@@ -1796,8 +1771,6 @@ _aboutMisskey:
   contributors: "主要贡献者"
   allContributors: "全体贡献者"
   source: "源代码"
-  original: "原版"
-  thisIsModifiedVersion: "{name}正在使用修改后的 CherryPick。"
   translation: "翻译 Misskey"
   donate: "赞助 Misskey"
   morePatrons: "还有很多其它的人也在支持我们，非常感谢🥰"
@@ -2128,7 +2101,7 @@ _permissions:
   "read:admin:stream": "使用管理员用的 Websocket API"
   "write:admin:ad": "编辑广告"
   "read:admin:ad": "查看广告"
-  "write:invite-codes": "生成邀请码"
+  "write:invite-codes": "发行邀请码"
   "read:invite-codes": "获取已发行的邀请码"
   "write:clip-favorite": "编辑便签的点赞"
   "read:clip-favorite": "查看便签的点赞"
@@ -2387,7 +2360,6 @@ _notification:
   reactedBySomeUsers: "{n} 人回应了"
   renotedBySomeUsers: "{n} 人转发了"
   followedBySomeUsers: "被 {n} 人关注"
-  flushNotification: "重置通知历史"
   _types:
     all: "全部"
     note: "用户的新帖子"
@@ -2486,11 +2458,10 @@ _moderationLogTypes:
   resetPassword: "重置密码"
   suspendRemoteInstance: "停止远程服务器"
   unsuspendRemoteInstance: "恢复远程服务器"
-  updateRemoteInstanceNote: "更新远程服务器的管理笔记"
   markSensitiveDriveFile: "标记网盘文件为敏感媒体"
   unmarkSensitiveDriveFile: "取消标记网盘文件为敏感媒体"
   resolveAbuseReport: "处理举报"
-  createInvitation: "生成邀请码"
+  createInvitation: "发行邀请码"
   createAd: "创建了广告"
   deleteAd: "删除了广告"
   updateAd: "更新了广告"
@@ -2581,8 +2552,6 @@ _reversi:
   myTurn: "你的回合"
   turnOf: "{name}的回合"
   pastTurnOf: "{name}的回合"
-  surrender: "认输"
-  surrendered: "已认输"
   timeout: "超时"
   drawn: "平局"
   won: "{name}获胜"
@@ -2604,8 +2573,6 @@ _reversi:
   opponentHasSettingsChanged: "对手更改了设定"
   allowIrregularRules: "允许非常规规则（完全自由）"
   disallowIrregularRules: "禁止非常规规则"
-  showBoardLabels: "显示行号和列号"
-  useAvatarAsStone: "用头像作为棋子"
 _offlineScreen:
   title: "离线——无法连接到服务器"
   header: "无法连接到服务器"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index d6f0d51e97..a8ae2629fd 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1005,7 +1005,6 @@ neverShow: "不再顯示"
 remindMeLater: "以後再說"
 didYouLikeMisskey: "您喜歡 CherryPick 嗎？"
 pleaseDonate: "CherryPick 是由 {host} 使用的免費軟體。請贊助我們，讓開發得以持續！"
-correspondingSourceIsAvailable: "對應的原始碼可以在 {anchor} 處找到。"
 roles: "角色"
 role: "角色"
 noRole: "沒有角色"
@@ -1174,7 +1173,6 @@ showRenotes: "顯示其他人的轉發貼文"
 edited: "已編輯"
 notificationRecieveConfig: "接受通知的設定"
 mutualFollow: "互相追隨"
-followingOrFollower: "追隨中或追隨者"
 fileAttachedOnly: "顯示包含附件的貼文"
 showRepliesToOthersInTimeline: "顯示給其他人的回覆"
 hideRepliesToOthersInTimeline: "在時間軸上隱藏給其他人的回覆"
@@ -1184,12 +1182,6 @@ confirmShowRepliesAll: "進行此操作後無法復原。您真的希望時間
 confirmHideRepliesAll: "進行此操作後無法復原。您真的希望時間軸「不包含」您目前追隨的所有人的回覆嗎？"
 externalServices: "外部服務"
 sourceCode: "原始碼"
-sourceCodeIsNotYetProvided: "尚未提供原始碼，請洽詢管理員解決這個問題。"
-repositoryUrl: "儲存庫 URL"
-repositoryUrlDescription: "如果存在可公開取得原始碼的儲存庫，請輸入其 URL。 如果您按原樣使用 CherryPick（不對原始碼進行任何更改），請輸入 https://github.com/kokonect-link/cherrypick。"
-repositoryUrlOrTarballRequired: "如果儲存庫不是公開的，則必須提供 tarball。 詳細資訊請參閱 .config/example.yml。"
-feedback: "意見回饋"
-feedbackUrl: "意見回饋 URL"
 impressum: "營運者資訊"
 impressumUrl: "營運者資訊網址"
 impressumDescription: "在德國與部份地區必須要明確顯示營運者資訊。"
@@ -1225,8 +1217,6 @@ soundWillBePlayed: "將播放音效"
 showReplay: "觀看重播"
 replay: "重播"
 replaying: "重播中"
-endReplay: "退出重播"
-copyReplayData: "複製重播資料"
 ranking: "排行榜"
 lastNDays: "過去 {n} 天"
 backToTitle: "回到遊戲標題頁"
@@ -1234,20 +1224,8 @@ hemisphere: "您居住的地區"
 withSensitive: "顯示包含敏感檔案的貼文"
 userSaysSomethingSensitive: "包含 {name} 敏感檔案的貼文"
 enableHorizontalSwipe: "滑動切換時間軸"
-loading: "載入中"
-surrender: "退出"
-gameRetry: "再試一次"
 _bubbleGame:
   howToPlay: "玩法說明"
-  hold: "保留"
-  _score:
-    score: "分數"
-    scoreYen: "賺取的金額"
-    highScore: "最高分"
-    maxChain: "最大結合數"
-    yen: "{yen} 日圓"
-    estimatedQty: "{qty}個"
-    scoreSweets: "飯糰 {onigiriQtyWithUnit}"
   _howToPlay:
     section1: "調整位置並將物體放入盒子中。"
     section2: "當相同類型的物體黏在一起時，它們會變成不同的物體，您就會得到分數。"
@@ -1654,7 +1632,7 @@ _role:
   baseRole: "基本角色"
   useBaseValue: "使用基本角色的值"
   chooseRoleToAssign: "選擇要指派的角色"
-  iconUrl: "圖示的 URL"
+  iconUrl: "圖示的URL"
   asBadge: "顯示為徽章"
   descriptionOfAsBadge: "開啟的話，角色圖示會顯示在使用者名稱旁邊。"
   isExplorable: "讓使用者更容易找到您"
@@ -1673,7 +1651,6 @@ _role:
     ltlAvailable: "瀏覽本地時間軸"
     canPublicNote: "允許公開貼文"
     canEditNote: "允許編輯貼文"
-    mentionMax: "貼文內的最大提及數"
     canInvite: "發行伺服器邀請碼"
     inviteLimit: "可建立邀請碼的數量"
     inviteLimitCycle: "邀請碼的發放間隔"
@@ -1697,7 +1674,6 @@ _role:
     canUseTranslator: "使用翻譯功能"
     avatarDecorationLimit: "頭像裝飾的最大設置量"
   _condition:
-    roleAssignedTo: "手動指派角色完成"
     isLocal: "本地使用者"
     isRemote: "遠端使用者"
     createdLessThan: "帳戶加入時間不超過"
@@ -1798,8 +1774,6 @@ _aboutMisskey:
   contributors: "主要貢獻者"
   allContributors: "全體貢獻人員"
   source: "原始碼"
-  original: "原始"
-  thisIsModifiedVersion: "{name} 使用原始 CherryPick 的修改版本。"
   translation: "翻譯 Misskey"
   donate: "贊助 Misskey"
   morePatrons: "還有許許多多幫助我們的其他人，非常感謝你們。 🥰"
@@ -2389,7 +2363,6 @@ _notification:
   reactedBySomeUsers: "{n}人做出了反應"
   renotedBySomeUsers: "{n}人做了轉發"
   followedBySomeUsers: "被{n}人追隨了"
-  flushNotification: "重置通知歷史紀錄"
   _types:
     all: "全部 "
     note: "使用者的最新貼文"
@@ -2476,7 +2449,7 @@ _moderationLogTypes:
   updateCustomEmoji: "更新自訂表情符號"
   deleteCustomEmoji: "刪除自訂表情符號"
   updateServerSettings: "更新伺服器設定"
-  updateUserNote: "更新了使用者的管理筆記"
+  updateUserNote: "更新管理筆記"
   deleteDriveFile: "刪除檔案"
   deleteNote: "刪除貼文"
   createGlobalAnnouncement: "建立全網通知"
@@ -2488,7 +2461,6 @@ _moderationLogTypes:
   resetPassword: "重設密碼"
   suspendRemoteInstance: "封鎖遠端伺服器"
   unsuspendRemoteInstance: "解除封鎖遠端伺服器"
-  updateRemoteInstanceNote: "更新了遠端伺服器的管理筆記"
   markSensitiveDriveFile: "標記為敏感檔案"
   unmarkSensitiveDriveFile: "撤銷標記為敏感檔案"
   resolveAbuseReport: "解決檢舉"
@@ -2609,8 +2581,6 @@ _reversi:
   opponentHasSettingsChanged: "對手更改了設定"
   allowIrregularRules: "允許異常規則（完全自由）"
   disallowIrregularRules: "不允許異常規則"
-  showBoardLabels: "在棋盤上顯示行、列號"
-  useAvatarAsStone: "用大頭貼當作棋子"
 _offlineScreen:
   title: "離線－無法連接伺服器"
   header: "無法連接伺服器"
diff --git a/package.json b/package.json
index 392d8b4f4b..5c9fd98fba 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,13 @@
 {
 	"name": "cherrypick",
-	"version": "4.8.0-beta.1-engawa0.3.1",
-	"basedMisskeyVersion": "2024.3.1",
+	"version": "4.7.0-engawa0.3.0",
+	"basedMisskeyVersion": "2024.2.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/kokonect-link/cherrypick.git"
 	},
-	"packageManager": "pnpm@8.15.4",
+	"packageManager": "pnpm@8.15.1",
 	"workspaces": [
 		"packages/frontend",
 		"packages/backend",
@@ -52,23 +52,22 @@
 		"lodash": "4.17.21"
 	},
 	"dependencies": {
-		"cssnano": "6.0.5",
+		"cssnano": "6.0.3",
 		"execa": "8.0.1",
 		"fast-glob": "3.3.2",
 		"ignore-walk": "6.0.4",
 		"js-yaml": "4.1.0",
-		"postcss": "8.4.35",
+		"postcss": "8.4.33",
 		"tar": "6.2.0",
-		"terser": "5.28.1",
+		"terser": "5.27.0",
 		"typescript": "5.3.3"
 	},
 	"devDependencies": {
-		"@types/node": "^20.11.28",
-		"@typescript-eslint/eslint-plugin": "7.1.0",
-		"@typescript-eslint/parser": "7.1.0",
+		"@typescript-eslint/eslint-plugin": "6.18.1",
+		"@typescript-eslint/parser": "6.18.1",
 		"cross-env": "7.0.3",
-		"cypress": "13.6.6",
-		"eslint": "8.57.0",
+		"cypress": "13.6.3",
+		"eslint": "8.56.0",
 		"ncp": "2.0.0",
 		"start-server-and-test": "2.0.3"
 	},
diff --git a/packages/backend/generate_api_json.js b/packages/backend/generate_api_json.js
index 602ced1d75..4079b3bb0a 100644
--- a/packages/backend/generate_api_json.js
+++ b/packages/backend/generate_api_json.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 import { loadConfig } from './built/config.js'
 import { genOpenapiSpec } from './built/server/api/openapi/gen-spec.js'
 import { writeFileSync } from "node:fs";
@@ -10,4 +5,4 @@ import { writeFileSync } from "node:fs";
 const config = loadConfig();
 const spec = genOpenapiSpec(config, true);
 
-writeFileSync('./built/api.json', JSON.stringify(spec), 'utf-8');
+writeFileSync('./built/api.json', JSON.stringify(spec), 'utf-8');
\ No newline at end of file
diff --git a/packages/backend/migration/1689325027964-UserBlacklistAnntena.js b/packages/backend/migration/1689325027964-UserBlacklistAnntena.js
index 2dc7774493..ce246b20f8 100644
--- a/packages/backend/migration/1689325027964-UserBlacklistAnntena.js
+++ b/packages/backend/migration/1689325027964-UserBlacklistAnntena.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class UserBlacklistAnntena1689325027964 {
     name = 'UserBlacklistAnntena1689325027964'
 
diff --git a/packages/backend/migration/1690417561185-fix-renote-muting.js b/packages/backend/migration/1690417561185-fix-renote-muting.js
index d9604ca26c..14150b0362 100644
--- a/packages/backend/migration/1690417561185-fix-renote-muting.js
+++ b/packages/backend/migration/1690417561185-fix-renote-muting.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class FixRenoteMuting1690417561185 {
     name = 'FixRenoteMuting1690417561185'
 
diff --git a/packages/backend/migration/1690417561186-ChangeCacheRemoteFilesDefault.js b/packages/backend/migration/1690417561186-ChangeCacheRemoteFilesDefault.js
index 9bccdb3bb5..7eda5debe5 100644
--- a/packages/backend/migration/1690417561186-ChangeCacheRemoteFilesDefault.js
+++ b/packages/backend/migration/1690417561186-ChangeCacheRemoteFilesDefault.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class ChangeCacheRemoteFilesDefault1690417561186 {
     name = 'ChangeCacheRemoteFilesDefault1690417561186'
 
diff --git a/packages/backend/migration/1690417561187-Fix.js b/packages/backend/migration/1690417561187-Fix.js
index 6275662c23..e48e069f40 100644
--- a/packages/backend/migration/1690417561187-Fix.js
+++ b/packages/backend/migration/1690417561187-Fix.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class Fix1690417561187 {
     name = 'Fix1690417561187'
 
diff --git a/packages/backend/migration/1690569881926-user-2fa-backup-codes.js b/packages/backend/migration/1690569881926-user-2fa-backup-codes.js
index a3ef8dcf08..2049df8ea2 100644
--- a/packages/backend/migration/1690569881926-user-2fa-backup-codes.js
+++ b/packages/backend/migration/1690569881926-user-2fa-backup-codes.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class User2faBackupCodes1690569881926 {
 	name = 'User2faBackupCodes1690569881926'
 
diff --git a/packages/backend/migration/1691649257651-refine-announcement.js b/packages/backend/migration/1691649257651-refine-announcement.js
index ac621155d5..d8d63f3103 100644
--- a/packages/backend/migration/1691649257651-refine-announcement.js
+++ b/packages/backend/migration/1691649257651-refine-announcement.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class RefineAnnouncement1691649257651 {
     name = 'RefineAnnouncement1691649257651'
 
diff --git a/packages/backend/migration/1691657412740-refine-announcement-2.js b/packages/backend/migration/1691657412740-refine-announcement-2.js
index 67edf19659..8791f99f44 100644
--- a/packages/backend/migration/1691657412740-refine-announcement-2.js
+++ b/packages/backend/migration/1691657412740-refine-announcement-2.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class RefineAnnouncement21691657412740 {
     name = 'RefineAnnouncement21691657412740'
 
diff --git a/packages/backend/migration/1695260774117-verified-links.js b/packages/backend/migration/1695260774117-verified-links.js
index 64c8a9ad8f..18e0571d81 100644
--- a/packages/backend/migration/1695260774117-verified-links.js
+++ b/packages/backend/migration/1695260774117-verified-links.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class VerifiedLinks1695260774117 {
     name = 'VerifiedLinks1695260774117'
 
diff --git a/packages/backend/migration/1695288787870-following-notify.js b/packages/backend/migration/1695288787870-following-notify.js
index b3f78d5f2a..e7e2194b15 100644
--- a/packages/backend/migration/1695288787870-following-notify.js
+++ b/packages/backend/migration/1695288787870-following-notify.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class FollowingNotify1695288787870 {
     name = 'FollowingNotify1695288787870'
 
diff --git a/packages/backend/migration/1695440131671-short-name.js b/packages/backend/migration/1695440131671-short-name.js
index fdc256caf8..2c37297fc1 100644
--- a/packages/backend/migration/1695440131671-short-name.js
+++ b/packages/backend/migration/1695440131671-short-name.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class ShortName1695440131671 {
     name = 'ShortName1695440131671'
 
diff --git a/packages/backend/migration/1695605508898-mutingNotificationTypes.js b/packages/backend/migration/1695605508898-mutingNotificationTypes.js
index 67d4243142..8c0e52a2f0 100644
--- a/packages/backend/migration/1695605508898-mutingNotificationTypes.js
+++ b/packages/backend/migration/1695605508898-mutingNotificationTypes.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class MutingNotificationTypes1695605508898 {
     name = 'MutingNotificationTypes1695605508898'
 
diff --git a/packages/backend/migration/1695901659683-note-updated-at.js b/packages/backend/migration/1695901659683-note-updated-at.js
index e828fb1a6f..d8a151a1f7 100644
--- a/packages/backend/migration/1695901659683-note-updated-at.js
+++ b/packages/backend/migration/1695901659683-note-updated-at.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class NoteUpdatedAt1695901659683 {
     name = 'NoteUpdatedAt1695901659683'
 
diff --git a/packages/backend/migration/1696323464251-user-list-membership.js b/packages/backend/migration/1696323464251-user-list-membership.js
index dc1d438dd7..7534040c4c 100644
--- a/packages/backend/migration/1696323464251-user-list-membership.js
+++ b/packages/backend/migration/1696323464251-user-list-membership.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class UserListMembership1696323464251 {
     name = 'UserListMembership1696323464251'
 
diff --git a/packages/backend/migration/1696331570827-hibernation.js b/packages/backend/migration/1696331570827-hibernation.js
index 1487ece77c..119d35913f 100644
--- a/packages/backend/migration/1696331570827-hibernation.js
+++ b/packages/backend/migration/1696331570827-hibernation.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class Hibernation1696331570827 {
     name = 'Hibernation1696331570827'
 
diff --git a/packages/backend/migration/1696332072038-clean.js b/packages/backend/migration/1696332072038-clean.js
index 23dca55fdc..45b7511acc 100644
--- a/packages/backend/migration/1696332072038-clean.js
+++ b/packages/backend/migration/1696332072038-clean.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class Clean1696332072038 {
     name = 'Clean1696332072038'
 
diff --git a/packages/backend/migration/1696604572677-poll-vote-poll.js b/packages/backend/migration/1696604572677-poll-vote-poll.js
index d675b2c454..da52904565 100644
--- a/packages/backend/migration/1696604572677-poll-vote-poll.js
+++ b/packages/backend/migration/1696604572677-poll-vote-poll.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class PollVotePoll1696604572677 {
 		name = 'PollVotePoll1696604572677';
 
diff --git a/packages/backend/migration/1697737204579-deleteCreatedAt.js b/packages/backend/migration/1697737204579-deleteCreatedAt.js
index 59371b8878..8f801e7913 100644
--- a/packages/backend/migration/1697737204579-deleteCreatedAt.js
+++ b/packages/backend/migration/1697737204579-deleteCreatedAt.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 
 export class DeleteCreatedAt1697737204579 {
 		name = 'DeleteCreatedAt1697737204579'
diff --git a/packages/backend/migration/1699432324194-remoteAvaterDecoration.js b/packages/backend/migration/1699432324194-remoteAvaterDecoration.js
index 2daa879228..5b2762b476 100644
--- a/packages/backend/migration/1699432324194-remoteAvaterDecoration.js
+++ b/packages/backend/migration/1699432324194-remoteAvaterDecoration.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class RemoteAvaterDecoration1699432324194 {
 		name = 'RemoteAvaterDecoration1699432324194'
 
diff --git a/packages/backend/migration/1700383825690-hard-mute.js b/packages/backend/migration/1700383825690-hard-mute.js
index 92c3ada4a1..afd3247f5c 100644
--- a/packages/backend/migration/1700383825690-hard-mute.js
+++ b/packages/backend/migration/1700383825690-hard-mute.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class HardMute1700383825690 {
     name = 'HardMute1700383825690'
 
diff --git a/packages/backend/migration/1704185628000-note-updated-at2.js b/packages/backend/migration/1704185628000-note-updated-at2.js
index 92f0e0a142..b3fee061e4 100644
--- a/packages/backend/migration/1704185628000-note-updated-at2.js
+++ b/packages/backend/migration/1704185628000-note-updated-at2.js
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export class NoteUpdatedAt1704185628000 {
     name = 'NoteUpdatedAt1704185628000'
 
diff --git a/packages/backend/migration/1708399372194-per-instance-mod-note.js b/packages/backend/migration/1708399372194-per-instance-mod-note.js
deleted file mode 100644
index 339a4d7af9..0000000000
--- a/packages/backend/migration/1708399372194-per-instance-mod-note.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class PerInstanceModNote1708399372194 {
-    name = 'PerInstanceModNote1708399372194'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "instance" ADD "moderationNote" character varying(16384) NOT NULL DEFAULT ''`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "moderationNote"`);
-    }
-}
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 83e8daedee..ce3a134106 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -19,7 +19,7 @@
 		"watch": "node watch.mjs",
 		"restart": "pnpm build && pnpm start",
 		"dev": "nodemon -w src -e ts,js,mjs,cjs,json --exec \"cross-env NODE_ENV=development pnpm run restart\"",
-		"typecheck": "tsc --noEmit && tsc -p test --noEmit",
+		"typecheck": "tsc --noEmit",
 		"eslint": "eslint --quiet \"src/**/*.ts\"",
 		"lint": "pnpm typecheck && pnpm eslint",
 		"jest": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --forceExit --config jest.config.unit.cjs",
@@ -68,9 +68,9 @@
 	"dependencies": {
 		"@aws-sdk/client-s3": "3.412.0",
 		"@aws-sdk/lib-storage": "3.412.0",
-		"@bull-board/api": "5.14.2",
-		"@bull-board/fastify": "5.14.2",
-		"@bull-board/ui": "5.14.2",
+		"@bull-board/api": "5.14.0",
+		"@bull-board/fastify": "5.14.0",
+		"@bull-board/ui": "5.14.0",
 		"@discordapp/twemoji": "15.0.2",
 		"@fastify/accepts": "4.3.0",
 		"@fastify/cookie": "9.3.1",
@@ -82,13 +82,13 @@
 		"@fastify/view": "8.2.0",
 		"@google-cloud/logging": "^10.5.0",
 		"@google-cloud/translate": "^7.2.1",
-		"@misskey-dev/sharp-read-bmp": "1.2.0",
-		"@misskey-dev/summaly": "5.0.3",
-		"@nestjs/common": "10.3.3",
-		"@nestjs/core": "10.3.3",
-		"@nestjs/testing": "10.3.3",
+		"@misskey-dev/sharp-read-bmp": "^1.1.1",
+		"@misskey-dev/summaly": "^5.0.3",
+		"@nestjs/common": "10.2.10",
+		"@nestjs/core": "10.2.10",
+		"@nestjs/testing": "10.2.10",
 		"@peertube/http-signature": "1.7.0",
-		"@simplewebauthn/server": "9.0.3",
+		"@simplewebauthn/server": "9.0.2",
 		"@sinonjs/fake-timers": "11.2.2",
 		"@smithy/node-http-handler": "2.1.10",
 		"@swc/cli": "0.1.63",
@@ -102,7 +102,7 @@
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
 		"body-parser": "1.20.2",
-		"bullmq": "5.4.0",
+		"bullmq": "5.1.9",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "9.0.2",
 		"chalk": "5.3.0",
@@ -121,11 +121,10 @@
 		"file-type": "19.0.0",
 		"fluent-ffmpeg": "2.1.2",
 		"form-data": "4.0.0",
-		"got": "14.2.0",
+		"got": "14.1.0",
 		"happy-dom": "10.0.3",
 		"hpagent": "1.2.0",
-		"htmlescape": "1.1.1",
-		"http-link-header": "1.1.2",
+		"http-link-header": "1.1.1",
 		"ioredis": "5.3.2",
 		"ip-cidr": "3.1.0",
 		"ipaddr.js": "2.1.0",
@@ -134,16 +133,16 @@
 		"jsdom": "23.2.0",
 		"json5": "2.2.3",
 		"jsonld": "8.3.2",
-		"jsrsasign": "11.1.0",
+		"jsrsasign": "11.0.0",
 		"meilisearch": "0.37.0",
 		"microformats-parser": "2.0.2",
 		"mime-types": "2.1.35",
 		"misskey-reversi": "workspace:*",
 		"ms": "3.0.0-canary.1",
-		"nanoid": "5.0.6",
+		"nanoid": "5.0.4",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.2",
-		"nodemailer": "6.9.10",
+		"nodemailer": "6.9.8",
 		"nsfwjs": "2.4.2",
 		"oauth": "0.10.0",
 		"oauth2orize": "1.12.0",
@@ -163,20 +162,20 @@
 		"ratelimiter": "3.4.1",
 		"re2": "1.20.9",
 		"redis-lock": "0.1.4",
-		"reflect-metadata": "0.2.1",
+		"reflect-metadata": "0.1.14",
 		"rename": "1.0.4",
 		"rss-parser": "3.13.0",
 		"rxjs": "7.8.1",
-		"sanitize-html": "2.12.1",
+		"sanitize-html": "2.11.0",
 		"secure-json-parse": "2.7.0",
-		"sharp": "0.33.2",
+		"sharp": "0.32.6",
 		"slacc": "0.0.10",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
 		"strip-ansi": "^7.1.0",
-		"systeminformation": "5.22.0",
+		"systeminformation": "5.21.24",
 		"tinycolor2": "1.6.0",
-		"tmp": "0.2.2",
+		"tmp": "0.2.1",
 		"tsc-alias": "1.8.8",
 		"tsconfig-paths": "4.2.0",
 		"typeorm": "0.3.20",
@@ -190,7 +189,7 @@
 	"devDependencies": {
 		"@jest/globals": "29.7.0",
 		"@misskey-dev/eslint-plugin": "1.0.0",
-		"@nestjs/platform-express": "10.3.3",
+		"@nestjs/platform-express": "10.3.1",
 		"@simplewebauthn/types": "9.0.1",
 		"@swc/jest": "0.2.31",
 		"@types/accepts": "1.3.7",
@@ -200,7 +199,6 @@
 		"@types/color-convert": "2.0.3",
 		"@types/content-disposition": "0.5.8",
 		"@types/fluent-ffmpeg": "2.1.24",
-		"@types/htmlescape": "^1.1.3",
 		"@types/http-link-header": "1.0.5",
 		"@types/jest": "29.5.11",
 		"@types/js-yaml": "4.0.9",
@@ -209,21 +207,21 @@
 		"@types/jsrsasign": "10.5.12",
 		"@types/mime-types": "2.1.4",
 		"@types/ms": "0.7.34",
-		"@types/node": "20.11.22",
+		"@types/node": "20.11.17",
 		"@types/node-fetch": "3.0.3",
 		"@types/nodemailer": "6.4.14",
 		"@types/oauth": "0.9.4",
 		"@types/oauth2orize": "1.11.3",
 		"@types/oauth2orize-pkce": "0.1.2",
-		"@types/pg": "8.11.2",
+		"@types/pg": "8.11.0",
 		"@types/pug": "2.0.10",
-		"@types/punycode": "2.1.4",
+		"@types/punycode": "2.1.3",
 		"@types/qrcode": "1.5.5",
 		"@types/random-seed": "0.3.5",
 		"@types/ratelimiter": "3.4.6",
 		"@types/rename": "1.0.7",
-		"@types/sanitize-html": "2.11.0",
-		"@types/semver": "7.5.8",
+		"@types/sanitize-html": "2.9.5",
+		"@types/semver": "7.5.6",
 		"@types/simple-oauth2": "5.0.7",
 		"@types/sinonjs__fake-timers": "8.1.5",
 		"@types/tinycolor2": "1.4.6",
@@ -231,17 +229,17 @@
 		"@types/vary": "1.1.3",
 		"@types/web-push": "3.6.3",
 		"@types/ws": "8.5.10",
-		"@typescript-eslint/eslint-plugin": "7.1.0",
-		"@typescript-eslint/parser": "7.1.0",
+		"@typescript-eslint/eslint-plugin": "6.18.1",
+		"@typescript-eslint/parser": "6.18.1",
 		"aws-sdk-client-mock": "3.0.1",
 		"cross-env": "7.0.3",
-		"eslint": "8.57.0",
+		"eslint": "8.56.0",
 		"eslint-plugin-import": "2.29.1",
 		"execa": "8.0.1",
 		"fkill": "^9.0.0",
 		"jest": "29.7.0",
 		"jest-mock": "29.7.0",
-		"nodemon": "3.1.0",
+		"nodemon": "3.0.3",
 		"pid-port": "1.0.0",
 		"simple-oauth2": "5.0.0"
 	}
diff --git a/packages/backend/src/core/AccountMoveService.ts b/packages/backend/src/core/AccountMoveService.ts
index 5bd885df40..b7796a5183 100644
--- a/packages/backend/src/core/AccountMoveService.ts
+++ b/packages/backend/src/core/AccountMoveService.ts
@@ -20,6 +20,7 @@ import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
 import { ApDeliverManagerService } from '@/core/activitypub/ApDeliverManagerService.js';
 import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { CacheService } from '@/core/CacheService.js';
 import { ProxyAccountService } from '@/core/ProxyAccountService.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import { MetaService } from '@/core/MetaService.js';
@@ -59,6 +60,7 @@ export class AccountMoveService {
 		private instanceChart: InstanceChart,
 		private metaService: MetaService,
 		private relayService: RelayService,
+		private cacheService: CacheService,
 		private queueService: QueueService,
 	) {
 	}
@@ -82,7 +84,7 @@ export class AccountMoveService {
 		Object.assign(src, update);
 
 		// Update cache
-		this.globalEventService.publishInternalEvent('localUserUpdated', src);
+		this.cacheService.uriPersonCache.set(srcUri, src);
 
 		const srcPerson = await this.apRendererService.renderPerson(src);
 		const updateAct = this.apRendererService.addContext(this.apRendererService.renderUpdate(srcPerson, src));
diff --git a/packages/backend/src/core/CacheService.ts b/packages/backend/src/core/CacheService.ts
index 9d6074f929..2bafb8ffe2 100644
--- a/packages/backend/src/core/CacheService.ts
+++ b/packages/backend/src/core/CacheService.ts
@@ -137,13 +137,10 @@ export class CacheService implements OnApplicationShutdown {
 			const { type, body } = obj.message as GlobalEvents['internal']['payload'];
 			switch (type) {
 				case 'userChangeSuspendedState':
-				case 'userChangeDeletedState':
-				case 'remoteUserUpdated':
-				case 'localUserUpdated': {
+				case 'remoteUserUpdated': {
 					const user = await this.usersRepository.findOneBy({ id: body.id });
 					if (user == null) {
 						this.userByIdCache.delete(body.id);
-						this.localUserByIdCache.delete(body.id);
 						for (const [k, v] of this.uriPersonCache.cache.entries()) {
 							if (v.value?.id === body.id) {
 								this.uriPersonCache.delete(k);
diff --git a/packages/backend/src/core/ChannelFollowingService.ts b/packages/backend/src/core/ChannelFollowingService.ts
index 12251595e2..75843b9773 100644
--- a/packages/backend/src/core/ChannelFollowingService.ts
+++ b/packages/backend/src/core/ChannelFollowingService.ts
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
 import Redis from 'ioredis';
 import { DI } from '@/di-symbols.js';
diff --git a/packages/backend/src/core/CoreModule.ts b/packages/backend/src/core/CoreModule.ts
index e7edac5add..cda1b641d1 100644
--- a/packages/backend/src/core/CoreModule.ts
+++ b/packages/backend/src/core/CoreModule.ts
@@ -121,7 +121,6 @@ import { FlashEntityService } from './entities/FlashEntityService.js';
 import { FlashLikeEntityService } from './entities/FlashLikeEntityService.js';
 import { RoleEntityService } from './entities/RoleEntityService.js';
 import { ReversiGameEntityService } from './entities/ReversiGameEntityService.js';
-import { MetaEntityService } from './entities/MetaEntityService.js';
 
 import { ApAudienceService } from './activitypub/ApAudienceService.js';
 import { ApDbResolverService } from './activitypub/ApDbResolverService.js';
@@ -266,7 +265,6 @@ const $FlashEntityService: Provider = { provide: 'FlashEntityService', useExisti
 const $FlashLikeEntityService: Provider = { provide: 'FlashLikeEntityService', useExisting: FlashLikeEntityService };
 const $RoleEntityService: Provider = { provide: 'RoleEntityService', useExisting: RoleEntityService };
 const $ReversiGameEntityService: Provider = { provide: 'ReversiGameEntityService', useExisting: ReversiGameEntityService };
-const $MetaEntityService: Provider = { provide: 'MetaEntityService', useExisting: MetaEntityService };
 
 const $ApAudienceService: Provider = { provide: 'ApAudienceService', useExisting: ApAudienceService };
 const $ApDbResolverService: Provider = { provide: 'ApDbResolverService', useExisting: ApDbResolverService };
@@ -412,7 +410,6 @@ const $ApEventService: Provider = { provide: 'ApEventService', useExisting: ApEv
 		FlashLikeEntityService,
 		RoleEntityService,
 		ReversiGameEntityService,
-		MetaEntityService,
 
 		ApAudienceService,
 		ApDbResolverService,
@@ -554,7 +551,6 @@ const $ApEventService: Provider = { provide: 'ApEventService', useExisting: ApEv
 		$FlashLikeEntityService,
 		$RoleEntityService,
 		$ReversiGameEntityService,
-		$MetaEntityService,
 
 		$ApAudienceService,
 		$ApDbResolverService,
@@ -696,7 +692,6 @@ const $ApEventService: Provider = { provide: 'ApEventService', useExisting: ApEv
 		FlashLikeEntityService,
 		RoleEntityService,
 		ReversiGameEntityService,
-		MetaEntityService,
 
 		ApAudienceService,
 		ApDbResolverService,
@@ -837,7 +832,6 @@ const $ApEventService: Provider = { provide: 'ApEventService', useExisting: ApEv
 		$FlashLikeEntityService,
 		$RoleEntityService,
 		$ReversiGameEntityService,
-		$MetaEntityService,
 
 		$ApAudienceService,
 		$ApDbResolverService,
diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts
index bf9458e5f7..c0a7d9a445 100644
--- a/packages/backend/src/core/CustomEmojiService.ts
+++ b/packages/backend/src/core/CustomEmojiService.ts
@@ -396,11 +396,6 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		return this.emojisRepository.findOneBy({ id });
 	}
 
-	@bindThis
-	public getEmojiByName(name: string): Promise<MiEmoji | null> {
-		return this.emojisRepository.findOneBy({ name, host: IsNull() });
-	}
-
 	@bindThis
 	public dispose(): void {
 		this.cache.dispose();
diff --git a/packages/backend/src/core/DeleteAccountService.ts b/packages/backend/src/core/DeleteAccountService.ts
index 79b614edba..fc5d217ae0 100644
--- a/packages/backend/src/core/DeleteAccountService.ts
+++ b/packages/backend/src/core/DeleteAccountService.ts
@@ -9,7 +9,6 @@ import { QueueService } from '@/core/QueueService.js';
 import { UserSuspendService } from '@/core/UserSuspendService.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
-import { GlobalEventService } from '@/core/GlobalEventService.js';
 
 @Injectable()
 export class DeleteAccountService {
@@ -19,7 +18,6 @@ export class DeleteAccountService {
 
 		private userSuspendService: UserSuspendService,
 		private queueService: QueueService,
-		private globalEventService: GlobalEventService,
 	) {
 	}
 
@@ -41,7 +39,5 @@ export class DeleteAccountService {
 		await this.usersRepository.update(user.id, {
 			isDeleted: true,
 		});
-
-		this.globalEventService.publishInternalEvent('userChangeDeletedState', { id: user.id, isDeleted: true });
 	}
 }
diff --git a/packages/backend/src/core/FetchInstanceMetadataService.ts b/packages/backend/src/core/FetchInstanceMetadataService.ts
index 62ae9a9a6c..4336e2a619 100644
--- a/packages/backend/src/core/FetchInstanceMetadataService.ts
+++ b/packages/backend/src/core/FetchInstanceMetadataService.ts
@@ -52,35 +52,21 @@ export class FetchInstanceMetadataService {
 	}
 
 	@bindThis
-	// public for test
-	public async tryLock(host: string): Promise<string | null> {
-		// TODO: マイグレーションなのであとで消す (2024.3.1)
-		this.redisClient.del(`fetchInstanceMetadata:mutex:${host}`);
-
-		return await this.redisClient.set(
-			`fetchInstanceMetadata:mutex:v2:${host}`, '1',
-			'EX', 30, // 30秒したら自動でロック解除 https://github.com/misskey-dev/misskey/issues/13506#issuecomment-1975375395
-			'GET', // 古い値を返す（なかったらnull）
-		);
+	public async tryLock(host: string): Promise<boolean> {
+		const mutex = await this.redisClient.set(`fetchInstanceMetadata:mutex:${host}`, '1', 'GET');
+		return mutex !== '1';
 	}
 
 	@bindThis
-	// public for test
-	public unlock(host: string): Promise<number> {
-		return this.redisClient.del(`fetchInstanceMetadata:mutex:v2:${host}`);
+	public unlock(host: string): Promise<'OK'> {
+		return this.redisClient.set(`fetchInstanceMetadata:mutex:${host}`, '0');
 	}
 
 	@bindThis
 	public async fetchInstanceMetadata(instance: MiInstance, force = false): Promise<void> {
 		const host = instance.host;
-
-		// finallyでunlockされてしまうのでtry内でロックチェックをしない
-		// （returnであってもfinallyは実行される）
-		if (!force && await this.tryLock(host) === '1') {
-			// 1が返ってきていたらロックされているという意味なので、何もしない
-			return;
-		}
-
+		// Acquire mutex to ensure no parallel runs
+		if (!await this.tryLock(host)) return;
 		try {
 			if (!force) {
 				const _instance = await this.federatedInstanceService.fetch(host);
diff --git a/packages/backend/src/core/FileInfoService.ts b/packages/backend/src/core/FileInfoService.ts
index b8babcb3a7..b177367a16 100644
--- a/packages/backend/src/core/FileInfoService.ts
+++ b/packages/backend/src/core/FileInfoService.ts
@@ -15,7 +15,6 @@ import isSvg from 'is-svg';
 import probeImageSize from 'probe-image-size';
 import { type predictionType } from 'nsfwjs';
 import sharp from 'sharp';
-import { sharpBmp } from '@misskey-dev/sharp-read-bmp';
 import { encode } from 'blurhash';
 import { createTempDir } from '@/misc/create-temp.js';
 import { AiService } from '@/core/AiService.js';
@@ -123,7 +122,7 @@ export class FileInfoService {
 			'image/avif',
 			'image/svg+xml',
 		].includes(type.mime)) {
-			blurhash = await this.getBlurhash(path, type.mime).catch(e => {
+			blurhash = await this.getBlurhash(path).catch(e => {
 				warnings.push(`getBlurhash failed: ${e}`);
 				return undefined;
 			});
@@ -408,9 +407,9 @@ export class FileInfoService {
 	 * Calculate average color of image
 	 */
 	@bindThis
-	private getBlurhash(path: string, type: string): Promise<string> {
-		return new Promise(async (resolve, reject) => {
-			(await sharpBmp(path, type))
+	private getBlurhash(path: string): Promise<string> {
+		return new Promise((resolve, reject) => {
+			sharp(path)
 				.raw()
 				.ensureAlpha()
 				.resize(64, 64, { fit: 'inside' })
diff --git a/packages/backend/src/core/GlobalEventService.ts b/packages/backend/src/core/GlobalEventService.ts
index bcbf782933..2454c0fec2 100644
--- a/packages/backend/src/core/GlobalEventService.ts
+++ b/packages/backend/src/core/GlobalEventService.ts
@@ -71,7 +71,6 @@ export interface MainEventTypes {
 		file: Packed<'DriveFile'>;
 	};
 	readAllNotifications: undefined;
-	notificationFlushed: undefined;
 	unreadNotification: Packed<'Notification'>;
 	unreadMention: MiNote['id'];
 	readAllUnreadMentions: undefined;
@@ -241,10 +240,8 @@ type SerializedAll<T> = {
 
 export interface InternalEventTypes {
 	userChangeSuspendedState: { id: MiUser['id']; isSuspended: MiUser['isSuspended']; };
-	userChangeDeletedState: { id: MiUser['id']; isDeleted: MiUser['isDeleted']; };
 	userTokenRegenerated: { id: MiUser['id']; oldToken: string; newToken: string; };
 	remoteUserUpdated: { id: MiUser['id']; };
-	localUserUpdated: { id: MiUser['id']; };
 	follow: { followerId: MiUser['id']; followeeId: MiUser['id']; };
 	unfollow: { followerId: MiUser['id']; followeeId: MiUser['id']; };
 	blockingCreated: { blockerId: MiUser['id']; blockeeId: MiUser['id']; };
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 7d1b07b902..c3122ca42d 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -61,8 +61,6 @@ import { UtilityService } from '@/core/UtilityService.js';
 import { UserBlockingService } from '@/core/UserBlockingService.js';
 import { isReply } from '@/misc/is-reply.js';
 import { trackPromise } from '@/misc/promise-tracker.js';
-import { isNotNull } from '@/misc/is-not-null.js';
-import { IdentifiableError } from '@/misc/identifiable-error.js';
 
 type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
 
@@ -158,6 +156,8 @@ type Option = {
 export class NoteCreateService implements OnApplicationShutdown {
 	#shutdownController = new AbortController();
 
+	public static ContainsProhibitedWordsError = class extends Error {};
+
 	constructor(
 		@Inject(DI.config)
 		private config: Config,
@@ -269,14 +269,8 @@ export class NoteCreateService implements OnApplicationShutdown {
 			}
 		}
 
-		const hasProhibitedWords = await this.checkProhibitedWordsContain({
-			cw: data.cw,
-			text: data.text,
-			pollChoices: data.poll?.choices,
-		}, meta.prohibitedWords);
-
-		if (hasProhibitedWords) {
-			throw new IdentifiableError('689ee33f-f97c-479a-ac49-1b9f8140af99', 'Note contains prohibited words');
+		if (this.utilityService.isKeyWordIncluded(data.cw ?? data.text ?? '', meta.prohibitedWords)) {
+			throw new NoteCreateService.ContainsProhibitedWordsError();
 		}
 
 		const inSilencedInstance = this.utilityService.isSilencedHost(meta.silencedHosts, user.host);
@@ -391,10 +385,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 			}
 		}
 
-		if (mentionedUsers.length > 0 && mentionedUsers.length > (await this.roleService.getUserPolicies(user.id)).mentionLimit) {
-			throw new IdentifiableError('9f466dab-c856-48cd-9e65-ff90ff750580', 'Note contains too many mentions');
-		}
-
 		const note = await this.insertNote(user, data, tags, emojis, mentionedUsers);
 
 		setImmediate('post created', { signal: this.#shutdownController.signal }).then(
@@ -852,7 +842,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		const mentions = extractMentions(tokens);
 		let mentionedUsers = (await Promise.all(mentions.map(m =>
 			this.remoteUserResolveService.resolveUser(m.username, m.host ?? user.host).catch(() => null),
-		))).filter(isNotNull);
+		))).filter(x => x != null) as MiUser[];
 
 		// Drop duplicate users
 		mentionedUsers = mentionedUsers.filter((u, i, self) =>
@@ -1026,23 +1016,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 		}
 	}
 
-	public async checkProhibitedWordsContain(content: Parameters<UtilityService['concatNoteContentsForKeyWordCheck']>[0], prohibitedWords?: string[]) {
-		if (prohibitedWords == null) {
-			prohibitedWords = (await this.metaService.fetch()).prohibitedWords;
-		}
-
-		if (
-			this.utilityService.isKeyWordIncluded(
-				this.utilityService.concatNoteContentsForKeyWordCheck(content),
-				prohibitedWords,
-			)
-		) {
-			return true;
-		}
-
-		return false;
-	}
-
 	@bindThis
 	public dispose(): void {
 		this.#shutdownController.abort();
diff --git a/packages/backend/src/core/NoteReadService.ts b/packages/backend/src/core/NoteReadService.ts
index 181c9f7649..feef024602 100644
--- a/packages/backend/src/core/NoteReadService.ts
+++ b/packages/backend/src/core/NoteReadService.ts
@@ -88,47 +88,46 @@ export class NoteReadService implements OnApplicationShutdown {
 		userId: MiUser['id'],
 		notes: (MiNote | Packed<'Note'>)[],
 	): Promise<void> {
-		if (notes.length === 0) return;
-
-		const noteIds = new Set<MiNote['id']>();
+		const readMentions: (MiNote | Packed<'Note'>)[] = [];
+		const readSpecifiedNotes: (MiNote | Packed<'Note'>)[] = [];
 
 		for (const note of notes) {
 			if (note.mentions && note.mentions.includes(userId)) {
-				noteIds.add(note.id);
+				readMentions.push(note);
 			} else if (note.visibleUserIds && note.visibleUserIds.includes(userId)) {
-				noteIds.add(note.id);
+				readSpecifiedNotes.push(note);
 			}
 		}
 
-		if (noteIds.size === 0) return;
-
-		// Remove the record
-		await this.noteUnreadsRepository.delete({
-			userId: userId,
-			noteId: In(Array.from(noteIds)),
-		});
+		if ((readMentions.length > 0) || (readSpecifiedNotes.length > 0)) {
+			// Remove the record
+			await this.noteUnreadsRepository.delete({
+				userId: userId,
+				noteId: In([...readMentions.map(n => n.id), ...readSpecifiedNotes.map(n => n.id)]),
+			});
 
-		// TODO: ↓まとめてクエリしたい
+			// TODO: ↓まとめてクエリしたい
 
-		trackPromise(this.noteUnreadsRepository.countBy({
-			userId: userId,
-			isMentioned: true,
-		}).then(mentionsCount => {
-			if (mentionsCount === 0) {
-				// 全て既読になったイベントを発行
-				this.globalEventService.publishMainStream(userId, 'readAllUnreadMentions');
-			}
-		}));
-
-		trackPromise(this.noteUnreadsRepository.countBy({
-			userId: userId,
-			isSpecified: true,
-		}).then(specifiedCount => {
-			if (specifiedCount === 0) {
-				// 全て既読になったイベントを発行
-				this.globalEventService.publishMainStream(userId, 'readAllUnreadSpecifiedNotes');
-			}
-		}));
+			trackPromise(this.noteUnreadsRepository.countBy({
+				userId: userId,
+				isMentioned: true,
+			}).then(mentionsCount => {
+				if (mentionsCount === 0) {
+					// 全て既読になったイベントを発行
+					this.globalEventService.publishMainStream(userId, 'readAllUnreadMentions');
+				}
+			}));
+
+			trackPromise(this.noteUnreadsRepository.countBy({
+				userId: userId,
+				isSpecified: true,
+			}).then(specifiedCount => {
+				if (specifiedCount === 0) {
+					// 全て既読になったイベントを発行
+					this.globalEventService.publishMainStream(userId, 'readAllUnreadSpecifiedNotes');
+				}
+			}));
+		}
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/NotificationService.ts b/packages/backend/src/core/NotificationService.ts
index 68ad92f396..ee16193579 100644
--- a/packages/backend/src/core/NotificationService.ts
+++ b/packages/backend/src/core/NotificationService.ts
@@ -122,14 +122,6 @@ export class NotificationService implements OnApplicationShutdown {
 					return null;
 				}
 			} else if (recieveConfig?.type === 'mutualFollow') {
-				const [isFollowing, isFollower] = await Promise.all([
-					this.cacheService.userFollowingsCache.fetch(notifieeId).then(followings => Object.hasOwn(followings, notifierId)),
-					this.cacheService.userFollowingsCache.fetch(notifierId).then(followings => Object.hasOwn(followings, notifieeId)),
-				]);
-				if (!(isFollowing && isFollower)) {
-					return null;
-				}
-			} else if (recieveConfig?.type === 'followingOrFollower') {
 				const [isFollowing, isFollower] = await Promise.all([
 					this.cacheService.userFollowingsCache.fetch(notifieeId).then(followings => Object.hasOwn(followings, notifierId)),
 					this.cacheService.userFollowingsCache.fetch(notifierId).then(followings => Object.hasOwn(followings, notifieeId)),
@@ -163,8 +155,6 @@ export class NotificationService implements OnApplicationShutdown {
 
 		const packed = await this.notificationEntityService.pack(notification, notifieeId, {});
 
-		if (packed == null) return null;
-
 		// Publish notification event
 		this.globalEventService.publishMainStream(notifieeId, 'notification', packed);
 
@@ -214,15 +204,6 @@ export class NotificationService implements OnApplicationShutdown {
 		*/
 	}
 
-	@bindThis
-	public async flushAllNotifications(userId: MiUser['id']) {
-		await Promise.all([
-			this.redisClient.del(`notificationTimeline:${userId}`),
-			this.redisClient.del(`latestReadNotification:${userId}`),
-		]);
-		this.globalEventService.publishMainStream(userId, 'notificationFlushed');
-	}
-
 	@bindThis
 	public dispose(): void {
 		this.#shutdownController.abort();
diff --git a/packages/backend/src/core/PushNotificationService.ts b/packages/backend/src/core/PushNotificationService.ts
index 8fec150a56..6ccf56e630 100644
--- a/packages/backend/src/core/PushNotificationService.ts
+++ b/packages/backend/src/core/PushNotificationService.ts
@@ -120,19 +120,12 @@ export class PushNotificationService implements OnApplicationShutdown {
 						endpoint: subscription.endpoint,
 						auth: subscription.auth,
 						publickey: subscription.publickey,
-					}).then(() => {
-						this.refreshCache(userId);
 					});
 				}
 			});
 		}
 	}
 
-	@bindThis
-	public refreshCache(userId: string): void {
-		this.subscriptionsCache.refresh(userId);
-	}
-
 	@bindThis
 	public dispose(): void {
 		this.subscriptionsCache.dispose();
diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index cb0b079df0..5014156a5c 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -322,36 +322,35 @@ export class ReactionService {
 		//#endregion
 	}
 
-	/**
-	 * 文字列タイプのレガシーな形式のリアクションを現在の形式に変換しつつ、
-	 * データベース上には存在する「0個のリアクションがついている」という情報を削除する。
-	 */
 	@bindThis
-	public convertLegacyReactions(reactions: MiNote['reactions']): MiNote['reactions'] {
-		return Object.entries(reactions)
-			.filter(([, count]) => {
-				// `ReactionService.prototype.delete`ではリアクション削除時に、
-				// `MiNote['reactions']`のエントリの値をデクリメントしているが、
-				// デクリメントしているだけなのでエントリ自体は0を値として持つ形で残り続ける。
-				// そのため、この処理がなければ、「0個のリアクションがついている」ということになってしまう。
-				return count > 0;
-			})
-			.map(([reaction, count]) => {
-				// unchecked indexed access
-				const convertedReaction = legacies[reaction] as string | undefined;
+	public convertLegacyReactions(reactions: Record<string, number>) {
+		const _reactions = {} as Record<string, number>;
 
-				const key = this.decodeReaction(convertedReaction ?? reaction).reaction;
+		for (const reaction of Object.keys(reactions)) {
+			if (reactions[reaction] <= 0) continue;
 
-				return [key, count] as const;
-			})
-			.reduce<MiNote['reactions']>((acc, [key, count]) => {
-				// unchecked indexed access
-				const prevCount = acc[key] as number | undefined;
+			if (Object.keys(legacies).includes(reaction)) {
+				if (_reactions[legacies[reaction]]) {
+					_reactions[legacies[reaction]] += reactions[reaction];
+				} else {
+					_reactions[legacies[reaction]] = reactions[reaction];
+				}
+			} else {
+				if (_reactions[reaction]) {
+					_reactions[reaction] += reactions[reaction];
+				} else {
+					_reactions[reaction] = reactions[reaction];
+				}
+			}
+		}
+
+		const _reactions2 = {} as Record<string, number>;
 
-				acc[key] = (prevCount ?? 0) + count;
+		for (const reaction of Object.keys(_reactions)) {
+			_reactions2[this.decodeReaction(reaction).reaction] = _reactions[reaction];
+		}
 
-				return acc;
-			}, {});
+		return _reactions2;
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts
index 9181dafaf3..813a715996 100644
--- a/packages/backend/src/core/RoleService.ts
+++ b/packages/backend/src/core/RoleService.ts
@@ -36,7 +36,6 @@ export type RolePolicies = {
 	ltlAvailable: boolean;
 	canPublicNote: boolean;
 	canEditNote: boolean;
-	mentionLimit: number;
 	canInvite: boolean;
 	inviteLimit: number;
 	inviteLimitCycle: number;
@@ -65,7 +64,6 @@ export const DEFAULT_POLICIES: RolePolicies = {
 	ltlAvailable: true,
 	canPublicNote: true,
 	canEditNote: true,
-	mentionLimit: 20,
 	canInvite: false,
 	inviteLimit: 0,
 	inviteLimitCycle: 60 * 24 * 7,
@@ -204,20 +202,17 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 	}
 
 	@bindThis
-	private evalCond(user: MiUser, roles: MiRole[], value: RoleCondFormulaValue): boolean {
+	private evalCond(user: MiUser, value: RoleCondFormulaValue): boolean {
 		try {
 			switch (value.type) {
 				case 'and': {
-					return value.values.every(v => this.evalCond(user, roles, v));
+					return value.values.every(v => this.evalCond(user, v));
 				}
 				case 'or': {
-					return value.values.some(v => this.evalCond(user, roles, v));
+					return value.values.some(v => this.evalCond(user, v));
 				}
 				case 'not': {
-					return !this.evalCond(user, roles, value.value);
-				}
-				case 'roleAssignedTo': {
-					return roles.some(r => r.id === value.roleId);
+					return !this.evalCond(user, value.value);
 				}
 				case 'isLocal': {
 					return this.userEntityService.isLocalUser(user);
@@ -279,7 +274,7 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 		const assigns = await this.getUserAssigns(userId);
 		const assignedRoles = roles.filter(r => assigns.map(x => x.roleId).includes(r.id));
 		const user = roles.some(r => r.target === 'conditional') ? await this.cacheService.findUserById(userId) : null;
-		const matchedCondRoles = roles.filter(r => r.target === 'conditional' && this.evalCond(user!, assignedRoles, r.condFormula));
+		const matchedCondRoles = roles.filter(r => r.target === 'conditional' && this.evalCond(user!, r.condFormula));
 		return [...assignedRoles, ...matchedCondRoles];
 	}
 
@@ -292,13 +287,13 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 		let assigns = await this.roleAssignmentByUserIdCache.fetch(userId, () => this.roleAssignmentsRepository.findBy({ userId }));
 		// 期限切れのロールを除外
 		assigns = assigns.filter(a => a.expiresAt == null || (a.expiresAt.getTime() > now));
+		const assignedRoleIds = assigns.map(x => x.roleId);
 		const roles = await this.rolesCache.fetch(() => this.rolesRepository.findBy({}));
-		const assignedRoles = roles.filter(r => assigns.map(x => x.roleId).includes(r.id));
-		const assignedBadgeRoles = assignedRoles.filter(r => r.asBadge);
+		const assignedBadgeRoles = roles.filter(r => r.asBadge && assignedRoleIds.includes(r.id));
 		const badgeCondRoles = roles.filter(r => r.asBadge && (r.target === 'conditional'));
 		if (badgeCondRoles.length > 0) {
 			const user = roles.some(r => r.target === 'conditional') ? await this.cacheService.findUserById(userId) : null;
-			const matchedBadgeCondRoles = badgeCondRoles.filter(r => this.evalCond(user!, assignedRoles, r.condFormula));
+			const matchedBadgeCondRoles = badgeCondRoles.filter(r => this.evalCond(user!, r.condFormula));
 			return [...assignedBadgeRoles, ...matchedBadgeCondRoles];
 		} else {
 			return assignedBadgeRoles;
@@ -333,7 +328,6 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 			ltlAvailable: calc('ltlAvailable', vs => vs.some(v => v === true)),
 			canPublicNote: calc('canPublicNote', vs => vs.some(v => v === true)),
 			canEditNote: calc('canEditNote', vs => vs.some(v => v === true)),
-			mentionLimit: calc('mentionLimit', vs => Math.max(...vs)),
 			canInvite: calc('canInvite', vs => vs.some(v => v === true)),
 			inviteLimit: calc('inviteLimit', vs => Math.max(...vs)),
 			inviteLimitCycle: calc('inviteLimitCycle', vs => Math.max(...vs)),
diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts
index deeecdeb1f..8ad85391c6 100644
--- a/packages/backend/src/core/UserFollowingService.ts
+++ b/packages/backend/src/core/UserFollowingService.ts
@@ -30,7 +30,6 @@ import type { Config } from '@/config.js';
 import { AccountMoveService } from '@/core/AccountMoveService.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { FanoutTimelineService } from '@/core/FanoutTimelineService.js';
-import type { ThinUser } from '@/queue/types.js';
 import Logger from '../logger.js';
 
 const logger = new Logger('following/create');
@@ -95,35 +94,21 @@ export class UserFollowingService implements OnModuleInit {
 		this.userBlockingService = this.moduleRef.get('UserBlockingService');
 	}
 
-	@bindThis
-	public async deliverAccept(follower: MiRemoteUser, followee: MiPartialLocalUser, requestId?: string) {
-		const content = this.apRendererService.addContext(this.apRendererService.renderAccept(this.apRendererService.renderFollow(follower, followee, requestId), followee));
-		this.queueService.deliver(followee, content, follower.inbox, false);
-	}
-
 	@bindThis
 	public async follow(
-		_follower: ThinUser,
-		_followee: ThinUser,
+		_follower: { id: MiUser['id'] },
+		_followee: { id: MiUser['id'] },
 		{ requestId, silent = false, withReplies }: {
 			requestId?: string,
 			silent?: boolean,
 			withReplies?: boolean,
 		} = {},
 	): Promise<void> {
-		/**
-		 * 必ず最新のユーザー情報を取得する
-		 */
 		const [follower, followee] = await Promise.all([
 			this.usersRepository.findOneByOrFail({ id: _follower.id }),
 			this.usersRepository.findOneByOrFail({ id: _followee.id }),
 		]) as [MiLocalUser | MiRemoteUser, MiLocalUser | MiRemoteUser];
 
-		if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isRemoteUser(followee)) {
-			// What?
-			throw new Error('Remote user cannot follow remote user.');
-		}
-
 		// check blocking
 		const [blocking, blocked] = await Promise.all([
 			this.userBlockingService.checkBlocked(follower.id, followee.id),
@@ -144,24 +129,6 @@ export class UserFollowingService implements OnModuleInit {
 			if (blocked) throw new IdentifiableError('3338392a-f764-498d-8855-db939dcf8c48', 'blocked');
 		}
 
-		if (await this.followingsRepository.exists({
-			where: {
-				followerId: follower.id,
-				followeeId: followee.id,
-			},
-		})) {
-			// すでにフォロー関係が存在している場合
-			if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
-				// リモート → ローカル: acceptを送り返しておしまい
-				this.deliverAccept(follower, followee, requestId);
-				return;
-			}
-			if (this.userEntityService.isLocalUser(follower)) {
-				// ローカル → リモート/ローカル: 例外
-				throw new IdentifiableError('ec3f65c0-a9d1-47d9-8791-b2e7b9dcdced', 'already following');
-			}
-		}
-
 		const followeeProfile = await this.userProfilesRepository.findOneByOrFail({ userId: followee.id });
 		// フォロー対象が鍵アカウントである or
 		// フォロワーがBotであり、フォロー対象がBotからのフォローに慎重である or
@@ -222,7 +189,8 @@ export class UserFollowingService implements OnModuleInit {
 		await this.insertFollowingDoc(followee, follower, silent, withReplies);
 
 		if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
-			this.deliverAccept(follower, followee, requestId);
+			const content = this.apRendererService.addContext(this.apRendererService.renderAccept(this.apRendererService.renderFollow(follower, followee, requestId), followee));
+			this.queueService.deliver(followee, content, follower.inbox, false);
 		}
 	}
 
@@ -511,12 +479,6 @@ export class UserFollowingService implements OnModuleInit {
 		if (blocking) throw new Error('blocking');
 		if (blocked) throw new Error('blocked');
 
-		// Remove old follow requests before creating a new one.
-		await this.followRequestsRepository.delete({
-			followeeId: followee.id,
-			followerId: follower.id,
-		});
-
 		const followRequest = await this.followRequestsRepository.insert({
 			id: this.idService.gen(),
 			followerId: follower.id,
@@ -609,7 +571,8 @@ export class UserFollowingService implements OnModuleInit {
 		await this.insertFollowingDoc(followee, follower, false, request.withReplies);
 
 		if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
-			this.deliverAccept(follower, followee as MiPartialLocalUser, request.requestId ?? undefined);
+			const content = this.apRendererService.addContext(this.apRendererService.renderAccept(this.apRendererService.renderFollow(follower, followee as MiPartialLocalUser, request.requestId!), followee));
+			this.queueService.deliver(followee, content, follower.inbox, false);
 		}
 
 		this.userEntityService.pack(followee.id, followee, {
diff --git a/packages/backend/src/core/UtilityService.ts b/packages/backend/src/core/UtilityService.ts
index 652e8f7449..638a0c019e 100644
--- a/packages/backend/src/core/UtilityService.ts
+++ b/packages/backend/src/core/UtilityService.ts
@@ -42,20 +42,6 @@ export class UtilityService {
 		return silencedHosts.some(x => `.${host.toLowerCase()}`.endsWith(`.${x}`));
 	}
 
-	@bindThis
-	public concatNoteContentsForKeyWordCheck(content: {
-		cw?: string | null;
-		text?: string | null;
-		pollChoices?: string[] | null;
-		others?: string[] | null;
-	}): string {
-		/**
-		 * ノートの内容を結合してキーワードチェック用の文字列を生成する
-		 * cwとtextは内容が繋がっているかもしれないので間に何も入れずにチェックする
-		 */
-		return `${content.cw ?? ''}${content.text ?? ''}\n${(content.pollChoices ?? []).join('\n')}\n${(content.others ?? []).join('\n')}`;
-	}
-
 	@bindThis
 	public isKeyWordIncluded(text: string, keyWords: string[]): boolean {
 		if (keyWords.length === 0) return false;
diff --git a/packages/backend/src/core/WebAuthnService.ts b/packages/backend/src/core/WebAuthnService.ts
index 42fbed2110..4d11865906 100644
--- a/packages/backend/src/core/WebAuthnService.ts
+++ b/packages/backend/src/core/WebAuthnService.ts
@@ -191,7 +191,7 @@ export class WebAuthnService {
 			if (cert[0] === 0x04) { // 前の実装ではいつも 0x04 で始まっていた
 				const halfLength = (cert.length - 1) / 2;
 
-				const cborMap = new Map<number, number | Uint8Array>();
+				const cborMap = new Map<number, number | ArrayBufferLike>();
 				cborMap.set(1, 2); // kty, EC2
 				cborMap.set(3, -7); // alg, ES256
 				cborMap.set(-1, 1); // crv, P256
diff --git a/packages/backend/src/core/activitypub/ApAudienceService.ts b/packages/backend/src/core/activitypub/ApAudienceService.ts
index 0fccc7b950..d47be79441 100644
--- a/packages/backend/src/core/activitypub/ApAudienceService.ts
+++ b/packages/backend/src/core/activitypub/ApAudienceService.ts
@@ -8,7 +8,6 @@ import promiseLimit from 'promise-limit';
 import type { MiRemoteUser, MiUser } from '@/models/User.js';
 import { concat, unique } from '@/misc/prelude/array.js';
 import { bindThis } from '@/decorators.js';
-import { isNotNull } from '@/misc/is-not-null.js';
 import { getApIds } from './type.js';
 import { ApPersonService } from './models/ApPersonService.js';
 import type { ApObject } from './type.js';
@@ -41,7 +40,7 @@ export class ApAudienceService {
 		const limit = promiseLimit<MiUser | null>(2);
 		const mentionedUsers = (await Promise.all(
 			others.map(id => limit(() => this.apPersonService.resolvePerson(id, resolver).catch(() => null))),
-		)).filter(isNotNull);
+		)).filter((x): x is MiUser => x != null);
 
 		if (toGroups.public.length > 0) {
 			return {
diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts
index f7edb3fbc1..5c9d9d90da 100644
--- a/packages/backend/src/core/activitypub/ApInboxService.ts
+++ b/packages/backend/src/core/activitypub/ApInboxService.ts
@@ -29,8 +29,6 @@ import { MessagingService } from '@/core/MessagingService.js';
 import type { UsersRepository, NotesRepository, FollowingsRepository, MessagingMessagesRepository, AbuseUserReportsRepository, FollowRequestsRepository } from '@/models/_.js';
 import { bindThis } from '@/decorators.js';
 import type { MiRemoteUser } from '@/models/User.js';
-import { isNotNull } from '@/misc/is-not-null.js';
-import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { getApHrefNullable, getApId, getApIds, getApType, isAccept, isActor, isAdd, isAnnounce, isBlock, isCollection, isCollectionOrOrderedCollection, isCreate, isDelete, isFlag, isFollow, isLike, isMove, isPost, isRead, isReject, isRemove, isTombstone, isUndo, isUpdate, validActor, validPost } from './type.js';
 import { ApNoteService } from './models/ApNoteService.js';
 import { ApLoggerService } from './ApLoggerService.js';
@@ -39,6 +37,8 @@ import { ApResolverService } from './ApResolverService.js';
 import { ApAudienceService } from './ApAudienceService.js';
 import { ApPersonService } from './models/ApPersonService.js';
 import { ApQuestionService } from './models/ApQuestionService.js';
+import { CacheService } from '@/core/CacheService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
 import type { Resolver } from './ApResolverService.js';
 import type { IAccept, IAdd, IAnnounce, IBlock, ICreate, IDelete, IFlag, IFollow, ILike, IObject, IRead, IReject, IRemove, IUndo, IUpdate, IMove } from './type.js';
 
@@ -90,6 +90,7 @@ export class ApInboxService {
 		private apPersonService: ApPersonService,
 		private apQuestionService: ApQuestionService,
 		private queueService: QueueService,
+		private cacheService: CacheService,
 		private globalEventService: GlobalEventService,
 		private messagingService: MessagingService,
 	) {
@@ -574,7 +575,7 @@ export class ApInboxService {
 		const userIds = uris
 			.filter(uri => uri.startsWith(this.config.url + '/users/'))
 			.map(uri => uri.split('/').at(-1))
-			.filter(isNotNull);
+			.filter((userId): userId is string => userId !== undefined);
 		const users = await this.usersRepository.findBy({
 			id: In(userIds),
 		});
diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts
index 75d5a47c4c..a53e880586 100644
--- a/packages/backend/src/core/activitypub/ApRendererService.ts
+++ b/packages/backend/src/core/activitypub/ApRendererService.ts
@@ -320,7 +320,7 @@ export class ApRendererService {
 		const getPromisedFiles = async (ids: string[]): Promise<MiDriveFile[]> => {
 			if (ids.length === 0) return [];
 			const items = await this.driveFilesRepository.findBy({ id: In(ids) });
-			return ids.map(id => items.find(item => item.id === id)).filter(isNotNull);
+			return ids.map(id => items.find(item => item.id === id)).filter((item): item is MiDriveFile => item != null);
 		};
 
 		let inReplyTo;
diff --git a/packages/backend/src/core/activitypub/models/ApMentionService.ts b/packages/backend/src/core/activitypub/models/ApMentionService.ts
index 0ced7e88af..73eea1edf0 100644
--- a/packages/backend/src/core/activitypub/models/ApMentionService.ts
+++ b/packages/backend/src/core/activitypub/models/ApMentionService.ts
@@ -8,7 +8,6 @@ import promiseLimit from 'promise-limit';
 import type { MiUser } from '@/models/_.js';
 import { toArray, unique } from '@/misc/prelude/array.js';
 import { bindThis } from '@/decorators.js';
-import { isNotNull } from '@/misc/is-not-null.js';
 import { isMention } from '../type.js';
 import { Resolver } from '../ApResolverService.js';
 import { ApPersonService } from './ApPersonService.js';
@@ -28,7 +27,7 @@ export class ApMentionService {
 		const limit = promiseLimit<MiUser | null>(2);
 		const mentionedUsers = (await Promise.all(
 			hrefs.map(x => limit(() => this.apPersonService.resolvePerson(x, resolver).catch(() => null))),
-		)).filter(isNotNull);
+		)).filter((x): x is MiUser => x != null);
 
 		return mentionedUsers;
 	}
diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
index 6351528cd2..15eb16dd33 100644
--- a/packages/backend/src/core/activitypub/models/ApNoteService.ts
+++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -26,9 +26,7 @@ import { MessagingService } from '@/core/MessagingService.js';
 import { bindThis } from '@/decorators.js';
 import { checkHttps } from '@/misc/check-https.js';
 import { NoteUpdateService } from '@/core/NoteUpdateService.js';
-import { IdentifiableError } from '@/misc/identifiable-error.js';
-import { isNotNull } from '@/misc/is-not-null.js';
-import { getOneApId, getApId, getOneApHrefNullable, validPost, isEmoji, getApType } from '../type.js';
+import { getApId, getApType, getOneApHrefNullable, getOneApId, isEmoji, validPost } from '../type.js';
 import { ApLoggerService } from '../ApLoggerService.js';
 import { ApMfmService } from '../ApMfmService.js';
 import { ApDbResolverService } from '../ApDbResolverService.js';
@@ -141,7 +139,7 @@ export class ApNoteService {
 				value,
 				object,
 			});
-			throw err;
+			throw new Error('invalid note');
 		}
 
 		const note = object as IPost;
@@ -165,47 +163,11 @@ export class ApNoteService {
 			throw new Error('invalid note.attributedTo: ' + note.attributedTo);
 		}
 
-		const uri = getOneApId(note.attributedTo);
-
-		// ローカルで投稿者を検索し、もし凍結されていたらスキップ
-		const cachedActor = await this.apPersonService.fetchPerson(uri) as MiRemoteUser;
-		if (cachedActor && cachedActor.isSuspended) {
-			throw new IdentifiableError('85ab9bd7-3a41-4530-959d-f07073900109', 'actor has been suspended');
-		}
-
-		const apMentions = await this.apMentionService.extractApMentions(note.tag, resolver);
-		const apHashtags = extractApHashtags(note.tag);
-
-		const cw = note.summary === '' ? null : note.summary;
-
-		// テキストのパース
-		let text: string | null = null;
-		if (note.source?.mediaType === 'text/x.misskeymarkdown' && typeof note.source.content === 'string') {
-			text = note.source.content;
-		} else if (typeof note._misskey_content !== 'undefined') {
-			text = note._misskey_content;
-		} else if (typeof note.content === 'string') {
-			text = this.apMfmService.htmlToMfm(note.content, note.tag);
-		}
-
-		const poll = await this.apQuestionService.extractPollFromQuestion(note, resolver).catch(() => undefined);
-
-		//#region Contents Check
-		// 添付ファイルとユーザーをこのサーバーで登録する前に内容をチェックする
-		/**
-		 * 禁止ワードチェック
-		 */
-		const hasProhibitedWords = await this.noteCreateService.checkProhibitedWordsContain({ cw, text, pollChoices: poll?.choices });
-		if (hasProhibitedWords) {
-			throw new IdentifiableError('689ee33f-f97c-479a-ac49-1b9f8140af99', 'Note contains prohibited words');
-		}
-		//#endregion
-
-		const actor = cachedActor ?? await this.apPersonService.resolvePerson(uri, resolver) as MiRemoteUser;
+		const actor = await this.apPersonService.resolvePerson(getOneApId(note.attributedTo), resolver) as MiRemoteUser;
 
-		// 解決した投稿者が凍結されていたらスキップ
+		// 投稿者が凍結されていたらスキップ
 		if (actor.isSuspended) {
-			throw new IdentifiableError('85ab9bd7-3a41-4530-959d-f07073900109', 'actor has been suspended');
+			throw new Error('actor has been suspended');
 		}
 
 		const noteAudience = await this.apAudienceService.parseAudience(actor, note.to, note.cc, resolver);
@@ -222,6 +184,9 @@ export class ApNoteService {
 
 		let isMessaging = note._misskey_talk && visibility === 'specified';
 
+		const apMentions = await this.apMentionService.extractApMentions(note.tag, resolver);
+		const apHashtags = extractApHashtags(note.tag);
+
 		// 添付ファイル
 		// TODO: attachmentは必ずしもImageではない
 		// TODO: attachmentは必ずしも配列ではない
@@ -281,7 +246,7 @@ export class ApNoteService {
 				}
 			};
 
-			const uris = unique([note._misskey_quote, note.quoteUrl].filter(isNotNull));
+			const uris = unique([note._misskey_quote, note.quoteUrl].filter((x): x is string => typeof x === 'string'));
 			const results = await Promise.all(uris.map(tryResolveNote));
 
 			quote = results.filter((x): x is { status: 'ok', res: MiNote } => x.status === 'ok').map(x => x.res).at(0);
@@ -292,6 +257,18 @@ export class ApNoteService {
 			}
 		}
 
+		const cw = note.summary === '' ? null : note.summary;
+
+		// テキストのパース
+		let text: string | null = null;
+		if (note.source?.mediaType === 'text/x.misskeymarkdown' && typeof note.source.content === 'string') {
+			text = note.source.content;
+		} else if (typeof note._misskey_content !== 'undefined') {
+			text = note._misskey_content;
+		} else if (typeof note.content === 'string') {
+			text = this.apMfmService.htmlToMfm(note.content, note.tag);
+		}
+
 		// vote
 		if (reply && reply.hasPoll) {
 			const poll = await this.pollsRepository.findOneByOrFail({ noteId: reply.id });
@@ -321,6 +298,7 @@ export class ApNoteService {
 
 		const apEmojis = emojis.map(emoji => emoji.name);
 
+		const poll = await this.apQuestionService.extractPollFromQuestion(note, resolver).catch(() => undefined);
 		const event = await this.apEventService.extractEventFromNote(note, resolver).catch(() => undefined);
 
 		if (isMessaging) {
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index ea0654e9ad..f3cda78038 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -39,7 +39,6 @@ import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.j
 import type { AccountMoveService } from '@/core/AccountMoveService.js';
 import { checkHttps } from '@/misc/check-https.js';
 import { AvatarDecorationService } from '@/core/AvatarDecorationService.js';
-import { isNotNull } from '@/misc/is-not-null.js';
 import { getApId, getApType, getOneApHrefNullable, isActor, isCollection, isCollectionOrOrderedCollection, isPropertyValue } from '../type.js';
 import { extractApHashtags } from './tag.js';
 import type { OnModuleInit } from '@nestjs/common';
@@ -797,7 +796,7 @@ export class ApPersonService implements OnModuleInit {
 
 			// とりあえずidを別の時間で生成して順番を維持
 			let td = 0;
-			for (const note of featuredNotes.filter(isNotNull)) {
+			for (const note of featuredNotes.filter((note): note is MiNote => note != null)) {
 				td -= 1000;
 				transactionalEntityManager.insert(MiUserNotePining, {
 					id: this.idService.gen(Date.now() + td),
diff --git a/packages/backend/src/core/activitypub/models/ApQuestionService.ts b/packages/backend/src/core/activitypub/models/ApQuestionService.ts
index d1936cfe1d..e78b3a3599 100644
--- a/packages/backend/src/core/activitypub/models/ApQuestionService.ts
+++ b/packages/backend/src/core/activitypub/models/ApQuestionService.ts
@@ -10,7 +10,6 @@ import type { Config } from '@/config.js';
 import type { IPoll } from '@/models/Poll.js';
 import type Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
-import { isNotNull } from '@/misc/is-not-null.js';
 import { isQuestion } from '../type.js';
 import { ApLoggerService } from '../ApLoggerService.js';
 import { ApResolverService } from '../ApResolverService.js';
@@ -52,7 +51,7 @@ export class ApQuestionService {
 
 		const choices = question[multiple ? 'anyOf' : 'oneOf']
 			?.map((x) => x.name)
-			.filter(isNotNull)
+			.filter((x): x is string => typeof x === 'string')
 			?? [];
 
 		const votes = question[multiple ? 'anyOf' : 'oneOf']?.map((x) => x.replies?.totalItems ?? x._misskey_votes ?? 0);
diff --git a/packages/backend/src/core/activitypub/models/tag.ts b/packages/backend/src/core/activitypub/models/tag.ts
index e7ceec3262..ced101b764 100644
--- a/packages/backend/src/core/activitypub/models/tag.ts
+++ b/packages/backend/src/core/activitypub/models/tag.ts
@@ -4,7 +4,6 @@
  */
 
 import { toArray } from '@/misc/prelude/array.js';
-import { isNotNull } from '@/misc/is-not-null.js';
 import { isHashtag } from '../type.js';
 import type { IObject, IApHashtag } from '../type.js';
 
@@ -16,7 +15,7 @@ export function extractApHashtags(tags: IObject | IObject[] | null | undefined):
 	return hashtags.map(tag => {
 		const m = tag.name.match(/^#(.+)/);
 		return m ? m[1] : null;
-	}).filter(isNotNull);
+	}).filter((x): x is string => x != null);
 }
 
 export function extractApHashtagObjects(tags: IObject | IObject[] | null | undefined): IApHashtag[] {
diff --git a/packages/backend/src/core/chart/core.ts b/packages/backend/src/core/chart/core.ts
index f10e30ef10..aa0cb9dc2b 100644
--- a/packages/backend/src/core/chart/core.ts
+++ b/packages/backend/src/core/chart/core.ts
@@ -459,15 +459,13 @@ export default abstract class Chart<T extends Schema> {
 				}
 			}
 
-			// bake cardinality
+			// bake unique count
 			for (const [k, v] of Object.entries(finalDiffs)) {
 				if (this.schema[k].uniqueIncrement) {
 					const name = COLUMN_PREFIX + k.replaceAll('.', COLUMN_DELIMITER) as keyof Columns<T>;
 					const tempColumnName = UNIQUE_TEMP_COLUMN_PREFIX + k.replaceAll('.', COLUMN_DELIMITER) as keyof TempColumnsForUnique<T>;
-					const cardinalityOfHour = new Set([...(v as string[]), ...(logHour[tempColumnName] as unknown as string[])]).size;
-					const cardinalityOfDay = new Set([...(v as string[]), ...(logDay[tempColumnName] as unknown as string[])]).size;
-					queryForHour[name] = cardinalityOfHour;
-					queryForDay[name] = cardinalityOfDay;
+					queryForHour[name] = new Set([...(v as string[]), ...(logHour[tempColumnName] as unknown as string[])]).size;
+					queryForDay[name] = new Set([...(v as string[]), ...(logDay[tempColumnName] as unknown as string[])]).size;
 				}
 			}
 
@@ -639,7 +637,7 @@ export default abstract class Chart<T extends Schema> {
 		// 要求された範囲にログがひとつもなかったら
 		if (logs.length === 0) {
 			// もっとも新しいログを持ってくる
-			// (すくなくともひとつログが無いと補間できないため)
+			// (すくなくともひとつログが無いと隙間埋めできないため)
 			const recentLog = await repository.findOne({
 				where: group ? {
 					group: group,
@@ -656,7 +654,7 @@ export default abstract class Chart<T extends Schema> {
 		// 要求された範囲の最も古い箇所に位置するログが存在しなかったら
 		} else if (!isTimeSame(new Date(logs.at(-1)!.date * 1000), gt)) {
 			// 要求された範囲の最も古い箇所時点での最も新しいログを持ってきて末尾に追加する
-			// (補間できないため)
+			// (隙間埋めできないため)
 			const outdatedLog = await repository.findOne({
 				where: {
 					date: LessThan(Chart.dateToTimestamp(gt)),
@@ -685,7 +683,7 @@ export default abstract class Chart<T extends Schema> {
 			if (log) {
 				chart.unshift(this.convertRawRecord(log));
 			} else {
-				// 補間
+				// 隙間埋め
 				const latest = logs.find(l => isTimeBefore(new Date(l.date * 1000), current));
 				const data = latest ? this.convertRawRecord(latest) : null;
 				chart.unshift(this.getNewLog(data));
diff --git a/packages/backend/src/core/entities/DriveFileEntityService.ts b/packages/backend/src/core/entities/DriveFileEntityService.ts
index 4a3ed1fc4d..15782b9298 100644
--- a/packages/backend/src/core/entities/DriveFileEntityService.ts
+++ b/packages/backend/src/core/entities/DriveFileEntityService.ts
@@ -258,7 +258,7 @@ export class DriveFileEntityService {
 			folder: opts.detail && file.folderId ? this.driveFolderEntityService.pack(file.folderId, {
 				detail: true,
 			}) : null,
-			userId: file.userId,
+			userId: opts.withUser ? file.userId : null,
 			user: (opts.withUser && file.userId) ? this.userEntityService.pack(file.userId) : null,
 		});
 	}
@@ -269,7 +269,7 @@ export class DriveFileEntityService {
 		options?: PackOptions,
 	): Promise<Packed<'DriveFile'>[]> {
 		const items = await Promise.all(files.map(f => this.packNullable(f, options)));
-		return items.filter(isNotNull);
+		return items.filter((x): x is Packed<'DriveFile'> => x != null);
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/entities/InstanceEntityService.ts b/packages/backend/src/core/entities/InstanceEntityService.ts
index e46bd8b963..9287c98003 100644
--- a/packages/backend/src/core/entities/InstanceEntityService.ts
+++ b/packages/backend/src/core/entities/InstanceEntityService.ts
@@ -8,15 +8,12 @@ import type { Packed } from '@/misc/json-schema.js';
 import type { MiInstance } from '@/models/Instance.js';
 import { MetaService } from '@/core/MetaService.js';
 import { bindThis } from '@/decorators.js';
-import { UtilityService } from '@/core/UtilityService.js';
-import { RoleService } from '@/core/RoleService.js';
-import { MiUser } from '@/models/User.js';
+import { UtilityService } from '../UtilityService.js';
 
 @Injectable()
 export class InstanceEntityService {
 	constructor(
 		private metaService: MetaService,
-		private roleService: RoleService,
 
 		private utilityService: UtilityService,
 	) {
@@ -25,11 +22,8 @@ export class InstanceEntityService {
 	@bindThis
 	public async pack(
 		instance: MiInstance,
-		me?: { id: MiUser['id']; } | null | undefined,
 	): Promise<Packed<'FederationInstance'>> {
 		const meta = await this.metaService.fetch();
-		const iAmModerator = me ? await this.roleService.isModerator(me as MiUser) : false;
-
 		return {
 			id: instance.id,
 			firstRetrievedAt: instance.firstRetrievedAt.toISOString(),
@@ -54,7 +48,6 @@ export class InstanceEntityService {
 			themeColor: instance.themeColor,
 			infoUpdatedAt: instance.infoUpdatedAt ? instance.infoUpdatedAt.toISOString() : null,
 			latestRequestReceivedAt: instance.latestRequestReceivedAt ? instance.latestRequestReceivedAt.toISOString() : null,
-			moderationNote: iAmModerator ? instance.moderationNote : null,
 		};
 	}
 
diff --git a/packages/backend/src/core/entities/MetaEntityService.ts b/packages/backend/src/core/entities/MetaEntityService.ts
deleted file mode 100644
index ec686cecbb..0000000000
--- a/packages/backend/src/core/entities/MetaEntityService.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Brackets } from 'typeorm';
-import { Inject, Injectable } from '@nestjs/common';
-import JSON5 from 'json5';
-import type { Packed } from '@/misc/json-schema.js';
-import type { MiMeta } from '@/models/Meta.js';
-import type { AdsRepository } from '@/models/_.js';
-import { MAX_NOTE_TEXT_LENGTH } from '@/const.js';
-import { MetaService } from '@/core/MetaService.js';
-import { bindThis } from '@/decorators.js';
-import { UserEntityService } from '@/core/entities/UserEntityService.js';
-import { InstanceActorService } from '@/core/InstanceActorService.js';
-import type { Config } from '@/config.js';
-import { DI } from '@/di-symbols.js';
-import { DEFAULT_POLICIES } from '@/core/RoleService.js';
-
-@Injectable()
-export class MetaEntityService {
-	constructor(
-		@Inject(DI.config)
-		private config: Config,
-
-		@Inject(DI.adsRepository)
-		private adsRepository: AdsRepository,
-
-		private userEntityService: UserEntityService,
-		private metaService: MetaService,
-		private instanceActorService: InstanceActorService,
-	) { }
-
-	@bindThis
-	public async pack(meta?: MiMeta): Promise<Packed<'MetaLite'>> {
-		let instance = meta;
-
-		if (!instance) {
-			instance = await this.metaService.fetch();
-		}
-
-		const ads = await this.adsRepository.createQueryBuilder('ads')
-			.where('ads.expiresAt > :now', { now: new Date() })
-			.andWhere('ads.startsAt <= :now', { now: new Date() })
-			.andWhere(new Brackets(qb => {
-				// 曜日のビットフラグを確認する
-				qb.where('ads.dayOfWeek & :dayOfWeek > 0', { dayOfWeek: 1 << new Date().getDay() })
-					.orWhere('ads.dayOfWeek = 0');
-			}))
-			.getMany();
-
-		const packed: Packed<'MetaLite'> = {
-			maintainerName: instance.maintainerName,
-			maintainerEmail: instance.maintainerEmail,
-
-			version: this.config.version,
-			basedMisskeyVersion: this.config.basedMisskeyVersion,
-			providesTarball: this.config.publishTarballInsteadOfProvideRepositoryUrl,
-
-			name: instance.name,
-			shortName: instance.shortName,
-			uri: this.config.url,
-			description: instance.description,
-			langs: instance.langs,
-			tosUrl: instance.termsOfServiceUrl,
-			repositoryUrl: instance.repositoryUrl,
-			feedbackUrl: instance.feedbackUrl,
-			impressumUrl: instance.impressumUrl,
-			privacyPolicyUrl: instance.privacyPolicyUrl,
-			disableRegistration: instance.disableRegistration,
-			emailRequiredForSignup: instance.emailRequiredForSignup,
-			enableHcaptcha: instance.enableHcaptcha,
-			hcaptchaSiteKey: instance.hcaptchaSiteKey,
-			enableMcaptcha: instance.enableMcaptcha,
-			mcaptchaSiteKey: instance.mcaptchaSitekey,
-			mcaptchaInstanceUrl: instance.mcaptchaInstanceUrl,
-			enableRecaptcha: instance.enableRecaptcha,
-			recaptchaSiteKey: instance.recaptchaSiteKey,
-			enableTurnstile: instance.enableTurnstile,
-			turnstileSiteKey: instance.turnstileSiteKey,
-			swPublickey: instance.swPublicKey,
-			themeColor: instance.themeColor,
-			mascotImageUrl: instance.mascotImageUrl ?? '/assets/ai.png',
-			bannerUrl: instance.bannerUrl,
-			infoImageUrl: instance.infoImageUrl,
-			serverErrorImageUrl: instance.serverErrorImageUrl,
-			notFoundImageUrl: instance.notFoundImageUrl,
-			iconUrl: instance.iconUrl,
-			backgroundImageUrl: instance.backgroundImageUrl,
-			logoImageUrl: instance.logoImageUrl,
-			maxNoteTextLength: MAX_NOTE_TEXT_LENGTH,
-			// クライアントの手間を減らすためあらかじめJSONに変換しておく
-			defaultLightTheme: instance.defaultLightTheme ? JSON.stringify(JSON5.parse(instance.defaultLightTheme)) : null,
-			defaultDarkTheme: instance.defaultDarkTheme ? JSON.stringify(JSON5.parse(instance.defaultDarkTheme)) : null,
-			ads: ads.map(ad => ({
-				id: ad.id,
-				url: ad.url,
-				place: ad.place,
-				ratio: ad.ratio,
-				imageUrl: ad.imageUrl,
-				dayOfWeek: ad.dayOfWeek,
-			})),
-			notesPerOneAd: instance.notesPerOneAd,
-			enableEmail: instance.enableEmail,
-			enableServiceWorker: instance.enableServiceWorker,
-
-			translatorAvailable: instance.deeplAuthKey != null,
-
-			serverRules: instance.serverRules,
-
-			policies: { ...DEFAULT_POLICIES, ...instance.policies },
-
-			mediaProxy: this.config.mediaProxy,
-		};
-
-		return packed;
-	}
-
-	@bindThis
-	public async packDetailed(meta?: MiMeta): Promise<Packed<'MetaDetailed'>> {
-		let instance = meta;
-
-		if (!instance) {
-			instance = await this.metaService.fetch();
-		}
-
-		const packed = await this.pack(instance);
-
-		const proxyAccount = instance.proxyAccountId ? await this.userEntityService.pack(instance.proxyAccountId).catch(() => null) : null;
-
-		const packDetailed: Packed<'MetaDetailed'> = {
-			...packed,
-			cacheRemoteFiles: instance.cacheRemoteFiles,
-			cacheRemoteSensitiveFiles: instance.cacheRemoteSensitiveFiles,
-			requireSetup: !await this.instanceActorService.realLocalUsersPresent(),
-			proxyAccountName: proxyAccount ? proxyAccount.username : null,
-			features: {
-				localTimeline: instance.policies.ltlAvailable,
-				globalTimeline: instance.policies.gtlAvailable,
-				registration: !instance.disableRegistration,
-				emailRequiredForSignup: instance.emailRequiredForSignup,
-				hcaptcha: instance.enableHcaptcha,
-				recaptcha: instance.enableRecaptcha,
-				turnstile: instance.enableTurnstile,
-				objectStorage: instance.useObjectStorage,
-				serviceWorker: instance.enableServiceWorker,
-				miauth: true,
-			},
-		};
-
-		return packDetailed;
-	}
-}
-
diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index 43cc3fc010..5fda736b15 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -352,7 +352,6 @@ export class NoteEntityService implements OnModuleInit {
 			disableRightClick: note.disableRightClick || undefined,
 			renoteCount: note.renoteCount,
 			repliesCount: note.repliesCount,
-			reactionCount: Object.values(note.reactions).reduce((a, b) => a + b, 0),
 			reactions: this.reactionService.convertLegacyReactions(note.reactions),
 			reactionEmojis: this.customEmojiService.populateEmojis(reactionEmojiNames, host),
 			reactionAndUserPairCache: opts.withReactionAndUserPairCache ? note.reactionAndUserPairCache : undefined,
diff --git a/packages/backend/src/core/entities/NoteReactionEntityService.ts b/packages/backend/src/core/entities/NoteReactionEntityService.ts
index 3f4fa3cf96..2799f58992 100644
--- a/packages/backend/src/core/entities/NoteReactionEntityService.ts
+++ b/packages/backend/src/core/entities/NoteReactionEntityService.ts
@@ -69,19 +69,4 @@ export class NoteReactionEntityService implements OnModuleInit {
 			} : {}),
 		};
 	}
-
-	@bindThis
-	public async packMany(
-		reactions: MiNoteReaction[],
-		me?: { id: MiUser['id'] } | null | undefined,
-		options?: {
-			withNote: boolean;
-		},
-	): Promise<Packed<'NoteReaction'>[]> {
-		const opts = Object.assign({
-			withNote: false,
-		}, options);
-
-		return Promise.all(reactions.map(reaction => this.pack(reaction, me, opts)));
-	}
 }
diff --git a/packages/backend/src/core/entities/NotificationEntityService.ts b/packages/backend/src/core/entities/NotificationEntityService.ts
index f0c2e7f6fa..9a66f37b66 100644
--- a/packages/backend/src/core/entities/NotificationEntityService.ts
+++ b/packages/backend/src/core/entities/NotificationEntityService.ts
@@ -14,15 +14,15 @@ import type { MiNote } from '@/models/Note.js';
 import type { Packed } from '@/misc/json-schema.js';
 import { bindThis } from '@/decorators.js';
 import { isNotNull } from '@/misc/is-not-null.js';
-import { FilterUnionByProperty, groupedNotificationTypes } from '@/types.js';
-import { CacheService } from '@/core/CacheService.js';
+import { FilterUnionByProperty, notificationTypes } from '@/types.js';
 import { RoleEntityService } from './RoleEntityService.js';
 import type { OnModuleInit } from '@nestjs/common';
 import type { UserEntityService } from './UserEntityService.js';
 import type { NoteEntityService } from './NoteEntityService.js';
 import type { UserGroupInvitationEntityService } from './UserGroupInvitationEntityService.js';
 
-const NOTE_REQUIRED_NOTIFICATION_TYPES = new Set(['note', 'mention', 'reply', 'renote', 'renote:grouped', 'quote', 'reaction', 'reaction:grouped', 'pollEnded'] as (typeof groupedNotificationTypes[number])[]);
+const NOTE_REQUIRED_NOTIFICATION_TYPES = new Set(['note', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollEnded'] as (typeof notificationTypes[number])[]);
+const NOTE_REQUIRED_GROUPED_NOTIFICATION_TYPES = new Set(['note', 'mention', 'reply', 'renote', 'renote:grouped', 'quote', 'reaction', 'reaction:grouped', 'pollEnded']);
 
 @Injectable()
 export class NotificationEntityService implements OnModuleInit {
@@ -46,8 +46,6 @@ export class NotificationEntityService implements OnModuleInit {
 		@Inject(DI.userGroupInvitationsRepository)
 		private userGroupInvitationsRepository: UserGroupInvitationsRepository,
 
-		private cacheService: CacheService,
-
 		//private userEntityService: UserEntityService,
 		//private noteEntityService: NoteEntityService,
 		//private userGroupInvitationEntityService: UserGroupInvitationEntityService,
@@ -61,48 +59,147 @@ export class NotificationEntityService implements OnModuleInit {
 		this.userGroupInvitationEntityService = this.moduleRef.get('UserGroupInvitationEntityService');
 	}
 
-	/**
-	 * 通知をパックする共通処理
-	*/
-	async #packInternal <T extends MiNotification | MiGroupedNotification> (
-		src: T,
+	@bindThis
+	public async pack(
+		src: MiNotification,
 		meId: MiUser['id'],
 		// eslint-disable-next-line @typescript-eslint/ban-types
 		options: {
-			checkValidNotifier?: boolean;
+
 		},
 		hint?: {
 			packedNotes: Map<MiNote['id'], Packed<'Note'>>;
 			packedUsers: Map<MiUser['id'], Packed<'UserLite'>>;
 		},
-	): Promise<Packed<'Notification'> | null> {
+	): Promise<Packed<'Notification'>> {
 		const notification = src;
+		const noteIfNeed = NOTE_REQUIRED_NOTIFICATION_TYPES.has(notification.type) && 'noteId' in notification ? (
+			hint?.packedNotes != null
+				? hint.packedNotes.get(notification.noteId)
+				: this.noteEntityService.pack(notification.noteId, { id: meId }, {
+					detail: true,
+				})
+		) : undefined;
+		const userIfNeed = 'notifierId' in notification ? (
+			hint?.packedUsers != null
+				? hint.packedUsers.get(notification.notifierId)
+				: this.userEntityService.pack(notification.notifierId, { id: meId })
+		) : undefined;
+		const role = notification.type === 'roleAssigned' ? await this.roleEntityService.pack(notification.roleId) : undefined;
+
+		return await awaitAll({
+			id: notification.id,
+			createdAt: new Date(notification.createdAt).toISOString(),
+			type: notification.type,
+			userId: 'notifierId' in notification ? notification.notifierId : undefined,
+			...(userIfNeed != null ? { user: userIfNeed } : {}),
+			...(noteIfNeed != null ? { note: noteIfNeed } : {}),
+			...(notification.type === 'reaction' ? {
+				reaction: notification.reaction,
+			} : {}),
+			...(notification.type === 'roleAssigned' ? {
+				role: role,
+			} : {}),
+			// ...(notification.type === 'pollEnded' ? {
+			// 	note: this.noteEntityService.pack(notification.note ?? notification.noteId!, { id: notification.notifieeId }, {
+			// 		detail: true,
+			// 		_hint_: options._hintForEachNotes_,
+			// 	}),
+			// } : {}),
+			...(notification.type === 'groupInvited' ? {
+				invitation: this.userGroupInvitationEntityService.pack(notification.userGroupInvitationId),
+			} : {}),
+			...(notification.type === 'achievementEarned' ? {
+				achievement: notification.achievement,
+			} : {}),
+			...(notification.type === 'app' ? {
+				body: notification.customBody,
+				header: notification.customHeader,
+				icon: notification.customIcon,
+			} : {}),
+		});
+	}
+
+	@bindThis
+	public async packMany(
+		notifications: MiNotification[],
+		meId: MiUser['id'],
+	) {
+		if (notifications.length === 0) return [];
+
+		let validNotifications = notifications;
+
+		const noteIds = validNotifications.map(x => 'noteId' in x ? x.noteId : null).filter(isNotNull);
+		const notes = noteIds.length > 0 ? await this.notesRepository.find({
+			where: { id: In(noteIds) },
+			relations: ['user', 'reply', 'reply.user', 'renote', 'renote.user'],
+		}) : [];
+		const packedNotesArray = await this.noteEntityService.packMany(notes, { id: meId }, {
+			detail: true,
+		});
+		const packedNotes = new Map(packedNotesArray.map(p => [p.id, p]));
+
+		validNotifications = validNotifications.filter(x => !('noteId' in x) || packedNotes.has(x.noteId));
+
+		const userIds = validNotifications.map(x => 'notifierId' in x ? x.notifierId : null).filter(isNotNull);
+		const users = userIds.length > 0 ? await this.usersRepository.find({
+			where: { id: In(userIds) },
+		}) : [];
+		const packedUsersArray = await this.userEntityService.packMany(users, { id: meId });
+		const packedUsers = new Map(packedUsersArray.map(p => [p.id, p]));
+
+		// 既に解決されたフォローリクエストの通知を除外
+		const followRequestNotifications = validNotifications.filter((x): x is FilterUnionByProperty<MiGroupedNotification, 'type', 'receiveFollowRequest'> => x.type === 'receiveFollowRequest');
+		if (followRequestNotifications.length > 0) {
+			const reqs = await this.followRequestsRepository.find({
+				where: { followerId: In(followRequestNotifications.map(x => x.notifierId)) },
+			});
+			validNotifications = validNotifications.filter(x => (x.type !== 'receiveFollowRequest') || reqs.some(r => r.followerId === x.notifierId));
+		}
+
+		const groupInvitedNotifications = validNotifications.filter((x): x is FilterUnionByProperty<MiGroupedNotification, 'type', 'groupInvited'> => x.type === 'groupInvited');
+		if (groupInvitedNotifications.length > 0) {
+			const existingInvitationIds = await this.userGroupInvitationsRepository.find({
+				where: { id: In(groupInvitedNotifications.map(x => x.userGroupInvitationId)) },
+			});
+			validNotifications = validNotifications.filter(x => (x.type !== 'groupInvited') || existingInvitationIds.some(r => r.id === x.userGroupInvitationId));
+		}
 
-		if (options.checkValidNotifier !== false && !(await this.#isValidNotifier(notification, meId))) return null;
+		return await Promise.all(validNotifications.map(x => this.pack(x, meId, {}, {
+			packedNotes,
+			packedUsers,
+		})));
+	}
 
-		const needsNote = NOTE_REQUIRED_NOTIFICATION_TYPES.has(notification.type) && 'noteId' in notification;
-		const noteIfNeed = needsNote ? (
+	@bindThis
+	public async packGrouped(
+		src: MiGroupedNotification,
+		meId: MiUser['id'],
+		// eslint-disable-next-line @typescript-eslint/ban-types
+		options: {
+
+		},
+		hint?: {
+			packedNotes: Map<MiNote['id'], Packed<'Note'>>;
+			packedUsers: Map<MiUser['id'], Packed<'UserLite'>>;
+		},
+	): Promise<Packed<'Notification'>> {
+		const notification = src;
+		const noteIfNeed = NOTE_REQUIRED_GROUPED_NOTIFICATION_TYPES.has(notification.type) && 'noteId' in notification ? (
 			hint?.packedNotes != null
 				? hint.packedNotes.get(notification.noteId)
 				: this.noteEntityService.pack(notification.noteId, { id: meId }, {
 					detail: true,
 				})
 		) : undefined;
-		// if the note has been deleted, don't show this notification
-		if (needsNote && !noteIfNeed) return null;
-
-		const needsUser = 'notifierId' in notification;
-		const userIfNeed = needsUser ? (
+		const userIfNeed = 'notifierId' in notification ? (
 			hint?.packedUsers != null
 				? hint.packedUsers.get(notification.notifierId)
 				: this.userEntityService.pack(notification.notifierId, { id: meId })
 		) : undefined;
-		// if the user has been deleted, don't show this notification
-		if (needsUser && !userIfNeed) return null;
 
-		// #region Grouped notifications
 		if (notification.type === 'reaction:grouped') {
-			const reactions = (await Promise.all(notification.reactions.map(async reaction => {
+			const reactions = await Promise.all(notification.reactions.map(async reaction => {
 				const user = hint?.packedUsers != null
 					? hint.packedUsers.get(reaction.userId)!
 					: await this.userEntityService.pack(reaction.userId, { id: meId });
@@ -110,12 +207,7 @@ export class NotificationEntityService implements OnModuleInit {
 					user,
 					reaction: reaction.reaction,
 				};
-			}))).filter(r => isNotNull(r.user));
-			// if all users have been deleted, don't show this notification
-			if (reactions.length === 0) {
-				return null;
-			}
-
+			}));
 			return await awaitAll({
 				id: notification.id,
 				createdAt: new Date(notification.createdAt).toISOString(),
@@ -124,19 +216,14 @@ export class NotificationEntityService implements OnModuleInit {
 				reactions,
 			});
 		} else if (notification.type === 'renote:grouped') {
-			const users = (await Promise.all(notification.userIds.map(userId => {
+			const users = await Promise.all(notification.userIds.map(userId => {
 				const packedUser = hint?.packedUsers != null ? hint.packedUsers.get(userId) : null;
 				if (packedUser) {
 					return packedUser;
 				}
 
 				return this.userEntityService.pack(userId, { id: meId });
-			}))).filter(isNotNull);
-			// if all users have been deleted, don't show this notification
-			if (users.length === 0) {
-				return null;
-			}
-
+			}));
 			return await awaitAll({
 				id: notification.id,
 				createdAt: new Date(notification.createdAt).toISOString(),
@@ -145,14 +232,8 @@ export class NotificationEntityService implements OnModuleInit {
 				users,
 			});
 		}
-		// #endregion
 
-		const needsRole = notification.type === 'roleAssigned';
-		const role = needsRole ? await this.roleEntityService.pack(notification.roleId) : undefined;
-		// if the role has been deleted, don't show this notification
-		if (needsRole && !role) {
-			return null;
-		}
+		const role = notification.type === 'roleAssigned' ? await this.roleEntityService.pack(notification.roleId) : undefined;
 
 		return await awaitAll({
 			id: notification.id,
@@ -164,12 +245,12 @@ export class NotificationEntityService implements OnModuleInit {
 			...(notification.type === 'reaction' ? {
 				reaction: notification.reaction,
 			} : {}),
-			...(notification.type === 'groupInvited' ? {
-				invitation: this.userGroupInvitationEntityService.pack(notification.userGroupInvitationId),
-			} : {}),
 			...(notification.type === 'roleAssigned' ? {
 				role: role,
 			} : {}),
+			...(notification.type === 'groupInvited' ? {
+				invitation: this.userGroupInvitationEntityService.pack(notification.userGroupInvitationId),
+			} : {}),
 			...(notification.type === 'achievementEarned' ? {
 				achievement: notification.achievement,
 			} : {}),
@@ -181,16 +262,15 @@ export class NotificationEntityService implements OnModuleInit {
 		});
 	}
 
-	async #packManyInternal <T extends MiNotification | MiGroupedNotification>	(
-		notifications: T[],
+	@bindThis
+	public async packGroupedMany(
+		notifications: MiGroupedNotification[],
 		meId: MiUser['id'],
-	): Promise<T[]> {
+	) {
 		if (notifications.length === 0) return [];
 
 		let validNotifications = notifications;
 
-		validNotifications = await this.#filterValidNotifier(validNotifications, meId);
-
 		const noteIds = validNotifications.map(x => 'noteId' in x ? x.noteId : null).filter(isNotNull);
 		const notes = noteIds.length > 0 ? await this.notesRepository.find({
 			where: { id: In(noteIds) },
@@ -216,7 +296,7 @@ export class NotificationEntityService implements OnModuleInit {
 		const packedUsers = new Map(packedUsersArray.map(p => [p.id, p]));
 
 		// 既に解決されたフォローリクエストの通知を除外
-		const followRequestNotifications = validNotifications.filter((x): x is FilterUnionByProperty<T, 'type', 'receiveFollowRequest'> => x.type === 'receiveFollowRequest');
+		const followRequestNotifications = validNotifications.filter((x): x is FilterUnionByProperty<MiGroupedNotification, 'type', 'receiveFollowRequest'> => x.type === 'receiveFollowRequest');
 		if (followRequestNotifications.length > 0) {
 			const reqs = await this.followRequestsRepository.find({
 				where: { followerId: In(followRequestNotifications.map(x => x.notifierId)) },
@@ -224,107 +304,17 @@ export class NotificationEntityService implements OnModuleInit {
 			validNotifications = validNotifications.filter(x => (x.type !== 'receiveFollowRequest') || reqs.some(r => r.followerId === x.notifierId));
 		}
 
-		const packPromises = validNotifications.map(x => {
-			return this.pack(
-				x,
-				meId,
-				{ checkValidNotifier: false },
-				{ packedNotes, packedUsers },
-			);
-		});
-
-		return (await Promise.all(packPromises)).filter(isNotNull);
-	}
-
-	@bindThis
-	public async pack(
-		src: MiNotification | MiGroupedNotification,
-		meId: MiUser['id'],
-		// eslint-disable-next-line @typescript-eslint/ban-types
-		options: {
-			checkValidNotifier?: boolean;
-		},
-		hint?: {
-			packedNotes: Map<MiNote['id'], Packed<'Note'>>;
-			packedUsers: Map<MiUser['id'], Packed<'UserLite'>>;
-		},
-	): Promise<Packed<'Notification'> | null> {
-		return await this.#packInternal(src, meId, options, hint);
-	}
-
-	@bindThis
-	public async packMany(
-		notifications: MiNotification[],
-		meId: MiUser['id'],
-	): Promise<MiNotification[]> {
-		return await this.#packManyInternal(notifications, meId);
-	}
-
-	@bindThis
-	public async packGroupedMany(
-		notifications: MiGroupedNotification[],
-		meId: MiUser['id'],
-	): Promise<MiGroupedNotification[]> {
-		return await this.#packManyInternal(notifications, meId);
-	}
-
-	/**
-	 * notifierが存在するか、ミュートされていないか、サスペンドされていないかを確認するvalidator
-	 */
-	#validateNotifier <T extends MiNotification | MiGroupedNotification> (
-		notification: T,
-		userIdsWhoMeMuting: Set<MiUser['id']>,
-		userMutedInstances: Set<string>,
-		notifiers: MiUser[],
-	): boolean {
-		if (!('notifierId' in notification)) return true;
-		if (userIdsWhoMeMuting.has(notification.notifierId)) return false;
-
-		const notifier = notifiers.find(x => x.id === notification.notifierId) ?? null;
-
-		if (notifier == null) return false;
-		if (notifier.host && userMutedInstances.has(notifier.host)) return false;
-
-		if (notifier.isSuspended) return false;
-
-		return true;
-	}
-
-	/**
-	 * notifierが存在するか、ミュートされていないか、サスペンドされていないかを実際に確認する
-	 */
-	async #isValidNotifier(
-		notification: MiNotification | MiGroupedNotification,
-		meId: MiUser['id'],
-	): Promise<boolean> {
-		return (await this.#filterValidNotifier([notification], meId)).length === 1;
-	}
-
-	/**
-	 * notifierが存在するか、ミュートされていないか、サスペンドされていないかを実際に複数確認する
-	 */
-	async #filterValidNotifier <T extends MiNotification | MiGroupedNotification> (
-		notifications: T[],
-		meId: MiUser['id'],
-	): Promise<T[]> {
-		const [
-			userIdsWhoMeMuting,
-			userMutedInstances,
-		] = await Promise.all([
-			this.cacheService.userMutingsCache.fetch(meId),
-			this.cacheService.userProfileCache.fetch(meId).then(p => new Set(p.mutedInstances)),
-		]);
-
-		const notifierIds = notifications.map(notification => 'notifierId' in notification ? notification.notifierId : null).filter(isNotNull);
-		const notifiers = notifierIds.length > 0 ? await this.usersRepository.find({
-			where: { id: In(notifierIds) },
-		}) : [];
-
-		const filteredNotifications = ((await Promise.all(notifications.map(async (notification) => {
-			const isValid = this.#validateNotifier(notification, userIdsWhoMeMuting, userMutedInstances, notifiers);
-			return isValid ? notification : null;
-		}))) as [T | null] ).filter(isNotNull);
+		const groupInvitedNotifications = validNotifications.filter((x): x is FilterUnionByProperty<MiGroupedNotification, 'type', 'groupInvited'> => x.type === 'groupInvited');
+		if (groupInvitedNotifications.length > 0) {
+			const existingInvitationIds = await this.userGroupInvitationsRepository.find({
+				where: { id: In(groupInvitedNotifications.map(x => x.userGroupInvitationId)) },
+			});
+			validNotifications = validNotifications.filter(x => (x.type !== 'groupInvited') || existingInvitationIds.some(r => r.id === x.userGroupInvitationId));
+		}
 
-		return filteredNotifications;
+		return await Promise.all(validNotifications.map(x => this.packGrouped(x, meId, {}, {
+			packedNotes,
+			packedUsers,
+		})));
 	}
 }
diff --git a/packages/backend/src/core/entities/PageEntityService.ts b/packages/backend/src/core/entities/PageEntityService.ts
index 65c69a49a7..fe7b137bd2 100644
--- a/packages/backend/src/core/entities/PageEntityService.ts
+++ b/packages/backend/src/core/entities/PageEntityService.ts
@@ -14,7 +14,6 @@ import type { MiPage } from '@/models/Page.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
 import { bindThis } from '@/decorators.js';
 import { IdService } from '@/core/IdService.js';
-import { isNotNull } from '@/misc/is-not-null.js';
 import { UserEntityService } from './UserEntityService.js';
 import { DriveFileEntityService } from './DriveFileEntityService.js';
 
@@ -103,7 +102,7 @@ export class PageEntityService {
 			script: page.script,
 			eyeCatchingImageId: page.eyeCatchingImageId,
 			eyeCatchingImage: page.eyeCatchingImageId ? await this.driveFileEntityService.pack(page.eyeCatchingImageId) : null,
-			attachedFiles: this.driveFileEntityService.packMany((await Promise.all(attachedFiles)).filter(isNotNull)),
+			attachedFiles: this.driveFileEntityService.packMany((await Promise.all(attachedFiles)).filter((x): x is MiDriveFile => x != null)),
 			likedCount: page.likedCount,
 			isLiked: meId ? await this.pageLikesRepository.exists({ where: { pageId: page.id, userId: meId } }) : undefined,
 		});
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index 34718570de..0e0023568b 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -15,32 +15,8 @@ import type { Promiseable } from '@/misc/prelude/await-all.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
 import { USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD } from '@/const.js';
 import type { MiLocalUser, MiPartialLocalUser, MiPartialRemoteUser, MiRemoteUser, MiUser } from '@/models/User.js';
-import {
-	birthdaySchema,
-	descriptionSchema,
-	localUsernameSchema,
-	locationSchema,
-	nameSchema,
-	passwordSchema,
-} from '@/models/User.js';
-import type {
-	BlockingsRepository,
-	FollowingsRepository,
-	FollowRequestsRepository,
-	MessagingMessagesRepository,
-	MiFollowing,
-	MiUserNotePining,
-	MiUserProfile,
-	MutingsRepository,
-	NoteUnreadsRepository,
-	RenoteMutingsRepository,
-	UserGroupJoiningsRepository,
-	UserMemoRepository,
-	UserNotePiningsRepository,
-	UserProfilesRepository,
-	UserSecurityKeysRepository,
-	UsersRepository,
-} from '@/models/_.js';
+import { birthdaySchema, descriptionSchema, localUsernameSchema, locationSchema, nameSchema, passwordSchema } from '@/models/User.js';
+import type { UsersRepository, UserSecurityKeysRepository, FollowingsRepository, FollowRequestsRepository, BlockingsRepository, MutingsRepository, DriveFilesRepository, NoteUnreadsRepository, UserNotePiningsRepository, UserProfilesRepository, AnnouncementReadsRepository, AnnouncementsRepository, MessagingMessagesRepository, UserGroupJoiningsRepository, MiUserProfile, RenoteMutingsRepository, UserMemoRepository } from '@/models/_.js';
 import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
 import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
@@ -49,7 +25,6 @@ import { IdService } from '@/core/IdService.js';
 import type { AnnouncementService } from '@/core/AnnouncementService.js';
 import type { CustomEmojiService } from '@/core/CustomEmojiService.js';
 import { AvatarDecorationService } from '@/core/AvatarDecorationService.js';
-import { isNotNull } from '@/misc/is-not-null.js';
 import type { OnModuleInit } from '@nestjs/common';
 import type { NoteEntityService } from './NoteEntityService.js';
 import type { DriveFileEntityService } from './DriveFileEntityService.js';
@@ -70,23 +45,11 @@ function isRemoteUser(user: MiUser | { host: MiUser['host'] }): boolean {
 	return !isLocalUser(user);
 }
 
-export type UserRelation = {
-	id: MiUser['id']
-	following: MiFollowing | null,
-	isFollowing: boolean
-	isFollowed: boolean
-	hasPendingFollowRequestFromYou: boolean
-	hasPendingFollowRequestToYou: boolean
-	isBlocking: boolean
-	isBlocked: boolean
-	isMuted: boolean
-	isRenoteMuted: boolean
-}
-
 @Injectable()
 export class UserEntityService implements OnModuleInit {
 	private apPersonService: ApPersonService;
 	private noteEntityService: NoteEntityService;
+	private driveFileEntityService: DriveFileEntityService;
 	private pageEntityService: PageEntityService;
 	private customEmojiService: CustomEmojiService;
 	private announcementService: AnnouncementService;
@@ -125,6 +88,9 @@ export class UserEntityService implements OnModuleInit {
 		@Inject(DI.renoteMutingsRepository)
 		private renoteMutingsRepository: RenoteMutingsRepository,
 
+		@Inject(DI.driveFilesRepository)
+		private driveFilesRepository: DriveFilesRepository,
+
 		@Inject(DI.noteUnreadsRepository)
 		private noteUnreadsRepository: NoteUnreadsRepository,
 
@@ -140,6 +106,12 @@ export class UserEntityService implements OnModuleInit {
 		@Inject(DI.userGroupJoiningsRepository)
 		private userGroupJoiningsRepository: UserGroupJoiningsRepository,
 
+		@Inject(DI.announcementReadsRepository)
+		private announcementReadsRepository: AnnouncementReadsRepository,
+
+		@Inject(DI.announcementsRepository)
+		private announcementsRepository: AnnouncementsRepository,
+
 		@Inject(DI.userMemosRepository)
 		private userMemosRepository: UserMemoRepository,
 	) {
@@ -148,6 +120,7 @@ export class UserEntityService implements OnModuleInit {
 	onModuleInit() {
 		this.apPersonService = this.moduleRef.get('ApPersonService');
 		this.noteEntityService = this.moduleRef.get('NoteEntityService');
+		this.driveFileEntityService = this.moduleRef.get('DriveFileEntityService');
 		this.pageEntityService = this.moduleRef.get('PageEntityService');
 		this.customEmojiService = this.moduleRef.get('CustomEmojiService');
 		this.announcementService = this.moduleRef.get('AnnouncementService');
@@ -170,7 +143,7 @@ export class UserEntityService implements OnModuleInit {
 	public isRemoteUser = isRemoteUser;
 
 	@bindThis
-	public async getRelation(me: MiUser['id'], target: MiUser['id']): Promise<UserRelation> {
+	public async getRelation(me: MiUser['id'], target: MiUser['id']) {
 		const [
 			following,
 			isFollowed,
@@ -243,59 +216,6 @@ export class UserEntityService implements OnModuleInit {
 		};
 	}
 
-	@bindThis
-	public async getRelations(me: MiUser['id'], targets: MiUser['id'][]): Promise<Map<MiUser['id'], UserRelation>> {
-		const [
-			followers,
-			followees,
-			followersRequests,
-			followeesRequests,
-			blockers,
-			blockees,
-			muters,
-			renoteMuters,
-		] = await Promise.all([
-			this.followingsRepository.findBy({ followerId: me })
-				.then(f => new Map(f.map(it => [it.followeeId, it]))),
-			this.followingsRepository.findBy({ followeeId: me })
-				.then(it => it.map(it => it.followerId)),
-			this.followRequestsRepository.findBy({ followerId: me })
-				.then(it => it.map(it => it.followeeId)),
-			this.followRequestsRepository.findBy({ followeeId: me })
-				.then(it => it.map(it => it.followerId)),
-			this.blockingsRepository.findBy({ blockerId: me })
-				.then(it => it.map(it => it.blockeeId)),
-			this.blockingsRepository.findBy({ blockeeId: me })
-				.then(it => it.map(it => it.blockerId)),
-			this.mutingsRepository.findBy({ muterId: me })
-				.then(it => it.map(it => it.muteeId)),
-			this.renoteMutingsRepository.findBy({ muterId: me })
-				.then(it => it.map(it => it.muteeId)),
-		]);
-
-		return new Map(
-			targets.map(target => {
-				const following = followers.get(target) ?? null;
-
-				return [
-					target,
-					{
-						id: target,
-						following: following,
-						isFollowing: following != null,
-						isFollowed: followees.includes(target),
-						hasPendingFollowRequestFromYou: followersRequests.includes(target),
-						hasPendingFollowRequestToYou: followeesRequests.includes(target),
-						isBlocking: blockers.includes(target),
-						isBlocked: blockees.includes(target),
-						isMuted: muters.includes(target),
-						isRenoteMuted: renoteMuters.includes(target),
-					},
-				];
-			}),
-		);
-	}
-
 	@bindThis
 	public async getHasUnreadMessagingMessage(userId: MiUser['id']): Promise<boolean> {
 		const mute = await this.mutingsRepository.findBy({
@@ -418,9 +338,6 @@ export class UserEntityService implements OnModuleInit {
 			schema?: S,
 			includeSecrets?: boolean,
 			userProfile?: MiUserProfile,
-			userRelations?: Map<MiUser['id'], UserRelation>,
-			userMemos?: Map<MiUser['id'], string | null>,
-			pinNotes?: Map<MiUser['id'], MiUserNotePining[]>,
 		},
 	): Promise<Packed<S>> {
 		const opts = Object.assign({
@@ -435,41 +352,13 @@ export class UserEntityService implements OnModuleInit {
 		const isMe = meId === user.id;
 		const iAmModerator = me ? await this.roleService.isModerator(me as MiUser) : false;
 
-		const profile = isDetailed
-			? (opts.userProfile ?? await this.userProfilesRepository.findOneByOrFail({ userId: user.id }))
-			: null;
-
-		let relation: UserRelation | null = null;
-		if (meId && !isMe && isDetailed) {
-			if (opts.userRelations) {
-				relation = opts.userRelations.get(user.id) ?? null;
-			} else {
-				relation = await this.getRelation(meId, user.id);
-			}
-		}
-
-		let memo: string | null = null;
-		if (isDetailed && meId) {
-			if (opts.userMemos) {
-				memo = opts.userMemos.get(user.id) ?? null;
-			} else {
-				memo = await this.userMemosRepository.findOneBy({ userId: meId, targetUserId: user.id })
-					.then(row => row?.memo ?? null);
-			}
-		}
-
-		let pins: MiUserNotePining[] = [];
-		if (isDetailed) {
-			if (opts.pinNotes) {
-				pins = opts.pinNotes.get(user.id) ?? [];
-			} else {
-				pins = await this.userNotePiningsRepository.createQueryBuilder('pin')
-					.where('pin.userId = :userId', { userId: user.id })
-					.innerJoinAndSelect('pin.note', 'note')
-					.orderBy('pin.id', 'DESC')
-					.getMany();
-			}
-		}
+		const relation = meId && !isMe && isDetailed ? await this.getRelation(meId, user.id) : null;
+		const pins = isDetailed ? await this.userNotePiningsRepository.createQueryBuilder('pin')
+			.where('pin.userId = :userId', { userId: user.id })
+			.innerJoinAndSelect('pin.note', 'note')
+			.orderBy('pin.id', 'DESC')
+			.getMany() : [];
+		const profile = isDetailed ? (opts.userProfile ?? await this.userProfilesRepository.findOneByOrFail({ userId: user.id })) : null;
 
 		const followingCount = profile == null ? null :
 			(profile.followingVisibility === 'public') || isMe ? user.followingCount :
@@ -533,7 +422,7 @@ export class UserEntityService implements OnModuleInit {
 				movedTo: user.movedToUri ? this.apPersonService.resolvePerson(user.movedToUri).then(user => user.id).catch(() => null) : null,
 				alsoKnownAs: user.alsoKnownAs
 					? Promise.all(user.alsoKnownAs.map(uri => this.apPersonService.fetchPerson(uri).then(user => user?.id).catch(() => null)))
-						.then(xs => xs.length === 0 ? null : xs.filter(isNotNull))
+						.then(xs => xs.length === 0 ? null : xs.filter(x => x != null) as string[])
 					: null,
 				createdAt: this.idService.parse(user.id).date.toISOString(),
 				updatedAt: user.updatedAt ? user.updatedAt.toISOString() : null,
@@ -564,7 +453,9 @@ export class UserEntityService implements OnModuleInit {
 				twoFactorEnabled: profile!.twoFactorEnabled,
 				usePasswordLessLogin: profile!.usePasswordLessLogin,
 				securityKeys: profile!.twoFactorEnabled
-					? this.userSecurityKeysRepository.countBy({ userId: user.id }).then(result => result >= 1)
+					? this.userSecurityKeysRepository.countBy({
+						userId: user.id,
+					}).then(result => result >= 1)
 					: false,
 				roles: this.roleService.getUserRoles(user.id).then(roles => roles.filter(role => role.isPublic).sort((a, b) => b.displayOrder - a.displayOrder).map(role => ({
 					id: role.id,
@@ -576,7 +467,10 @@ export class UserEntityService implements OnModuleInit {
 					isAdministrator: role.isAdministrator,
 					displayOrder: role.displayOrder,
 				}))),
-				memo: memo,
+				memo: meId == null ? null : await this.userMemosRepository.findOneBy({
+					userId: meId,
+					targetUserId: user.id,
+				}).then(row => row?.memo ?? null),
 				moderationNote: iAmModerator ? (profile!.moderationNote ?? '') : undefined,
 			} : {}),
 
@@ -658,7 +552,7 @@ export class UserEntityService implements OnModuleInit {
 		return await awaitAll(packed);
 	}
 
-	public async packMany<S extends 'MeDetailed' | 'UserDetailedNotMe' | 'UserDetailed' | 'UserLite' = 'UserLite'>(
+	public packMany<S extends 'MeDetailed' | 'UserDetailedNotMe' | 'UserDetailed' | 'UserLite' = 'UserLite'>(
 		users: (MiUser['id'] | MiUser)[],
 		me?: { id: MiUser['id'] } | null | undefined,
 		options?: {
@@ -666,70 +560,6 @@ export class UserEntityService implements OnModuleInit {
 			includeSecrets?: boolean,
 		},
 	): Promise<Packed<S>[]> {
-		// -- IDのみの要素を補完して完全なエンティティ一覧を作る
-
-		const _users = users.filter((user): user is MiUser => typeof user !== 'string');
-		if (_users.length !== users.length) {
-			_users.push(
-				...await this.usersRepository.findBy({
-					id: In(users.filter((user): user is string => typeof user === 'string')),
-				}),
-			);
-		}
-		const _userIds = _users.map(u => u.id);
-
-		// -- 特に前提条件のない値群を取得
-
-		const profilesMap = await this.userProfilesRepository.findBy({ userId: In(_userIds) })
-			.then(profiles => new Map(profiles.map(p => [p.userId, p])));
-
-		// -- 実行者の有無や指定スキーマの種別によって要否が異なる値群を取得
-
-		let userRelations: Map<MiUser['id'], UserRelation> = new Map();
-		let userMemos: Map<MiUser['id'], string | null> = new Map();
-		let pinNotes: Map<MiUser['id'], MiUserNotePining[]> = new Map();
-
-		if (options?.schema !== 'UserLite') {
-			const meId = me ? me.id : null;
-			if (meId) {
-				userMemos = await this.userMemosRepository.findBy({ userId: meId })
-					.then(memos => new Map(memos.map(memo => [memo.targetUserId, memo.memo])));
-
-				if (_userIds.length > 0) {
-					userRelations = await this.getRelations(meId, _userIds);
-					pinNotes = await this.userNotePiningsRepository.createQueryBuilder('pin')
-						.where('pin.userId IN (:...userIds)', { userIds: _userIds })
-						.innerJoinAndSelect('pin.note', 'note')
-						.getMany()
-						.then(pinsNotes => {
-							const map = new Map<MiUser['id'], MiUserNotePining[]>();
-							for (const note of pinsNotes) {
-								const notes = map.get(note.userId) ?? [];
-								notes.push(note);
-								map.set(note.userId, notes);
-							}
-							for (const [, notes] of map.entries()) {
-								// pack側ではDESCで取得しているので、それに合わせて降順に並び替えておく
-								notes.sort((a, b) => b.id.localeCompare(a.id));
-							}
-							return map;
-						});
-				}
-			}
-		}
-
-		return Promise.all(
-			_users.map(u => this.pack(
-				u,
-				me,
-				{
-					...options,
-					userProfile: profilesMap.get(u.id),
-					userRelations: userRelations,
-					userMemos: userMemos,
-					pinNotes: pinNotes,
-				},
-			)),
-		);
+		return Promise.all(users.map(u => this.pack(u, me, options)));
 	}
 }
diff --git a/packages/backend/src/misc/FileWriterStream.ts b/packages/backend/src/misc/FileWriterStream.ts
deleted file mode 100644
index 367a8eb560..0000000000
--- a/packages/backend/src/misc/FileWriterStream.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import * as fs from 'node:fs/promises';
-import type { PathLike } from 'node:fs';
-
-/**
- * `fs.createWriteStream()`相当のことを行う`WritableStream` (Web標準)
- */
-export class FileWriterStream extends WritableStream<Uint8Array> {
-	constructor(path: PathLike) {
-		let file: fs.FileHandle | null = null;
-
-		super({
-			start: async () => {
-				file = await fs.open(path, 'a');
-			},
-			write: async (chunk, controller) => {
-				if (file === null) {
-					controller.error();
-					throw new Error();
-				}
-
-				await file.write(chunk);
-			},
-			close: async () => {
-				await file?.close();
-			},
-			abort: async () => {
-				await file?.close();
-			},
-		});
-	}
-}
diff --git a/packages/backend/src/misc/JsonArrayStream.ts b/packages/backend/src/misc/JsonArrayStream.ts
deleted file mode 100644
index 754938989d..0000000000
--- a/packages/backend/src/misc/JsonArrayStream.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { TransformStream } from 'node:stream/web';
-
-/**
- * ストリームに流れてきた各データについて`JSON.stringify()`した上で、それらを一つの配列にまとめる
- */
-export class JsonArrayStream extends TransformStream<unknown, string> {
-	constructor() {
-		/** 最初の要素かどうかを変数に記録 */
-		let isFirst = true;
-
-		super({
-			start(controller) {
-				controller.enqueue('[');
-			},
-			flush(controller) {
-				controller.enqueue(']');
-			},
-			transform(chunk, controller) {
-				if (isFirst) {
-					isFirst = false;
-				} else {
-					// 妥当なJSON配列にするためには最初以外の要素の前に`,`を挿入しなければならない
-					controller.enqueue(',\n');
-				}
-
-				controller.enqueue(JSON.stringify(chunk));
-			},
-		});
-	}
-}
diff --git a/packages/backend/src/misc/cache.ts b/packages/backend/src/misc/cache.ts
index 71f7b838a8..b5ffe76fda 100644
--- a/packages/backend/src/misc/cache.ts
+++ b/packages/backend/src/misc/cache.ts
@@ -193,10 +193,6 @@ export class RedisSingleCache<T> {
 // TODO: メモリ節約のためあまり参照されないキーを定期的に削除できるようにする？
 
 export class MemoryKVCache<T> {
-	/**
-	 * データを持つマップ
-	 * @deprecated これを直接操作するべきではない
-	 */
 	public cache: Map<string, { date: number; value: T; }>;
 	private lifetime: number;
 	private gcIntervalHandle: NodeJS.Timeout;
@@ -211,10 +207,6 @@ export class MemoryKVCache<T> {
 	}
 
 	@bindThis
-	/**
-	 * Mapにキャッシュをセットします
-	 * @deprecated これを直接呼び出すべきではない。InternalEventなどで変更を全てのプロセス/マシンに通知するべき
-	 */
 	public set(key: string, value: T): void {
 		this.cache.set(key, {
 			date: Date.now(),
diff --git a/packages/backend/src/misc/fastify-hook-handlers.ts b/packages/backend/src/misc/fastify-hook-handlers.ts
index 3e1c099e00..49a48f6a6b 100644
--- a/packages/backend/src/misc/fastify-hook-handlers.ts
+++ b/packages/backend/src/misc/fastify-hook-handlers.ts
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 import type { onRequestHookHandler } from 'fastify';
 
 export const handleRequestRedirectToOmitSearch: onRequestHookHandler = (request, reply, done) => {
diff --git a/packages/backend/src/misc/is-not-null.ts b/packages/backend/src/misc/is-not-null.ts
index 8d9dc8bb39..584a09d35a 100644
--- a/packages/backend/src/misc/is-not-null.ts
+++ b/packages/backend/src/misc/is-not-null.ts
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-export function isNotNull<T extends NonNullable<unknown>>(input: T | undefined | null): input is T {
+// we are using {} as "any non-nullish value" as expected
+// eslint-disable-next-line @typescript-eslint/ban-types
+export function isNotNull<T extends {}>(input: T | undefined | null): input is T {
 	return input != null;
 }
diff --git a/packages/backend/src/misc/is-pure-renote.ts b/packages/backend/src/misc/is-pure-renote.ts
index f9c2243a06..994d981522 100644
--- a/packages/backend/src/misc/is-pure-renote.ts
+++ b/packages/backend/src/misc/is-pure-renote.ts
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 import type { MiNote } from '@/models/Note.js';
 
 export function isPureRenote(note: MiNote): note is MiNote & { renoteId: NonNullable<MiNote['renoteId']> } {
diff --git a/packages/backend/src/misc/json-schema.ts b/packages/backend/src/misc/json-schema.ts
index 5ccbcf330c..8881985a63 100644
--- a/packages/backend/src/misc/json-schema.ts
+++ b/packages/backend/src/misc/json-schema.ts
@@ -46,18 +46,12 @@ import {
 	packedRoleCondFormulaLogicsSchema,
 	packedRoleCondFormulaValueNot,
 	packedRoleCondFormulaValueIsLocalOrRemoteSchema,
-	packedRoleCondFormulaValueAssignedRoleSchema,
 	packedRoleCondFormulaValueCreatedSchema,
 	packedRoleCondFormulaFollowersOrFollowingOrNotesSchema,
 	packedRoleCondFormulaValueSchema,
 } from '@/models/json-schema/role.js';
 import { packedAdSchema } from '@/models/json-schema/ad.js';
 import { packedReversiGameLiteSchema, packedReversiGameDetailedSchema } from '@/models/json-schema/reversi-game.js';
-import {
-	packedMetaLiteSchema,
-	packedMetaDetailedOnlySchema,
-	packedMetaDetailedSchema,
-} from '@/models/json-schema/meta.js';
 
 export const refs = {
 	UserLite: packedUserLiteSchema,
@@ -101,7 +95,6 @@ export const refs = {
 	RoleCondFormulaLogics: packedRoleCondFormulaLogicsSchema,
 	RoleCondFormulaValueNot: packedRoleCondFormulaValueNot,
 	RoleCondFormulaValueIsLocalOrRemote: packedRoleCondFormulaValueIsLocalOrRemoteSchema,
-	RoleCondFormulaValueAssignedRole: packedRoleCondFormulaValueAssignedRoleSchema,
 	RoleCondFormulaValueCreated: packedRoleCondFormulaValueCreatedSchema,
 	RoleCondFormulaFollowersOrFollowingOrNotes: packedRoleCondFormulaFollowersOrFollowingOrNotesSchema,
 	RoleCondFormulaValue: packedRoleCondFormulaValueSchema,
@@ -110,9 +103,6 @@ export const refs = {
 	RolePolicies: packedRolePoliciesSchema,
 	ReversiGameLite: packedReversiGameLiteSchema,
 	ReversiGameDetailed: packedReversiGameDetailedSchema,
-	MetaLite: packedMetaLiteSchema,
-	MetaDetailedOnly: packedMetaDetailedOnlySchema,
-	MetaDetailed: packedMetaDetailedSchema,
 };
 
 export type Packed<x extends keyof typeof refs> = SchemaType<typeof refs[x]>;
diff --git a/packages/backend/src/misc/loader.ts b/packages/backend/src/misc/loader.ts
index 7f29b9db10..25f7b54d31 100644
--- a/packages/backend/src/misc/loader.ts
+++ b/packages/backend/src/misc/loader.ts
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export type FetchFunction<K, V> = (key: K) => Promise<V>;
 
 type ResolveReject<V> = Parameters<ConstructorParameters<typeof Promise<V>>[0]>;
diff --git a/packages/backend/src/models/Instance.ts b/packages/backend/src/models/Instance.ts
index 9863c9d75d..0632ef525b 100644
--- a/packages/backend/src/models/Instance.ts
+++ b/packages/backend/src/models/Instance.ts
@@ -144,9 +144,4 @@ export class MiInstance {
 		nullable: true,
 	})
 	public infoUpdatedAt: Date | null;
-
-	@Column('varchar', {
-		length: 16384, default: '',
-	})
-	public moderationNote: string;
 }
diff --git a/packages/backend/src/models/Notification.ts b/packages/backend/src/models/Notification.ts
index 68ece6b947..4eace566d7 100644
--- a/packages/backend/src/models/Notification.ts
+++ b/packages/backend/src/models/Notification.ts
@@ -69,16 +69,16 @@ export type MiNotification = {
 	createdAt: string;
 	notifierId: MiUser['id'];
 } | {
-	type: 'groupInvited';
+	type: 'roleAssigned';
 	id: string;
 	createdAt: string;
-	notifierId: MiUser['id'];
-	userGroupInvitationId: MiUserGroupInvitation['id'];
+	roleId: MiRole['id'];
 } | {
-	type: 'roleAssigned';
+	type: 'groupInvited';
 	id: string;
 	createdAt: string;
-	roleId: MiRole['id'];
+	notifierId: MiUser['id'];
+	userGroupInvitationId: MiUserGroupInvitation['id'];
 } | {
 	type: 'achievementEarned';
 	id: string;
diff --git a/packages/backend/src/models/ReversiGame.ts b/packages/backend/src/models/ReversiGame.ts
index 6b29a0ce8c..c03335dd63 100644
--- a/packages/backend/src/models/ReversiGame.ts
+++ b/packages/backend/src/models/ReversiGame.ts
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { id } from './util/id.js';
 import { MiUser } from './User.js';
diff --git a/packages/backend/src/models/Role.ts b/packages/backend/src/models/Role.ts
index 058abe3118..fa05ea8637 100644
--- a/packages/backend/src/models/Role.ts
+++ b/packages/backend/src/models/Role.ts
@@ -29,11 +29,6 @@ type CondFormulaValueIsRemote = {
 	type: 'isRemote';
 };
 
-type CondFormulaValueRoleAssignedTo = {
-	type: 'roleAssignedTo';
-	roleId: string;
-};
-
 type CondFormulaValueCreatedLessThan = {
 	type: 'createdLessThan';
 	sec: number;
@@ -80,7 +75,6 @@ export type RoleCondFormulaValue = { id: string } & (
 	CondFormulaValueNot |
 	CondFormulaValueIsLocal |
 	CondFormulaValueIsRemote |
-	CondFormulaValueRoleAssignedTo |
 	CondFormulaValueCreatedLessThan |
 	CondFormulaValueCreatedMoreThan |
 	CondFormulaValueFollowersLessThanOrEq |
diff --git a/packages/backend/src/models/UserProfile.ts b/packages/backend/src/models/UserProfile.ts
index dddd434c03..d8105784b3 100644
--- a/packages/backend/src/models/UserProfile.ts
+++ b/packages/backend/src/models/UserProfile.ts
@@ -249,8 +249,6 @@ export class MiUserProfile {
 			type: 'follower';
 		} | {
 			type: 'mutualFollow';
-		} | {
-			type: 'followingOrFollower';
 		} | {
 			type: 'list';
 			userListId: MiUserList['id'];
diff --git a/packages/backend/src/models/json-schema/federation-instance.ts b/packages/backend/src/models/json-schema/federation-instance.ts
index 9aca997960..0940d9e940 100644
--- a/packages/backend/src/models/json-schema/federation-instance.ts
+++ b/packages/backend/src/models/json-schema/federation-instance.ts
@@ -107,9 +107,5 @@ export const packedFederationInstanceSchema = {
 			optional: false, nullable: true,
 			format: 'date-time',
 		},
-		moderationNote: {
-			type: 'string',
-			optional: true, nullable: true,
-		},
 	},
 } as const;
diff --git a/packages/backend/src/models/json-schema/meta.ts b/packages/backend/src/models/json-schema/meta.ts
deleted file mode 100644
index 9c089f0773..0000000000
--- a/packages/backend/src/models/json-schema/meta.ts
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export const packedMetaLiteSchema = {
-	type: 'object',
-	optional: false, nullable: false,
-	properties: {
-		maintainerName: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		maintainerEmail: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		version: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		basedMisskeyVersion: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		providesTarball: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		name: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		shortName: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		uri: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'url',
-			example: 'https://cherrypick.example.com',
-		},
-		description: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		langs: {
-			type: 'array',
-			optional: false, nullable: false,
-			items: {
-				type: 'string',
-				optional: false, nullable: false,
-			},
-		},
-		tosUrl: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		repositoryUrl: {
-			type: 'string',
-			optional: false, nullable: true,
-			default: 'https://github.com/kokonect-link/cherrypick',
-		},
-		feedbackUrl: {
-			type: 'string',
-			optional: false, nullable: true,
-			default: 'https://github.com/kokonect-link/cherrypick/issues/new',
-		},
-		defaultDarkTheme: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		defaultLightTheme: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		disableRegistration: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		emailRequiredForSignup: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		enableHcaptcha: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		hcaptchaSiteKey: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		enableMcaptcha: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		mcaptchaSiteKey: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		mcaptchaInstanceUrl: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		enableRecaptcha: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		recaptchaSiteKey: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		enableTurnstile: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		turnstileSiteKey: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		swPublickey: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		mascotImageUrl: {
-			type: 'string',
-			optional: false, nullable: false,
-			default: '/assets/ai.png',
-		},
-		bannerUrl: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		serverErrorImageUrl: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		infoImageUrl: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		notFoundImageUrl: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		iconUrl: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		maxNoteTextLength: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
-		ads: {
-			type: 'array',
-			optional: false, nullable: false,
-			items: {
-				type: 'object',
-				optional: false, nullable: false,
-				properties: {
-					id: {
-						type: 'string',
-						optional: false, nullable: false,
-						format: 'id',
-						example: 'xxxxxxxxxx',
-					},
-					url: {
-						type: 'string',
-						optional: false, nullable: false,
-						format: 'url',
-					},
-					place: {
-						type: 'string',
-						optional: false, nullable: false,
-					},
-					ratio: {
-						type: 'number',
-						optional: false, nullable: false,
-					},
-					imageUrl: {
-						type: 'string',
-						optional: false, nullable: false,
-						format: 'url',
-					},
-					dayOfWeek: {
-						type: 'integer',
-						optional: false, nullable: false,
-					},
-				},
-			},
-		},
-		notesPerOneAd: {
-			type: 'number',
-			optional: false, nullable: false,
-			default: 0,
-		},
-		enableEmail: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		enableServiceWorker: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		translatorAvailable: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		mediaProxy: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		backgroundImageUrl: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		impressumUrl: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		logoImageUrl: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		privacyPolicyUrl: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		serverRules: {
-			type: 'array',
-			optional: false, nullable: false,
-			items: {
-				type: 'string',
-			},
-		},
-		themeColor: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		policies: {
-			type: 'object',
-			optional: false, nullable: false,
-			ref: 'RolePolicies',
-		},
-	},
-} as const;
-
-export const packedMetaDetailedOnlySchema = {
-	type: 'object',
-	optional: false, nullable: false,
-	properties: {
-		features: {
-			type: 'object',
-			optional: true, nullable: false,
-			properties: {
-				registration: {
-					type: 'boolean',
-					optional: false, nullable: false,
-				},
-				emailRequiredForSignup: {
-					type: 'boolean',
-					optional: false, nullable: false,
-				},
-				localTimeline: {
-					type: 'boolean',
-					optional: false, nullable: false,
-				},
-				globalTimeline: {
-					type: 'boolean',
-					optional: false, nullable: false,
-				},
-				hcaptcha: {
-					type: 'boolean',
-					optional: false, nullable: false,
-				},
-				turnstile: {
-					type: 'boolean',
-					optional: false, nullable: false,
-				},
-				recaptcha: {
-					type: 'boolean',
-					optional: false, nullable: false,
-				},
-				objectStorage: {
-					type: 'boolean',
-					optional: false, nullable: false,
-				},
-				serviceWorker: {
-					type: 'boolean',
-					optional: false, nullable: false,
-				},
-				miauth: {
-					type: 'boolean',
-					optional: true, nullable: false,
-					default: true,
-				},
-			},
-		},
-		proxyAccountName: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		requireSetup: {
-			type: 'boolean',
-			optional: false, nullable: false,
-			example: false,
-		},
-		cacheRemoteFiles: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		cacheRemoteSensitiveFiles: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-	},
-} as const;
-
-export const packedMetaDetailedSchema = {
-	type: 'object',
-	allOf: [
-		{
-			type: 'object',
-			ref: 'MetaLite',
-		},
-		{
-			type: 'object',
-			ref: 'MetaDetailedOnly',
-		},
-	],
-} as const;
diff --git a/packages/backend/src/models/json-schema/note.ts b/packages/backend/src/models/json-schema/note.ts
index 4fe44ce0b6..00c2eac310 100644
--- a/packages/backend/src/models/json-schema/note.ts
+++ b/packages/backend/src/models/json-schema/note.ts
@@ -249,10 +249,6 @@ export const packedNoteSchema = {
 				}],
 			},
 		},
-		reactionCount: {
-			type: 'number',
-			optional: false, nullable: false,
-		},
 		renoteCount: {
 			type: 'number',
 			optional: false, nullable: false,
diff --git a/packages/backend/src/models/json-schema/notification.ts b/packages/backend/src/models/json-schema/notification.ts
index 052eb84bf7..b4c4442758 100644
--- a/packages/backend/src/models/json-schema/notification.ts
+++ b/packages/backend/src/models/json-schema/notification.ts
@@ -386,20 +386,5 @@ export const packedNotificationSchema = {
 				enum: ['test'],
 			},
 		},
-	}, {
-		type: 'object',
-		properties: {
-			...baseSchema.properties,
-			type: {
-				type: 'string',
-				optional: false, nullable: false,
-				enum: ['groupInvited'],
-			},
-			invitation: {
-				type: 'string',
-				optional: false, nullable: false,
-				format: 'id',
-			},
-		},
 	}],
 } as const;
diff --git a/packages/backend/src/models/json-schema/role.ts b/packages/backend/src/models/json-schema/role.ts
index c770250503..ef6b279bee 100644
--- a/packages/backend/src/models/json-schema/role.ts
+++ b/packages/backend/src/models/json-schema/role.ts
@@ -57,26 +57,6 @@ export const packedRoleCondFormulaValueIsLocalOrRemoteSchema = {
 	},
 } as const;
 
-export const packedRoleCondFormulaValueAssignedRoleSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string', optional: false,
-		},
-		type: {
-			type: 'string',
-			nullable: false, optional: false,
-			enum: ['roleAssignedTo'],
-		},
-		roleId: {
-			type: 'string',
-			nullable: false, optional: false,
-			format: 'id',
-			example: 'xxxxxxxxxx',
-		},
-	},
-} as const;
-
 export const packedRoleCondFormulaValueCreatedSchema = {
 	type: 'object',
 	properties: {
@@ -135,9 +115,6 @@ export const packedRoleCondFormulaValueSchema = {
 		{
 			ref: 'RoleCondFormulaValueIsLocalOrRemote',
 		},
-		{
-			ref: 'RoleCondFormulaValueAssignedRole',
-		},
 		{
 			ref: 'RoleCondFormulaValueCreated',
 		},
@@ -163,10 +140,6 @@ export const packedRolePoliciesSchema = {
 			type: 'boolean',
 			optional: false, nullable: false,
 		},
-		mentionLimit: {
-			type: 'integer',
-			optional: false, nullable: false,
-		},
 		canInvite: {
 			type: 'boolean',
 			optional: false, nullable: false,
diff --git a/packages/backend/src/models/json-schema/signin.ts b/packages/backend/src/models/json-schema/signin.ts
index 45732a742b..d27d2490c5 100644
--- a/packages/backend/src/models/json-schema/signin.ts
+++ b/packages/backend/src/models/json-schema/signin.ts
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export const packedSigninSchema = {
 	type: 'object',
 	properties: {
diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts
index b8efacd1a8..85d111b23f 100644
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@@ -13,7 +13,7 @@ export const notificationRecieveConfig = {
 				type: {
 					type: 'string',
 					nullable: false,
-					enum: ['all', 'following', 'follower', 'mutualFollow', 'followingOrFollower', 'never'],
+					enum: ['all', 'following', 'follower', 'mutualFollow', 'never'],
 				},
 			},
 			required: ['type'],
@@ -156,9 +156,6 @@ export const packedUserLiteSchema = {
 		emojis: {
 			type: 'object',
 			nullable: false, optional: false,
-			additionalProperties: {
-				type: 'string',
-			},
 		},
 		onlineStatus: {
 			type: 'string',
diff --git a/packages/backend/src/queue/processors/ExportNotesProcessorService.ts b/packages/backend/src/queue/processors/ExportNotesProcessorService.ts
index 7a10ea3a50..f2ae0ce4b4 100644
--- a/packages/backend/src/queue/processors/ExportNotesProcessorService.ts
+++ b/packages/backend/src/queue/processors/ExportNotesProcessorService.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { ReadableStream, TextEncoderStream } from 'node:stream/web';
+import * as fs from 'node:fs';
 import { Inject, Injectable } from '@nestjs/common';
 import { MoreThan } from 'typeorm';
 import { format as dateFormat } from 'date-fns';
@@ -18,85 +18,10 @@ import { bindThis } from '@/decorators.js';
 import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
 import { Packed } from '@/misc/json-schema.js';
 import { IdService } from '@/core/IdService.js';
-import { JsonArrayStream } from '@/misc/JsonArrayStream.js';
-import { FileWriterStream } from '@/misc/FileWriterStream.js';
 import { QueueLoggerService } from '../QueueLoggerService.js';
 import type * as Bull from 'bullmq';
 import type { DbJobDataWithUser } from '../types.js';
 
-class NoteStream extends ReadableStream<Record<string, unknown>> {
-	constructor(
-		job: Bull.Job,
-		notesRepository: NotesRepository,
-		pollsRepository: PollsRepository,
-		driveFileEntityService: DriveFileEntityService,
-		idService: IdService,
-		userId: string,
-	) {
-		let exportedNotesCount = 0;
-		let cursor: MiNote['id'] | null = null;
-
-		const serialize = (
-			note: MiNote,
-			poll: MiPoll | null,
-			files: Packed<'DriveFile'>[],
-		): Record<string, unknown> => {
-			return {
-				id: note.id,
-				text: note.text,
-				createdAt: idService.parse(note.id).date.toISOString(),
-				updatedAt: note.updatedAt?.toISOString(),
-				updatedAtHistory: note.updatedAtHistory?.map(x => x.toISOString()),
-				noteEditHistory: note.noteEditHistory,
-				fileIds: note.fileIds,
-				files: files,
-				replyId: note.replyId,
-				renoteId: note.renoteId,
-				poll: poll,
-				cw: note.cw,
-				visibility: note.visibility,
-				visibleUserIds: note.visibleUserIds,
-				localOnly: note.localOnly,
-				reactionAcceptance: note.reactionAcceptance,
-			};
-		};
-
-		super({
-			async pull(controller): Promise<void> {
-				const notes = await notesRepository.find({
-					where: {
-						userId,
-						...(cursor !== null ? { id: MoreThan(cursor) } : {}),
-					},
-					take: 100, // 100件ずつ取得
-					order: { id: 1 },
-				});
-
-				if (notes.length === 0) {
-					job.updateProgress(100);
-					controller.close();
-				}
-
-				cursor = notes.at(-1)?.id ?? null;
-
-				for (const note of notes) {
-					const poll = note.hasPoll
-						? await pollsRepository.findOneByOrFail({ noteId: note.id }) // N+1
-						: null;
-					const files = await driveFileEntityService.packManyByIds(note.fileIds); // N+1
-					const content = serialize(note, poll, files);
-
-					controller.enqueue(content);
-					exportedNotesCount++;
-				}
-
-				const total = await notesRepository.countBy({ userId });
-				job.updateProgress(exportedNotesCount / total);
-			},
-		});
-	}
-}
-
 @Injectable()
 export class ExportNotesProcessorService {
 	private logger: Logger;
@@ -134,19 +59,67 @@ export class ExportNotesProcessorService {
 		this.logger.info(`Temp file is ${path}`);
 
 		try {
-			// メモリが足りなくならないようにストリームで処理する
-			await new NoteStream(
-				job,
-				this.notesRepository,
-				this.pollsRepository,
-				this.driveFileEntityService,
-				this.idService,
-				user.id,
-			)
-				.pipeThrough(new JsonArrayStream())
-				.pipeThrough(new TextEncoderStream())
-				.pipeTo(new FileWriterStream(path));
+			const stream = fs.createWriteStream(path, { flags: 'a' });
+
+			const write = (text: string): Promise<void> => {
+				return new Promise<void>((res, rej) => {
+					stream.write(text, err => {
+						if (err) {
+							this.logger.error(err);
+							rej(err);
+						} else {
+							res();
+						}
+					});
+				});
+			};
+
+			await write('[');
+
+			let exportedNotesCount = 0;
+			let cursor: MiNote['id'] | null = null;
+
+			while (true) {
+				const notes = await this.notesRepository.find({
+					where: {
+						userId: user.id,
+						...(cursor ? { id: MoreThan(cursor) } : {}),
+					},
+					take: 100,
+					order: {
+						id: 1,
+					},
+				}) as MiNote[];
+
+				if (notes.length === 0) {
+					job.updateProgress(100);
+					break;
+				}
+
+				cursor = notes.at(-1)?.id ?? null;
 
+				for (const note of notes) {
+					let poll: MiPoll | undefined;
+					if (note.hasPoll) {
+						poll = await this.pollsRepository.findOneByOrFail({ noteId: note.id });
+					}
+					const files = await this.driveFileEntityService.packManyByIds(note.fileIds);
+					const content = JSON.stringify(this.serialize(note, poll, files));
+					const isFirst = exportedNotesCount === 0;
+					await write(isFirst ? content : ',\n' + content);
+					exportedNotesCount++;
+				}
+
+				const total = await this.notesRepository.countBy({
+					userId: user.id,
+				});
+
+				job.updateProgress(exportedNotesCount / total);
+			}
+
+			await write(']');
+
+			stream.end();
 			this.logger.succ(`Exported to: ${path}`);
 
 			const fileName = 'notes-' + dateFormat(new Date(), 'yyyy-MM-dd-HH-mm-ss') + '.json';
@@ -157,4 +130,22 @@ export class ExportNotesProcessorService {
 			cleanup();
 		}
 	}
+
+	private serialize(note: MiNote, poll: MiPoll | null = null, files: Packed<'DriveFile'>[]): Record<string, unknown> {
+		return {
+			id: note.id,
+			text: note.text,
+			createdAt: this.idService.parse(note.id).date.toISOString(),
+			fileIds: note.fileIds,
+			files: files,
+			replyId: note.replyId,
+			renoteId: note.renoteId,
+			poll: poll,
+			cw: note.cw,
+			visibility: note.visibility,
+			visibleUserIds: note.visibleUserIds,
+			localOnly: note.localOnly,
+			reactionAcceptance: note.reactionAcceptance,
+		};
+	}
 }
diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts
index 3addead058..7adadd799b 100644
--- a/packages/backend/src/queue/processors/InboxProcessorService.ts
+++ b/packages/backend/src/queue/processors/InboxProcessorService.ts
@@ -24,7 +24,6 @@ import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
 import { LdSignatureService } from '@/core/activitypub/LdSignatureService.js';
 import { ApInboxService } from '@/core/activitypub/ApInboxService.js';
 import { bindThis } from '@/decorators.js';
-import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { QueueLoggerService } from '../QueueLoggerService.js';
 import type { InboxJobData } from '../types.js';
 
@@ -181,17 +180,7 @@ export class InboxProcessorService {
 		});
 
 		// アクティビティを処理
-		try {
-			await this.apInboxService.performActivity(authUser.user, activity);
-		} catch (e) {
-			if (e instanceof IdentifiableError) {
-				if (e.id === '689ee33f-f97c-479a-ac49-1b9f8140af99') {
-					return 'blocked notes with prohibited words';
-				}
-				if (e.id === '85ab9bd7-3a41-4530-959d-f07073900109') return 'actor has been suspended';
-			}
-			throw e;
-		}
+		await this.apInboxService.performActivity(authUser.user, activity);
 		return 'ok';
 	}
 }
diff --git a/packages/backend/src/server/api/EndpointsModule.ts b/packages/backend/src/server/api/EndpointsModule.ts
index 7a3da56a2c..9bc3506135 100644
--- a/packages/backend/src/server/api/EndpointsModule.ts
+++ b/packages/backend/src/server/api/EndpointsModule.ts
@@ -310,7 +310,6 @@ import * as ep___notes_translate from './endpoints/notes/translate.js';
 import * as ep___notes_unrenote from './endpoints/notes/unrenote.js';
 import * as ep___notes_userListTimeline from './endpoints/notes/user-list-timeline.js';
 import * as ep___notifications_create from './endpoints/notifications/create.js';
-import * as ep___notifications_flush from './endpoints/notifications/flush.js';
 import * as ep___notifications_markAllAsRead from './endpoints/notifications/mark-all-as-read.js';
 import * as ep___notifications_testNotification from './endpoints/notifications/test-notification.js';
 import * as ep___pagePush from './endpoints/page-push.js';
@@ -713,7 +712,6 @@ const $notes_translate: Provider = { provide: 'ep:notes/translate', useClass: ep
 const $notes_unrenote: Provider = { provide: 'ep:notes/unrenote', useClass: ep___notes_unrenote.default };
 const $notes_userListTimeline: Provider = { provide: 'ep:notes/user-list-timeline', useClass: ep___notes_userListTimeline.default };
 const $notifications_create: Provider = { provide: 'ep:notifications/create', useClass: ep___notifications_create.default };
-const $notifications_flush: Provider = { provide: 'ep:notifications/flush', useClass: ep___notifications_flush.default };
 const $notifications_markAllAsRead: Provider = { provide: 'ep:notifications/mark-all-as-read', useClass: ep___notifications_markAllAsRead.default };
 const $notifications_testNotification: Provider = { provide: 'ep:notifications/test-notification', useClass: ep___notifications_testNotification.default };
 const $pagePush: Provider = { provide: 'ep:page-push', useClass: ep___pagePush.default };
@@ -1121,7 +1119,6 @@ const $reversi_verify: Provider = { provide: 'ep:reversi/verify', useClass: ep__
 		$notes_unrenote,
 		$notes_userListTimeline,
 		$notifications_create,
-		$notifications_flush,
 		$notifications_markAllAsRead,
 		$notifications_testNotification,
 		$pagePush,
@@ -1521,9 +1518,7 @@ const $reversi_verify: Provider = { provide: 'ep:reversi/verify', useClass: ep__
 		$notes_unrenote,
 		$notes_userListTimeline,
 		$notifications_create,
-		$notifications_flush,
 		$notifications_markAllAsRead,
-		$notifications_testNotification,
 		$pagePush,
 		$pages_create,
 		$pages_delete,
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index 101ae67f5e..ff75ec81b9 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -309,7 +309,6 @@ import * as ep___notes_translate from './endpoints/notes/translate.js';
 import * as ep___notes_unrenote from './endpoints/notes/unrenote.js';
 import * as ep___notes_userListTimeline from './endpoints/notes/user-list-timeline.js';
 import * as ep___notifications_create from './endpoints/notifications/create.js';
-import * as ep___notifications_flush from './endpoints/notifications/flush.js';
 import * as ep___notifications_markAllAsRead from './endpoints/notifications/mark-all-as-read.js';
 import * as ep___notifications_testNotification from './endpoints/notifications/test-notification.js';
 import * as ep___pagePush from './endpoints/page-push.js';
@@ -710,7 +709,6 @@ const eps = [
 	['notes/unrenote', ep___notes_unrenote],
 	['notes/user-list-timeline', ep___notes_userListTimeline],
 	['notifications/create', ep___notifications_create],
-	['notifications/flush', ep___notifications_flush],
 	['notifications/mark-all-as-read', ep___notifications_markAllAsRead],
 	['notifications/test-notification', ep___notifications_testNotification],
 	['page-push', ep___pagePush],
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
index 796f273330..e32a19120d 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
@@ -31,10 +31,7 @@ export const meta = {
 		},
 	},
 
-	res: {
-		type: 'object',
-		ref: 'EmojiDetailed',
-	},
+	ref: 'EmojiDetailed',
 } as const;
 
 export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/adds.ts b/packages/backend/src/server/api/endpoints/admin/emoji/adds.ts
index de7a8929f1..b7e38e3ff1 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/adds.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/adds.ts
@@ -32,10 +32,7 @@ export const meta = {
 		},
 	},
 
-	res: {
-		type: 'object',
-		ref: 'EmojiDetailed',
-	},
+	ref: 'EmojiDetailed',
 } as const;
 
 export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
index 22609a16a3..a9ff4236d2 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
@@ -57,10 +57,7 @@ export const paramDef = {
 			type: 'string',
 		} },
 	},
-	anyOf: [
-		{ required: ['id'] },
-		{ required: ['name'] },
-	],
+	required: ['id', 'name', 'aliases'],
 } as const;
 
 @Injectable()
@@ -73,33 +70,27 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			let driveFile;
+
 			if (ps.fileId) {
 				driveFile = await this.driveFilesRepository.findOneBy({ id: ps.fileId });
 				if (driveFile == null) throw new ApiError(meta.errors.noSuchFile);
 			}
-
-			let emojiId;
-			if (ps.id) {
-				emojiId = ps.id;
-				const emoji = await this.customEmojiService.getEmojiById(ps.id);
-				if (!emoji) throw new ApiError(meta.errors.noSuchEmoji);
-				if (ps.name && (ps.name !== emoji.name)) {
+			const emoji = await this.customEmojiService.getEmojiById(ps.id);
+			if (emoji != null) {
+				if (ps.name !== emoji.name) {
 					const isDuplicate = await this.customEmojiService.checkDuplicate(ps.name);
 					if (isDuplicate) throw new ApiError(meta.errors.sameNameEmojiExists);
 				}
 			} else {
-				if (!ps.name) throw new Error('Invalid Params unexpectedly passed. This is a BUG. Please report it to the development team.');
-				const emoji = await this.customEmojiService.getEmojiByName(ps.name);
-				if (!emoji) throw new ApiError(meta.errors.noSuchEmoji);
-				emojiId = emoji.id;
+				throw new ApiError(meta.errors.noSuchEmoji);
 			}
 
-			await this.customEmojiService.update(emojiId, {
+			await this.customEmojiService.update(ps.id, {
 				driveFile,
 				name: ps.name,
-				category: ps.category,
+				category: ps.category ?? null,
 				aliases: ps.aliases,
-				license: ps.license,
+				license: ps.license ?? null,
 				isSensitive: ps.isSensitive,
 				localOnly: ps.localOnly,
 				roleIdsThatCanBeUsedThisEmojiAsReaction: ps.roleIdsThatCanBeUsedThisEmojiAsReaction,
diff --git a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
index 0bcdc2a4b8..b989b99e47 100644
--- a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
+++ b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
@@ -24,9 +24,8 @@ export const paramDef = {
 	properties: {
 		host: { type: 'string' },
 		isSuspended: { type: 'boolean' },
-		moderationNote: { type: 'string' },
 	},
-	required: ['host'],
+	required: ['host', 'isSuspended'],
 } as const;
 
 @Injectable()
@@ -48,10 +47,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			await this.federatedInstanceService.update(instance.id, {
 				isSuspended: ps.isSuspended,
-				moderationNote: ps.moderationNote,
 			});
 
-			if (ps.isSuspended != null && instance.isSuspended !== ps.isSuspended) {
+			if (instance.isSuspended !== ps.isSuspended) {
 				if (ps.isSuspended) {
 					this.moderationLogService.log(me, 'suspendRemoteInstance', {
 						id: instance.id,
@@ -64,15 +62,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					});
 				}
 			}
-
-			if (ps.moderationNote != null && instance.moderationNote !== ps.moderationNote) {
-				this.moderationLogService.log(me, 'updateRemoteInstanceNote', {
-					id: instance.id,
-					host: instance.host,
-					before: instance.moderationNote,
-					after: ps.moderationNote,
-				});
-			}
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/show-user.ts b/packages/backend/src/server/api/endpoints/admin/show-user.ts
index 292fc2e436..5a1c05f41a 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-user.ts
@@ -101,7 +101,6 @@ export const meta = {
 					pollEnded: { optional: true, ...notificationRecieveConfig },
 					receiveFollowRequest: { optional: true, ...notificationRecieveConfig },
 					followRequestAccepted: { optional: true, ...notificationRecieveConfig },
-					groupInvited: { optional: true, ...notificationRecieveConfig },
 					roleAssigned: { optional: true, ...notificationRecieveConfig },
 					achievementEarned: { optional: true, ...notificationRecieveConfig },
 					app: { optional: true, ...notificationRecieveConfig },
diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts
index f4dfe1ecc4..39f3fab21e 100644
--- a/packages/backend/src/server/api/endpoints/antennas/notes.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/notes.ts
@@ -124,7 +124,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				notes.sort((a, b) => a.id > b.id ? -1 : 1);
 			}
 
-			this.noteReadService.read(me.id, notes);
+			if (notes.length > 0) {
+				this.noteReadService.read(me.id, notes);
+			}
 
 			return await this.noteEntityService.packMany(notes, me);
 		});
diff --git a/packages/backend/src/server/api/endpoints/antennas/update.ts b/packages/backend/src/server/api/endpoints/antennas/update.ts
index 173409b05f..66140d3d23 100644
--- a/packages/backend/src/server/api/endpoints/antennas/update.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/update.ts
@@ -74,7 +74,7 @@ export const paramDef = {
 		withFile: { type: 'boolean' },
 		notify: { type: 'boolean' },
 	},
-	required: ['antennaId'],
+	required: ['antennaId', 'name', 'src', 'keywords', 'excludeKeywords', 'users', 'caseSensitive', 'withReplies', 'withFile', 'notify'],
 } as const;
 
 @Injectable()
@@ -93,10 +93,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private globalEventService: GlobalEventService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			if (ps.keywords && ps.excludeKeywords) {
-				if (ps.keywords.flat().every(x => x === '') && ps.excludeKeywords.flat().every(x => x === '')) {
-					throw new Error('either keywords or excludeKeywords is required.');
-				}
+			if (ps.keywords.flat().every(x => x === '') && ps.excludeKeywords.flat().every(x => x === '')) {
+				throw new Error('either keywords or excludeKeywords is required.');
 			}
 			// Fetch the antenna
 			const antenna = await this.antennasRepository.findOneBy({
@@ -111,7 +109,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			let userList;
 			let userGroupJoining;
 
-			if ((ps.src === 'list' || antenna.src === 'list') && ps.userListId) {
+			if (ps.src === 'list' && ps.userListId) {
 				userList = await this.userListsRepository.findOneBy({
 					id: ps.userListId,
 					userId: me.id,
@@ -134,7 +132,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			await this.antennasRepository.update(antenna.id, {
 				name: ps.name,
 				src: ps.src,
-				userListId: ps.userListId !== undefined ? userList ? userList.id : null : undefined,
+				userListId: userList ? userList.id : null,
 				userGroupJoiningId: userGroupJoining ? userGroupJoining.id : null,
 				keywords: ps.keywords,
 				excludeKeywords: ps.excludeKeywords,
diff --git a/packages/backend/src/server/api/endpoints/federation/show-instance.ts b/packages/backend/src/server/api/endpoints/federation/show-instance.ts
index 2972861a4b..e3c598d110 100644
--- a/packages/backend/src/server/api/endpoints/federation/show-instance.ts
+++ b/packages/backend/src/server/api/endpoints/federation/show-instance.ts
@@ -43,7 +43,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const instance = await this.instancesRepository
 				.findOneBy({ host: this.utilityService.toPuny(ps.host) });
 
-			return instance ? await this.instanceEntityService.pack(instance, me) : null;
+			return instance ? await this.instanceEntityService.pack(instance) : null;
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/flash/create.ts b/packages/backend/src/server/api/endpoints/flash/create.ts
index 361496e17e..584d167a29 100644
--- a/packages/backend/src/server/api/endpoints/flash/create.ts
+++ b/packages/backend/src/server/api/endpoints/flash/create.ts
@@ -44,7 +44,6 @@ export const paramDef = {
 		permissions: { type: 'array', items: {
 			type: 'string',
 		} },
-		visibility: { type: 'string', enum: ['public', 'private'], default: 'public' },
 	},
 	required: ['title', 'summary', 'script', 'permissions'],
 } as const;
@@ -67,7 +66,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				summary: ps.summary,
 				script: ps.script,
 				permissions: ps.permissions,
-				visibility: ps.visibility,
 			}).then(x => this.flashsRepository.findOneByOrFail(x.identifiers[0]));
 
 			return await this.flashEntityService.pack(flash);
diff --git a/packages/backend/src/server/api/endpoints/flash/update.ts b/packages/backend/src/server/api/endpoints/flash/update.ts
index 8696c6f6e8..7d7633daa5 100644
--- a/packages/backend/src/server/api/endpoints/flash/update.ts
+++ b/packages/backend/src/server/api/endpoints/flash/update.ts
@@ -51,7 +51,7 @@ export const paramDef = {
 		} },
 		visibility: { type: 'string', enum: ['public', 'private'] },
 	},
-	required: ['flashId'],
+	required: ['flashId', 'title', 'summary', 'script', 'permissions'],
 } as const;
 
 @Injectable()
@@ -71,11 +71,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			await this.flashsRepository.update(flash.id, {
 				updatedAt: new Date(),
-				...Object.fromEntries(
-					Object.entries(ps).filter(
-						([key, val]) => (key !== 'flashId') && Object.hasOwn(paramDef.properties, key),
-					),
-				),
+				title: ps.title,
+				summary: ps.summary,
+				script: ps.script,
+				permissions: ps.permissions,
+				visibility: ps.visibility,
 			});
 		});
 	}
diff --git a/packages/backend/src/server/api/endpoints/following/create.ts b/packages/backend/src/server/api/endpoints/following/create.ts
index db320e7129..590fab013f 100644
--- a/packages/backend/src/server/api/endpoints/following/create.ts
+++ b/packages/backend/src/server/api/endpoints/following/create.ts
@@ -100,11 +100,22 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw err;
 			});
 
+			// Check if already following
+			const exist = await this.followingsRepository.exists({
+				where: {
+					followerId: follower.id,
+					followeeId: followee.id,
+				},
+			});
+
+			if (exist) {
+				throw new ApiError(meta.errors.alreadyFollowing);
+			}
+
 			try {
 				await this.userFollowingService.follow(follower, followee, { withReplies: ps.withReplies });
 			} catch (e) {
 				if (e instanceof IdentifiableError) {
-					if (e.id === 'ec3f65c0-a9d1-47d9-8791-b2e7b9dcdced') throw new ApiError(meta.errors.alreadyFollowing);
 					if (e.id === '710e8fb0-b8c3-4922-be49-d5d93d8e6a6e') throw new ApiError(meta.errors.blocking);
 					if (e.id === '3338392a-f764-498d-8855-db939dcf8c48') throw new ApiError(meta.errors.blocked);
 				}
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
index b07cdf1ed9..784ae5088f 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
@@ -12,7 +12,6 @@ import type { MiDriveFile } from '@/models/DriveFile.js';
 import { IdService } from '@/core/IdService.js';
 import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js';
 import { DI } from '@/di-symbols.js';
-import { isNotNull } from '@/misc/is-not-null.js';
 
 export const meta = {
 	tags: ['gallery'],
@@ -70,7 +69,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					id: fileId,
 					userId: me.id,
 				}),
-			))).filter(isNotNull);
+			))).filter((file): file is MiDriveFile => file != null);
 
 			if (files.length === 0) {
 				throw new Error();
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/update.ts b/packages/backend/src/server/api/endpoints/gallery/posts/update.ts
index cbf40a3416..c5162279e7 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/update.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/update.ts
@@ -10,7 +10,6 @@ import type { DriveFilesRepository, GalleryPostsRepository } from '@/models/_.js
 import type { MiDriveFile } from '@/models/DriveFile.js';
 import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js';
 import { DI } from '@/di-symbols.js';
-import { isNotNull } from '@/misc/is-not-null.js';
 
 export const meta = {
 	tags: ['gallery'],
@@ -68,7 +67,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					id: fileId,
 					userId: me.id,
 				}),
-			))).filter(isNotNull);
+			))).filter((file): file is MiDriveFile => file != null);
 
 			if (files.length === 0) {
 				throw new Error();
diff --git a/packages/backend/src/server/api/endpoints/hashtags/search.ts b/packages/backend/src/server/api/endpoints/hashtags/search.ts
index d4eb851054..12d47fa512 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/search.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/search.ts
@@ -43,7 +43,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		super(meta, paramDef, async (ps, me) => {
 			const hashtags = await this.hashtagsRepository.createQueryBuilder('tag')
 				.where('tag.name like :q', { q: sqlLikeEscape(ps.query.toLowerCase()) + '%' })
-				.orderBy('tag.mentionedLocalUsersCount', 'DESC')
+				.orderBy('tag.count', 'DESC')
 				.groupBy('tag.id')
 				.limit(ps.limit)
 				.offset(ps.offset)
diff --git a/packages/backend/src/server/api/endpoints/i/notifications-grouped.ts b/packages/backend/src/server/api/endpoints/i/notifications-grouped.ts
index dc6ffd3e02..703808d279 100644
--- a/packages/backend/src/server/api/endpoints/i/notifications-grouped.ts
+++ b/packages/backend/src/server/api/endpoints/i/notifications-grouped.ts
@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { In } from 'typeorm';
+import { Brackets, In } from 'typeorm';
 import * as Redis from 'ioredis';
 import { Inject, Injectable } from '@nestjs/common';
 import type { NotesRepository } from '@/models/_.js';
-import { obsoleteNotificationTypes, groupedNotificationTypes, FilterUnionByProperty } from '@/types.js';
+import { obsoleteNotificationTypes, notificationTypes, FilterUnionByProperty } from '@/types.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { NoteReadService } from '@/core/NoteReadService.js';
 import { NotificationEntityService } from '@/core/entities/NotificationEntityService.js';
@@ -48,10 +48,10 @@ export const paramDef = {
 		markAsRead: { type: 'boolean', default: true },
 		// 後方互換のため、廃止された通知タイプも受け付ける
 		includeTypes: { type: 'array', items: {
-			type: 'string', enum: [...groupedNotificationTypes, ...obsoleteNotificationTypes],
+			type: 'string', enum: [...notificationTypes, ...obsoleteNotificationTypes],
 		} },
 		excludeTypes: { type: 'array', items: {
-			type: 'string', enum: [...groupedNotificationTypes, ...obsoleteNotificationTypes],
+			type: 'string', enum: [...notificationTypes, ...obsoleteNotificationTypes],
 		} },
 	},
 	required: [],
@@ -79,12 +79,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				return [];
 			}
 			// excludeTypes に全指定されている場合はクエリしない
-			if (groupedNotificationTypes.every(type => ps.excludeTypes?.includes(type))) {
+			if (notificationTypes.every(type => ps.excludeTypes?.includes(type))) {
 				return [];
 			}
 
-			const includeTypes = ps.includeTypes && ps.includeTypes.filter(type => !(obsoleteNotificationTypes).includes(type as any)) as typeof groupedNotificationTypes[number][];
-			const excludeTypes = ps.excludeTypes && ps.excludeTypes.filter(type => !(obsoleteNotificationTypes).includes(type as any)) as typeof groupedNotificationTypes[number][];
+			const includeTypes = ps.includeTypes && ps.includeTypes.filter(type => !(obsoleteNotificationTypes).includes(type as any)) as typeof notificationTypes[number][];
+			const excludeTypes = ps.excludeTypes && ps.excludeTypes.filter(type => !(obsoleteNotificationTypes).includes(type as any)) as typeof notificationTypes[number][];
 
 			const limit = (ps.limit + EXTRA_LIMIT) + (ps.untilId ? 1 : 0) + (ps.sinceId ? 1 : 0); // untilIdに指定したものも含まれるため+1
 			const notificationsRes = await this.redisClient.xrevrange(
@@ -162,6 +162,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}
 
 			groupedNotifications = groupedNotifications.slice(0, ps.limit);
+
 			const noteIds = groupedNotifications
 				.filter((notification): notification is FilterUnionByProperty<MiNotification, 'type', 'mention' | 'reply' | 'quote'> => ['mention', 'reply', 'quote'].includes(notification.type))
 				.map(notification => notification.noteId!);
diff --git a/packages/backend/src/server/api/endpoints/i/notifications.ts b/packages/backend/src/server/api/endpoints/i/notifications.ts
index 320d9fdb00..52b6749e3f 100644
--- a/packages/backend/src/server/api/endpoints/i/notifications.ts
+++ b/packages/backend/src/server/api/endpoints/i/notifications.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { In } from 'typeorm';
+import { Brackets, In } from 'typeorm';
 import * as Redis from 'ioredis';
 import { Inject, Injectable } from '@nestjs/common';
 import type { NotesRepository } from '@/models/_.js';
diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index 348c13cfdd..c001715429 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -201,7 +201,6 @@ export const paramDef = {
 				pollEnded: notificationRecieveConfig,
 				receiveFollowRequest: notificationRecieveConfig,
 				followRequestAccepted: notificationRecieveConfig,
-				groupInvited: notificationRecieveConfig,
 				roleAssigned: notificationRecieveConfig,
 				achievementEarned: notificationRecieveConfig,
 				app: notificationRecieveConfig,
@@ -461,9 +460,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			this.hashtagService.updateUsertags(user, tags);
 			//#endregion
 
-			if (Object.keys(updates).length > 0) {
-				await this.usersRepository.update(user.id, updates);
-				this.globalEventService.publishInternalEvent('localUserUpdated', { id: user.id });
+			if (Object.keys(updates).length > 0) await this.usersRepository.update(user.id, updates);
+			if (Object.keys(updates).includes('alsoKnownAs')) {
+				this.cacheService.uriPersonCache.set(this.userEntityService.genLocalUserUri(user.id), { ...user, ...updates });
 			}
 
 			await this.userProfilesRepository.update(user.id, {
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index 5460635e1d..8d0cf3a2c9 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -3,9 +3,18 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { Injectable } from '@nestjs/common';
+import { IsNull, LessThanOrEqual, MoreThan, Brackets } from 'typeorm';
+import { Inject, Injectable } from '@nestjs/common';
+import JSON5 from 'json5';
+import type { AdsRepository } from '@/models/_.js';
+import { MAX_NOTE_TEXT_LENGTH } from '@/const.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import { MetaEntityService } from '@/core/entities/MetaEntityService.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { MetaService } from '@/core/MetaService.js';
+import { InstanceActorService } from '@/core/InstanceActorService.js';
+import type { Config } from '@/config.js';
+import { DI } from '@/di-symbols.js';
+import { DEFAULT_POLICIES } from '@/core/RoleService.js';
 
 export const meta = {
 	tags: ['meta'],
@@ -14,10 +23,301 @@ export const meta = {
 
 	res: {
 		type: 'object',
-		oneOf: [
-			{ type: 'object', ref: 'MetaLite' },
-			{ type: 'object', ref: 'MetaDetailed' },
-		],
+		optional: false, nullable: false,
+		properties: {
+			maintainerName: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			maintainerEmail: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			version: {
+				type: 'string',
+				optional: false, nullable: false,
+			},
+			basedMisskeyVersion: {
+				type: 'string',
+				optional: false, nullable: false,
+			},
+			providesTarball: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
+			name: {
+				type: 'string',
+				optional: false, nullable: false,
+			},
+			shortName: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			uri: {
+				type: 'string',
+				optional: false, nullable: false,
+				format: 'url',
+				example: 'https://cherrypick.example.com',
+			},
+			description: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			langs: {
+				type: 'array',
+				optional: false, nullable: false,
+				items: {
+					type: 'string',
+					optional: false, nullable: false,
+				},
+			},
+			tosUrl: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			repositoryUrl: {
+				type: 'string',
+				optional: false, nullable: true,
+				default: 'https://github.com/kokonect-link/cherrypick',
+			},
+			feedbackUrl: {
+				type: 'string',
+				optional: false, nullable: true,
+				default: 'https://github.com/kokonect-link/cherrypick/issues/new',
+			},
+			defaultDarkTheme: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			defaultLightTheme: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			disableRegistration: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
+			cacheRemoteFiles: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
+			cacheRemoteSensitiveFiles: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
+			emailRequiredForSignup: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
+			enableHcaptcha: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
+			hcaptchaSiteKey: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			enableMcaptcha: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
+			mcaptchaSiteKey: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			mcaptchaInstanceUrl: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			enableRecaptcha: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
+			recaptchaSiteKey: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			enableTurnstile: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
+			turnstileSiteKey: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			swPublickey: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			mascotImageUrl: {
+				type: 'string',
+				optional: false, nullable: false,
+				default: '/assets/ai.png',
+			},
+			bannerUrl: {
+				type: 'string',
+				optional: false, nullable: false,
+			},
+			serverErrorImageUrl: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			infoImageUrl: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			notFoundImageUrl: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			iconUrl: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			maxNoteTextLength: {
+				type: 'number',
+				optional: false, nullable: false,
+			},
+			ads: {
+				type: 'array',
+				optional: false, nullable: false,
+				items: {
+					type: 'object',
+					optional: false, nullable: false,
+					properties: {
+						id: {
+							type: 'string',
+							optional: false, nullable: false,
+							format: 'id',
+							example: 'xxxxxxxxxx',
+						},
+						url: {
+							type: 'string',
+							optional: false, nullable: false,
+							format: 'url',
+						},
+						place: {
+							type: 'string',
+							optional: false, nullable: false,
+						},
+						ratio: {
+							type: 'number',
+							optional: false, nullable: false,
+						},
+						imageUrl: {
+							type: 'string',
+							optional: false, nullable: false,
+							format: 'url',
+						},
+						dayOfWeek: {
+							type: 'integer',
+							optional: false, nullable: false,
+						},
+					},
+				},
+			},
+			notesPerOneAd: {
+				type: 'number',
+				optional: false, nullable: false,
+				default: 0,
+			},
+			requireSetup: {
+				type: 'boolean',
+				optional: false, nullable: false,
+				example: false,
+			},
+			enableEmail: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
+			enableServiceWorker: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
+			translatorAvailable: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
+			proxyAccountName: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			mediaProxy: {
+				type: 'string',
+				optional: false, nullable: false,
+			},
+			features: {
+				type: 'object',
+				optional: true, nullable: false,
+				properties: {
+					registration: {
+						type: 'boolean',
+						optional: false, nullable: false,
+					},
+					localTimeline: {
+						type: 'boolean',
+						optional: false, nullable: false,
+					},
+					globalTimeline: {
+						type: 'boolean',
+						optional: false, nullable: false,
+					},
+					hcaptcha: {
+						type: 'boolean',
+						optional: false, nullable: false,
+					},
+					recaptcha: {
+						type: 'boolean',
+						optional: false, nullable: false,
+					},
+					objectStorage: {
+						type: 'boolean',
+						optional: false, nullable: false,
+					},
+					serviceWorker: {
+						type: 'boolean',
+						optional: false, nullable: false,
+					},
+					miauth: {
+						type: 'boolean',
+						optional: true, nullable: false,
+						default: true,
+					},
+				},
+			},
+			backgroundImageUrl: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			impressumUrl: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			logoImageUrl: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			privacyPolicyUrl: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			serverRules: {
+				type: 'array',
+				optional: false, nullable: false,
+				items: {
+					type: 'string',
+				},
+			},
+			themeColor: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
+			policies: {
+				type: 'object',
+				optional: false, nullable: false,
+				ref: 'RolePolicies',
+			},
+		},
 	},
 } as const;
 
@@ -32,10 +332,118 @@ export const paramDef = {
 @Injectable()
 export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
 	constructor(
-		private metaEntityService: MetaEntityService,
+		@Inject(DI.config)
+		private config: Config,
+
+		@Inject(DI.adsRepository)
+		private adsRepository: AdsRepository,
+
+		private userEntityService: UserEntityService,
+		private metaService: MetaService,
+		private instanceActorService: InstanceActorService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			return ps.detail ? await this.metaEntityService.packDetailed() : await this.metaEntityService.pack();
+			const instance = await this.metaService.fetch(true);
+
+			const ads = await this.adsRepository.createQueryBuilder('ads')
+				.where('ads.expiresAt > :now', { now: new Date() })
+				.andWhere('ads.startsAt <= :now', { now: new Date() })
+				.andWhere(new Brackets(qb => {
+					// 曜日のビットフラグを確認する
+					qb.where('ads.dayOfWeek & :dayOfWeek > 0', { dayOfWeek: 1 << new Date().getDay() })
+						.orWhere('ads.dayOfWeek = 0');
+				}))
+				.getMany();
+
+			const response: any = {
+				maintainerName: instance.maintainerName,
+				maintainerEmail: instance.maintainerEmail,
+
+				version: this.config.version,
+				basedMisskeyVersion: this.config.basedMisskeyVersion,
+				providesTarball: this.config.publishTarballInsteadOfProvideRepositoryUrl,
+
+				name: instance.name,
+				shortName: instance.shortName,
+				uri: this.config.url,
+				description: instance.description,
+				langs: instance.langs,
+				tosUrl: instance.termsOfServiceUrl,
+				repositoryUrl: instance.repositoryUrl,
+				feedbackUrl: instance.feedbackUrl,
+				impressumUrl: instance.impressumUrl,
+				privacyPolicyUrl: instance.privacyPolicyUrl,
+				statusUrl: instance.statusUrl,
+				disableRegistration: instance.disableRegistration,
+				emailRequiredForSignup: instance.emailRequiredForSignup,
+				enableHcaptcha: instance.enableHcaptcha,
+				hcaptchaSiteKey: instance.hcaptchaSiteKey,
+				enableMcaptcha: instance.enableMcaptcha,
+				mcaptchaSiteKey: instance.mcaptchaSitekey,
+				mcaptchaInstanceUrl: instance.mcaptchaInstanceUrl,
+				enableRecaptcha: instance.enableRecaptcha,
+				recaptchaSiteKey: instance.recaptchaSiteKey,
+				enableTurnstile: instance.enableTurnstile,
+				turnstileSiteKey: instance.turnstileSiteKey,
+				swPublickey: instance.swPublicKey,
+				themeColor: instance.themeColor,
+				mascotImageUrl: instance.mascotImageUrl,
+				bannerUrl: instance.bannerUrl,
+				infoImageUrl: instance.infoImageUrl,
+				serverErrorImageUrl: instance.serverErrorImageUrl,
+				notFoundImageUrl: instance.notFoundImageUrl,
+				iconUrl: instance.iconUrl,
+				backgroundImageUrl: instance.backgroundImageUrl,
+				logoImageUrl: instance.logoImageUrl,
+				maxNoteTextLength: MAX_NOTE_TEXT_LENGTH,
+				// クライアントの手間を減らすためあらかじめJSONに変換しておく
+				defaultLightTheme: instance.defaultLightTheme ? JSON.stringify(JSON5.parse(instance.defaultLightTheme)) : null,
+				defaultDarkTheme: instance.defaultDarkTheme ? JSON.stringify(JSON5.parse(instance.defaultDarkTheme)) : null,
+				ads: ads.map(ad => ({
+					id: ad.id,
+					url: ad.url,
+					place: ad.place,
+					ratio: ad.ratio,
+					imageUrl: ad.imageUrl,
+					dayOfWeek: ad.dayOfWeek,
+				})),
+				notesPerOneAd: instance.notesPerOneAd,
+				enableEmail: instance.enableEmail,
+				enableServiceWorker: instance.enableServiceWorker,
+
+				// translatorAvailable: instance.deeplAuthKey != null,
+				translatorAvailable: instance.translatorType != null,
+
+				serverRules: instance.serverRules,
+
+				policies: { ...DEFAULT_POLICIES, ...instance.policies },
+
+				mediaProxy: this.config.mediaProxy,
+
+				...(ps.detail ? {
+					cacheRemoteFiles: instance.cacheRemoteFiles,
+					cacheRemoteSensitiveFiles: instance.cacheRemoteSensitiveFiles,
+					requireSetup: !await this.instanceActorService.realLocalUsersPresent(),
+				} : {}),
+			};
+
+			if (ps.detail) {
+				const proxyAccount = instance.proxyAccountId ? await this.userEntityService.pack(instance.proxyAccountId).catch(() => null) : null;
+
+				response.proxyAccountName = proxyAccount ? proxyAccount.username : null;
+				response.features = {
+					registration: !instance.disableRegistration,
+					emailRequiredForSignup: instance.emailRequiredForSignup,
+					hcaptcha: instance.enableHcaptcha,
+					recaptcha: instance.enableRecaptcha,
+					turnstile: instance.enableTurnstile,
+					objectStorage: instance.useObjectStorage,
+					serviceWorker: instance.enableServiceWorker,
+					miauth: true,
+				};
+			}
+
+			return response;
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts
index c125690fa1..07d328724f 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.ts
@@ -19,7 +19,6 @@ import { DI } from '@/di-symbols.js';
 import { isPureRenote } from '@/misc/is-pure-renote.js';
 import { MetaService } from '@/core/MetaService.js';
 import { UtilityService } from '@/core/UtilityService.js';
-import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -85,12 +84,6 @@ export const meta = {
 			id: '3ac74a84-8fd5-4bb0-870f-01804f82ce15',
 		},
 
-		cannotReplyToSpecifiedVisibilityNoteWithExtendedVisibility: {
-			message: 'You cannot reply to a specified visibility note with extended visibility.',
-			code: 'CANNOT_REPLY_TO_SPECIFIED_VISIBILITY_NOTE_WITH_EXTENDED_VISIBILITY',
-			id: 'ed940410-535c-4d5e-bfa3-af798671e93c',
-		},
-
 		cannotCreateAlreadyExpiredPoll: {
 			message: 'Poll is already expired.',
 			code: 'CANNOT_CREATE_ALREADY_EXPIRED_POLL',
@@ -126,12 +119,6 @@ export const meta = {
 			code: 'CONTAINS_PROHIBITED_WORDS',
 			id: 'aa6e01d3-a85c-669d-758a-76aab43af334',
 		},
-
-		containsTooManyMentions: {
-			message: 'Cannot post because it exceeds the allowed number of mentions.',
-			code: 'CONTAINS_TOO_MANY_MENTIONS',
-			id: '4de0363a-3046-481b-9b0f-feff3e211025',
-		},
 	},
 } as const;
 
@@ -336,8 +323,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					throw new ApiError(meta.errors.cannotReplyToPureRenote);
 				} else if (!await this.noteEntityService.isVisibleForMe(reply, me.id)) {
 					throw new ApiError(meta.errors.cannotReplyToInvisibleNote);
-				} else if (reply.visibility === 'specified' && ps.visibility !== 'specified') {
-					throw new ApiError(meta.errors.cannotReplyToSpecifiedVisibilityNoteWithExtendedVisibility);
 				}
 
 				// Check blocking
@@ -409,13 +394,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				};
 			} catch (e) {
 				// TODO: 他のErrorもここでキャッチしてエラーメッセージを当てるようにしたい
-				if (e instanceof IdentifiableError) {
-					if (e.id === '689ee33f-f97c-479a-ac49-1b9f8140af99') {
-						throw new ApiError(meta.errors.containsProhibitedWords);
-					} else if (e.id === '9f466dab-c856-48cd-9e65-ff90ff750580') {
-						throw new ApiError(meta.errors.containsTooManyMentions);
-					}
+				if (e instanceof NoteCreateService.ContainsProhibitedWordsError) {
+					throw new ApiError(meta.errors.containsProhibitedWords);
 				}
+
 				throw e;
 			}
 		});
diff --git a/packages/backend/src/server/api/endpoints/notifications/flush.ts b/packages/backend/src/server/api/endpoints/notifications/flush.ts
deleted file mode 100644
index 47c0642fd1..0000000000
--- a/packages/backend/src/server/api/endpoints/notifications/flush.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Injectable } from '@nestjs/common';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import { NotificationService } from '@/core/NotificationService.js';
-
-export const meta = {
-	tags: ['notifications', 'account'],
-
-	requireCredential: true,
-
-	kind: 'write:notifications',
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {},
-	required: [],
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
-	constructor(
-		private notificationService: NotificationService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			this.notificationService.flushAllNotifications(me.id);
-		});
-	}
-}
diff --git a/packages/backend/src/server/api/endpoints/pinned-users.ts b/packages/backend/src/server/api/endpoints/pinned-users.ts
index 784766bcb5..1f4509764f 100644
--- a/packages/backend/src/server/api/endpoints/pinned-users.ts
+++ b/packages/backend/src/server/api/endpoints/pinned-users.ts
@@ -12,7 +12,6 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
 import { MetaService } from '@/core/MetaService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { DI } from '@/di-symbols.js';
-import { isNotNull } from '@/misc/is-not-null.js';
 
 export const meta = {
 	tags: ['users'],
@@ -53,7 +52,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				host: acct.host ?? IsNull(),
 			})));
 
-			return await this.userEntityService.packMany(users.filter(isNotNull), me, { schema: 'UserDetailed' });
+			return await this.userEntityService.packMany(users.filter(x => x !== null) as MiUser[], me, { schema: 'UserDetailed' });
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/sw/register.ts b/packages/backend/src/server/api/endpoints/sw/register.ts
index a9a33149f9..06c04b3f9a 100644
--- a/packages/backend/src/server/api/endpoints/sw/register.ts
+++ b/packages/backend/src/server/api/endpoints/sw/register.ts
@@ -9,7 +9,6 @@ import type { SwSubscriptionsRepository } from '@/models/_.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { MetaService } from '@/core/MetaService.js';
 import { DI } from '@/di-symbols.js';
-import { PushNotificationService } from '@/core/PushNotificationService.js';
 
 export const meta = {
 	tags: ['account'],
@@ -67,7 +66,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 		private idService: IdService,
 		private metaService: MetaService,
-		private pushNotificationService: PushNotificationService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			// if already subscribed
@@ -99,8 +97,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				sendReadMessage: ps.sendReadMessage,
 			});
 
-			this.pushNotificationService.refreshCache(me.id);
-
 			return {
 				state: 'subscribed' as const,
 				key: instance.swPublicKey,
diff --git a/packages/backend/src/server/api/endpoints/sw/unregister.ts b/packages/backend/src/server/api/endpoints/sw/unregister.ts
index 2edf7fab1b..2bc91c7278 100644
--- a/packages/backend/src/server/api/endpoints/sw/unregister.ts
+++ b/packages/backend/src/server/api/endpoints/sw/unregister.ts
@@ -7,7 +7,6 @@ import { Inject, Injectable } from '@nestjs/common';
 import type { SwSubscriptionsRepository } from '@/models/_.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { DI } from '@/di-symbols.js';
-import { PushNotificationService } from '@/core/PushNotificationService.js';
 
 export const meta = {
 	tags: ['account'],
@@ -30,18 +29,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 	constructor(
 		@Inject(DI.swSubscriptionsRepository)
 		private swSubscriptionsRepository: SwSubscriptionsRepository,
-
-		private pushNotificationService: PushNotificationService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			await this.swSubscriptionsRepository.delete({
 				...(me ? { userId: me.id } : {}),
 				endpoint: ps.endpoint,
 			});
-
-			if (me) {
-				this.pushNotificationService.refreshCache(me.id);
-			}
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/sw/update-registration.ts b/packages/backend/src/server/api/endpoints/sw/update-registration.ts
index 839a07c770..b56b07fd00 100644
--- a/packages/backend/src/server/api/endpoints/sw/update-registration.ts
+++ b/packages/backend/src/server/api/endpoints/sw/update-registration.ts
@@ -7,7 +7,6 @@ import { Inject, Injectable } from '@nestjs/common';
 import type { SwSubscriptionsRepository } from '@/models/_.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { DI } from '@/di-symbols.js';
-import { PushNotificationService } from '@/core/PushNotificationService.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -59,8 +58,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 	constructor(
 		@Inject(DI.swSubscriptionsRepository)
 		private swSubscriptionsRepository: SwSubscriptionsRepository,
-
-		private pushNotificationService: PushNotificationService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const swSubscription = await this.swSubscriptionsRepository.findOneBy({
@@ -80,8 +77,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				sendReadMessage: swSubscription.sendReadMessage,
 			});
 
-			this.pushNotificationService.refreshCache(me.id);
-
 			return {
 				userId: swSubscription.userId,
 				endpoint: swSubscription.endpoint,
diff --git a/packages/backend/src/server/api/endpoints/users/reactions.ts b/packages/backend/src/server/api/endpoints/users/reactions.ts
index 23b3a517c2..9dbee87b82 100644
--- a/packages/backend/src/server/api/endpoints/users/reactions.ts
+++ b/packages/backend/src/server/api/endpoints/users/reactions.ts
@@ -109,7 +109,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.limit(ps.limit)
 				.getRawMany<MiNoteReaction>();
 
-			return await this.noteReactionEntityService.packMany(reactions, me, { withNote: true });
+			return await Promise.all(reactions.map(reaction => this.noteReactionEntityService.pack(reaction, me, { withNote: true })));
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/users/relation.ts b/packages/backend/src/server/api/endpoints/users/relation.ts
index 1d75437b81..6a5b2262fa 100644
--- a/packages/backend/src/server/api/endpoints/users/relation.ts
+++ b/packages/backend/src/server/api/endpoints/users/relation.ts
@@ -132,9 +132,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private userEntityService: UserEntityService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			return Array.isArray(ps.userId)
-				? await this.userEntityService.getRelations(me.id, ps.userId).then(it => [...it.values()])
-				: await this.userEntityService.getRelation(me.id, ps.userId).then(it => [it]);
+			const ids = Array.isArray(ps.userId) ? ps.userId : [ps.userId];
+
+			const relations = await Promise.all(ids.map(id => this.userEntityService.getRelation(me.id, id)));
+
+			return Array.isArray(ps.userId) ? relations : relations[0];
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/stream/channels/home-timeline.ts b/packages/backend/src/server/api/stream/channels/home-timeline.ts
index f45bf8622e..ce9d7f5647 100644
--- a/packages/backend/src/server/api/stream/channels/home-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/home-timeline.ts
@@ -71,15 +71,7 @@ class HomeTimelineChannel extends Channel {
 			}
 		}
 
-		// 純粋なリノート（引用リノートでないリノート）の場合
-		if (note.renote && note.text == null && (note.fileIds == null || note.fileIds.length === 0) && note.poll == null) {
-			if (!this.withRenotes) return;
-			if (note.renote.reply) {
-				const reply = note.renote.reply;
-				// 自分のフォローしていないユーザーの visibility: followers な投稿への返信のリノートは弾く
-				if (reply.visibility === 'followers' && !Object.hasOwn(this.following, reply.userId)) return;
-			}
-		}
+		if (note.renote && note.text == null && (note.fileIds == null || note.fileIds.length === 0) && !this.withRenotes) return;
 
 		// 流れてきたNoteがミュートしているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.userIdsWhoMeMuting)) return;
diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts
index cca3c4e096..345a26cd62 100644
--- a/packages/backend/src/server/web/ClientServerService.ts
+++ b/packages/backend/src/server/web/ClientServerService.ts
@@ -19,7 +19,6 @@ import fastifyView from '@fastify/view';
 import fastifyCookie from '@fastify/cookie';
 import fastifyProxy from '@fastify/http-proxy';
 import vary from 'vary';
-import htmlSafeJsonStringify from 'htmlescape';
 import type { Config } from '@/config.js';
 import { getNoteSummary } from '@/misc/get-note-summary.js';
 import { DI } from '@/di-symbols.js';
@@ -29,12 +28,12 @@ import type { DbQueue, DeliverQueue, EndedPollNotificationQueue, InboxQueue, Obj
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { PageEntityService } from '@/core/entities/PageEntityService.js';
-import { MetaEntityService } from '@/core/entities/MetaEntityService.js';
 import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js';
 import { ClipEntityService } from '@/core/entities/ClipEntityService.js';
 import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js';
 import type { ChannelsRepository, ClipsRepository, FlashsRepository, GalleryPostsRepository, MiMeta, NotesRepository, PagesRepository, ReversiGamesRepository, UserProfilesRepository, UsersRepository } from '@/models/_.js';
 import type Logger from '@/logger.js';
+import { deepClone } from '@/misc/clone.js';
 import { handleRequestRedirectToOmitSearch } from '@/misc/fastify-hook-handlers.js';
 import { bindThis } from '@/decorators.js';
 import { FlashEntityService } from '@/core/entities/FlashEntityService.js';
@@ -94,7 +93,6 @@ export class ClientServerService {
 		private userEntityService: UserEntityService,
 		private noteEntityService: NoteEntityService,
 		private pageEntityService: PageEntityService,
-		private metaEntityService: MetaEntityService,
 		private galleryPostEntityService: GalleryPostEntityService,
 		private clipEntityService: ClipEntityService,
 		private channelEntityService: ChannelEntityService,
@@ -175,7 +173,7 @@ export class ClientServerService {
 	}
 
 	@bindThis
-	private async generateCommonPugData(meta: MiMeta) {
+	private generateCommonPugData(meta: MiMeta) {
 		return {
 			instanceName: meta.name ?? 'CherryPick',
 			icon: meta.iconUrl,
@@ -185,8 +183,6 @@ export class ClientServerService {
 			infoImageUrl: meta.infoImageUrl ?? 'https://xn--931a.moe/assets/info.jpg',
 			notFoundImageUrl: meta.notFoundImageUrl ?? 'https://xn--931a.moe/assets/not-found.jpg',
 			instanceUrl: this.config.url,
-			metaJson: htmlSafeJsonStringify(await this.metaEntityService.packDetailed(meta)),
-			now: Date.now(),
 		};
 	}
 
@@ -438,7 +434,7 @@ export class ClientServerService {
 				url: this.config.url,
 				title: meta.name ?? 'CherryPick',
 				desc: meta.description,
-				...await this.generateCommonPugData(meta),
+				...this.generateCommonPugData(meta),
 			});
 		};
 
@@ -525,7 +521,7 @@ export class ClientServerService {
 					user, profile, me,
 					avatarUrl: user.avatarUrl ?? this.userEntityService.getIdenticonUrl(user),
 					sub: request.params.sub,
-					...await this.generateCommonPugData(meta),
+					...this.generateCommonPugData(meta),
 				});
 			} else {
 				// リモートユーザーなので
@@ -575,7 +571,7 @@ export class ClientServerService {
 					avatarUrl: _note.user.avatarUrl,
 					// TODO: Let locale changeable by instance setting
 					summary: getNoteSummary(_note),
-					...await this.generateCommonPugData(meta),
+					...this.generateCommonPugData(meta),
 				});
 			} else {
 				return await renderBase(reply);
@@ -614,7 +610,7 @@ export class ClientServerService {
 					page: _page,
 					profile,
 					avatarUrl: _page.user.avatarUrl,
-					...await this.generateCommonPugData(meta),
+					...this.generateCommonPugData(meta),
 				});
 			} else {
 				return await renderBase(reply);
@@ -640,7 +636,7 @@ export class ClientServerService {
 					flash: _flash,
 					profile,
 					avatarUrl: _flash.user.avatarUrl,
-					...await this.generateCommonPugData(meta),
+					...this.generateCommonPugData(meta),
 				});
 			} else {
 				return await renderBase(reply);
@@ -666,7 +662,7 @@ export class ClientServerService {
 					clip: _clip,
 					profile,
 					avatarUrl: _clip.user.avatarUrl,
-					...await this.generateCommonPugData(meta),
+					...this.generateCommonPugData(meta),
 				});
 			} else {
 				return await renderBase(reply);
@@ -690,7 +686,7 @@ export class ClientServerService {
 					post: _post,
 					profile,
 					avatarUrl: _post.user.avatarUrl,
-					...await this.generateCommonPugData(meta),
+					...this.generateCommonPugData(meta),
 				});
 			} else {
 				return await renderBase(reply);
@@ -709,7 +705,7 @@ export class ClientServerService {
 				reply.header('Cache-Control', 'public, max-age=15');
 				return await reply.view('channel', {
 					channel: _channel,
-					...await this.generateCommonPugData(meta),
+					...this.generateCommonPugData(meta),
 				});
 			} else {
 				return await renderBase(reply);
@@ -728,7 +724,7 @@ export class ClientServerService {
 				reply.header('Cache-Control', 'public, max-age=3600');
 				return await reply.view('reversi-game', {
 					game: _game,
-					...await this.generateCommonPugData(meta),
+					...this.generateCommonPugData(meta),
 				});
 			} else {
 				return await renderBase(reply);
diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js
index f6218992f7..290431c2e5 100644
--- a/packages/backend/src/server/web/boot.js
+++ b/packages/backend/src/server/web/boot.js
@@ -91,8 +91,8 @@
 	//#endregion
 
 	//#region Script
-	async function importAppScript() {
-		await import(`/vite/${CLIENT_ENTRY}`)
+	function importAppScript() {
+		import(`/vite/${CLIENT_ENTRY}`)
 			.catch(async e => {
 				console.error(e);
 				renderError('APP_IMPORT', e);
diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug
index dd06651a09..1423d39b8a 100644
--- a/packages/backend/src/server/web/views/base.pug
+++ b/packages/backend/src/server/web/views/base.pug
@@ -68,9 +68,6 @@ html
 			var VERSION = "#{version}";
 			var CLIENT_ENTRY = "#{clientEntry.file}";
 
-		script(type='application/json' id='misskey_meta' data-generated-at=now)
-			!= metaJson
-
 		script
 			include ../boot.js
 
diff --git a/packages/backend/src/server/web/views/note.pug b/packages/backend/src/server/web/views/note.pug
index fb659ce171..9bc652b6a1 100644
--- a/packages/backend/src/server/web/views/note.pug
+++ b/packages/backend/src/server/web/views/note.pug
@@ -2,7 +2,7 @@ extends ./base
 
 block vars
 	- const user = note.user;
-	- const title = user.name ? `${user.name} (@${user.username}${user.host ? `@${user.host}` : ''})` : `@${user.username}${user.host ? `@${user.host}` : ''}`;
+	- const title = user.name ? `${user.name} (@${user.username})` : `@${user.username}`;
 	- const url = `${config.url}/notes/${note.id}`;
 	- const isRenote = note.renote && note.text == null && note.fileIds.length == 0 && note.poll == null;
 	- const images = (note.files || []).filter(file => file.type.startsWith('image/') && !file.isSensitive)
@@ -28,7 +28,7 @@ block og
 			// FIXME: add embed player for Twitter
 	if images.length
 		meta(property='twitter:card' content='summary_large_image')
-		each image in images
+		each image in images	
 			meta(property='og:image'     content= image.url)
 	else
 		meta(property='twitter:card' content='summary')
diff --git a/packages/backend/src/server/web/views/user.pug b/packages/backend/src/server/web/views/user.pug
index 2b0a7bab5c..83d57349a6 100644
--- a/packages/backend/src/server/web/views/user.pug
+++ b/packages/backend/src/server/web/views/user.pug
@@ -1,7 +1,7 @@
 extends ./base
 
 block vars
-	- const title = user.name ? `${user.name} (@${user.username}${user.host ? `@${user.host}` : ''})` : `@${user.username}${user.host ? `@${user.host}` : ''}`;
+	- const title = user.name ? `${user.name} (@${user.username})` : `@${user.username}`;
 	- const url = `${config.url}/@${(user.host ? `${user.username}@${user.host}` : user.username)}`;
 
 block title
diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
index 20d83cb137..24510d7f69 100644
--- a/packages/backend/src/types.ts
+++ b/packages/backend/src/types.ts
@@ -14,8 +14,8 @@
  * pollEnded - 自分のアンケートもしくは自分が投票したアンケートが終了した
  * receiveFollowRequest - フォローリクエストされた
  * followRequestAccepted - 自分の送ったフォローリクエストが承認された
- * groupInvited - グループに招待された
  * roleAssigned - ロールが付与された
+ * groupInvited - グループに招待された
  * achievementEarned - 実績を獲得
  * app - アプリ通知
  * test - テスト通知（サーバー側）
@@ -31,19 +31,11 @@ export const notificationTypes = [
 	'pollEnded',
 	'receiveFollowRequest',
 	'followRequestAccepted',
-	'groupInvited',
 	'roleAssigned',
+	'groupInvited',
 	'achievementEarned',
 	'app',
-	'test',
-] as const;
-
-export const groupedNotificationTypes = [
-	...notificationTypes,
-	'reaction:grouped',
-	'renote:grouped',
-] as const;
-
+	'test'] as const;
 export const obsoleteNotificationTypes = ['pollVote'/*, 'groupInvited'*/] as const;
 
 export const noteVisibilities = ['public', 'home', 'followers', 'specified'] as const;
@@ -79,7 +71,6 @@ export const moderationLogTypes = [
 	'resetPassword',
 	'suspendRemoteInstance',
 	'unsuspendRemoteInstance',
-	'updateRemoteInstanceNote',
 	'markSensitiveDriveFile',
 	'unmarkSensitiveDriveFile',
 	'resolveAbuseReport',
@@ -220,12 +211,6 @@ export type ModerationLogPayloads = {
 		id: string;
 		host: string;
 	};
-	updateRemoteInstanceNote: {
-		id: string;
-		host: string;
-		before: string | null;
-		after: string | null;
-	};
 	markSensitiveDriveFile: {
 		fileId: string;
 		fileUserId: string | null;
diff --git a/packages/backend/test/e2e/2fa.ts b/packages/backend/test/e2e/2fa.ts
index 1a7a89734b..8084081a55 100644
--- a/packages/backend/test/e2e/2fa.ts
+++ b/packages/backend/test/e2e/2fa.ts
@@ -187,7 +187,7 @@ describe('2要素認証', () => {
 	}, 1000 * 60 * 2);
 
 	test('が設定でき、OTPでログインできる。', async () => {
-		const registerResponse = await api('i/2fa/register', {
+		const registerResponse = await api('/i/2fa/register', {
 			password,
 		}, alice);
 		assert.strictEqual(registerResponse.status, 200);
@@ -197,18 +197,18 @@ describe('2要素認証', () => {
 		assert.strictEqual(registerResponse.body.label, username);
 		assert.strictEqual(registerResponse.body.issuer, config.host);
 
-		const doneResponse = await api('i/2fa/done', {
+		const doneResponse = await api('/i/2fa/done', {
 			token: otpToken(registerResponse.body.secret),
 		}, alice);
 		assert.strictEqual(doneResponse.status, 200);
 
-		const usersShowResponse = await api('users/show', {
+		const usersShowResponse = await api('/users/show', {
 			username,
 		}, alice);
 		assert.strictEqual(usersShowResponse.status, 200);
 		assert.strictEqual(usersShowResponse.body.twoFactorEnabled, true);
 
-		const signinResponse = await api('signin', {
+		const signinResponse = await api('/signin', {
 			...signinParam(),
 			token: otpToken(registerResponse.body.secret),
 		});
@@ -216,24 +216,24 @@ describe('2要素認証', () => {
 		assert.notEqual(signinResponse.body.i, undefined);
 
 		// 後片付け
-		await api('i/2fa/unregister', {
+		await api('/i/2fa/unregister', {
 			password,
 			token: otpToken(registerResponse.body.secret),
 		}, alice);
 	});
 
 	test('が設定でき、セキュリティキーでログインできる。', async () => {
-		const registerResponse = await api('i/2fa/register', {
+		const registerResponse = await api('/i/2fa/register', {
 			password,
 		}, alice);
 		assert.strictEqual(registerResponse.status, 200);
 
-		const doneResponse = await api('i/2fa/done', {
+		const doneResponse = await api('/i/2fa/done', {
 			token: otpToken(registerResponse.body.secret),
 		}, alice);
 		assert.strictEqual(doneResponse.status, 200);
 
-		const registerKeyResponse = await api('i/2fa/register-key', {
+		const registerKeyResponse = await api('/i/2fa/register-key', {
 			password,
 			token: otpToken(registerResponse.body.secret),
 		}, alice);
@@ -243,23 +243,23 @@ describe('2要素認証', () => {
 
 		const keyName = 'example-key';
 		const credentialId = crypto.randomBytes(0x41);
-		const keyDoneResponse = await api('i/2fa/key-done', keyDoneParam({
+		const keyDoneResponse = await api('/i/2fa/key-done', keyDoneParam({
 			token: otpToken(registerResponse.body.secret),
 			keyName,
 			credentialId,
 			creationOptions: registerKeyResponse.body,
-		}) as any, alice);
+		}), alice);
 		assert.strictEqual(keyDoneResponse.status, 200);
 		assert.strictEqual(keyDoneResponse.body.id, credentialId.toString('base64url'));
 		assert.strictEqual(keyDoneResponse.body.name, keyName);
 
-		const usersShowResponse = await api('users/show', {
+		const usersShowResponse = await api('/users/show', {
 			username,
 		});
 		assert.strictEqual(usersShowResponse.status, 200);
 		assert.strictEqual(usersShowResponse.body.securityKeys, true);
 
-		const signinResponse = await api('signin', {
+		const signinResponse = await api('/signin', {
 			...signinParam(),
 		});
 		assert.strictEqual(signinResponse.status, 200);
@@ -268,7 +268,7 @@ describe('2要素認証', () => {
 		assert.notEqual(signinResponse.body.allowCredentials, undefined);
 		assert.strictEqual(signinResponse.body.allowCredentials[0].id, credentialId.toString('base64url'));
 
-		const signinResponse2 = await api('signin', signinWithSecurityKeyParam({
+		const signinResponse2 = await api('/signin', signinWithSecurityKeyParam({
 			keyName,
 			credentialId,
 			requestOptions: signinResponse.body,
@@ -277,24 +277,24 @@ describe('2要素認証', () => {
 		assert.notEqual(signinResponse2.body.i, undefined);
 
 		// 後片付け
-		await api('i/2fa/unregister', {
+		await api('/i/2fa/unregister', {
 			password,
 			token: otpToken(registerResponse.body.secret),
 		}, alice);
 	});
 
 	test('が設定でき、セキュリティキーでパスワードレスログインできる。', async () => {
-		const registerResponse = await api('i/2fa/register', {
+		const registerResponse = await api('/i/2fa/register', {
 			password,
 		}, alice);
 		assert.strictEqual(registerResponse.status, 200);
 
-		const doneResponse = await api('i/2fa/done', {
+		const doneResponse = await api('/i/2fa/done', {
 			token: otpToken(registerResponse.body.secret),
 		}, alice);
 		assert.strictEqual(doneResponse.status, 200);
 
-		const registerKeyResponse = await api('i/2fa/register-key', {
+		const registerKeyResponse = await api('/i/2fa/register-key', {
 			token: otpToken(registerResponse.body.secret),
 			password,
 		}, alice);
@@ -302,33 +302,33 @@ describe('2要素認証', () => {
 
 		const keyName = 'example-key';
 		const credentialId = crypto.randomBytes(0x41);
-		const keyDoneResponse = await api('i/2fa/key-done', keyDoneParam({
+		const keyDoneResponse = await api('/i/2fa/key-done', keyDoneParam({
 			token: otpToken(registerResponse.body.secret),
 			keyName,
 			credentialId,
 			creationOptions: registerKeyResponse.body,
-		}) as any, alice);
+		}), alice);
 		assert.strictEqual(keyDoneResponse.status, 200);
 
-		const passwordLessResponse = await api('i/2fa/password-less', {
+		const passwordLessResponse = await api('/i/2fa/password-less', {
 			value: true,
 		}, alice);
 		assert.strictEqual(passwordLessResponse.status, 204);
 
-		const usersShowResponse = await api('users/show', {
+		const usersShowResponse = await api('/users/show', {
 			username,
 		});
 		assert.strictEqual(usersShowResponse.status, 200);
 		assert.strictEqual(usersShowResponse.body.usePasswordLessLogin, true);
 
-		const signinResponse = await api('signin', {
+		const signinResponse = await api('/signin', {
 			...signinParam(),
 			password: '',
 		});
 		assert.strictEqual(signinResponse.status, 200);
 		assert.strictEqual(signinResponse.body.i, undefined);
 
-		const signinResponse2 = await api('signin', {
+		const signinResponse2 = await api('/signin', {
 			...signinWithSecurityKeyParam({
 				keyName,
 				credentialId,
@@ -340,24 +340,24 @@ describe('2要素認証', () => {
 		assert.notEqual(signinResponse2.body.i, undefined);
 
 		// 後片付け
-		await api('i/2fa/unregister', {
+		await api('/i/2fa/unregister', {
 			password,
 			token: otpToken(registerResponse.body.secret),
 		}, alice);
 	});
 
 	test('が設定でき、設定したセキュリティキーの名前を変更できる。', async () => {
-		const registerResponse = await api('i/2fa/register', {
+		const registerResponse = await api('/i/2fa/register', {
 			password,
 		}, alice);
 		assert.strictEqual(registerResponse.status, 200);
 
-		const doneResponse = await api('i/2fa/done', {
+		const doneResponse = await api('/i/2fa/done', {
 			token: otpToken(registerResponse.body.secret),
 		}, alice);
 		assert.strictEqual(doneResponse.status, 200);
 
-		const registerKeyResponse = await api('i/2fa/register-key', {
+		const registerKeyResponse = await api('/i/2fa/register-key', {
 			token: otpToken(registerResponse.body.secret),
 			password,
 		}, alice);
@@ -365,22 +365,22 @@ describe('2要素認証', () => {
 
 		const keyName = 'example-key';
 		const credentialId = crypto.randomBytes(0x41);
-		const keyDoneResponse = await api('i/2fa/key-done', keyDoneParam({
+		const keyDoneResponse = await api('/i/2fa/key-done', keyDoneParam({
 			token: otpToken(registerResponse.body.secret),
 			keyName,
 			credentialId,
 			creationOptions: registerKeyResponse.body,
-		}) as any, alice);
+		}), alice);
 		assert.strictEqual(keyDoneResponse.status, 200);
 
 		const renamedKey = 'other-key';
-		const updateKeyResponse = await api('i/2fa/update-key', {
+		const updateKeyResponse = await api('/i/2fa/update-key', {
 			name: renamedKey,
 			credentialId: credentialId.toString('base64url'),
 		}, alice);
 		assert.strictEqual(updateKeyResponse.status, 200);
 
-		const iResponse = await api('i', {
+		const iResponse = await api('/i', {
 		}, alice);
 		assert.strictEqual(iResponse.status, 200);
 		const securityKeys = iResponse.body.securityKeysList.filter((s: { id: string; }) => s.id === credentialId.toString('base64url'));
@@ -389,24 +389,24 @@ describe('2要素認証', () => {
 		assert.notEqual(securityKeys[0].lastUsed, undefined);
 
 		// 後片付け
-		await api('i/2fa/unregister', {
+		await api('/i/2fa/unregister', {
 			password,
 			token: otpToken(registerResponse.body.secret),
 		}, alice);
 	});
 
 	test('が設定でき、設定したセキュリティキーを削除できる。', async () => {
-		const registerResponse = await api('i/2fa/register', {
+		const registerResponse = await api('/i/2fa/register', {
 			password,
 		}, alice);
 		assert.strictEqual(registerResponse.status, 200);
 
-		const doneResponse = await api('i/2fa/done', {
+		const doneResponse = await api('/i/2fa/done', {
 			token: otpToken(registerResponse.body.secret),
 		}, alice);
 		assert.strictEqual(doneResponse.status, 200);
 
-		const registerKeyResponse = await api('i/2fa/register-key', {
+		const registerKeyResponse = await api('/i/2fa/register-key', {
 			token: otpToken(registerResponse.body.secret),
 			password,
 		}, alice);
@@ -414,20 +414,20 @@ describe('2要素認証', () => {
 
 		const keyName = 'example-key';
 		const credentialId = crypto.randomBytes(0x41);
-		const keyDoneResponse = await api('i/2fa/key-done', keyDoneParam({
+		const keyDoneResponse = await api('/i/2fa/key-done', keyDoneParam({
 			token: otpToken(registerResponse.body.secret),
 			keyName,
 			credentialId,
 			creationOptions: registerKeyResponse.body,
-		}) as any, alice);
+		}), alice);
 		assert.strictEqual(keyDoneResponse.status, 200);
 
 		// テストの実行順によっては複数残ってるので全部消す
-		const iResponse = await api('i', {
+		const iResponse = await api('/i', {
 		}, alice);
 		assert.strictEqual(iResponse.status, 200);
 		for (const key of iResponse.body.securityKeysList) {
-			const removeKeyResponse = await api('i/2fa/remove-key', {
+			const removeKeyResponse = await api('/i/2fa/remove-key', {
 				token: otpToken(registerResponse.body.secret),
 				password,
 				credentialId: key.id,
@@ -435,13 +435,13 @@ describe('2要素認証', () => {
 			assert.strictEqual(removeKeyResponse.status, 200);
 		}
 
-		const usersShowResponse = await api('users/show', {
+		const usersShowResponse = await api('/users/show', {
 			username,
 		});
 		assert.strictEqual(usersShowResponse.status, 200);
 		assert.strictEqual(usersShowResponse.body.securityKeys, false);
 
-		const signinResponse = await api('signin', {
+		const signinResponse = await api('/signin', {
 			...signinParam(),
 			token: otpToken(registerResponse.body.secret),
 		});
@@ -449,43 +449,43 @@ describe('2要素認証', () => {
 		assert.notEqual(signinResponse.body.i, undefined);
 
 		// 後片付け
-		await api('i/2fa/unregister', {
+		await api('/i/2fa/unregister', {
 			password,
 			token: otpToken(registerResponse.body.secret),
 		}, alice);
 	});
 
 	test('が設定でき、設定解除できる。（パスワードのみでログインできる。）', async () => {
-		const registerResponse = await api('i/2fa/register', {
+		const registerResponse = await api('/i/2fa/register', {
 			password,
 		}, alice);
 		assert.strictEqual(registerResponse.status, 200);
 
-		const doneResponse = await api('i/2fa/done', {
+		const doneResponse = await api('/i/2fa/done', {
 			token: otpToken(registerResponse.body.secret),
 		}, alice);
 		assert.strictEqual(doneResponse.status, 200);
 
-		const usersShowResponse = await api('users/show', {
+		const usersShowResponse = await api('/users/show', {
 			username,
 		});
 		assert.strictEqual(usersShowResponse.status, 200);
 		assert.strictEqual(usersShowResponse.body.twoFactorEnabled, true);
 
-		const unregisterResponse = await api('i/2fa/unregister', {
+		const unregisterResponse = await api('/i/2fa/unregister', {
 			token: otpToken(registerResponse.body.secret),
 			password,
 		}, alice);
 		assert.strictEqual(unregisterResponse.status, 204);
 
-		const signinResponse = await api('signin', {
+		const signinResponse = await api('/signin', {
 			...signinParam(),
 		});
 		assert.strictEqual(signinResponse.status, 200);
 		assert.notEqual(signinResponse.body.i, undefined);
 
 		// 後片付け
-		await api('i/2fa/unregister', {
+		await api('/i/2fa/unregister', {
 			password,
 			token: otpToken(registerResponse.body.secret),
 		}, alice);
diff --git a/packages/backend/test/e2e/antennas.ts b/packages/backend/test/e2e/antennas.ts
index 80b0ef8448..5c3bbaf1da 100644
--- a/packages/backend/test/e2e/antennas.ts
+++ b/packages/backend/test/e2e/antennas.ts
@@ -7,6 +7,7 @@ process.env.NODE_ENV = 'test';
 
 import * as assert from 'assert';
 import { DEFAULT_POLICIES } from '@/core/RoleService.js';
+import type { Packed } from '@/misc/json-schema.js';
 import {
 	api,
 	failedApiCall,
@@ -28,7 +29,10 @@ describe('アンテナ', () => {
 	// エンティティとしてのアンテナを主眼においたテストを記述する
 	// (Antennaを返すエンドポイント、Antennaエンティティを書き換えるエンドポイント、Antennaからノートを取得するエンドポイントをテストする)
 
-	type Antenna = misskey.entities.Antenna;
+	// BUG cherrypick-jsとjson-schemaが一致していない。
+	// - srcのenumにgroupが残っている
+	// - userGroupIdが残っている, isActiveがない
+	type Antenna = misskey.entities.Antenna | Packed<'Antenna'>;
 	type User = misskey.entities.SignupResponse;
 	type Note = misskey.entities.Note;
 
@@ -77,7 +81,7 @@ describe('アンテナ', () => {
 		aliceList = await userList(alice, {});
 		bob = await signup({ username: 'bob' });
 		aliceList = await userList(alice, {});
-		bobFile = (await uploadFile(bob)).body!;
+		bobFile = (await uploadFile(bob)).body;
 		bobList = await userList(bob);
 		carol = await signup({ username: 'carol' });
 		await api('users/lists/push', { listId: aliceList.id, userId: bob.id }, alice);
@@ -126,9 +130,9 @@ describe('アンテナ', () => {
 	beforeEach(async () => {
 		// テスト間で影響し合わないように毎回全部消す。
 		for (const user of [alice, bob]) {
-			const list = await api('antennas/list', {}, user);
+			const list = await api('/antennas/list', {}, user);
 			for (const antenna of list.body) {
-				await api('antennas/delete', { antennaId: antenna.id }, user);
+				await api('/antennas/delete', { antennaId: antenna.id }, user);
 			}
 		}
 	});
@@ -138,11 +142,11 @@ describe('アンテナ', () => {
 	test('が作成できること、キーが過不足なく入っていること。', async () => {
 		const response = await successfulApiCall({
 			endpoint: 'antennas/create',
-			parameters: defaultParam,
+			parameters: { ...defaultParam },
 			user: alice,
 		});
 		assert.match(response.id, /[0-9a-z]{10}/);
-		const expected: Antenna = {
+		const expected = {
 			id: response.id,
 			caseSensitive: false,
 			createdAt: new Date(response.createdAt).toISOString(),
@@ -159,7 +163,7 @@ describe('アンテナ', () => {
 			withFile: false,
 			withReplies: false,
 			localOnly: false,
-		};
+		} as Antenna;
 		assert.deepStrictEqual(response, expected);
 	});
 
@@ -200,28 +204,28 @@ describe('アンテナ', () => {
 	});
 
 	const antennaParamPattern = [
-		{ parameters: () => ({ name: 'x'.repeat(100) }) },
-		{ parameters: () => ({ name: 'x' }) },
-		{ parameters: () => ({ src: 'home' as const }) },
-		{ parameters: () => ({ src: 'all' as const }) },
-		{ parameters: () => ({ src: 'users' as const }) },
-		{ parameters: () => ({ src: 'list' as const }) },
-		{ parameters: () => ({ userGroupId: null }) },
-		{ parameters: () => ({ userListId: null }) },
-		{ parameters: () => ({ src: 'list' as const, userListId: aliceList.id }) },
-		{ parameters: () => ({ keywords: [['x']] }) },
-		{ parameters: () => ({ keywords: [['a', 'b', 'c'], ['x'], ['y'], ['z']] }) },
-		{ parameters: () => ({ excludeKeywords: [['a', 'b', 'c'], ['x'], ['y'], ['z']] }) },
-		{ parameters: () => ({ users: [alice.username] }) },
-		{ parameters: () => ({ users: [alice.username, bob.username, carol.username] }) },
-		{ parameters: () => ({ caseSensitive: false }) },
-		{ parameters: () => ({ caseSensitive: true }) },
-		{ parameters: () => ({ withReplies: false }) },
-		{ parameters: () => ({ withReplies: true }) },
-		{ parameters: () => ({ withFile: false }) },
-		{ parameters: () => ({ withFile: true }) },
-		{ parameters: () => ({ notify: false }) },
-		{ parameters: () => ({ notify: true }) },
+		{ parameters: (): object => ({ name: 'x'.repeat(100) }) },
+		{ parameters: (): object => ({ name: 'x' }) },
+		{ parameters: (): object => ({ src: 'home' }) },
+		{ parameters: (): object => ({ src: 'all' }) },
+		{ parameters: (): object => ({ src: 'users' }) },
+		{ parameters: (): object => ({ src: 'list' }) },
+		{ parameters: (): object => ({ userGroupId: null }) },
+		{ parameters: (): object => ({ userListId: null }) },
+		{ parameters: (): object => ({ src: 'list', userListId: aliceList.id }) },
+		{ parameters: (): object => ({ keywords: [['x']] }) },
+		{ parameters: (): object => ({ keywords: [['a', 'b', 'c'], ['x'], ['y'], ['z']] }) },
+		{ parameters: (): object => ({ excludeKeywords: [['a', 'b', 'c'], ['x'], ['y'], ['z']] }) },
+		{ parameters: (): object => ({ users: [alice.username] }) },
+		{ parameters: (): object => ({ users: [alice.username, bob.username, carol.username] }) },
+		{ parameters: (): object => ({ caseSensitive: false }) },
+		{ parameters: (): object => ({ caseSensitive: true }) },
+		{ parameters: (): object => ({ withReplies: false }) },
+		{ parameters: (): object => ({ withReplies: true }) },
+		{ parameters: (): object => ({ withFile: false }) },
+		{ parameters: (): object => ({ withFile: true }) },
+		{ parameters: (): object => ({ notify: false }) },
+		{ parameters: (): object => ({ notify: true }) },
 	];
 	test.each(antennaParamPattern)('を作成できること($#)', async ({ parameters }) => {
 		const response = await successfulApiCall({
@@ -334,7 +338,7 @@ describe('アンテナ', () => {
 		test.each([
 			{
 				label: '全体から',
-				parameters: () => ({ src: 'all' }),
+				parameters: (): object => ({ src: 'all' }),
 				posts: [
 					{ note: (): Promise<Note> => post(alice, { text: `${keyword}` }), included: true },
 					{ note: (): Promise<Note> => post(userFollowedByAlice, { text: `${keyword}` }), included: true },
@@ -345,7 +349,7 @@ describe('アンテナ', () => {
 			{
 				// BUG e4144a1 以降home指定は壊れている(allと同じ)
 				label: 'ホーム指定はallと同じ',
-				parameters: () => ({ src: 'home' }),
+				parameters: (): object => ({ src: 'home' }),
 				posts: [
 					{ note: (): Promise<Note> => post(alice, { text: `${keyword}` }), included: true },
 					{ note: (): Promise<Note> => post(userFollowedByAlice, { text: `${keyword}` }), included: true },
@@ -356,7 +360,7 @@ describe('アンテナ', () => {
 			{
 				// https://github.com/misskey-dev/misskey/issues/9025
 				label: 'ただし、フォロワー限定投稿とDM投稿を含まない。フォロワーであっても。',
-				parameters: () => ({}),
+				parameters: (): object => ({}),
 				posts: [
 					{ note: (): Promise<Note> => post(userFollowedByAlice, { text: `${keyword}`, visibility: 'public' }), included: true },
 					{ note: (): Promise<Note> => post(userFollowedByAlice, { text: `${keyword}`, visibility: 'home' }), included: true },
@@ -366,56 +370,56 @@ describe('アンテナ', () => {
 			},
 			{
 				label: 'ブロックしているユーザーのノートは含む',
-				parameters: () => ({}),
+				parameters: (): object => ({}),
 				posts: [
 					{ note: (): Promise<Note> => post(userBlockedByAlice, { text: `${keyword}` }), included: true },
 				],
 			},
 			{
 				label: 'ブロックされているユーザーのノートは含まない',
-				parameters: () => ({}),
+				parameters: (): object => ({}),
 				posts: [
 					{ note: (): Promise<Note> => post(userBlockingAlice, { text: `${keyword}` }) },
 				],
 			},
 			{
 				label: 'ミュートしているユーザーのノートは含まない',
-				parameters: () => ({}),
+				parameters: (): object => ({}),
 				posts: [
 					{ note: (): Promise<Note> => post(userMutedByAlice, { text: `${keyword}` }) },
 				],
 			},
 			{
 				label: 'ミュートされているユーザーのノートは含む',
-				parameters: () => ({}),
+				parameters: (): object => ({}),
 				posts: [
 					{ note: (): Promise<Note> => post(userMutingAlice, { text: `${keyword}` }), included: true },
 				],
 			},
 			{
 				label: '「見つけやすくする」がOFFのユーザーのノートも含まれる',
-				parameters: () => ({}),
+				parameters: (): object => ({}),
 				posts: [
 					{ note: (): Promise<Note> => post(userNotExplorable, { text: `${keyword}` }), included: true },
 				],
 			},
 			{
 				label: '鍵付きユーザーのノートも含まれる',
-				parameters: () => ({}),
+				parameters: (): object => ({}),
 				posts: [
 					{ note: (): Promise<Note> => post(userLocking, { text: `${keyword}` }), included: true },
 				],
 			},
 			{
 				label: 'サイレンスのノートも含まれる',
-				parameters: () => ({}),
+				parameters: (): object => ({}),
 				posts: [
 					{ note: (): Promise<Note> => post(userSilenced, { text: `${keyword}` }), included: true },
 				],
 			},
 			{
 				label: '削除ユーザーのノートも含まれる',
-				parameters: () => ({}),
+				parameters: (): object => ({}),
 				posts: [
 					{ note: (): Promise<Note> => post(userDeletedBySelf, { text: `${keyword}` }), included: true },
 					{ note: (): Promise<Note> => post(userDeletedByAdmin, { text: `${keyword}` }), included: true },
@@ -423,7 +427,7 @@ describe('アンテナ', () => {
 			},
 			{
 				label: 'ユーザー指定で',
-				parameters: () => ({ src: 'users', users: [`@${bob.username}`, `@${carol.username}`] }),
+				parameters: (): object => ({ src: 'users', users: [`@${bob.username}`, `@${carol.username}`] }),
 				posts: [
 					{ note: (): Promise<Note> => post(alice, { text: `test ${keyword}` }) },
 					{ note: (): Promise<Note> => post(bob, { text: `test ${keyword}` }), included: true },
@@ -432,7 +436,7 @@ describe('アンテナ', () => {
 			},
 			{
 				label: 'リスト指定で',
-				parameters: () => ({ src: 'list', userListId: aliceList.id }),
+				parameters: (): object => ({ src: 'list', userListId: aliceList.id }),
 				posts: [
 					{ note: (): Promise<Note> => post(alice, { text: `test ${keyword}` }) },
 					{ note: (): Promise<Note> => post(bob, { text: `test ${keyword}` }), included: true },
@@ -441,14 +445,14 @@ describe('アンテナ', () => {
 			},
 			{
 				label: 'CWにもマッチする',
-				parameters: () => ({ keywords: [[keyword]] }),
+				parameters: (): object => ({ keywords: [[keyword]] }),
 				posts: [
 					{ note: (): Promise<Note> => post(bob, { text: 'test', cw: `cw ${keyword}` }), included: true },
 				],
 			},
 			{
 				label: 'キーワード1つ',
-				parameters: () => ({ keywords: [[keyword]] }),
+				parameters: (): object => ({ keywords: [[keyword]] }),
 				posts: [
 					{ note: (): Promise<Note> => post(alice, { text: 'test' }) },
 					{ note: (): Promise<Note> => post(bob, { text: `test ${keyword}` }), included: true },
@@ -457,7 +461,7 @@ describe('アンテナ', () => {
 			},
 			{
 				label: 'キーワード3つ(AND)',
-				parameters: () => ({ keywords: [['A', 'B', 'C']] }),
+				parameters: (): object => ({ keywords: [['A', 'B', 'C']] }),
 				posts: [
 					{ note: (): Promise<Note> => post(bob, { text: 'test A' }) },
 					{ note: (): Promise<Note> => post(bob, { text: 'test A B' }) },
@@ -468,7 +472,7 @@ describe('アンテナ', () => {
 			},
 			{
 				label: 'キーワード3つ(OR)',
-				parameters: () => ({ keywords: [['A'], ['B'], ['C']] }),
+				parameters: (): object => ({ keywords: [['A'], ['B'], ['C']] }),
 				posts: [
 					{ note: (): Promise<Note> => post(bob, { text: 'test' }) },
 					{ note: (): Promise<Note> => post(bob, { text: 'test A' }), included: true },
@@ -481,7 +485,7 @@ describe('アンテナ', () => {
 			},
 			{
 				label: '除外ワード3つ(AND)',
-				parameters: () => ({ excludeKeywords: [['A', 'B', 'C']] }),
+				parameters: (): object => ({ excludeKeywords: [['A', 'B', 'C']] }),
 				posts: [
 					{ note: (): Promise<Note> => post(bob, { text: `test ${keyword}` }), included: true },
 					{ note: (): Promise<Note> => post(bob, { text: `test ${keyword} A` }), included: true },
@@ -494,7 +498,7 @@ describe('アンテナ', () => {
 			},
 			{
 				label: '除外ワード3つ(OR)',
-				parameters: () => ({ excludeKeywords: [['A'], ['B'], ['C']] }),
+				parameters: (): object => ({ excludeKeywords: [['A'], ['B'], ['C']] }),
 				posts: [
 					{ note: (): Promise<Note> => post(bob, { text: `test ${keyword}` }), included: true },
 					{ note: (): Promise<Note> => post(bob, { text: `test ${keyword} A` }) },
@@ -507,7 +511,7 @@ describe('アンテナ', () => {
 			},
 			{
 				label: 'キーワード1つ(大文字小文字区別する)',
-				parameters: () => ({ keywords: [['KEYWORD']], caseSensitive: true }),
+				parameters: (): object => ({ keywords: [['KEYWORD']], caseSensitive: true }),
 				posts: [
 					{ note: (): Promise<Note> => post(bob, { text: 'keyword' }) },
 					{ note: (): Promise<Note> => post(bob, { text: 'kEyWoRd' }) },
@@ -516,7 +520,7 @@ describe('アンテナ', () => {
 			},
 			{
 				label: 'キーワード1つ(大文字小文字区別しない)',
-				parameters: () => ({ keywords: [['KEYWORD']], caseSensitive: false }),
+				parameters: (): object => ({ keywords: [['KEYWORD']], caseSensitive: false }),
 				posts: [
 					{ note: (): Promise<Note> => post(bob, { text: 'keyword' }), included: true },
 					{ note: (): Promise<Note> => post(bob, { text: 'kEyWoRd' }), included: true },
@@ -525,7 +529,7 @@ describe('アンテナ', () => {
 			},
 			{
 				label: '除外ワード1つ(大文字小文字区別する)',
-				parameters: () => ({ excludeKeywords: [['KEYWORD']], caseSensitive: true }),
+				parameters: (): object => ({ excludeKeywords: [['KEYWORD']], caseSensitive: true }),
 				posts: [
 					{ note: (): Promise<Note> => post(bob, { text: `${keyword}` }), included: true },
 					{ note: (): Promise<Note> => post(bob, { text: `${keyword} keyword` }), included: true },
@@ -535,7 +539,7 @@ describe('アンテナ', () => {
 			},
 			{
 				label: '除外ワード1つ(大文字小文字区別しない)',
-				parameters: () => ({ excludeKeywords: [['KEYWORD']], caseSensitive: false }),
+				parameters: (): object => ({ excludeKeywords: [['KEYWORD']], caseSensitive: false }),
 				posts: [
 					{ note: (): Promise<Note> => post(bob, { text: `${keyword}` }), included: true },
 					{ note: (): Promise<Note> => post(bob, { text: `${keyword} keyword` }) },
@@ -545,7 +549,7 @@ describe('アンテナ', () => {
 			},
 			{
 				label: '添付ファイルを問わない',
-				parameters: () => ({ withFile: false }),
+				parameters: (): object => ({ withFile: false }),
 				posts: [
 					{ note: (): Promise<Note> => post(bob, { text: `${keyword}`, fileIds: [bobFile.id] }), included: true },
 					{ note: (): Promise<Note> => post(bob, { text: `${keyword}` }), included: true },
@@ -553,7 +557,7 @@ describe('アンテナ', () => {
 			},
 			{
 				label: '添付ファイル付きのみ',
-				parameters: () => ({ withFile: true }),
+				parameters: (): object => ({ withFile: true }),
 				posts: [
 					{ note: (): Promise<Note> => post(bob, { text: `${keyword}`, fileIds: [bobFile.id] }), included: true },
 					{ note: (): Promise<Note> => post(bob, { text: `${keyword}` }) },
@@ -561,7 +565,7 @@ describe('アンテナ', () => {
 			},
 			{
 				label: 'リプライ以外',
-				parameters: () => ({ withReplies: false }),
+				parameters: (): object => ({ withReplies: false }),
 				posts: [
 					{ note: (): Promise<Note> => post(bob, { text: `${keyword}`, replyId: alicePost.id }) },
 					{ note: (): Promise<Note> => post(bob, { text: `${keyword}` }), included: true },
@@ -569,7 +573,7 @@ describe('アンテナ', () => {
 			},
 			{
 				label: 'リプライも含む',
-				parameters: () => ({ withReplies: true }),
+				parameters: (): object => ({ withReplies: true }),
 				posts: [
 					{ note: (): Promise<Note> => post(bob, { text: `${keyword}`, replyId: alicePost.id }), included: true },
 					{ note: (): Promise<Note> => post(bob, { text: `${keyword}` }), included: true },
@@ -632,7 +636,7 @@ describe('アンテナ', () => {
 					endpoint: 'antennas/notes',
 					parameters: { antennaId: antenna.id, ...paginationParam },
 					user: alice,
-				});
+				}) as any as Note[];
 			}, offsetBy, 'desc');
 		});
 
diff --git a/packages/backend/test/e2e/api-visibility.ts b/packages/backend/test/e2e/api-visibility.ts
index 0c38d49ae1..e3c69106e4 100644
--- a/packages/backend/test/e2e/api-visibility.ts
+++ b/packages/backend/test/e2e/api-visibility.ts
@@ -6,7 +6,7 @@
 process.env.NODE_ENV = 'test';
 
 import * as assert from 'assert';
-import { UserToken, api, post, signup } from '../utils.js';
+import { api, post, signup } from '../utils.js';
 import type * as misskey from 'cherrypick-js';
 
 describe('API visibility', () => {
@@ -24,38 +24,38 @@ describe('API visibility', () => {
 		let target2: misskey.entities.SignupResponse;
 
 		/** public-post */
-		let pub: misskey.entities.Note;
+		let pub: any;
 		/** home-post */
-		let home: misskey.entities.Note;
+		let home: any;
 		/** followers-post */
-		let fol: misskey.entities.Note;
+		let fol: any;
 		/** specified-post */
-		let spe: misskey.entities.Note;
+		let spe: any;
 
 		/** public-reply to target's post */
-		let pubR: misskey.entities.Note;
+		let pubR: any;
 		/** home-reply to target's post */
-		let homeR: misskey.entities.Note;
+		let homeR: any;
 		/** followers-reply to target's post */
-		let folR: misskey.entities.Note;
+		let folR: any;
 		/** specified-reply to target's post */
-		let speR: misskey.entities.Note;
+		let speR: any;
 
 		/** public-mention to target */
-		let pubM: misskey.entities.Note;
+		let pubM: any;
 		/** home-mention to target */
-		let homeM: misskey.entities.Note;
+		let homeM: any;
 		/** followers-mention to target */
-		let folM: misskey.entities.Note;
+		let folM: any;
 		/** specified-mention to target */
-		let speM: misskey.entities.Note;
+		let speM: any;
 
 		/** reply target post */
-		let tgt: misskey.entities.Note;
+		let tgt: any;
 		//#endregion
 
-		const show = async (noteId: misskey.entities.Note['id'], by?: UserToken) => {
-			return await api('notes/show', {
+		const show = async (noteId: any, by: any) => {
+			return await api('/notes/show', {
 				noteId,
 			}, by);
 		};
@@ -70,7 +70,7 @@ describe('API visibility', () => {
 			target2 = await signup({ username: 'target2' });
 
 			// follow alice <= follower
-			await api('following/create', { userId: alice.id }, follower);
+			await api('/following/create', { userId: alice.id }, follower);
 
 			// normal posts
 			pub = await post(alice, { text: 'x', visibility: 'public' });
@@ -111,7 +111,7 @@ describe('API visibility', () => {
 		});
 
 		test('[show] public-postを未認証が見れる', async () => {
-			const res = await show(pub.id);
+			const res = await show(pub.id, null);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
@@ -132,7 +132,7 @@ describe('API visibility', () => {
 		});
 
 		test('[show] home-postを未認証が見れる', async () => {
-			const res = await show(home.id);
+			const res = await show(home.id, null);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
@@ -153,7 +153,7 @@ describe('API visibility', () => {
 		});
 
 		test('[show] followers-postを未認証が見れない', async () => {
-			const res = await show(fol.id);
+			const res = await show(fol.id, null);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 
@@ -179,7 +179,7 @@ describe('API visibility', () => {
 		});
 
 		test('[show] specified-postを未認証が見れない', async () => {
-			const res = await show(spe.id);
+			const res = await show(spe.id, null);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 		//#endregion
@@ -207,7 +207,7 @@ describe('API visibility', () => {
 		});
 
 		test('[show] public-replyを未認証が見れる', async () => {
-			const res = await show(pubR.id);
+			const res = await show(pubR.id, null);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
@@ -233,7 +233,7 @@ describe('API visibility', () => {
 		});
 
 		test('[show] home-replyを未認証が見れる', async () => {
-			const res = await show(homeR.id);
+			const res = await show(homeR.id, null);
 			assert.strictEqual(res.body.text, 'x');
 		});
 
@@ -259,7 +259,7 @@ describe('API visibility', () => {
 		});
 
 		test('[show] followers-replyを未認証が見れない', async () => {
-			const res = await show(folR.id);
+			const res = await show(folR.id, null);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 
@@ -290,7 +290,7 @@ describe('API visibility', () => {
 		});
 
 		test('[show] specified-replyを未認証が見れない', async () => {
-			const res = await show(speR.id);
+			const res = await show(speR.id, null);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 		//#endregion
@@ -318,7 +318,7 @@ describe('API visibility', () => {
 		});
 
 		test('[show] public-mentionを未認証が見れる', async () => {
-			const res = await show(pubM.id);
+			const res = await show(pubM.id, null);
 			assert.strictEqual(res.body.text, '@target x');
 		});
 
@@ -344,7 +344,7 @@ describe('API visibility', () => {
 		});
 
 		test('[show] home-mentionを未認証が見れる', async () => {
-			const res = await show(homeM.id);
+			const res = await show(homeM.id, null);
 			assert.strictEqual(res.body.text, '@target x');
 		});
 
@@ -370,7 +370,7 @@ describe('API visibility', () => {
 		});
 
 		test('[show] followers-mentionを未認証が見れない', async () => {
-			const res = await show(folM.id);
+			const res = await show(folM.id, null);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 
@@ -401,28 +401,28 @@ describe('API visibility', () => {
 		});
 
 		test('[show] specified-mentionを未認証が見れない', async () => {
-			const res = await show(speM.id);
+			const res = await show(speM.id, null);
 			assert.strictEqual(res.body.isHidden, true);
 		});
 		//#endregion
 
 		//#region HTL
 		test('[HTL] public-post が 自分が見れる', async () => {
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id === pub.id);
 			assert.strictEqual(notes[0].text, 'x');
 		});
 
 		test('[HTL] public-post が 非フォロワーから見れない', async () => {
-			const res = await api('notes/timeline', { limit: 100 }, other);
+			const res = await api('/notes/timeline', { limit: 100 }, other);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id === pub.id);
 			assert.strictEqual(notes.length, 0);
 		});
 
 		test('[HTL] followers-post が フォロワーから見れる', async () => {
-			const res = await api('notes/timeline', { limit: 100 }, follower);
+			const res = await api('/notes/timeline', { limit: 100 }, follower);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id === fol.id);
 			assert.strictEqual(notes[0].text, 'x');
@@ -431,21 +431,21 @@ describe('API visibility', () => {
 
 		//#region RTL
 		test('[replies] followers-reply が フォロワーから見れる', async () => {
-			const res = await api('notes/replies', { noteId: tgt.id, limit: 100 }, follower);
+			const res = await api('/notes/replies', { noteId: tgt.id, limit: 100 }, follower);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id === folR.id);
 			assert.strictEqual(notes[0].text, 'x');
 		});
 
 		test('[replies] followers-reply が 非フォロワー (リプライ先ではない) から見れない', async () => {
-			const res = await api('notes/replies', { noteId: tgt.id, limit: 100 }, other);
+			const res = await api('/notes/replies', { noteId: tgt.id, limit: 100 }, other);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id === folR.id);
 			assert.strictEqual(notes.length, 0);
 		});
 
 		test('[replies] followers-reply が 非フォロワー (リプライ先である) から見れる', async () => {
-			const res = await api('notes/replies', { noteId: tgt.id, limit: 100 }, target);
+			const res = await api('/notes/replies', { noteId: tgt.id, limit: 100 }, target);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id === folR.id);
 			assert.strictEqual(notes[0].text, 'x');
@@ -454,14 +454,14 @@ describe('API visibility', () => {
 
 		//#region MTL
 		test('[mentions] followers-reply が 非フォロワー (リプライ先である) から見れる', async () => {
-			const res = await api('notes/mentions', { limit: 100 }, target);
+			const res = await api('/notes/mentions', { limit: 100 }, target);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id === folR.id);
 			assert.strictEqual(notes[0].text, 'x');
 		});
 
 		test('[mentions] followers-mention が 非フォロワー (メンション先である) から見れる', async () => {
-			const res = await api('notes/mentions', { limit: 100 }, target);
+			const res = await api('/notes/mentions', { limit: 100 }, target);
 			assert.strictEqual(res.status, 200);
 			const notes = res.body.filter((n: any) => n.id === folM.id);
 			assert.strictEqual(notes[0].text, '@target x');
diff --git a/packages/backend/test/e2e/api.ts b/packages/backend/test/e2e/api.ts
index bc6e46421a..e5fccca16e 100644
--- a/packages/backend/test/e2e/api.ts
+++ b/packages/backend/test/e2e/api.ts
@@ -23,32 +23,32 @@ import type * as misskey from 'cherrypick-js';
 describe('API', () => {
 	let alice: misskey.entities.SignupResponse;
 	let bob: misskey.entities.SignupResponse;
+	let carol: misskey.entities.SignupResponse;
 
 	beforeAll(async () => {
 		alice = await signup({ username: 'alice' });
 		bob = await signup({ username: 'bob' });
+		carol = await signup({ username: 'carol' });
 	}, 1000 * 60 * 2);
 
 	describe('General validation', () => {
 		test('wrong type', async () => {
-			const res = await api('test', {
+			const res = await api('/test', {
 				required: true,
-				// @ts-expect-error string must be string
 				string: 42,
 			});
 			assert.strictEqual(res.status, 400);
 		});
 
 		test('missing require param', async () => {
-			// @ts-expect-error required is required
-			const res = await api('test', {
+			const res = await api('/test', {
 				string: 'a',
 			});
 			assert.strictEqual(res.status, 400);
 		});
 
 		test('invalid misskey:id (empty string)', async () => {
-			const res = await api('test', {
+			const res = await api('/test', {
 				required: true,
 				id: '',
 			});
@@ -56,7 +56,7 @@ describe('API', () => {
 		});
 
 		test('valid misskey:id', async () => {
-			const res = await api('test', {
+			const res = await api('/test', {
 				required: true,
 				id: '8wvhjghbxu',
 			});
@@ -64,7 +64,7 @@ describe('API', () => {
 		});
 
 		test('default value', async () => {
-			const res = await api('test', {
+			const res = await api('/test', {
 				required: true,
 				string: 'a',
 			});
@@ -73,7 +73,7 @@ describe('API', () => {
 		});
 
 		test('can set null even if it has default value', async () => {
-			const res = await api('test', {
+			const res = await api('/test', {
 				required: true,
 				nullableDefault: null,
 			});
@@ -82,7 +82,7 @@ describe('API', () => {
 		});
 
 		test('cannot set undefined if it has default value', async () => {
-			const res = await api('test', {
+			const res = await api('/test', {
 				required: true,
 				nullableDefault: undefined,
 			});
@@ -99,14 +99,14 @@ describe('API', () => {
 
 		// aliceは管理者、APIを使える
 		await successfulApiCall({
-			endpoint: 'admin/get-index-stats',
+			endpoint: '/admin/get-index-stats',
 			parameters: {},
 			user: alice,
 		});
 
 		// bobは一般ユーザーだからダメ
 		await failedApiCall({
-			endpoint: 'admin/get-index-stats',
+			endpoint: '/admin/get-index-stats',
 			parameters: {},
 			user: bob,
 		}, {
@@ -117,7 +117,7 @@ describe('API', () => {
 
 		// publicアクセスももちろんダメ
 		await failedApiCall({
-			endpoint: 'admin/get-index-stats',
+			endpoint: '/admin/get-index-stats',
 			parameters: {},
 			user: undefined,
 		}, {
@@ -128,7 +128,7 @@ describe('API', () => {
 
 		// ごまがしもダメ
 		await failedApiCall({
-			endpoint: 'admin/get-index-stats',
+			endpoint: '/admin/get-index-stats',
 			parameters: {},
 			user: { token: 'tsukawasete' },
 		}, {
@@ -138,13 +138,13 @@ describe('API', () => {
 		});
 
 		await successfulApiCall({
-			endpoint: 'admin/get-index-stats',
+			endpoint: '/admin/get-index-stats',
 			parameters: {},
 			user: { token: application2 },
 		});
 
 		await failedApiCall({
-			endpoint: 'admin/get-index-stats',
+			endpoint: '/admin/get-index-stats',
 			parameters: {},
 			user: { token: application },
 		}, {
@@ -154,7 +154,7 @@ describe('API', () => {
 		});
 
 		await failedApiCall({
-			endpoint: 'admin/get-index-stats',
+			endpoint: '/admin/get-index-stats',
 			parameters: {},
 			user: { token: application3 },
 		}, {
@@ -164,7 +164,7 @@ describe('API', () => {
 		});
 
 		await failedApiCall({
-			endpoint: 'admin/get-index-stats',
+			endpoint: '/admin/get-index-stats',
 			parameters: {},
 			user: { token: application4 },
 		}, {
@@ -177,7 +177,7 @@ describe('API', () => {
 	describe('Authentication header', () => {
 		test('一般リクエスト', async () => {
 			await successfulApiCall({
-				endpoint: 'admin/get-index-stats',
+				endpoint: '/admin/get-index-stats',
 				parameters: {},
 				user: {
 					token: alice.token,
@@ -211,7 +211,7 @@ describe('API', () => {
 	describe('tokenエラー応答でWWW-Authenticate headerを送る', () => {
 		describe('invalid_token', () => {
 			test('一般リクエスト', async () => {
-				const result = await api('admin/get-index-stats', {}, {
+				const result = await api('/admin/get-index-stats', {}, {
 					token: 'noridev',
 					bearer: true,
 				});
@@ -246,7 +246,7 @@ describe('API', () => {
 
 		describe('tokenがないとrealmだけおくる', () => {
 			test('一般リクエスト', async () => {
-				const result = await api('admin/get-index-stats', {});
+				const result = await api('/admin/get-index-stats', {});
 				assert.strictEqual(result.status, 401);
 				assert.strictEqual(result.headers.get('WWW-Authenticate'), 'Bearer realm="CherryPick"');
 			});
@@ -259,8 +259,7 @@ describe('API', () => {
 		});
 
 		test('invalid_request', async () => {
-			// @ts-expect-error text must be string
-			const result = await api('notes/create', { text: true }, {
+			const result = await api('/notes/create', { text: true }, {
 				token: alice.token,
 				bearer: true,
 			});
diff --git a/packages/backend/test/e2e/block.ts b/packages/backend/test/e2e/block.ts
index 9244effda2..2f2ae0380f 100644
--- a/packages/backend/test/e2e/block.ts
+++ b/packages/backend/test/e2e/block.ts
@@ -22,7 +22,7 @@ describe('Block', () => {
 	}, 1000 * 60 * 2);
 
 	test('Block作成', async () => {
-		const res = await api('blocking/create', {
+		const res = await api('/blocking/create', {
 			userId: bob.id,
 		}, alice);
 
@@ -30,7 +30,7 @@ describe('Block', () => {
 	});
 
 	test('ブロックされているユーザーをフォローできない', async () => {
-		const res = await api('following/create', { userId: alice.id }, bob);
+		const res = await api('/following/create', { userId: alice.id }, bob);
 
 		assert.strictEqual(res.status, 400);
 		assert.strictEqual(res.body.error.id, 'c4ab57cc-4e41-45e9-bfd9-584f61e35ce0');
@@ -39,7 +39,7 @@ describe('Block', () => {
 	test('ブロックされているユーザーにリアクションできない', async () => {
 		const note = await post(alice, { text: 'hello' });
 
-		const res = await api('notes/reactions/create', { noteId: note.id, reaction: '👍' }, bob);
+		const res = await api('/notes/reactions/create', { noteId: note.id, reaction: '👍' }, bob);
 
 		assert.strictEqual(res.status, 400);
 		assert.strictEqual(res.body.error.id, '20ef5475-9f38-4e4c-bd33-de6d979498ec');
@@ -48,7 +48,7 @@ describe('Block', () => {
 	test('ブロックされているユーザーに返信できない', async () => {
 		const note = await post(alice, { text: 'hello' });
 
-		const res = await api('notes/create', { replyId: note.id, text: 'yo' }, bob);
+		const res = await api('/notes/create', { replyId: note.id, text: 'yo' }, bob);
 
 		assert.strictEqual(res.status, 400);
 		assert.strictEqual(res.body.error.id, 'b390d7e1-8a5e-46ed-b625-06271cafd3d3');
@@ -57,7 +57,7 @@ describe('Block', () => {
 	test('ブロックされているユーザーのノートをRenoteできない', async () => {
 		const note = await post(alice, { text: 'hello' });
 
-		const res = await api('notes/create', { renoteId: note.id, text: 'yo' }, bob);
+		const res = await api('/notes/create', { renoteId: note.id, text: 'yo' }, bob);
 
 		assert.strictEqual(res.status, 400);
 		assert.strictEqual(res.body.error.id, 'b390d7e1-8a5e-46ed-b625-06271cafd3d3');
@@ -72,13 +72,12 @@ describe('Block', () => {
 		const bobNote = await post(bob, { text: 'hi' });
 		const carolNote = await post(carol, { text: 'hi' });
 
-		const res = await api('notes/local-timeline', {}, bob);
-		const body = res.body as misskey.entities.Note[];
+		const res = await api('/notes/local-timeline', {}, bob);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(Array.isArray(res.body), true);
-		assert.strictEqual(body.some(note => note.id === aliceNote.id), false);
-		assert.strictEqual(body.some(note => note.id === bobNote.id), true);
-		assert.strictEqual(body.some(note => note.id === carolNote.id), true);
+		assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), false);
+		assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+		assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), true);
 	});
 });
diff --git a/packages/backend/test/e2e/clips.ts b/packages/backend/test/e2e/clips.ts
index 8144a85540..476cbc6fdf 100644
--- a/packages/backend/test/e2e/clips.ts
+++ b/packages/backend/test/e2e/clips.ts
@@ -6,34 +6,47 @@
 process.env.NODE_ENV = 'test';
 
 import * as assert from 'assert';
+import { JTDDataType } from 'ajv/dist/jtd';
 import { DEFAULT_POLICIES } from '@/core/RoleService.js';
+import type { Packed } from '@/misc/json-schema.js';
+import { paramDef as CreateParamDef } from '@/server/api/endpoints/clips/create.js';
+import { paramDef as UpdateParamDef } from '@/server/api/endpoints/clips/update.js';
+import { paramDef as DeleteParamDef } from '@/server/api/endpoints/clips/delete.js';
+import { paramDef as ShowParamDef } from '@/server/api/endpoints/clips/show.js';
+import { paramDef as FavoriteParamDef } from '@/server/api/endpoints/clips/favorite.js';
+import { paramDef as UnfavoriteParamDef } from '@/server/api/endpoints/clips/unfavorite.js';
+import { paramDef as AddNoteParamDef } from '@/server/api/endpoints/clips/add-note.js';
+import { paramDef as RemoveNoteParamDef } from '@/server/api/endpoints/clips/remove-note.js';
+import { paramDef as NotesParamDef } from '@/server/api/endpoints/clips/notes.js';
 import { api, ApiRequest, failedApiCall, hiddenNote, post, signup, successfulApiCall } from '../utils.js';
-import type * as Misskey from 'cherrypick-js';
-
-type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
 
 describe('クリップ', () => {
-	let alice: Misskey.entities.SignupResponse;
-	let bob: Misskey.entities.SignupResponse;
-	let aliceNote: Misskey.entities.Note;
-	let aliceHomeNote: Misskey.entities.Note;
-	let aliceFollowersNote: Misskey.entities.Note;
-	let aliceSpecifiedNote: Misskey.entities.Note;
-	let bobNote: Misskey.entities.Note;
-	let bobHomeNote: Misskey.entities.Note;
-	let bobFollowersNote: Misskey.entities.Note;
-	let bobSpecifiedNote: Misskey.entities.Note;
+	type User = Packed<'User'>;
+	type Note = Packed<'Note'>;
+	type Clip = Packed<'Clip'>;
+
+	let alice: User;
+	let bob: User;
+	let aliceNote: Note;
+	let aliceHomeNote: Note;
+	let aliceFollowersNote: Note;
+	let aliceSpecifiedNote: Note;
+	let bobNote: Note;
+	let bobHomeNote: Note;
+	let bobFollowersNote: Note;
+	let bobSpecifiedNote: Note;
 
 	const compareBy = <T extends { id: string }, >(selector: (s: T) => string = (s: T): string => s.id) => (a: T, b: T): number => {
 		return selector(a).localeCompare(selector(b));
 	};
 
-	const defaultCreate = (): Pick<Misskey.entities.ClipsCreateRequest, 'name'> => ({
+	type CreateParam = JTDDataType<typeof CreateParamDef>;
+	const defaultCreate = (): Partial<CreateParam> => ({
 		name: 'test',
 	});
-	const create = async (parameters: Partial<Misskey.entities.ClipsCreateRequest> = {}, request: Partial<ApiRequest<'clips/create'>> = {}): Promise<Misskey.entities.Clip> => {
-		const clip = await successfulApiCall({
-			endpoint: 'clips/create',
+	const create = async (parameters: Partial<CreateParam> = {}, request: Partial<ApiRequest> = {}): Promise<Clip> => {
+		const clip = await successfulApiCall<Clip>({
+			endpoint: '/clips/create',
 			parameters: {
 				...defaultCreate(),
 				...parameters,
@@ -51,16 +64,17 @@ describe('クリップ', () => {
 		return clip;
 	};
 
-	const createMany = async (parameters: Partial<Misskey.entities.ClipsCreateRequest>, count = 10, user = alice): Promise<Misskey.entities.Clip[]> => {
+	const createMany = async (parameters: Partial<CreateParam>, count = 10, user = alice): Promise<Clip[]> => {
 		return await Promise.all([...Array(count)].map((_, i) => create({
 			name: `test${i}`,
 			...parameters,
 		}, { user })));
 	};
 
-	const update = async (parameters: Optional<Misskey.entities.ClipsUpdateRequest, 'name'>, request: Partial<ApiRequest<'clips/update'>> = {}): Promise<Misskey.entities.Clip> => {
-		const clip = await successfulApiCall({
-			endpoint: 'clips/update',
+	type UpdateParam = JTDDataType<typeof UpdateParamDef>;
+	const update = async (parameters: Partial<UpdateParam>, request: Partial<ApiRequest> = {}): Promise<Clip> => {
+		const clip = await successfulApiCall<Clip>({
+			endpoint: '/clips/update',
 			parameters: {
 				name: 'updated',
 				...parameters,
@@ -78,39 +92,41 @@ describe('クリップ', () => {
 		return clip;
 	};
 
-	const deleteClip = async (parameters: Misskey.entities.ClipsDeleteRequest, request: Partial<ApiRequest<'clips/delete'>> = {}): Promise<void> => {
-		return await successfulApiCall({
-			endpoint: 'clips/delete',
+	type DeleteParam = JTDDataType<typeof DeleteParamDef>;
+	const deleteClip = async (parameters: DeleteParam, request: Partial<ApiRequest> = {}): Promise<void> => {
+		return await successfulApiCall<void>({
+			endpoint: '/clips/delete',
 			parameters,
 			user: alice,
 			...request,
 		}, {
 			status: 204,
-		}) as any as void;
+		});
 	};
 
-	const show = async (parameters: Misskey.entities.ClipsShowRequest, request: Partial<ApiRequest<'clips/show'>> = {}): Promise<Misskey.entities.Clip> => {
-		return await successfulApiCall({
-			endpoint: 'clips/show',
+	type ShowParam = JTDDataType<typeof ShowParamDef>;
+	const show = async (parameters: ShowParam, request: Partial<ApiRequest> = {}): Promise<Clip> => {
+		return await successfulApiCall<Clip>({
+			endpoint: '/clips/show',
 			parameters,
 			user: alice,
 			...request,
 		});
 	};
 
-	const list = async (request: Partial<ApiRequest<'clips/list'>>): Promise<Misskey.entities.Clip[]> => {
-		return successfulApiCall({
-			endpoint: 'clips/list',
+	const list = async (request: Partial<ApiRequest>): Promise<Clip[]> => {
+		return successfulApiCall<Clip[]>({
+			endpoint: '/clips/list',
 			parameters: {},
 			user: alice,
 			...request,
 		});
 	};
 
-	const usersClips = async (parameters: Misskey.entities.UsersClipsRequest, request: Partial<ApiRequest<'users/clips'>> = {}): Promise<Misskey.entities.Clip[]> => {
-		return await successfulApiCall({
-			endpoint: 'users/clips',
-			parameters,
+	const usersClips = async (request: Partial<ApiRequest>): Promise<Clip[]> => {
+		return await successfulApiCall<Clip[]>({
+			endpoint: '/users/clips',
+			parameters: {},
 			user: alice,
 			...request,
 		});
@@ -120,22 +136,23 @@ describe('クリップ', () => {
 		alice = await signup({ username: 'alice' });
 		bob = await signup({ username: 'bob' });
 
-		aliceNote = await post(alice, { text: 'test' });
-		aliceHomeNote = await post(alice, { text: 'home only', visibility: 'home' });
-		aliceFollowersNote = await post(alice, { text: 'followers only', visibility: 'followers' });
-		aliceSpecifiedNote = await post(alice, { text: 'specified only', visibility: 'specified' });
-		bobNote = await post(bob, { text: 'test' });
-		bobHomeNote = await post(bob, { text: 'home only', visibility: 'home' });
-		bobFollowersNote = await post(bob, { text: 'followers only', visibility: 'followers' });
-		bobSpecifiedNote = await post(bob, { text: 'specified only', visibility: 'specified' });
+		// FIXME: cherrypick-jsのNoteはoutdatedなので直接変換できない
+		aliceNote = await post(alice, { text: 'test' }) as any;
+		aliceHomeNote = await post(alice, { text: 'home only', visibility: 'home' }) as any;
+		aliceFollowersNote = await post(alice, { text: 'followers only', visibility: 'followers' }) as any;
+		aliceSpecifiedNote = await post(alice, { text: 'specified only', visibility: 'specified' }) as any;
+		bobNote = await post(bob, { text: 'test' }) as any;
+		bobHomeNote = await post(bob, { text: 'home only', visibility: 'home' }) as any;
+		bobFollowersNote = await post(bob, { text: 'followers only', visibility: 'followers' }) as any;
+		bobSpecifiedNote = await post(bob, { text: 'specified only', visibility: 'specified' }) as any;
 	}, 1000 * 60 * 2);
 
 	afterEach(async () => {
 		// テスト間で影響し合わないように毎回全部消す。
 		for (const user of [alice, bob]) {
-			const list = await api('clips/list', { limit: 11 }, user);
+			const list = await api('/clips/list', { limit: 11 }, user);
 			for (const clip of list.body) {
-				await api('clips/delete', { clipId: clip.id }, user);
+				await api('/clips/delete', { clipId: clip.id }, user);
 			}
 		}
 	});
@@ -160,7 +177,7 @@ describe('クリップ', () => {
 		}
 
 		await failedApiCall({
-			endpoint: 'clips/create',
+			endpoint: '/clips/create',
 			parameters: defaultCreate(),
 			user: alice,
 		}, {
@@ -187,8 +204,7 @@ describe('クリップ', () => {
 		{ label: 'descriptionが最大長+1', parameters: { description: 'a'.repeat(2049) } },
 	];
 	test.each(createClipDenyPattern)('の作成は$labelならできない', async ({ parameters }) => failedApiCall({
-		endpoint: 'clips/create',
-		// @ts-expect-error invalid params
+		endpoint: '/clips/create',
 		parameters: {
 			...defaultCreate(),
 			...parameters,
@@ -230,15 +246,15 @@ describe('クリップ', () => {
 			code: 'NO_SUCH_CLIP',
 			id: 'b4d92d70-b216-46fa-9a3f-a8c811699257',
 		} },
-		{ label: '他人のクリップ', user: () => bob, assertion: {
+		{ label: '他人のクリップ', user: (): User => bob, assertion: {
 			code: 'NO_SUCH_CLIP',
 			id: 'b4d92d70-b216-46fa-9a3f-a8c811699257',
 		} },
 		...createClipDenyPattern as any,
 	])('の更新は$labelならできない', async ({ parameters, user, assertion }) => failedApiCall({
-		endpoint: 'clips/update',
+		endpoint: '/clips/update',
 		parameters: {
-			clipId: (await create({}, { user: (user ?? (() => alice))() })).id,
+			clipId: (await create({}, { user: (user ?? ((): User => alice))() })).id,
 			name: 'updated',
 			...parameters,
 		},
@@ -263,15 +279,14 @@ describe('クリップ', () => {
 			code: 'NO_SUCH_CLIP',
 			id: '70ca08ba-6865-4630-b6fb-8494759aa754',
 		} },
-		{ label: '他人のクリップ', user: () => bob, assertion: {
+		{ label: '他人のクリップ', user: (): User => bob, assertion: {
 			code: 'NO_SUCH_CLIP',
 			id: '70ca08ba-6865-4630-b6fb-8494759aa754',
 		} },
 	])('の削除は$labelならできない', async ({ parameters, user, assertion }) => failedApiCall({
-		endpoint: 'clips/delete',
+		endpoint: '/clips/delete',
 		parameters: {
-			// @ts-expect-error clipId must not be null
-			clipId: (await create({}, { user: (user ?? (() => alice))() })).id,
+			clipId: (await create({}, { user: (user ?? ((): User => alice))() })).id,
 			...parameters,
 		},
 		user: alice,
@@ -291,7 +306,7 @@ describe('クリップ', () => {
 	test('のID指定取得は他人のPrivateなクリップは取得できない', async () => {
 		const clip = await create({ isPublic: false }, { user: bob } );
 		failedApiCall({
-			endpoint: 'clips/show',
+			endpoint: '/clips/show',
 			parameters: { clipId: clip.id },
 			user: alice,
 		}, {
@@ -308,8 +323,7 @@ describe('クリップ', () => {
 			id: 'c3c5fe33-d62c-44d2-9ea5-d997703f5c20',
 		} },
 	])('のID指定取得は$labelならできない', async ({ parameters, assetion }) => failedApiCall({
-		endpoint: 'clips/show',
-		// @ts-expect-error clipId must not be undefined
+		endpoint: '/clips/show',
 		parameters: {
 			...parameters,
 		},
@@ -342,23 +356,27 @@ describe('クリップ', () => {
 
 	test('の一覧が取得できる(空)', async () => {
 		const res = await usersClips({
-			userId: alice.id,
+			parameters: {
+				userId: alice.id,
+			},
 		});
 		assert.deepStrictEqual(res, []);
 	});
 
 	test.each([
 		{ label: '' },
-		{ label: '他人アカウントから', user: () => bob },
+		{ label: '他人アカウントから', user: (): User => bob },
 	])('の一覧が$label取得できる', async () => {
 		const clips = await createMany({ isPublic: true });
 		const res = await usersClips({
-			userId: alice.id,
+			parameters: {
+				userId: alice.id,
+			},
 		});
 
 		// 返ってくる配列には順序保障がないのでidでソートして厳密比較
 		assert.deepStrictEqual(
-			res.sort(compareBy<Misskey.entities.Clip>(s => s.id)),
+			res.sort(compareBy<Clip>(s => s.id)),
 			clips.sort(compareBy(s => s.id)));
 
 		// 認証状態で見たときだけisFavoritedが入っている
@@ -368,16 +386,17 @@ describe('クリップ', () => {
 	});
 
 	test.each([
-		{ label: '未認証', user: () => undefined },
+		{ label: '未認証', user: (): undefined => undefined },
 		{ label: '存在しないユーザーのもの', parameters: { userId: 'xxxxxxx' } },
 	])('の一覧は$labelでも取得できる', async ({ parameters, user }) => {
 		const clips = await createMany({ isPublic: true });
 		const res = await usersClips({
-			userId: alice.id,
-			limit: clips.length,
-			...parameters,
-		}, {
-			user: (user ?? (() => alice))(),
+			parameters: {
+				userId: alice.id,
+				limit: clips.length,
+				...parameters,
+			},
+			user: (user ?? ((): User => alice))(),
 		});
 
 		// 未認証で見たときはisFavoritedは入らない
@@ -390,8 +409,10 @@ describe('クリップ', () => {
 		await create({ isPublic: false });
 		const aliceClip = await create({ isPublic: true });
 		const res = await usersClips({
-			userId: alice.id,
-			limit: 2,
+			parameters: {
+				userId: alice.id,
+				limit: 2,
+			},
 		});
 		assert.deepStrictEqual(res, [aliceClip]);
 	});
@@ -400,15 +421,17 @@ describe('クリップ', () => {
 		const clips = await createMany({ isPublic: true }, 7);
 		clips.sort(compareBy(s => s.id));
 		const res = await usersClips({
-			userId: alice.id,
-			sinceId: clips[1].id,
-			untilId: clips[5].id,
-			limit: 4,
+			parameters: {
+				userId: alice.id,
+				sinceId: clips[1].id,
+				untilId: clips[5].id,
+				limit: 4,
+			},
 		});
 
 		// Promise.allで返ってくる配列には順序保障がないのでidでソートして厳密比較
 		assert.deepStrictEqual(
-			res.sort(compareBy<Misskey.entities.Clip>(s => s.id)),
+			res.sort(compareBy<Clip>(s => s.id)),
 			[clips[2], clips[3], clips[4]], // sinceIdとuntilId自体は結果に含まれない
 			clips[1].id + ' ... ' + clips[3].id + ' with ' + clips.map(s => s.id) + ' vs. ' + res.map(s => s.id));
 	});
@@ -418,9 +441,8 @@ describe('クリップ', () => {
 		{ label: 'limitゼロ', parameters: { limit: 0 } },
 		{ label: 'limit最大+1', parameters: { limit: 101 } },
 	])('の一覧は$labelだと取得できない', async ({ parameters }) => failedApiCall({
-		endpoint: 'users/clips',
+		endpoint: '/users/clips',
 		parameters: {
-			// @ts-expect-error userId must not be undefined
 			userId: alice.id,
 			...parameters,
 		},
@@ -432,15 +454,15 @@ describe('クリップ', () => {
 	}));
 
 	test.each([
-		{ label: '作成', endpoint: 'clips/create' as const },
-		{ label: '更新', endpoint: 'clips/update' as const },
-		{ label: '削除', endpoint: 'clips/delete' as const },
-		{ label: '取得', endpoint: 'clips/list' as const },
-		{ label: 'お気に入り設定', endpoint: 'clips/favorite' as const },
-		{ label: 'お気に入り解除', endpoint: 'clips/unfavorite' as const },
-		{ label: 'お気に入り取得', endpoint: 'clips/my-favorites' as const },
-		{ label: 'ノート追加', endpoint: 'clips/add-note' as const },
-		{ label: 'ノート削除', endpoint: 'clips/remove-note' as const },
+		{ label: '作成', endpoint: '/clips/create' },
+		{ label: '更新', endpoint: '/clips/update' },
+		{ label: '削除', endpoint: '/clips/delete' },
+		{ label: '取得', endpoint: '/clips/list' },
+		{ label: 'お気に入り設定', endpoint: '/clips/favorite' },
+		{ label: 'お気に入り解除', endpoint: '/clips/unfavorite' },
+		{ label: 'お気に入り取得', endpoint: '/clips/my-favorites' },
+		{ label: 'ノート追加', endpoint: '/clips/add-note' },
+		{ label: 'ノート削除', endpoint: '/clips/remove-note' },
 	])('の$labelは未認証ではできない', async ({ endpoint }) => await failedApiCall({
 		endpoint: endpoint,
 		parameters: {},
@@ -452,33 +474,35 @@ describe('クリップ', () => {
 	}));
 
 	describe('のお気に入り', () => {
-		let aliceClip: Misskey.entities.Clip;
+		let aliceClip: Clip;
 
-		const favorite = async (parameters: Misskey.entities.ClipsFavoriteRequest, request: Partial<ApiRequest<'clips/favorite'>> = {}): Promise<void> => {
-			return successfulApiCall({
-				endpoint: 'clips/favorite',
+		type FavoriteParam = JTDDataType<typeof FavoriteParamDef>;
+		const favorite = async (parameters: FavoriteParam, request: Partial<ApiRequest> = {}): Promise<void> => {
+			return successfulApiCall<void>({
+				endpoint: '/clips/favorite',
 				parameters,
 				user: alice,
 				...request,
 			}, {
 				status: 204,
-			}) as any as void;
+			});
 		};
 
-		const unfavorite = async (parameters: Misskey.entities.ClipsUnfavoriteRequest, request: Partial<ApiRequest<'clips/unfavorite'>> = {}): Promise<void> => {
-			return successfulApiCall({
-				endpoint: 'clips/unfavorite',
+		type UnfavoriteParam = JTDDataType<typeof UnfavoriteParamDef>;
+		const unfavorite = async (parameters: UnfavoriteParam, request: Partial<ApiRequest> = {}): Promise<void> => {
+			return successfulApiCall<void>({
+				endpoint: '/clips/unfavorite',
 				parameters,
 				user: alice,
 				...request,
 			}, {
 				status: 204,
-			}) as any as void;
+			});
 		};
 
-		const myFavorites = async (request: Partial<ApiRequest<'clips/my-favorites'>> = {}): Promise<Misskey.entities.Clip[]> => {
-			return successfulApiCall({
-				endpoint: 'clips/my-favorites',
+		const myFavorites = async (request: Partial<ApiRequest> = {}): Promise<Clip[]> => {
+			return successfulApiCall<Clip[]>({
+				endpoint: '/clips/my-favorites',
 				parameters: {},
 				user: alice,
 				...request,
@@ -544,7 +568,7 @@ describe('クリップ', () => {
 		test('は同じクリップに対して二回設定できない。', async () => {
 			await favorite({ clipId: aliceClip.id });
 			await failedApiCall({
-				endpoint: 'clips/favorite',
+				endpoint: '/clips/favorite',
 				parameters: {
 					clipId: aliceClip.id,
 				},
@@ -562,15 +586,14 @@ describe('クリップ', () => {
 				code: 'NO_SUCH_CLIP',
 				id: '4c2aaeae-80d8-4250-9606-26cb1fdb77a5',
 			} },
-			{ label: '他人のクリップ', user: () => bob, assertion: {
+			{ label: '他人のクリップ', user: (): User => bob, assertion: {
 				code: 'NO_SUCH_CLIP',
 				id: '4c2aaeae-80d8-4250-9606-26cb1fdb77a5',
 			} },
 		])('の設定は$labelならできない', async ({ parameters, user, assertion }) => failedApiCall({
-			endpoint: 'clips/favorite',
+			endpoint: '/clips/favorite',
 			parameters: {
-				// @ts-expect-error clipId must not be null
-				clipId: (await create({}, { user: (user ?? (() => alice))() })).id,
+				clipId: (await create({}, { user: (user ?? ((): User => alice))() })).id,
 				...parameters,
 			},
 			user: alice,
@@ -596,7 +619,7 @@ describe('クリップ', () => {
 				code: 'NO_SUCH_CLIP',
 				id: '2603966e-b865-426c-94a7-af4a01241dc1',
 			} },
-			{ label: '他人のクリップ', user: () => bob, assertion: {
+			{ label: '他人のクリップ', user: (): User => bob, assertion: {
 				code: 'NOT_FAVORITED',
 				id: '90c3a9e8-b321-4dae-bf57-2bf79bbcc187',
 			} },
@@ -605,10 +628,9 @@ describe('クリップ', () => {
 				id: '90c3a9e8-b321-4dae-bf57-2bf79bbcc187',
 			} },
 		])('の設定解除は$labelならできない', async ({ parameters, user, assertion }) => failedApiCall({
-			endpoint: 'clips/unfavorite',
+			endpoint: '/clips/unfavorite',
 			parameters: {
-				// @ts-expect-error clipId must not be null
-				clipId: (await create({}, { user: (user ?? (() => alice))() })).id,
+				clipId: (await create({}, { user: (user ?? ((): User => alice))() })).id,
 				...parameters,
 			},
 			user: alice,
@@ -633,38 +655,41 @@ describe('クリップ', () => {
 	});
 
 	describe('に紐づくノート', () => {
-		let aliceClip: Misskey.entities.Clip;
+		let aliceClip: Clip;
 
-		const sampleNotes = (): Misskey.entities.Note[] => [
+		const sampleNotes = (): Note[] => [
 			aliceNote, aliceHomeNote, aliceFollowersNote, aliceSpecifiedNote,
 			bobNote, bobHomeNote, bobFollowersNote, bobSpecifiedNote,
 		];
 
-		const addNote = async (parameters: Misskey.entities.ClipsAddNoteRequest, request: Partial<ApiRequest<'clips/add-note'>> = {}): Promise<void> => {
-			return successfulApiCall({
-				endpoint: 'clips/add-note',
+		type AddNoteParam = JTDDataType<typeof AddNoteParamDef>;
+		const addNote = async (parameters: AddNoteParam, request: Partial<ApiRequest> = {}): Promise<void> => {
+			return successfulApiCall<void>({
+				endpoint: '/clips/add-note',
 				parameters,
 				user: alice,
 				...request,
 			}, {
 				status: 204,
-			}) as any as void;
+			});
 		};
 
-		const removeNote = async (parameters: Misskey.entities.ClipsRemoveNoteRequest, request: Partial<ApiRequest<'clips/remove-note'>> = {}): Promise<void> => {
-			return successfulApiCall({
-				endpoint: 'clips/remove-note',
+		type RemoveNoteParam = JTDDataType<typeof RemoveNoteParamDef>;
+		const removeNote = async (parameters: RemoveNoteParam, request: Partial<ApiRequest> = {}): Promise<void> => {
+			return successfulApiCall<void>({
+				endpoint: '/clips/remove-note',
 				parameters,
 				user: alice,
 				...request,
 			}, {
 				status: 204,
-			}) as any as void;
+			});
 		};
 
-		const notes = async (parameters: Misskey.entities.ClipsNotesRequest, request: Partial<ApiRequest<'clips/notes'>> = {}): Promise<Misskey.entities.Note[]> => {
-			return successfulApiCall({
-				endpoint: 'clips/notes',
+		type NotesParam = JTDDataType<typeof NotesParamDef>;
+		const notes = async (parameters: Partial<NotesParam>, request: Partial<ApiRequest> = {}): Promise<Note[]> => {
+			return successfulApiCall<Note[]>({
+				endpoint: '/clips/notes',
 				parameters,
 				user: alice,
 				...request,
@@ -690,7 +715,7 @@ describe('クリップ', () => {
 		test('として同じノートを二回紐づけることはできない', async () => {
 			await addNote({ clipId: aliceClip.id, noteId: aliceNote.id });
 			await failedApiCall({
-				endpoint: 'clips/add-note',
+				endpoint: '/clips/add-note',
 				parameters: {
 					clipId: aliceClip.id,
 					noteId: aliceNote.id,
@@ -708,11 +733,11 @@ describe('クリップ', () => {
 			const noteLimit = DEFAULT_POLICIES.noteEachClipsLimit + 1;
 			const noteList = await Promise.all([...Array(noteLimit)].map((_, i) => post(alice, {
 				text: `test ${i}`,
-			}) as unknown)) as Misskey.entities.Note[];
+			}) as unknown)) as Note[];
 			await Promise.all(noteList.map(s => addNote({ clipId: aliceClip.id, noteId: s.id })));
 
 			await failedApiCall({
-				endpoint: 'clips/add-note',
+				endpoint: '/clips/add-note',
 				parameters: {
 					clipId: aliceClip.id,
 					noteId: aliceNote.id,
@@ -726,7 +751,7 @@ describe('クリップ', () => {
 		});
 
 		test('は他人のクリップへ追加できない。', async () => await failedApiCall({
-			endpoint: 'clips/add-note',
+			endpoint: '/clips/add-note',
 			parameters: {
 				clipId: aliceClip.id,
 				noteId: aliceNote.id,
@@ -749,20 +774,18 @@ describe('クリップ', () => {
 				code: 'NO_SUCH_NOTE',
 				id: 'fc8c0b49-c7a3-4664-a0a6-b418d386bb8b',
 			} },
-			{ label: '他人のクリップ', user: () => bob, assetion: {
+			{ label: '他人のクリップ', user: (): object => bob, assetion: {
 				code: 'NO_SUCH_CLIP',
 				id: 'd6e76cc0-a1b5-4c7c-a287-73fa9c716dcf',
 			} },
 		])('の追加は$labelだとできない', async ({ parameters, user, assetion }) => failedApiCall({
-			endpoint: 'clips/add-note',
+			endpoint: '/clips/add-note',
 			parameters: {
-				// @ts-expect-error clipId must not be undefined
 				clipId: aliceClip.id,
-				// @ts-expect-error noteId must not be undefined
 				noteId: aliceNote.id,
 				...parameters,
 			},
-			user: (user ?? (() => alice))(),
+			user: (user ?? ((): User => alice))(),
 		}, {
 			status: 400,
 			code: 'INVALID_PARAM',
@@ -787,20 +810,18 @@ describe('クリップ', () => {
 				code: 'NO_SUCH_NOTE',
 				id: 'aff017de-190e-434b-893e-33a9ff5049d8', // add-noteと異なる
 			} },
-			{ label: '他人のクリップ', user: () => bob, assetion: {
+			{ label: '他人のクリップ', user: (): object => bob, assetion: {
 				code: 'NO_SUCH_CLIP',
 				id: 'b80525c6-97f7-49d7-a42d-ebccd49cfd52', // add-noteと異なる
 			} },
 		])('の削除は$labelだとできない', async ({ parameters, user, assetion }) => failedApiCall({
-			endpoint: 'clips/remove-note',
+			endpoint: '/clips/remove-note',
 			parameters: {
-				// @ts-expect-error clipId must not be undefined
 				clipId: aliceClip.id,
-				// @ts-expect-error noteId must not be undefined
 				noteId: aliceNote.id,
 				...parameters,
 			},
-			user: (user ?? (() => alice))(),
+			user: (user ?? ((): User => alice))(),
 		}, {
 			status: 400,
 			code: 'INVALID_PARAM',
@@ -904,22 +925,21 @@ describe('クリップ', () => {
 				code: 'NO_SUCH_CLIP',
 				id: '1d7645e6-2b6d-4635-b0fe-fe22b0e72e00',
 			} },
-			{ label: '他人のPrivateなクリップから', user: () => bob, assertion: {
+			{ label: '他人のPrivateなクリップから', user: (): object => bob, assertion: {
 				code: 'NO_SUCH_CLIP',
 				id: '1d7645e6-2b6d-4635-b0fe-fe22b0e72e00',
 			} },
-			{ label: '未認証でPrivateなクリップから', user: () => undefined, assertion: {
+			{ label: '未認証でPrivateなクリップから', user: (): undefined => undefined, assertion: {
 				code: 'NO_SUCH_CLIP',
 				id: '1d7645e6-2b6d-4635-b0fe-fe22b0e72e00',
 			} },
 		])('は$labelだと取得できない', async ({ parameters, user, assertion }) => failedApiCall({
-			endpoint: 'clips/notes',
+			endpoint: '/clips/notes',
 			parameters: {
-				// @ts-expect-error clipId must not be undefined
 				clipId: aliceClip.id,
 				...parameters,
 			},
-			user: (user ?? (() => alice))(),
+			user: (user ?? ((): User => alice))(),
 		}, {
 			status: 400,
 			code: 'INVALID_PARAM',
diff --git a/packages/backend/test/e2e/drive.ts b/packages/backend/test/e2e/drive.ts
index dedc318fe1..74dc5db829 100644
--- a/packages/backend/test/e2e/drive.ts
+++ b/packages/backend/test/e2e/drive.ts
@@ -6,14 +6,21 @@
 process.env.NODE_ENV = 'test';
 
 import * as assert from 'assert';
-import { api, makeStreamCatcher, post, signup, uploadFile } from '../utils.js';
+import { MiNote } from '@/models/Note.js';
+import type { Packed } from '@/misc/json-schema.js';
+import { api, initTestDb, makeStreamCatcher, post, signup, uploadFile } from '../utils.js';
 import type * as misskey from 'cherrypick-js';
+import type{ Repository } from 'typeorm';
 
 describe('Drive', () => {
+	let Notes: Repository<MiNote>;
+
 	let alice: misskey.entities.SignupResponse;
 	let bob: misskey.entities.SignupResponse;
 
 	beforeAll(async () => {
+		const connection = await initTestDb(true);
+		Notes = connection.getRepository(MiNote);
 		alice = await signup({ username: 'alice' });
 		bob = await signup({ username: 'bob' });
 	}, 1000 * 60 * 2);
@@ -29,7 +36,7 @@ describe('Drive', () => {
 			alice,
 			'main',
 			(msg) => msg.type === 'urlUploadFinished' && msg.body.marker === marker,
-			(msg) => msg.body.file,
+			(msg) => msg.body.file as Packed<'DriveFile'>,
 			10 * 1000);
 
 		const res = await api('drive/files/upload-from-url', {
@@ -83,3 +90,4 @@ describe('Drive', () => {
 		assert.strictEqual('error' in res.body, true);
 	});
 });
+
diff --git a/packages/backend/test/e2e/endpoints.ts b/packages/backend/test/e2e/endpoints.ts
index 5d3f230b36..0a81fb9a6a 100644
--- a/packages/backend/test/e2e/endpoints.ts
+++ b/packages/backend/test/e2e/endpoints.ts
@@ -79,7 +79,6 @@ describe('Endpoints', () => {
 		test('クエリをインジェクションできない', async () => {
 			const res = await api('signin', {
 				username: 'test1',
-				// @ts-expect-error password must be string
 				password: {
 					$gt: '',
 				},
@@ -104,7 +103,7 @@ describe('Endpoints', () => {
 			const myLocation = '七森中';
 			const myBirthday = '2000-09-07';
 
-			const res = await api('i/update', {
+			const res = await api('/i/update', {
 				name: myName,
 				location: myLocation,
 				birthday: myBirthday,
@@ -118,7 +117,7 @@ describe('Endpoints', () => {
 		});
 
 		test('名前を空白にできる', async () => {
-			const res = await api('i/update', {
+			const res = await api('/i/update', {
 				name: ' ',
 			}, alice);
 			assert.strictEqual(res.status, 200);
@@ -126,11 +125,11 @@ describe('Endpoints', () => {
 		});
 
 		test('誕生日の設定を削除できる', async () => {
-			await api('i/update', {
+			await api('/i/update', {
 				birthday: '2000-09-07',
 			}, alice);
 
-			const res = await api('i/update', {
+			const res = await api('/i/update', {
 				birthday: null,
 			}, alice);
 
@@ -140,7 +139,7 @@ describe('Endpoints', () => {
 		});
 
 		test('不正な誕生日の形式で怒られる', async () => {
-			const res = await api('i/update', {
+			const res = await api('/i/update', {
 				birthday: '2000/09/07',
 			}, alice);
 			assert.strictEqual(res.status, 400);
@@ -149,7 +148,7 @@ describe('Endpoints', () => {
 
 	describe('users/show', () => {
 		test('ユーザーが取得できる', async () => {
-			const res = await api('users/show', {
+			const res = await api('/users/show', {
 				userId: alice.id,
 			}, alice);
 
@@ -159,14 +158,14 @@ describe('Endpoints', () => {
 		});
 
 		test('ユーザーが存在しなかったら怒る', async () => {
-			const res = await api('users/show', {
+			const res = await api('/users/show', {
 				userId: '000000000000000000000000',
 			});
 			assert.strictEqual(res.status, 404);
 		});
 
 		test('間違ったIDで怒られる', async () => {
-			const res = await api('users/show', {
+			const res = await api('/users/show', {
 				userId: 'kyoppie',
 			});
 			assert.strictEqual(res.status, 404);
@@ -179,7 +178,7 @@ describe('Endpoints', () => {
 				text: 'test',
 			});
 
-			const res = await api('notes/show', {
+			const res = await api('/notes/show', {
 				noteId: myPost.id,
 			}, alice);
 
@@ -190,14 +189,14 @@ describe('Endpoints', () => {
 		});
 
 		test('投稿が存在しなかったら怒る', async () => {
-			const res = await api('notes/show', {
+			const res = await api('/notes/show', {
 				noteId: '000000000000000000000000',
 			});
 			assert.strictEqual(res.status, 400);
 		});
 
 		test('間違ったIDで怒られる', async () => {
-			const res = await api('notes/show', {
+			const res = await api('/notes/show', {
 				noteId: 'kyoppie',
 			});
 			assert.strictEqual(res.status, 400);
@@ -208,14 +207,14 @@ describe('Endpoints', () => {
 		test('リアクションできる', async () => {
 			const bobPost = await post(bob, { text: 'hi' });
 
-			const res = await api('notes/reactions/create', {
+			const res = await api('/notes/reactions/create', {
 				noteId: bobPost.id,
 				reaction: '🚀',
 			}, alice);
 
 			assert.strictEqual(res.status, 204);
 
-			const resNote = await api('notes/show', {
+			const resNote = await api('/notes/show', {
 				noteId: bobPost.id,
 			}, alice);
 
@@ -226,7 +225,7 @@ describe('Endpoints', () => {
 		test('自分の投稿にもリアクションできる', async () => {
 			const myPost = await post(alice, { text: 'hi' });
 
-			const res = await api('notes/reactions/create', {
+			const res = await api('/notes/reactions/create', {
 				noteId: myPost.id,
 				reaction: '🚀',
 			}, alice);
@@ -237,19 +236,19 @@ describe('Endpoints', () => {
 		test('二重にリアクションすると上書きされる', async () => {
 			const bobPost = await post(bob, { text: 'hi' });
 
-			await api('notes/reactions/create', {
+			await api('/notes/reactions/create', {
 				noteId: bobPost.id,
 				reaction: '🥰',
 			}, alice);
 
-			const res = await api('notes/reactions/create', {
+			const res = await api('/notes/reactions/create', {
 				noteId: bobPost.id,
 				reaction: '🚀',
 			}, alice);
 
 			assert.strictEqual(res.status, 204);
 
-			const resNote = await api('notes/show', {
+			const resNote = await api('/notes/show', {
 				noteId: bobPost.id,
 			}, alice);
 
@@ -258,7 +257,7 @@ describe('Endpoints', () => {
 		});
 
 		test('存在しない投稿にはリアクションできない', async () => {
-			const res = await api('notes/reactions/create', {
+			const res = await api('/notes/reactions/create', {
 				noteId: '000000000000000000000000',
 				reaction: '🚀',
 			}, alice);
@@ -267,14 +266,13 @@ describe('Endpoints', () => {
 		});
 
 		test('空のパラメータで怒られる', async () => {
-			// @ts-expect-error param must not be empty
-			const res = await api('notes/reactions/create', {}, alice);
+			const res = await api('/notes/reactions/create', {}, alice);
 
 			assert.strictEqual(res.status, 400);
 		});
 
 		test('間違ったIDで怒られる', async () => {
-			const res = await api('notes/reactions/create', {
+			const res = await api('/notes/reactions/create', {
 				noteId: 'kyoppie',
 				reaction: '🚀',
 			}, alice);
@@ -285,7 +283,7 @@ describe('Endpoints', () => {
 
 	describe('following/create', () => {
 		test('フォローできる', async () => {
-			const res = await api('following/create', {
+			const res = await api('/following/create', {
 				userId: alice.id,
 			}, bob);
 
@@ -303,7 +301,7 @@ describe('Endpoints', () => {
 		});
 
 		test('既にフォローしている場合は怒る', async () => {
-			const res = await api('following/create', {
+			const res = await api('/following/create', {
 				userId: alice.id,
 			}, bob);
 
@@ -311,7 +309,7 @@ describe('Endpoints', () => {
 		});
 
 		test('存在しないユーザーはフォローできない', async () => {
-			const res = await api('following/create', {
+			const res = await api('/following/create', {
 				userId: '000000000000000000000000',
 			}, alice);
 
@@ -319,7 +317,7 @@ describe('Endpoints', () => {
 		});
 
 		test('自分自身はフォローできない', async () => {
-			const res = await api('following/create', {
+			const res = await api('/following/create', {
 				userId: alice.id,
 			}, alice);
 
@@ -327,14 +325,13 @@ describe('Endpoints', () => {
 		});
 
 		test('空のパラメータで怒られる', async () => {
-			// @ts-expect-error params must not be empty
-			const res = await api('following/create', {}, alice);
+			const res = await api('/following/create', {}, alice);
 
 			assert.strictEqual(res.status, 400);
 		});
 
 		test('間違ったIDで怒られる', async () => {
-			const res = await api('following/create', {
+			const res = await api('/following/create', {
 				userId: 'foo',
 			}, alice);
 
@@ -344,11 +341,11 @@ describe('Endpoints', () => {
 
 	describe('following/delete', () => {
 		test('フォロー解除できる', async () => {
-			await api('following/create', {
+			await api('/following/create', {
 				userId: alice.id,
 			}, bob);
 
-			const res = await api('following/delete', {
+			const res = await api('/following/delete', {
 				userId: alice.id,
 			}, bob);
 
@@ -366,7 +363,7 @@ describe('Endpoints', () => {
 		});
 
 		test('フォローしていない場合は怒る', async () => {
-			const res = await api('following/delete', {
+			const res = await api('/following/delete', {
 				userId: alice.id,
 			}, bob);
 
@@ -374,7 +371,7 @@ describe('Endpoints', () => {
 		});
 
 		test('存在しないユーザーはフォロー解除できない', async () => {
-			const res = await api('following/delete', {
+			const res = await api('/following/delete', {
 				userId: '000000000000000000000000',
 			}, alice);
 
@@ -382,7 +379,7 @@ describe('Endpoints', () => {
 		});
 
 		test('自分自身はフォロー解除できない', async () => {
-			const res = await api('following/delete', {
+			const res = await api('/following/delete', {
 				userId: alice.id,
 			}, alice);
 
@@ -390,14 +387,13 @@ describe('Endpoints', () => {
 		});
 
 		test('空のパラメータで怒られる', async () => {
-			// @ts-expect-error params must not be empty
-			const res = await api('following/delete', {}, alice);
+			const res = await api('/following/delete', {}, alice);
 
 			assert.strictEqual(res.status, 400);
 		});
 
 		test('間違ったIDで怒られる', async () => {
-			const res = await api('following/delete', {
+			const res = await api('/following/delete', {
 				userId: 'kyoppie',
 			}, alice);
 
@@ -407,20 +403,20 @@ describe('Endpoints', () => {
 
 	describe('channels/search', () => {
 		test('空白検索で一覧を取得できる', async () => {
-			await api('channels/create', {
+			await api('/channels/create', {
 				name: 'aaa',
 				description: 'bbb',
 			}, bob);
-			await api('channels/create', {
+			await api('/channels/create', {
 				name: 'ccc1',
 				description: 'ddd1',
 			}, bob);
-			await api('channels/create', {
+			await api('/channels/create', {
 				name: 'ccc2',
 				description: 'ddd2',
 			}, bob);
 
-			const res = await api('channels/search', {
+			const res = await api('/channels/search', {
 				query: '',
 			}, bob);
 
@@ -429,7 +425,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.body.length, 3);
 		});
 		test('名前のみの検索で名前を検索できる', async () => {
-			const res = await api('channels/search', {
+			const res = await api('/channels/search', {
 				query: 'aaa',
 				type: 'nameOnly',
 			}, bob);
@@ -440,7 +436,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.body[0].name, 'aaa');
 		});
 		test('名前のみの検索で名前を複数検索できる', async () => {
-			const res = await api('channels/search', {
+			const res = await api('/channels/search', {
 				query: 'ccc',
 				type: 'nameOnly',
 			}, bob);
@@ -450,7 +446,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.body.length, 2);
 		});
 		test('名前のみの検索で説明は検索できない', async () => {
-			const res = await api('channels/search', {
+			const res = await api('/channels/search', {
 				query: 'bbb',
 				type: 'nameOnly',
 			}, bob);
@@ -460,7 +456,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.body.length, 0);
 		});
 		test('名前と説明の検索で名前を検索できる', async () => {
-			const res = await api('channels/search', {
+			const res = await api('/channels/search', {
 				query: 'ccc1',
 			}, bob);
 
@@ -470,7 +466,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.body[0].name, 'ccc1');
 		});
 		test('名前と説明での検索で説明を検索できる', async () => {
-			const res = await api('channels/search', {
+			const res = await api('/channels/search', {
 				query: 'ddd1',
 			}, bob);
 
@@ -480,7 +476,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.body[0].name, 'ccc1');
 		});
 		test('名前と説明の検索で名前を複数検索できる', async () => {
-			const res = await api('channels/search', {
+			const res = await api('/channels/search', {
 				query: 'ccc',
 			}, bob);
 
@@ -489,7 +485,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.body.length, 2);
 		});
 		test('名前と説明での検索で説明を複数検索できる', async () => {
-			const res = await api('channels/search', {
+			const res = await api('/channels/search', {
 				query: 'ddd',
 			}, bob);
 
@@ -510,7 +506,7 @@ describe('Endpoints', () => {
 			await uploadFile(alice, {
 				blob: new Blob([new Uint8Array(1024)]),
 			});
-			const res = await api('drive', {}, alice);
+			const res = await api('/drive', {}, alice);
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
 			expect(res.body).toHaveProperty('usage', 1792);
@@ -523,7 +519,7 @@ describe('Endpoints', () => {
 
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
-			assert.strictEqual(res.body!.name, 'Lenna.jpg');
+			assert.strictEqual(res.body.name, 'Lenna.jpg');
 		});
 
 		test('ファイルに名前を付けられる', async () => {
@@ -531,7 +527,7 @@ describe('Endpoints', () => {
 
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
-			assert.strictEqual(res.body!.name, 'Belmond.jpg');
+			assert.strictEqual(res.body.name, 'Belmond.jpg');
 		});
 
 		test('ファイルに名前を付けられるが、拡張子は正しいものになる', async () => {
@@ -539,12 +535,11 @@ describe('Endpoints', () => {
 
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
-			assert.strictEqual(res.body!.name, 'Belmond.png.jpg');
+			assert.strictEqual(res.body.name, 'Belmond.png.jpg');
 		});
 
 		test('ファイル無しで怒られる', async () => {
-			// @ts-expect-error params must not be empty
-			const res = await api('drive/files/create', {}, alice);
+			const res = await api('/drive/files/create', {}, alice);
 
 			assert.strictEqual(res.status, 400);
 		});
@@ -554,14 +549,14 @@ describe('Endpoints', () => {
 
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
-			assert.strictEqual(res.body!.name, 'image.svg');
-			assert.strictEqual(res.body!.type, 'image/svg+xml');
+			assert.strictEqual(res.body.name, 'image.svg');
+			assert.strictEqual(res.body.type, 'image/svg+xml');
 		});
 
 		for (const type of ['webp', 'avif']) {
 			const mediaType = `image/${type}`;
 
-			const getWebpublicType = async (user: misskey.entities.SignupResponse, fileId: string): Promise<string> => {
+			const getWebpublicType = async (user: any, fileId: string): Promise<string> => {
 				// drive/files/create does not expose webpublicType directly, so get it by posting it
 				const res = await post(user, {
 					text: mediaType,
@@ -578,10 +573,10 @@ describe('Endpoints', () => {
 				const res = await uploadFile(alice, { path });
 
 				assert.strictEqual(res.status, 200);
-				assert.strictEqual(res.body!.name, path);
-				assert.strictEqual(res.body!.type, mediaType);
+				assert.strictEqual(res.body.name, path);
+				assert.strictEqual(res.body.type, mediaType);
 
-				const webpublicType = await getWebpublicType(alice, res.body!.id);
+				const webpublicType = await getWebpublicType(alice, res.body.id);
 				assert.strictEqual(webpublicType, 'image/webp');
 			});
 
@@ -589,10 +584,10 @@ describe('Endpoints', () => {
 				const path = `without-alpha.${type}`;
 				const res = await uploadFile(alice, { path });
 				assert.strictEqual(res.status, 200);
-				assert.strictEqual(res.body!.name, path);
-				assert.strictEqual(res.body!.type, mediaType);
+				assert.strictEqual(res.body.name, path);
+				assert.strictEqual(res.body.type, mediaType);
 
-				const webpublicType = await getWebpublicType(alice, res.body!.id);
+				const webpublicType = await getWebpublicType(alice, res.body.id);
 				assert.strictEqual(webpublicType, 'image/webp');
 			});
 		}
@@ -603,8 +598,8 @@ describe('Endpoints', () => {
 			const file = (await uploadFile(alice)).body;
 			const newName = 'いちごパスタ.png';
 
-			const res = await api('drive/files/update', {
-				fileId: file!.id,
+			const res = await api('/drive/files/update', {
+				fileId: file.id,
 				name: newName,
 			}, alice);
 
@@ -616,8 +611,8 @@ describe('Endpoints', () => {
 		test('他人のファイルは更新できない', async () => {
 			const file = (await uploadFile(alice)).body;
 
-			const res = await api('drive/files/update', {
-				fileId: file!.id,
+			const res = await api('/drive/files/update', {
+				fileId: file.id,
 				name: 'いちごパスタ.png',
 			}, bob);
 
@@ -626,12 +621,12 @@ describe('Endpoints', () => {
 
 		test('親フォルダを更新できる', async () => {
 			const file = (await uploadFile(alice)).body;
-			const folder = (await api('drive/folders/create', {
+			const folder = (await api('/drive/folders/create', {
 				name: 'test',
 			}, alice)).body;
 
-			const res = await api('drive/files/update', {
-				fileId: file!.id,
+			const res = await api('/drive/files/update', {
+				fileId: file.id,
 				folderId: folder.id,
 			}, alice);
 
@@ -643,17 +638,17 @@ describe('Endpoints', () => {
 		test('親フォルダを無しにできる', async () => {
 			const file = (await uploadFile(alice)).body;
 
-			const folder = (await api('drive/folders/create', {
+			const folder = (await api('/drive/folders/create', {
 				name: 'test',
 			}, alice)).body;
 
-			await api('drive/files/update', {
-				fileId: file!.id,
+			await api('/drive/files/update', {
+				fileId: file.id,
 				folderId: folder.id,
 			}, alice);
 
-			const res = await api('drive/files/update', {
-				fileId: file!.id,
+			const res = await api('/drive/files/update', {
+				fileId: file.id,
 				folderId: null,
 			}, alice);
 
@@ -664,12 +659,12 @@ describe('Endpoints', () => {
 
 		test('他人のフォルダには入れられない', async () => {
 			const file = (await uploadFile(alice)).body;
-			const folder = (await api('drive/folders/create', {
+			const folder = (await api('/drive/folders/create', {
 				name: 'test',
 			}, bob)).body;
 
-			const res = await api('drive/files/update', {
-				fileId: file!.id,
+			const res = await api('/drive/files/update', {
+				fileId: file.id,
 				folderId: folder.id,
 			}, alice);
 
@@ -679,8 +674,8 @@ describe('Endpoints', () => {
 		test('存在しないフォルダで怒られる', async () => {
 			const file = (await uploadFile(alice)).body;
 
-			const res = await api('drive/files/update', {
-				fileId: file!.id,
+			const res = await api('/drive/files/update', {
+				fileId: file.id,
 				folderId: '000000000000000000000000',
 			}, alice);
 
@@ -690,8 +685,8 @@ describe('Endpoints', () => {
 		test('不正なフォルダIDで怒られる', async () => {
 			const file = (await uploadFile(alice)).body;
 
-			const res = await api('drive/files/update', {
-				fileId: file!.id,
+			const res = await api('/drive/files/update', {
+				fileId: file.id,
 				folderId: 'foo',
 			}, alice);
 
@@ -699,7 +694,7 @@ describe('Endpoints', () => {
 		});
 
 		test('ファイルが存在しなかったら怒る', async () => {
-			const res = await api('drive/files/update', {
+			const res = await api('/drive/files/update', {
 				fileId: '000000000000000000000000',
 				name: 'いちごパスタ.png',
 			}, alice);
@@ -711,8 +706,8 @@ describe('Endpoints', () => {
 			const file = (await uploadFile(alice)).body;
 			const newName = '';
 
-			const res = await api('drive/files/update', {
-				fileId: file!.id,
+			const res = await api('/drive/files/update', {
+				fileId: file.id,
 				name: newName,
 			}, alice);
 
@@ -720,7 +715,7 @@ describe('Endpoints', () => {
 		});
 
 		test('間違ったIDで怒られる', async () => {
-			const res = await api('drive/files/update', {
+			const res = await api('/drive/files/update', {
 				fileId: 'kyoppie',
 				name: 'いちごパスタ.png',
 			}, alice);
@@ -731,7 +726,7 @@ describe('Endpoints', () => {
 
 	describe('drive/folders/create', () => {
 		test('フォルダを作成できる', async () => {
-			const res = await api('drive/folders/create', {
+			const res = await api('/drive/folders/create', {
 				name: 'test',
 			}, alice);
 
@@ -743,11 +738,11 @@ describe('Endpoints', () => {
 
 	describe('drive/folders/update', () => {
 		test('名前を更新できる', async () => {
-			const folder = (await api('drive/folders/create', {
+			const folder = (await api('/drive/folders/create', {
 				name: 'test',
 			}, alice)).body;
 
-			const res = await api('drive/folders/update', {
+			const res = await api('/drive/folders/update', {
 				folderId: folder.id,
 				name: 'new name',
 			}, alice);
@@ -758,11 +753,11 @@ describe('Endpoints', () => {
 		});
 
 		test('他人のフォルダを更新できない', async () => {
-			const folder = (await api('drive/folders/create', {
+			const folder = (await api('/drive/folders/create', {
 				name: 'test',
 			}, bob)).body;
 
-			const res = await api('drive/folders/update', {
+			const res = await api('/drive/folders/update', {
 				folderId: folder.id,
 				name: 'new name',
 			}, alice);
@@ -771,14 +766,14 @@ describe('Endpoints', () => {
 		});
 
 		test('親フォルダを更新できる', async () => {
-			const folder = (await api('drive/folders/create', {
+			const folder = (await api('/drive/folders/create', {
 				name: 'test',
 			}, alice)).body;
-			const parentFolder = (await api('drive/folders/create', {
+			const parentFolder = (await api('/drive/folders/create', {
 				name: 'parent',
 			}, alice)).body;
 
-			const res = await api('drive/folders/update', {
+			const res = await api('/drive/folders/update', {
 				folderId: folder.id,
 				parentId: parentFolder.id,
 			}, alice);
@@ -789,18 +784,18 @@ describe('Endpoints', () => {
 		});
 
 		test('親フォルダを無しに更新できる', async () => {
-			const folder = (await api('drive/folders/create', {
+			const folder = (await api('/drive/folders/create', {
 				name: 'test',
 			}, alice)).body;
-			const parentFolder = (await api('drive/folders/create', {
+			const parentFolder = (await api('/drive/folders/create', {
 				name: 'parent',
 			}, alice)).body;
-			await api('drive/folders/update', {
+			await api('/drive/folders/update', {
 				folderId: folder.id,
 				parentId: parentFolder.id,
 			}, alice);
 
-			const res = await api('drive/folders/update', {
+			const res = await api('/drive/folders/update', {
 				folderId: folder.id,
 				parentId: null,
 			}, alice);
@@ -811,14 +806,14 @@ describe('Endpoints', () => {
 		});
 
 		test('他人のフォルダを親フォルダに設定できない', async () => {
-			const folder = (await api('drive/folders/create', {
+			const folder = (await api('/drive/folders/create', {
 				name: 'test',
 			}, alice)).body;
-			const parentFolder = (await api('drive/folders/create', {
+			const parentFolder = (await api('/drive/folders/create', {
 				name: 'parent',
 			}, bob)).body;
 
-			const res = await api('drive/folders/update', {
+			const res = await api('/drive/folders/update', {
 				folderId: folder.id,
 				parentId: parentFolder.id,
 			}, alice);
@@ -827,18 +822,18 @@ describe('Endpoints', () => {
 		});
 
 		test('フォルダが循環するような構造にできない', async () => {
-			const folder = (await api('drive/folders/create', {
+			const folder = (await api('/drive/folders/create', {
 				name: 'test',
 			}, alice)).body;
-			const parentFolder = (await api('drive/folders/create', {
+			const parentFolder = (await api('/drive/folders/create', {
 				name: 'parent',
 			}, alice)).body;
-			await api('drive/folders/update', {
+			await api('/drive/folders/update', {
 				folderId: parentFolder.id,
 				parentId: folder.id,
 			}, alice);
 
-			const res = await api('drive/folders/update', {
+			const res = await api('/drive/folders/update', {
 				folderId: folder.id,
 				parentId: parentFolder.id,
 			}, alice);
@@ -847,25 +842,25 @@ describe('Endpoints', () => {
 		});
 
 		test('フォルダが循環するような構造にできない(再帰的)', async () => {
-			const folderA = (await api('drive/folders/create', {
+			const folderA = (await api('/drive/folders/create', {
 				name: 'test',
 			}, alice)).body;
-			const folderB = (await api('drive/folders/create', {
+			const folderB = (await api('/drive/folders/create', {
 				name: 'test',
 			}, alice)).body;
-			const folderC = (await api('drive/folders/create', {
+			const folderC = (await api('/drive/folders/create', {
 				name: 'test',
 			}, alice)).body;
-			await api('drive/folders/update', {
+			await api('/drive/folders/update', {
 				folderId: folderB.id,
 				parentId: folderA.id,
 			}, alice);
-			await api('drive/folders/update', {
+			await api('/drive/folders/update', {
 				folderId: folderC.id,
 				parentId: folderB.id,
 			}, alice);
 
-			const res = await api('drive/folders/update', {
+			const res = await api('/drive/folders/update', {
 				folderId: folderA.id,
 				parentId: folderC.id,
 			}, alice);
@@ -874,11 +869,11 @@ describe('Endpoints', () => {
 		});
 
 		test('フォルダが循環するような構造にできない(自身)', async () => {
-			const folderA = (await api('drive/folders/create', {
+			const folderA = (await api('/drive/folders/create', {
 				name: 'test',
 			}, alice)).body;
 
-			const res = await api('drive/folders/update', {
+			const res = await api('/drive/folders/update', {
 				folderId: folderA.id,
 				parentId: folderA.id,
 			}, alice);
@@ -887,11 +882,11 @@ describe('Endpoints', () => {
 		});
 
 		test('存在しない親フォルダを設定できない', async () => {
-			const folder = (await api('drive/folders/create', {
+			const folder = (await api('/drive/folders/create', {
 				name: 'test',
 			}, alice)).body;
 
-			const res = await api('drive/folders/update', {
+			const res = await api('/drive/folders/update', {
 				folderId: folder.id,
 				parentId: '000000000000000000000000',
 			}, alice);
@@ -900,11 +895,11 @@ describe('Endpoints', () => {
 		});
 
 		test('不正な親フォルダIDで怒られる', async () => {
-			const folder = (await api('drive/folders/create', {
+			const folder = (await api('/drive/folders/create', {
 				name: 'test',
 			}, alice)).body;
 
-			const res = await api('drive/folders/update', {
+			const res = await api('/drive/folders/update', {
 				folderId: folder.id,
 				parentId: 'foo',
 			}, alice);
@@ -913,7 +908,7 @@ describe('Endpoints', () => {
 		});
 
 		test('存在しないフォルダを更新できない', async () => {
-			const res = await api('drive/folders/update', {
+			const res = await api('/drive/folders/update', {
 				folderId: '000000000000000000000000',
 			}, alice);
 
@@ -921,7 +916,7 @@ describe('Endpoints', () => {
 		});
 
 		test('不正なフォルダIDで怒られる', async () => {
-			const res = await api('drive/folders/update', {
+			const res = await api('/drive/folders/update', {
 				folderId: 'foo',
 			}, alice);
 
@@ -931,7 +926,7 @@ describe('Endpoints', () => {
 
 	describe('messaging/messages/create', () => {
 		test('メッセージを送信できる', async () => {
-			const res = await api('messaging/messages/create', {
+			const res = await api('/messaging/messages/create', {
 				userId: bob.id,
 				text: 'test',
 			}, alice);
@@ -942,7 +937,7 @@ describe('Endpoints', () => {
 		});
 
 		test('自分自身にはメッセージを送信できない', async () => {
-			const res = await api('messaging/messages/create', {
+			const res = await api('/messaging/messages/create', {
 				userId: alice.id,
 				text: 'Yo',
 			}, alice);
@@ -951,7 +946,7 @@ describe('Endpoints', () => {
 		});
 
 		test('存在しないユーザーにはメッセージを送信できない', async () => {
-			const res = await api('messaging/messages/create', {
+			const res = await api('/messaging/messages/create', {
 				userId: '000000000000000000000000',
 				text: 'test',
 			}, alice);
@@ -960,7 +955,7 @@ describe('Endpoints', () => {
 		});
 
 		test('不正なユーザーIDで怒られる', async () => {
-			const res = await api('messaging/messages/create', {
+			const res = await api('/messaging/messages/create', {
 				userId: 'foo',
 				text: 'test',
 			}, alice);
@@ -969,7 +964,7 @@ describe('Endpoints', () => {
 		});
 
 		test('テキストが無くて怒られる', async () => {
-			const res = await api('messaging/messages/create', {
+			const res = await api('/messaging/messages/create', {
 				userId: bob.id,
 			}, alice);
 
@@ -977,7 +972,7 @@ describe('Endpoints', () => {
 		});
 
 		test('文字数オーバーで怒られる', async () => {
-			const res = await api('messaging/messages/create', {
+			const res = await api('/messaging/messages/create', {
 				userId: bob.id,
 				text: '!'.repeat(3001),
 			}, alice);
@@ -999,7 +994,7 @@ describe('Endpoints', () => {
 				visibleUserIds: [alice.id],
 			});
 
-			const res = await api('notes/replies', {
+			const res = await api('/notes/replies', {
 				noteId: alicePost.id,
 			}, carol);
 
@@ -1011,7 +1006,7 @@ describe('Endpoints', () => {
 
 	describe('notes/timeline', () => {
 		test('フォロワー限定投稿が含まれる', async () => {
-			await api('following/create', {
+			await api('/following/create', {
 				userId: carol.id,
 			}, dave);
 
@@ -1020,7 +1015,7 @@ describe('Endpoints', () => {
 				visibility: 'followers',
 			});
 
-			const res = await api('notes/timeline', {}, dave);
+			const res = await api('/notes/timeline', {}, dave);
 
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
@@ -1041,12 +1036,12 @@ describe('Endpoints', () => {
 		test('他者に関するメモを更新できる', async () => {
 			const memo = '10月まで低浮上とのこと。';
 
-			const res1 = await api('users/update-memo', {
+			const res1 = await api('/users/update-memo', {
 				memo,
 				userId: bob.id,
 			}, alice);
 
-			const res2 = await api('users/show', {
+			const res2 = await api('/users/show', {
 				userId: bob.id,
 			}, alice);
 			assert.strictEqual(res1.status, 204);
@@ -1056,12 +1051,12 @@ describe('Endpoints', () => {
 		test('自分に関するメモを更新できる', async () => {
 			const memo = 'チケットを月末までに買う。';
 
-			const res1 = await api('users/update-memo', {
+			const res1 = await api('/users/update-memo', {
 				memo,
 				userId: alice.id,
 			}, alice);
 
-			const res2 = await api('users/show', {
+			const res2 = await api('/users/show', {
 				userId: alice.id,
 			}, alice);
 			assert.strictEqual(res1.status, 204);
@@ -1071,17 +1066,17 @@ describe('Endpoints', () => {
 		test('メモを削除できる', async () => {
 			const memo = '10月まで低浮上とのこと。';
 
-			await api('users/update-memo', {
+			await api('/users/update-memo', {
 				memo,
 				userId: bob.id,
 			}, alice);
 
-			await api('users/update-memo', {
+			await api('/users/update-memo', {
 				memo: '',
 				userId: bob.id,
 			}, alice);
 
-			const res = await api('users/show', {
+			const res = await api('/users/show', {
 				userId: bob.id,
 			}, alice);
 
@@ -1094,21 +1089,21 @@ describe('Endpoints', () => {
 			const memoCarolToBob = '例の件について今度問いただす。';
 
 			await Promise.all([
-				api('users/update-memo', {
+				api('/users/update-memo', {
 					memo: memoAliceToBob,
 					userId: bob.id,
 				}, alice),
-				api('users/update-memo', {
+				api('/users/update-memo', {
 					memo: memoCarolToBob,
 					userId: bob.id,
 				}, carol),
 			]);
 
 			const [resAlice, resCarol] = await Promise.all([
-				api('users/show', {
+				api('/users/show', {
 					userId: bob.id,
 				}, alice),
-				api('users/show', {
+				api('/users/show', {
 					userId: bob.id,
 				}, carol),
 			]);
diff --git a/packages/backend/test/e2e/exports.ts b/packages/backend/test/e2e/exports.ts
index 23ab875b29..c0a08e2599 100644
--- a/packages/backend/test/e2e/exports.ts
+++ b/packages/backend/test/e2e/exports.ts
@@ -18,7 +18,7 @@ describe('export-clips', () => {
 	// XXX: Any better way to get the result?
 	async function pollFirstDriveFile() {
 		while (true) {
-			const files = (await api('drive/files', {}, alice)).body;
+			const files = (await api('/drive/files', {}, alice)).body;
 			if (!files.length) {
 				await new Promise(r => setTimeout(r, 100));
 				continue;
@@ -26,7 +26,7 @@ describe('export-clips', () => {
 			if (files.length > 1) {
 				throw new Error('Too many files?');
 			}
-			const file = (await api('drive/files/show', { fileId: files[0].id }, alice)).body;
+			const file = (await api('/drive/files/show', { fileId: files[0].id }, alice)).body;
 			const res = await fetch(new URL(new URL(file.url).pathname, `http://127.0.0.1:${port}`));
 			return await res.json();
 		}
@@ -44,16 +44,16 @@ describe('export-clips', () => {
 
 	beforeEach(async () => {
 		// Clean all clips and files of alice
-		const clips = (await api('clips/list', {}, alice)).body;
+		const clips = (await api('/clips/list', {}, alice)).body;
 		for (const clip of clips) {
-			const res = await api('clips/delete', { clipId: clip.id }, alice);
+			const res = await api('/clips/delete', { clipId: clip.id }, alice);
 			if (res.status !== 204) {
 				throw new Error('Failed to delete clip');
 			}
 		}
-		const files = (await api('drive/files', {}, alice)).body;
+		const files = (await api('/drive/files', {}, alice)).body;
 		for (const file of files) {
-			const res = await api('drive/files/delete', { fileId: file.id }, alice);
+			const res = await api('/drive/files/delete', { fileId: file.id }, alice);
 			if (res.status !== 204) {
 				throw new Error('Failed to delete file');
 			}
@@ -61,13 +61,13 @@ describe('export-clips', () => {
 	});
 
 	test('basic export', async () => {
-		let res = await api('clips/create', {
+		let res = await api('/clips/create', {
 			name: 'foo',
 			description: 'bar',
 		}, alice);
 		assert.strictEqual(res.status, 200);
 
-		res = await api('i/export-clips', {}, alice);
+		res = await api('/i/export-clips', {}, alice);
 		assert.strictEqual(res.status, 204);
 
 		const exported = await pollFirstDriveFile();
@@ -77,7 +77,7 @@ describe('export-clips', () => {
 	});
 
 	test('export with notes', async () => {
-		let res = await api('clips/create', {
+		let res = await api('/clips/create', {
 			name: 'foo',
 			description: 'bar',
 		}, alice);
@@ -96,14 +96,14 @@ describe('export-clips', () => {
 		});
 
 		for (const note of [note1, note2]) {
-			res = await api('clips/add-note', {
+			res = await api('/clips/add-note', {
 				clipId: clip.id,
 				noteId: note.id,
 			}, alice);
 			assert.strictEqual(res.status, 204);
 		}
 
-		res = await api('i/export-clips', {}, alice);
+		res = await api('/i/export-clips', {}, alice);
 		assert.strictEqual(res.status, 204);
 
 		const exported = await pollFirstDriveFile();
@@ -116,14 +116,14 @@ describe('export-clips', () => {
 	});
 
 	test('multiple clips', async () => {
-		let res = await api('clips/create', {
+		let res = await api('/clips/create', {
 			name: 'kawaii',
 			description: 'kawaii',
 		}, alice);
 		assert.strictEqual(res.status, 200);
 		const clip1 = res.body;
 
-		res = await api('clips/create', {
+		res = await api('/clips/create', {
 			name: 'yuri',
 			description: 'yuri',
 		}, alice);
@@ -138,19 +138,19 @@ describe('export-clips', () => {
 			text: 'baz2',
 		});
 
-		res = await api('clips/add-note', {
+		res = await api('/clips/add-note', {
 			clipId: clip1.id,
 			noteId: note1.id,
 		}, alice);
 		assert.strictEqual(res.status, 204);
 
-		res = await api('clips/add-note', {
+		res = await api('/clips/add-note', {
 			clipId: clip2.id,
 			noteId: note2.id,
 		}, alice);
 		assert.strictEqual(res.status, 204);
 
-		res = await api('i/export-clips', {}, alice);
+		res = await api('/i/export-clips', {}, alice);
 		assert.strictEqual(res.status, 204);
 
 		const exported = await pollFirstDriveFile();
@@ -163,7 +163,7 @@ describe('export-clips', () => {
 	});
 
 	test('Clipping other user\'s note', async () => {
-		let res = await api('clips/create', {
+		let res = await api('/clips/create', {
 			name: 'kawaii',
 			description: 'kawaii',
 		}, alice);
@@ -175,13 +175,13 @@ describe('export-clips', () => {
 			visibility: 'followers',
 		});
 
-		res = await api('clips/add-note', {
+		res = await api('/clips/add-note', {
 			clipId: clip.id,
 			noteId: note.id,
 		}, alice);
 		assert.strictEqual(res.status, 204);
 
-		res = await api('i/export-clips', {}, alice);
+		res = await api('/i/export-clips', {}, alice);
 		assert.strictEqual(res.status, 204);
 
 		const exported = await pollFirstDriveFile();
diff --git a/packages/backend/test/e2e/fetch-resource.ts b/packages/backend/test/e2e/fetch-resource.ts
index 99c2567744..ab380925e5 100644
--- a/packages/backend/test/e2e/fetch-resource.ts
+++ b/packages/backend/test/e2e/fetch-resource.ts
@@ -23,13 +23,13 @@ const JSON_UTF8 = 'application/json; charset=utf-8';
 
 describe('Webリソース', () => {
 	let alice: misskey.entities.SignupResponse;
-	let aliceUploadedFile: misskey.entities.DriveFile | null;
-	let alicesPost: misskey.entities.Note;
-	let alicePage: misskey.entities.Page;
-	let alicePlay: misskey.entities.Flash;
-	let aliceClip: misskey.entities.Clip;
-	let aliceGalleryPost: misskey.entities.GalleryPost;
-	let aliceChannel: misskey.entities.Channel;
+	let aliceUploadedFile: any;
+	let alicesPost: any;
+	let alicePage: any;
+	let alicePlay: any;
+	let aliceClip: any;
+	let aliceGalleryPost: any;
+	let aliceChannel: any;
 
 	let bob: misskey.entities.SignupResponse;
 
@@ -77,7 +77,7 @@ describe('Webリソース', () => {
 
 	beforeAll(async () => {
 		alice = await signup({ username: 'alice' });
-		aliceUploadedFile = (await uploadFile(alice)).body;
+		aliceUploadedFile = await uploadFile(alice);
 		alicesPost = await post(alice, {
 			text: 'test',
 		});
@@ -85,7 +85,7 @@ describe('Webリソース', () => {
 		alicePlay = await play(alice, {});
 		aliceClip = await clip(alice, {});
 		aliceGalleryPost = await galleryPost(alice, {
-			fileIds: [aliceUploadedFile!.id],
+			fileIds: [aliceUploadedFile.body.id],
 		});
 		aliceChannel = await channel(alice, {});
 
diff --git a/packages/backend/test/e2e/ff-visibility.ts b/packages/backend/test/e2e/ff-visibility.ts
index 96099d3df2..6dd1ea2427 100644
--- a/packages/backend/test/e2e/ff-visibility.ts
+++ b/packages/backend/test/e2e/ff-visibility.ts
@@ -19,15 +19,15 @@ describe('FF visibility', () => {
 	}, 1000 * 60 * 2);
 
 	test('followingVisibility, followersVisibility がともに public なユーザーのフォロー/フォロワーを誰でも見れる', async () => {
-		await api('i/update', {
+		await api('/i/update', {
 			followingVisibility: 'public',
 			followersVisibility: 'public',
 		}, alice);
 
-		const followingRes = await api('users/following', {
+		const followingRes = await api('/users/following', {
 			userId: alice.id,
 		}, bob);
-		const followersRes = await api('users/followers', {
+		const followersRes = await api('/users/followers', {
 			userId: alice.id,
 		}, bob);
 
@@ -39,36 +39,36 @@ describe('FF visibility', () => {
 
 	test('followingVisibility が public であれば followersVisibility の設定に関わらずユーザーのフォローを誰でも見れる', async () => {
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'public',
 				followersVisibility: 'public',
 			}, alice);
 
-			const followingRes = await api('users/following', {
+			const followingRes = await api('/users/following', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followingRes.status, 200);
 			assert.strictEqual(Array.isArray(followingRes.body), true);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'public',
 				followersVisibility: 'followers',
 			}, alice);
 
-			const followingRes = await api('users/following', {
+			const followingRes = await api('/users/following', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followingRes.status, 200);
 			assert.strictEqual(Array.isArray(followingRes.body), true);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'public',
 				followersVisibility: 'private',
 			}, alice);
 
-			const followingRes = await api('users/following', {
+			const followingRes = await api('/users/following', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followingRes.status, 200);
@@ -78,36 +78,36 @@ describe('FF visibility', () => {
 
 	test('followersVisibility が public であれば followingVisibility の設定に関わらずユーザーのフォロワーを誰でも見れる', async () => {
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'public',
 				followersVisibility: 'public',
 			}, alice);
 
-			const followersRes = await api('users/followers', {
+			const followersRes = await api('/users/followers', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followersRes.status, 200);
 			assert.strictEqual(Array.isArray(followersRes.body), true);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'followers',
 				followersVisibility: 'public',
 			}, alice);
 
-			const followersRes = await api('users/followers', {
+			const followersRes = await api('/users/followers', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followersRes.status, 200);
 			assert.strictEqual(Array.isArray(followersRes.body), true);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'private',
 				followersVisibility: 'public',
 			}, alice);
 
-			const followersRes = await api('users/followers', {
+			const followersRes = await api('/users/followers', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followersRes.status, 200);
@@ -116,15 +116,15 @@ describe('FF visibility', () => {
 	});
 
 	test('followingVisibility, followersVisibility がともに followers なユーザーのフォロー/フォロワーを自分で見れる', async () => {
-		await api('i/update', {
+		await api('/i/update', {
 			followingVisibility: 'followers',
 			followersVisibility: 'followers',
 		}, alice);
 
-		const followingRes = await api('users/following', {
+		const followingRes = await api('/users/following', {
 			userId: alice.id,
 		}, alice);
-		const followersRes = await api('users/followers', {
+		const followersRes = await api('/users/followers', {
 			userId: alice.id,
 		}, alice);
 
@@ -136,36 +136,36 @@ describe('FF visibility', () => {
 
 	test('followingVisibility が followers なユーザーのフォローを followersVisibility の設定に関わらず自分で見れる', async () => {
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'followers',
 				followersVisibility: 'public',
 			}, alice);
 
-			const followingRes = await api('users/following', {
+			const followingRes = await api('/users/following', {
 				userId: alice.id,
 			}, alice);
 			assert.strictEqual(followingRes.status, 200);
 			assert.strictEqual(Array.isArray(followingRes.body), true);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'followers',
 				followersVisibility: 'followers',
 			}, alice);
 
-			const followingRes = await api('users/following', {
+			const followingRes = await api('/users/following', {
 				userId: alice.id,
 			}, alice);
 			assert.strictEqual(followingRes.status, 200);
 			assert.strictEqual(Array.isArray(followingRes.body), true);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'followers',
 				followersVisibility: 'private',
 			}, alice);
 
-			const followingRes = await api('users/following', {
+			const followingRes = await api('/users/following', {
 				userId: alice.id,
 			}, alice);
 			assert.strictEqual(followingRes.status, 200);
@@ -175,36 +175,36 @@ describe('FF visibility', () => {
 
 	test('followersVisibility が followers なユーザーのフォロワーを followingVisibility の設定に関わらず自分で見れる', async () => {
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'public',
 				followersVisibility: 'followers',
 			}, alice);
 
-			const followersRes = await api('users/followers', {
+			const followersRes = await api('/users/followers', {
 				userId: alice.id,
 			}, alice);
 			assert.strictEqual(followersRes.status, 200);
 			assert.strictEqual(Array.isArray(followersRes.body), true);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'followers',
 				followersVisibility: 'followers',
 			}, alice);
 
-			const followersRes = await api('users/followers', {
+			const followersRes = await api('/users/followers', {
 				userId: alice.id,
 			}, alice);
 			assert.strictEqual(followersRes.status, 200);
 			assert.strictEqual(Array.isArray(followersRes.body), true);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'private',
 				followersVisibility: 'followers',
 			}, alice);
 
-			const followersRes = await api('users/followers', {
+			const followersRes = await api('/users/followers', {
 				userId: alice.id,
 			}, alice);
 			assert.strictEqual(followersRes.status, 200);
@@ -213,15 +213,15 @@ describe('FF visibility', () => {
 	});
 
 	test('followingVisibility, followersVisibility がともに followers なユーザーのフォロー/フォロワーを非フォロワーが見れない', async () => {
-		await api('i/update', {
+		await api('/i/update', {
 			followingVisibility: 'followers',
 			followersVisibility: 'followers',
 		}, alice);
 
-		const followingRes = await api('users/following', {
+		const followingRes = await api('/users/following', {
 			userId: alice.id,
 		}, bob);
-		const followersRes = await api('users/followers', {
+		const followersRes = await api('/users/followers', {
 			userId: alice.id,
 		}, bob);
 
@@ -231,34 +231,34 @@ describe('FF visibility', () => {
 
 	test('followingVisibility が followers なユーザーのフォローを followersVisibility の設定に関わらず非フォロワーが見れない', async () => {
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'followers',
 				followersVisibility: 'public',
 			}, alice);
 
-			const followingRes = await api('users/following', {
+			const followingRes = await api('/users/following', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followingRes.status, 400);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'followers',
 				followersVisibility: 'followers',
 			}, alice);
 
-			const followingRes = await api('users/following', {
+			const followingRes = await api('/users/following', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followingRes.status, 400);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'followers',
 				followersVisibility: 'private',
 			}, alice);
 
-			const followingRes = await api('users/following', {
+			const followingRes = await api('/users/following', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followingRes.status, 400);
@@ -267,34 +267,34 @@ describe('FF visibility', () => {
 
 	test('followersVisibility が followers なユーザーのフォロワーを followingVisibility の設定に関わらず非フォロワーが見れない', async () => {
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'public',
 				followersVisibility: 'followers',
 			}, alice);
 
-			const followersRes = await api('users/followers', {
+			const followersRes = await api('/users/followers', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followersRes.status, 400);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'followers',
 				followersVisibility: 'followers',
 			}, alice);
 
-			const followersRes = await api('users/followers', {
+			const followersRes = await api('/users/followers', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followersRes.status, 400);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'private',
 				followersVisibility: 'followers',
 			}, alice);
 
-			const followersRes = await api('users/followers', {
+			const followersRes = await api('/users/followers', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followersRes.status, 400);
@@ -302,19 +302,19 @@ describe('FF visibility', () => {
 	});
 
 	test('followingVisibility, followersVisibility がともに followers なユーザーのフォロー/フォロワーをフォロワーが見れる', async () => {
-		await api('i/update', {
+		await api('/i/update', {
 			followingVisibility: 'followers',
 			followersVisibility: 'followers',
 		}, alice);
 
-		await api('following/create', {
+		await api('/following/create', {
 			userId: alice.id,
 		}, bob);
 
-		const followingRes = await api('users/following', {
+		const followingRes = await api('/users/following', {
 			userId: alice.id,
 		}, bob);
-		const followersRes = await api('users/followers', {
+		const followersRes = await api('/users/followers', {
 			userId: alice.id,
 		}, bob);
 
@@ -326,45 +326,45 @@ describe('FF visibility', () => {
 
 	test('followingVisibility が followers なユーザーのフォローを followersVisibility の設定に関わらずフォロワーが見れる', async () => {
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'followers',
 				followersVisibility: 'public',
 			}, alice);
-			await api('following/create', {
+			await api('/following/create', {
 				userId: alice.id,
 			}, bob);
 
-			const followingRes = await api('users/following', {
+			const followingRes = await api('/users/following', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followingRes.status, 200);
 			assert.strictEqual(Array.isArray(followingRes.body), true);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'followers',
 				followersVisibility: 'followers',
 			}, alice);
-			await api('following/create', {
+			await api('/following/create', {
 				userId: alice.id,
 			}, bob);
 
-			const followingRes = await api('users/following', {
+			const followingRes = await api('/users/following', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followingRes.status, 200);
 			assert.strictEqual(Array.isArray(followingRes.body), true);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'followers',
 				followersVisibility: 'private',
 			}, alice);
-			await api('following/create', {
+			await api('/following/create', {
 				userId: alice.id,
 			}, bob);
 
-			const followingRes = await api('users/following', {
+			const followingRes = await api('/users/following', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followingRes.status, 200);
@@ -374,45 +374,45 @@ describe('FF visibility', () => {
 
 	test('followersVisibility が followers なユーザーのフォロワーを followingVisibility の設定に関わらずフォロワーが見れる', async () => {
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'public',
 				followersVisibility: 'followers',
 			}, alice);
-			await api('following/create', {
+			await api('/following/create', {
 				userId: alice.id,
 			}, bob);
 
-			const followersRes = await api('users/followers', {
+			const followersRes = await api('/users/followers', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followersRes.status, 200);
 			assert.strictEqual(Array.isArray(followersRes.body), true);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'followers',
 				followersVisibility: 'followers',
 			}, alice);
-			await api('following/create', {
+			await api('/following/create', {
 				userId: alice.id,
 			}, bob);
 
-			const followersRes = await api('users/followers', {
+			const followersRes = await api('/users/followers', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followersRes.status, 200);
 			assert.strictEqual(Array.isArray(followersRes.body), true);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'private',
 				followersVisibility: 'followers',
 			}, alice);
-			await api('following/create', {
+			await api('/following/create', {
 				userId: alice.id,
 			}, bob);
 
-			const followersRes = await api('users/followers', {
+			const followersRes = await api('/users/followers', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followersRes.status, 200);
@@ -421,15 +421,15 @@ describe('FF visibility', () => {
 	});
 
 	test('followingVisibility, followersVisibility がともに private なユーザーのフォロー/フォロワーを自分で見れる', async () => {
-		await api('i/update', {
+		await api('/i/update', {
 			followingVisibility: 'private',
 			followersVisibility: 'private',
 		}, alice);
 
-		const followingRes = await api('users/following', {
+		const followingRes = await api('/users/following', {
 			userId: alice.id,
 		}, alice);
-		const followersRes = await api('users/followers', {
+		const followersRes = await api('/users/followers', {
 			userId: alice.id,
 		}, alice);
 
@@ -441,36 +441,36 @@ describe('FF visibility', () => {
 
 	test('followingVisibility が private なユーザーのフォローを followersVisibility の設定に関わらず自分で見れる', async () => {
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'private',
 				followersVisibility: 'public',
 			}, alice);
 
-			const followingRes = await api('users/following', {
+			const followingRes = await api('/users/following', {
 				userId: alice.id,
 			}, alice);
 			assert.strictEqual(followingRes.status, 200);
 			assert.strictEqual(Array.isArray(followingRes.body), true);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'private',
 				followersVisibility: 'followers',
 			}, alice);
 
-			const followingRes = await api('users/following', {
+			const followingRes = await api('/users/following', {
 				userId: alice.id,
 			}, alice);
 			assert.strictEqual(followingRes.status, 200);
 			assert.strictEqual(Array.isArray(followingRes.body), true);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'private',
 				followersVisibility: 'private',
 			}, alice);
 
-			const followingRes = await api('users/following', {
+			const followingRes = await api('/users/following', {
 				userId: alice.id,
 			}, alice);
 			assert.strictEqual(followingRes.status, 200);
@@ -480,36 +480,36 @@ describe('FF visibility', () => {
 
 	test('followersVisibility が private なユーザーのフォロワーを followingVisibility の設定に関わらず自分で見れる', async () => {
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'public',
 				followersVisibility: 'private',
 			}, alice);
 
-			const followersRes = await api('users/followers', {
+			const followersRes = await api('/users/followers', {
 				userId: alice.id,
 			}, alice);
 			assert.strictEqual(followersRes.status, 200);
 			assert.strictEqual(Array.isArray(followersRes.body), true);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'followers',
 				followersVisibility: 'private',
 			}, alice);
 
-			const followersRes = await api('users/followers', {
+			const followersRes = await api('/users/followers', {
 				userId: alice.id,
 			}, alice);
 			assert.strictEqual(followersRes.status, 200);
 			assert.strictEqual(Array.isArray(followersRes.body), true);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'private',
 				followersVisibility: 'private',
 			}, alice);
 
-			const followersRes = await api('users/followers', {
+			const followersRes = await api('/users/followers', {
 				userId: alice.id,
 			}, alice);
 			assert.strictEqual(followersRes.status, 200);
@@ -518,15 +518,15 @@ describe('FF visibility', () => {
 	});
 
 	test('followingVisibility, followersVisibility がともに private なユーザーのフォロー/フォロワーを他人が見れない', async () => {
-		await api('i/update', {
+		await api('/i/update', {
 			followingVisibility: 'private',
 			followersVisibility: 'private',
 		}, alice);
 
-		const followingRes = await api('users/following', {
+		const followingRes = await api('/users/following', {
 			userId: alice.id,
 		}, bob);
-		const followersRes = await api('users/followers', {
+		const followersRes = await api('/users/followers', {
 			userId: alice.id,
 		}, bob);
 
@@ -536,34 +536,34 @@ describe('FF visibility', () => {
 
 	test('followingVisibility が private なユーザーのフォローを followersVisibility の設定に関わらず他人が見れない', async () => {
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'private',
 				followersVisibility: 'public',
 			}, alice);
 
-			const followingRes = await api('users/following', {
+			const followingRes = await api('/users/following', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followingRes.status, 400);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'private',
 				followersVisibility: 'followers',
 			}, alice);
 
-			const followingRes = await api('users/following', {
+			const followingRes = await api('/users/following', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followingRes.status, 400);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'private',
 				followersVisibility: 'private',
 			}, alice);
 
-			const followingRes = await api('users/following', {
+			const followingRes = await api('/users/following', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followingRes.status, 400);
@@ -572,34 +572,34 @@ describe('FF visibility', () => {
 
 	test('followersVisibility が private なユーザーのフォロワーを followingVisibility の設定に関わらず他人が見れない', async () => {
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'public',
 				followersVisibility: 'private',
 			}, alice);
 
-			const followersRes = await api('users/followers', {
+			const followersRes = await api('/users/followers', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followersRes.status, 400);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'followers',
 				followersVisibility: 'private',
 			}, alice);
 
-			const followersRes = await api('users/followers', {
+			const followersRes = await api('/users/followers', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followersRes.status, 400);
 		}
 		{
-			await api('i/update', {
+			await api('/i/update', {
 				followingVisibility: 'private',
 				followersVisibility: 'private',
 			}, alice);
 
-			const followersRes = await api('users/followers', {
+			const followersRes = await api('/users/followers', {
 				userId: alice.id,
 			}, bob);
 			assert.strictEqual(followersRes.status, 400);
@@ -609,7 +609,7 @@ describe('FF visibility', () => {
 	describe('AP', () => {
 		test('followingVisibility が public 以外ならばAPからはフォローを取得できない', async () => {
 			{
-				await api('i/update', {
+				await api('/i/update', {
 					followingVisibility: 'public',
 				}, alice);
 
@@ -617,7 +617,7 @@ describe('FF visibility', () => {
 				assert.strictEqual(followingRes.status, 200);
 			}
 			{
-				await api('i/update', {
+				await api('/i/update', {
 					followingVisibility: 'followers',
 				}, alice);
 
@@ -625,7 +625,7 @@ describe('FF visibility', () => {
 				assert.strictEqual(followingRes.status, 403);
 			}
 			{
-				await api('i/update', {
+				await api('/i/update', {
 					followingVisibility: 'private',
 				}, alice);
 
@@ -636,7 +636,7 @@ describe('FF visibility', () => {
 
 		test('followersVisibility が public 以外ならばAPからはフォロワーを取得できない', async () => {
 			{
-				await api('i/update', {
+				await api('/i/update', {
 					followersVisibility: 'public',
 				}, alice);
 
@@ -644,7 +644,7 @@ describe('FF visibility', () => {
 				assert.strictEqual(followersRes.status, 200);
 			}
 			{
-				await api('i/update', {
+				await api('/i/update', {
 					followersVisibility: 'followers',
 				}, alice);
 
@@ -652,7 +652,7 @@ describe('FF visibility', () => {
 				assert.strictEqual(followersRes.status, 403);
 			}
 			{
-				await api('i/update', {
+				await api('/i/update', {
 					followersVisibility: 'private',
 				}, alice);
 
diff --git a/packages/backend/test/e2e/move.ts b/packages/backend/test/e2e/move.ts
index cb08ba77d1..1993ff5e12 100644
--- a/packages/backend/test/e2e/move.ts
+++ b/packages/backend/test/e2e/move.ts
@@ -55,7 +55,7 @@ describe('Account Move', () => {
 		}, 1000 * 10);
 
 		test('Able to create an alias', async () => {
-			const res = await api('i/update', {
+			const res = await api('/i/update', {
 				alsoKnownAs: [`@alice@${url.hostname}`],
 			}, bob);
 
@@ -67,7 +67,7 @@ describe('Account Move', () => {
 		});
 
 		test('Able to create a local alias without hostname', async () => {
-			await api('i/update', {
+			await api('/i/update', {
 				alsoKnownAs: ['@alice'],
 			}, bob);
 
@@ -77,7 +77,7 @@ describe('Account Move', () => {
 		});
 
 		test('Able to create a local alias without @', async () => {
-			await api('i/update', {
+			await api('/i/update', {
 				alsoKnownAs: ['alice'],
 			}, bob);
 
@@ -87,7 +87,7 @@ describe('Account Move', () => {
 		});
 
 		test('Able to set remote user (but may fail)', async () => {
-			const res = await api('i/update', {
+			const res = await api('/i/update', {
 				alsoKnownAs: ['@syuilo@example.com'],
 			}, bob);
 
@@ -97,7 +97,7 @@ describe('Account Move', () => {
 		});
 
 		test('Unable to add duplicated aliases to alsoKnownAs', async () => {
-			const res = await api('i/update', {
+			const res = await api('/i/update', {
 				alsoKnownAs: [`@alice@${url.hostname}`, `@alice@${url.hostname}`],
 			}, bob);
 
@@ -107,7 +107,7 @@ describe('Account Move', () => {
 		});
 
 		test('Unable to add itself', async () => {
-			const res = await api('i/update', {
+			const res = await api('/i/update', {
 				alsoKnownAs: [`@bob@${url.hostname}`],
 			}, bob);
 
@@ -117,7 +117,7 @@ describe('Account Move', () => {
 		});
 
 		test('Unable to add a nonexisting local account to alsoKnownAs', async () => {
-			const res1 = await api('i/update', {
+			const res1 = await api('/i/update', {
 				alsoKnownAs: [`@nonexist@${url.hostname}`],
 			}, bob);
 
@@ -125,7 +125,7 @@ describe('Account Move', () => {
 			assert.strictEqual(res1.body.error.code, 'NO_SUCH_USER');
 			assert.strictEqual(res1.body.error.id, 'fcd2eef9-a9b2-4c4f-8624-038099e90aa5');
 
-			const res2 = await api('i/update', {
+			const res2 = await api('/i/update', {
 				alsoKnownAs: ['@alice', 'nonexist'],
 			}, bob);
 
@@ -135,7 +135,7 @@ describe('Account Move', () => {
 		});
 
 		test('Able to add two existing local account to alsoKnownAs', async () => {
-			await api('i/update', {
+			await api('/i/update', {
 				alsoKnownAs: [`@alice@${url.hostname}`, `@carol@${url.hostname}`],
 			}, bob);
 
@@ -146,10 +146,10 @@ describe('Account Move', () => {
 		});
 
 		test('Able to properly overwrite alsoKnownAs', async () => {
-			await api('i/update', {
+			await api('/i/update', {
 				alsoKnownAs: [`@alice@${url.hostname}`],
 			}, bob);
-			await api('i/update', {
+			await api('/i/update', {
 				alsoKnownAs: [`@carol@${url.hostname}`, `@dave@${url.hostname}`],
 			}, bob);
 
@@ -164,27 +164,27 @@ describe('Account Move', () => {
 		let antennaId = '';
 
 		beforeAll(async () => {
-			await api('i/update', {
+			await api('/i/update', {
 				alsoKnownAs: [`@alice@${url.hostname}`],
 			}, root);
-			const listRoot = await api('users/lists/create', {
+			const listRoot = await api('/users/lists/create', {
 				name: secureRndstr(8),
 			}, root);
-			await api('users/lists/push', {
+			await api('/users/lists/push', {
 				listId: listRoot.body.id,
 				userId: alice.id,
 			}, root);
 
-			await api('following/create', {
+			await api('/following/create', {
 				userId: root.id,
 			}, alice);
-			await api('following/create', {
+			await api('/following/create', {
 				userId: eve.id,
 			}, alice);
-			const antenna = await api('antennas/create', {
+			const antenna = await api('/antennas/create', {
 				name: secureRndstr(8),
 				src: 'home',
-				keywords: [[secureRndstr(8)]],
+				keywords: [secureRndstr(8)],
 				excludeKeywords: [],
 				users: [],
 				caseSensitive: false,
@@ -195,48 +195,48 @@ describe('Account Move', () => {
 			}, alice);
 			antennaId = antenna.body.id;
 
-			await api('i/update', {
+			await api('/i/update', {
 				alsoKnownAs: [`@alice@${url.hostname}`],
 			}, bob);
 
-			await api('following/create', {
+			await api('/following/create', {
 				userId: alice.id,
 			}, carol);
 
-			await api('mute/create', {
+			await api('/mute/create', {
 				userId: alice.id,
 			}, dave);
-			await api('blocking/create', {
+			await api('/blocking/create', {
 				userId: alice.id,
 			}, dave);
-			await api('following/create', {
+			await api('/following/create', {
 				userId: eve.id,
 			}, dave);
 
-			await api('following/create', {
+			await api('/following/create', {
 				userId: dave.id,
 			}, eve);
-			const listEve = await api('users/lists/create', {
+			const listEve = await api('/users/lists/create', {
 				name: secureRndstr(8),
 			}, eve);
-			await api('users/lists/push', {
+			await api('/users/lists/push', {
 				listId: listEve.body.id,
 				userId: bob.id,
 			}, eve);
 
-			await api('i/update', {
+			await api('/i/update', {
 				isLocked: true,
 			}, frank);
-			await api('following/create', {
+			await api('/following/create', {
 				userId: frank.id,
 			}, alice);
-			await api('following/requests/accept', {
+			await api('/following/requests/accept', {
 				userId: alice.id,
 			}, frank);
 		}, 1000 * 10);
 
 		test('Prohibit the root account from moving', async () => {
-			const res = await api('i/move', {
+			const res = await api('/i/move', {
 				moveToAccount: `@bob@${url.hostname}`,
 			}, root);
 
@@ -246,7 +246,7 @@ describe('Account Move', () => {
 		});
 
 		test('Unable to move to a nonexisting local account', async () => {
-			const res = await api('i/move', {
+			const res = await api('/i/move', {
 				moveToAccount: `@nonexist@${url.hostname}`,
 			}, alice);
 
@@ -256,7 +256,7 @@ describe('Account Move', () => {
 		});
 
 		test('Unable to move if alsoKnownAs is invalid', async () => {
-			const res = await api('i/move', {
+			const res = await api('/i/move', {
 				moveToAccount: `@carol@${url.hostname}`,
 			}, alice);
 
@@ -266,7 +266,7 @@ describe('Account Move', () => {
 		});
 
 		test('Relationships have been properly migrated', async () => {
-			const move = await api('i/move', {
+			const move = await api('/i/move', {
 				moveToAccount: `@bob@${url.hostname}`,
 			}, alice);
 
@@ -275,13 +275,13 @@ describe('Account Move', () => {
 			await sleep(1000 * 3); // wait for jobs to finish
 
 			// Unfollow delayed?
-			const aliceFollowings = await api('users/following', {
+			const aliceFollowings = await api('/users/following', {
 				userId: alice.id,
 			}, alice);
 			assert.strictEqual(aliceFollowings.status, 200);
 			assert.strictEqual(aliceFollowings.body.length, 3);
 
-			const carolFollowings = await api('users/following', {
+			const carolFollowings = await api('/users/following', {
 				userId: carol.id,
 			}, carol);
 			assert.strictEqual(carolFollowings.status, 200);
@@ -289,25 +289,25 @@ describe('Account Move', () => {
 			assert.strictEqual(carolFollowings.body[0].followeeId, bob.id);
 			assert.strictEqual(carolFollowings.body[1].followeeId, alice.id);
 
-			const blockings = await api('blocking/list', {}, dave);
+			const blockings = await api('/blocking/list', {}, dave);
 			assert.strictEqual(blockings.status, 200);
 			assert.strictEqual(blockings.body.length, 2);
 			assert.strictEqual(blockings.body[0].blockeeId, bob.id);
 			assert.strictEqual(blockings.body[1].blockeeId, alice.id);
 
-			const mutings = await api('mute/list', {}, dave);
+			const mutings = await api('/mute/list', {}, dave);
 			assert.strictEqual(mutings.status, 200);
 			assert.strictEqual(mutings.body.length, 2);
 			assert.strictEqual(mutings.body[0].muteeId, bob.id);
 			assert.strictEqual(mutings.body[1].muteeId, alice.id);
 
-			const rootLists = await api('users/lists/list', {}, root);
+			const rootLists = await api('/users/lists/list', {}, root);
 			assert.strictEqual(rootLists.status, 200);
 			assert.strictEqual(rootLists.body[0].userIds.length, 2);
 			assert.ok(rootLists.body[0].userIds.find((id: string) => id === bob.id));
 			assert.ok(rootLists.body[0].userIds.find((id: string) => id === alice.id));
 
-			const eveLists = await api('users/lists/list', {}, eve);
+			const eveLists = await api('/users/lists/list', {}, eve);
 			assert.strictEqual(eveLists.status, 200);
 			assert.strictEqual(eveLists.body[0].userIds.length, 1);
 			assert.ok(eveLists.body[0].userIds.find((id: string) => id === bob.id));
@@ -315,13 +315,13 @@ describe('Account Move', () => {
 
 		test('A locked account automatically accept the follow request if it had already accepted the old account.', async () => {
 			await successfulApiCall({
-				endpoint: 'following/create',
+				endpoint: '/following/create',
 				parameters: {
 					userId: frank.id,
 				},
 				user: bob,
 			});
-			const followers = await api('users/followers', {
+			const followers = await api('/users/followers', {
 				userId: frank.id,
 			}, frank);
 
@@ -333,7 +333,7 @@ describe('Account Move', () => {
 		test('Unfollowed after 10 sec (24 hours in production).', async () => {
 			await sleep(1000 * 8);
 
-			const following = await api('users/following', {
+			const following = await api('/users/following', {
 				userId: alice.id,
 			}, alice);
 
@@ -342,7 +342,7 @@ describe('Account Move', () => {
 		});
 
 		test('Unable to move if the destination account has already moved.', async () => {
-			const res = await api('i/move', {
+			const res = await api('/i/move', {
 				moveToAccount: `@alice@${url.hostname}`,
 			}, bob);
 
@@ -352,7 +352,7 @@ describe('Account Move', () => {
 		});
 
 		test('Follow and follower counts are properly adjusted', async () => {
-			await api('following/create', {
+			await api('/following/create', {
 				userId: alice.id,
 			}, eve);
 			const newAlice = await Users.findOneByOrFail({ id: alice.id });
@@ -365,7 +365,7 @@ describe('Account Move', () => {
 			assert.strictEqual(newEve.followingCount, 1);
 			assert.strictEqual(newEve.followersCount, 1);
 
-			await api('following/delete', {
+			await api('/following/delete', {
 				userId: alice.id,
 			}, eve);
 			newEve = await Users.findOneByOrFail({ id: eve.id });
@@ -374,49 +374,49 @@ describe('Account Move', () => {
 		});
 
 		test.each([
-			'antennas/create',
-			'channels/create',
-			'channels/favorite',
-			'channels/follow',
-			'channels/unfavorite',
-			'channels/unfollow',
-			'clips/add-note',
-			'clips/create',
-			'clips/favorite',
-			'clips/remove-note',
-			'clips/unfavorite',
-			'clips/update',
-			'drive/files/upload-from-url',
-			'flash/create',
-			'flash/like',
-			'flash/unlike',
-			'flash/update',
-			'following/create',
-			'gallery/posts/create',
-			'gallery/posts/like',
-			'gallery/posts/unlike',
-			'gallery/posts/update',
-			'i/claim-achievement',
-			'i/move',
-			'i/import-blocking',
-			'i/import-following',
-			'i/import-muting',
-			'i/import-user-lists',
-			'i/pin',
-			'mute/create',
-			'notes/create',
-			'notes/favorites/create',
-			'notes/polls/vote',
-			'notes/reactions/create',
-			'pages/create',
-			'pages/like',
-			'pages/unlike',
-			'pages/update',
-			'renote-mute/create',
-			'users/lists/create',
-			'users/lists/pull',
-			'users/lists/push',
-		] as const)('Prohibit access after moving: %s', async (endpoint) => {
+			'/antennas/create',
+			'/channels/create',
+			'/channels/favorite',
+			'/channels/follow',
+			'/channels/unfavorite',
+			'/channels/unfollow',
+			'/clips/add-note',
+			'/clips/create',
+			'/clips/favorite',
+			'/clips/remove-note',
+			'/clips/unfavorite',
+			'/clips/update',
+			'/drive/files/upload-from-url',
+			'/flash/create',
+			'/flash/like',
+			'/flash/unlike',
+			'/flash/update',
+			'/following/create',
+			'/gallery/posts/create',
+			'/gallery/posts/like',
+			'/gallery/posts/unlike',
+			'/gallery/posts/update',
+			'/i/claim-achievement',
+			'/i/move',
+			'/i/import-blocking',
+			'/i/import-following',
+			'/i/import-muting',
+			'/i/import-user-lists',
+			'/i/pin',
+			'/mute/create',
+			'/notes/create',
+			'/notes/favorites/create',
+			'/notes/polls/vote',
+			'/notes/reactions/create',
+			'/pages/create',
+			'/pages/like',
+			'/pages/unlike',
+			'/pages/update',
+			'/renote-mute/create',
+			'/users/lists/create',
+			'/users/lists/pull',
+			'/users/lists/push',
+		])('Prohibit access after moving: %s', async (endpoint) => {
 			const res = await api(endpoint, {}, alice);
 			assert.strictEqual(res.status, 403);
 			assert.strictEqual(res.body.error.code, 'YOUR_ACCOUNT_MOVED');
@@ -424,11 +424,11 @@ describe('Account Move', () => {
 		});
 
 		test('Prohibit access after moving: /antennas/update', async () => {
-			const res = await api('antennas/update', {
+			const res = await api('/antennas/update', {
 				antennaId,
 				name: secureRndstr(8),
 				src: 'users',
-				keywords: [[secureRndstr(8)]],
+				keywords: [secureRndstr(8)],
 				excludeKeywords: [],
 				users: [eve.id],
 				caseSensitive: false,
@@ -447,12 +447,12 @@ describe('Account Move', () => {
 			const res = await uploadFile(alice);
 
 			assert.strictEqual(res.status, 403);
-			assert.strictEqual((res.body! as any as { error: misskey.api.APIError }).error.code, 'YOUR_ACCOUNT_MOVED');
-			assert.strictEqual((res.body! as any as { error: misskey.api.APIError }).error.id, '56f20ec9-fd06-4fa5-841b-edd6d7d4fa31');
+			assert.strictEqual(res.body.error.code, 'YOUR_ACCOUNT_MOVED');
+			assert.strictEqual(res.body.error.id, '56f20ec9-fd06-4fa5-841b-edd6d7d4fa31');
 		});
 
 		test('Prohibit updating alsoKnownAs after moving', async () => {
-			const res = await api('i/update', {
+			const res = await api('/i/update', {
 				alsoKnownAs: [`@eve@${url.hostname}`],
 			}, alice);
 
diff --git a/packages/backend/test/e2e/mute.ts b/packages/backend/test/e2e/mute.ts
index 5841f80166..abba3e1afd 100644
--- a/packages/backend/test/e2e/mute.ts
+++ b/packages/backend/test/e2e/mute.ts
@@ -19,31 +19,21 @@ describe('Mute', () => {
 		alice = await signup({ username: 'alice' });
 		bob = await signup({ username: 'bob' });
 		carol = await signup({ username: 'carol' });
-
-		// Mute: alice ==> carol
-		await api('mute/create', {
-			userId: carol.id,
-		}, alice);
 	}, 1000 * 60 * 2);
 
 	test('ミュート作成', async () => {
-		const res = await api('mute/create', {
-			userId: bob.id,
+		const res = await api('/mute/create', {
+			userId: carol.id,
 		}, alice);
 
 		assert.strictEqual(res.status, 204);
-
-		// 単体でも走らせられるように副作用消す
-		await api('mute/delete', {
-			userId: bob.id,
-		}, alice);
 	});
 
 	test('「自分宛ての投稿」にミュートしているユーザーの投稿が含まれない', async () => {
 		const bobNote = await post(bob, { text: '@alice hi' });
 		const carolNote = await post(carol, { text: '@alice hi' });
 
-		const res = await api('notes/mentions', {}, alice);
+		const res = await api('/notes/mentions', {}, alice);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(Array.isArray(res.body), true);
@@ -53,11 +43,11 @@ describe('Mute', () => {
 
 	test('ミュートしているユーザーからメンションされても、hasUnreadMentions が true にならない', async () => {
 		// 状態リセット
-		await api('i/read-all-unread-notes', {}, alice);
+		await api('/i/read-all-unread-notes', {}, alice);
 
 		await post(carol, { text: '@alice hi' });
 
-		const res = await api('i', {}, alice);
+		const res = await api('/i', {}, alice);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(res.body.hasUnreadMentions, false);
@@ -65,7 +55,7 @@ describe('Mute', () => {
 
 	test('ミュートしているユーザーからメンションされても、ストリームに unreadMention イベントが流れてこない', async () => {
 		// 状態リセット
-		await api('i/read-all-unread-notes', {}, alice);
+		await api('/i/read-all-unread-notes', {}, alice);
 
 		const fired = await waitFire(alice, 'main', () => post(carol, { text: '@alice hi' }), msg => msg.type === 'unreadMention');
 
@@ -74,8 +64,8 @@ describe('Mute', () => {
 
 	test('ミュートしているユーザーからメンションされても、ストリームに unreadNotification イベントが流れてこない', async () => {
 		// 状態リセット
-		await api('i/read-all-unread-notes', {}, alice);
-		await api('notifications/mark-all-as-read', {}, alice);
+		await api('/i/read-all-unread-notes', {}, alice);
+		await api('/notifications/mark-all-as-read', {}, alice);
 
 		const fired = await waitFire(alice, 'main', () => post(carol, { text: '@alice hi' }), msg => msg.type === 'unreadNotification');
 
@@ -88,7 +78,7 @@ describe('Mute', () => {
 			const bobNote = await post(bob, { text: 'hi' });
 			const carolNote = await post(carol, { text: 'hi' });
 
-			const res = await api('notes/local-timeline', {}, alice);
+			const res = await api('/notes/local-timeline', {}, alice);
 
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
@@ -104,7 +94,7 @@ describe('Mute', () => {
 				renoteId: carolNote.id,
 			});
 
-			const res = await api('notes/local-timeline', {}, alice);
+			const res = await api('/notes/local-timeline', {}, alice);
 
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
@@ -120,199 +110,10 @@ describe('Mute', () => {
 			await react(bob, aliceNote, 'like');
 			await react(carol, aliceNote, 'like');
 
-			const res = await api('i/notifications', {}, alice);
-
-			assert.strictEqual(res.status, 200);
-			assert.strictEqual(Array.isArray(res.body), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
-		});
-
-		test('通知にミュートしているユーザーからのリプライが含まれない', async () => {
-			const aliceNote = await post(alice, { text: 'hi' });
-			await post(bob, { text: '@alice hi', replyId: aliceNote.id });
-			await post(carol, { text: '@alice hi', replyId: aliceNote.id });
-
-			const res = await api('i/notifications', {}, alice);
-
-			assert.strictEqual(res.status, 200);
-			assert.strictEqual(Array.isArray(res.body), true);
-
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
-		});
-
-		test('通知にミュートしているユーザーからのリプライが含まれない', async () => {
-			await post(alice, { text: 'hi' });
-			await post(bob, { text: '@alice hi' });
-			await post(carol, { text: '@alice hi' });
-
-			const res = await api('i/notifications', {}, alice);
-
-			assert.strictEqual(res.status, 200);
-			assert.strictEqual(Array.isArray(res.body), true);
-
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
-		});
-
-		test('通知にミュートしているユーザーからの引用リノートが含まれない', async () => {
-			const aliceNote = await post(alice, { text: 'hi' });
-			await post(bob, { text: 'hi', renoteId: aliceNote.id });
-			await post(carol, { text: 'hi', renoteId: aliceNote.id });
-
-			const res = await api('i/notifications', {}, alice);
+			const res = await api('/i/notifications', {}, alice);
 
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
-
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
-		});
-
-		test('通知にミュートしているユーザーからのリノートが含まれない', async () => {
-			const aliceNote = await post(alice, { text: 'hi' });
-			await post(bob, { renoteId: aliceNote.id });
-			await post(carol, { renoteId: aliceNote.id });
-
-			const res = await api('i/notifications', {}, alice);
-
-			assert.strictEqual(res.status, 200);
-			assert.strictEqual(Array.isArray(res.body), true);
-
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
-		});
-
-		test('通知にミュートしているユーザーからのフォロー通知が含まれない', async () => {
-			await api('following/create', { userId: alice.id }, bob);
-			await api('following/create', { userId: alice.id }, carol);
-
-			const res = await api('i/notifications', {}, alice);
-
-			assert.strictEqual(res.status, 200);
-			assert.strictEqual(Array.isArray(res.body), true);
-
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
-
-			await api('following/delete', { userId: alice.id }, bob);
-			await api('following/delete', { userId: alice.id }, carol);
-		});
-
-		test('通知にミュートしているユーザーからのフォローリクエストが含まれない', async () => {
-			await api('i/update', { isLocked: true }, alice);
-			await api('following/create', { userId: alice.id }, bob);
-			await api('following/create', { userId: alice.id }, carol);
-
-			const res = await api('i/notifications', {}, alice);
-
-			assert.strictEqual(res.status, 200);
-			assert.strictEqual(Array.isArray(res.body), true);
-
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
-
-			await api('following/delete', { userId: alice.id }, bob);
-			await api('following/delete', { userId: alice.id }, carol);
-		});
-	});
-
-	describe('Notification (Grouped)', () => {
-		test('通知にミュートしているユーザーの通知が含まれない(リアクション)', async () => {
-			const aliceNote = await post(alice, { text: 'hi' });
-			await react(bob, aliceNote, 'like');
-			await react(carol, aliceNote, 'like');
-
-			const res = await api('i/notifications-grouped', {}, alice);
-
-			assert.strictEqual(res.status, 200);
-			assert.strictEqual(Array.isArray(res.body), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
-		});
-		test('通知にミュートしているユーザーからのリプライが含まれない', async () => {
-			const aliceNote = await post(alice, { text: 'hi' });
-			await post(bob, { text: '@alice hi', replyId: aliceNote.id });
-			await post(carol, { text: '@alice hi', replyId: aliceNote.id });
-
-			const res = await api('i/notifications-grouped', {}, alice);
-
-			assert.strictEqual(res.status, 200);
-			assert.strictEqual(Array.isArray(res.body), true);
-
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
-		});
-
-		test('通知にミュートしているユーザーからのリプライが含まれない', async () => {
-			await post(alice, { text: 'hi' });
-			await post(bob, { text: '@alice hi' });
-			await post(carol, { text: '@alice hi' });
-
-			const res = await api('i/notifications-grouped', {}, alice);
-
-			assert.strictEqual(res.status, 200);
-			assert.strictEqual(Array.isArray(res.body), true);
-
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
-		});
-
-		test('通知にミュートしているユーザーからの引用リノートが含まれない', async () => {
-			const aliceNote = await post(alice, { text: 'hi' });
-			await post(bob, { text: 'hi', renoteId: aliceNote.id });
-			await post(carol, { text: 'hi', renoteId: aliceNote.id });
-
-			const res = await api('i/notifications-grouped', {}, alice);
-
-			assert.strictEqual(res.status, 200);
-			assert.strictEqual(Array.isArray(res.body), true);
-
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
-		});
-
-		test('通知にミュートしているユーザーからのリノートが含まれない', async () => {
-			const aliceNote = await post(alice, { text: 'hi' });
-			await post(bob, { renoteId: aliceNote.id });
-			await post(carol, { renoteId: aliceNote.id });
-
-			const res = await api('i/notifications-grouped', {}, alice);
-
-			assert.strictEqual(res.status, 200);
-			assert.strictEqual(Array.isArray(res.body), true);
-
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
-		});
-
-		test('通知にミュートしているユーザーからのフォロー通知が含まれない', async () => {
-			await api('following/create', { userId: alice.id }, bob);
-			await api('following/create', { userId: alice.id }, carol);
-
-			const res = await api('i/notifications-grouped', {}, alice);
-
-			assert.strictEqual(res.status, 200);
-			assert.strictEqual(Array.isArray(res.body), true);
-
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
-
-			await api('following/delete', { userId: alice.id }, bob);
-			await api('following/delete', { userId: alice.id }, carol);
-		});
-
-		test('通知にミュートしているユーザーからのフォローリクエストが含まれない', async () => {
-			await api('i/update', { isLocked: true }, alice);
-			await api('following/create', { userId: alice.id }, bob);
-			await api('following/create', { userId: alice.id }, carol);
-
-			const res = await api('i/notifications-grouped', {}, alice);
-
-			assert.strictEqual(res.status, 200);
-			assert.strictEqual(Array.isArray(res.body), true);
-
 			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
 			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
 		});
diff --git a/packages/backend/test/e2e/note.ts b/packages/backend/test/e2e/note.ts
index 0f21078cb2..9ab6bbd842 100644
--- a/packages/backend/test/e2e/note.ts
+++ b/packages/backend/test/e2e/note.ts
@@ -31,7 +31,7 @@ describe('Note', () => {
 			text: 'test',
 		};
 
-		const res = await api('notes/create', post, alice);
+		const res = await api('/notes/create', post, alice);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
@@ -41,7 +41,7 @@ describe('Note', () => {
 	test('ファイルを添付できる', async () => {
 		const file = await uploadUrl(alice, 'https://raw.githubusercontent.com/kokonect-link/cherrypick/develop/packages/backend/test/resources/Lenna.jpg');
 
-		const res = await api('notes/create', {
+		const res = await api('/notes/create', {
 			fileIds: [file.id],
 		}, alice);
 
@@ -53,7 +53,7 @@ describe('Note', () => {
 	test('他人のファイルで怒られる', async () => {
 		const file = await uploadUrl(bob, 'https://raw.githubusercontent.com/kokonect-link/cherrypick/develop/packages/backend/test/resources/Lenna.jpg');
 
-		const res = await api('notes/create', {
+		const res = await api('/notes/create', {
 			text: 'test',
 			fileIds: [file.id],
 		}, alice);
@@ -64,7 +64,7 @@ describe('Note', () => {
 	}, 1000 * 10);
 
 	test('存在しないファイルで怒られる', async () => {
-		const res = await api('notes/create', {
+		const res = await api('/notes/create', {
 			text: 'test',
 			fileIds: ['000000000000000000000000'],
 		}, alice);
@@ -75,7 +75,7 @@ describe('Note', () => {
 	});
 
 	test('不正なファイルIDで怒られる', async () => {
-		const res = await api('notes/create', {
+		const res = await api('/notes/create', {
 			fileIds: ['kyoppie'],
 		}, alice);
 		assert.strictEqual(res.status, 400);
@@ -93,7 +93,7 @@ describe('Note', () => {
 			replyId: bobPost.id,
 		};
 
-		const res = await api('notes/create', alicePost, alice);
+		const res = await api('/notes/create', alicePost, alice);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
@@ -111,7 +111,7 @@ describe('Note', () => {
 			renoteId: bobPost.id,
 		};
 
-		const res = await api('notes/create', alicePost, alice);
+		const res = await api('/notes/create', alicePost, alice);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
@@ -129,7 +129,7 @@ describe('Note', () => {
 			renoteId: bobPost.id,
 		};
 
-		const res = await api('notes/create', alicePost, alice);
+		const res = await api('/notes/create', alicePost, alice);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
@@ -142,7 +142,7 @@ describe('Note', () => {
 		const bobPost = await post(bob, {
 			text: 'test',
 		});
-		const res = await api('notes/create', {
+		const res = await api('/notes/create', {
 			text: ' ',
 			renoteId: bobPost.id,
 		}, alice);
@@ -152,7 +152,7 @@ describe('Note', () => {
 	});
 
 	test('visibility: followersでrenoteできる', async () => {
-		const createRes = await api('notes/create', {
+		const createRes = await api('/notes/create', {
 			text: 'test',
 			visibility: 'followers',
 		}, alice);
@@ -160,7 +160,7 @@ describe('Note', () => {
 		assert.strictEqual(createRes.status, 200);
 
 		const renoteId = createRes.body.createdNote.id;
-		const renoteRes = await api('notes/create', {
+		const renoteRes = await api('/notes/create', {
 			visibility: 'followers',
 			renoteId,
 		}, alice);
@@ -169,99 +169,18 @@ describe('Note', () => {
 		assert.strictEqual(renoteRes.body.createdNote.renoteId, renoteId);
 		assert.strictEqual(renoteRes.body.createdNote.visibility, 'followers');
 
-		const deleteRes = await api('notes/delete', {
+		const deleteRes = await api('/notes/delete', {
 			noteId: renoteRes.body.createdNote.id,
 		}, alice);
 
 		assert.strictEqual(deleteRes.status, 204);
 	});
 
-	test('visibility: followersなノートに対してフォロワーはリプライできる', async () => {
-		await api('following/create', {
-			userId: alice.id,
-		}, bob);
-
-		const aliceNote = await api('notes/create', {
-			text: 'direct note to bob',
-			visibility: 'followers',
-		}, alice);
-
-		assert.strictEqual(aliceNote.status, 200);
-
-		const replyId = aliceNote.body.createdNote.id;
-		const bobReply = await api('notes/create', {
-			text: 'reply to alice note',
-			replyId,
-		}, bob);
-
-		assert.strictEqual(bobReply.status, 200);
-		assert.strictEqual(bobReply.body.createdNote.replyId, replyId);
-
-		await api('following/delete', {
-			userId: alice.id,
-		}, bob);
-	});
-
-	test('visibility: followersなノートに対してフォロワーでないユーザーがリプライしようとすると怒られる', async () => {
-		const aliceNote = await api('notes/create', {
-			text: 'direct note to bob',
-			visibility: 'followers',
-		}, alice);
-
-		assert.strictEqual(aliceNote.status, 200);
-
-		const bobReply = await api('notes/create', {
-			text: 'reply to alice note',
-			replyId: aliceNote.body.createdNote.id,
-		}, bob);
-
-		assert.strictEqual(bobReply.status, 400);
-		assert.strictEqual(bobReply.body.error.code, 'CANNOT_REPLY_TO_AN_INVISIBLE_NOTE');
-	});
-
-	test('visibility: specifiedなノートに対してvisibility: specifiedで返信できる', async () => {
-		const aliceNote = await api('notes/create', {
-			text: 'direct note to bob',
-			visibility: 'specified',
-			visibleUserIds: [bob.id],
-		}, alice);
-
-		assert.strictEqual(aliceNote.status, 200);
-
-		const bobReply = await api('notes/create', {
-			text: 'reply to alice note',
-			replyId: aliceNote.body.createdNote.id,
-			visibility: 'specified',
-			visibleUserIds: [alice.id],
-		}, bob);
-
-		assert.strictEqual(bobReply.status, 200);
-	});
-
-	test('visibility: specifiedなノートに対してvisibility: follwersで返信しようとすると怒られる', async () => {
-		const aliceNote = await api('notes/create', {
-			text: 'direct note to bob',
-			visibility: 'specified',
-			visibleUserIds: [bob.id],
-		}, alice);
-
-		assert.strictEqual(aliceNote.status, 200);
-
-		const bobReply = await api('notes/create', {
-			text: 'reply to alice note with visibility: followers',
-			replyId: aliceNote.body.createdNote.id,
-			visibility: 'followers',
-		}, bob);
-
-		assert.strictEqual(bobReply.status, 400);
-		assert.strictEqual(bobReply.body.error.code, 'CANNOT_REPLY_TO_SPECIFIED_VISIBILITY_NOTE_WITH_EXTENDED_VISIBILITY');
-	});
-
 	test('文字数ぎりぎりで怒られない', async () => {
 		const post = {
 			text: '!'.repeat(MAX_NOTE_TEXT_LENGTH), // 3000文字
 		};
-		const res = await api('notes/create', post, alice);
+		const res = await api('/notes/create', post, alice);
 		assert.strictEqual(res.status, 200);
 	});
 
@@ -269,7 +188,7 @@ describe('Note', () => {
 		const post = {
 			text: '!'.repeat(MAX_NOTE_TEXT_LENGTH + 1), // 3001文字
 		};
-		const res = await api('notes/create', post, alice);
+		const res = await api('/notes/create', post, alice);
 		assert.strictEqual(res.status, 400);
 	});
 
@@ -278,7 +197,7 @@ describe('Note', () => {
 			text: 'test',
 			replyId: '000000000000000000000000',
 		};
-		const res = await api('notes/create', post, alice);
+		const res = await api('/notes/create', post, alice);
 		assert.strictEqual(res.status, 400);
 	});
 
@@ -286,7 +205,7 @@ describe('Note', () => {
 		const post = {
 			renoteId: '000000000000000000000000',
 		};
-		const res = await api('notes/create', post, alice);
+		const res = await api('/notes/create', post, alice);
 		assert.strictEqual(res.status, 400);
 	});
 
@@ -295,7 +214,7 @@ describe('Note', () => {
 			text: 'test',
 			replyId: 'foo',
 		};
-		const res = await api('notes/create', post, alice);
+		const res = await api('/notes/create', post, alice);
 		assert.strictEqual(res.status, 400);
 	});
 
@@ -303,7 +222,7 @@ describe('Note', () => {
 		const post = {
 			renoteId: 'foo',
 		};
-		const res = await api('notes/create', post, alice);
+		const res = await api('/notes/create', post, alice);
 		assert.strictEqual(res.status, 400);
 	});
 
@@ -312,7 +231,7 @@ describe('Note', () => {
 			text: '@ghost yo',
 		};
 
-		const res = await api('notes/create', post, alice);
+		const res = await api('/notes/create', post, alice);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
@@ -324,7 +243,7 @@ describe('Note', () => {
 			text: '@bob @bob @bob yo',
 		};
 
-		const res = await api('notes/create', post, alice);
+		const res = await api('/notes/create', post, alice);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
@@ -337,25 +256,25 @@ describe('Note', () => {
 	describe('添付ファイル情報', () => {
 		test('ファイルを添付した場合、投稿成功時にファイル情報入りのレスポンスが帰ってくる', async () => {
 			const file = await uploadFile(alice);
-			const res = await api('notes/create', {
-				fileIds: [file.body!.id],
+			const res = await api('/notes/create', {
+				fileIds: [file.body.id],
 			}, alice);
 
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
 			assert.strictEqual(res.body.createdNote.files.length, 1);
-			assert.strictEqual(res.body.createdNote.files[0].id, file.body!.id);
+			assert.strictEqual(res.body.createdNote.files[0].id, file.body.id);
 		});
 
 		test('ファイルを添付した場合、タイムラインでファイル情報入りのレスポンスが帰ってくる', async () => {
 			const file = await uploadFile(alice);
-			const createdNote = await api('notes/create', {
-				fileIds: [file.body!.id],
+			const createdNote = await api('/notes/create', {
+				fileIds: [file.body.id],
 			}, alice);
 
 			assert.strictEqual(createdNote.status, 200);
 
-			const res = await api('notes', {
+			const res = await api('/notes', {
 				withFiles: true,
 			}, alice);
 
@@ -364,23 +283,23 @@ describe('Note', () => {
 			const myNote = res.body.find((note: { id: string; files: { id: string }[] }) => note.id === createdNote.body.createdNote.id);
 			assert.notEqual(myNote, null);
 			assert.strictEqual(myNote.files.length, 1);
-			assert.strictEqual(myNote.files[0].id, file.body!.id);
+			assert.strictEqual(myNote.files[0].id, file.body.id);
 		});
 
 		test('ファイルが添付されたノートをリノートした場合、タイムラインでファイル情報入りのレスポンスが帰ってくる', async () => {
 			const file = await uploadFile(alice);
-			const createdNote = await api('notes/create', {
-				fileIds: [file.body!.id],
+			const createdNote = await api('/notes/create', {
+				fileIds: [file.body.id],
 			}, alice);
 
 			assert.strictEqual(createdNote.status, 200);
 
-			const renoted = await api('notes/create', {
+			const renoted = await api('/notes/create', {
 				renoteId: createdNote.body.createdNote.id,
 			}, alice);
 			assert.strictEqual(renoted.status, 200);
 
-			const res = await api('notes', {
+			const res = await api('/notes', {
 				renote: true,
 			}, alice);
 
@@ -389,24 +308,24 @@ describe('Note', () => {
 			const myNote = res.body.find((note: { id: string }) => note.id === renoted.body.createdNote.id);
 			assert.notEqual(myNote, null);
 			assert.strictEqual(myNote.renote.files.length, 1);
-			assert.strictEqual(myNote.renote.files[0].id, file.body!.id);
+			assert.strictEqual(myNote.renote.files[0].id, file.body.id);
 		});
 
 		test('ファイルが添付されたノートに返信した場合、タイムラインでファイル情報入りのレスポンスが帰ってくる', async () => {
 			const file = await uploadFile(alice);
-			const createdNote = await api('notes/create', {
-				fileIds: [file.body!.id],
+			const createdNote = await api('/notes/create', {
+				fileIds: [file.body.id],
 			}, alice);
 
 			assert.strictEqual(createdNote.status, 200);
 
-			const reply = await api('notes/create', {
+			const reply = await api('/notes/create', {
 				replyId: createdNote.body.createdNote.id,
 				text: 'this is reply',
 			}, alice);
 			assert.strictEqual(reply.status, 200);
 
-			const res = await api('notes', {
+			const res = await api('/notes', {
 				reply: true,
 			}, alice);
 
@@ -415,29 +334,29 @@ describe('Note', () => {
 			const myNote = res.body.find((note: { id: string }) => note.id === reply.body.createdNote.id);
 			assert.notEqual(myNote, null);
 			assert.strictEqual(myNote.reply.files.length, 1);
-			assert.strictEqual(myNote.reply.files[0].id, file.body!.id);
+			assert.strictEqual(myNote.reply.files[0].id, file.body.id);
 		});
 
 		test('ファイルが添付されたノートへの返信をリノートした場合、タイムラインでファイル情報入りのレスポンスが帰ってくる', async () => {
 			const file = await uploadFile(alice);
-			const createdNote = await api('notes/create', {
-				fileIds: [file.body!.id],
+			const createdNote = await api('/notes/create', {
+				fileIds: [file.body.id],
 			}, alice);
 
 			assert.strictEqual(createdNote.status, 200);
 
-			const reply = await api('notes/create', {
+			const reply = await api('/notes/create', {
 				replyId: createdNote.body.createdNote.id,
 				text: 'this is reply',
 			}, alice);
 			assert.strictEqual(reply.status, 200);
 
-			const renoted = await api('notes/create', {
+			const renoted = await api('/notes/create', {
 				renoteId: reply.body.createdNote.id,
 			}, alice);
 			assert.strictEqual(renoted.status, 200);
 
-			const res = await api('notes', {
+			const res = await api('/notes', {
 				renote: true,
 			}, alice);
 
@@ -446,7 +365,7 @@ describe('Note', () => {
 			const myNote = res.body.find((note: { id: string }) => note.id === renoted.body.createdNote.id);
 			assert.notEqual(myNote, null);
 			assert.strictEqual(myNote.renote.reply.files.length, 1);
-			assert.strictEqual(myNote.renote.reply.files[0].id, file.body!.id);
+			assert.strictEqual(myNote.renote.reply.files[0].id, file.body.id);
 		});
 
 		test('NSFWが強制されている場合変更できない', async () => {
@@ -472,7 +391,7 @@ describe('Note', () => {
 						priority: 0,
 						value: true,
 					},
-				} as any,
+				},
 			}, alice);
 
 			assert.strictEqual(res.status, 200);
@@ -483,15 +402,15 @@ describe('Note', () => {
 			}, alice);
 
 			assert.strictEqual(assign.status, 204);
-			assert.strictEqual(file.body!.isSensitive, false);
+			assert.strictEqual(file.body.isSensitive, false);
 
 			const nsfwfile = await uploadFile(alice);
 
 			assert.strictEqual(nsfwfile.status, 200);
-			assert.strictEqual(nsfwfile.body!.isSensitive, true);
+			assert.strictEqual(nsfwfile.body.isSensitive, true);
 
 			const liftnsfw = await api('drive/files/update', {
-				fileId: nsfwfile.body!.id,
+				fileId: nsfwfile.body.id,
 				isSensitive: false,
 			}, alice);
 
@@ -499,7 +418,7 @@ describe('Note', () => {
 			assert.strictEqual(liftnsfw.body.error.code, 'RESTRICTED_BY_ROLE');
 
 			const oldaddnsfw = await api('drive/files/update', {
-				fileId: file.body!.id,
+				fileId: file.body.id,
 				isSensitive: true,
 			}, alice);
 
@@ -518,7 +437,7 @@ describe('Note', () => {
 
 	describe('notes/create', () => {
 		test('投票を添付できる', async () => {
-			const res = await api('notes/create', {
+			const res = await api('/notes/create', {
 				text: 'test',
 				poll: {
 					choices: ['foo', 'bar'],
@@ -531,15 +450,14 @@ describe('Note', () => {
 		});
 
 		test('投票の選択肢が無くて怒られる', async () => {
-			const res = await api('notes/create', {
-				// @ts-expect-error poll must not be empty
+			const res = await api('/notes/create', {
 				poll: {},
 			}, alice);
 			assert.strictEqual(res.status, 400);
 		});
 
 		test('投票の選択肢が無くて怒られる (空の配列)', async () => {
-			const res = await api('notes/create', {
+			const res = await api('/notes/create', {
 				poll: {
 					choices: [],
 				},
@@ -548,7 +466,7 @@ describe('Note', () => {
 		});
 
 		test('投票の選択肢が1つで怒られる', async () => {
-			const res = await api('notes/create', {
+			const res = await api('/notes/create', {
 				poll: {
 					choices: ['Strawberry Pasta'],
 				},
@@ -557,14 +475,14 @@ describe('Note', () => {
 		});
 
 		test('投票できる', async () => {
-			const { body } = await api('notes/create', {
+			const { body } = await api('/notes/create', {
 				text: 'test',
 				poll: {
 					choices: ['sakura', 'izumi', 'ako'],
 				},
 			}, alice);
 
-			const res = await api('notes/polls/vote', {
+			const res = await api('/notes/polls/vote', {
 				noteId: body.createdNote.id,
 				choice: 1,
 			}, alice);
@@ -573,19 +491,19 @@ describe('Note', () => {
 		});
 
 		test('複数投票できない', async () => {
-			const { body } = await api('notes/create', {
+			const { body } = await api('/notes/create', {
 				text: 'test',
 				poll: {
 					choices: ['sakura', 'izumi', 'ako'],
 				},
 			}, alice);
 
-			await api('notes/polls/vote', {
+			await api('/notes/polls/vote', {
 				noteId: body.createdNote.id,
 				choice: 0,
 			}, alice);
 
-			const res = await api('notes/polls/vote', {
+			const res = await api('/notes/polls/vote', {
 				noteId: body.createdNote.id,
 				choice: 2,
 			}, alice);
@@ -594,7 +512,7 @@ describe('Note', () => {
 		});
 
 		test('許可されている場合は複数投票できる', async () => {
-			const { body } = await api('notes/create', {
+			const { body } = await api('/notes/create', {
 				text: 'test',
 				poll: {
 					choices: ['sakura', 'izumi', 'ako'],
@@ -602,17 +520,17 @@ describe('Note', () => {
 				},
 			}, alice);
 
-			await api('notes/polls/vote', {
+			await api('/notes/polls/vote', {
 				noteId: body.createdNote.id,
 				choice: 0,
 			}, alice);
 
-			await api('notes/polls/vote', {
+			await api('/notes/polls/vote', {
 				noteId: body.createdNote.id,
 				choice: 1,
 			}, alice);
 
-			const res = await api('notes/polls/vote', {
+			const res = await api('/notes/polls/vote', {
 				noteId: body.createdNote.id,
 				choice: 2,
 			}, alice);
@@ -621,7 +539,7 @@ describe('Note', () => {
 		});
 
 		test('締め切られている場合は投票できない', async () => {
-			const { body } = await api('notes/create', {
+			const { body } = await api('/notes/create', {
 				text: 'test',
 				poll: {
 					choices: ['sakura', 'izumi', 'ako'],
@@ -631,7 +549,7 @@ describe('Note', () => {
 
 			await new Promise(x => setTimeout(x, 2));
 
-			const res = await api('notes/polls/vote', {
+			const res = await api('/notes/polls/vote', {
 				noteId: body.createdNote.id,
 				choice: 1,
 			}, alice);
@@ -650,7 +568,7 @@ describe('Note', () => {
 
 			await new Promise(x => setTimeout(x, 2));
 
-			const note1 = await api('notes/create', {
+			const note1 = await api('/notes/create', {
 				text: 'hogetesthuge',
 			}, alice);
 
@@ -667,7 +585,7 @@ describe('Note', () => {
 
 			assert.strictEqual(sensitive.status, 204);
 
-			const note2 = await api('notes/create', {
+			const note2 = await api('/notes/create', {
 				text: 'hogetesthuge',
 			}, alice);
 
@@ -684,7 +602,7 @@ describe('Note', () => {
 
 			assert.strictEqual(sensitive.status, 204);
 
-			const note2 = await api('notes/create', {
+			const note2 = await api('/notes/create', {
 				text: 'hogeTesthuge',
 			}, alice);
 
@@ -703,7 +621,7 @@ describe('Note', () => {
 
 			await new Promise(x => setTimeout(x, 2));
 
-			const note1 = await api('notes/create', {
+			const note1 = await api('/notes/create', {
 				text: 'hogetesthuge',
 			}, alice);
 
@@ -720,7 +638,7 @@ describe('Note', () => {
 
 			assert.strictEqual(prohibited.status, 204);
 
-			const note2 = await api('notes/create', {
+			const note2 = await api('/notes/create', {
 				text: 'hogetesthuge',
 			}, alice);
 
@@ -737,7 +655,7 @@ describe('Note', () => {
 
 			assert.strictEqual(prohibited.status, 204);
 
-			const note2 = await api('notes/create', {
+			const note2 = await api('/notes/create', {
 				text: 'hogeTesthuge',
 			}, alice);
 
@@ -756,177 +674,12 @@ describe('Note', () => {
 
 			await new Promise(x => setTimeout(x, 2));
 
-			const note1 = await api('notes/create', {
+			const note1 = await api('/notes/create', {
 				text: 'hogetesthuge',
 			}, tom);
 
 			assert.strictEqual(note1.status, 400);
 		});
-
-		test('メンションの数が上限を超えるとエラーになる', async () => {
-			const res = await api('admin/roles/create', {
-				name: 'test',
-				description: '',
-				color: null,
-				iconUrl: null,
-				displayOrder: 0,
-				target: 'manual',
-				condFormula: {},
-				isAdministrator: false,
-				isModerator: false,
-				isPublic: false,
-				isExplorable: false,
-				asBadge: false,
-				canEditMembersByModerator: false,
-				policies: {
-					mentionLimit: {
-						useDefault: false,
-						priority: 1,
-						value: 0,
-					},
-				} as any,
-			}, alice);
-
-			assert.strictEqual(res.status, 200);
-
-			await new Promise(x => setTimeout(x, 2));
-
-			const assign = await api('admin/roles/assign', {
-				userId: alice.id,
-				roleId: res.body.id,
-			}, alice);
-
-			assert.strictEqual(assign.status, 204);
-
-			await new Promise(x => setTimeout(x, 2));
-
-			const note = await api('notes/create', {
-				text: '@bob potentially annoying text',
-			}, alice);
-
-			assert.strictEqual(note.status, 400);
-			assert.strictEqual(note.body.error.code, 'CONTAINS_TOO_MANY_MENTIONS');
-
-			await api('admin/roles/unassign', {
-				userId: alice.id,
-				roleId: res.body.id,
-			});
-
-			await api('admin/roles/delete', {
-				roleId: res.body.id,
-			}, alice);
-		});
-
-		test('ダイレクト投稿もエラーになる', async () => {
-			const res = await api('admin/roles/create', {
-				name: 'test',
-				description: '',
-				color: null,
-				iconUrl: null,
-				displayOrder: 0,
-				target: 'manual',
-				condFormula: {},
-				isAdministrator: false,
-				isModerator: false,
-				isPublic: false,
-				isExplorable: false,
-				asBadge: false,
-				canEditMembersByModerator: false,
-				policies: {
-					mentionLimit: {
-						useDefault: false,
-						priority: 1,
-						value: 0,
-					},
-				} as any,
-			}, alice);
-
-			assert.strictEqual(res.status, 200);
-
-			await new Promise(x => setTimeout(x, 2));
-
-			const assign = await api('admin/roles/assign', {
-				userId: alice.id,
-				roleId: res.body.id,
-			}, alice);
-
-			assert.strictEqual(assign.status, 204);
-
-			await new Promise(x => setTimeout(x, 2));
-
-			const note = await api('notes/create', {
-				text: 'potentially annoying text',
-				visibility: 'specified',
-				visibleUserIds: [bob.id],
-			}, alice);
-
-			assert.strictEqual(note.status, 400);
-			assert.strictEqual(note.body.error.code, 'CONTAINS_TOO_MANY_MENTIONS');
-
-			await api('admin/roles/unassign', {
-				userId: alice.id,
-				roleId: res.body.id,
-			});
-
-			await api('admin/roles/delete', {
-				roleId: res.body.id,
-			}, alice);
-		});
-
-		test('ダイレクトの宛先とメンションが同じ場合は重複してカウントしない', async () => {
-			const res = await api('admin/roles/create', {
-				name: 'test',
-				description: '',
-				color: null,
-				iconUrl: null,
-				displayOrder: 0,
-				target: 'manual',
-				condFormula: {},
-				isAdministrator: false,
-				isModerator: false,
-				isPublic: false,
-				isExplorable: false,
-				asBadge: false,
-				canEditMembersByModerator: false,
-				policies: {
-					mentionLimit: {
-						useDefault: false,
-						priority: 1,
-						value: 1,
-					},
-				} as any,
-			}, alice);
-
-			assert.strictEqual(res.status, 200);
-
-			await new Promise(x => setTimeout(x, 2));
-
-			const assign = await api('admin/roles/assign', {
-				userId: alice.id,
-				roleId: res.body.id,
-			}, alice);
-
-			assert.strictEqual(assign.status, 204);
-
-			await new Promise(x => setTimeout(x, 2));
-
-			const note = await api('notes/create', {
-				text: '@bob potentially annoying text',
-				visibility: 'specified',
-				visibleUserIds: [bob.id],
-			}, alice);
-
-			assert.strictEqual(note.status, 200);
-
-			await api('admin/roles/unassign', {
-				userId: alice.id,
-				roleId: res.body.id,
-			});
-
-			await api('admin/roles/delete', {
-				roleId: res.body.id,
-			}, alice);
-		});
 	});
 
 	describe('notes/delete', () => {
diff --git a/packages/backend/test/e2e/renote-mute.ts b/packages/backend/test/e2e/renote-mute.ts
index 99016f1e30..7775bcdb84 100644
--- a/packages/backend/test/e2e/renote-mute.ts
+++ b/packages/backend/test/e2e/renote-mute.ts
@@ -22,7 +22,7 @@ describe('Renote Mute', () => {
 	}, 1000 * 60 * 2);
 
 	test('ミュート作成', async () => {
-		const res = await api('renote-mute/create', {
+		const res = await api('/renote-mute/create', {
 			userId: carol.id,
 		}, alice);
 
@@ -37,7 +37,7 @@ describe('Renote Mute', () => {
 		// redisに追加されるのを待つ
 		await sleep(100);
 
-		const res = await api('notes/local-timeline', {}, alice);
+		const res = await api('/notes/local-timeline', {}, alice);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(Array.isArray(res.body), true);
@@ -54,7 +54,7 @@ describe('Renote Mute', () => {
 		// redisに追加されるのを待つ
 		await sleep(100);
 
-		const res = await api('notes/local-timeline', {}, alice);
+		const res = await api('/notes/local-timeline', {}, alice);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(Array.isArray(res.body), true);
diff --git a/packages/backend/test/e2e/streaming.ts b/packages/backend/test/e2e/streaming.ts
index 100664d241..aee1ce21df 100644
--- a/packages/backend/test/e2e/streaming.ts
+++ b/packages/backend/test/e2e/streaming.ts
@@ -40,9 +40,9 @@ describe('Streaming', () => {
 		let chinatsu: misskey.entities.SignupResponse;
 		let takumi: misskey.entities.SignupResponse;
 
-		let kyokoNote: misskey.entities.Note;
-		let kanakoNote: misskey.entities.Note;
-		let takumiNote: misskey.entities.Note;
+		let kyokoNote: any;
+		let kanakoNote: any;
+		let takumiNote: any;
 		let list: any;
 
 		beforeAll(async () => {
@@ -68,9 +68,6 @@ describe('Streaming', () => {
 			// Follow: ayano => akari
 			await follow(ayano, akari);
 
-			// Follow: kyoko => chitose
-			await api('following/create', { userId: chitose.id }, kyoko);
-
 			// Mute: chitose => kanako
 			await api('mute/create', { userId: kanako.id }, chitose);
 
@@ -173,28 +170,7 @@ describe('Streaming', () => {
 			*/
 
 			test('フォローしているユーザーのフォローしていないユーザーの visibility: followers な投稿への返信が流れない', async () => {
-				const chitoseNote = await post(chitose, { text: 'followers-only post', visibility: 'followers' });
-
-				const fired = await waitFire(
-					ayano, 'homeTimeline',	// ayano:home
-					() => api('notes/create', { text: 'reply to chitose\'s followers-only post', replyId: chitoseNote.id }, kyoko),	// kyoko's reply to chitose's followers-only post
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id,	// wait kyoko
-				);
-
-				assert.strictEqual(fired, false);
-			});
-
-			test('フォローしているユーザーのフォローしていないユーザーの visibility: followers な投稿への返信のリノートが流れない', async () => {
-				const chitoseNote = await post(chitose, { text: 'followers-only post', visibility: 'followers' });
-				const kyokoReply = await post(kyoko, { text: 'reply to followers-only post', replyId: chitoseNote.id });
-
-				const fired = await waitFire(
-					ayano, 'homeTimeline',	// ayano:home
-					() => api('notes/create', { renoteId: kyokoReply.id }, kyoko),	// kyoko's renote of kyoko's reply to chitose's followers-only post
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id,	// wait kyoko
-				);
-
-				assert.strictEqual(fired, false);
+				// TODO
 			});
 
 			test('フォローしていないユーザーの投稿は流れない', async () => {
@@ -226,79 +202,6 @@ describe('Streaming', () => {
 
 				assert.strictEqual(fired, false);
 			});
-
-			/**
-			 * TODO: 落ちる
-			 * @see https://github.com/misskey-dev/misskey/issues/13474
-			test('visibility: specified なノートで visibleUserIds に自分が含まれているときそのノートへのリプライが流れてくる', async () => {
-				const chitoseToKyokoAndAyano = await post(chitose, { text: 'direct note from chitose to kyoko and ayano', visibility: 'specified', visibleUserIds: [kyoko.id, ayano.id] });
-
-				const fired = await waitFire(
-					ayano, 'homeTimeline',	// ayano:home
-					() => api('notes/create', { text: 'direct reply from kyoko to chitose and ayano', replyId: chitoseToKyokoAndAyano.id, visibility: 'specified', visibleUserIds: [chitose.id, ayano.id] }, kyoko),
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id,
-				);
-
-				assert.strictEqual(fired, true);
-			});
-			 */
-
-			test('visibility: specified な投稿に対するリプライで visibleUserIds が拡張されたとき、その拡張されたユーザーの HTL にはそのリプライが流れない', async () => {
-				const chitoseToKyoko = await post(chitose, { text: 'direct note from chitose to kyoko', visibility: 'specified', visibleUserIds: [kyoko.id] });
-
-				const fired = await waitFire(
-					ayano, 'homeTimeline',	// ayano:home
-					() => api('notes/create', { text: 'direct reply from kyoko to chitose and ayano', replyId: chitoseToKyoko.id, visibility: 'specified', visibleUserIds: [chitose.id, ayano.id] }, kyoko),
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id,
-				);
-
-				assert.strictEqual(fired, false);
-			});
-
-			test('visibility: specified な投稿に対するリプライで visibleUserIds が収縮されたとき、その収縮されたユーザーの HTL にはそのリプライが流れない', async () => {
-				const chitoseToKyokoAndAyano = await post(chitose, { text: 'direct note from chitose to kyoko and ayano', visibility: 'specified', visibleUserIds: [kyoko.id, ayano.id] });
-
-				const fired = await waitFire(
-					ayano, 'homeTimeline',	// ayano:home
-					() => api('notes/create', { text: 'direct reply from kyoko to chitose', replyId: chitoseToKyokoAndAyano.id, visibility: 'specified', visibleUserIds: [chitose.id] }, kyoko),
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id,
-				);
-
-				assert.strictEqual(fired, false);
-			});
-
-			test('withRenotes: false のときリノートが流れない', async () => {
-				const fired = await waitFire(
-					ayano, 'homeTimeline',	// ayano:home
-					() => api('notes/create', { renoteId: kyokoNote.id }, kyoko),	// kyoko renote
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id,	// wait kyoko
-					{ withRenotes: false },
-				);
-
-				assert.strictEqual(fired, false);
-			});
-
-			test('withRenotes: false のとき引用リノートが流れる', async () => {
-				const fired = await waitFire(
-					ayano, 'homeTimeline',	// ayano:home
-					() => api('notes/create', { text: 'quote', renoteId: kyokoNote.id }, kyoko),	// kyoko quote
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id,	// wait kyoko
-					{ withRenotes: false },
-				);
-
-				assert.strictEqual(fired, true);
-			});
-
-			test('withRenotes: false のとき投票のみのリノートが流れる', async () => {
-				const fired = await waitFire(
-					ayano, 'homeTimeline',	// ayano:home
-					() => api('notes/create', { poll: { choices: ['kinoko', 'takenoko'] }, renoteId: kyokoNote.id }, kyoko),	// kyoko renote with poll
-					msg => msg.type === 'note' && msg.body.userId === kyoko.id,	// wait kyoko
-					{ withRenotes: false },
-				);
-
-				assert.strictEqual(fired, true);
-			});
 		});	// Home
 
 		describe('Local Timeline', () => {
@@ -601,7 +504,7 @@ describe('Streaming', () => {
 
 			// #10443
 			test('ミュートしているサーバのノートがリストTLに流れない', async () => {
-				await api('i/update', {
+				await api('/i/update', {
 					mutedInstances: ['example.com'],
 				}, chitose);
 
@@ -618,7 +521,7 @@ describe('Streaming', () => {
 
 			// #10443
 			test('ミュートしているサーバのノートに対するリプライがリストTLに流れない', async () => {
-				await api('i/update', {
+				await api('/i/update', {
 					mutedInstances: ['example.com'],
 				}, chitose);
 
@@ -635,7 +538,7 @@ describe('Streaming', () => {
 
 			// #10443
 			test('ミュートしているサーバのノートに対するリノートがリストTLに流れない', async () => {
-				await api('i/update', {
+				await api('/i/update', {
 					mutedInstances: ['example.com'],
 				}, chitose);
 
diff --git a/packages/backend/test/e2e/thread-mute.ts b/packages/backend/test/e2e/thread-mute.ts
index 0a57139719..98a1908984 100644
--- a/packages/backend/test/e2e/thread-mute.ts
+++ b/packages/backend/test/e2e/thread-mute.ts
@@ -24,12 +24,12 @@ describe('Note thread mute', () => {
 		const bobNote = await post(bob, { text: '@alice @carol root note' });
 		const aliceReply = await post(alice, { replyId: bobNote.id, text: '@bob @carol child note' });
 
-		await api('notes/thread-muting/create', { noteId: bobNote.id }, alice);
+		await api('/notes/thread-muting/create', { noteId: bobNote.id }, alice);
 
 		const carolReply = await post(carol, { replyId: bobNote.id, text: '@bob @alice child note' });
 		const carolReplyWithoutMention = await post(carol, { replyId: aliceReply.id, text: 'child note' });
 
-		const res = await api('notes/mentions', {}, alice);
+		const res = await api('/notes/mentions', {}, alice);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(Array.isArray(res.body), true);
@@ -40,15 +40,15 @@ describe('Note thread mute', () => {
 
 	test('ミュートしているスレッドからメンションされても、hasUnreadMentions が true にならない', async () => {
 		// 状態リセット
-		await api('i/read-all-unread-notes', {}, alice);
+		await api('/i/read-all-unread-notes', {}, alice);
 
 		const bobNote = await post(bob, { text: '@alice @carol root note' });
 
-		await api('notes/thread-muting/create', { noteId: bobNote.id }, alice);
+		await api('/notes/thread-muting/create', { noteId: bobNote.id }, alice);
 
 		const carolReply = await post(carol, { replyId: bobNote.id, text: '@bob @alice child note' });
 
-		const res = await api('i', {}, alice);
+		const res = await api('/i', {}, alice);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(res.body.hasUnreadMentions, false);
@@ -56,11 +56,11 @@ describe('Note thread mute', () => {
 
 	test('ミュートしているスレッドからメンションされても、ストリームに unreadMention イベントが流れてこない', () => new Promise<void>(async done => {
 		// 状態リセット
-		await api('i/read-all-unread-notes', {}, alice);
+		await api('/i/read-all-unread-notes', {}, alice);
 
 		const bobNote = await post(bob, { text: '@alice @carol root note' });
 
-		await api('notes/thread-muting/create', { noteId: bobNote.id }, alice);
+		await api('/notes/thread-muting/create', { noteId: bobNote.id }, alice);
 
 		let fired = false;
 
@@ -84,12 +84,12 @@ describe('Note thread mute', () => {
 		const bobNote = await post(bob, { text: '@alice @carol root note' });
 		const aliceReply = await post(alice, { replyId: bobNote.id, text: '@bob @carol child note' });
 
-		await api('notes/thread-muting/create', { noteId: bobNote.id }, alice);
+		await api('/notes/thread-muting/create', { noteId: bobNote.id }, alice);
 
 		const carolReply = await post(carol, { replyId: bobNote.id, text: '@bob @alice child note' });
 		const carolReplyWithoutMention = await post(carol, { replyId: aliceReply.id, text: 'child note' });
 
-		const res = await api('i/notifications', {}, alice);
+		const res = await api('/i/notifications', {}, alice);
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(Array.isArray(res.body), true);
diff --git a/packages/backend/test/e2e/timelines.ts b/packages/backend/test/e2e/timelines.ts
index 5487292afc..0e71d707dd 100644
--- a/packages/backend/test/e2e/timelines.ts
+++ b/packages/backend/test/e2e/timelines.ts
@@ -26,7 +26,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
 			assert.strictEqual(res.body.find((note: any) => note.id === aliceNote.id).text, 'hi');
@@ -35,14 +35,14 @@ describe('Timelines', () => {
 		test.concurrent('フォローしているユーザーのノートが含まれる', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 			await sleep(1000);
 			const bobNote = await post(bob, { text: 'hi' });
 			const carolNote = await post(carol, { text: 'hi' });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
@@ -51,14 +51,14 @@ describe('Timelines', () => {
 		test.concurrent('フォローしているユーザーの visibility: followers なノートが含まれる', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 			await sleep(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'followers' });
 			const carolNote = await post(carol, { text: 'hi' });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 			assert.strictEqual(res.body.find((note: any) => note.id === bobNote.id).text, 'hi');
@@ -68,14 +68,14 @@ describe('Timelines', () => {
 		test.concurrent('withReplies: false でフォローしているユーザーの他人への返信が含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 			await sleep(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
@@ -84,15 +84,15 @@ describe('Timelines', () => {
 		test.concurrent('withReplies: true でフォローしているユーザーの他人への返信が含まれる', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
-			await api('following/update', { userId: bob.id, withReplies: true }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
+			await api('/following/update', { userId: bob.id, withReplies: true }, alice);
 			await sleep(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
@@ -101,15 +101,15 @@ describe('Timelines', () => {
 		test.concurrent('withReplies: true でフォローしているユーザーの他人へのDM返信が含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
-			await api('following/update', { userId: bob.id, withReplies: true }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
+			await api('/following/update', { userId: bob.id, withReplies: true }, alice);
 			await sleep(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id, visibility: 'specified', visibleUserIds: [carolNote.id] });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
@@ -118,15 +118,15 @@ describe('Timelines', () => {
 		test.concurrent('withReplies: true でフォローしているユーザーの他人の visibility: followers な投稿への返信が含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
-			await api('following/update', { userId: bob.id, withReplies: true }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
+			await api('/following/update', { userId: bob.id, withReplies: true }, alice);
 			await sleep(1000);
 			const carolNote = await post(carol, { text: 'hi', visibility: 'followers' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
@@ -135,17 +135,17 @@ describe('Timelines', () => {
 		test.concurrent('withReplies: true でフォローしているユーザーの行った別のフォローしているユーザーの visibility: followers な投稿への返信が含まれる', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
-			await api('following/create', { userId: carol.id }, alice);
-			await api('following/create', { userId: carol.id }, bob);
-			await api('following/update', { userId: bob.id, withReplies: true }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: carol.id }, alice);
+			await api('/following/create', { userId: carol.id }, bob);
+			await api('/following/update', { userId: bob.id, withReplies: true }, alice);
 			await sleep(1000);
 			const carolNote = await post(carol, { text: 'hi', visibility: 'followers' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), true);
@@ -155,16 +155,16 @@ describe('Timelines', () => {
 		test.concurrent('withReplies: true でフォローしているユーザーの行った別のフォローしているユーザーの投稿への visibility: specified な返信が含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
-			await api('following/create', { userId: carol.id }, alice);
-			await api('following/update', { userId: bob.id, withReplies: true }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: carol.id }, alice);
+			await api('/following/update', { userId: bob.id, withReplies: true }, alice);
 			await sleep(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id, visibility: 'specified', visibleUserIds: [carolNote.id] });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), true);
@@ -173,14 +173,14 @@ describe('Timelines', () => {
 		test.concurrent('withReplies: false でフォローしているユーザーのそのユーザー自身への返信が含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 			await sleep(1000);
 			const bobNote1 = await post(bob, { text: 'hi' });
 			const bobNote2 = await post(bob, { text: 'hi', replyId: bobNote1.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true);
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
@@ -189,14 +189,14 @@ describe('Timelines', () => {
 		test.concurrent('withReplies: false でフォローしているユーザーからの自分への返信が含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 			await sleep(1000);
 			const aliceNote = await post(alice, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: aliceNote.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
@@ -210,7 +210,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
@@ -219,14 +219,14 @@ describe('Timelines', () => {
 		test.concurrent('フォローしているユーザーの他人の投稿のリノートが含まれる', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 			await sleep(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { renoteId: carolNote.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
@@ -235,14 +235,14 @@ describe('Timelines', () => {
 		test.concurrent('[withRenotes: false] フォローしているユーザーの他人の投稿のリノートが含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 			await sleep(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { renoteId: carolNote.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', {
+			const res = await api('/notes/timeline', {
 				withRenotes: false,
 			}, alice);
 
@@ -253,14 +253,14 @@ describe('Timelines', () => {
 		test.concurrent('[withRenotes: false] フォローしているユーザーの他人の投稿の引用が含まれる', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 			await sleep(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', renoteId: carolNote.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', {
+			const res = await api('/notes/timeline', {
 				withRenotes: false,
 			}, alice);
 
@@ -271,13 +271,13 @@ describe('Timelines', () => {
 		test.concurrent('フォローしているユーザーの他人への visibility: specified なノートが含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 			await sleep(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'specified', visibleUserIds: [carol.id] });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 		});
@@ -285,15 +285,15 @@ describe('Timelines', () => {
 		test.concurrent('フォローしているユーザーが行ったミュートしているユーザーのリノートが含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
-			await api('mute/create', { userId: carol.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
+			await api('/mute/create', { userId: carol.id }, alice);
 			await sleep(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', renoteId: carolNote.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
@@ -302,16 +302,16 @@ describe('Timelines', () => {
 		test.concurrent('withReplies: true でフォローしているユーザーが行ったミュートしているユーザーの投稿への返信が含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
-			await api('following/update', { userId: bob.id, withReplies: true }, alice);
-			await api('mute/create', { userId: carol.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
+			await api('/following/update', { userId: bob.id, withReplies: true }, alice);
+			await api('/mute/create', { userId: carol.id }, alice);
 			await sleep(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
@@ -321,13 +321,13 @@ describe('Timelines', () => {
 			const [alice, bob] = await Promise.all([signup(), signup({ host: genHost() })]);
 
 			await sendEnvUpdateRequest({ key: 'FORCE_FOLLOW_REMOTE_USER_FOR_TESTING', value: 'true' });
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 
 			const bobNote = await post(bob, { text: 'hi' });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 		});
@@ -336,13 +336,13 @@ describe('Timelines', () => {
 			const [alice, bob] = await Promise.all([signup(), signup({ host: genHost() })]);
 
 			await sendEnvUpdateRequest({ key: 'FORCE_FOLLOW_REMOTE_USER_FOR_TESTING', value: 'true' });
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 
 			const bobNote = await post(bob, { text: 'hi', visibility: 'home' });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 		});
@@ -350,7 +350,7 @@ describe('Timelines', () => {
 		test.concurrent('[withFiles: true] フォローしているユーザーのファイル付きノートのみ含まれる', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 			await sleep(1000);
 			const [bobFile, carolFile] = await Promise.all([
 				uploadUrl(bob, 'https://raw.githubusercontent.com/misskey-dev/assets/main/public/icon.png'),
@@ -363,7 +363,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100, withFiles: true }, alice);
+			const res = await api('/notes/timeline', { limit: 100, withFiles: true }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), false);
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
@@ -374,14 +374,14 @@ describe('Timelines', () => {
 		test.concurrent('フォローしているユーザーのチャンネル投稿が含まれない', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			const channel = await api('channels/create', { name: 'channel' }, bob).then(x => x.body);
-			await api('following/create', { userId: bob.id }, alice);
+			const channel = await api('/channels/create', { name: 'channel' }, bob).then(x => x.body);
+			await api('/following/create', { userId: bob.id }, alice);
 			await sleep(1000);
 			const bobNote = await post(bob, { text: 'hi', channelId: channel.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 		});
@@ -393,7 +393,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
 			assert.strictEqual(res.body.find((note: any) => note.id === aliceNote.id).text, 'hi');
@@ -402,13 +402,13 @@ describe('Timelines', () => {
 		test.concurrent('フォローしているユーザーの自身を visibleUserIds に指定した visibility: specified なノートが含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 			await sleep(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'specified', visibleUserIds: [alice.id] });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 			assert.strictEqual(res.body.find((note: any) => note.id === bobNote.id).text, 'hi');
@@ -421,7 +421,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 		});
@@ -429,13 +429,13 @@ describe('Timelines', () => {
 		test.concurrent('フォローしているユーザーの自身を visibleUserIds に指定していない visibility: specified なノートが含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 			await sleep(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'specified', visibleUserIds: [carol.id] });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 		});
@@ -448,7 +448,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
 			assert.strictEqual(res.body.find((note: any) => note.id === aliceNote.id).text, 'ok');
@@ -463,7 +463,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 			assert.strictEqual(res.body.find((note: any) => note.id === bobNote.id).text, 'ok');
@@ -479,7 +479,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/timeline', { limit: 100 }, alice);
+			const res = await api('/notes/timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 		});
@@ -494,7 +494,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/local-timeline', { limit: 100 }, alice);
+			const res = await api('/notes/local-timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
@@ -508,7 +508,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/local-timeline', { limit: 100 }, alice);
+			const res = await api('/notes/local-timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), true);
@@ -522,7 +522,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/local-timeline', { limit: 100 }, alice);
+			const res = await api('/notes/local-timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true);
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
@@ -531,12 +531,12 @@ describe('Timelines', () => {
 		test.concurrent('チャンネル投稿が含まれない', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			const channel = await api('channels/create', { name: 'channel' }, bob).then(x => x.body);
+			const channel = await api('/channels/create', { name: 'channel' }, bob).then(x => x.body);
 			const bobNote = await post(bob, { text: 'hi', channelId: channel.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/local-timeline', { limit: 100 }, alice);
+			const res = await api('/notes/local-timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 		});
@@ -548,7 +548,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/local-timeline', { limit: 100 }, alice);
+			const res = await api('/notes/local-timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 		});
@@ -557,14 +557,14 @@ describe('Timelines', () => {
 		test.concurrent('フォローしているユーザーの visibility: home なノートが含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: carol.id }, alice);
+			await api('/following/create', { userId: carol.id }, alice);
 			await sleep(1000);
 			const carolNote = await post(carol, { text: 'hi', visibility: 'home' });
 			const bobNote = await post(bob, { text: 'hi' });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/local-timeline', { limit: 100 }, alice);
+			const res = await api('/notes/local-timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
@@ -573,14 +573,14 @@ describe('Timelines', () => {
 		test.concurrent('ミュートしているユーザーのノートが含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('mute/create', { userId: carol.id }, alice);
+			await api('/mute/create', { userId: carol.id }, alice);
 			await sleep(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi' });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/local-timeline', { limit: 100 }, alice);
+			const res = await api('/notes/local-timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
@@ -589,15 +589,15 @@ describe('Timelines', () => {
 		test.concurrent('フォローしているユーザーが行ったミュートしているユーザーのリノートが含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
-			await api('mute/create', { userId: carol.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
+			await api('/mute/create', { userId: carol.id }, alice);
 			await sleep(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', renoteId: carolNote.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/local-timeline', { limit: 100 }, alice);
+			const res = await api('/notes/local-timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
@@ -606,16 +606,16 @@ describe('Timelines', () => {
 		test.concurrent('withReplies: true でフォローしているユーザーが行ったミュートしているユーザーの投稿への返信が含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
-			await api('following/update', { userId: bob.id, withReplies: true }, alice);
-			await api('mute/create', { userId: carol.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
+			await api('/following/update', { userId: bob.id, withReplies: true }, alice);
+			await api('/mute/create', { userId: carol.id }, alice);
 			await sleep(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/local-timeline', { limit: 100 }, alice);
+			const res = await api('/notes/local-timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
@@ -624,14 +624,14 @@ describe('Timelines', () => {
 		test.concurrent('withReplies: false でフォローしているユーザーからの自分への返信が含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 			await sleep(1000);
 			const aliceNote = await post(alice, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: aliceNote.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/local-timeline', { limit: 100 }, alice);
+			const res = await api('/notes/local-timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
@@ -645,7 +645,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/local-timeline', { limit: 100, withReplies: true }, alice);
+			const res = await api('/notes/local-timeline', { limit: 100, withReplies: true }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 		});
@@ -659,7 +659,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/local-timeline', { limit: 100, withFiles: true }, alice);
+			const res = await api('/notes/local-timeline', { limit: 100, withFiles: true }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), false);
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
@@ -674,7 +674,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/hybrid-timeline', { limit: 100 }, alice);
+			const res = await api('/notes/hybrid-timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 		});
@@ -686,7 +686,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/hybrid-timeline', { limit: 100 }, alice);
+			const res = await api('/notes/hybrid-timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 		});
@@ -694,13 +694,13 @@ describe('Timelines', () => {
 		test.concurrent('フォローしているローカルユーザーの visibility: home なノートが含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 			await sleep(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'home' });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/hybrid-timeline', { limit: 100 }, alice);
+			const res = await api('/notes/hybrid-timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 		});
@@ -708,14 +708,14 @@ describe('Timelines', () => {
 		test.concurrent('withReplies: false でフォローしているユーザーからの自分への返信が含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 			await sleep(1000);
 			const aliceNote = await post(alice, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: aliceNote.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/hybrid-timeline', { limit: 100 }, alice);
+			const res = await api('/notes/hybrid-timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
@@ -729,7 +729,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/hybrid-timeline', { limit: 100 }, alice);
+			const res = await api('/notes/hybrid-timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), true);
@@ -742,7 +742,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/local-timeline', { limit: 100 }, alice);
+			const res = await api('/notes/local-timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 		});
@@ -751,13 +751,13 @@ describe('Timelines', () => {
 			const [alice, bob] = await Promise.all([signup(), signup({ host: genHost() })]);
 
 			await sendEnvUpdateRequest({ key: 'FORCE_FOLLOW_REMOTE_USER_FOR_TESTING', value: 'true' });
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 
 			const bobNote = await post(bob, { text: 'hi' });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/hybrid-timeline', { limit: 100 }, alice);
+			const res = await api('/notes/hybrid-timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 		});
@@ -766,13 +766,13 @@ describe('Timelines', () => {
 			const [alice, bob] = await Promise.all([signup(), signup({ host: genHost() })]);
 
 			await sendEnvUpdateRequest({ key: 'FORCE_FOLLOW_REMOTE_USER_FOR_TESTING', value: 'true' });
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 
 			const bobNote = await post(bob, { text: 'hi', visibility: 'home' });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/hybrid-timeline', { limit: 100 }, alice);
+			const res = await api('/notes/hybrid-timeline', { limit: 100 }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 		});
@@ -785,7 +785,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/hybrid-timeline', { limit: 100, withReplies: true }, alice);
+			const res = await api('/notes/hybrid-timeline', { limit: 100, withReplies: true }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 		});
@@ -799,7 +799,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('notes/hybrid-timeline', { limit: 100, withFiles: true }, alice);
+			const res = await api('/notes/hybrid-timeline', { limit: 100, withFiles: true }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), false);
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
@@ -810,14 +810,14 @@ describe('Timelines', () => {
 		test.concurrent('リスインしているフォローしていないユーザーのノートが含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
-			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
+			const list = await api('/users/lists/create', { name: 'list' }, alice).then(res => res.body);
+			await api('/users/lists/push', { listId: list.id, userId: bob.id }, alice);
 			await sleep(1000);
 			const bobNote = await post(bob, { text: 'hi' });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
+			const res = await api('/notes/user-list-timeline', { listId: list.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 		});
@@ -825,14 +825,14 @@ describe('Timelines', () => {
 		test.concurrent('リスインしているフォローしていないユーザーの visibility: home なノートが含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
-			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
+			const list = await api('/users/lists/create', { name: 'list' }, alice).then(res => res.body);
+			await api('/users/lists/push', { listId: list.id, userId: bob.id }, alice);
 			await sleep(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'home' });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
+			const res = await api('/notes/user-list-timeline', { listId: list.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 		});
@@ -840,14 +840,14 @@ describe('Timelines', () => {
 		test.concurrent('リスインしているフォローしていないユーザーの visibility: followers なノートが含まれない', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
-			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
+			const list = await api('/users/lists/create', { name: 'list' }, alice).then(res => res.body);
+			await api('/users/lists/push', { listId: list.id, userId: bob.id }, alice);
 			await sleep(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'followers' });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
+			const res = await api('/notes/user-list-timeline', { listId: list.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 		});
@@ -855,15 +855,15 @@ describe('Timelines', () => {
 		test.concurrent('リスインしているフォローしていないユーザーの他人への返信が含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
-			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
+			const list = await api('/users/lists/create', { name: 'list' }, alice).then(res => res.body);
+			await api('/users/lists/push', { listId: list.id, userId: bob.id }, alice);
 			await sleep(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
+			const res = await api('/notes/user-list-timeline', { listId: list.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 		});
@@ -871,15 +871,15 @@ describe('Timelines', () => {
 		test.concurrent('リスインしているフォローしていないユーザーのユーザー自身への返信が含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
-			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
+			const list = await api('/users/lists/create', { name: 'list' }, alice).then(res => res.body);
+			await api('/users/lists/push', { listId: list.id, userId: bob.id }, alice);
 			await sleep(1000);
 			const bobNote1 = await post(bob, { text: 'hi' });
 			const bobNote2 = await post(bob, { text: 'hi', replyId: bobNote1.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
+			const res = await api('/notes/user-list-timeline', { listId: list.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true);
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
@@ -888,50 +888,32 @@ describe('Timelines', () => {
 		test.concurrent('withReplies: false でリスインしているフォローしていないユーザーからの自分への返信が含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
-			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
-			await api('users/lists/update-membership', { listId: list.id, userId: bob.id, withReplies: false }, alice);
+			const list = await api('/users/lists/create', { name: 'list' }, alice).then(res => res.body);
+			await api('/users/lists/push', { listId: list.id, userId: bob.id }, alice);
 			await sleep(1000);
 			const aliceNote = await post(alice, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: aliceNote.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
+			const res = await api('/notes/user-list-timeline', { listId: list.id, withReplies: false }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 		});
 
-		test.concurrent('withReplies: false でリスインしているフォローしていないユーザーの他人への返信が含まれない', async () => {
-			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
-
-			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
-			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
-			await api('users/lists/update-membership', { listId: list.id, userId: bob.id, withReplies: false }, alice);
-			await sleep(1000);
-			const carolNote = await post(carol, { text: 'hi' });
-			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
-
-			await waitForPushToTl();
-
-			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
-
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
-		});
-
 		test.concurrent('withReplies: true でリスインしているフォローしていないユーザーの他人への返信が含まれる', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
-			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
-			await api('users/lists/update-membership', { listId: list.id, userId: bob.id, withReplies: true }, alice);
+			const list = await api('/users/lists/create', { name: 'list' }, alice).then(res => res.body);
+			await api('/users/lists/push', { listId: list.id, userId: bob.id }, alice);
+			await api('/users/lists/update-membership', { listId: list.id, userId: bob.id, withReplies: true }, alice);
 			await sleep(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
+			const res = await api('/notes/user-list-timeline', { listId: list.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 		});
@@ -939,15 +921,15 @@ describe('Timelines', () => {
 		test.concurrent('リスインしているフォローしているユーザーの visibility: home なノートが含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
-			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
-			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
+			const list = await api('/users/lists/create', { name: 'list' }, alice).then(res => res.body);
+			await api('/users/lists/push', { listId: list.id, userId: bob.id }, alice);
 			await sleep(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'home' });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
+			const res = await api('/notes/user-list-timeline', { listId: list.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 		});
@@ -955,15 +937,15 @@ describe('Timelines', () => {
 		test.concurrent('リスインしているフォローしているユーザーの visibility: followers なノートが含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
-			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
-			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
+			const list = await api('/users/lists/create', { name: 'list' }, alice).then(res => res.body);
+			await api('/users/lists/push', { listId: list.id, userId: bob.id }, alice);
 			await sleep(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'followers' });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
+			const res = await api('/notes/user-list-timeline', { listId: list.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 			assert.strictEqual(res.body.find((note: any) => note.id === bobNote.id).text, 'hi');
@@ -972,14 +954,14 @@ describe('Timelines', () => {
 		test.concurrent('リスインしている自分の visibility: followers なノートが含まれる', async () => {
 			const [alice] = await Promise.all([signup(), signup()]);
 
-			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
-			await api('users/lists/push', { listId: list.id, userId: alice.id }, alice);
+			const list = await api('/users/lists/create', { name: 'list' }, alice).then(res => res.body);
+			await api('/users/lists/push', { listId: list.id, userId: alice.id }, alice);
 			await sleep(1000);
 			const aliceNote = await post(alice, { text: 'hi', visibility: 'followers' });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
+			const res = await api('/notes/user-list-timeline', { listId: list.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
 			assert.strictEqual(res.body.find((note: any) => note.id === aliceNote.id).text, 'hi');
@@ -988,15 +970,15 @@ describe('Timelines', () => {
 		test.concurrent('リスインしているユーザーのチャンネルノートが含まれない', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			const channel = await api('channels/create', { name: 'channel' }, bob).then(x => x.body);
-			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
-			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
+			const channel = await api('/channels/create', { name: 'channel' }, bob).then(x => x.body);
+			const list = await api('/users/lists/create', { name: 'list' }, alice).then(res => res.body);
+			await api('/users/lists/push', { listId: list.id, userId: bob.id }, alice);
 			await sleep(1000);
 			const bobNote = await post(bob, { text: 'hi', channelId: channel.id });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
+			const res = await api('/notes/user-list-timeline', { listId: list.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 		});
@@ -1004,15 +986,15 @@ describe('Timelines', () => {
 		test.concurrent('[withFiles: true] リスインしているユーザーのファイル付きノートのみ含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
-			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
+			const list = await api('/users/lists/create', { name: 'list' }, alice).then(res => res.body);
+			await api('/users/lists/push', { listId: list.id, userId: bob.id }, alice);
 			const file = await uploadUrl(bob, 'https://raw.githubusercontent.com/misskey-dev/assets/main/public/icon.png');
 			const bobNote1 = await post(bob, { text: 'hi' });
 			const bobNote2 = await post(bob, { fileIds: [file.id] });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/user-list-timeline', { listId: list.id, withFiles: true }, alice);
+			const res = await api('/notes/user-list-timeline', { listId: list.id, withFiles: true }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), false);
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
@@ -1021,14 +1003,14 @@ describe('Timelines', () => {
 		test.concurrent('リスインしているユーザーの自身宛ての visibility: specified なノートが含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
-			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
+			const list = await api('/users/lists/create', { name: 'list' }, alice).then(res => res.body);
+			await api('/users/lists/push', { listId: list.id, userId: bob.id }, alice);
 			await sleep(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'specified', visibleUserIds: [alice.id] });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
+			const res = await api('/notes/user-list-timeline', { listId: list.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 			assert.strictEqual(res.body.find((note: any) => note.id === bobNote.id).text, 'hi');
@@ -1037,15 +1019,15 @@ describe('Timelines', () => {
 		test.concurrent('リスインしているユーザーの自身宛てではない visibility: specified なノートが含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
-			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
-			await api('users/lists/push', { listId: list.id, userId: carol.id }, alice);
+			const list = await api('/users/lists/create', { name: 'list' }, alice).then(res => res.body);
+			await api('/users/lists/push', { listId: list.id, userId: bob.id }, alice);
+			await api('/users/lists/push', { listId: list.id, userId: carol.id }, alice);
 			await sleep(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'specified', visibleUserIds: [carol.id] });
 
 			await waitForPushToTl();
 
-			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
+			const res = await api('/notes/user-list-timeline', { listId: list.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 		});
@@ -1059,7 +1041,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('users/notes', { userId: bob.id }, alice);
+			const res = await api('/users/notes', { userId: bob.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 		});
@@ -1071,7 +1053,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('users/notes', { userId: bob.id }, alice);
+			const res = await api('/users/notes', { userId: bob.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 		});
@@ -1079,13 +1061,13 @@ describe('Timelines', () => {
 		test.concurrent('フォローしているユーザーの visibility: followers なノートが含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			await api('following/create', { userId: bob.id }, alice);
+			await api('/following/create', { userId: bob.id }, alice);
 			await sleep(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'followers' });
 
 			await waitForPushToTl();
 
-			const res = await api('users/notes', { userId: bob.id }, alice);
+			const res = await api('/users/notes', { userId: bob.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 			assert.strictEqual(res.body.find((note: any) => note.id === bobNote.id).text, 'hi');
@@ -1098,7 +1080,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('users/notes', { userId: alice.id }, alice);
+			const res = await api('/users/notes', { userId: alice.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
 			assert.strictEqual(res.body.find((note: any) => note.id === aliceNote.id).text, 'hi');
@@ -1107,12 +1089,12 @@ describe('Timelines', () => {
 		test.concurrent('チャンネル投稿が含まれない', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			const channel = await api('channels/create', { name: 'channel' }, bob).then(x => x.body);
+			const channel = await api('/channels/create', { name: 'channel' }, bob).then(x => x.body);
 			const bobNote = await post(bob, { text: 'hi', channelId: channel.id });
 
 			await waitForPushToTl();
 
-			const res = await api('users/notes', { userId: bob.id }, alice);
+			const res = await api('/users/notes', { userId: bob.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 		});
@@ -1126,7 +1108,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('users/notes', { userId: bob.id }, alice);
+			const res = await api('/users/notes', { userId: bob.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true);
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), false);
@@ -1141,7 +1123,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('users/notes', { userId: bob.id, withReplies: true }, alice);
+			const res = await api('/users/notes', { userId: bob.id, withReplies: true }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true);
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
@@ -1156,7 +1138,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('users/notes', { userId: bob.id, withReplies: true }, alice);
+			const res = await api('/users/notes', { userId: bob.id, withReplies: true }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true);
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), false);
@@ -1171,7 +1153,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('users/notes', { userId: bob.id, withFiles: true }, alice);
+			const res = await api('/users/notes', { userId: bob.id, withFiles: true }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), false);
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
@@ -1180,12 +1162,12 @@ describe('Timelines', () => {
 		test.concurrent('[withChannelNotes: true] チャンネル投稿が含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			const channel = await api('channels/create', { name: 'channel' }, bob).then(x => x.body);
+			const channel = await api('/channels/create', { name: 'channel' }, bob).then(x => x.body);
 			const bobNote = await post(bob, { text: 'hi', channelId: channel.id });
 
 			await waitForPushToTl();
 
-			const res = await api('users/notes', { userId: bob.id, withChannelNotes: true }, alice);
+			const res = await api('/users/notes', { userId: bob.id, withChannelNotes: true }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 		});
@@ -1193,12 +1175,12 @@ describe('Timelines', () => {
 		test.concurrent('[withChannelNotes: true] 他人が取得した場合センシティブチャンネル投稿が含まれない', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			const channel = await api('channels/create', { name: 'channel', isSensitive: true }, bob).then(x => x.body);
+			const channel = await api('/channels/create', { name: 'channel', isSensitive: true }, bob).then(x => x.body);
 			const bobNote = await post(bob, { text: 'hi', channelId: channel.id });
 
 			await waitForPushToTl();
 
-			const res = await api('users/notes', { userId: bob.id, withChannelNotes: true }, alice);
+			const res = await api('/users/notes', { userId: bob.id, withChannelNotes: true }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 		});
@@ -1206,12 +1188,12 @@ describe('Timelines', () => {
 		test.concurrent('[withChannelNotes: true] 自分が取得した場合センシティブチャンネル投稿が含まれる', async () => {
 			const [bob] = await Promise.all([signup()]);
 
-			const channel = await api('channels/create', { name: 'channel', isSensitive: true }, bob).then(x => x.body);
+			const channel = await api('/channels/create', { name: 'channel', isSensitive: true }, bob).then(x => x.body);
 			const bobNote = await post(bob, { text: 'hi', channelId: channel.id });
 
 			await waitForPushToTl();
 
-			const res = await api('users/notes', { userId: bob.id, withChannelNotes: true }, bob);
+			const res = await api('/users/notes', { userId: bob.id, withChannelNotes: true }, bob);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
 		});
@@ -1219,14 +1201,14 @@ describe('Timelines', () => {
 		test.concurrent('ミュートしているユーザーに関連する投稿が含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
-			await api('mute/create', { userId: carol.id }, alice);
+			await api('/mute/create', { userId: carol.id }, alice);
 			await sleep(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', renoteId: carolNote.id });
 
 			await waitForPushToTl();
 
-			const res = await api('users/notes', { userId: bob.id }, alice);
+			const res = await api('/users/notes', { userId: bob.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 		});
@@ -1234,7 +1216,7 @@ describe('Timelines', () => {
 		test.concurrent('ミュートしていても userId に指定したユーザーの投稿が含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
-			await api('mute/create', { userId: bob.id }, alice);
+			await api('/mute/create', { userId: bob.id }, alice);
 			await sleep(1000);
 			const bobNote1 = await post(bob, { text: 'hi' });
 			const bobNote2 = await post(bob, { text: 'hi', replyId: bobNote1.id });
@@ -1242,7 +1224,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('users/notes', { userId: bob.id }, alice);
+			const res = await api('/users/notes', { userId: bob.id }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true);
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
@@ -1256,7 +1238,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('users/notes', { userId: alice.id, withReplies: true }, alice);
+			const res = await api('/users/notes', { userId: alice.id, withReplies: true }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
 		});
@@ -1268,7 +1250,7 @@ describe('Timelines', () => {
 
 			await waitForPushToTl();
 
-			const res = await api('users/notes', { userId: bob.id, withReplies: true }, alice);
+			const res = await api('/users/notes', { userId: bob.id, withReplies: true }, alice);
 
 			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
 		});
diff --git a/packages/backend/test/e2e/user-notes.ts b/packages/backend/test/e2e/user-notes.ts
index a927928f06..59b65e60f0 100644
--- a/packages/backend/test/e2e/user-notes.ts
+++ b/packages/backend/test/e2e/user-notes.ts
@@ -11,9 +11,9 @@ import type * as misskey from 'cherrypick-js';
 
 describe('users/notes', () => {
 	let alice: misskey.entities.SignupResponse;
-	let jpgNote: misskey.entities.Note;
-	let pngNote: misskey.entities.Note;
-	let jpgPngNote: misskey.entities.Note;
+	let jpgNote: any;
+	let pngNote: any;
+	let jpgPngNote: any;
 
 	beforeAll(async () => {
 		alice = await signup({ username: 'alice' });
@@ -31,7 +31,7 @@ describe('users/notes', () => {
 	}, 1000 * 60 * 2);
 
 	test('withFiles', async () => {
-		const res = await api('users/notes', {
+		const res = await api('/users/notes', {
 			userId: alice.id,
 			withFiles: true,
 		}, alice);
diff --git a/packages/backend/test/e2e/users.ts b/packages/backend/test/e2e/users.ts
index 5424cb822d..bca01a5856 100644
--- a/packages/backend/test/e2e/users.ts
+++ b/packages/backend/test/e2e/users.ts
@@ -8,7 +8,7 @@ process.env.NODE_ENV = 'test';
 import * as assert from 'assert';
 import { inspect } from 'node:util';
 import { DEFAULT_POLICIES } from '@/core/RoleService.js';
-import { api, post, role, signup, successfulApiCall, uploadFile } from '../utils.js';
+import { api, page, post, role, signup, successfulApiCall, uploadFile } from '../utils.js';
 import type * as misskey from 'cherrypick-js';
 
 describe('ユーザー', () => {
@@ -24,12 +24,31 @@ describe('ユーザー', () => {
 			}, {});
 	};
 
-	const show = async (id: string, me = root): Promise<misskey.entities.UserDetailed> => {
-		return successfulApiCall({ endpoint: 'users/show', parameters: { userId: id }, user: me });
+	// BUG cherrypick-jsとjson-schemaと実際に返ってくるデータが全部違う
+	type UserLite = misskey.entities.UserLite & {
+		badgeRoles: any[],
+	};
+
+	type UserDetailedNotMe = UserLite &
+	misskey.entities.UserDetailed & {
+		roles: any[],
+	};
+
+	type MeDetailed = UserDetailedNotMe &
+		misskey.entities.MeDetailed & {
+		achievements: object[],
+		loggedInDays: number,
+		policies: object,
+	};
+
+	type User = MeDetailed & { token: string };
+
+	const show = async (id: string, me = root): Promise<MeDetailed | UserDetailedNotMe> => {
+		return successfulApiCall({ endpoint: 'users/show', parameters: { userId: id }, user: me }) as any;
 	};
 
 	// UserLiteのキーが過不足なく入っている？
-	const userLite = (user: misskey.entities.UserLite): Partial<misskey.entities.UserLite> => {
+	const userLite = (user: User): Partial<UserLite> => {
 		return stripUndefined({
 			id: user.id,
 			name: user.name,
@@ -52,7 +71,7 @@ describe('ユーザー', () => {
 	};
 
 	// UserDetailedNotMeのキーが過不足なく入っている？
-	const userDetailedNotMe = (user: misskey.entities.SignupResponse): Partial<misskey.entities.UserDetailedNotMe> => {
+	const userDetailedNotMe = (user: User): Partial<UserDetailedNotMe> => {
 		return stripUndefined({
 			...userLite(user),
 			url: user.url,
@@ -92,7 +111,7 @@ describe('ユーザー', () => {
 	};
 
 	// Relations関連のキーが過不足なく入っている？
-	const userDetailedNotMeWithRelations = (user: misskey.entities.SignupResponse): Partial<misskey.entities.UserDetailedNotMe> => {
+	const userDetailedNotMeWithRelations = (user: User): Partial<UserDetailedNotMe> => {
 		return stripUndefined({
 			...userDetailedNotMe(user),
 			isFollowing: user.isFollowing ?? false,
@@ -109,7 +128,7 @@ describe('ユーザー', () => {
 	};
 
 	// MeDetailedのキーが過不足なく入っている？
-	const meDetailed = (user: misskey.entities.SignupResponse, security = false): Partial<misskey.entities.MeDetailed> => {
+	const meDetailed = (user: User, security = false): Partial<MeDetailed> => {
 		return stripUndefined({
 			...userDetailedNotMe(user),
 			avatarId: user.avatarId,
@@ -141,7 +160,6 @@ describe('ユーザー', () => {
 			mutedWords: user.mutedWords,
 			hardMutedWords: user.hardMutedWords,
 			mutedInstances: user.mutedInstances,
-			// @ts-expect-error 後方互換性
 			mutingNotificationTypes: user.mutingNotificationTypes,
 			notificationRecieveConfig: user.notificationRecieveConfig,
 			emailNotificationTypes: user.emailNotificationTypes,
@@ -156,53 +174,61 @@ describe('ユーザー', () => {
 		});
 	};
 
-	let root: misskey.entities.SignupResponse;
-	let alice: misskey.entities.SignupResponse;
+	let root: User;
+	let alice: User;
 	let aliceNote: misskey.entities.Note;
-
-	let bob: misskey.entities.SignupResponse;
-
-	// NOTE: これがないと落ちる（bob の updatedAt が null になってしまうため？）
-	let bobNote: misskey.entities.Note; // eslint-disable-line @typescript-eslint/no-unused-vars
-
-	let carol: misskey.entities.SignupResponse;
-
-	let usersReplying: misskey.entities.SignupResponse[];
-
-	let userNoNote: misskey.entities.SignupResponse;
-	let userNotExplorable: misskey.entities.SignupResponse;
-	let userLocking: misskey.entities.SignupResponse;
-	let userAdmin: misskey.entities.SignupResponse;
-	let roleAdmin: misskey.entities.Role;
-	let userModerator: misskey.entities.SignupResponse;
-	let roleModerator: misskey.entities.Role;
-	let userRolePublic: misskey.entities.SignupResponse;
-	let rolePublic: misskey.entities.Role;
-	let userRoleBadge: misskey.entities.SignupResponse;
-	let roleBadge: misskey.entities.Role;
-	let userSilenced: misskey.entities.SignupResponse;
-	let roleSilenced: misskey.entities.Role;
-	let userSuspended: misskey.entities.SignupResponse;
-	let userDeletedBySelf: misskey.entities.SignupResponse;
-	let userDeletedByAdmin: misskey.entities.SignupResponse;
-	let userFollowingAlice: misskey.entities.SignupResponse;
-	let userFollowedByAlice: misskey.entities.SignupResponse;
-	let userBlockingAlice: misskey.entities.SignupResponse;
-	let userBlockedByAlice: misskey.entities.SignupResponse;
-	let userMutingAlice: misskey.entities.SignupResponse;
-	let userMutedByAlice: misskey.entities.SignupResponse;
-	let userRnMutingAlice: misskey.entities.SignupResponse;
-	let userRnMutedByAlice: misskey.entities.SignupResponse;
-	let userFollowRequesting: misskey.entities.SignupResponse;
-	let userFollowRequested: misskey.entities.SignupResponse;
+	let alicePage: misskey.entities.Page;
+	let aliceList: misskey.entities.UserList;
+
+	let bob: User;
+	let bobNote: misskey.entities.Note;
+
+	let carol: User;
+	let dave: User;
+	let ellen: User;
+	let frank: User;
+
+	let usersReplying: User[];
+
+	let userNoNote: User;
+	let userNotExplorable: User;
+	let userLocking: User;
+	let userAdmin: User;
+	let roleAdmin: any;
+	let userModerator: User;
+	let roleModerator: any;
+	let userRolePublic: User;
+	let rolePublic: any;
+	let userRoleBadge: User;
+	let roleBadge: any;
+	let userSilenced: User;
+	let roleSilenced: any;
+	let userSuspended: User;
+	let userDeletedBySelf: User;
+	let userDeletedByAdmin: User;
+	let userFollowingAlice: User;
+	let userFollowedByAlice: User;
+	let userBlockingAlice: User;
+	let userBlockedByAlice: User;
+	let userMutingAlice: User;
+	let userMutedByAlice: User;
+	let userRnMutingAlice: User;
+	let userRnMutedByAlice: User;
+	let userFollowRequesting: User;
+	let userFollowRequested: User;
 
 	beforeAll(async () => {
 		root = await signup({ username: 'root' });
 		alice = await signup({ username: 'alice' });
-		aliceNote = await post(alice, { text: 'test' });
+		aliceNote = await post(alice, { text: 'test' }) as any;
+		alicePage = await page(alice);
+		aliceList = (await api('users/list/create', { name: 'aliceList' }, alice)).body;
 		bob = await signup({ username: 'bob' });
-		bobNote = await post(bob, { text: 'test' });
+		bobNote = await post(bob, { text: 'test' }) as any;
 		carol = await signup({ username: 'carol' });
+		dave = await signup({ username: 'dave' });
+		ellen = await signup({ username: 'ellen' });
+		frank = await signup({ username: 'frank' });
 
 		// @alice -> @replyingへのリプライ。Promise.allで一気に作るとtimeoutしてしまうのでreduceで一つ一つawaitする
 		usersReplying = await [...Array(10)].map((_, i) => i).reduce(async (acc, i) => {
@@ -213,7 +239,7 @@ describe('ユーザー', () => {
 			}
 
 			return (await acc).concat(u);
-		}, Promise.resolve([] as misskey.entities.SignupResponse[]));
+		}, Promise.resolve([] as User[]));
 
 		userNoNote = await signup({ username: 'userNoNote' });
 		userNotExplorable = await signup({ username: 'userNotExplorable' });
@@ -281,7 +307,7 @@ describe('ユーザー', () => {
 	beforeEach(async () => {
 		alice = {
 			...alice,
-			...await successfulApiCall({ endpoint: 'i', parameters: {}, user: alice }),
+			...await successfulApiCall({ endpoint: 'i', parameters: {}, user: alice }) as any,
 		};
 		aliceNote = await successfulApiCall({ endpoint: 'notes/show', parameters: { noteId: aliceNote.id }, user: alice });
 	});
@@ -294,7 +320,7 @@ describe('ユーザー', () => {
 			endpoint: 'signup',
 			parameters: { username: 'zoe', password: 'password' },
 			user: undefined,
-		}) as unknown as misskey.entities.SignupResponse; // BUG MeDetailedに足りないキーがある
+		}) as unknown as User; // BUG MeDetailedに足りないキーがある
 
 		// signupの時はtokenが含まれる特別なMeDetailedが返ってくる
 		assert.match(response.token, /[a-zA-Z0-9]{16}/);
@@ -304,7 +330,7 @@ describe('ユーザー', () => {
 		assert.strictEqual(response.name, null);
 		assert.strictEqual(response.username, 'zoe');
 		assert.strictEqual(response.host, null);
-		response.avatarUrl && assert.match(response.avatarUrl, /^[-a-zA-Z0-9@:%._\+~#&?=\/]+$/);
+		assert.match(response.avatarUrl, /^[-a-zA-Z0-9@:%._\+~#&?=\/]+$/);
 		assert.strictEqual(response.avatarBlurhash, null);
 		assert.deepStrictEqual(response.avatarDecorations, []);
 		assert.strictEqual(response.isBot, false);
@@ -377,7 +403,6 @@ describe('ユーザー', () => {
 		assert.deepStrictEqual(response.unreadAnnouncements, []);
 		assert.deepStrictEqual(response.mutedWords, []);
 		assert.deepStrictEqual(response.mutedInstances, []);
-		// @ts-expect-error 後方互換のため
 		assert.deepStrictEqual(response.mutingNotificationTypes, []);
 		assert.deepStrictEqual(response.notificationRecieveConfig, {});
 		assert.deepStrictEqual(response.emailNotificationTypes, ['follow', 'receiveFollowRequest', 'groupInvited']);
@@ -407,66 +432,66 @@ describe('ユーザー', () => {
 	//#region 自分の情報の更新(i/update)
 
 	test.each([
-		{ parameters: () => ({ name: null }) },
-		{ parameters: () => ({ name: 'x'.repeat(50) }) },
-		{ parameters: () => ({ name: 'x' }) },
-		{ parameters: () => ({ name: 'My name' }) },
-		{ parameters: () => ({ description: null }) },
-		{ parameters: () => ({ description: 'x'.repeat(1500) }) },
-		{ parameters: () => ({ description: 'x' }) },
-		{ parameters: () => ({ description: 'My description' }) },
-		{ parameters: () => ({ location: null }) },
-		{ parameters: () => ({ location: 'x'.repeat(50) }) },
-		{ parameters: () => ({ location: 'x' }) },
-		{ parameters: () => ({ location: 'My location' }) },
-		{ parameters: () => ({ birthday: '0000-00-00' }) },
-		{ parameters: () => ({ birthday: '9999-99-99' }) },
-		{ parameters: () => ({ lang: 'en-US' as const }) },
-		{ parameters: () => ({ fields: [] }) },
-		{ parameters: () => ({ fields: [{ name: 'x', value: 'x' }] }) },
-		{ parameters: () => ({ fields: [{ name: 'x'.repeat(3000), value: 'x'.repeat(3000) }] }) }, // BUG? fieldには制限がない
-		{ parameters: () => ({ fields: Array(16).fill({ name: 'x', value: 'y' }) }) },
-		{ parameters: () => ({ isLocked: true }) },
-		{ parameters: () => ({ isLocked: false }) },
-		{ parameters: () => ({ isExplorable: false }) },
-		{ parameters: () => ({ isExplorable: true }) },
-		{ parameters: () => ({ hideOnlineStatus: true }) },
-		{ parameters: () => ({ hideOnlineStatus: false }) },
-		{ parameters: () => ({ publicReactions: false }) },
-		{ parameters: () => ({ publicReactions: true }) },
-		{ parameters: () => ({ autoAcceptFollowed: true }) },
-		{ parameters: () => ({ autoAcceptFollowed: false }) },
-		{ parameters: () => ({ noCrawle: true }) },
-		{ parameters: () => ({ noCrawle: false }) },
-		{ parameters: () => ({ preventAiLearning: false }) },
-		{ parameters: () => ({ preventAiLearning: true }) },
-		{ parameters: () => ({ isBot: true }) },
-		{ parameters: () => ({ isBot: false }) },
-		{ parameters: () => ({ isCat: true }) },
-		{ parameters: () => ({ isCat: false }) },
-		{ parameters: () => ({ injectFeaturedNote: true }) },
-		{ parameters: () => ({ injectFeaturedNote: false }) },
-		{ parameters: () => ({ receiveAnnouncementEmail: true }) },
-		{ parameters: () => ({ receiveAnnouncementEmail: false }) },
-		{ parameters: () => ({ alwaysMarkNsfw: true }) },
-		{ parameters: () => ({ alwaysMarkNsfw: false }) },
-		{ parameters: () => ({ autoSensitive: true }) },
-		{ parameters: () => ({ autoSensitive: false }) },
-		{ parameters: () => ({ followingVisibility: 'private' as const }) },
-		{ parameters: () => ({ followingVisibility: 'followers' as const }) },
-		{ parameters: () => ({ followingVisibility: 'public' as const }) },
-		{ parameters: () => ({ followersVisibility: 'private' as const }) },
-		{ parameters: () => ({ followersVisibility: 'followers' as const }) },
-		{ parameters: () => ({ followersVisibility: 'public' as const }) },
-		{ parameters: () => ({ mutedWords: Array(19).fill(['xxxxx']) }) },
-		{ parameters: () => ({ mutedWords: [['x'.repeat(194)]] }) },
-		{ parameters: () => ({ mutedWords: [] }) },
-		{ parameters: () => ({ mutedInstances: ['xxxx.xxxxx'] }) },
-		{ parameters: () => ({ mutedInstances: [] }) },
-		{ parameters: () => ({ notificationRecieveConfig: { mention: { type: 'following' } } }) },
-		{ parameters: () => ({ notificationRecieveConfig: {} }) },
-		{ parameters: () => ({ emailNotificationTypes: ['mention', 'reply', 'quote', 'follow', 'receiveFollowRequest'] }) },
-		{ parameters: () => ({ emailNotificationTypes: [] }) },
+		{ parameters: (): object => ({ name: null }) },
+		{ parameters: (): object => ({ name: 'x'.repeat(50) }) },
+		{ parameters: (): object => ({ name: 'x' }) },
+		{ parameters: (): object => ({ name: 'My name' }) },
+		{ parameters: (): object => ({ description: null }) },
+		{ parameters: (): object => ({ description: 'x'.repeat(1500) }) },
+		{ parameters: (): object => ({ description: 'x' }) },
+		{ parameters: (): object => ({ description: 'My description' }) },
+		{ parameters: (): object => ({ location: null }) },
+		{ parameters: (): object => ({ location: 'x'.repeat(50) }) },
+		{ parameters: (): object => ({ location: 'x' }) },
+		{ parameters: (): object => ({ location: 'My location' }) },
+		{ parameters: (): object => ({ birthday: '0000-00-00' }) },
+		{ parameters: (): object => ({ birthday: '9999-99-99' }) },
+		{ parameters: (): object => ({ lang: 'en-US' }) },
+		{ parameters: (): object => ({ fields: [] }) },
+		{ parameters: (): object => ({ fields: [{ name: 'x', value: 'x' }] }) },
+		{ parameters: (): object => ({ fields: [{ name: 'x'.repeat(3000), value: 'x'.repeat(3000) }] }) }, // BUG? fieldには制限がない
+		{ parameters: (): object => ({ fields: Array(16).fill({ name: 'x', value: 'y' }) }) },
+		{ parameters: (): object => ({ isLocked: true }) },
+		{ parameters: (): object => ({ isLocked: false }) },
+		{ parameters: (): object => ({ isExplorable: false }) },
+		{ parameters: (): object => ({ isExplorable: true }) },
+		{ parameters: (): object => ({ hideOnlineStatus: true }) },
+		{ parameters: (): object => ({ hideOnlineStatus: false }) },
+		{ parameters: (): object => ({ publicReactions: false }) },
+		{ parameters: (): object => ({ publicReactions: true }) },
+		{ parameters: (): object => ({ autoAcceptFollowed: true }) },
+		{ parameters: (): object => ({ autoAcceptFollowed: false }) },
+		{ parameters: (): object => ({ noCrawle: true }) },
+		{ parameters: (): object => ({ noCrawle: false }) },
+		{ parameters: (): object => ({ preventAiLearning: false }) },
+		{ parameters: (): object => ({ preventAiLearning: true }) },
+		{ parameters: (): object => ({ isBot: true }) },
+		{ parameters: (): object => ({ isBot: false }) },
+		{ parameters: (): object => ({ isCat: true }) },
+		{ parameters: (): object => ({ isCat: false }) },
+		{ parameters: (): object => ({ injectFeaturedNote: true }) },
+		{ parameters: (): object => ({ injectFeaturedNote: false }) },
+		{ parameters: (): object => ({ receiveAnnouncementEmail: true }) },
+		{ parameters: (): object => ({ receiveAnnouncementEmail: false }) },
+		{ parameters: (): object => ({ alwaysMarkNsfw: true }) },
+		{ parameters: (): object => ({ alwaysMarkNsfw: false }) },
+		{ parameters: (): object => ({ autoSensitive: true }) },
+		{ parameters: (): object => ({ autoSensitive: false }) },
+		{ parameters: (): object => ({ followingVisibility: 'private' }) },
+		{ parameters: (): object => ({ followingVisibility: 'followers' }) },
+		{ parameters: (): object => ({ followingVisibility: 'public' }) },
+		{ parameters: (): object => ({ followersVisibility: 'private' }) },
+		{ parameters: (): object => ({ followersVisibility: 'followers' }) },
+		{ parameters: (): object => ({ followersVisibility: 'public' }) },
+		{ parameters: (): object => ({ mutedWords: Array(19).fill(['xxxxx']) }) },
+		{ parameters: (): object => ({ mutedWords: [['x'.repeat(194)]] }) },
+		{ parameters: (): object => ({ mutedWords: [] }) },
+		{ parameters: (): object => ({ mutedInstances: ['xxxx.xxxxx'] }) },
+		{ parameters: (): object => ({ mutedInstances: [] }) },
+		{ parameters: (): object => ({ notificationRecieveConfig: { mention: { type: 'following' } } }) },
+		{ parameters: (): object => ({ notificationRecieveConfig: {} }) },
+		{ parameters: (): object => ({ emailNotificationTypes: ['mention', 'reply', 'quote', 'follow', 'receiveFollowRequest', 'groupInvited'] }) },
+		{ parameters: (): object => ({ emailNotificationTypes: [] }) },
 	] as const)('を書き換えることができる($#)', async ({ parameters }) => {
 		const response = await successfulApiCall({ endpoint: 'i/update', parameters: parameters(), user: alice });
 		const expected = { ...meDetailed(alice, true), ...parameters() };
@@ -475,13 +500,13 @@ describe('ユーザー', () => {
 
 	test('を書き換えることができる(Avatar)', async () => {
 		const aliceFile = (await uploadFile(alice)).body;
-		const parameters = { avatarId: aliceFile!.id };
+		const parameters = { avatarId: aliceFile.id };
 		const response = await successfulApiCall({ endpoint: 'i/update', parameters: parameters, user: alice });
 		assert.match(response.avatarUrl ?? '.', /^[-a-zA-Z0-9@:%._\+~#&?=\/]+$/);
 		assert.match(response.avatarBlurhash ?? '.', /[ -~]{54}/);
 		const expected = {
 			...meDetailed(alice, true),
-			avatarId: aliceFile!.id,
+			avatarId: aliceFile.id,
 			avatarBlurhash: response.avatarBlurhash,
 			avatarUrl: response.avatarUrl,
 		};
@@ -500,13 +525,13 @@ describe('ユーザー', () => {
 
 	test('を書き換えることができる(Banner)', async () => {
 		const aliceFile = (await uploadFile(alice)).body;
-		const parameters = { bannerId: aliceFile!.id };
+		const parameters = { bannerId: aliceFile.id };
 		const response = await successfulApiCall({ endpoint: 'i/update', parameters: parameters, user: alice });
 		assert.match(response.bannerUrl ?? '.', /^[-a-zA-Z0-9@:%._\+~#&?=\/]+$/);
 		assert.match(response.bannerBlurhash ?? '.', /[ -~]{54}/);
 		const expected = {
 			...meDetailed(alice, true),
-			bannerId: aliceFile!.id,
+			bannerId: aliceFile.id,
 			bannerBlurhash: response.bannerBlurhash,
 			bannerUrl: response.bannerUrl,
 		};
@@ -556,13 +581,13 @@ describe('ユーザー', () => {
 	//#region ユーザー(users)
 
 	test.each([
-		{ label: 'ID昇順', parameters: { limit: 5 }, selector: (u: misskey.entities.UserLite): string => u.id },
-		{ label: 'フォロワー昇順', parameters: { sort: '+follower' }, selector: (u: misskey.entities.UserDetailedNotMe): string => String(u.followersCount) },
-		{ label: 'フォロワー降順', parameters: { sort: '-follower' }, selector: (u: misskey.entities.UserDetailedNotMe): string => String(u.followersCount) },
-		{ label: '登録日時昇順', parameters: { sort: '+createdAt' }, selector: (u: misskey.entities.UserDetailedNotMe): string => u.createdAt },
-		{ label: '登録日時降順', parameters: { sort: '-createdAt' }, selector: (u: misskey.entities.UserDetailedNotMe): string => u.createdAt },
-		{ label: '投稿日時昇順', parameters: { sort: '+updatedAt' }, selector: (u: misskey.entities.UserDetailedNotMe): string => String(u.updatedAt) },
-		{ label: '投稿日時降順', parameters: { sort: '-updatedAt' }, selector: (u: misskey.entities.UserDetailedNotMe): string => String(u.updatedAt) },
+		{ label: 'ID昇順', parameters: { limit: 5 }, selector: (u: UserLite): string => u.id },
+		{ label: 'フォロワー昇順', parameters: { sort: '+follower' }, selector: (u: UserDetailedNotMe): string => String(u.followersCount) },
+		{ label: 'フォロワー降順', parameters: { sort: '-follower' }, selector: (u: UserDetailedNotMe): string => String(u.followersCount) },
+		{ label: '登録日時昇順', parameters: { sort: '+createdAt' }, selector: (u: UserDetailedNotMe): string => u.createdAt },
+		{ label: '登録日時降順', parameters: { sort: '-createdAt' }, selector: (u: UserDetailedNotMe): string => u.createdAt },
+		{ label: '投稿日時昇順', parameters: { sort: '+updatedAt' }, selector: (u: UserDetailedNotMe): string => String(u.updatedAt) },
+		{ label: '投稿日時降順', parameters: { sort: '-updatedAt' }, selector: (u: UserDetailedNotMe): string => String(u.updatedAt) },
 	] as const)('をリスト形式で取得することができる（$label）', async ({ parameters, selector }) => {
 		const response = await successfulApiCall({ endpoint: 'users', parameters, user: alice });
 
@@ -575,15 +600,15 @@ describe('ユーザー', () => {
 		assert.deepStrictEqual(response, expected);
 	});
 	test.each([
-		{ label: '「見つけやすくする」がOFFのユーザーが含まれない', user: () => userNotExplorable, excluded: true },
-		{ label: 'ミュートユーザーが含まれない', user: () => userMutedByAlice, excluded: true },
-		{ label: 'ブロックされているユーザーが含まれない', user: () => userBlockedByAlice, excluded: true },
-		{ label: 'ブロックしてきているユーザーが含まれる', user: () => userBlockingAlice, excluded: true },
-		{ label: '承認制ユーザーが含まれる', user: () => userLocking },
-		{ label: 'サイレンスユーザーが含まれる', user: () => userSilenced },
-		{ label: 'サスペンドユーザーが含まれない', user: () => userSuspended, excluded: true },
-		{ label: '削除済ユーザーが含まれる', user: () => userDeletedBySelf },
-		{ label: '削除済(byAdmin)ユーザーが含まれる', user: () => userDeletedByAdmin },
+		{ label: '「見つけやすくする」がOFFのユーザーが含まれない', user: (): User => userNotExplorable, excluded: true },
+		{ label: 'ミュートユーザーが含まれない', user: (): User => userMutedByAlice, excluded: true },
+		{ label: 'ブロックされているユーザーが含まれない', user: (): User => userBlockedByAlice, excluded: true },
+		{ label: 'ブロックしてきているユーザーが含まれる', user: (): User => userBlockingAlice, excluded: true },
+		{ label: '承認制ユーザーが含まれる', user: (): User => userLocking },
+		{ label: 'サイレンスユーザーが含まれる', user: (): User => userSilenced },
+		{ label: 'サスペンドユーザーが含まれない', user: (): User => userSuspended, excluded: true },
+		{ label: '削除済ユーザーが含まれる', user: (): User => userDeletedBySelf },
+		{ label: '削除済(byAdmin)ユーザーが含まれる', user: (): User => userDeletedByAdmin },
 	] as const)('をリスト形式で取得することができ、結果に$label', async ({ user, excluded }) => {
 		const parameters = { limit: 100 };
 		const response = await successfulApiCall({ endpoint: 'users', parameters, user: alice });
@@ -597,44 +622,39 @@ describe('ユーザー', () => {
 	//#region ユーザー情報(users/show)
 
 	test.each([
-		{ label: 'ID指定で自分自身を', parameters: () => ({ userId: alice.id }), user: () => alice, type: meDetailed },
-		{ label: 'ID指定で他人を', parameters: () => ({ userId: alice.id }), user: () => bob, type: userDetailedNotMeWithRelations },
-		{ label: 'ID指定かつ未認証', parameters: () => ({ userId: alice.id }), user: undefined, type: userDetailedNotMe },
-		{ label: '@指定で自分自身を', parameters: () => ({ username: alice.username }), user: () => alice, type: meDetailed },
-		{ label: '@指定で他人を', parameters: () => ({ username: alice.username }), user: () => bob, type: userDetailedNotMeWithRelations },
-		{ label: '@指定かつ未認証', parameters: () => ({ username: alice.username }), user: undefined, type: userDetailedNotMe },
+		{ label: 'ID指定で自分自身を', parameters: (): object => ({ userId: alice.id }), user: (): User => alice, type: meDetailed },
+		{ label: 'ID指定で他人を', parameters: (): object => ({ userId: alice.id }), user: (): User => bob, type: userDetailedNotMeWithRelations },
+		{ label: 'ID指定かつ未認証', parameters: (): object => ({ userId: alice.id }), user: undefined, type: userDetailedNotMe },
+		{ label: '@指定で自分自身を', parameters: (): object => ({ username: alice.username }), user: (): User => alice, type: meDetailed },
+		{ label: '@指定で他人を', parameters: (): object => ({ username: alice.username }), user: (): User => bob, type: userDetailedNotMeWithRelations },
+		{ label: '@指定かつ未認証', parameters: (): object => ({ username: alice.username }), user: undefined, type: userDetailedNotMe },
 	] as const)('を取得することができる（$label）', async ({ parameters, user, type }) => {
 		const response = await successfulApiCall({ endpoint: 'users/show', parameters: parameters(), user: user?.() });
 		const expected = type(alice);
 		assert.deepStrictEqual(response, expected);
 	});
 	test.each([
-		{ label: 'Administratorになっている', user: () => userAdmin, me: () => userAdmin, selector: (user: misskey.entities.MeDetailed) => user.isAdmin },
-		// @ts-expect-error UserDetailedNotMe doesn't include isAdmin
-		{ label: '自分以外から見たときはAdministratorか判定できない', user: () => userAdmin, selector: (user: misskey.entities.UserDetailedNotMe) => user.isAdmin, expected: () => undefined },
-		{ label: 'Moderatorになっている', user: () => userModerator, me: () => userModerator, selector: (user: misskey.entities.MeDetailed) => user.isModerator },
-		// @ts-expect-error UserDetailedNotMe doesn't include isModerator
-		{ label: '自分以外から見たときはModeratorか判定できない', user: () => userModerator, selector: (user: misskey.entities.UserDetailedNotMe) => user.isModerator, expected: () => undefined },
-		{ label: 'サイレンスになっている', user: () => userSilenced, selector: (user: misskey.entities.UserDetailed) => user.isSilenced },
-		// FIXME: 落ちる
-		//{ label: 'サスペンドになっている', user: () => userSuspended, selector: (user: misskey.entities.UserDetailed) => user.isSuspended },
-		{ label: '削除済みになっている', user: () => userDeletedBySelf, me: () => userDeletedBySelf, selector: (user: misskey.entities.MeDetailed) => user.isDeleted },
-		// @ts-expect-error UserDetailedNotMe doesn't include isDeleted
-		{ label: '自分以外から見たときは削除済みか判定できない', user: () => userDeletedBySelf, selector: (user: misskey.entities.UserDetailedNotMe) => user.isDeleted, expected: () => undefined },
-		{ label: '削除済み(byAdmin)になっている', user: () => userDeletedByAdmin, me: () => userDeletedByAdmin, selector: (user: misskey.entities.MeDetailed) => user.isDeleted },
-		// @ts-expect-error UserDetailedNotMe doesn't include isDeleted
-		{ label: '自分以外から見たときは削除済み(byAdmin)か判定できない', user: () => userDeletedByAdmin, selector: (user: misskey.entities.UserDetailedNotMe) => user.isDeleted, expected: () => undefined },
-		{ label: 'フォロー中になっている', user: () => userFollowedByAlice, selector: (user: misskey.entities.UserDetailed) => user.isFollowing },
-		{ label: 'フォローされている', user: () => userFollowingAlice, selector: (user: misskey.entities.UserDetailed) => user.isFollowed },
-		{ label: 'ブロック中になっている', user: () => userBlockedByAlice, selector: (user: misskey.entities.UserDetailed) => user.isBlocking },
-		{ label: 'ブロックされている', user: () => userBlockingAlice, selector: (user: misskey.entities.UserDetailed) => user.isBlocked },
-		{ label: 'ミュート中になっている', user: () => userMutedByAlice, selector: (user: misskey.entities.UserDetailed) => user.isMuted },
-		{ label: 'リノートミュート中になっている', user: () => userRnMutedByAlice, selector: (user: misskey.entities.UserDetailed) => user.isRenoteMuted },
-		{ label: 'フォローリクエスト中になっている', user: () => userFollowRequested, me: () => userFollowRequesting, selector: (user: misskey.entities.UserDetailed) => user.hasPendingFollowRequestFromYou },
-		{ label: 'フォローリクエストされている', user: () => userFollowRequesting, me: () => userFollowRequested, selector: (user: misskey.entities.UserDetailed) => user.hasPendingFollowRequestToYou },
+		{ label: 'Administratorになっている', user: (): User => userAdmin, me: (): User => userAdmin, selector: (user: User): unknown => user.isAdmin },
+		{ label: '自分以外から見たときはAdministratorか判定できない', user: (): User => userAdmin, selector: (user: User): unknown => user.isAdmin, expected: (): undefined => undefined },
+		{ label: 'Moderatorになっている', user: (): User => userModerator, me: (): User => userModerator, selector: (user: User): unknown => user.isModerator },
+		{ label: '自分以外から見たときはModeratorか判定できない', user: (): User => userModerator, selector: (user: User): unknown => user.isModerator, expected: (): undefined => undefined },
+		{ label: 'サイレンスになっている', user: (): User => userSilenced, selector: (user: User): unknown => user.isSilenced },
+		//{ label: 'サスペンドになっている', user: (): User => userSuspended, selector: (user: User): unknown => user.isSuspended },
+		{ label: '削除済みになっている', user: (): User => userDeletedBySelf, me: (): User => userDeletedBySelf, selector: (user: User): unknown => user.isDeleted },
+		{ label: '自分以外から見たときは削除済みか判定できない', user: (): User => userDeletedBySelf, selector: (user: User): unknown => user.isDeleted, expected: (): undefined => undefined },
+		{ label: '削除済み(byAdmin)になっている', user: (): User => userDeletedByAdmin, me: (): User => userDeletedByAdmin, selector: (user: User): unknown => user.isDeleted },
+		{ label: '自分以外から見たときは削除済み(byAdmin)か判定できない', user: (): User => userDeletedByAdmin, selector: (user: User): unknown => user.isDeleted, expected: (): undefined => undefined },
+		{ label: 'フォロー中になっている', user: (): User => userFollowedByAlice, selector: (user: User): unknown => user.isFollowing },
+		{ label: 'フォローされている', user: (): User => userFollowingAlice, selector: (user: User): unknown => user.isFollowed },
+		{ label: 'ブロック中になっている', user: (): User => userBlockedByAlice, selector: (user: User): unknown => user.isBlocking },
+		{ label: 'ブロックされている', user: (): User => userBlockingAlice, selector: (user: User): unknown => user.isBlocked },
+		{ label: 'ミュート中になっている', user: (): User => userMutedByAlice, selector: (user: User): unknown => user.isMuted },
+		{ label: 'リノートミュート中になっている', user: (): User => userRnMutedByAlice, selector: (user: User): unknown => user.isRenoteMuted },
+		{ label: 'フォローリクエスト中になっている', user: (): User => userFollowRequested, me: (): User => userFollowRequesting, selector: (user: User): unknown => user.hasPendingFollowRequestFromYou },
+		{ label: 'フォローリクエストされている', user: (): User => userFollowRequesting, me: (): User => userFollowRequested, selector: (user: User): unknown => user.hasPendingFollowRequestToYou },
 	] as const)('を取得することができ、$labelこと', async ({ user, me, selector, expected }) => {
 		const response = await successfulApiCall({ endpoint: 'users/show', parameters: { userId: user().id }, user: me?.() ?? alice });
-		assert.strictEqual(selector(response as any), (expected ?? ((): true => true))());
+		assert.strictEqual(selector(response), (expected ?? ((): true => true))());
 	});
 	test('を取得することができ、Publicなロールがセットされていること', async () => {
 		const response = await successfulApiCall({ endpoint: 'users/show', parameters: { userId: userRolePublic.id }, user: alice });
@@ -676,18 +696,17 @@ describe('ユーザー', () => {
 		assert.deepStrictEqual(response, expected);
 	});
 	test.each([
-		{ label: '「見つけやすくする」がOFFのユーザーが含まれる', user: () => userNotExplorable },
-		{ label: 'ミュートユーザーが含まれる', user: () => userMutedByAlice },
-		{ label: 'ブロックされているユーザーが含まれる', user: () => userBlockedByAlice },
-		{ label: 'ブロックしてきているユーザーが含まれる', user: () => userBlockingAlice },
-		{ label: '承認制ユーザーが含まれる', user: () => userLocking },
-		{ label: 'サイレンスユーザーが含まれる', user: () => userSilenced },
-		{ label: 'サスペンドユーザーが（モデレーターが見るときは）含まれる', user: () => userSuspended, me: () => root },
+		{ label: '「見つけやすくする」がOFFのユーザーが含まれる', user: (): User => userNotExplorable },
+		{ label: 'ミュートユーザーが含まれる', user: (): User => userMutedByAlice },
+		{ label: 'ブロックされているユーザーが含まれる', user: (): User => userBlockedByAlice },
+		{ label: 'ブロックしてきているユーザーが含まれる', user: (): User => userBlockingAlice },
+		{ label: '承認制ユーザーが含まれる', user: (): User => userLocking },
+		{ label: 'サイレンスユーザーが含まれる', user: (): User => userSilenced },
+		{ label: 'サスペンドユーザーが（モデレーターが見るときは）含まれる', user: (): User => userSuspended, me: (): User => root },
 		// BUG サスペンドユーザーを一般ユーザーから見るとrootユーザーが返ってくる
-		//{ label: 'サスペンドユーザーが（一般ユーザーが見るときは）含まれない', user: () => userSuspended, me: () => bob, excluded: true },
-		{ label: '削除済ユーザーが含まれる', user: () => userDeletedBySelf },
-		{ label: '削除済(byAdmin)ユーザーが含まれる', user: () => userDeletedByAdmin },
-		// @ts-expect-error excluded は上でコメントアウトされているので
+		//{ label: 'サスペンドユーザーが（一般ユーザーが見るときは）含まれない', user: (): User => userSuspended, me: (): User => bob, excluded: true },
+		{ label: '削除済ユーザーが含まれる', user: (): User => userDeletedBySelf },
+		{ label: '削除済(byAdmin)ユーザーが含まれる', user: (): User => userDeletedByAdmin },
 	] as const)('をID指定のリスト形式で取得することができ、結果に$label', async ({ user, me, excluded }) => {
 		const parameters = { userIds: [user().id] };
 		const response = await successfulApiCall({ endpoint: 'users/show', parameters, user: me?.() ?? alice });
@@ -712,15 +731,15 @@ describe('ユーザー', () => {
 		assert.deepStrictEqual(response, expected);
 	});
 	test.each([
-		{ label: '「見つけやすくする」がOFFのユーザーが含まれる', user: () => userNotExplorable },
-		{ label: 'ミュートユーザーが含まれる', user: () => userMutedByAlice },
-		{ label: 'ブロックされているユーザーが含まれる', user: () => userBlockedByAlice },
-		{ label: 'ブロックしてきているユーザーが含まれる', user: () => userBlockingAlice },
-		{ label: '承認制ユーザーが含まれる', user: () => userLocking },
-		{ label: 'サイレンスユーザーが含まれる', user: () => userSilenced },
-		{ label: 'サスペンドユーザーが含まれない', user: () => userSuspended, excluded: true },
-		{ label: '削除済ユーザーが含まれる', user: () => userDeletedBySelf },
-		{ label: '削除済(byAdmin)ユーザーが含まれる', user: () => userDeletedByAdmin },
+		{ label: '「見つけやすくする」がOFFのユーザーが含まれる', user: (): User => userNotExplorable },
+		{ label: 'ミュートユーザーが含まれる', user: (): User => userMutedByAlice },
+		{ label: 'ブロックされているユーザーが含まれる', user: (): User => userBlockedByAlice },
+		{ label: 'ブロックしてきているユーザーが含まれる', user: (): User => userBlockingAlice },
+		{ label: '承認制ユーザーが含まれる', user: (): User => userLocking },
+		{ label: 'サイレンスユーザーが含まれる', user: (): User => userSilenced },
+		{ label: 'サスペンドユーザーが含まれない', user: (): User => userSuspended, excluded: true },
+		{ label: '削除済ユーザーが含まれる', user: (): User => userDeletedBySelf },
+		{ label: '削除済(byAdmin)ユーザーが含まれる', user: (): User => userDeletedByAdmin },
 	] as const)('を検索することができ、結果に$labelが含まれる', async ({ user, excluded }) => {
 		const parameters = { query: user().username, limit: 1 };
 		const response = await successfulApiCall({ endpoint: 'users/search', parameters, user: alice });
@@ -734,30 +753,30 @@ describe('ユーザー', () => {
 	//#region ID指定検索(users/search-by-username-and-host)
 
 	test.each([
-		{ label: '自分', parameters: { username: 'alice' }, user: () => [alice] },
-		{ label: '自分かつusernameが大文字', parameters: { username: 'ALICE' }, user: () => [alice] },
-		{ label: 'ローカルのフォロイーでノートなし', parameters: { username: 'userFollowedByAlice' }, user: () => [userFollowedByAlice] },
-		{ label: 'ローカルでノートなしは検索に載らない', parameters: { username: 'userNoNote' }, user: () => [] },
-		{ label: 'ローカルの他人1', parameters: { username: 'bob' }, user: () => [bob] },
-		{ label: 'ローカルの他人2', parameters: { username: 'bob', host: null }, user: () => [bob] },
-		{ label: 'ローカルの他人3', parameters: { username: 'bob', host: '.' }, user: () => [bob] },
-		{ label: 'ローカル', parameters: { host: null, limit: 1 }, user: () => [userFollowedByAlice] },
-		{ label: 'ローカル', parameters: { host: '.', limit: 1 }, user: () => [userFollowedByAlice] },
+		{ label: '自分', parameters: { username: 'alice' }, user: (): User[] => [alice] },
+		{ label: '自分かつusernameが大文字', parameters: { username: 'ALICE' }, user: (): User[] => [alice] },
+		{ label: 'ローカルのフォロイーでノートなし', parameters: { username: 'userFollowedByAlice' }, user: (): User[] => [userFollowedByAlice] },
+		{ label: 'ローカルでノートなしは検索に載らない', parameters: { username: 'userNoNote' }, user: (): User[] => [] },
+		{ label: 'ローカルの他人1', parameters: { username: 'bob' }, user: (): User[] => [bob] },
+		{ label: 'ローカルの他人2', parameters: { username: 'bob', host: null }, user: (): User[] => [bob] },
+		{ label: 'ローカルの他人3', parameters: { username: 'bob', host: '.' }, user: (): User[] => [bob] },
+		{ label: 'ローカル', parameters: { host: null, limit: 1 }, user: (): User[] => [userFollowedByAlice] },
+		{ label: 'ローカル', parameters: { host: '.', limit: 1 }, user: (): User[] => [userFollowedByAlice] },
 	])('をID&ホスト指定で検索できる($label)', async ({ parameters, user }) => {
 		const response = await successfulApiCall({ endpoint: 'users/search-by-username-and-host', parameters, user: alice });
 		const expected = await Promise.all(user().map(u => show(u.id, alice)));
 		assert.deepStrictEqual(response, expected);
 	});
 	test.each([
-		{ label: '「見つけやすくする」がOFFのユーザーが含まれる', user: () => userNotExplorable },
-		{ label: 'ミュートユーザーが含まれる', user: () => userMutedByAlice },
-		{ label: 'ブロックされているユーザーが含まれる', user: () => userBlockedByAlice },
-		{ label: 'ブロックしてきているユーザーが含まれる', user: () => userBlockingAlice },
-		{ label: '承認制ユーザーが含まれる', user: () => userLocking },
-		{ label: 'サイレンスユーザーが含まれる', user: () => userSilenced },
-		{ label: 'サスペンドユーザーが含まれない', user: () => userSuspended, excluded: true },
-		{ label: '削除済ユーザーが含まれる', user: () => userDeletedBySelf },
-		{ label: '削除済(byAdmin)ユーザーが含まれる', user: () => userDeletedByAdmin },
+		{ label: '「見つけやすくする」がOFFのユーザーが含まれる', user: (): User => userNotExplorable },
+		{ label: 'ミュートユーザーが含まれる', user: (): User => userMutedByAlice },
+		{ label: 'ブロックされているユーザーが含まれる', user: (): User => userBlockedByAlice },
+		{ label: 'ブロックしてきているユーザーが含まれる', user: (): User => userBlockingAlice },
+		{ label: '承認制ユーザーが含まれる', user: (): User => userLocking },
+		{ label: 'サイレンスユーザーが含まれる', user: (): User => userSilenced },
+		{ label: 'サスペンドユーザーが含まれない', user: (): User => userSuspended, excluded: true },
+		{ label: '削除済ユーザーが含まれる', user: (): User => userDeletedBySelf },
+		{ label: '削除済(byAdmin)ユーザーが含まれる', user: (): User => userDeletedByAdmin },
 	] as const)('をID&ホスト指定で検索でき、結果に$label', async ({ user, excluded }) => {
 		const parameters = { username: user().username };
 		const response = await successfulApiCall({ endpoint: 'users/search-by-username-and-host', parameters, user: alice });
@@ -779,15 +798,15 @@ describe('ユーザー', () => {
 		assert.deepStrictEqual(response, expected);
 	});
 	test.each([
-		{ label: '「見つけやすくする」がOFFのユーザーが含まれる', user: () => userNotExplorable },
-		{ label: 'ミュートユーザーが含まれる', user: () => userMutedByAlice },
-		{ label: 'ブロックされているユーザーが含まれる', user: () => userBlockedByAlice },
-		{ label: 'ブロックしてきているユーザーが含まれない', user: () => userBlockingAlice, excluded: true },
-		{ label: '承認制ユーザーが含まれる', user: () => userLocking },
-		{ label: 'サイレンスユーザーが含まれる', user: () => userSilenced },
-		//{ label: 'サスペンドユーザーが含まれない', user: () => userSuspended, excluded: true },
-		{ label: '削除済ユーザーが含まれる', user: () => userDeletedBySelf },
-		{ label: '削除済(byAdmin)ユーザーが含まれる', user: () => userDeletedByAdmin },
+		{ label: '「見つけやすくする」がOFFのユーザーが含まれる', user: (): User => userNotExplorable },
+		{ label: 'ミュートユーザーが含まれる', user: (): User => userMutedByAlice },
+		{ label: 'ブロックされているユーザーが含まれる', user: (): User => userBlockedByAlice },
+		{ label: 'ブロックしてきているユーザーが含まれない', user: (): User => userBlockingAlice, excluded: true },
+		{ label: '承認制ユーザーが含まれる', user: (): User => userLocking },
+		{ label: 'サイレンスユーザーが含まれる', user: (): User => userSilenced },
+		//{ label: 'サスペンドユーザーが含まれない', user: (): User => userSuspended, excluded: true },
+		{ label: '削除済ユーザーが含まれる', user: (): User => userDeletedBySelf },
+		{ label: '削除済(byAdmin)ユーザーが含まれる', user: (): User => userDeletedByAdmin },
 	] as const)('がよくリプライをするユーザーのリストを取得でき、結果に$label', async ({ user, excluded }) => {
 		const replyTo = (await successfulApiCall({ endpoint: 'users/notes', parameters: { userId: user().id }, user: undefined }))[0];
 		await post(alice, { text: `@${user().username} test`, replyId: replyTo.id });
@@ -801,12 +820,12 @@ describe('ユーザー', () => {
 	//#region ハッシュタグ(hashtags/users)
 
 	test.each([
-		{ label: 'フォロワー昇順', sort: { sort: '+follower' }, selector: (u: misskey.entities.UserDetailedNotMe): string => String(u.followersCount) },
-		{ label: 'フォロワー降順', sort: { sort: '-follower' }, selector: (u: misskey.entities.UserDetailedNotMe): string => String(u.followersCount) },
-		{ label: '登録日時昇順', sort: { sort: '+createdAt' }, selector: (u: misskey.entities.UserDetailedNotMe): string => u.createdAt },
-		{ label: '登録日時降順', sort: { sort: '-createdAt' }, selector: (u: misskey.entities.UserDetailedNotMe): string => u.createdAt },
-		{ label: '投稿日時昇順', sort: { sort: '+updatedAt' }, selector: (u: misskey.entities.UserDetailedNotMe): string => String(u.updatedAt) },
-		{ label: '投稿日時降順', sort: { sort: '-updatedAt' }, selector: (u: misskey.entities.UserDetailedNotMe): string => String(u.updatedAt) },
+		{ label: 'フォロワー昇順', sort: { sort: '+follower' }, selector: (u: UserDetailedNotMe): string => String(u.followersCount) },
+		{ label: 'フォロワー降順', sort: { sort: '-follower' }, selector: (u: UserDetailedNotMe): string => String(u.followersCount) },
+		{ label: '登録日時昇順', sort: { sort: '+createdAt' }, selector: (u: UserDetailedNotMe): string => u.createdAt },
+		{ label: '登録日時降順', sort: { sort: '-createdAt' }, selector: (u: UserDetailedNotMe): string => u.createdAt },
+		{ label: '投稿日時昇順', sort: { sort: '+updatedAt' }, selector: (u: UserDetailedNotMe): string => String(u.updatedAt) },
+		{ label: '投稿日時降順', sort: { sort: '-updatedAt' }, selector: (u: UserDetailedNotMe): string => String(u.updatedAt) },
 	] as const)('をハッシュタグ指定で取得することができる($label)', async ({ sort, selector }) => {
 		const hashtag = 'test_hashtag';
 		await successfulApiCall({ endpoint: 'i/update', parameters: { description: `#${hashtag}` }, user: alice });
@@ -820,15 +839,15 @@ describe('ユーザー', () => {
 		assert.deepStrictEqual(response, expected);
 	});
 	test.each([
-		{ label: '「見つけやすくする」がOFFのユーザーが含まれる', user: () => userNotExplorable },
-		{ label: 'ミュートユーザーが含まれる', user: () => userMutedByAlice },
-		{ label: 'ブロックされているユーザーが含まれる', user: () => userBlockedByAlice },
-		{ label: 'ブロックしてきているユーザーが含まれる', user: () => userBlockingAlice },
-		{ label: '承認制ユーザーが含まれる', user: () => userLocking },
-		{ label: 'サイレンスユーザーが含まれる', user: () => userSilenced },
-		{ label: 'サスペンドユーザーが含まれない', user: () => userSuspended, excluded: true },
-		{ label: '削除済ユーザーが含まれる', user: () => userDeletedBySelf },
-		{ label: '削除済(byAdmin)ユーザーが含まれる', user: () => userDeletedByAdmin },
+		{ label: '「見つけやすくする」がOFFのユーザーが含まれる', user: (): User => userNotExplorable },
+		{ label: 'ミュートユーザーが含まれる', user: (): User => userMutedByAlice },
+		{ label: 'ブロックされているユーザーが含まれる', user: (): User => userBlockedByAlice },
+		{ label: 'ブロックしてきているユーザーが含まれる', user: (): User => userBlockingAlice },
+		{ label: '承認制ユーザーが含まれる', user: (): User => userLocking },
+		{ label: 'サイレンスユーザーが含まれる', user: (): User => userSilenced },
+		{ label: 'サスペンドユーザーが含まれない', user: (): User => userSuspended, excluded: true },
+		{ label: '削除済ユーザーが含まれる', user: (): User => userDeletedBySelf },
+		{ label: '削除済(byAdmin)ユーザーが含まれる', user: (): User => userDeletedByAdmin },
 	] as const)('をハッシュタグ指定で取得することができ、結果に$label', async ({ user, excluded }) => {
 		const hashtag = `user_test${user().username}`;
 		if (user() !== userSuspended) {
diff --git a/packages/backend/test/global.d.ts b/packages/backend/test/global.d.ts
deleted file mode 100644
index 0363073356..0000000000
--- a/packages/backend/test/global.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type FIXME = any;
diff --git a/packages/backend/test/jest.setup.ts b/packages/backend/test/jest.setup.ts
index 861bc6db66..cf5b9bf24d 100644
--- a/packages/backend/test/jest.setup.ts
+++ b/packages/backend/test/jest.setup.ts
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 import { initTestDb, sendEnvResetRequest } from './utils.js';
 
 beforeAll(async () => {
diff --git a/packages/backend/test/prelude/get-api-validator.ts b/packages/backend/test/prelude/get-api-validator.ts
index 7aa7a92702..b86a7a978d 100644
--- a/packages/backend/test/prelude/get-api-validator.ts
+++ b/packages/backend/test/prelude/get-api-validator.ts
@@ -4,10 +4,10 @@
  */
 
 import Ajv from 'ajv';
-import { Schema } from '@/misc/json-schema.js';
+import { Schema } from '@/misc/schema';
 
 export const getValidator = (paramDef: Schema) => {
-	const ajv = new Ajv.default({
+	const ajv = new Ajv({
 		useDefaults: true,
 	});
 	ajv.addFormat('misskey:id', /^[a-zA-Z0-9]+$/);
diff --git a/packages/backend/test/tsconfig.json b/packages/backend/test/tsconfig.json
index 2b562acda8..4597ff8780 100644
--- a/packages/backend/test/tsconfig.json
+++ b/packages/backend/test/tsconfig.json
@@ -5,7 +5,7 @@
 		"noImplicitAny": true,
 		"noImplicitReturns": true,
 		"noUnusedParameters": false,
-		"noUnusedLocals": false,
+		"noUnusedLocals": true,
 		"noFallthroughCasesInSwitch": true,
 		"declaration": false,
 		"sourceMap": true,
@@ -18,7 +18,6 @@
 		"strict": true,
 		"strictNullChecks": true,
 		"strictPropertyInitialization": false,
-		"skipLibCheck": true,
 		"experimentalDecorators": true,
 		"emitDecoratorMetadata": true,
 		"resolveJsonModule": true,
diff --git a/packages/backend/test/unit/AnnouncementService.ts b/packages/backend/test/unit/AnnouncementService.ts
index aa082ff2f2..fc35837420 100644
--- a/packages/backend/test/unit/AnnouncementService.ts
+++ b/packages/backend/test/unit/AnnouncementService.ts
@@ -51,7 +51,7 @@ describe('AnnouncementService', () => {
 
 	function createAnnouncement(data: Partial<MiAnnouncement & { createdAt: Date }> = {}) {
 		return announcementsRepository.insert({
-			id: genAidx(data.createdAt?.getTime() ?? Date.now()),
+			id: genAidx(data.createdAt ?? new Date()),
 			updatedAt: null,
 			title: 'Title',
 			text: 'Text',
diff --git a/packages/backend/test/unit/ApMfmService.ts b/packages/backend/test/unit/ApMfmService.ts
index 033b0e0bcf..3fa55194e1 100644
--- a/packages/backend/test/unit/ApMfmService.ts
+++ b/packages/backend/test/unit/ApMfmService.ts
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 import * as assert from 'assert';
 import { Test } from '@nestjs/testing';
 
diff --git a/packages/backend/test/unit/FetchInstanceMetadataService.ts b/packages/backend/test/unit/FetchInstanceMetadataService.ts
index bf8f3ab0e3..e6e68ccd6d 100644
--- a/packages/backend/test/unit/FetchInstanceMetadataService.ts
+++ b/packages/backend/test/unit/FetchInstanceMetadataService.ts
@@ -19,8 +19,8 @@ import { DI } from '@/di-symbols.js';
 import type { TestingModule } from '@nestjs/testing';
 
 function mockRedis() {
-	const hash = {} as any;
-	const set = jest.fn((key: string, value) => {
+	const hash = {};
+	const set = jest.fn((key, value) => {
 		const ret = hash[key];
 		hash[key] = value;
 		return ret;
@@ -56,13 +56,12 @@ describe('FetchInstanceMetadataService', () => {
 				} else if (token === DI.redis) {
 					return mockRedis;
 				}
-				return null;
 			})
 			.compile();
 
 		app.enableShutdownHooks();
 
-		fetchInstanceMetadataService = app.get<FetchInstanceMetadataService>(FetchInstanceMetadataService) as jest.Mocked<FetchInstanceMetadataService>;
+		fetchInstanceMetadataService = app.get<FetchInstanceMetadataService>(FetchInstanceMetadataService);
 		federatedInstanceService = app.get<FederatedInstanceService>(FederatedInstanceService) as jest.Mocked<FederatedInstanceService>;
 		redisClient = app.get<Redis>(DI.redis) as jest.Mocked<Redis>;
 		httpRequestService = app.get<HttpRequestService>(HttpRequestService) as jest.Mocked<HttpRequestService>;
@@ -75,12 +74,11 @@ describe('FetchInstanceMetadataService', () => {
 	test('Lock and update', async () => {
 		redisClient.set = mockRedis();
 		const now = Date.now();
-		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: { getTime: () => { return now - 10 * 1000 * 60 * 60 * 24; } } } as any);
+		federatedInstanceService.fetch.mockReturnValue({ infoUpdatedAt: { getTime: () => { return now - 10 * 1000 * 60 * 60 * 24; } } });
 		httpRequestService.getJson.mockImplementation(() => { throw Error(); });
 		const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
 		const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
-
-		await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' } as any);
+		await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' });
 		expect(tryLockSpy).toHaveBeenCalledTimes(1);
 		expect(unlockSpy).toHaveBeenCalledTimes(1);
 		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(1);
@@ -90,12 +88,11 @@ describe('FetchInstanceMetadataService', () => {
 	test('Lock and don\'t update', async () => {
 		redisClient.set = mockRedis();
 		const now = Date.now();
-		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: { getTime: () => now } } as any);
+		federatedInstanceService.fetch.mockReturnValue({ infoUpdatedAt: { getTime: () => now } });
 		httpRequestService.getJson.mockImplementation(() => { throw Error(); });
 		const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
 		const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
-
-		await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' } as any);
+		await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' });
 		expect(tryLockSpy).toHaveBeenCalledTimes(1);
 		expect(unlockSpy).toHaveBeenCalledTimes(1);
 		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(1);
@@ -104,33 +101,15 @@ describe('FetchInstanceMetadataService', () => {
 
 	test('Do nothing when lock not acquired', async () => {
 		redisClient.set = mockRedis();
-		const now = Date.now();
-		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: { getTime: () => now - 10 * 1000 * 60 * 60 * 24 } } as any);
+		federatedInstanceService.fetch.mockReturnValue({ infoUpdatedAt: { getTime: () => now - 10 * 1000 * 60 * 60 * 24 } });
 		httpRequestService.getJson.mockImplementation(() => { throw Error(); });
-		await fetchInstanceMetadataService.tryLock('example.com');
 		const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
 		const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
-
-		await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' } as any);
-		expect(tryLockSpy).toHaveBeenCalledTimes(1);
+		await fetchInstanceMetadataService.tryLock('example.com');
+		await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' });
+		expect(tryLockSpy).toHaveBeenCalledTimes(2);
 		expect(unlockSpy).toHaveBeenCalledTimes(0);
 		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(0);
 		expect(httpRequestService.getJson).toHaveBeenCalledTimes(0);
 	});
-
-	test('Do when lock not acquired but forced', async () => {
-		redisClient.set = mockRedis();
-		const now = Date.now();
-		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: { getTime: () => now - 10 * 1000 * 60 * 60 * 24 } } as any);
-		httpRequestService.getJson.mockImplementation(() => { throw Error(); });
-		await fetchInstanceMetadataService.tryLock('example.com');
-		const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
-		const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
-
-		await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' } as any, true);
-		expect(tryLockSpy).toHaveBeenCalledTimes(0);
-		expect(unlockSpy).toHaveBeenCalledTimes(1);
-		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(0);
-		expect(httpRequestService.getJson).toHaveBeenCalled();
-	});
 });
diff --git a/packages/backend/test/unit/ReactionService.ts b/packages/backend/test/unit/ReactionService.ts
index 1957f4544c..d1c31cac3a 100644
--- a/packages/backend/test/unit/ReactionService.ts
+++ b/packages/backend/test/unit/ReactionService.ts
@@ -90,45 +90,4 @@ describe('ReactionService', () => {
 			assert.strictEqual(await reactionService.normalize('unknown'), '❤');
 		});
 	});
-
-	describe('convertLegacyReactions', () => {
-		test('空の入力に対しては何もしない', () => {
-			const input = {};
-			assert.deepStrictEqual(reactionService.convertLegacyReactions(input), input);
-		});
-
-		test('Unicode絵文字リアクションを変換してしまわない', () => {
-			const input = { '👍': 1, '🍮': 2 };
-			assert.deepStrictEqual(reactionService.convertLegacyReactions(input), input);
-		});
-
-		test('カスタム絵文字リアクションを変換してしまわない', () => {
-			const input = { ':like@.:': 1, ':pudding@example.tld:': 2 };
-			assert.deepStrictEqual(reactionService.convertLegacyReactions(input), input);
-		});
-
-		test('文字列によるレガシーなリアクションを変換する', () => {
-			const input = { 'like': 1, 'pudding': 2 };
-			const output = { '👍': 1, '🍮': 2 };
-			assert.deepStrictEqual(reactionService.convertLegacyReactions(input), output);
-		});
-
-		test('host部分が省略されたレガシーなカスタム絵文字リアクションを変換する', () => {
-			const input = { ':custom_emoji:': 1 };
-			const output = { ':custom_emoji@.:': 1 };
-			assert.deepStrictEqual(reactionService.convertLegacyReactions(input), output);
-		});
-
-		test('「0個のリアクション」情報を削除する', () => {
-			const input = { 'angry': 0 };
-			const output = {};
-			assert.deepStrictEqual(reactionService.convertLegacyReactions(input), output);
-		});
-
-		test('host部分の有無によりデコードすると同じ表記になるカスタム絵文字リアクションの個数情報を正しく足し合わせる', () => {
-			const input = { ':custom_emoji:': 1, ':custom_emoji@.:': 2 };
-			const output = { ':custom_emoji@.:': 3 };
-			assert.deepStrictEqual(reactionService.convertLegacyReactions(input), output);
-		});
-	});
 });
diff --git a/packages/backend/test/unit/RelayService.ts b/packages/backend/test/unit/RelayService.ts
index 9676abf07b..f2a67dba46 100644
--- a/packages/backend/test/unit/RelayService.ts
+++ b/packages/backend/test/unit/RelayService.ts
@@ -90,8 +90,7 @@ describe('RelayService', () => {
 
 		expect(queueService.deliver).toHaveBeenCalled();
 		expect(queueService.deliver.mock.lastCall![1]?.type).toBe('Undo');
-		expect(typeof queueService.deliver.mock.lastCall![1]?.object).toBe('object');
-		expect((queueService.deliver.mock.lastCall![1]?.object as any).type).toBe('Follow');
+		expect(queueService.deliver.mock.lastCall![1]?.object.type).toBe('Follow');
 		expect(queueService.deliver.mock.lastCall![2]).toBe('https://example.com');
 		//expect(queueService.deliver.mock.lastCall![0].username).toBe('relay.actor');
 
diff --git a/packages/backend/test/unit/RoleService.ts b/packages/backend/test/unit/RoleService.ts
index 19d03570e0..5222745b7f 100644
--- a/packages/backend/test/unit/RoleService.ts
+++ b/packages/backend/test/unit/RoleService.ts
@@ -228,14 +228,11 @@ describe('RoleService', () => {
 				},
 				target: 'conditional',
 				condFormula: {
-					id: '232a4221-9816-49a6-a967-ae0fac52ec5e',
 					type: 'and',
 					values: [{
-						id: '2a37ef43-2d93-4c4d-87f6-f2fdb7d9b530',
 						type: 'followersMoreThanOrEq',
 						value: 10,
 					}, {
-						id: '1bd67839-b126-4f92-bad0-4e285dab453b',
 						type: 'createdMoreThan',
 						sec: 60 * 60 * 24 * 7,
 					}],
@@ -254,34 +251,6 @@ describe('RoleService', () => {
 			expect(user2Policies.canManageCustomEmojis).toBe(true);
 		});
 
-		test('コンディショナルロール: マニュアルロールにアサイン済み', async () => {
-			const [user1, user2, role1] = await Promise.all([
-				createUser(),
-				createUser(),
-				createRole({
-					name: 'manual role',
-				}),
-			]);
-			const role2 = await createRole({
-				name: 'conditional role',
-				target: 'conditional',
-				condFormula: {
-					// idはバックエンドのロジックに必要ない？
-					id: 'bdc612bd-9d54-4675-ae83-0499c82ea670',
-					type: 'roleAssignedTo',
-					roleId: role1.id,
-				},
-			});
-			await roleService.assign(user2.id, role1.id);
-
-			const [u1role, u2role] = await Promise.all([
-				roleService.getUserRoles(user1.id),
-				roleService.getUserRoles(user2.id),
-			]);
-			expect(u1role.some(r => r.id === role2.id)).toBe(false);
-			expect(u2role.some(r => r.id === role2.id)).toBe(true);
-		});
-
 		test('expired role', async () => {
 			const user = await createUser();
 			const role = await createRole({
diff --git a/packages/backend/test/unit/entities/UserEntityService.ts b/packages/backend/test/unit/entities/UserEntityService.ts
deleted file mode 100644
index ee16d421c4..0000000000
--- a/packages/backend/test/unit/entities/UserEntityService.ts
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Test, TestingModule } from '@nestjs/testing';
-import { UserEntityService } from '@/core/entities/UserEntityService.js';
-import { GlobalModule } from '@/GlobalModule.js';
-import { CoreModule } from '@/core/CoreModule.js';
-import type { MiUser } from '@/models/User.js';
-import { secureRndstr } from '@/misc/secure-rndstr.js';
-import { genAidx } from '@/misc/id/aidx.js';
-import {
-	BlockingsRepository,
-	FollowingsRepository, FollowRequestsRepository,
-	MiUserProfile, MutingsRepository, RenoteMutingsRepository,
-	UserMemoRepository,
-	UserProfilesRepository,
-	UsersRepository,
-} from '@/models/_.js';
-import { DI } from '@/di-symbols.js';
-import { AvatarDecorationService } from '@/core/AvatarDecorationService.js';
-import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
-import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
-import { PageEntityService } from '@/core/entities/PageEntityService.js';
-import { CustomEmojiService } from '@/core/CustomEmojiService.js';
-import { AnnouncementService } from '@/core/AnnouncementService.js';
-import { RoleService } from '@/core/RoleService.js';
-import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
-import { IdService } from '@/core/IdService.js';
-import { UtilityService } from '@/core/UtilityService.js';
-import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js';
-import { ModerationLogService } from '@/core/ModerationLogService.js';
-import { GlobalEventService } from '@/core/GlobalEventService.js';
-import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
-import { MetaService } from '@/core/MetaService.js';
-import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js';
-import { CacheService } from '@/core/CacheService.js';
-import { ApResolverService } from '@/core/activitypub/ApResolverService.js';
-import { ApNoteService } from '@/core/activitypub/models/ApNoteService.js';
-import { ApImageService } from '@/core/activitypub/models/ApImageService.js';
-import { ApMfmService } from '@/core/activitypub/ApMfmService.js';
-import { MfmService } from '@/core/MfmService.js';
-import { HashtagService } from '@/core/HashtagService.js';
-import UsersChart from '@/core/chart/charts/users.js';
-import { ChartLoggerService } from '@/core/chart/ChartLoggerService.js';
-import InstanceChart from '@/core/chart/charts/instance.js';
-import { ApLoggerService } from '@/core/activitypub/ApLoggerService.js';
-import { AccountMoveService } from '@/core/AccountMoveService.js';
-import { ReactionService } from '@/core/ReactionService.js';
-import { NotificationService } from '@/core/NotificationService.js';
-
-process.env.NODE_ENV = 'test';
-
-describe('UserEntityService', () => {
-	describe('pack/packMany', () => {
-		let app: TestingModule;
-		let service: UserEntityService;
-		let usersRepository: UsersRepository;
-		let userProfileRepository: UserProfilesRepository;
-		let userMemosRepository: UserMemoRepository;
-		let followingRepository: FollowingsRepository;
-		let followingRequestRepository: FollowRequestsRepository;
-		let blockingRepository: BlockingsRepository;
-		let mutingRepository: MutingsRepository;
-		let renoteMutingsRepository: RenoteMutingsRepository;
-
-		async function createUser(userData: Partial<MiUser> = {}, profileData: Partial<MiUserProfile> = {}) {
-			const un = secureRndstr(16);
-			const user = await usersRepository
-				.insert({
-					...userData,
-					id: genAidx(Date.now()),
-					username: un,
-					usernameLower: un,
-				})
-				.then(x => usersRepository.findOneByOrFail(x.identifiers[0]));
-
-			await userProfileRepository.insert({
-				...profileData,
-				userId: user.id,
-			});
-
-			return user;
-		}
-
-		async function memo(writer: MiUser, target: MiUser, memo: string) {
-			await userMemosRepository.insert({
-				id: genAidx(Date.now()),
-				userId: writer.id,
-				targetUserId: target.id,
-				memo,
-			});
-		}
-
-		async function follow(follower: MiUser, followee: MiUser) {
-			await followingRepository.insert({
-				id: genAidx(Date.now()),
-				followerId: follower.id,
-				followeeId: followee.id,
-			});
-		}
-
-		async function requestFollow(requester: MiUser, requestee: MiUser) {
-			await followingRequestRepository.insert({
-				id: genAidx(Date.now()),
-				followerId: requester.id,
-				followeeId: requestee.id,
-			});
-		}
-
-		async function block(blocker: MiUser, blockee: MiUser) {
-			await blockingRepository.insert({
-				id: genAidx(Date.now()),
-				blockerId: blocker.id,
-				blockeeId: blockee.id,
-			});
-		}
-
-		async function mute(mutant: MiUser, mutee: MiUser) {
-			await mutingRepository.insert({
-				id: genAidx(Date.now()),
-				muterId: mutant.id,
-				muteeId: mutee.id,
-			});
-		}
-
-		async function muteRenote(mutant: MiUser, mutee: MiUser) {
-			await renoteMutingsRepository.insert({
-				id: genAidx(Date.now()),
-				muterId: mutant.id,
-				muteeId: mutee.id,
-			});
-		}
-
-		function randomIntRange(weight = 10) {
-			return [...Array(Math.floor(Math.random() * weight))].map((it, idx) => idx);
-		}
-
-		beforeAll(async () => {
-			const services = [
-				UserEntityService,
-				ApPersonService,
-				NoteEntityService,
-				PageEntityService,
-				CustomEmojiService,
-				AnnouncementService,
-				RoleService,
-				FederatedInstanceService,
-				IdService,
-				AvatarDecorationService,
-				UtilityService,
-				EmojiEntityService,
-				ModerationLogService,
-				GlobalEventService,
-				DriveFileEntityService,
-				MetaService,
-				FetchInstanceMetadataService,
-				CacheService,
-				ApResolverService,
-				ApNoteService,
-				ApImageService,
-				ApMfmService,
-				MfmService,
-				HashtagService,
-				UsersChart,
-				ChartLoggerService,
-				InstanceChart,
-				ApLoggerService,
-				AccountMoveService,
-				ReactionService,
-				NotificationService,
-			];
-
-			app = await Test.createTestingModule({
-				imports: [GlobalModule, CoreModule],
-				providers: [
-					...services,
-					...services.map(x => ({ provide: x.name, useExisting: x })),
-				],
-			}).compile();
-			await app.init();
-			app.enableShutdownHooks();
-
-			service = app.get<UserEntityService>(UserEntityService);
-			usersRepository = app.get<UsersRepository>(DI.usersRepository);
-			userProfileRepository = app.get<UserProfilesRepository>(DI.userProfilesRepository);
-			userMemosRepository = app.get<UserMemoRepository>(DI.userMemosRepository);
-			followingRepository = app.get<FollowingsRepository>(DI.followingsRepository);
-			followingRequestRepository = app.get<FollowRequestsRepository>(DI.followRequestsRepository);
-			blockingRepository = app.get<BlockingsRepository>(DI.blockingsRepository);
-			mutingRepository = app.get<MutingsRepository>(DI.mutingsRepository);
-			renoteMutingsRepository = app.get<RenoteMutingsRepository>(DI.renoteMutingsRepository);
-		});
-
-		afterAll(async () => {
-			await app.close();
-		});
-
-		test('UserLite', async() => {
-			const me = await createUser();
-			const who = await createUser();
-
-			await memo(me, who, 'memo');
-
-			const actual = await service.pack(who, me, { schema: 'UserLite' }) as any;
-			// no detail
-			expect(actual.memo).toBeUndefined();
-			// no detail and me
-			expect(actual.birthday).toBeUndefined();
-			// no detail and me
-			expect(actual.achievements).toBeUndefined();
-		});
-
-		test('UserDetailedNotMe', async() => {
-			const me = await createUser();
-			const who = await createUser({}, { birthday: '2000-01-01' });
-
-			await memo(me, who, 'memo');
-
-			const actual = await service.pack(who, me, { schema: 'UserDetailedNotMe' }) as any;
-			// is detail
-			expect(actual.memo).toBe('memo');
-			// is detail
-			expect(actual.birthday).toBe('2000-01-01');
-			// no detail and me
-			expect(actual.achievements).toBeUndefined();
-		});
-
-		test('MeDetailed', async() => {
-			const achievements = [{ name: 'achievement', unlockedAt: new Date().getTime() }];
-			const me = await createUser({}, {
-				birthday: '2000-01-01',
-				achievements: achievements,
-			});
-			await memo(me, me, 'memo');
-
-			const actual = await service.pack(me, me, { schema: 'MeDetailed' }) as any;
-			// is detail
-			expect(actual.memo).toBe('memo');
-			// is detail
-			expect(actual.birthday).toBe('2000-01-01');
-			// is detail and me
-			expect(actual.achievements).toEqual(achievements);
-		});
-
-		describe('packManyによるpreloadがある時、preloadが無い時とpackの結果が同じになるか見たい', () => {
-			test('no-preload', async() => {
-				const me = await createUser();
-				// meがフォローしてる人たち
-				const followeeMe = await Promise.all(randomIntRange().map(() => createUser()));
-				for (const who of followeeMe) {
-					await follow(me, who);
-					const actual = await service.pack(who, me, { schema: 'UserDetailed' }) as any;
-					expect(actual.isFollowing).toBe(true);
-					expect(actual.isFollowed).toBe(false);
-					expect(actual.hasPendingFollowRequestFromYou).toBe(false);
-					expect(actual.hasPendingFollowRequestToYou).toBe(false);
-					expect(actual.isBlocking).toBe(false);
-					expect(actual.isBlocked).toBe(false);
-					expect(actual.isMuted).toBe(false);
-					expect(actual.isRenoteMuted).toBe(false);
-				}
-
-				// meをフォローしてる人たち
-				const followerMe = await Promise.all(randomIntRange().map(() => createUser()));
-				for (const who of followerMe) {
-					await follow(who, me);
-					const actual = await service.pack(who, me, { schema: 'UserDetailed' }) as any;
-					expect(actual.isFollowing).toBe(false);
-					expect(actual.isFollowed).toBe(true);
-					expect(actual.hasPendingFollowRequestFromYou).toBe(false);
-					expect(actual.hasPendingFollowRequestToYou).toBe(false);
-					expect(actual.isBlocking).toBe(false);
-					expect(actual.isBlocked).toBe(false);
-					expect(actual.isMuted).toBe(false);
-					expect(actual.isRenoteMuted).toBe(false);
-				}
-
-				// meがフォローリクエストを送った人たち
-				const requestsFromYou = await Promise.all(randomIntRange().map(() => createUser()));
-				for (const who of requestsFromYou) {
-					await requestFollow(me, who);
-					const actual = await service.pack(who, me, { schema: 'UserDetailed' }) as any;
-					expect(actual.isFollowing).toBe(false);
-					expect(actual.isFollowed).toBe(false);
-					expect(actual.hasPendingFollowRequestFromYou).toBe(true);
-					expect(actual.hasPendingFollowRequestToYou).toBe(false);
-					expect(actual.isBlocking).toBe(false);
-					expect(actual.isBlocked).toBe(false);
-					expect(actual.isMuted).toBe(false);
-					expect(actual.isRenoteMuted).toBe(false);
-				}
-
-				// meにフォローリクエストを送った人たち
-				const requestsToYou = await Promise.all(randomIntRange().map(() => createUser()));
-				for (const who of requestsToYou) {
-					await requestFollow(who, me);
-					const actual = await service.pack(who, me, { schema: 'UserDetailed' }) as any;
-					expect(actual.isFollowing).toBe(false);
-					expect(actual.isFollowed).toBe(false);
-					expect(actual.hasPendingFollowRequestFromYou).toBe(false);
-					expect(actual.hasPendingFollowRequestToYou).toBe(true);
-					expect(actual.isBlocking).toBe(false);
-					expect(actual.isBlocked).toBe(false);
-					expect(actual.isMuted).toBe(false);
-					expect(actual.isRenoteMuted).toBe(false);
-				}
-
-				// meがブロックしてる人たち
-				const blockingYou = await Promise.all(randomIntRange().map(() => createUser()));
-				for (const who of blockingYou) {
-					await block(me, who);
-					const actual = await service.pack(who, me, { schema: 'UserDetailed' }) as any;
-					expect(actual.isFollowing).toBe(false);
-					expect(actual.isFollowed).toBe(false);
-					expect(actual.hasPendingFollowRequestFromYou).toBe(false);
-					expect(actual.hasPendingFollowRequestToYou).toBe(false);
-					expect(actual.isBlocking).toBe(true);
-					expect(actual.isBlocked).toBe(false);
-					expect(actual.isMuted).toBe(false);
-					expect(actual.isRenoteMuted).toBe(false);
-				}
-
-				// meをブロックしてる人たち
-				const blockingMe = await Promise.all(randomIntRange().map(() => createUser()));
-				for (const who of blockingMe) {
-					await block(who, me);
-					const actual = await service.pack(who, me, { schema: 'UserDetailed' }) as any;
-					expect(actual.isFollowing).toBe(false);
-					expect(actual.isFollowed).toBe(false);
-					expect(actual.hasPendingFollowRequestFromYou).toBe(false);
-					expect(actual.hasPendingFollowRequestToYou).toBe(false);
-					expect(actual.isBlocking).toBe(false);
-					expect(actual.isBlocked).toBe(true);
-					expect(actual.isMuted).toBe(false);
-					expect(actual.isRenoteMuted).toBe(false);
-				}
-
-				// meがミュートしてる人たち
-				const muters = await Promise.all(randomIntRange().map(() => createUser()));
-				for (const who of muters) {
-					await mute(me, who);
-					const actual = await service.pack(who, me, { schema: 'UserDetailed' }) as any;
-					expect(actual.isFollowing).toBe(false);
-					expect(actual.isFollowed).toBe(false);
-					expect(actual.hasPendingFollowRequestFromYou).toBe(false);
-					expect(actual.hasPendingFollowRequestToYou).toBe(false);
-					expect(actual.isBlocking).toBe(false);
-					expect(actual.isBlocked).toBe(false);
-					expect(actual.isMuted).toBe(true);
-					expect(actual.isRenoteMuted).toBe(false);
-				}
-
-				// meがリノートミュートしてる人たち
-				const renoteMuters = await Promise.all(randomIntRange().map(() => createUser()));
-				for (const who of renoteMuters) {
-					await muteRenote(me, who);
-					const actual = await service.pack(who, me, { schema: 'UserDetailed' }) as any;
-					expect(actual.isFollowing).toBe(false);
-					expect(actual.isFollowed).toBe(false);
-					expect(actual.hasPendingFollowRequestFromYou).toBe(false);
-					expect(actual.hasPendingFollowRequestToYou).toBe(false);
-					expect(actual.isBlocking).toBe(false);
-					expect(actual.isBlocked).toBe(false);
-					expect(actual.isMuted).toBe(false);
-					expect(actual.isRenoteMuted).toBe(true);
-				}
-			});
-
-			test('preload', async() => {
-				const me = await createUser();
-
-				{
-					// meがフォローしてる人たち
-					const followeeMe = await Promise.all(randomIntRange().map(() => createUser()));
-					for (const who of followeeMe) {
-						await follow(me, who);
-					}
-					const actualList = await service.packMany(followeeMe, me, { schema: 'UserDetailed' }) as any;
-					for (const actual of actualList) {
-						expect(actual.isFollowing).toBe(true);
-						expect(actual.isFollowed).toBe(false);
-						expect(actual.hasPendingFollowRequestFromYou).toBe(false);
-						expect(actual.hasPendingFollowRequestToYou).toBe(false);
-						expect(actual.isBlocking).toBe(false);
-						expect(actual.isBlocked).toBe(false);
-						expect(actual.isMuted).toBe(false);
-						expect(actual.isRenoteMuted).toBe(false);
-					}
-				}
-
-				{
-					// meをフォローしてる人たち
-					const followerMe = await Promise.all(randomIntRange().map(() => createUser()));
-					for (const who of followerMe) {
-						await follow(who, me);
-					}
-					const actualList = await service.packMany(followerMe, me, { schema: 'UserDetailed' }) as any;
-					for (const actual of actualList) {
-						expect(actual.isFollowing).toBe(false);
-						expect(actual.isFollowed).toBe(true);
-						expect(actual.hasPendingFollowRequestFromYou).toBe(false);
-						expect(actual.hasPendingFollowRequestToYou).toBe(false);
-						expect(actual.isBlocking).toBe(false);
-						expect(actual.isBlocked).toBe(false);
-						expect(actual.isMuted).toBe(false);
-						expect(actual.isRenoteMuted).toBe(false);
-					}
-				}
-
-				{
-					// meがフォローリクエストを送った人たち
-					const requestsFromYou = await Promise.all(randomIntRange().map(() => createUser()));
-					for (const who of requestsFromYou) {
-						await requestFollow(me, who);
-					}
-					const actualList = await service.packMany(requestsFromYou, me, { schema: 'UserDetailed' }) as any;
-					for (const actual of actualList) {
-						expect(actual.isFollowing).toBe(false);
-						expect(actual.isFollowed).toBe(false);
-						expect(actual.hasPendingFollowRequestFromYou).toBe(true);
-						expect(actual.hasPendingFollowRequestToYou).toBe(false);
-						expect(actual.isBlocking).toBe(false);
-						expect(actual.isBlocked).toBe(false);
-						expect(actual.isMuted).toBe(false);
-						expect(actual.isRenoteMuted).toBe(false);
-					}
-				}
-
-				{
-					// meにフォローリクエストを送った人たち
-					const requestsToYou = await Promise.all(randomIntRange().map(() => createUser()));
-					for (const who of requestsToYou) {
-						await requestFollow(who, me);
-					}
-					const actualList = await service.packMany(requestsToYou, me, { schema: 'UserDetailed' }) as any;
-					for (const actual of actualList) {
-						expect(actual.isFollowing).toBe(false);
-						expect(actual.isFollowed).toBe(false);
-						expect(actual.hasPendingFollowRequestFromYou).toBe(false);
-						expect(actual.hasPendingFollowRequestToYou).toBe(true);
-						expect(actual.isBlocking).toBe(false);
-						expect(actual.isBlocked).toBe(false);
-						expect(actual.isMuted).toBe(false);
-						expect(actual.isRenoteMuted).toBe(false);
-					}
-				}
-
-				{
-					// meがブロックしてる人たち
-					const blockingYou = await Promise.all(randomIntRange().map(() => createUser()));
-					for (const who of blockingYou) {
-						await block(me, who);
-					}
-					const actualList = await service.packMany(blockingYou, me, { schema: 'UserDetailed' }) as any;
-					for (const actual of actualList) {
-						expect(actual.isFollowing).toBe(false);
-						expect(actual.isFollowed).toBe(false);
-						expect(actual.hasPendingFollowRequestFromYou).toBe(false);
-						expect(actual.hasPendingFollowRequestToYou).toBe(false);
-						expect(actual.isBlocking).toBe(true);
-						expect(actual.isBlocked).toBe(false);
-						expect(actual.isMuted).toBe(false);
-						expect(actual.isRenoteMuted).toBe(false);
-					}
-				}
-
-				{
-					// meをブロックしてる人たち
-					const blockingMe = await Promise.all(randomIntRange().map(() => createUser()));
-					for (const who of blockingMe) {
-						await block(who, me);
-					}
-					const actualList = await service.packMany(blockingMe, me, { schema: 'UserDetailed' }) as any;
-					for (const actual of actualList) {
-						expect(actual.isFollowing).toBe(false);
-						expect(actual.isFollowed).toBe(false);
-						expect(actual.hasPendingFollowRequestFromYou).toBe(false);
-						expect(actual.hasPendingFollowRequestToYou).toBe(false);
-						expect(actual.isBlocking).toBe(false);
-						expect(actual.isBlocked).toBe(true);
-						expect(actual.isMuted).toBe(false);
-						expect(actual.isRenoteMuted).toBe(false);
-					}
-				}
-
-				{
-					// meがミュートしてる人たち
-					const muters = await Promise.all(randomIntRange().map(() => createUser()));
-					for (const who of muters) {
-						await mute(me, who);
-					}
-					const actualList = await service.packMany(muters, me, { schema: 'UserDetailed' }) as any;
-					for (const actual of actualList) {
-						expect(actual.isFollowing).toBe(false);
-						expect(actual.isFollowed).toBe(false);
-						expect(actual.hasPendingFollowRequestFromYou).toBe(false);
-						expect(actual.hasPendingFollowRequestToYou).toBe(false);
-						expect(actual.isBlocking).toBe(false);
-						expect(actual.isBlocked).toBe(false);
-						expect(actual.isMuted).toBe(true);
-						expect(actual.isRenoteMuted).toBe(false);
-					}
-				}
-
-				{
-					// meがリノートミュートしてる人たち
-					const renoteMuters = await Promise.all(randomIntRange().map(() => createUser()));
-					for (const who of renoteMuters) {
-						await muteRenote(me, who);
-					}
-					const actualList = await service.packMany(renoteMuters, me, { schema: 'UserDetailed' }) as any;
-					for (const actual of actualList) {
-						expect(actual.isFollowing).toBe(false);
-						expect(actual.isFollowed).toBe(false);
-						expect(actual.hasPendingFollowRequestFromYou).toBe(false);
-						expect(actual.hasPendingFollowRequestToYou).toBe(false);
-						expect(actual.isBlocking).toBe(false);
-						expect(actual.isBlocked).toBe(false);
-						expect(actual.isMuted).toBe(false);
-						expect(actual.isRenoteMuted).toBe(true);
-					}
-				}
-			});
-		});
-	});
-});
diff --git a/packages/backend/test/unit/misc/loader.ts b/packages/backend/test/unit/misc/loader.ts
index 2cf54e1555..fa37950951 100644
--- a/packages/backend/test/unit/misc/loader.ts
+++ b/packages/backend/test/unit/misc/loader.ts
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 import { DebounceLoader } from '@/misc/loader.js';
 
 class Mock {
diff --git a/packages/backend/test/utils.ts b/packages/backend/test/utils.ts
index 2c92f2c74b..004f1477c6 100644
--- a/packages/backend/test/utils.ts
+++ b/packages/backend/test/utils.ts
@@ -9,10 +9,11 @@ import { basename, isAbsolute } from 'node:path';
 import { randomUUID } from 'node:crypto';
 import { inspect } from 'node:util';
 import WebSocket, { ClientOptions } from 'ws';
-import fetch, { File, RequestInit, type Headers } from 'node-fetch';
+import fetch, { File, RequestInit } from 'node-fetch';
 import { DataSource } from 'typeorm';
 import { JSDOM } from 'jsdom';
 import { DEFAULT_POLICIES } from '@/core/RoleService.js';
+import { Packed } from '@/misc/json-schema.js';
 import { validateContentTypeSetAsActivityPub } from '@/core/activitypub/misc/validator.js';
 import { entities } from '@/postgres.js';
 import { loadConfig } from '@/config.js';
@@ -20,7 +21,7 @@ import type * as misskey from 'cherrypick-js';
 
 export { server as startServer, jobQueue as startJobQueue } from '@/boot/common.js';
 
-export interface UserToken {
+interface UserToken {
 	token: string;
 	bearer?: boolean;
 }
@@ -34,15 +35,20 @@ export const cookie = (me: UserToken): string => {
 	return `token=${me.token};`;
 };
 
-export type ApiRequest<E extends keyof misskey.Endpoints, P extends misskey.Endpoints[E]['req'] = misskey.Endpoints[E]['req']> = {
-	endpoint: E,
-	parameters: P,
+export const api = async (endpoint: string, params: any, me?: UserToken) => {
+	const normalized = endpoint.replace(/^\//, '');
+	return await request(`api/${normalized}`, params, me);
+};
+
+export type ApiRequest = {
+	endpoint: string,
+	parameters: object,
 	user: UserToken | undefined,
 };
 
-export const successfulApiCall = async <E extends keyof misskey.Endpoints, P extends misskey.Endpoints[E]['req']>(request: ApiRequest<E, P>, assertion: {
+export const successfulApiCall = async <T, >(request: ApiRequest, assertion: {
 	status?: number,
-} = {}): Promise<misskey.api.SwitchCaseResponseType<E, P>> => {
+} = {}): Promise<T> => {
 	const { endpoint, parameters, user } = request;
 	const res = await api(endpoint, parameters, user);
 	const status = assertion.status ?? (res.body == null ? 204 : 200);
@@ -50,7 +56,7 @@ export const successfulApiCall = async <E extends keyof misskey.Endpoints, P ext
 	return res.body;
 };
 
-export const failedApiCall = async <T, E extends keyof misskey.Endpoints, P extends misskey.Endpoints[E]['req']>(request: ApiRequest<E, P>, assertion: {
+export const failedApiCall = async <T, >(request: ApiRequest, assertion: {
 	status: number,
 	code: string,
 	id: string
@@ -64,7 +70,7 @@ export const failedApiCall = async <T, E extends keyof misskey.Endpoints, P exte
 	return res.body;
 };
 
-export const api = async <E extends keyof misskey.Endpoints>(path: E, params: misskey.Endpoints[E]['req'], me?: UserToken): Promise<{
+const request = async (path: string, params: any, me?: UserToken): Promise<{
 	status: number,
 	headers: Headers,
 	body: any
@@ -80,7 +86,7 @@ export const api = async <E extends keyof misskey.Endpoints>(path: E, params: mi
 		bodyAuth.i = me.token;
 	}
 
-	const res = await relativeFetch(`api/${path}`, {
+	const res = await relativeFetch(path, {
 		method: 'POST',
 		headers,
 		body: JSON.stringify(Object.assign(bodyAuth, params)),
@@ -135,7 +141,7 @@ export const signup = async (params?: Partial<misskey.Endpoints['signup']['req']
 	return res.body;
 };
 
-export const post = async (user: UserToken, params: misskey.Endpoints['notes/create']['req']): Promise<misskey.entities.Note> => {
+export const post = async (user: UserToken, params?: misskey.Endpoints['notes/create']['req']): Promise<misskey.entities.Note> => {
 	const q = params;
 
 	const res = await api('notes/create', q, user);
@@ -153,8 +159,8 @@ export const createAppToken = async (user: UserToken, permissions: (typeof missk
 };
 
 // 非公開ノートをAPI越しに見たときのノート NoteEntityService.ts
-export const hiddenNote = (note: misskey.entities.Note): misskey.entities.Note => {
-	const temp: misskey.entities.Note = {
+export const hiddenNote = (note: any): any => {
+	const temp = {
 		...note,
 		fileIds: [],
 		files: [],
@@ -167,22 +173,21 @@ export const hiddenNote = (note: misskey.entities.Note): misskey.entities.Note =
 	return temp;
 };
 
-export const react = async (user: UserToken, note: misskey.entities.Note, reaction: string): Promise<void> => {
+export const react = async (user: UserToken, note: any, reaction: string): Promise<any> => {
 	await api('notes/reactions/create', {
 		noteId: note.id,
 		reaction: reaction,
 	}, user);
 };
 
-export const userList = async (user: UserToken, userList: Partial<misskey.entities.UserList> = {}): Promise<misskey.entities.UserList> => {
+export const userList = async (user: UserToken, userList: any = {}): Promise<any> => {
 	const res = await api('users/lists/create', {
 		name: 'test',
-		...userList,
 	}, user);
 	return res.body;
 };
 
-export const page = async (user: UserToken, page: Partial<misskey.entities.Page> = {}): Promise<misskey.entities.Page> => {
+export const page = async (user: UserToken, page: any = {}): Promise<any> => {
 	const res = await api('pages/create', {
 		alignCenter: false,
 		content: [
@@ -193,7 +198,7 @@ export const page = async (user: UserToken, page: Partial<misskey.entities.Page>
 			},
 		],
 		eyeCatchingImageId: null,
-		font: 'sans-serif' as any,
+		font: 'sans-serif',
 		hideTitleWhenPinned: false,
 		name: '1678594845072',
 		script: '',
@@ -205,7 +210,7 @@ export const page = async (user: UserToken, page: Partial<misskey.entities.Page>
 	return res.body;
 };
 
-export const play = async (user: UserToken, play: Partial<misskey.entities.Flash> = {}): Promise<misskey.entities.Flash> => {
+export const play = async (user: UserToken, play: any = {}): Promise<any> => {
 	const res = await api('flash/create', {
 		permissions: [],
 		script: 'test',
@@ -216,7 +221,7 @@ export const play = async (user: UserToken, play: Partial<misskey.entities.Flash
 	return res.body;
 };
 
-export const clip = async (user: UserToken, clip: Partial<misskey.entities.Clip> = {}): Promise<misskey.entities.Clip> => {
+export const clip = async (user: UserToken, clip: any = {}): Promise<any> => {
 	const res = await api('clips/create', {
 		description: null,
 		isPublic: true,
@@ -226,18 +231,18 @@ export const clip = async (user: UserToken, clip: Partial<misskey.entities.Clip>
 	return res.body;
 };
 
-export const galleryPost = async (user: UserToken, galleryPost: Partial<misskey.entities.GalleryPost> = {}): Promise<misskey.entities.GalleryPost> => {
+export const galleryPost = async (user: UserToken, channel: any = {}): Promise<any> => {
 	const res = await api('gallery/posts/create', {
 		description: null,
 		fileIds: [],
 		isSensitive: false,
 		title: 'test',
-		...galleryPost,
+		...channel,
 	}, user);
 	return res.body;
 };
 
-export const channel = async (user: UserToken, channel: Partial<misskey.entities.Channel> = {}): Promise<misskey.entities.Channel> => {
+export const channel = async (user: UserToken, channel: any = {}): Promise<any> => {
 	const res = await api('channels/create', {
 		bannerId: null,
 		description: null,
@@ -247,7 +252,7 @@ export const channel = async (user: UserToken, channel: Partial<misskey.entities
 	return res.body;
 };
 
-export const role = async (user: UserToken, role: Partial<misskey.entities.Role> = {}, policies: any = {}): Promise<misskey.entities.Role> => {
+export const role = async (user: UserToken, role: any = {}, policies: any = {}): Promise<any> => {
 	const res = await api('admin/roles/create', {
 		asBadge: false,
 		canEditMembersByModerator: false,
@@ -255,7 +260,7 @@ export const role = async (user: UserToken, role: Partial<misskey.entities.Role>
 		condFormula: {
 			id: 'ebef1684-672d-49b6-ad82-1b3ec3784f85',
 			type: 'isRemote',
-		} as any,
+		},
 		description: '',
 		displayOrder: 0,
 		iconUrl: null,
@@ -293,7 +298,7 @@ interface UploadOptions {
 export const uploadFile = async (user?: UserToken, { path, name, blob }: UploadOptions = {}): Promise<{
 	status: number,
 	headers: Headers,
-	body: misskey.entities.DriveFile | null
+	body: misskey.Endpoints['drive/files/create']['res'] | null
 }> => {
 	const absPath = path == null
 		? new URL('resources/Lenna.jpg', import.meta.url)
@@ -330,14 +335,14 @@ export const uploadFile = async (user?: UserToken, { path, name, blob }: UploadO
 	};
 };
 
-export const uploadUrl = async (user: UserToken, url: string): Promise<misskey.entities.DriveFile> => {
+export const uploadUrl = async (user: UserToken, url: string): Promise<Packed<'DriveFile'>> => {
 	const marker = Math.random().toString();
 
 	const catcher = makeStreamCatcher(
 		user,
 		'main',
 		(msg) => msg.type === 'urlUploadFinished' && msg.body.marker === marker,
-		(msg) => msg.body.file,
+		(msg) => msg.body.file as Packed<'DriveFile'>,
 		60 * 1000,
 	);
 
@@ -350,7 +355,7 @@ export const uploadUrl = async (user: UserToken, url: string): Promise<misskey.e
 	return catcher;
 };
 
-export function connectStream<C extends keyof misskey.Channels>(user: UserToken, channel: C, listener: (message: Record<string, any>) => any, params?: misskey.Channels[C]['params']): Promise<WebSocket> {
+export function connectStream(user: UserToken, channel: string, listener: (message: Record<string, any>) => any, params?: any): Promise<WebSocket> {
 	return new Promise((res, rej) => {
 		const url = new URL(`ws://127.0.0.1:${port}/streaming`);
 		const options: ClientOptions = {};
@@ -385,7 +390,7 @@ export function connectStream<C extends keyof misskey.Channels>(user: UserToken,
 	});
 }
 
-export const waitFire = async <C extends keyof misskey.Channels>(user: UserToken, channel: C, trgr: () => any, cond: (msg: Record<string, any>) => boolean, params?: misskey.Channels[C]['params']) => {
+export const waitFire = async (user: UserToken, channel: string, trgr: () => any, cond: (msg: Record<string, any>) => boolean, params?: any) => {
 	return new Promise<boolean>(async (res, rej) => {
 		let timer: NodeJS.Timeout | null = null;
 
@@ -430,7 +435,7 @@ export const waitFire = async <C extends keyof misskey.Channels>(user: UserToken
  */
 export function makeStreamCatcher<T>(
 	user: UserToken,
-	channel: keyof misskey.Channels,
+	channel: string,
 	cond: (message: Record<string, any>) => boolean,
 	extractor: (message: Record<string, any>) => T,
 	timeout = 60 * 1000): Promise<T> {
diff --git a/packages/cherrypick-js/etc/cherrypick-js.api.md b/packages/cherrypick-js/etc/cherrypick-js.api.md
index 149df0b8df..a5b0803c4f 100644
--- a/packages/cherrypick-js/etc/cherrypick-js.api.md
+++ b/packages/cherrypick-js/etc/cherrypick-js.api.md
@@ -142,15 +142,9 @@ type AdminEmojiAddAliasesBulkRequest = operations['admin/emoji/add-aliases-bulk'
 // @public (undocumented)
 type AdminEmojiAddRequest = operations['admin/emoji/add']['requestBody']['content']['application/json'];
 
-// @public (undocumented)
-type AdminEmojiAddResponse = operations['admin/emoji/add']['responses']['200']['content']['application/json'];
-
 // @public (undocumented)
 type AdminEmojiAddsRequest = operations['admin/emoji/adds']['requestBody']['content']['application/json'];
 
-// @public (undocumented)
-type AdminEmojiAddsResponse = operations['admin/emoji/adds']['responses']['200']['content']['application/json'];
-
 // @public (undocumented)
 type AdminEmojiCopyRequest = operations['admin/emoji/copy']['requestBody']['content']['application/json'];
 
@@ -560,7 +554,6 @@ export type Channels = {
             unreadNotification: (payload: Notification_2) => void;
             unreadMention: (payload: Note['id']) => void;
             readAllUnreadMentions: () => void;
-            notificationFlushed: () => void;
             unreadSpecifiedNote: (payload: Note['id']) => void;
             readAllUnreadSpecifiedNotes: () => void;
             readAllMessagingMessages: () => void;
@@ -1219,9 +1212,7 @@ declare namespace entities {
         AdminDriveShowFileResponse,
         AdminEmojiAddAliasesBulkRequest,
         AdminEmojiAddRequest,
-        AdminEmojiAddResponse,
         AdminEmojiAddsRequest,
-        AdminEmojiAddsResponse,
         AdminEmojiCopyRequest,
         AdminEmojiCopyResponse,
         AdminEmojiDeleteBulkRequest,
@@ -1815,7 +1806,6 @@ declare namespace entities {
         RoleCondFormulaLogics,
         RoleCondFormulaValueNot,
         RoleCondFormulaValueIsLocalOrRemote,
-        RoleCondFormulaValueAssignedRole,
         RoleCondFormulaValueCreated,
         RoleCondFormulaFollowersOrFollowingOrNotes,
         RoleCondFormulaValue,
@@ -1823,10 +1813,7 @@ declare namespace entities {
         Role,
         RolePolicies,
         ReversiGameLite,
-        ReversiGameDetailed,
-        MetaLite,
-        MetaDetailedOnly,
-        MetaDetailed
+        ReversiGameDetailed
     }
 }
 export { entities }
@@ -2373,15 +2360,6 @@ type MessagingMessagesRequest = operations['messaging/messages']['requestBody'][
 // @public (undocumented)
 type MessagingMessagesResponse = operations['messaging/messages']['responses']['200']['content']['application/json'];
 
-// @public (undocumented)
-type MetaDetailed = components['schemas']['MetaDetailed'];
-
-// @public (undocumented)
-type MetaDetailedOnly = components['schemas']['MetaDetailedOnly'];
-
-// @public (undocumented)
-type MetaLite = components['schemas']['MetaLite'];
-
 // @public (undocumented)
 type MetaRequest = operations['meta']['requestBody']['content']['application/json'];
 
@@ -2475,9 +2453,6 @@ type ModerationLog = {
 } | {
     type: 'unsuspendRemoteInstance';
     info: ModerationLogPayloads['unsuspendRemoteInstance'];
-} | {
-    type: 'updateRemoteInstanceNote';
-    info: ModerationLogPayloads['updateRemoteInstanceNote'];
 } | {
     type: 'markSensitiveDriveFile';
     info: ModerationLogPayloads['markSensitiveDriveFile'];
@@ -2517,7 +2492,7 @@ type ModerationLog = {
 });
 
 // @public (undocumented)
-export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "unsuspend", "updateUserNote", "addCustomEmoji", "updateCustomEmoji", "deleteCustomEmoji", "assignRole", "unassignRole", "createRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "suspendRemoteInstance", "unsuspendRemoteInstance", "updateRemoteInstanceNote", "markSensitiveDriveFile", "unmarkSensitiveDriveFile", "resolveAbuseReport", "createInvitation", "createAd", "updateAd", "deleteAd", "createAvatarDecoration", "updateAvatarDecoration", "deleteAvatarDecoration", "unsetUserAvatar", "unsetUserBanner"];
+export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "unsuspend", "updateUserNote", "addCustomEmoji", "updateCustomEmoji", "deleteCustomEmoji", "assignRole", "unassignRole", "createRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "suspendRemoteInstance", "unsuspendRemoteInstance", "markSensitiveDriveFile", "unmarkSensitiveDriveFile", "resolveAbuseReport", "createInvitation", "createAd", "updateAd", "deleteAd", "createAvatarDecoration", "updateAvatarDecoration", "deleteAvatarDecoration", "unsetUserAvatar", "unsetUserBanner"];
 
 // @public (undocumented)
 type MuteCreateRequest = operations['mute/create']['requestBody']['content']['application/json'];
@@ -2883,9 +2858,6 @@ type RoleCondFormulaLogics = components['schemas']['RoleCondFormulaLogics'];
 // @public (undocumented)
 type RoleCondFormulaValue = components['schemas']['RoleCondFormulaValue'];
 
-// @public (undocumented)
-type RoleCondFormulaValueAssignedRole = components['schemas']['RoleCondFormulaValueAssignedRole'];
-
 // @public (undocumented)
 type RoleCondFormulaValueCreated = components['schemas']['RoleCondFormulaValueCreated'];
 
diff --git a/packages/cherrypick-js/package.json b/packages/cherrypick-js/package.json
index 54e7bae2ff..0f13e4bb3e 100644
--- a/packages/cherrypick-js/package.json
+++ b/packages/cherrypick-js/package.json
@@ -1,8 +1,8 @@
 {
 	"type": "module",
 	"name": "cherrypick-js",
-	"version": "4.8.0-beta.1-engawa0.3.1",
-	"basedMisskeyVersion": "2024.3.1",
+	"version": "4.7.0-engawa0.3.0",
+	"basedMisskeyVersion": "2024.2.0",
 	"description": "CherryPick SDK for JavaScript",
 	"types": "./built/dts/index.d.ts",
 	"exports": {
@@ -39,18 +39,18 @@
 		"@microsoft/api-extractor": "7.39.1",
 		"@misskey-dev/eslint-plugin": "1.0.0",
 		"@swc/jest": "0.2.31",
-		"@types/jest": "29.5.12",
-		"@types/node": "20.11.22",
-		"@typescript-eslint/eslint-plugin": "7.1.0",
-		"@typescript-eslint/parser": "7.1.0",
-		"eslint": "8.57.0",
+		"@types/jest": "29.5.11",
+		"@types/node": "20.11.17",
+		"@typescript-eslint/eslint-plugin": "6.18.1",
+		"@typescript-eslint/parser": "6.18.1",
+		"eslint": "8.56.0",
 		"jest": "29.7.0",
 		"jest-fetch-mock": "3.0.3",
 		"jest-websocket-mock": "2.5.0",
 		"mock-socket": "9.3.1",
 		"ncp": "2.0.0",
-		"nodemon": "3.1.0",
-		"tsd": "0.30.7",
+		"nodemon": "3.0.3",
+		"tsd": "0.30.4",
 		"typescript": "5.3.3"
 	},
 	"files": [
diff --git a/packages/cherrypick-js/src/autogen/apiClientJSDoc.ts b/packages/cherrypick-js/src/autogen/apiClientJSDoc.ts
index 2fba53b08e..2feb126e5a 100644
--- a/packages/cherrypick-js/src/autogen/apiClientJSDoc.ts
+++ b/packages/cherrypick-js/src/autogen/apiClientJSDoc.ts
@@ -3371,17 +3371,6 @@ declare module '../api.js' {
       credential?: string | null,
     ): Promise<SwitchCaseResponseType<E, P>>;
 
-    /**
-     * No description provided.
-     * 
-     * **Credential required**: *Yes* / **Permission**: *write:notifications*
-     */
-    request<E extends 'notifications/flush', P extends Endpoints[E]['req']>(
-      endpoint: E,
-      params: P,
-      credential?: string | null,
-    ): Promise<SwitchCaseResponseType<E, P>>;
-
     /**
      * No description provided.
      * 
diff --git a/packages/cherrypick-js/src/autogen/endpoint.ts b/packages/cherrypick-js/src/autogen/endpoint.ts
index 5ab518a98d..d3e58c10e2 100644
--- a/packages/cherrypick-js/src/autogen/endpoint.ts
+++ b/packages/cherrypick-js/src/autogen/endpoint.ts
@@ -41,9 +41,7 @@ import type {
 	AdminDriveShowFileResponse,
 	AdminEmojiAddAliasesBulkRequest,
 	AdminEmojiAddRequest,
-	AdminEmojiAddResponse,
 	AdminEmojiAddsRequest,
-	AdminEmojiAddsResponse,
 	AdminEmojiCopyRequest,
 	AdminEmojiCopyResponse,
 	AdminEmojiDeleteBulkRequest,
@@ -628,8 +626,8 @@ export type Endpoints = {
 	'admin/drive/files': { req: AdminDriveFilesRequest; res: AdminDriveFilesResponse };
 	'admin/drive/show-file': { req: AdminDriveShowFileRequest; res: AdminDriveShowFileResponse };
 	'admin/emoji/add-aliases-bulk': { req: AdminEmojiAddAliasesBulkRequest; res: EmptyResponse };
-	'admin/emoji/add': { req: AdminEmojiAddRequest; res: AdminEmojiAddResponse };
-	'admin/emoji/adds': { req: AdminEmojiAddsRequest; res: AdminEmojiAddsResponse };
+	'admin/emoji/add': { req: AdminEmojiAddRequest; res: EmptyResponse };
+	'admin/emoji/adds': { req: AdminEmojiAddsRequest; res: EmptyResponse };
 	'admin/emoji/copy': { req: AdminEmojiCopyRequest; res: AdminEmojiCopyResponse };
 	'admin/emoji/delete-bulk': { req: AdminEmojiDeleteBulkRequest; res: EmptyResponse };
 	'admin/emoji/delete': { req: AdminEmojiDeleteRequest; res: EmptyResponse };
@@ -902,7 +900,6 @@ export type Endpoints = {
 	'notes/unrenote': { req: NotesUnrenoteRequest; res: EmptyResponse };
 	'notes/user-list-timeline': { req: NotesUserListTimelineRequest; res: NotesUserListTimelineResponse };
 	'notifications/create': { req: NotificationsCreateRequest; res: EmptyResponse };
-	'notifications/flush': { req: EmptyRequest; res: EmptyResponse };
 	'notifications/mark-all-as-read': { req: EmptyRequest; res: EmptyResponse };
 	'notifications/test-notification': { req: EmptyRequest; res: EmptyResponse };
 	'page-push': { req: PagePushRequest; res: EmptyResponse };
diff --git a/packages/cherrypick-js/src/autogen/entities.ts b/packages/cherrypick-js/src/autogen/entities.ts
index 959cb12cd8..fe18f807e9 100644
--- a/packages/cherrypick-js/src/autogen/entities.ts
+++ b/packages/cherrypick-js/src/autogen/entities.ts
@@ -43,9 +43,7 @@ export type AdminDriveShowFileRequest = operations['admin/drive/show-file']['req
 export type AdminDriveShowFileResponse = operations['admin/drive/show-file']['responses']['200']['content']['application/json'];
 export type AdminEmojiAddAliasesBulkRequest = operations['admin/emoji/add-aliases-bulk']['requestBody']['content']['application/json'];
 export type AdminEmojiAddRequest = operations['admin/emoji/add']['requestBody']['content']['application/json'];
-export type AdminEmojiAddResponse = operations['admin/emoji/add']['responses']['200']['content']['application/json'];
 export type AdminEmojiAddsRequest = operations['admin/emoji/adds']['requestBody']['content']['application/json'];
-export type AdminEmojiAddsResponse = operations['admin/emoji/adds']['responses']['200']['content']['application/json'];
 export type AdminEmojiCopyRequest = operations['admin/emoji/copy']['requestBody']['content']['application/json'];
 export type AdminEmojiCopyResponse = operations['admin/emoji/copy']['responses']['200']['content']['application/json'];
 export type AdminEmojiDeleteBulkRequest = operations['admin/emoji/delete-bulk']['requestBody']['content']['application/json'];
diff --git a/packages/cherrypick-js/src/autogen/models.ts b/packages/cherrypick-js/src/autogen/models.ts
index 77be7dbf41..8737a33b77 100644
--- a/packages/cherrypick-js/src/autogen/models.ts
+++ b/packages/cherrypick-js/src/autogen/models.ts
@@ -40,7 +40,6 @@ export type Signin = components['schemas']['Signin'];
 export type RoleCondFormulaLogics = components['schemas']['RoleCondFormulaLogics'];
 export type RoleCondFormulaValueNot = components['schemas']['RoleCondFormulaValueNot'];
 export type RoleCondFormulaValueIsLocalOrRemote = components['schemas']['RoleCondFormulaValueIsLocalOrRemote'];
-export type RoleCondFormulaValueAssignedRole = components['schemas']['RoleCondFormulaValueAssignedRole'];
 export type RoleCondFormulaValueCreated = components['schemas']['RoleCondFormulaValueCreated'];
 export type RoleCondFormulaFollowersOrFollowingOrNotes = components['schemas']['RoleCondFormulaFollowersOrFollowingOrNotes'];
 export type RoleCondFormulaValue = components['schemas']['RoleCondFormulaValue'];
@@ -49,6 +48,3 @@ export type Role = components['schemas']['Role'];
 export type RolePolicies = components['schemas']['RolePolicies'];
 export type ReversiGameLite = components['schemas']['ReversiGameLite'];
 export type ReversiGameDetailed = components['schemas']['ReversiGameDetailed'];
-export type MetaLite = components['schemas']['MetaLite'];
-export type MetaDetailedOnly = components['schemas']['MetaDetailedOnly'];
-export type MetaDetailed = components['schemas']['MetaDetailed'];
diff --git a/packages/cherrypick-js/src/autogen/types.ts b/packages/cherrypick-js/src/autogen/types.ts
index b8d267fc19..e15ec287a6 100644
--- a/packages/cherrypick-js/src/autogen/types.ts
+++ b/packages/cherrypick-js/src/autogen/types.ts
@@ -2914,15 +2914,6 @@ export type paths = {
      */
     post: operations['notifications/create'];
   };
-  '/notifications/flush': {
-    /**
-     * notifications/flush
-     * @description No description provided.
-     *
-     * **Credential required**: *Yes* / **Permission**: *write:notifications*
-     */
-    post: operations['notifications/flush'];
-  };
   '/notifications/mark-all-as-read': {
     /**
      * notifications/mark-all-as-read
@@ -3879,9 +3870,7 @@ export type components = {
         faviconUrl: string | null;
         themeColor: string | null;
       };
-      emojis: {
-        [key: string]: string;
-      };
+      emojis: Record<string, never>;
       /** @enum {string} */
       onlineStatus: 'unknown' | 'online' | 'active' | 'offline';
       badgeRoles?: ({
@@ -3992,7 +3981,7 @@ export type components = {
       notificationRecieveConfig: {
         note?: OneOf<[{
           /** @enum {string} */
-          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
         }, {
           /** @enum {string} */
           type: 'list';
@@ -4001,7 +3990,7 @@ export type components = {
         }]>;
         follow?: OneOf<[{
           /** @enum {string} */
-          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
         }, {
           /** @enum {string} */
           type: 'list';
@@ -4010,7 +3999,7 @@ export type components = {
         }]>;
         mention?: OneOf<[{
           /** @enum {string} */
-          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
         }, {
           /** @enum {string} */
           type: 'list';
@@ -4019,7 +4008,7 @@ export type components = {
         }]>;
         reply?: OneOf<[{
           /** @enum {string} */
-          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
         }, {
           /** @enum {string} */
           type: 'list';
@@ -4028,7 +4017,7 @@ export type components = {
         }]>;
         renote?: OneOf<[{
           /** @enum {string} */
-          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
         }, {
           /** @enum {string} */
           type: 'list';
@@ -4037,7 +4026,7 @@ export type components = {
         }]>;
         quote?: OneOf<[{
           /** @enum {string} */
-          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
         }, {
           /** @enum {string} */
           type: 'list';
@@ -4046,7 +4035,7 @@ export type components = {
         }]>;
         reaction?: OneOf<[{
           /** @enum {string} */
-          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
         }, {
           /** @enum {string} */
           type: 'list';
@@ -4055,7 +4044,7 @@ export type components = {
         }]>;
         pollEnded?: OneOf<[{
           /** @enum {string} */
-          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
         }, {
           /** @enum {string} */
           type: 'list';
@@ -4064,7 +4053,7 @@ export type components = {
         }]>;
         receiveFollowRequest?: OneOf<[{
           /** @enum {string} */
-          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
         }, {
           /** @enum {string} */
           type: 'list';
@@ -4073,7 +4062,7 @@ export type components = {
         }]>;
         followRequestAccepted?: OneOf<[{
           /** @enum {string} */
-          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
         }, {
           /** @enum {string} */
           type: 'list';
@@ -4082,7 +4071,7 @@ export type components = {
         }]>;
         groupInvited?: OneOf<[{
           /** @enum {string} */
-          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
         }, {
           /** @enum {string} */
           type: 'list';
@@ -4091,7 +4080,7 @@ export type components = {
         }]>;
         roleAssigned?: OneOf<[{
           /** @enum {string} */
-          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
         }, {
           /** @enum {string} */
           type: 'list';
@@ -4100,7 +4089,7 @@ export type components = {
         }]>;
         achievementEarned?: OneOf<[{
           /** @enum {string} */
-          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
         }, {
           /** @enum {string} */
           type: 'list';
@@ -4109,7 +4098,7 @@ export type components = {
         }]>;
         app?: OneOf<[{
           /** @enum {string} */
-          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
         }, {
           /** @enum {string} */
           type: 'list';
@@ -4118,7 +4107,7 @@ export type components = {
         }]>;
         test?: OneOf<[{
           /** @enum {string} */
-          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+          type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
         }, {
           /** @enum {string} */
           type: 'list';
@@ -4301,6 +4290,8 @@ export type components = {
         [key: string]: string;
       };
       event?: Record<string, never> | null;
+      /** Format: date-time */
+      deleteAt?: string | null;
       /**
        * Format: id
        * @example xxxxxxxxxx
@@ -4322,7 +4313,6 @@ export type components = {
       reactions: {
         [key: string]: number;
       };
-      reactionCount: number;
       renoteCount: number;
       repliesCount: number;
       uri?: string;
@@ -4516,15 +4506,6 @@ export type components = {
       createdAt: string;
       /** @enum {string} */
       type: 'test';
-    } | {
-      /** Format: id */
-      id: string;
-      /** Format: date-time */
-      createdAt: string;
-      /** @enum {string} */
-      type: 'groupInvited';
-      /** Format: id */
-      invitation: string;
     };
     DriveFile: {
       /**
@@ -4838,7 +4819,6 @@ export type components = {
       infoUpdatedAt: string | null;
       /** Format: date-time */
       latestRequestReceivedAt: string | null;
-      moderationNote?: string | null;
     };
     GalleryPost: {
       /**
@@ -4929,16 +4909,6 @@ export type components = {
       /** @enum {string} */
       type: 'isLocal' | 'isRemote';
     };
-    RoleCondFormulaValueAssignedRole: {
-      id: string;
-      /** @enum {string} */
-      type: 'roleAssignedTo';
-      /**
-       * Format: id
-       * @example xxxxxxxxxx
-       */
-      roleId: string;
-    };
     RoleCondFormulaValueCreated: {
       id: string;
       /** @enum {string} */
@@ -4951,7 +4921,7 @@ export type components = {
       type: 'followersLessThanOrEq' | 'followersMoreThanOrEq' | 'followingLessThanOrEq' | 'followingMoreThanOrEq' | 'notesLessThanOrEq' | 'notesMoreThanOrEq';
       value: number;
     };
-    RoleCondFormulaValue: components['schemas']['RoleCondFormulaLogics'] | components['schemas']['RoleCondFormulaValueNot'] | components['schemas']['RoleCondFormulaValueIsLocalOrRemote'] | components['schemas']['RoleCondFormulaValueAssignedRole'] | components['schemas']['RoleCondFormulaValueCreated'] | components['schemas']['RoleCondFormulaFollowersOrFollowingOrNotes'];
+    RoleCondFormulaValue: components['schemas']['RoleCondFormulaLogics'] | components['schemas']['RoleCondFormulaValueNot'] | components['schemas']['RoleCondFormulaValueIsLocalOrRemote'] | components['schemas']['RoleCondFormulaValueCreated'] | components['schemas']['RoleCondFormulaFollowersOrFollowingOrNotes'];
     RoleLite: {
       /**
        * Format: id
@@ -5000,7 +4970,6 @@ export type components = {
       gtlAvailable: boolean;
       ltlAvailable: boolean;
       canPublicNote: boolean;
-      mentionLimit: number;
       canInvite: boolean;
       inviteLimit: number;
       inviteLimitCycle: number;
@@ -5093,97 +5062,6 @@ export type components = {
       logs: number[][];
       map: string[];
     };
-    MetaLite: {
-      maintainerName: string | null;
-      maintainerEmail: string | null;
-      version: string;
-      basedMisskeyVersion: string;
-      providesTarball: boolean;
-      name: string | null;
-      shortName: string | null;
-      /**
-       * Format: url
-       * @example https://cherrypick.example.com
-       */
-      uri: string;
-      description: string | null;
-      langs: string[];
-      tosUrl: string | null;
-      /** @default https://github.com/kokonect-link/cherrypick */
-      repositoryUrl: string | null;
-      /** @default https://github.com/kokonect-link/cherrypick/issues/new */
-      feedbackUrl: string | null;
-      defaultDarkTheme: string | null;
-      defaultLightTheme: string | null;
-      disableRegistration: boolean;
-      emailRequiredForSignup: boolean;
-      enableHcaptcha: boolean;
-      hcaptchaSiteKey: string | null;
-      enableMcaptcha: boolean;
-      mcaptchaSiteKey: string | null;
-      mcaptchaInstanceUrl: string | null;
-      enableRecaptcha: boolean;
-      recaptchaSiteKey: string | null;
-      enableTurnstile: boolean;
-      turnstileSiteKey: string | null;
-      swPublickey: string | null;
-      /** @default /assets/ai.png */
-      mascotImageUrl: string;
-      bannerUrl: string | null;
-      serverErrorImageUrl: string | null;
-      infoImageUrl: string | null;
-      notFoundImageUrl: string | null;
-      iconUrl: string | null;
-      maxNoteTextLength: number;
-      ads: {
-          /**
-           * Format: id
-           * @example xxxxxxxxxx
-           */
-          id: string;
-          /** Format: url */
-          url: string;
-          place: string;
-          ratio: number;
-          /** Format: url */
-          imageUrl: string;
-          dayOfWeek: number;
-        }[];
-      /** @default 0 */
-      notesPerOneAd: number;
-      enableEmail: boolean;
-      enableServiceWorker: boolean;
-      translatorAvailable: boolean;
-      mediaProxy: string;
-      backgroundImageUrl: string | null;
-      impressumUrl: string | null;
-      logoImageUrl: string | null;
-      privacyPolicyUrl: string | null;
-      serverRules: string[];
-      themeColor: string | null;
-      policies: components['schemas']['RolePolicies'];
-    };
-    MetaDetailedOnly: {
-      features?: {
-        registration: boolean;
-        emailRequiredForSignup: boolean;
-        localTimeline: boolean;
-        globalTimeline: boolean;
-        hcaptcha: boolean;
-        turnstile: boolean;
-        recaptcha: boolean;
-        objectStorage: boolean;
-        serviceWorker: boolean;
-        /** @default true */
-        miauth?: boolean;
-      };
-      proxyAccountName: string | null;
-      /** @example false */
-      requireSetup: boolean;
-      cacheRemoteFiles: boolean;
-      cacheRemoteSensitiveFiles: boolean;
-    };
-    MetaDetailed: components['schemas']['MetaLite'] & components['schemas']['MetaDetailedOnly'];
   };
   responses: never;
   parameters: never;
@@ -7107,11 +6985,9 @@ export type operations = {
       };
     };
     responses: {
-      /** @description OK (with results) */
-      200: {
-        content: {
-          'application/json': components['schemas']['EmojiDetailed'];
-        };
+      /** @description OK (without any results) */
+      204: {
+        content: never;
       };
       /** @description Client error */
       400: {
@@ -7169,11 +7045,9 @@ export type operations = {
       };
     };
     responses: {
-      /** @description OK (with results) */
-      200: {
-        content: {
-          'application/json': components['schemas']['EmojiDetailed'];
-        };
+      /** @description OK (without any results) */
+      204: {
+        content: never;
       };
       /** @description Client error */
       400: {
@@ -7841,13 +7715,13 @@ export type operations = {
       content: {
         'application/json': {
           /** Format: misskey:id */
-          id?: string;
-          name?: string;
+          id: string;
+          name: string;
           /** Format: misskey:id */
           fileId?: string;
           /** @description Use `null` to reset the category. */
           category?: string | null;
-          aliases?: string[];
+          aliases: string[];
           license?: string | null;
           isSensitive?: boolean;
           localOnly?: boolean;
@@ -8056,8 +7930,7 @@ export type operations = {
       content: {
         'application/json': {
           host: string;
-          isSuspended?: boolean;
-          moderationNote?: string;
+          isSuspended: boolean;
         };
       };
     };
@@ -9219,7 +9092,7 @@ export type operations = {
             notificationRecieveConfig: {
               note?: OneOf<[{
                 /** @enum {string} */
-                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
               }, {
                 /** @enum {string} */
                 type: 'list';
@@ -9228,7 +9101,7 @@ export type operations = {
               }]>;
               follow?: OneOf<[{
                 /** @enum {string} */
-                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
               }, {
                 /** @enum {string} */
                 type: 'list';
@@ -9237,7 +9110,7 @@ export type operations = {
               }]>;
               mention?: OneOf<[{
                 /** @enum {string} */
-                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
               }, {
                 /** @enum {string} */
                 type: 'list';
@@ -9246,7 +9119,7 @@ export type operations = {
               }]>;
               reply?: OneOf<[{
                 /** @enum {string} */
-                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
               }, {
                 /** @enum {string} */
                 type: 'list';
@@ -9255,7 +9128,7 @@ export type operations = {
               }]>;
               renote?: OneOf<[{
                 /** @enum {string} */
-                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
               }, {
                 /** @enum {string} */
                 type: 'list';
@@ -9264,7 +9137,7 @@ export type operations = {
               }]>;
               quote?: OneOf<[{
                 /** @enum {string} */
-                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
               }, {
                 /** @enum {string} */
                 type: 'list';
@@ -9273,7 +9146,7 @@ export type operations = {
               }]>;
               reaction?: OneOf<[{
                 /** @enum {string} */
-                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
               }, {
                 /** @enum {string} */
                 type: 'list';
@@ -9282,7 +9155,7 @@ export type operations = {
               }]>;
               pollEnded?: OneOf<[{
                 /** @enum {string} */
-                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
               }, {
                 /** @enum {string} */
                 type: 'list';
@@ -9291,7 +9164,7 @@ export type operations = {
               }]>;
               receiveFollowRequest?: OneOf<[{
                 /** @enum {string} */
-                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
               }, {
                 /** @enum {string} */
                 type: 'list';
@@ -9300,16 +9173,7 @@ export type operations = {
               }]>;
               followRequestAccepted?: OneOf<[{
                 /** @enum {string} */
-                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
-              }, {
-                /** @enum {string} */
-                type: 'list';
-                /** Format: misskey:id */
-                userListId: string;
-              }]>;
-              groupInvited?: OneOf<[{
-                /** @enum {string} */
-                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
               }, {
                 /** @enum {string} */
                 type: 'list';
@@ -9318,7 +9182,7 @@ export type operations = {
               }]>;
               roleAssigned?: OneOf<[{
                 /** @enum {string} */
-                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
               }, {
                 /** @enum {string} */
                 type: 'list';
@@ -9327,7 +9191,7 @@ export type operations = {
               }]>;
               achievementEarned?: OneOf<[{
                 /** @enum {string} */
-                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
               }, {
                 /** @enum {string} */
                 type: 'list';
@@ -9336,7 +9200,7 @@ export type operations = {
               }]>;
               app?: OneOf<[{
                 /** @enum {string} */
-                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
               }, {
                 /** @enum {string} */
                 type: 'list';
@@ -9345,7 +9209,7 @@ export type operations = {
               }]>;
               test?: OneOf<[{
                 /** @enum {string} */
-                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+                type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
               }, {
                 /** @enum {string} */
                 type: 'list';
@@ -10732,21 +10596,21 @@ export type operations = {
         'application/json': {
           /** Format: misskey:id */
           antennaId: string;
-          name?: string;
+          name: string;
           /** @enum {string} */
-          src?: 'home' | 'all' | 'users' | 'list' | 'group' | 'users_blacklist';
+          src: 'home' | 'all' | 'users' | 'list' | 'group' | 'users_blacklist';
           /** Format: misskey:id */
           userListId?: string | null;
           /** Format: misskey:id */
           userGroupId?: string | null;
-          keywords?: string[][];
-          excludeKeywords?: string[][];
-          users?: string[];
-          caseSensitive?: boolean;
+          keywords: string[][];
+          excludeKeywords: string[][];
+          users: string[];
+          caseSensitive: boolean;
           localOnly?: boolean;
-          withReplies?: boolean;
-          withFile?: boolean;
-          notify?: boolean;
+          withReplies: boolean;
+          withFile: boolean;
+          notify: boolean;
         };
       };
     };
@@ -18440,8 +18304,8 @@ export type operations = {
           untilId?: string;
           /** @default true */
           markAsRead?: boolean;
-          includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'groupInvited' | 'roleAssigned' | 'achievementEarned' | 'app' | 'test' | 'pollVote')[];
-          excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'groupInvited' | 'roleAssigned' | 'achievementEarned' | 'app' | 'test' | 'pollVote')[];
+          includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'groupInvited' | 'achievementEarned' | 'app' | 'test' | 'pollVote')[];
+          excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'groupInvited' | 'achievementEarned' | 'app' | 'test' | 'pollVote')[];
         };
       };
     };
@@ -18508,8 +18372,8 @@ export type operations = {
           untilId?: string;
           /** @default true */
           markAsRead?: boolean;
-          includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'groupInvited' | 'roleAssigned' | 'achievementEarned' | 'app' | 'test' | 'reaction:grouped' | 'renote:grouped' | 'pollVote')[];
-          excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'groupInvited' | 'roleAssigned' | 'achievementEarned' | 'app' | 'test' | 'reaction:grouped' | 'renote:grouped' | 'pollVote')[];
+          includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'groupInvited' | 'achievementEarned' | 'app' | 'test' | 'pollVote')[];
+          excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'groupInvited' | 'achievementEarned' | 'app' | 'test' | 'pollVote')[];
         };
       };
     };
@@ -19654,7 +19518,7 @@ export type operations = {
           notificationRecieveConfig?: {
             note?: OneOf<[{
               /** @enum {string} */
-              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
             }, {
               /** @enum {string} */
               type: 'list';
@@ -19663,7 +19527,7 @@ export type operations = {
             }]>;
             follow?: OneOf<[{
               /** @enum {string} */
-              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
             }, {
               /** @enum {string} */
               type: 'list';
@@ -19672,7 +19536,7 @@ export type operations = {
             }]>;
             mention?: OneOf<[{
               /** @enum {string} */
-              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
             }, {
               /** @enum {string} */
               type: 'list';
@@ -19681,7 +19545,7 @@ export type operations = {
             }]>;
             reply?: OneOf<[{
               /** @enum {string} */
-              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
             }, {
               /** @enum {string} */
               type: 'list';
@@ -19690,7 +19554,7 @@ export type operations = {
             }]>;
             renote?: OneOf<[{
               /** @enum {string} */
-              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
             }, {
               /** @enum {string} */
               type: 'list';
@@ -19699,7 +19563,7 @@ export type operations = {
             }]>;
             quote?: OneOf<[{
               /** @enum {string} */
-              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
             }, {
               /** @enum {string} */
               type: 'list';
@@ -19708,7 +19572,7 @@ export type operations = {
             }]>;
             reaction?: OneOf<[{
               /** @enum {string} */
-              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
             }, {
               /** @enum {string} */
               type: 'list';
@@ -19717,7 +19581,7 @@ export type operations = {
             }]>;
             pollEnded?: OneOf<[{
               /** @enum {string} */
-              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
             }, {
               /** @enum {string} */
               type: 'list';
@@ -19726,7 +19590,7 @@ export type operations = {
             }]>;
             receiveFollowRequest?: OneOf<[{
               /** @enum {string} */
-              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
             }, {
               /** @enum {string} */
               type: 'list';
@@ -19735,16 +19599,7 @@ export type operations = {
             }]>;
             followRequestAccepted?: OneOf<[{
               /** @enum {string} */
-              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
-            }, {
-              /** @enum {string} */
-              type: 'list';
-              /** Format: misskey:id */
-              userListId: string;
-            }]>;
-            groupInvited?: OneOf<[{
-              /** @enum {string} */
-              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
             }, {
               /** @enum {string} */
               type: 'list';
@@ -19753,7 +19608,7 @@ export type operations = {
             }]>;
             roleAssigned?: OneOf<[{
               /** @enum {string} */
-              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
             }, {
               /** @enum {string} */
               type: 'list';
@@ -19762,7 +19617,7 @@ export type operations = {
             }]>;
             achievementEarned?: OneOf<[{
               /** @enum {string} */
-              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
             }, {
               /** @enum {string} */
               type: 'list';
@@ -19771,7 +19626,7 @@ export type operations = {
             }]>;
             app?: OneOf<[{
               /** @enum {string} */
-              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
             }, {
               /** @enum {string} */
               type: 'list';
@@ -19780,7 +19635,7 @@ export type operations = {
             }]>;
             test?: OneOf<[{
               /** @enum {string} */
-              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'followingOrFollower' | 'never';
+              type: 'all' | 'following' | 'follower' | 'mutualFollow' | 'never';
             }, {
               /** @enum {string} */
               type: 'list';
@@ -20784,7 +20639,92 @@ export type operations = {
       /** @description OK (with results) */
       200: {
         content: {
-          'application/json': components['schemas']['MetaLite'] | components['schemas']['MetaDetailed'];
+          'application/json': {
+            maintainerName: string | null;
+            maintainerEmail: string | null;
+            version: string;
+            basedMisskeyVersion: string;
+            providesTarball: boolean;
+            name: string;
+            shortName: string | null;
+            /**
+             * Format: url
+             * @example https://cherrypick.example.com
+             */
+            uri: string;
+            description: string | null;
+            langs: string[];
+            tosUrl: string | null;
+            /** @default https://github.com/kokonect-link/cherrypick */
+            repositoryUrl: string | null;
+            /** @default https://github.com/kokonect-link/cherrypick/issues/new */
+            feedbackUrl: string | null;
+            defaultDarkTheme: string | null;
+            defaultLightTheme: string | null;
+            disableRegistration: boolean;
+            cacheRemoteFiles: boolean;
+            cacheRemoteSensitiveFiles: boolean;
+            emailRequiredForSignup: boolean;
+            enableHcaptcha: boolean;
+            hcaptchaSiteKey: string | null;
+            enableMcaptcha: boolean;
+            mcaptchaSiteKey: string | null;
+            mcaptchaInstanceUrl: string | null;
+            enableRecaptcha: boolean;
+            recaptchaSiteKey: string | null;
+            enableTurnstile: boolean;
+            turnstileSiteKey: string | null;
+            swPublickey: string | null;
+            /** @default /assets/ai.png */
+            mascotImageUrl: string;
+            bannerUrl: string;
+            serverErrorImageUrl: string | null;
+            infoImageUrl: string | null;
+            notFoundImageUrl: string | null;
+            iconUrl: string | null;
+            maxNoteTextLength: number;
+            ads: {
+                /**
+                 * Format: id
+                 * @example xxxxxxxxxx
+                 */
+                id: string;
+                /** Format: url */
+                url: string;
+                place: string;
+                ratio: number;
+                /** Format: url */
+                imageUrl: string;
+                dayOfWeek: number;
+              }[];
+            /** @default 0 */
+            notesPerOneAd: number;
+            /** @example false */
+            requireSetup: boolean;
+            enableEmail: boolean;
+            enableServiceWorker: boolean;
+            translatorAvailable: boolean;
+            proxyAccountName: string | null;
+            mediaProxy: string;
+            features?: {
+              registration: boolean;
+              localTimeline: boolean;
+              globalTimeline: boolean;
+              hcaptcha: boolean;
+              recaptcha: boolean;
+              objectStorage: boolean;
+              serviceWorker: boolean;
+              /** @default true */
+              miauth?: boolean;
+            };
+            backgroundImageUrl: string | null;
+            impressumUrl: string | null;
+            logoImageUrl: string | null;
+            privacyPolicyUrl: string | null;
+            serverRules: string[];
+            themeColor: string | null;
+            policies: components['schemas']['RolePolicies'];
+          };
         };
       };
       /** @description Client error */
@@ -21664,6 +21604,10 @@ export type operations = {
             end?: number | null;
             metadata?: Record<string, never>;
           }) | null;
+          scheduledDelete?: ({
+            deleteAt?: number | null;
+            deleteAfter?: number | null;
+          }) | null;
         };
       };
     };
@@ -23464,50 +23408,6 @@ export type operations = {
       };
     };
   };
-  /**
-   * notifications/flush
-   * @description No description provided.
-   *
-   * **Credential required**: *Yes* / **Permission**: *write:notifications*
-   */
-  'notifications/flush': {
-    responses: {
-      /** @description OK (without any results) */
-      204: {
-        content: never;
-      };
-      /** @description Client error */
-      400: {
-        content: {
-          'application/json': components['schemas']['Error'];
-        };
-      };
-      /** @description Authentication error */
-      401: {
-        content: {
-          'application/json': components['schemas']['Error'];
-        };
-      };
-      /** @description Forbidden error */
-      403: {
-        content: {
-          'application/json': components['schemas']['Error'];
-        };
-      };
-      /** @description I'm Ai */
-      418: {
-        content: {
-          'application/json': components['schemas']['Error'];
-        };
-      };
-      /** @description Internal server error */
-      500: {
-        content: {
-          'application/json': components['schemas']['Error'];
-        };
-      };
-    };
-  };
   /**
    * notifications/mark-all-as-read
    * @description No description provided.
@@ -24082,11 +23982,6 @@ export type operations = {
           summary: string;
           script: string;
           permissions: string[];
-          /**
-           * @default public
-           * @enum {string}
-           */
-          visibility?: 'public' | 'private';
         };
       };
     };
@@ -24465,10 +24360,10 @@ export type operations = {
         'application/json': {
           /** Format: misskey:id */
           flashId: string;
-          title?: string;
-          summary?: string;
-          script?: string;
-          permissions?: string[];
+          title: string;
+          summary: string;
+          script: string;
+          permissions: string[];
           /** @enum {string} */
           visibility?: 'public' | 'private';
         };
diff --git a/packages/cherrypick-js/src/consts.ts b/packages/cherrypick-js/src/consts.ts
index b690621e98..0e446c1215 100644
--- a/packages/cherrypick-js/src/consts.ts
+++ b/packages/cherrypick-js/src/consts.ts
@@ -121,7 +121,6 @@ export const moderationLogTypes = [
 	'resetPassword',
 	'suspendRemoteInstance',
 	'unsuspendRemoteInstance',
-	'updateRemoteInstanceNote',
 	'markSensitiveDriveFile',
 	'unmarkSensitiveDriveFile',
 	'resolveAbuseReport',
@@ -262,12 +261,6 @@ export type ModerationLogPayloads = {
 		id: string;
 		host: string;
 	};
-	updateRemoteInstanceNote: {
-		id: string;
-		host: string;
-		before: string | null;
-		after: string | null;
-	};
 	markSensitiveDriveFile: {
 		fileId: string;
 		fileUserId: string | null;
diff --git a/packages/cherrypick-js/src/entities.ts b/packages/cherrypick-js/src/entities.ts
index 35503d6d6f..772d2bbfa1 100644
--- a/packages/cherrypick-js/src/entities.ts
+++ b/packages/cherrypick-js/src/entities.ts
@@ -95,9 +95,6 @@ export type ModerationLog = {
 } | {
 	type: 'unsuspendRemoteInstance';
 	info: ModerationLogPayloads['unsuspendRemoteInstance'];
-} | {
-	type: 'updateRemoteInstanceNote';
-	info: ModerationLogPayloads['updateRemoteInstanceNote'];
 } | {
 	type: 'markSensitiveDriveFile';
 	info: ModerationLogPayloads['markSensitiveDriveFile'];
diff --git a/packages/cherrypick-js/src/streaming.types.ts b/packages/cherrypick-js/src/streaming.types.ts
index 6b997cad44..a1e4108b28 100644
--- a/packages/cherrypick-js/src/streaming.types.ts
+++ b/packages/cherrypick-js/src/streaming.types.ts
@@ -42,7 +42,6 @@ export type Channels = {
 			unreadNotification: (payload: Notification) => void;
 			unreadMention: (payload: Note['id']) => void;
 			readAllUnreadMentions: () => void;
-			notificationFlushed: () => void;
 			unreadSpecifiedNote: (payload: Note['id']) => void;
 			readAllUnreadSpecifiedNotes: () => void;
 			readAllMessagingMessages: () => void;
diff --git a/packages/frontend/.storybook/generate.tsx b/packages/frontend/.storybook/generate.tsx
index 3763b3c933..ab8aa0537b 100644
--- a/packages/frontend/.storybook/generate.tsx
+++ b/packages/frontend/.storybook/generate.tsx
@@ -401,8 +401,7 @@ function toStories(component: string): Promise<string> {
 // glob('src/{components,pages,ui,widgets}/**/*.vue')
 (async () => {
 	const globs = await Promise.all([
-		glob('src/components/global/Mk*.vue'),
-		glob('src/components/global/RouterView.vue'),
+		glob('src/components/global/*.vue'),
 		glob('src/components/Mk{A,B}*.vue'),
 		glob('src/components/MkDigitalClock.vue'),
 		glob('src/components/MkEvent.vue'),
@@ -412,7 +411,6 @@ function toStories(component: string): Promise<string> {
 		glob('src/components/MkUserSetupDialog.*.vue'),
 		glob('src/components/MkInviteCode.vue'),
 		glob('src/pages/user/home.vue'),
-		glob('src/components/global/CP*.vue'),
 	]);
 	const components = globs.flat();
 	await Promise.all(components.map(async (component) => {
diff --git a/packages/frontend/.storybook/preview-head.html b/packages/frontend/.storybook/preview-head.html
index 4548dcedfe..537ccf971a 100644
--- a/packages/frontend/.storybook/preview-head.html
+++ b/packages/frontend/.storybook/preview-head.html
@@ -1,8 +1,3 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
 <link rel="preload" href="https://github.com/kokonect-link/cherrypick/blob/master/packages/frontend/assets/about-icon.png?raw=true" as="image" type="image/png" crossorigin="anonymous">
 <link rel="preload" href="https://github.com/kokonect-link/cherrypick/blob/master/packages/frontend/assets/fedi.jpg?raw=true" as="image" type="image/jpeg" crossorigin="anonymous">
 <link rel="stylesheet" href="https://unpkg.com/@tabler/icons-webfont@2.44.0/tabler-icons.min.css">
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 3af7d25069..53fa567979 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -28,22 +28,22 @@
 		"@syuilo/aiscript": "0.17.0",
 		"@tabler/icons-webfont": "2.44.0",
 		"@twemoji/parser": "15.0.0",
-		"@vitejs/plugin-vue": "5.0.4",
-		"@vue/compiler-sfc": "3.4.21",
+		"@vitejs/plugin-vue": "5.0.3",
+		"@vue/compiler-sfc": "3.4.18",
 		"aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.1.2",
 		"astring": "1.8.6",
 		"autosize": "6.0.1",
 		"broadcast-channel": "7.0.0",
 		"buraha": "0.0.1",
-		"canvas-confetti": "1.9.2",
-		"chart.js": "4.4.2",
+		"canvas-confetti": "1.6.1",
+		"chart.js": "4.4.1",
 		"chartjs-adapter-date-fns": "3.0.0",
 		"chartjs-chart-matrix": "2.0.1",
 		"chartjs-plugin-gradient": "0.6.1",
 		"chartjs-plugin-zoom": "2.0.1",
 		"cherrypick-js": "workspace:*",
 		"cherrypick-mfm-js": "0.24.0-cherrypick.4",
-		"chromatic": "11.0.0",
+		"chromatic": "10.6.1",
 		"compare-versions": "6.1.0",
 		"cropperjs": "2.0.0-beta.4",
 		"date-fns": "2.30.0",
@@ -62,14 +62,14 @@
 		"pretendard-jp": "^1.3.8",
 		"prismjs": "1.29.0",
 		"punycode": "2.3.1",
-		"rollup": "4.12.0",
-		"sanitize-html": "2.12.1",
-		"sass": "1.71.1",
-		"shiki": "1.2.0",
+		"rollup": "4.9.6",
+		"sanitize-html": "2.11.0",
+		"sass": "1.70.0",
+		"shiki": "1.0.0-beta.3",
 		"strict-event-emitter-types": "2.0.0",
 		"temml": "0.10.20",
 		"textarea-caret": "3.1.0",
-		"three": "0.162.0",
+		"three": "0.160.1",
 		"throttle-debounce": "5.0.0",
 		"tinycolor2": "1.6.0",
 		"tinyld": "^1.3.4",
@@ -77,70 +77,70 @@
 		"tsconfig-paths": "4.2.0",
 		"typescript": "5.3.3",
 		"uuid": "9.0.1",
-		"v-code-diff": "1.9.0",
-		"vite": "5.1.4",
-		"vue": "3.4.21",
+		"v-code-diff": "1.7.2",
+		"vite": "5.1.0",
+		"vue": "3.4.18",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vuedraggable": "next"
 	},
 	"devDependencies": {
 		"@misskey-dev/eslint-plugin": "1.0.0",
 		"@misskey-dev/summaly": "5.0.3",
-		"@storybook/addon-actions": "8.0.0-beta.6",
-		"@storybook/addon-essentials": "8.0.0-beta.6",
-		"@storybook/addon-interactions": "8.0.0-beta.6",
-		"@storybook/addon-links": "8.0.0-beta.6",
-		"@storybook/addon-mdx-gfm": "8.0.0-beta.6",
-		"@storybook/addon-storysource": "8.0.0-beta.6",
-		"@storybook/blocks": "8.0.0-beta.6",
-		"@storybook/components": "8.0.0-beta.6",
-		"@storybook/core-events": "8.0.0-beta.6",
-		"@storybook/manager-api": "8.0.0-beta.6",
-		"@storybook/preview-api": "8.0.0-beta.6",
-		"@storybook/react": "8.0.0-beta.6",
-		"@storybook/react-vite": "8.0.0-beta.6",
-		"@storybook/test": "8.0.0-beta.6",
-		"@storybook/theming": "8.0.0-beta.6",
-		"@storybook/types": "8.0.0-beta.6",
-		"@storybook/vue3": "8.0.0-beta.6",
-		"@storybook/vue3-vite": "8.0.0-beta.6",
+		"@storybook/addon-actions": "8.0.0-beta.2",
+		"@storybook/addon-essentials": "8.0.0-beta.2",
+		"@storybook/addon-interactions": "8.0.0-beta.2",
+		"@storybook/addon-links": "8.0.0-beta.2",
+		"@storybook/addon-mdx-gfm": "8.0.0-beta.2",
+		"@storybook/addon-storysource": "8.0.0-beta.2",
+		"@storybook/blocks": "8.0.0-beta.2",
+		"@storybook/components": "8.0.0-beta.2",
+		"@storybook/core-events": "8.0.0-beta.2",
+		"@storybook/manager-api": "8.0.0-beta.2",
+		"@storybook/preview-api": "8.0.0-beta.2",
+		"@storybook/react": "8.0.0-beta.2",
+		"@storybook/react-vite": "8.0.0-beta.2",
+		"@storybook/test": "8.0.0-beta.2",
+		"@storybook/theming": "8.0.0-beta.2",
+		"@storybook/types": "8.0.0-beta.2",
+		"@storybook/vue3": "8.0.0-beta.2",
+		"@storybook/vue3-vite": "8.0.0-beta.2",
 		"@testing-library/vue": "8.0.2",
 		"@types/autosize": "^4.0.1",
 		"@types/escape-regexp": "0.0.3",
 		"@types/estree": "1.0.5",
 		"@types/matter-js": "0.19.6",
 		"@types/micromatch": "4.0.6",
-		"@types/node": "20.11.22",
+		"@types/node": "20.11.17",
 		"@types/prismjs": "^1.26.0",
-		"@types/punycode": "2.1.4",
-		"@types/sanitize-html": "2.11.0",
+		"@types/punycode": "2.1.3",
+		"@types/sanitize-html": "2.9.5",
 		"@types/throttle-debounce": "5.0.2",
 		"@types/tinycolor2": "1.4.6",
 		"@types/uuid": "9.0.8",
 		"@types/ws": "8.5.10",
-		"@typescript-eslint/eslint-plugin": "7.1.0",
-		"@typescript-eslint/parser": "7.1.0",
+		"@typescript-eslint/eslint-plugin": "6.18.1",
+		"@typescript-eslint/parser": "6.18.1",
 		"@vitest/coverage-v8": "0.34.6",
-		"@vue/runtime-core": "3.4.21",
+		"@vue/runtime-core": "3.4.18",
 		"acorn": "8.11.3",
 		"cross-env": "7.0.3",
-		"cypress": "13.6.6",
-		"eslint": "8.57.0",
+		"cypress": "13.6.4",
+		"eslint": "8.56.0",
 		"eslint-plugin-import": "2.29.1",
 		"eslint-plugin-storybook": "^0.6.13",
-		"eslint-plugin-vue": "9.22.0",
+		"eslint-plugin-vue": "9.20.1",
 		"fast-glob": "3.3.2",
-		"happy-dom": "13.6.2",
+		"happy-dom": "10.0.3",
 		"intersection-observer": "0.12.2",
 		"micromatch": "4.0.5",
 		"msw": "2.1.7",
 		"msw-storybook-addon": "2.0.0-beta.1",
-		"nodemon": "3.1.0",
+		"nodemon": "3.0.3",
 		"prettier": "3.2.5",
 		"react": "18.2.0",
 		"react-dom": "18.2.0",
 		"start-server-and-test": "2.0.3",
-		"storybook": "8.0.0-beta.6",
+		"storybook": "8.0.0-beta.2",
 		"storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme",
 		"vite-plugin-turbosnap": "1.0.3",
 		"vitest": "0.34.6",
diff --git a/packages/frontend/src/account.ts b/packages/frontend/src/account.ts
index 173170b22f..a4b2526fda 100644
--- a/packages/frontend/src/account.ts
+++ b/packages/frontend/src/account.ts
@@ -329,7 +329,7 @@ export async function openAccountMenu(opts: {
 			text: i18n.ts.profile,
 			to: `/@${ $i.username }`,
 			avatar: $i,
-		}, { type: 'divider' as const }, ...(opts.includeCurrentAccount ? [createItem($i)] : []), ...accountItemPromises, {
+		}, { type: 'divider' }, ...(opts.includeCurrentAccount ? [createItem($i)] : []), ...accountItemPromises, {
 			type: 'parent' as const,
 			icon: 'ti ti-plus',
 			text: i18n.ts.addAccount,
diff --git a/packages/frontend/src/boot/common.ts b/packages/frontend/src/boot/common.ts
index fe06585349..e7340193c3 100644
--- a/packages/frontend/src/boot/common.ts
+++ b/packages/frontend/src/boot/common.ts
@@ -156,11 +156,8 @@ export async function common(createVue: () => App<Element>) {
 	// NOTE: この処理は必ずクライアント更新チェック処理より後に来ること(テーマ再構築のため)
 	watch(defaultStore.reactiveState.darkMode, (darkMode) => {
 		applyTheme(darkMode ? ColdDeviceStorage.get('darkTheme') : ColdDeviceStorage.get('lightTheme'));
-		document.documentElement.dataset.colorMode = darkMode ? 'dark' : 'light';
 	}, { immediate: miLocalStorage.getItem('theme') == null });
 
-	document.documentElement.dataset.colorMode = defaultStore.state.darkMode ? 'dark' : 'light';
-
 	const darkTheme = computed(ColdDeviceStorage.makeGetterSetter('darkTheme'));
 	const lightTheme = computed(ColdDeviceStorage.makeGetterSetter('lightTheme'));
 
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index 1e7ffe9a45..db10501b42 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -11,7 +11,7 @@ import { alert, confirm, popup, post, welcomeToast } from '@/os.js';
 import { useStream } from '@/stream.js';
 import * as sound from '@/scripts/sound.js';
 import { $i, signout, updateAccount } from '@/account.js';
-import { instance } from '@/instance.js';
+import { fetchInstance, instance } from '@/instance.js';
 import { ColdDeviceStorage, defaultStore } from '@/store.js';
 import { makeHotkey } from '@/scripts/hotkey.js';
 import { reactionPicker } from '@/scripts/reaction-picker.js';
@@ -82,31 +82,27 @@ export async function mainBoot() {
 			mainRouter.push('/search');
 		},
 	};
-	try {
-		if (defaultStore.state.enableSeasonalScreenEffect) {
-			const month = new Date().getMonth() + 1;
-			if (defaultStore.state.hemisphere === 'S') {
-				// ▼南半球
-				if (month === 7 || month === 8) {
-					const SnowfallEffect = (await import('@/scripts/snowfall-effect.js')).SnowfallEffect;
-					new SnowfallEffect({}).render();
-				}
-			} else {
-				// ▼北半球
-				if (month === 12 || month === 1) {
-					const SnowfallEffect = (await import('@/scripts/snowfall-effect.js')).SnowfallEffect;
-					new SnowfallEffect({}).render();
-				} else if (month === 3 || month === 4) {
-					const SakuraEffect = (await import('@/scripts/snowfall-effect.js')).SnowfallEffect;
-					new SakuraEffect({
-						sakura: true,
-					}).render();
-				}
+
+	if (defaultStore.state.enableSeasonalScreenEffect) {
+		const month = new Date().getMonth() + 1;
+		if (defaultStore.state.hemisphere === 'S') {
+			// ▼南半球
+			if (month === 7 || month === 8) {
+				const SnowfallEffect = (await import('@/scripts/snowfall-effect.js')).SnowfallEffect;
+				new SnowfallEffect({}).render();
+			}
+		} else {
+			// ▼北半球
+			if (month === 12 || month === 1) {
+				const SnowfallEffect = (await import('@/scripts/snowfall-effect.js')).SnowfallEffect;
+				new SnowfallEffect({}).render();
+			} else if (month === 3 || month === 4) {
+				const SakuraEffect = (await import('@/scripts/snowfall-effect.js')).SnowfallEffect;
+				new SakuraEffect({
+					sakura: true,
+				}).render();
 			}
-		}	
-	} catch (error) {
-		// console.error(error);
-		console.error('Failed to initialise the seasonal screen effect canvas context:', error);
+		}
 	}
 
 	if ($i) {
@@ -198,26 +194,14 @@ export async function mainBoot() {
 		if ($i.followersCount >= 500) claimAchievement('followers500');
 		if ($i.followersCount >= 1000) claimAchievement('followers1000');
 
-		const createdAt = new Date($i.createdAt);
-		const createdAtThreeYearsLater = new Date($i.createdAt);
-		createdAtThreeYearsLater.setFullYear(createdAtThreeYearsLater.getFullYear() + 3);
-		if (now >= createdAtThreeYearsLater) {
-			claimAchievement('passedSinceAccountCreated3');
-			claimAchievement('passedSinceAccountCreated2');
+		if (Date.now() - new Date($i.createdAt).getTime() > 1000 * 60 * 60 * 24 * 365) {
 			claimAchievement('passedSinceAccountCreated1');
-		} else {
-			const createdAtTwoYearsLater = new Date($i.createdAt);
-			createdAtTwoYearsLater.setFullYear(createdAtTwoYearsLater.getFullYear() + 2);
-			if (now >= createdAtTwoYearsLater) {
-				claimAchievement('passedSinceAccountCreated2');
-				claimAchievement('passedSinceAccountCreated1');
-			} else {
-				const createdAtOneYearLater = new Date($i.createdAt);
-				createdAtOneYearLater.setFullYear(createdAtOneYearLater.getFullYear() + 1);
-				if (now >= createdAtOneYearLater) {
-					claimAchievement('passedSinceAccountCreated1');
-				}
-			}
+		}
+		if (Date.now() - new Date($i.createdAt).getTime() > 1000 * 60 * 60 * 24 * 365 * 2) {
+			claimAchievement('passedSinceAccountCreated2');
+		}
+		if (Date.now() - new Date($i.createdAt).getTime() > 1000 * 60 * 60 * 24 * 365 * 3) {
+			claimAchievement('passedSinceAccountCreated3');
 		}
 
 		if (claimedAchievements.length >= 30) {
@@ -252,16 +236,18 @@ export async function mainBoot() {
 
 		const latestDonationInfoShownAt = miLocalStorage.getItem('latestDonationInfoShownAt');
 		const neverShowDonationInfo = miLocalStorage.getItem('neverShowDonationInfo');
-		if (neverShowDonationInfo !== 'true' && (createdAt.getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 3))) && !location.pathname.startsWith('/miauth')) {
+		if (neverShowDonationInfo !== 'true' && (new Date($i.createdAt).getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 3))) && !location.pathname.startsWith('/miauth')) {
 			if (latestDonationInfoShownAt == null || (new Date(latestDonationInfoShownAt).getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 30)))) {
 				popup(defineAsyncComponent(() => import('@/components/MkDonation.vue')), {}, {}, 'closed');
 			}
 		}
 
-		const modifiedVersionMustProminentlyOfferInAgplV3Section13Read = miLocalStorage.getItem('modifiedVersionMustProminentlyOfferInAgplV3Section13Read');
-		if (modifiedVersionMustProminentlyOfferInAgplV3Section13Read !== 'true' && instance.repositoryUrl !== 'https://github.com/kokonect-link/cherrypick') {
-			popup(defineAsyncComponent(() => import('@/components/MkSourceCodeAvailablePopup.vue')), {}, {}, 'closed');
-		}
+		fetchInstance().then(() => {
+			const modifiedVersionMustProminentlyOfferInAgplV3Section13Read = miLocalStorage.getItem('modifiedVersionMustProminentlyOfferInAgplV3Section13Read');
+			if (modifiedVersionMustProminentlyOfferInAgplV3Section13Read !== 'true' && instance.repositoryUrl !== 'https://github.com/kokonect-link/cherrypick') {
+				popup(defineAsyncComponent(() => import('@/components/MkSourceCodeAvailablePopup.vue')), {}, {}, 'closed');
+			}
+		});
 
 		if ('Notification' in window) {
 			// 許可を得ていなかったらリクエスト
diff --git a/packages/frontend/src/components/MkAutocomplete.vue b/packages/frontend/src/components/MkAutocomplete.vue
index d3f1595f6c..b4f8f447b1 100644
--- a/packages/frontend/src/components/MkAutocomplete.vue
+++ b/packages/frontend/src/components/MkAutocomplete.vue
@@ -22,7 +22,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</ol>
 	<ol v-else-if="emojis.length > 0" ref="suggests" :class="$style.list">
 		<li v-for="emoji in emojis" :key="emoji.emoji" :class="$style.item" tabindex="-1" @click="complete(type, emoji.emoji)" @keydown="onKeydown">
-			<MkCustomEmoji v-if="'isCustomEmoji' in emoji && emoji.isCustomEmoji" :name="emoji.emoji" :class="$style.emoji" :fallbackToImage="true"/>
+			<MkCustomEmoji v-if="'isCustomEmoji' in emoji && emoji.isCustomEmoji" :name="emoji.emoji" :class="$style.emoji"/>
 			<MkEmoji v-else :emoji="emoji.emoji" :class="$style.emoji"/>
 			<!-- eslint-disable-next-line vue/no-v-html -->
 			<span v-if="q" :class="$style.emojiName" v-html="sanitizeHtml(emoji.name.replace(q, `<b>${q}</b>`))"></span>
@@ -62,7 +62,18 @@ import { i18n } from '@/i18n.js';
 import { miLocalStorage } from '@/local-storage.js';
 import { customEmojis } from '@/custom-emojis.js';
 import { MFM_TAGS, MFM_PARAMS, HTML_TAGS } from '@/const.js';
-import { searchEmoji, EmojiDef } from '@/scripts/search-emoji.js';
+
+type EmojiDef = {
+	emoji: string;
+	name: string;
+	url: string;
+	aliasOf?: string;
+} | {
+	emoji: string;
+	name: string;
+	aliasOf?: string;
+	isCustomEmoji?: true;
+};
 
 const lib = emojilist.filter(x => x.category !== 'flags');
 
@@ -82,7 +93,7 @@ const emojiDb = computed(() => {
 				unicodeEmojiDB.push({
 					emoji: emoji,
 					name: k,
-					aliasOf: getEmojiName(emoji),
+					aliasOf: getEmojiName(emoji)!,
 					url: char2path(emoji),
 				});
 			}
@@ -245,7 +256,7 @@ function exec() {
 			return;
 		}
 
-		emojis.value = searchEmoji(props.q, emojiDb.value);
+		emojis.value = emojiAutoComplete(props.q, emojiDb.value);
 	} else if (props.type === 'mfmTag') {
 		if (!props.q || props.q === '') {
 			mfmTags.value = MFM_TAGS;
@@ -270,6 +281,87 @@ function exec() {
 	}
 }
 
+type EmojiScore = { emoji: EmojiDef, score: number };
+
+function emojiAutoComplete(query: string | null, emojiDb: EmojiDef[], max = 30): EmojiDef[] {
+	if (!query) {
+		return [];
+	}
+
+	const matched = new Map<string, EmojiScore>();
+	// 完全一致（エイリアス込み）
+	emojiDb.some(x => {
+		if (x.name === query && !matched.has(x.aliasOf ?? x.name)) {
+			matched.set(x.aliasOf ?? x.name, { emoji: x, score: query.length + 2 });
+		}
+		return matched.size === max;
+	});
+
+	// 前方一致（エイリアスなし）
+	if (matched.size < max) {
+		emojiDb.some(x => {
+			if (x.name.startsWith(query) && !x.aliasOf) {
+				matched.set(x.name, { emoji: x, score: query.length + 1 });
+			}
+			return matched.size === max;
+		});
+	}
+
+	// 前方一致（エイリアス込み）
+	if (matched.size < max) {
+		emojiDb.some(x => {
+			if (x.name.startsWith(query) && !matched.has(x.aliasOf ?? x.name)) {
+				matched.set(x.aliasOf ?? x.name, { emoji: x, score: query.length });
+			}
+			return matched.size === max;
+		});
+	}
+
+	// 部分一致（エイリアス込み）
+	if (matched.size < max) {
+		emojiDb.some(x => {
+			if (x.name.includes(query) && !matched.has(x.aliasOf ?? x.name)) {
+				matched.set(x.aliasOf ?? x.name, { emoji: x, score: query.length - 1 });
+			}
+			return matched.size === max;
+		});
+	}
+
+	// 簡易あいまい検索（3文字以上）
+	if (matched.size < max && query.length > 3) {
+		const queryChars = [...query];
+		const hitEmojis = new Map<string, EmojiScore>();
+
+		for (const x of emojiDb) {
+			// 文字列の位置を進めながら、クエリの文字を順番に探す
+
+			let pos = 0;
+			let hit = 0;
+			for (const c of queryChars) {
+				pos = x.name.indexOf(c, pos);
+				if (pos <= -1) break;
+				hit++;
+			}
+
+			// 半分以上の文字が含まれていればヒットとする
+			if (hit > Math.ceil(queryChars.length / 2) && hit - 2 > (matched.get(x.aliasOf ?? x.name)?.score ?? 0)) {
+				hitEmojis.set(x.aliasOf ?? x.name, { emoji: x, score: hit - 2 });
+			}
+		}
+
+		// ヒットしたものを全部追加すると雑多になるので、先頭の6件程度だけにしておく（6件＝オートコンプリートのポップアップのサイズ分）
+		[...hitEmojis.values()]
+			.sort((x, y) => y.score - x.score)
+			.slice(0, 6)
+			.forEach(it => matched.set(it.emoji.name, it));
+	}
+
+	return [...matched.values()]
+		.sort((x, y) => y.score - x.score)
+		.slice(0, max)
+		.map(it => it.emoji);
+}
+
 function onMousedown(event: Event) {
 	if (!contains(rootEl.value, event.target) && (rootEl.value !== event.target)) props.close();
 }
diff --git a/packages/frontend/src/components/MkCode.core.vue b/packages/frontend/src/components/MkCode.core.vue
index 171df8c8d1..2a4587507a 100644
--- a/packages/frontend/src/components/MkCode.core.vue
+++ b/packages/frontend/src/components/MkCode.core.vue
@@ -9,9 +9,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, ref, watch } from 'vue';
-import { bundledLanguagesInfo } from 'shiki/langs';
-import type { BundledLanguage } from 'shiki/langs';
+import { ref, computed, watch } from 'vue';
+import { bundledLanguagesInfo } from 'shiki';
+import type { BuiltinLanguage } from 'shiki';
 import { getHighlighter, getTheme } from '@/scripts/code-highlighter.js';
 import { defaultStore } from '@/store.js';
 
@@ -23,7 +23,7 @@ const props = defineProps<{
 
 const highlighter = await getHighlighter();
 const darkMode = defaultStore.reactiveState.darkMode;
-const codeLang = ref<BundledLanguage | 'aiscript'>('js');
+const codeLang = ref<BuiltinLanguage | 'aiscript'>('js');
 
 const [lightThemeName, darkThemeName] = await Promise.all([
 	getTheme('light', true),
@@ -42,7 +42,7 @@ const html = computed(() => highlighter.codeToHtml(props.code, {
 }));
 
 async function fetchLanguage(to: string): Promise<void> {
-	const language = to as BundledLanguage;
+	const language = to as BuiltinLanguage;
 
 	// Check for the loaded languages, and load the language if it's not loaded yet.
 	if (!highlighter.getLoadedLanguages().includes(language)) {
@@ -52,7 +52,7 @@ async function fetchLanguage(to: string): Promise<void> {
 			return bundle.id === language || bundle.aliases?.includes(language);
 		});
 		if (bundles.length > 0) {
-			if (_DEV_) console.log(`Loading language: ${language}`);
+			console.log(`Loading language: ${language}`);
 			await highlighter.loadLanguage(bundles[0].import);
 			codeLang.value = language;
 		} else {
diff --git a/packages/frontend/src/components/MkDialog.vue b/packages/frontend/src/components/MkDialog.vue
index 747cb1111e..f5a5ae4b16 100644
--- a/packages/frontend/src/components/MkDialog.vue
+++ b/packages/frontend/src/components/MkDialog.vue
@@ -39,6 +39,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<template v-if="select.items">
 				<option v-for="item in select.items" :value="item.value">{{ item.text }}</option>
 			</template>
+			<template v-else>
+				<optgroup v-for="groupedItem in select.groupedItems" :label="groupedItem.label">
+					<option v-for="item in groupedItem.items" :value="item.value">{{ item.text }}</option>
+				</optgroup>
+			</template>
 		</MkSelect>
 		<div v-if="(showOkButton || showCancelButton) && !actions" :class="$style.buttons">
 			<MkButton v-if="showOkButton" data-cy-modal-dialog-ok inline primary rounded :autofocus="!input && !select" :disabled="okButtonDisabledReason" @click="ok">{{ okText ?? ((showCancelButton || input || select) ? i18n.ts.ok : i18n.ts.gotIt) }}</MkButton>
@@ -60,7 +65,7 @@ import MkSelect from '@/components/MkSelect.vue';
 import { i18n } from '@/i18n.js';
 
 type Input = {
-	type?: 'text' | 'number' | 'password' | 'email' | 'url' | 'date' | 'time' | 'search' | 'datetime-local';
+	type: 'text' | 'number' | 'password' | 'email' | 'url' | 'date' | 'time' | 'search' | 'datetime-local';
 	placeholder?: string | null;
 	autocomplete?: string;
 	default: string | number | null;
@@ -70,17 +75,22 @@ type Input = {
 
 type Select = {
 	items: {
-		value: any;
+		value: string;
 		text: string;
 	}[];
+	groupedItems: {
+		label: string;
+		items: {
+			value: string;
+			text: string;
+		}[];
+	}[];
 	default: string | null;
 };
 
-type Result = string | number | true | null;
-
 const props = withDefaults(defineProps<{
 	type?: 'success' | 'error' | 'warning' | 'info' | 'question' | 'waiting';
-	title?: string;
+	title: string;
 	text?: string;
 	caption?: string;
 	input?: Input;
@@ -105,7 +115,7 @@ const props = withDefaults(defineProps<{
 });
 
 const emit = defineEmits<{
-	(ev: 'done', v: { canceled: true } | { canceled: false, result: Result }): void;
+	(ev: 'done', v: { canceled: boolean; result: any }): void;
 	(ev: 'closed'): void;
 }>();
 
@@ -131,11 +141,8 @@ const okButtonDisabledReason = computed<null | 'charactersExceeded' | 'character
 	return null;
 });
 
-// overload function を使いたいので lint エラーを無視する
-function done(canceled: true): void;
-function done(canceled: false, result: Result): void; // eslint-disable-line no-redeclare
-function done(canceled: boolean, result?: Result): void { // eslint-disable-line no-redeclare
-	emit('done', { canceled, result } as { canceled: true } | { canceled: false, result: Result });
+function done(canceled: boolean, result?) {
+	emit('done', { canceled, result });
 	modal.value?.close();
 }
 
diff --git a/packages/frontend/src/components/MkDriveSelectDialog.vue b/packages/frontend/src/components/MkDriveSelectDialog.vue
index be384c2c31..8583a71c4a 100644
--- a/packages/frontend/src/components/MkDriveSelectDialog.vue
+++ b/packages/frontend/src/components/MkDriveSelectDialog.vue
@@ -39,13 +39,13 @@ withDefaults(defineProps<{
 });
 
 const emit = defineEmits<{
-	(ev: 'done', r?: Misskey.entities.DriveFile[] | Misskey.entities.DriveFolder[]): void;
+	(ev: 'done', r?: Misskey.entities.DriveFile[]): void;
 	(ev: 'closed'): void;
 }>();
 
 const dialog = shallowRef<InstanceType<typeof MkModalWindow>>();
 
-const selected = ref<Misskey.entities.DriveFile[] | Misskey.entities.DriveFolder[]>([]);
+const selected = ref<Misskey.entities.DriveFile[]>([]);
 
 function ok() {
 	emit('done', selected.value);
@@ -57,7 +57,7 @@ function cancel() {
 	dialog.value?.close();
 }
 
-function onChangeSelection(v: Misskey.entities.DriveFile[] | Misskey.entities.DriveFolder[]) {
-	selected.value = v;
+function onChangeSelection(files: Misskey.entities.DriveFile[]) {
+	selected.value = files;
 }
 </script>
diff --git a/packages/frontend/src/components/MkEmojiPicker.section.vue b/packages/frontend/src/components/MkEmojiPicker.section.vue
index 26a1c78ea2..e5cb7bba3e 100644
--- a/packages/frontend/src/components/MkEmojiPicker.section.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.section.vue
@@ -16,11 +16,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 			:key="emoji"
 			:data-emoji="emoji"
 			class="_button item"
-			:disabled="disabledEmojis?.value.includes(emoji)"
 			@pointerenter="computeButtonTitle"
 			@click="emit('chosen', emoji, $event)"
 		>
-			<MkCustomEmoji v-if="emoji[0] === ':'" class="emoji" :name="emoji" :normal="true" :fallbackToImage="true"/>
+			<MkCustomEmoji v-if="emoji[0] === ':'" class="emoji" :name="emoji" :normal="true"/>
 			<MkEmoji v-else class="emoji" :emoji="emoji" :normal="true"/>
 		</button>
 	</div>
@@ -49,7 +48,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			:key="emoji"
 			:data-emoji="emoji"
 			class="_button item"
-			:disabled="disabledEmojis?.value.includes(emoji)"
 			@pointerenter="computeButtonTitle"
 			@click="emit('chosen', emoji, $event)"
 		>
@@ -69,7 +67,6 @@ import MkEmojiPickerSection from '@/components/MkEmojiPicker.section.vue';
 
 const props = defineProps<{
 	emojis: string[] | Ref<string[]>;
-	disabledEmojis?: Ref<string[]>;
 	initialShown?: boolean;
 	hasChildSection?: boolean;
 	customEmojiTree?: CustomEmojiFolderTree[];
@@ -87,7 +84,7 @@ const shown = ref(!!props.initialShown);
 function computeButtonTitle(ev: MouseEvent): void {
 	const elm = ev.target as HTMLElement;
 	const emoji = elm.dataset.emoji as string;
-	elm.title = getEmojiName(emoji);
+	elm.title = getEmojiName(emoji) ?? emoji;
 }
 
 function nestedChosen(emoji: any, ev: MouseEvent) {
diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue
index 601dd9fe02..33d6ffd606 100644
--- a/packages/frontend/src/components/MkEmojiPicker.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -15,12 +15,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 					:key="emoji.name"
 					v-vibrate="defaultStore.state.vibrateSystem ? 50 : []"
 					class="_button item"
-					:disabled="!canReact(emoji)"
 					:title="emoji.name"
 					tabindex="0"
 					@click="chosen(emoji, $event)"
 				>
-					<MkCustomEmoji class="emoji" :name="emoji.name" :fallbackToImage="true"/>
+					<MkCustomEmoji class="emoji" :name="emoji.name"/>
 				</button>
 			</div>
 			<div v-if="searchResultUnicode.length > 0" class="body">
@@ -41,17 +40,16 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<section v-if="showPinned && (pinned && pinned.length > 0)">
 				<div class="body">
 					<button
-						v-for="emoji in pinnedEmojisDef"
-						:key="getKey(emoji)"
-						:data-emoji="getKey(emoji)"
+						v-for="emoji in pinned"
+						:key="emoji"
+						:data-emoji="emoji"
 						class="_button item"
-						:disabled="!canReact(emoji)"
 						tabindex="0"
 						@pointerenter="computeButtonTitle"
 						@click="chosen(emoji, $event)"
 					>
-						<MkCustomEmoji v-if="!emoji.hasOwnProperty('char')" class="emoji" :name="getKey(emoji)" :normal="true"/>
-						<MkEmoji v-else class="emoji" :emoji="getKey(emoji)" :normal="true"/>
+						<MkCustomEmoji v-if="emoji[0] === ':'" class="emoji" :name="emoji" :normal="true"/>
+						<MkEmoji v-else class="emoji" :emoji="emoji" :normal="true"/>
 					</button>
 				</div>
 			</section>
@@ -60,16 +58,15 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<header class="_acrylic"><i class="ti ti-clock ti-fw"></i> {{ i18n.ts.recentUsed }}</header>
 				<div class="body">
 					<button
-						v-for="emoji in recentlyUsedEmojisDef"
-						:key="getKey(emoji)"
+						v-for="emoji in recentlyUsedEmojis"
+						:key="emoji"
 						class="_button item"
-						:disabled="!canReact(emoji)"
-						:data-emoji="getKey(emoji)"
+						:data-emoji="emoji"
 						@pointerenter="computeButtonTitle"
 						@click="chosen(emoji, $event)"
 					>
-						<MkCustomEmoji v-if="!emoji.hasOwnProperty('char')" class="emoji" :name="getKey(emoji)" :normal="true"/>
-						<MkEmoji v-else class="emoji" :emoji="getKey(emoji)" :normal="true"/>
+						<MkCustomEmoji v-if="emoji[0] === ':'" class="emoji" :name="emoji" :normal="true"/>
+						<MkEmoji v-else class="emoji" :emoji="emoji" :normal="true"/>
 					</button>
 				</div>
 			</section>
@@ -80,8 +77,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				v-for="child in customEmojiFolderRoot.children"
 				:key="`custom:${child.value}`"
 				:initialShown="false"
-				:emojis="computed(() => customEmojis.filter(e => filterCategory(e, child.value)).map(e => `:${e.name}:`))"
-				:disabledEmojis="computed(() => customEmojis.filter(e => filterCategory(e, child.value)).filter(e => !canReact(e)).map(e => `:${e.name}:`))"
+				:emojis="computed(() => customEmojis.filter(e => child.value === '' ? (e.category === 'null' || !e.category) : e.category === child.value).filter(filterAvailable).map(e => `:${e.name}:`))"
 				:hasChildSection="child.children.length !== 0"
 				:customEmojiTree="child.children"
 				@chosen="chosen"
@@ -114,7 +110,6 @@ import {
 	unicodeEmojiCategories as categories,
 	getEmojiName,
 	CustomEmojiFolderTree,
-	getUnicodeEmoji,
 } from '@/scripts/emojilist.js';
 import MkRippleEffect from '@/components/MkRippleEffect.vue';
 import * as os from '@/os.js';
@@ -152,13 +147,6 @@ const {
 	recentlyUsedEmojis,
 } = defaultStore.reactiveState;
 
-const recentlyUsedEmojisDef = computed(() => {
-	return recentlyUsedEmojis.value.map(getDef);
-});
-const pinnedEmojisDef = computed(() => {
-	return pinned.value?.map(getDef);
-});
-
 const pinned = computed(() => props.pinnedEmojis);
 const size = computed(() => emojiPickerScale.value);
 const width = computed(() => emojiPickerWidth.value);
@@ -350,18 +338,14 @@ watch(q, () => {
 		return matches;
 	};
 
-	searchResultCustom.value = Array.from(searchCustom());
+	searchResultCustom.value = Array.from(searchCustom()).filter(filterAvailable);
 	searchResultUnicode.value = Array.from(searchUnicode());
 });
 
-function canReact(emoji: Misskey.entities.EmojiSimple | UnicodeEmojiDef | string): boolean {
+function filterAvailable(emoji: Misskey.entities.EmojiSimple): boolean {
 	return !props.targetNote || checkReactionPermissions($i!, props.targetNote, emoji);
 }
 
-function filterCategory(emoji: Misskey.entities.EmojiSimple, category: string): boolean {
-	return category === '' ? (emoji.category === 'null' || !emoji.category) : emoji.category === category;
-}
-
 function focus() {
 	if (!['smartphone', 'tablet'].includes(deviceKind) && !isTouchUsing) {
 		searchEl.value?.focus({
@@ -379,22 +363,11 @@ function getKey(emoji: string | Misskey.entities.EmojiSimple | UnicodeEmojiDef):
 	return typeof emoji === 'string' ? emoji : 'char' in emoji ? emoji.char : `:${emoji.name}:`;
 }
 
-function getDef(emoji: string): string | Misskey.entities.EmojiSimple | UnicodeEmojiDef {
-	if (emoji.includes(':')) {
-		// カスタム絵文字が存在する場合はその情報を持つオブジェクトを返し、
-		// サーバの管理画面から削除された等で情報が見つからない場合は名前の文字列をそのまま返しておく（undefinedを返すとエラーになるため）
-		const name = emoji.replaceAll(':', '');
-		return customEmojisMap.get(name) ?? emoji;
-	} else {
-		return getUnicodeEmoji(emoji);
-	}
-}
-
 /** @see MkEmojiPicker.section.vue */
 function computeButtonTitle(ev: MouseEvent): void {
 	const elm = ev.target as HTMLElement;
 	const emoji = elm.dataset.emoji as string;
-	elm.title = getEmojiName(emoji);
+	elm.title = getEmojiName(emoji) ?? emoji;
 }
 
 function chosen(emoji: any, ev?: MouseEvent) {
@@ -554,18 +527,6 @@ defineExpose({
 						width: auto;
 						height: auto;
 						min-width: 0;
-
-						&:disabled {
-							cursor: not-allowed;
-							background: linear-gradient(-45deg, transparent 0% 48%, var(--X6) 48% 52%, transparent 52% 100%);
-							opacity: 1;
-
-							> .emoji {
-								filter: grayscale(1);
-								mix-blend-mode: exclusion;
-								opacity: 0.8;
-							}
-						}
 					}
 				}
 			}
@@ -588,18 +549,6 @@ defineExpose({
 						width: auto;
 						height: auto;
 						min-width: 0;
-
-						&:disabled {
-							cursor: not-allowed;
-							background: linear-gradient(-45deg, transparent 0% 48%, var(--X6) 48% 52%, transparent 52% 100%);
-							opacity: 1;
-
-							> .emoji {
-								filter: grayscale(1);
-								mix-blend-mode: exclusion;
-								opacity: 0.8;
-							}
-						}
 					}
 				}
 			}
@@ -715,18 +664,6 @@ defineExpose({
 						box-shadow: inset 0 0.15em 0.3em rgba(27, 31, 35, 0.15);
 					}
 
-					&:disabled {
-						cursor: not-allowed;
-						background: linear-gradient(-45deg, transparent 0% 48%, var(--X6) 48% 52%, transparent 52% 100%);
-						opacity: 1;
-
-						> .emoji {
-							filter: grayscale(1);
-							mix-blend-mode: exclusion;
-							opacity: 0.8;
-						}
-					}
-
 					> .emoji {
 						height: 1.25em;
 						vertical-align: -.25em;
diff --git a/packages/frontend/src/components/MkEmojiPickerDialog.vue b/packages/frontend/src/components/MkEmojiPickerDialog.vue
index 8ad4c02729..de23145963 100644
--- a/packages/frontend/src/components/MkEmojiPickerDialog.vue
+++ b/packages/frontend/src/components/MkEmojiPickerDialog.vue
@@ -56,7 +56,7 @@ const props = withDefaults(defineProps<{
 });
 
 const emit = defineEmits<{
-	(ev: 'done', v: string): void;
+	(ev: 'done', v: any): void;
 	(ev: 'close'): void;
 	(ev: 'closed'): void;
 }>();
@@ -64,7 +64,7 @@ const emit = defineEmits<{
 const modal = shallowRef<InstanceType<typeof MkModal>>();
 const picker = shallowRef<InstanceType<typeof MkEmojiPicker>>();
 
-function chosen(emoji: string) {
+function chosen(emoji: any) {
 	emit('done', emoji);
 	if (props.choseAndClose) {
 		modal.value?.close();
diff --git a/packages/frontend/src/components/MkEmojiPickerWindow.vue b/packages/frontend/src/components/MkEmojiPickerWindow.vue
new file mode 100644
index 0000000000..eb3003ea66
--- /dev/null
+++ b/packages/frontend/src/components/MkEmojiPickerWindow.vue
@@ -0,0 +1,49 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<MkWindow
+	ref="window"
+	:initialWidth="300"
+	:initialHeight="290"
+	:canResize="true"
+	:mini="true"
+	:front="true"
+	@closed="emit('closed')"
+>
+	<MkEmojiPicker :showPinned="showPinned" :asReactionPicker="asReactionPicker" :targetNote="targetNote" asWindow :class="$style.picker" @chosen="chosen"/>
+</MkWindow>
+</template>
+
+<script lang="ts" setup>
+import { } from 'vue';
+import * as Misskey from 'cherrypick-js';
+import MkWindow from '@/components/MkWindow.vue';
+import MkEmojiPicker from '@/components/MkEmojiPicker.vue';
+
+withDefaults(defineProps<{
+	src?: HTMLElement;
+	showPinned?: boolean;
+	asReactionPicker?: boolean;
+	targetNote?: Misskey.entities.Note
+}>(), {
+	showPinned: true,
+});
+
+const emit = defineEmits<{
+	(ev: 'chosen', v: any): void;
+	(ev: 'closed'): void;
+}>();
+
+function chosen(emoji: any) {
+	emit('chosen', emoji);
+}
+</script>
+
+<style lang="scss" module>
+.picker {
+	height: 100%;
+}
+</style>
diff --git a/packages/frontend/src/components/MkFormDialog.vue b/packages/frontend/src/components/MkFormDialog.vue
index deedc5badb..0d8734799c 100644
--- a/packages/frontend/src/components/MkFormDialog.vue
+++ b/packages/frontend/src/components/MkFormDialog.vue
@@ -21,37 +21,37 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 	<MkSpacer :marginMin="20" :marginMax="32">
 		<div v-if="Object.keys(form).filter(item => !form[item].hidden).length > 0" class="_gaps_m">
-			<template v-for="(v, k) in Object.fromEntries(Object.entries(form).filter(([_, v]) => !('hidden' in v) || 'hidden' in v && !v.hidden))">
-				<MkInput v-if="v.type === 'number'" v-model="values[k]" type="number" :step="v.step || 1">
-					<template #label><span v-text="v.label || k"></span><span v-if="v.required === false"> ({{ i18n.ts.optional }})</span></template>
-					<template v-if="v.description" #caption>{{ v.description }}</template>
+			<template v-for="item in Object.keys(form).filter(item => !form[item].hidden)">
+				<MkInput v-if="form[item].type === 'number'" v-model="values[item]" type="number" :step="form[item].step || 1">
+					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ i18n.ts.optional }})</span></template>
+					<template v-if="form[item].description" #caption>{{ form[item].description }}</template>
 				</MkInput>
-				<MkInput v-else-if="v.type === 'string' && !v.multiline" v-model="values[k]" type="text" :mfmAutocomplete="v.treatAsMfm">
-					<template #label><span v-text="v.label || k"></span><span v-if="v.required === false"> ({{ i18n.ts.optional }})</span></template>
-					<template v-if="v.description" #caption>{{ v.description }}</template>
+				<MkInput v-else-if="form[item].type === 'string' && !form[item].multiline" v-model="values[item]" type="text" :mfmAutocomplete="form[item].treatAsMfm">
+					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ i18n.ts.optional }})</span></template>
+					<template v-if="form[item].description" #caption>{{ form[item].description }}</template>
 				</MkInput>
-				<MkTextarea v-else-if="v.type === 'string' && v.multiline" v-model="values[k]" :mfmAutocomplete="v.treatAsMfm" :mfmPreview="v.treatAsMfm">
-					<template #label><span v-text="v.label || k"></span><span v-if="v.required === false"> ({{ i18n.ts.optional }})</span></template>
-					<template v-if="v.description" #caption>{{ v.description }}</template>
+				<MkTextarea v-else-if="form[item].type === 'string' && form[item].multiline" v-model="values[item]" :mfmAutocomplete="form[item].treatAsMfm" :mfmPreview="form[item].treatAsMfm">
+					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ i18n.ts.optional }})</span></template>
+					<template v-if="form[item].description" #caption>{{ form[item].description }}</template>
 				</MkTextarea>
-				<MkSwitch v-else-if="v.type === 'boolean'" v-model="values[k]">
-					<span v-text="v.label || k"></span>
-					<template v-if="v.description" #caption>{{ v.description }}</template>
+				<MkSwitch v-else-if="form[item].type === 'boolean'" v-model="values[item]">
+					<span v-text="form[item].label || item"></span>
+					<template v-if="form[item].description" #caption>{{ form[item].description }}</template>
 				</MkSwitch>
-				<MkSelect v-else-if="v.type === 'enum'" v-model="values[k]">
-					<template #label><span v-text="v.label || k"></span><span v-if="v.required === false"> ({{ i18n.ts.optional }})</span></template>
-					<option v-for="option in v.enum" :key="option.value" :value="option.value">{{ option.label }}</option>
+				<MkSelect v-else-if="form[item].type === 'enum'" v-model="values[item]">
+					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ i18n.ts.optional }})</span></template>
+					<option v-for="option in form[item].enum" :key="option.value" :value="option.value">{{ option.label }}</option>
 				</MkSelect>
-				<MkRadios v-else-if="v.type === 'radio'" v-model="values[k]">
-					<template #label><span v-text="v.label || k"></span><span v-if="v.required === false"> ({{ i18n.ts.optional }})</span></template>
-					<option v-for="option in v.options" :key="option.value" :value="option.value">{{ option.label }}</option>
+				<MkRadios v-else-if="form[item].type === 'radio'" v-model="values[item]">
+					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ i18n.ts.optional }})</span></template>
+					<option v-for="option in form[item].options" :key="option.value" :value="option.value">{{ option.label }}</option>
 				</MkRadios>
-				<MkRange v-else-if="v.type === 'range'" v-model="values[k]" :min="v.min" :max="v.max" :step="v.step" :textConverter="v.textConverter">
-					<template #label><span v-text="v.label || k"></span><span v-if="v.required === false"> ({{ i18n.ts.optional }})</span></template>
-					<template v-if="v.description" #caption>{{ v.description }}</template>
+				<MkRange v-else-if="form[item].type === 'range'" v-model="values[item]" :min="form[item].min" :max="form[item].max" :step="form[item].step" :textConverter="form[item].textConverter">
+					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ i18n.ts.optional }})</span></template>
+					<template v-if="form[item].description" #caption>{{ form[item].description }}</template>
 				</MkRange>
-				<MkButton v-else-if="v.type === 'button'" @click="v.action($event, values)">
-					<span v-text="v.content || k"></span>
+				<MkButton v-else-if="form[item].type === 'button'" @click="form[item].action($event, values)">
+					<span v-text="form[item].content || item"></span>
 				</MkButton>
 			</template>
 		</div>
@@ -72,21 +72,19 @@ import MkSelect from './MkSelect.vue';
 import MkRange from './MkRange.vue';
 import MkButton from './MkButton.vue';
 import MkRadios from './MkRadios.vue';
-import type { Form } from '@/scripts/form.js';
 import MkModalWindow from '@/components/MkModalWindow.vue';
 import { i18n } from '@/i18n.js';
 import { infoImageUrl } from '@/instance.js';
 
 const props = defineProps<{
 	title: string;
-	form: Form;
+	form: any;
 }>();
 
 const emit = defineEmits<{
 	(ev: 'done', v: {
-		canceled: true;
-	} | {
-		result: Record<string, any>;
+		canceled?: boolean;
+		result?: any;
 	}): void;
 	(ev: 'closed'): void;
 }>();
diff --git a/packages/frontend/src/components/MkLink.vue b/packages/frontend/src/components/MkLink.vue
index ac5365d208..c115672646 100644
--- a/packages/frontend/src/components/MkLink.vue
+++ b/packages/frontend/src/components/MkLink.vue
@@ -30,13 +30,13 @@ const self = props.url.startsWith(local);
 const attr = self ? 'to' : 'href';
 const target = self ? null : '_blank';
 
-const el = ref<HTMLElement | { $el: HTMLElement }>();
+const el = ref<HTMLElement>();
 
 useTooltip(el, (showing) => {
 	os.popup(defineAsyncComponent(() => import('@/components/MkUrlPreviewPopup.vue')), {
 		showing,
 		url: props.url,
-		source: el.value instanceof HTMLElement ? el.value : el.value?.$el,
+		source: el.value,
 	}, {}, 'closed');
 });
 </script>
diff --git a/packages/frontend/src/components/MkMediaAudio.vue b/packages/frontend/src/components/MkMediaAudio.vue
index 3f96ba5e53..2da12de658 100644
--- a/packages/frontend/src/components/MkMediaAudio.vue
+++ b/packages/frontend/src/components/MkMediaAudio.vue
@@ -66,7 +66,7 @@ import * as os from '@/os.js';
 import bytes from '@/filters/bytes.js';
 import { hms } from '@/filters/hms.js';
 import MkMediaRange from '@/components/MkMediaRange.vue';
-import { $i, iAmModerator } from '@/account.js';
+import { iAmModerator } from '@/account.js';
 
 const props = defineProps<{
 	audio: Misskey.entities.DriveFile;
@@ -96,6 +96,8 @@ function showMenu(ev: MouseEvent) {
 
 	if (iAmModerator) {
 		menu.push({
+			type: 'divider',
+		}, {
 			text: props.audio.isSensitive ? i18n.ts.unmarkAsSensitive : i18n.ts.markAsSensitive,
 			icon: props.audio.isSensitive ? 'ti ti-eye' : 'ti ti-eye-exclamation',
 			danger: true,
@@ -103,17 +105,6 @@ function showMenu(ev: MouseEvent) {
 		});
 	}
 
-	if ($i?.id === props.audio.userId) {
-		menu.push({
-			type: 'divider',
-		}, {
-			type: 'link' as const,
-			text: i18n.ts._fileViewer.title,
-			icon: 'ti ti-info-circle',
-			to: `/my/drive/file/${props.audio.id}`,
-		});
-	}
-
 	menuShowing.value = true;
 	os.popupMenu(menu, ev.currentTarget ?? ev.target, {
 		align: 'right',
diff --git a/packages/frontend/src/components/MkMediaImage.vue b/packages/frontend/src/components/MkMediaImage.vue
index a17c1a8314..07bb988c98 100644
--- a/packages/frontend/src/components/MkMediaImage.vue
+++ b/packages/frontend/src/components/MkMediaImage.vue
@@ -63,7 +63,7 @@ import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
 import { defaultStore } from '@/store.js';
 import { i18n } from '@/i18n.js';
 import * as os from '@/os.js';
-import { $i, iAmModerator } from '@/account.js';
+import { iAmModerator } from '@/account.js';
 import MkRippleEffect from '@/components/MkRippleEffect.vue';
 
 const props = withDefaults(defineProps<{
@@ -139,13 +139,6 @@ function showMenu(ev: MouseEvent) {
 		action: () => {
 			os.apiWithDialog('drive/files/update', { fileId: props.image.id, isSensitive: true });
 		},
-	}] : []), ...($i?.id === props.image.userId ? [{
-		type: 'divider' as const,
-	}, {
-		type: 'link' as const,
-		text: i18n.ts._fileViewer.title,
-		icon: 'ti ti-info-circle',
-		to: `/my/drive/file/${props.image.id}`,
 	}] : [])], ev.currentTarget ?? ev.target);
 }
 
diff --git a/packages/frontend/src/components/MkMediaVideo.vue b/packages/frontend/src/components/MkMediaVideo.vue
index 6d45ef9c39..2cd259d76d 100644
--- a/packages/frontend/src/components/MkMediaVideo.vue
+++ b/packages/frontend/src/components/MkMediaVideo.vue
@@ -94,7 +94,7 @@ import * as os from '@/os.js';
 import { isFullscreenNotSupported } from '@/scripts/device-kind.js';
 import hasAudio from '@/scripts/media-has-audio.js';
 import MkMediaRange from '@/components/MkMediaRange.vue';
-import { $i, iAmModerator } from '@/account.js';
+import { iAmModerator } from '@/account.js';
 import MkRippleEffect from '@/components/MkRippleEffect.vue';
 
 const props = defineProps<{
@@ -138,6 +138,8 @@ function showMenu(ev: MouseEvent) {
 
 	if (iAmModerator) {
 		menu.push({
+			type: 'divider',
+		}, {
 			text: props.video.isSensitive ? i18n.ts.unmarkAsSensitive : i18n.ts.markAsSensitive,
 			icon: props.video.isSensitive ? 'ti ti-eye' : 'ti ti-eye-exclamation',
 			danger: true,
@@ -145,17 +147,6 @@ function showMenu(ev: MouseEvent) {
 		});
 	}
 
-	if ($i?.id === props.video.userId) {
-		menu.push({
-			type: 'divider',
-		}, {
-			type: 'link' as const,
-			text: i18n.ts._fileViewer.title,
-			icon: 'ti ti-info-circle',
-			to: `/my/drive/file/${props.video.id}`,
-		});
-	}
-
 	menuShowing.value = true;
 	os.popupMenu(menu, ev.currentTarget ?? ev.target, {
 		align: 'right',
diff --git a/packages/frontend/src/components/MkMfmCheatSheetDialog.vue b/packages/frontend/src/components/MkMfmCheatSheetDialog.vue
index 1e86c6e111..dbec743ac8 100644
--- a/packages/frontend/src/components/MkMfmCheatSheetDialog.vue
+++ b/packages/frontend/src/components/MkMfmCheatSheetDialog.vue
@@ -1,8 +1,3 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
 <template>
 <MkModalWindow
 	ref="dialog"
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index ed3d000fd2..e81544fcf4 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -126,7 +126,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</div>
 		<div v-if="appearNote.renote" :class="$style.quote"><MkNoteSimple :note="appearNote.renote" :class="$style.quoteNote"/></div>
 		<div>
-			<MkReactionsViewer v-if="appearNote.reactionAcceptance !== 'likeOnly'" :note="appearNote" :maxNumber="16" @click.stop @contextmenu.prevent.stop @mockUpdateMyReaction="emitUpdReaction">
+			<MkReactionsViewer :note="appearNote" :maxNumber="16" @click.stop @contextmenu.prevent.stop @mockUpdateMyReaction="emitUpdReaction">
 				<template #more>
 					<div :class="$style.reactionOmitted">{{ i18n.ts.more }}</div>
 				</template>
@@ -134,7 +134,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<footer :class="$style.footer">
 				<button v-if="!note.isHidden" v-vibrate="defaultStore.state.vibrateSystem ? 5 : []" v-tooltip="i18n.ts.reply" :class="$style.footerButton" class="_button" @click.stop="reply()">
 					<i class="ti ti-arrow-back-up"></i>
-					<p v-if="appearNote.repliesCount > 0" :class="$style.footerButtonCount">{{ number(appearNote.repliesCount) }}</p>
+					<p v-if="appearNote.repliesCount > 0" :class="$style.footerButtonCount">{{ appearNote.repliesCount }}</p>
 				</button>
 				<button v-else :class="$style.footerButton" class="_button" disabled>
 					<i class="ti ti-ban"></i>
@@ -149,20 +149,20 @@ SPDX-License-Identifier: AGPL-3.0-only
 					@click.stop="defaultStore.state.renoteQuoteButtonSeparation && ((!defaultStore.state.renoteVisibilitySelection && !appearNote.channel) || (appearNote.channel && !appearNote.channel.allowRenoteToExternal) || appearNote.visibility === 'followers') ? renoteOnly() : renote()"
 				>
 					<i class="ti ti-repeat"></i>
-					<p v-if="appearNote.renoteCount > 0" :class="$style.footerButtonCount">{{ number(appearNote.renoteCount) }}</p>
+					<p v-if="appearNote.renoteCount > 0" :class="$style.footerButtonCount">{{ appearNote.renoteCount }}</p>
 				</button>
 				<button v-else :class="$style.footerButton" class="_button" disabled>
 					<i class="ti ti-ban"></i>
 				</button>
-				<button v-if="appearNote.reactionAcceptance !== 'likeOnly' && appearNote.myReaction == null" ref="heartReactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" v-tooltip="i18n.ts.like" :class="$style.footerButton" class="_button" @click.stop="heartReact()">
+				<button v-if="appearNote.myReaction == null" ref="heartReactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" v-tooltip="i18n.ts.like" :class="$style.footerButton" class="_button" @click.stop="heartReact()">
 					<i class="ti ti-heart"></i>
 				</button>
-				<button ref="reactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" :class="$style.footerButton" class="_button" @click.stop="toggleReact()">
-					<i v-if="appearNote.reactionAcceptance === 'likeOnly' && appearNote.myReaction != null" class="ti ti-heart-filled" style="color: var(--eventReactionHeart);"></i>
-					<i v-else-if="appearNote.myReaction != null" class="ti ti-mood-edit" style="color: var(--accent);"></i>
-					<i v-else-if="appearNote.reactionAcceptance === 'likeOnly'" class="ti ti-heart"></i>
-					<i v-else class="ti ti-mood-plus"></i>
-					<p v-if="(appearNote.reactionAcceptance === 'likeOnly' || defaultStore.state.showReactionsCount) && appearNote.reactionCount > 0" :class="$style.footerButtonCount">{{ number(appearNote.reactionCount) }}</p>
+				<button v-if="appearNote.reactionAcceptance !== 'likeOnly'" ref="reactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" :class="$style.footerButton" class="_button" @click.stop="react()">
+					<i v-if="appearNote.myReaction == null" v-tooltip="i18n.ts.reaction" class="ti ti-mood-plus"></i>
+					<i v-else v-tooltip="i18n.ts.editReaction" class="ti ti-mood-edit"></i>
+				</button>
+				<button v-if="appearNote.myReaction != null && appearNote.reactionAcceptance == 'likeOnly'" ref="reactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" v-tooltip="i18n.ts.removeReaction" :class="$style.footerButton" class="_button" @click.stop="undoReact(appearNote)">
+					<i class="ti ti-heart-minus"></i>
 				</button>
 				<button v-if="canRenote && defaultStore.state.renoteQuoteButtonSeparation" ref="quoteButton" v-vibrate="defaultStore.state.vibrateSystem ? 5 : []" v-tooltip="i18n.ts.quote" class="_button" :class="$style.footerButton" @click.stop="quote()">
 					<i class="ti ti-quote"></i>
@@ -222,7 +222,6 @@ import { pleaseLogin } from '@/scripts/please-login.js';
 import { focusPrev, focusNext } from '@/scripts/focus.js';
 import { checkWordMute } from '@/scripts/check-word-mute.js';
 import { userPage } from '@/filters/user.js';
-import number from '@/filters/number.js';
 import * as os from '@/os.js';
 import * as sound from '@/scripts/sound.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
@@ -598,14 +597,6 @@ function undoReact(targetNote: Misskey.entities.Note): void {
 	});
 }
 
-function toggleReact() {
-	if (appearNote.value.myReaction != null && appearNote.value.reactionAcceptance === 'likeOnly') {
-		undoReact(appearNote.value);
-	} else {
-		react();
-	}
-}
-
 function onContextmenu(ev: MouseEvent): void {
 	if (props.mock) {
 		return;
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 5ef9ee6b78..7773282eb4 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -144,10 +144,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkTime :class="$style.time" :time="appearNote.createdAt" mode="detail" colored/>
 				</MkA>
 			</div>
-			<MkReactionsViewer v-if="appearNote.reactionAcceptance !== 'likeOnly'" ref="reactionsViewer" :note="appearNote"/>
+			<MkReactionsViewer ref="reactionsViewer" :note="appearNote"/>
 			<button v-if="!note.isHidden" v-vibrate="defaultStore.state.vibrateSystem ? 5 : []" v-tooltip="i18n.ts.reply" class="_button" :class="$style.noteFooterButton" @click="reply()">
 				<i class="ti ti-arrow-back-up"></i>
-				<p v-if="appearNote.repliesCount > 0" :class="$style.noteFooterButtonCount">{{ number(appearNote.repliesCount) }}</p>
+				<p v-if="appearNote.repliesCount > 0" :class="$style.noteFooterButtonCount">{{ appearNote.repliesCount }}</p>
 			</button>
 			<button v-else class="_button" :class="$style.noteFooterButton" disabled>
 				<i class="ti ti-ban"></i>
@@ -162,20 +162,20 @@ SPDX-License-Identifier: AGPL-3.0-only
 				@click.stop="defaultStore.state.renoteQuoteButtonSeparation && ((!defaultStore.state.renoteVisibilitySelection && !appearNote.channel) || (appearNote.channel && !appearNote.channel.allowRenoteToExternal) || appearNote.visibility === 'followers') ? renoteOnly() : renote()"
 			>
 				<i class="ti ti-repeat"></i>
-				<p v-if="appearNote.renoteCount > 0" :class="$style.noteFooterButtonCount">{{ number(appearNote.renoteCount) }}</p>
+				<p v-if="appearNote.renoteCount > 0" :class="$style.noteFooterButtonCount">{{ appearNote.renoteCount }}</p>
 			</button>
 			<button v-else class="_button" :class="$style.noteFooterButton" disabled>
 				<i class="ti ti-ban"></i>
 			</button>
-			<button v-if="appearNote.reactionAcceptance !== 'likeOnly' && appearNote.myReaction == null" ref="heartReactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" v-tooltip="i18n.ts.like" :class="$style.noteFooterButton" class="_button" @click="heartReact()">
+			<button v-if="appearNote.myReaction == null" ref="heartReactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" v-tooltip="i18n.ts.like" :class="$style.noteFooterButton" class="_button" @click="heartReact()">
 				<i class="ti ti-heart"></i>
 			</button>
-			<button ref="reactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" :class="$style.noteFooterButton" class="_button" @click.stop="toggleReact()">
-				<i v-if="appearNote.reactionAcceptance === 'likeOnly' && appearNote.myReaction != null" class="ti ti-heart-filled" style="color: var(--eventReactionHeart);"></i>
-				<i v-else-if="appearNote.myReaction != null" class="ti ti-mood-edit" style="color: var(--accent);"></i>
-				<i v-else-if="appearNote.reactionAcceptance === 'likeOnly'" class="ti ti-heart"></i>
-				<i v-else class="ti ti-mood-plus"></i>
-				<p v-if="(appearNote.reactionAcceptance === 'likeOnly' || defaultStore.state.showReactionsCount) && appearNote.reactionCount > 0" :class="$style.noteFooterButtonCount">{{ number(appearNote.reactionCount) }}</p>
+			<button v-if="appearNote.reactionAcceptance !== 'likeOnly'" ref="reactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" :class="$style.noteFooterButton" class="_button" @click="react()">
+				<i v-if="appearNote.myReaction == null" v-tooltip="i18n.ts.reaction" class="ti ti-mood-plus"></i>
+				<i v-else v-tooltip="i18n.ts.editReaction" class="ti ti-mood-edit"></i>
+			</button>
+			<button v-if="appearNote.myReaction != null && appearNote.reactionAcceptance == 'likeOnly'" ref="reactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" v-tooltip="i18n.ts.removeReaction" :class="[$style.noteFooterButton, $style.reacted]" class="_button" @click="undoReact(appearNote)">
+				<i class="ti ti-heart-minus"></i>
 			</button>
 			<button v-if="canRenote && defaultStore.state.renoteQuoteButtonSeparation" ref="quoteButton" v-vibrate="defaultStore.state.vibrateSystem ? 5 : []" v-tooltip="i18n.ts.quote" class="_button" :class="$style.noteFooterButton" @click="quote()">
 				<i class="ti ti-quote"></i>
@@ -293,7 +293,6 @@ import { pleaseLogin } from '@/scripts/please-login.js';
 import { checkWordMute } from '@/scripts/check-word-mute.js';
 import { userPage } from '@/filters/user.js';
 import { notePage } from '@/filters/note.js';
-import number from '@/filters/number.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import * as sound from '@/scripts/sound.js';
@@ -583,14 +582,6 @@ function undoReact(targetNote: Misskey.entities.Note): void {
 	});
 }
 
-function toggleReact() {
-	if (appearNote.value.myReaction != null && appearNote.value.reactionAcceptance === 'likeOnly') {
-		undoReact(appearNote.value);
-	} else {
-		react();
-	}
-}
-
 function onContextmenu(ev: MouseEvent): void {
 	const isLink = (el: HTMLElement): boolean => {
 		if (el.tagName === 'A') return true;
diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue
index 43b6ca2fb6..34d39022ea 100644
--- a/packages/frontend/src/components/MkNotification.vue
+++ b/packages/frontend/src/components/MkNotification.vue
@@ -8,7 +8,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<div :class="$style.head">
 		<MkAvatar v-if="['pollEnded', 'note'].includes(notification.type) && notification.note" :class="$style.icon" :user="notification.note.user" link preview/>
 		<MkAvatar v-else-if="['roleAssigned', 'achievementEarned'].includes(notification.type)" :class="$style.icon" :user="$i" link preview/>
-		<div v-else-if="notification.type === 'reaction:grouped' && notification.note.reactionAcceptance === 'likeOnly'" :class="[$style.icon, $style.icon_reactionGroupHeart]"><i class="ti ti-heart" style="line-height: 1;"></i></div>
 		<div v-else-if="notification.type === 'reaction:grouped'" :class="[$style.icon, $style.icon_reactionGroup]"><i class="ti ti-plus" style="line-height: 1;"></i></div>
 		<div v-else-if="notification.type === 'renote:grouped'" :class="[$style.icon, $style.icon_renoteGroup]"><i class="ti ti-repeat" style="line-height: 1;"></i></div>
 		<img v-else-if="notification.type === 'test'" :class="$style.icon" :src="infoImageUrl"/>
@@ -60,7 +59,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<span v-else-if="notification.type === 'achievementEarned'">{{ i18n.ts._notification.achievementEarned }}</span>
 			<span v-else-if="notification.type === 'test'">{{ i18n.ts._notification.testNotification }}</span>
 			<MkA v-else-if="notification.type === 'follow' || notification.type === 'mention' || notification.type === 'reply' || notification.type === 'renote' || notification.type === 'quote' || notification.type === 'reaction' || notification.type === 'receiveFollowRequest' || notification.type === 'followRequestAccepted'" v-user-preview="notification.user.id" :class="$style.headerName" :to="userPage(notification.user)"><MkUserName :user="notification.user"/></MkA>
-			<span v-else-if="notification.type === 'reaction:grouped' && notification.note.reactionAcceptance === 'likeOnly'">{{ i18n.tsx._notification.likedBySomeUsers({ n: notification.reactions.length }) }}</span>
 			<span v-else-if="notification.type === 'reaction:grouped'">{{ i18n.tsx._notification.reactedBySomeUsers({ n: notification.reactions.length }) }}</span>
 			<span v-else-if="notification.type === 'renote:grouped'">{{ i18n.tsx._notification.renotedBySomeUsers({ n: notification.users.length }) }}</span>
 			<span v-else-if="notification.type === 'app'">{{ notification.header }}</span>
@@ -190,12 +188,12 @@ const rejectFollowRequest = () => {
 
 const acceptGroupInvitation = () => {
 	groupInviteDone.value = true;
-	misskeyApi('users/groups/invitations/accept', { invitationId: props.notification.invitation.id });
+	os.apiWithDialog('users/groups/invitations/accept', { invitationId: props.notification.invitation.id });
 };
 
 const rejectGroupInvitation = () => {
 	groupInviteDone.value = true;
-	misskeyApi('users/groups/invitations/reject', { invitationId: props.notification.invitation.id });
+	os.apiWithDialog('users/groups/invitations/reject', { invitationId: props.notification.invitation.id });
 };
 </script>
 
@@ -226,7 +224,6 @@ const rejectGroupInvitation = () => {
 }
 
 .icon_reactionGroup,
-.icon_reactionGroupHeart,
 .icon_renoteGroup {
 	display: grid;
 	align-items: center;
@@ -239,15 +236,11 @@ const rejectGroupInvitation = () => {
 }
 
 .icon_reactionGroup {
-	background: var(--eventReaction);
-}
-
-.icon_reactionGroupHeart {
-	background: var(--eventReactionHeart);
+	background: #e99a0b;
 }
 
 .icon_renoteGroup {
-	background: var(--eventRenote);
+	background: #36d298;
 }
 
 .icon_app {
@@ -276,49 +269,49 @@ const rejectGroupInvitation = () => {
 
 .t_follow, .t_followRequestAccepted, .t_receiveFollowRequest, .t_groupInvited {
 	padding: 3px;
-	background: var(--eventFollow);
+	background: #36aed2;
 	pointer-events: none;
 }
 
 .t_renote {
 	padding: 3px;
-	background: var(--eventRenote);
+	background: #36d298;
 	pointer-events: none;
 }
 
 .t_quote {
 	padding: 3px;
-	background: var(--eventRenote);
+	background: #36d298;
 	pointer-events: none;
 }
 
 .t_reply {
 	padding: 3px;
-	background: var(--eventReply);
+	background: #007aff;
 	pointer-events: none;
 }
 
 .t_mention {
 	padding: 3px;
-	background: var(--eventOther);
+	background: #88a6b7;
 	pointer-events: none;
 }
 
 .t_pollEnded {
 	padding: 3px;
-	background: var(--eventOther);
+	background: #88a6b7;
 	pointer-events: none;
 }
 
 .t_achievementEarned {
 	padding: 3px;
-	background: var(--eventAchievement);
+	background: #cb9a11;
 	pointer-events: none;
 }
 
 .t_roleAssigned {
 	padding: 3px;
-	background: var(--eventOther);
+	background: #88a6b7;
 	pointer-events: none;
 }
 
diff --git a/packages/frontend/src/components/MkNotifications.vue b/packages/frontend/src/components/MkNotifications.vue
index ceb0e6b5ca..33fea764bf 100644
--- a/packages/frontend/src/components/MkNotifications.vue
+++ b/packages/frontend/src/components/MkNotifications.vue
@@ -25,7 +25,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { onUnmounted, onDeactivated, onMounted, computed, shallowRef, onActivated } from 'vue';
-import * as Misskey from 'cherrypick-js';
 import MkPagination from '@/components/MkPagination.vue';
 import XNotification from '@/components/MkNotification.vue';
 import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue';
@@ -78,12 +77,11 @@ function reload() {
 	});
 }
 
-let connection: Misskey.ChannelConnection<Misskey.Channels['main']>;
+let connection;
 
 onMounted(() => {
 	connection = useStream().useChannel('main');
 	connection.on('notification', onNotification);
-	connection.on('notificationFlushed', reload);
 
 	globalEvents.on('reloadNotification', () => reload());
 });
@@ -92,7 +90,6 @@ onActivated(() => {
 	pagingComponent.value?.reload();
 	connection = useStream().useChannel('main');
 	connection.on('notification', onNotification);
-	connection.on('notificationFlushed', reload);
 });
 
 onUnmounted(() => {
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 5ab346bd58..181fb8a307 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -180,7 +180,7 @@ const emit = defineEmits<{
 const textareaEl = shallowRef<HTMLTextAreaElement | null>(null);
 const cwInputEl = shallowRef<HTMLInputElement | null>(null);
 const hashtagsInputEl = shallowRef<HTMLInputElement | null>(null);
-const visibilityButton = shallowRef<HTMLElement>();
+const visibilityButton = shallowRef<HTMLElement | null>(null);
 
 const posting = ref(false);
 const posted = ref(false);
@@ -500,7 +500,6 @@ function setVisibility() {
 		isSilenced: $i.isSilenced,
 		localOnly: localOnly.value,
 		src: visibilityButton.value,
-		...(props.reply ? { isReplyVisibilitySpecified: props.reply.visibility === 'specified' } : {}),
 	}, {
 		changeVisibility: v => {
 			visibility.value = v;
diff --git a/packages/frontend/src/components/MkReactionIcon.vue b/packages/frontend/src/components/MkReactionIcon.vue
index 068a2968db..59ceab27dc 100644
--- a/packages/frontend/src/components/MkReactionIcon.vue
+++ b/packages/frontend/src/components/MkReactionIcon.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkCustomEmoji v-if="reaction[0] === ':'" ref="elRef" :name="reaction" :normal="true" :noStyle="noStyle" :url="emojiUrl" :fallbackToImage="true"/>
+<MkCustomEmoji v-if="reaction[0] === ':'" ref="elRef" :name="reaction" :normal="true" :noStyle="noStyle" :url="emojiUrl"/>
 <MkEmoji v-else ref="elRef" :emoji="reaction" :normal="true" :noStyle="noStyle"/>
 </template>
 
diff --git a/packages/frontend/src/components/MkReactionsViewer.details.vue b/packages/frontend/src/components/MkReactionsViewer.details.vue
index 8b5e6efdf3..3158ba436e 100644
--- a/packages/frontend/src/components/MkReactionsViewer.details.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.details.vue
@@ -44,7 +44,7 @@ function getReactionName(reaction: string): string {
 	if (trimLocal.startsWith(':')) {
 		return trimLocal;
 	}
-	return getEmojiName(reaction);
+	return getEmojiName(reaction) ?? reaction;
 }
 </script>
 
diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index 2443aab64b..fb2dc7e85c 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -34,8 +34,7 @@ import { defaultStore } from '@/store.js';
 import { i18n } from '@/i18n.js';
 import * as sound from '@/scripts/sound.js';
 import { checkReactionPermissions } from '@/scripts/check-reaction-permissions.js';
-import { customEmojisMap } from '@/custom-emojis.js';
-import { getUnicodeEmoji } from '@/scripts/emojilist.js';
+import { customEmojis } from '@/custom-emojis.js';
 import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 
 const props = defineProps<{
@@ -53,11 +52,13 @@ const emit = defineEmits<{
 
 const buttonEl = shallowRef<HTMLElement>();
 
-const emojiName = computed(() => props.reaction.replace(/:/g, '').replace(/@\./, ''));
-const emoji = computed(() => customEmojisMap.get(emojiName.value) ?? getUnicodeEmoji(props.reaction));
+const isCustomEmoji = computed(() => props.reaction.includes(':'));
+const emoji = computed(() => isCustomEmoji.value ? customEmojis.value.find(emoji => emoji.name === props.reaction.replace(/:/g, '').replace(/@\./, '')) : null);
 
 const canToggle = computed(() => {
-	return !props.reaction.match(/@\w/) && $i && emoji.value && checkReactionPermissions($i, props.note, emoji.value);
+	return !props.reaction.match(/@\w/) && $i
+			&& (emoji.value && checkReactionPermissions($i, props.note, emoji.value))
+			|| !isCustomEmoji.value;
 });
 const canGetInfo = computed(() => !props.reaction.match(/@\w/) && props.reaction.includes(':'));
 
@@ -66,7 +67,7 @@ const reactionName = computed(() => {
 	return r.slice(0, r.indexOf('@'));
 });
 
-const alternative: ComputedRef<string | null> = computed(() => defaultStore.state.reactableRemoteReactionEnabled ? (customEmojisMap.value.find(it => it.name === reactionName.value)?.name ?? null) : null);
+const alternative: ComputedRef<string | null> = computed(() => defaultStore.state.reactableRemoteReactionEnabled ? (customEmojis.value.find(it => it.name === reactionName.value)?.name ?? null) : null);
 
 async function toggleReaction(ev: MouseEvent) {
 	if (!canToggle.value) {
@@ -167,7 +168,7 @@ async function menu(ev) {
 				}),
 			});
 		},
-	}, customEmojisMap.value.find(it => it.name === reactionName.value)?.name ? {
+	}, customEmojis.value.find(it => it.name === reactionName.value)?.name ? {
 		text: i18n.ts.copy,
 		icon: 'ti ti-copy',
 		action: () => {
diff --git a/packages/frontend/src/components/MkSubNoteContent.vue b/packages/frontend/src/components/MkSubNoteContent.vue
index 40a4ca8861..fa8d3be9a7 100644
--- a/packages/frontend/src/components/MkSubNoteContent.vue
+++ b/packages/frontend/src/components/MkSubNoteContent.vue
@@ -83,20 +83,20 @@ SPDX-License-Identifier: AGPL-3.0-only
 				@click.stop="defaultStore.state.renoteQuoteButtonSeparation && ((!defaultStore.state.renoteVisibilitySelection && !note.channel) || (note.channel && !note.channel.allowRenoteToExternal) || note.visibility === 'followers') ? renoteOnly() : renote()"
 			>
 				<i class="ti ti-repeat"></i>
-				<p v-if="note.renoteCount > 0" :class="$style.footerButtonCount">{{ number(note.renoteCount) }}</p>
+				<p v-if="note.renoteCount > 0" :class="$style.footerButtonCount">{{ note.renoteCount }}</p>
 			</button>
 			<button v-else :class="$style.footerButton" class="_button" disabled>
 				<i class="ti ti-ban"></i>
 			</button>
-			<button v-if="note.reactionAcceptance !== 'likeOnly' && note.myReaction == null" ref="heartReactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" v-tooltip="i18n.ts.like" :class="$style.footerButton" class="_button" @click.stop="heartReact()">
+			<button v-if="note.myReaction == null" ref="heartReactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" v-tooltip="i18n.ts.like" :class="$style.footerButton" class="_button" @click.stop="heartReact()">
 				<i class="ti ti-heart"></i>
 			</button>
-			<button ref="reactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" :class="$style.footerButton" class="_button" @click.stop="toggleReact()">
-				<i v-if="note.reactionAcceptance === 'likeOnly' && note.myReaction != null" class="ti ti-heart-filled" style="color: var(--eventReactionHeart);"></i>
-				<i v-else-if="note.myReaction != null" class="ti ti-mood-edit" style="color: var(--accent);"></i>
-				<i v-else-if="note.reactionAcceptance === 'likeOnly'" class="ti ti-heart"></i>
-				<i v-else class="ti ti-mood-plus"></i>
-				<p v-if="(note.reactionAcceptance === 'likeOnly' || defaultStore.state.showReactionsCount) && note.reactionCount > 0" :class="$style.footerButtonCount">{{ number(note.reactionCount) }}</p>
+			<button v-if="note.reactionAcceptance !== 'likeOnly'" ref="reactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" :class="$style.footerButton" class="_button" @click.stop="react()">
+				<i v-if="note.myReaction == null" v-tooltip="i18n.ts.reaction" class="ti ti-mood-plus"></i>
+				<i v-else v-tooltip="i18n.ts.editReaction" class="ti ti-mood-edit"></i>
+			</button>
+			<button v-if="note.myReaction != null && note.reactionAcceptance == 'likeOnly'" ref="reactButton" v-vibrate="defaultStore.state.vibrateSystem ? [30, 50, 50] : []" v-tooltip="i18n.ts.removeReaction" :class="$style.footerButton" class="_button" @click.stop="undoReact(note)">
+				<i class="ti ti-heart-minus"></i>
 			</button>
 			<button v-if="canRenote && defaultStore.state.renoteQuoteButtonSeparation" ref="quoteButton" v-vibrate="defaultStore.state.vibrateSystem ? 5 : []" v-tooltip="i18n.ts.quote" class="_button" :class="$style.footerButton" @click.stop="quote()">
 				<i class="ti ti-quote"></i>
@@ -145,7 +145,6 @@ import { concat } from '@/scripts/array.js';
 import { vibrate } from '@/scripts/vibrate.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import detectLanguage from '@/scripts/detect-language.js';
-import number from '@/filters/number.js';
 
 const props = withDefaults(defineProps<{
   note: Misskey.entities.Note;
@@ -396,14 +395,6 @@ function undoReact(targetNote: Misskey.entities.Note): void {
 	});
 }
 
-function toggleReact() {
-	if (note.value.myReaction != null && note.value.reactionAcceptance === 'likeOnly') {
-		undoReact(note.value);
-	} else {
-		react();
-	}
-}
-
 function showMenu(viaKeyboard = false): void {
 	if (props.mock) {
 		return;
diff --git a/packages/frontend/src/components/MkTutorialDialog.Note.vue b/packages/frontend/src/components/MkTutorialDialog.Note.vue
index 55b7639520..07bdfa2b08 100644
--- a/packages/frontend/src/components/MkTutorialDialog.Note.vue
+++ b/packages/frontend/src/components/MkTutorialDialog.Note.vue
@@ -65,7 +65,6 @@ const exampleNote = reactive<Misskey.entities.Note>({
 	reactionAcceptance: null,
 	renoteCount: 0,
 	repliesCount: 1,
-	reactionCount: 0,
 	reactions: {},
 	reactionEmojis: {},
 	fileIds: [],
diff --git a/packages/frontend/src/components/MkTutorialDialog.PostNote.vue b/packages/frontend/src/components/MkTutorialDialog.PostNote.vue
index 7a52c32e77..87b24bc8fb 100644
--- a/packages/frontend/src/components/MkTutorialDialog.PostNote.vue
+++ b/packages/frontend/src/components/MkTutorialDialog.PostNote.vue
@@ -68,7 +68,6 @@ const exampleCWNote = reactive<Misskey.entities.Note>({
 	reactionAcceptance: null,
 	renoteCount: 0,
 	repliesCount: 1,
-	reactionCount: 0,
 	reactions: {},
 	reactionEmojis: {},
 	fileIds: [],
diff --git a/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue b/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue
index de251b3c59..9d976c4c6d 100644
--- a/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue
+++ b/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue
@@ -58,7 +58,6 @@ const exampleNote = reactive<Misskey.entities.Note>({
 	reactionAcceptance: null,
 	renoteCount: 0,
 	repliesCount: 1,
-	reactionCount: 0,
 	reactions: {},
 	reactionEmojis: {},
 	fileIds: ['0000000002'],
diff --git a/packages/frontend/src/components/MkVisibilityPicker.vue b/packages/frontend/src/components/MkVisibilityPicker.vue
index 95ad80959c..f328aa7c3a 100644
--- a/packages/frontend/src/components/MkVisibilityPicker.vue
+++ b/packages/frontend/src/components/MkVisibilityPicker.vue
@@ -9,21 +9,21 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<div :class="[$style.label, $style.item]">
 			{{ i18n.ts.visibility }}
 		</div>
-		<button key="public" :disabled="isSilenced || isReplyVisibilitySpecified" class="_button" :class="[$style.item, { [$style.active]: v === 'public' }]" data-index="1" @click="choose('public')">
+		<button key="public" :disabled="isSilenced" class="_button" :class="[$style.item, { [$style.active]: v === 'public' }]" data-index="1" @click="choose('public')">
 			<div :class="$style.icon"><i class="ti ti-world"></i></div>
 			<div :class="$style.body">
 				<span :class="$style.itemTitle">{{ i18n.ts._visibility.public }}</span>
 				<span :class="$style.itemDescription">{{ i18n.ts._visibility.publicDescription }}</span>
 			</div>
 		</button>
-		<button key="home" :disabled="isReplyVisibilitySpecified" class="_button" :class="[$style.item, { [$style.active]: v === 'home' }]" data-index="2" @click="choose('home')">
+		<button key="home" class="_button" :class="[$style.item, { [$style.active]: v === 'home' }]" data-index="2" @click="choose('home')">
 			<div :class="$style.icon"><i class="ti ti-home"></i></div>
 			<div :class="$style.body">
 				<span :class="$style.itemTitle">{{ i18n.ts._visibility.home }}</span>
 				<span :class="$style.itemDescription">{{ i18n.ts._visibility.homeDescription }}</span>
 			</div>
 		</button>
-		<button key="followers" :disabled="isReplyVisibilitySpecified" class="_button" :class="[$style.item, { [$style.active]: v === 'followers' }]" data-index="3" @click="choose('followers')">
+		<button key="followers" class="_button" :class="[$style.item, { [$style.active]: v === 'followers' }]" data-index="3" @click="choose('followers')">
 			<div :class="$style.icon"><i class="ti ti-lock"></i></div>
 			<div :class="$style.body">
 				<span :class="$style.itemTitle">{{ i18n.ts._visibility.followers }}</span>
@@ -55,7 +55,6 @@ const props = withDefaults(defineProps<{
 	isSilenced: boolean;
 	localOnly: boolean;
 	src?: HTMLElement;
-	isReplyVisibilitySpecified?: boolean;
 }>(), {
 });
 
diff --git a/packages/frontend/src/components/MkWelcomeToast.vue b/packages/frontend/src/components/MkWelcomeToast.vue
index a0d7d1e221..d67ae65588 100644
--- a/packages/frontend/src/components/MkWelcomeToast.vue
+++ b/packages/frontend/src/components/MkWelcomeToast.vue
@@ -1,8 +1,3 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
 <template>
 <div>
 	<Transition
diff --git a/packages/frontend/src/components/global/I18n.vue b/packages/frontend/src/components/global/I18n.vue
index 6b7723e6ac..162aa2bcf8 100644
--- a/packages/frontend/src/components/global/I18n.vue
+++ b/packages/frontend/src/components/global/I18n.vue
@@ -1,8 +1,3 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
 <template>
 <render/>
 </template>
diff --git a/packages/frontend/src/components/global/MkA.stories.impl.ts b/packages/frontend/src/components/global/MkA.stories.impl.ts
index c26cd7466a..44d7d876b5 100644
--- a/packages/frontend/src/components/global/MkA.stories.impl.ts
+++ b/packages/frontend/src/components/global/MkA.stories.impl.ts
@@ -32,8 +32,7 @@ export const Default = {
 	async play({ canvasElement }) {
 		const canvas = within(canvasElement);
 		const a = canvas.getByRole<HTMLAnchorElement>('link');
-		// FIXME: 通るけどその後落ちるのでコメントアウト
-		// await expect(a.href).toMatch(/^https?:\/\/.*#test$/);
+		await expect(a.href).toMatch(/^https?:\/\/.*#test$/);
 		await userEvent.pointer({ keys: '[MouseRight]', target: a });
 		await tick();
 		const menu = canvas.getByRole('menu');
@@ -45,7 +44,6 @@ export const Default = {
 	},
 	args: {
 		to: '#test',
-		behavior: 'browser',
 	},
 	parameters: {
 		layout: 'centered',
diff --git a/packages/frontend/src/components/global/MkA.vue b/packages/frontend/src/components/global/MkA.vue
index e4c3e188b9..48ed1e2f86 100644
--- a/packages/frontend/src/components/global/MkA.vue
+++ b/packages/frontend/src/components/global/MkA.vue
@@ -4,13 +4,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<a ref="el" v-vibrate="defaultStore.state.vibrateSystem ? 5 : []" :href="to" :class="active ? activeClass : null" @click.prevent.stop="nav" @contextmenu.prevent.stop="onContextmenu">
+<a v-vibrate="defaultStore.state.vibrateSystem ? 5 : []" :href="to" :class="active ? activeClass : null" @click.prevent.stop="nav" @contextmenu.prevent.stop="onContextmenu">
 	<slot></slot>
 </a>
 </template>
 
 <script lang="ts" setup>
-import { computed, shallowRef } from 'vue';
+import { computed } from 'vue';
 import * as os from '@/os.js';
 import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 import { url } from '@/config.js';
@@ -27,10 +27,6 @@ const props = withDefaults(defineProps<{
 	behavior: null,
 });
 
-const el = shallowRef<HTMLElement>();
-
-defineExpose({ $el: el });
-
 const router = useRouter();
 
 const active = computed(() => {
diff --git a/packages/frontend/src/components/global/MkAd.vue b/packages/frontend/src/components/global/MkAd.vue
index bdaa8a809f..8f5ed760d5 100644
--- a/packages/frontend/src/components/global/MkAd.vue
+++ b/packages/frontend/src/components/global/MkAd.vue
@@ -14,20 +14,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 			[$style.form_vertical]: chosen.place === 'vertical',
 		}]"
 	>
-		<component
-			:is="self ? 'MkA' : 'a'"
-			:class="$style.link"
-			v-bind="self ? {
-				to: chosen.url.substring(local.length),
-			} : {
-				href: chosen.url,
-				rel: 'nofollow noopener',
-				target: '_blank',
-			}"
-		>
+		<a :href="chosen.url" target="_blank" :class="$style.link">
 			<img :src="chosen.imageUrl" :class="$style.img">
 			<button class="_button" :class="$style.i" @click.prevent.stop="toggleMenu"><i :class="$style.iIcon" class="ti ti-info-circle"></i></button>
-		</component>
+		</a>
 	</div>
 	<div v-else :class="$style.menu">
 		<div :class="$style.menuContainer">
@@ -42,10 +32,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue';
+import { ref } from 'vue';
 import { i18n } from '@/i18n.js';
 import { instance } from '@/instance.js';
-import { url as local, host } from '@/config.js';
+import { host } from '@/config.js';
 import MkButton from '@/components/MkButton.vue';
 import { defaultStore } from '@/store.js';
 import * as os from '@/os.js';
@@ -106,9 +96,6 @@ const choseAd = (): Ad | null => {
 };
 
 const chosen = ref(choseAd());
-
-const self = computed(() => chosen.value?.url.startsWith(local));
-
 const shouldHide = ref(!defaultStore.state.forceShowAds && $i && $i.policies.canHideAds && (props.specify == null));
 
 function reduceFrequency(): void {
diff --git a/packages/frontend/src/components/global/MkCustomEmoji.stories.impl.ts b/packages/frontend/src/components/global/MkCustomEmoji.stories.impl.ts
index 18176ae601..9872761b98 100644
--- a/packages/frontend/src/components/global/MkCustomEmoji.stories.impl.ts
+++ b/packages/frontend/src/components/global/MkCustomEmoji.stories.impl.ts
@@ -48,18 +48,3 @@ export const Missing = {
 		name: Default.args.name,
 	},
 } satisfies StoryObj<typeof MkCustomEmoji>;
-export const ErrorToText = {
-	...Default,
-	args: {
-		url: 'https://example.com/404',
-		name: Default.args.name,
-	},
-} satisfies StoryObj<typeof MkCustomEmoji>;
-export const ErrorToImage = {
-	...Default,
-	args: {
-		url: 'https://example.com/404',
-		name: Default.args.name,
-		fallbackToImage: true,
-	},
-} satisfies StoryObj<typeof MkCustomEmoji>;
diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue
index d1df0b7ed7..52286203b4 100644
--- a/packages/frontend/src/components/global/MkCustomEmoji.vue
+++ b/packages/frontend/src/components/global/MkCustomEmoji.vue
@@ -4,13 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<img
-	v-if="errored && fallbackToImage"
-	:class="[$style.root, { [$style.normal]: normal, [$style.noStyle]: noStyle }]"
-	src="/client-assets/dummy.png"
-	:title="alt"
-/>
-<span v-else-if="errored">:{{ customEmojiName }}:</span>
+<span v-if="errored">:{{ customEmojiName }}:</span>
 <img
 	v-else
 	:class="[$style.root, { [$style.normal]: normal, [$style.noStyle]: noStyle }]"
@@ -50,7 +44,6 @@ const props = defineProps<{
 	useOriginalSize?: boolean;
 	menu?: boolean;
 	menuReaction?: boolean;
-	fallbackToImage?: boolean;
 }>();
 
 const react = inject<((name: string) => void) | null>('react', null);
diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue
index d457be9120..40036a264e 100644
--- a/packages/frontend/src/components/global/MkEmoji.vue
+++ b/packages/frontend/src/components/global/MkEmoji.vue
@@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { computed, inject } from 'vue';
-import { char2fluentEmojiFilePath, char2twemojiFilePath } from '@/scripts/emoji-base.js';
+import { char2twemojiFilePath, char2fluentEmojiFilePath } from '@/scripts/emoji-base.js';
 import { defaultStore } from '@/store.js';
 import { colorizeEmoji, getEmojiName } from '@/scripts/emojilist.js';
 import * as os from '@/os.js';
@@ -34,7 +34,8 @@ const colorizedNativeEmoji = computed(() => colorizeEmoji(props.emoji));
 
 // Searching from an array with 2000 items for every emoji felt like too energy-consuming, so I decided to do it lazily on pointerenter
 function computeTitle(event: PointerEvent): void {
-	(event.target as HTMLElement).title = getEmojiName(props.emoji);
+	const title = getEmojiName(props.emoji as string) ?? props.emoji as string;
+	(event.target as HTMLElement).title = title;
 }
 
 function onClick(ev: MouseEvent) {
diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index 7b8d10bf7f..d013dfd114 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -417,7 +417,6 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
 						useOriginalSize: scale >= 2.5,
 						menu: props.enableEmojiMenu,
 						menuReaction: props.enableEmojiMenuReaction,
-						fallbackToImage: false,
 					})];
 				} else {
 					// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
diff --git a/packages/frontend/src/components/global/MkTime.stories.impl.ts b/packages/frontend/src/components/global/MkTime.stories.impl.ts
index 355c839113..2b4b1485fd 100644
--- a/packages/frontend/src/components/global/MkTime.stories.impl.ts
+++ b/packages/frontend/src/components/global/MkTime.stories.impl.ts
@@ -10,7 +10,7 @@ import MkTime from './MkTime.vue';
 import { i18n } from '@/i18n.js';
 import { dateTimeFormat } from '@/scripts/intl-const.js';
 const now = new Date('2023-04-01T00:00:00.000Z');
-const future = new Date('2024-04-01T00:00:00.000Z');
+const future = new Date(8640000000000000);
 const oneHourAgo = new Date(now.getTime() - 3600000);
 const oneDayAgo = new Date(now.getTime() - 86400000);
 const oneWeekAgo = new Date(now.getTime() - 604800000);
@@ -49,12 +49,11 @@ export const Empty = {
 export const RelativeFuture = {
 	...Empty,
 	async play({ canvasElement }) {
-		await expect(canvasElement).toHaveTextContent(i18n.tsx._timeIn.years({ n: 1 })); // n (1) = future (2024) - now (2023)
+		await expect(canvasElement).toHaveTextContent(i18n.ts._ago.future);
 	},
 	args: {
 		...Empty.args,
 		time: future,
-		origin: now,
 	},
 } satisfies StoryObj<typeof MkTime>;
 export const AbsoluteFuture = {
diff --git a/packages/frontend/src/components/global/MkUrl.vue b/packages/frontend/src/components/global/MkUrl.vue
index a9c985b43e..2fcf823fc4 100644
--- a/packages/frontend/src/components/global/MkUrl.vue
+++ b/packages/frontend/src/components/global/MkUrl.vue
@@ -50,7 +50,7 @@ if (props.showUrlPreview) {
 		os.popup(defineAsyncComponent(() => import('@/components/MkUrlPreviewPopup.vue')), {
 			showing,
 			url: props.url,
-			source: el.value instanceof HTMLElement ? el.value : el.value?.$el,
+			source: el.value,
 		}, {}, 'closed');
 	});
 }
diff --git a/packages/frontend/src/components/page/page.image.vue b/packages/frontend/src/components/page/page.image.vue
index e5948eaebf..8fd60fb6ab 100644
--- a/packages/frontend/src/components/page/page.image.vue
+++ b/packages/frontend/src/components/page/page.image.vue
@@ -4,15 +4,19 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div :class="$style.root">
-	<MkMediaList v-if="image" :mediaList="[image]" :class="$style.mediaList"/>
+<div>
+	<MediaImage
+		v-if="image"
+		:image="image"
+		:disableImageLink="true"
+	/>
 </div>
 </template>
 
 <script lang="ts" setup>
 import { onMounted, ref } from 'vue';
 import * as Misskey from 'cherrypick-js';
-import MkMediaList from '@/components/MkMediaList.vue';
+import MediaImage from '@/components/MkMediaImage.vue';
 
 const props = defineProps<{
 	block: Misskey.entities.PageBlock,
@@ -24,17 +28,5 @@ const image = ref<Misskey.entities.DriveFile | null>(null);
 onMounted(() => {
 	image.value = props.page.attachedFiles.find(x => x.id === props.block.fileId) ?? null;
 });
-</script>
 
-<style lang="scss" module>
-.root {
-	border: 1px solid var(--divider);
-	border-radius: var(--radius);
-	overflow: hidden;
-}
-.mediaList {
-	// MkMediaList 内の上部マージン 4px
-	margin-top: -4px;
-	height: calc(100% + 4px);
-}
-</style>
+</script>
diff --git a/packages/frontend/src/components/page/page.note.vue b/packages/frontend/src/components/page/page.note.vue
index 5325f85253..aaec694708 100644
--- a/packages/frontend/src/components/page/page.note.vue
+++ b/packages/frontend/src/components/page/page.note.vue
@@ -4,9 +4,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div :class="$style.root">
-	<MkNote v-if="note && !block.detailed" :key="note.id + ':normal'" :note="note"/>
-	<MkNoteDetailed v-if="note && block.detailed" :key="note.id + ':detail'" :note="note"/>
+<div style="margin: 1em 0;">
+	<MkNote v-if="note && !block.detailed" :key="note.id + ':normal'" v-model:note="note"/>
+	<MkNoteDetailed v-if="note && block.detailed" :key="note.id + ':detail'" v-model:note="note"/>
 </div>
 </template>
 
@@ -32,10 +32,3 @@ onMounted(() => {
 		});
 });
 </script>
-
-<style lang="scss" module>
-.root {
-	border: 1px solid var(--divider);
-	border-radius: var(--radius);
-}
-</style>
diff --git a/packages/frontend/src/components/page/page.text.vue b/packages/frontend/src/components/page/page.text.vue
index 1d683c3c85..dbf25c1b13 100644
--- a/packages/frontend/src/components/page/page.text.vue
+++ b/packages/frontend/src/components/page/page.text.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div class="_gaps" :class="$style.textRoot">
+<div class="_gaps">
 	<Mfm :text="block.text ?? ''" :isNote="false"/>
 	<MkUrlPreview v-for="url in urls" :key="url" :url="url"/>
 </div>
@@ -25,9 +25,3 @@ const props = defineProps<{
 
 const urls = props.block.text ? extractUrlFromMfm(mfm.parse(props.block.text)) : [];
 </script>
-
-<style lang="scss" module>
-.textRoot {
-	font-size: 1.1rem;
-}
-</style>
diff --git a/packages/frontend/src/components/page/page.vue b/packages/frontend/src/components/page/page.vue
index 2592c7d384..8ebb1d2463 100644
--- a/packages/frontend/src/components/page/page.vue
+++ b/packages/frontend/src/components/page/page.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div :class="{ [$style.center]: page.alignCenter, [$style.serif]: page.font === 'serif' }" class="_gaps">
+<div :class="{ [$style.center]: page.alignCenter, [$style.serif]: page.font === 'serif' }" class="_gaps_s">
 	<XBlock v-for="child in page.content" :key="child.id" :page="page" :block="child" :h="2"/>
 </div>
 </template>
diff --git a/packages/frontend/src/const.ts b/packages/frontend/src/const.ts
index 9cec0f215d..b8b5502aa0 100644
--- a/packages/frontend/src/const.ts
+++ b/packages/frontend/src/const.ts
@@ -65,8 +65,8 @@ export const notificationTypes = [
 	'pollEnded',
 	'receiveFollowRequest',
 	'followRequestAccepted',
-	'groupInvited',
 	'roleAssigned',
+	'groupInvited',
 	'achievementEarned',
 	'app',
 ] as const;
@@ -77,7 +77,6 @@ export const ROLE_POLICIES = [
 	'ltlAvailable',
 	'canPublicNote',
 	'canEditNote',
-	'mentionLimit',
 	'canInvite',
 	'inviteLimit',
 	'inviteLimitCycle',
diff --git a/packages/frontend/src/directives/user-preview.ts b/packages/frontend/src/directives/user-preview.ts
index 7a008a4486..0d6c330da1 100644
--- a/packages/frontend/src/directives/user-preview.ts
+++ b/packages/frontend/src/directives/user-preview.ts
@@ -99,6 +99,7 @@ export class UserPreview {
 		this.el.removeEventListener('mouseover', this.onMouseover);
 		this.el.removeEventListener('mouseleave', this.onMouseleave);
 		this.el.removeEventListener('click', this.onClick);
+		window.clearInterval(this.checkTimer);
 	}
 }
 
diff --git a/packages/frontend/src/filters/kmg.ts b/packages/frontend/src/filters/kmg.ts
index 9608e420f6..4dcb5c5800 100644
--- a/packages/frontend/src/filters/kmg.ts
+++ b/packages/frontend/src/filters/kmg.ts
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export default (v, fractionDigits = 0) => {
 	if (v == null) return 'N/A';
 	if (v === 0) return '0';
diff --git a/packages/frontend/src/index.html b/packages/frontend/src/index.html
index 470463d307..ffee68043c 100644
--- a/packages/frontend/src/index.html
+++ b/packages/frontend/src/index.html
@@ -18,7 +18,7 @@
 		http-equiv="Content-Security-Policy"
 		content="default-src 'self' https://newassets.hcaptcha.com/ https://challenges.cloudflare.com/ http://localhost:7493/;
 			worker-src 'self';
-			script-src 'self' 'unsafe-eval' https://*.hcaptcha.com https://challenges.cloudflare.com https://esm.sh;
+			script-src 'self' 'unsafe-eval' https://*.hcaptcha.com https://challenges.cloudflare.com;
 			style-src 'self' 'unsafe-inline';
 			img-src 'self' data: blob: www.google.com xn--931a.moe localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000;
 			media-src 'self' localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000;
diff --git a/packages/frontend/src/instance.ts b/packages/frontend/src/instance.ts
index 980a52bfb1..74a14e2306 100644
--- a/packages/frontend/src/instance.ts
+++ b/packages/frontend/src/instance.ts
@@ -11,24 +11,13 @@ import { DEFAULT_INFO_IMAGE_URL, DEFAULT_NOT_FOUND_IMAGE_URL, DEFAULT_SERVER_ERR
 
 // TODO: 他のタブと永続化されたstateを同期
 
-//#region loader
-const providedMetaEl = document.getElementById('misskey_meta');
-
-let cachedMeta = miLocalStorage.getItem('instance') ? JSON.parse(miLocalStorage.getItem('instance')!) : null;
-let cachedAt = miLocalStorage.getItem('instanceCachedAt') ? parseInt(miLocalStorage.getItem('instanceCachedAt')!) : 0;
-const providedMeta = providedMetaEl && providedMetaEl.textContent ? JSON.parse(providedMetaEl.textContent) : null;
-const providedAt = providedMetaEl && providedMetaEl.dataset.generatedAt ? parseInt(providedMetaEl.dataset.generatedAt) : 0;
-if (providedAt > cachedAt) {
-	miLocalStorage.setItem('instance', JSON.stringify(providedMeta));
-	miLocalStorage.setItem('instanceCachedAt', providedAt.toString());
-	cachedMeta = providedMeta;
-	cachedAt = providedAt;
-}
-//#endregion
+const cached = miLocalStorage.getItem('instance');
 
 // TODO: instanceをリアクティブにするかは再考の余地あり
 
-export const instance: Misskey.entities.MetaResponse = reactive(cachedMeta ?? {});
+export const instance: Misskey.entities.MetaResponse = reactive(cached ? JSON.parse(cached) : {
+	// TODO: set default values
+});
 
 export const serverErrorImageUrl = computed(() => instance.serverErrorImageUrl ?? DEFAULT_SERVER_ERROR_IMAGE_URL);
 
@@ -36,15 +25,7 @@ export const infoImageUrl = computed(() => instance.infoImageUrl ?? DEFAULT_INFO
 
 export const notFoundImageUrl = computed(() => instance.notFoundImageUrl ?? DEFAULT_NOT_FOUND_IMAGE_URL);
 
-export async function fetchInstance(force = false): Promise<void> {
-	if (!force) {
-		const cachedAt = miLocalStorage.getItem('instanceCachedAt') ? parseInt(miLocalStorage.getItem('instanceCachedAt')!) : 0;
-
-		if (Date.now() - cachedAt < 1000 * 60 * 60) {
-			return;
-		}
-	}
-
+export async function fetchInstance() {
 	const meta = await misskeyApi('meta', {
 		detail: false,
 	});
@@ -54,5 +35,4 @@ export async function fetchInstance(force = false): Promise<void> {
 	}
 
 	miLocalStorage.setItem('instance', JSON.stringify(instance));
-	miLocalStorage.setItem('instanceCachedAt', Date.now().toString());
 }
diff --git a/packages/frontend/src/local-storage.ts b/packages/frontend/src/local-storage.ts
index c34e2886f7..00601860ad 100644
--- a/packages/frontend/src/local-storage.ts
+++ b/packages/frontend/src/local-storage.ts
@@ -9,7 +9,6 @@ type Keys =
 	'lastVersion' |
 	'lastBasedMisskeyVersion' |
 	'instance' |
-	'instanceCachedAt' |
 	'account' |
 	'accounts' |
 	'latestDonationInfoShownAt' |
diff --git a/packages/frontend/src/nirax.ts b/packages/frontend/src/nirax.ts
index 6a8ea09ed6..616fb104e6 100644
--- a/packages/frontend/src/nirax.ts
+++ b/packages/frontend/src/nirax.ts
@@ -373,7 +373,7 @@ export class Router extends EventEmitter<RouterEvent> implements IRouter {
 		this.currentRoute.value = res.route;
 		this.currentKey = res.route.globalCacheKey ?? key ?? path;
 
-		if (emitChange && res.route.path !== '/:(*)') {
+		if (emitChange) {
 			this.emit('change', {
 				beforePath,
 				path,
@@ -408,17 +408,13 @@ export class Router extends EventEmitter<RouterEvent> implements IRouter {
 			if (cancel) return;
 		}
 		const res = this.navigate(path, null);
-		if (res.route.path === '/:(*)') {
-			location.href = path;
-		} else {
-			this.emit('push', {
-				beforePath,
-				path: res._parsedRoute.fullPath,
-				route: res.route,
-				props: res.props,
-				key: this.currentKey,
-			});
-		}
+		this.emit('push', {
+			beforePath,
+			path: res._parsedRoute.fullPath,
+			route: res.route,
+			props: res.props,
+			key: this.currentKey,
+		});
 	}
 
 	public replace(path: string, key?: string | null) {
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index 189730330a..8c8000da21 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -7,9 +7,9 @@
 
 import { Component, markRaw, Ref, ref, defineAsyncComponent } from 'vue';
 import { EventEmitter } from 'eventemitter3';
+import insertTextAtCursor from 'insert-text-at-cursor';
 import * as Misskey from 'cherrypick-js';
-import type { ComponentProps as CP } from 'vue-component-type-helpers';
-import type { Form, GetFormResultType } from '@/scripts/form.js';
+import type { ComponentProps } from 'vue-component-type-helpers';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { i18n } from '@/i18n.js';
 import MkPostFormDialog from '@/components/MkPostFormDialog.vue';
@@ -20,6 +20,7 @@ import MkWelcomeToast from '@/components/MkWelcomeToast.vue';
 import MkDialog from '@/components/MkDialog.vue';
 import MkPasswordDialog from '@/components/MkPasswordDialog.vue';
 import MkEmojiPickerDialog from '@/components/MkEmojiPickerDialog.vue';
+import MkEmojiPickerWindow from '@/components/MkEmojiPickerWindow.vue';
 import MkPopupMenu from '@/components/MkPopupMenu.vue';
 import MkContextMenu from '@/components/MkContextMenu.vue';
 import { MenuItem } from '@/types/menu.js';
@@ -28,15 +29,15 @@ import { showMovedDialog } from '@/scripts/show-moved-dialog.js';
 
 export const openingWindowsCount = ref(0);
 
-export const apiWithDialog = (<E extends keyof Misskey.Endpoints = keyof Misskey.Endpoints, P extends Misskey.Endpoints[E]['req'] = Misskey.Endpoints[E]['req']>(
-	endpoint: E,
-	data: P = {} as any,
+export const apiWithDialog = ((
+	endpoint: string,
+	data: Record<string, any> = {},
 	token?: string | null | undefined,
 ) => {
 	const promise = misskeyApi(endpoint, data, token);
 	promiseDialog(promise, null, async (err) => {
-		let title: string | undefined;
-		let text = err.message + '\n' + err.id;
+		let title = null;
+		let text = err.message + '\n' + (err as any).id;
 		if (err.code === 'INTERNAL_ERROR') {
 			title = i18n.ts.internalServerError;
 			text = i18n.ts.internalServerErrorDescription;
@@ -88,7 +89,7 @@ export const apiWithDialog = (<E extends keyof Misskey.Endpoints = keyof Misskey
 export function promiseDialog<T extends Promise<any>>(
 	promise: T,
 	onSuccess?: ((res: any) => void) | null,
-	onFailure?: ((err: Misskey.api.APIError) => void) | null,
+	onFailure?: ((err: Error) => void) | null,
 	text?: string,
 ): T {
 	const showing = ref(true);
@@ -149,30 +150,14 @@ export function claimZIndex(priority: keyof typeof zIndexes = 'low'): number {
 // 使い物にならないので、代わりに ['$props'] から色々省くことで emit の型を生成する
 // FIXME: 何故か *.ts ファイルからだと型がうまく取れない？ことがあるのをなんとかしたい
 type ComponentEmit<T> = T extends new () => { $props: infer Props }
-	? [keyof Pick<T, Extract<keyof T, `on${string}`>>] extends [never]
-		? Record<string, unknown> // *.ts ファイルから型がうまく取れないとき用（これがないと {} になって型エラーがうるさい）
-		: EmitsExtractor<Props>
-	: T extends (...args: any) => any
-		? ReturnType<T> extends { [x: string]: any; __ctx?: { [x: string]: any; props: infer Props } }
-			? [keyof Pick<T, Extract<keyof T, `on${string}`>>] extends [never]
-				? Record<string, unknown>
-				: EmitsExtractor<Props>
-			: never
-		: never;
-
-// props に ref を許可するようにする
-type ComponentProps<T extends Component> = { [K in keyof CP<T>]: CP<T>[K] | Ref<CP<T>[K]> };
+	? EmitsExtractor<Props>
+	: never;
 
 type EmitsExtractor<T> = {
 	[K in keyof T as K extends `onVnode${string}` ? never : K extends `on${infer E}` ? Uncapitalize<E> : K extends string ? never : K]: T[K];
 };
 
-export async function popup<T extends Component>(
-	component: T,
-	props: ComponentProps<T>,
-	events: ComponentEmit<T> = {} as ComponentEmit<T>,
-	disposeEvent?: keyof ComponentEmit<T>,
-): Promise<{ dispose: () => void }> {
+export async function popup<T extends Component>(component: T, props: ComponentProps<T>, events: ComponentEmit<T> = {} as ComponentEmit<T>, disposeEvent?: keyof ComponentEmit<T>) {
 	markRaw(component);
 
 	const id = ++popupIdCount;
@@ -220,12 +205,12 @@ export function welcomeToast(message: string) {
 
 export function alert(props: {
 	type?: 'error' | 'info' | 'success' | 'warning' | 'waiting' | 'question';
-	title?: string;
-	text?: string;
+	title?: string | null;
+	text?: string | null;
 }): Promise<void> {
-	return new Promise(resolve => {
+	return new Promise((resolve, reject) => {
 		popup(MkDialog, props, {
-			done: () => {
+			done: result => {
 				resolve();
 			},
 		}, 'closed');
@@ -234,13 +219,13 @@ export function alert(props: {
 
 export function confirm(props: {
 	type: 'error' | 'info' | 'success' | 'warning' | 'waiting' | 'question';
-	title?: string;
-	text?: string;
+	title?: string | null;
+	text?: string | null;
 	caption?: string | null;
 	okText?: string;
 	cancelText?: string;
 }): Promise<{ canceled: boolean }> {
-	return new Promise(resolve => {
+	return new Promise((resolve, reject) => {
 		popup(MkDialog, {
 			...props,
 			showCancelButton: true,
@@ -261,15 +246,13 @@ export function actions<T extends {
 	danger?: boolean,
 }[]>(props: {
 	type: 'error' | 'info' | 'success' | 'warning' | 'waiting' | 'question';
-	title?: string;
-	text?: string;
+	title?: string | null;
+	text?: string | null;
 	actions: T;
-}): Promise<{
-	canceled: true; result: undefined;
-} | {
+}): Promise<{ canceled: true; result: undefined; } | {
 	canceled: false; result: T[number]['value'];
 }> {
-	return new Promise(resolve => {
+	return new Promise((resolve, reject) => {
 		popup(MkDialog, {
 			...props,
 			actions: props.actions.map(a => ({
@@ -288,50 +271,19 @@ export function actions<T extends {
 	});
 }
 
-// default が指定されていたら result は null になり得ないことを保証する overload function
-export function inputText(props: {
-	type?: 'text' | 'email' | 'password' | 'url';
-	title?: string;
-	text?: string;
-	placeholder?: string | null;
-	autocomplete?: string;
-	default: string;
-	minLength?: number;
-	maxLength?: number;
-}): Promise<{
-	canceled: true; result: undefined;
-} | {
-	canceled: false; result: string;
-}>;
-export function inputText(props: {
-	type?: 'text' | 'email' | 'password' | 'url';
-	title?: string;
-	text?: string;
-	placeholder?: string | null;
-	autocomplete?: string;
-	default?: string | null;
-	minLength?: number;
-	maxLength?: number;
-}): Promise<{
-	canceled: true; result: undefined;
-} | {
-	canceled: false; result: string | null;
-}>;
 export function inputText(props: {
 	type?: 'text' | 'email' | 'password' | 'url';
-	title?: string;
-	text?: string;
+	title?: string | null;
+	text?: string | null;
 	placeholder?: string | null;
 	autocomplete?: string;
 	default?: string | null;
 	minLength?: number;
 	maxLength?: number;
-}): Promise<{
-	canceled: true; result: undefined;
-} | {
-	canceled: false; result: string | null;
+}): Promise<{ canceled: true; result: undefined; } | {
+	canceled: false; result: string;
 }> {
-	return new Promise(resolve => {
+	return new Promise((resolve, reject) => {
 		popup(MkDialog, {
 			title: props.title,
 			text: props.text,
@@ -339,7 +291,7 @@ export function inputText(props: {
 				type: props.type,
 				placeholder: props.placeholder,
 				autocomplete: props.autocomplete,
-				default: props.default ?? null,
+				default: props.default,
 				minLength: props.minLength,
 				maxLength: props.maxLength,
 			},
@@ -351,41 +303,16 @@ export function inputText(props: {
 	});
 }
 
-// default が指定されていたら result は null になり得ないことを保証する overload function
-export function inputNumber(props: {
-	title?: string;
-	text?: string;
-	placeholder?: string | null;
-	autocomplete?: string;
-	default: number;
-}): Promise<{
-	canceled: true; result: undefined;
-} | {
-	canceled: false; result: number;
-}>;
-export function inputNumber(props: {
-	title?: string;
-	text?: string;
-	placeholder?: string | null;
-	autocomplete?: string;
-	default?: number | null;
-}): Promise<{
-	canceled: true; result: undefined;
-} | {
-	canceled: false; result: number | null;
-}>;
 export function inputNumber(props: {
-	title?: string;
-	text?: string;
+	title?: string | null;
+	text?: string | null;
 	placeholder?: string | null;
 	autocomplete?: string;
 	default?: number | null;
-}): Promise<{
-	canceled: true; result: undefined;
-} | {
-	canceled: false; result: number | null;
+}): Promise<{ canceled: true; result: undefined; } | {
+	canceled: false; result: number;
 }> {
-	return new Promise(resolve => {
+	return new Promise((resolve, reject) => {
 		popup(MkDialog, {
 			title: props.title,
 			text: props.text,
@@ -393,7 +320,7 @@ export function inputNumber(props: {
 				type: 'number',
 				placeholder: props.placeholder,
 				autocomplete: props.autocomplete,
-				default: props.default ?? null,
+				default: props.default,
 			},
 		}, {
 			done: result => {
@@ -404,38 +331,34 @@ export function inputNumber(props: {
 }
 
 export function inputDate(props: {
-	title?: string;
-	text?: string;
+	title?: string | null;
+	text?: string | null;
 	placeholder?: string | null;
-	default?: string | null;
-}): Promise<{
-	canceled: true; result: undefined;
-} | {
+	default?: Date | null;
+}): Promise<{ canceled: true; result: undefined; } | {
 	canceled: false; result: Date;
 }> {
-	return new Promise(resolve => {
+	return new Promise((resolve, reject) => {
 		popup(MkDialog, {
 			title: props.title,
 			text: props.text,
 			input: {
 				type: 'date',
 				placeholder: props.placeholder,
-				default: props.default ?? null,
+				default: props.default,
 			},
 		}, {
 			done: result => {
-				resolve(result ? { result: new Date(result.result), canceled: false } : { result: undefined, canceled: true });
+				resolve(result ? { result: new Date(result.result), canceled: false } : { canceled: true });
 			},
 		}, 'closed');
 	});
 }
 
-export function authenticateDialog(): Promise<{
-	canceled: true; result: undefined;
-} | {
+export function authenticateDialog(): Promise<{ canceled: true; result: undefined; } | {
 	canceled: false; result: { password: string; token: string | null; };
 }> {
-	return new Promise(resolve => {
+	return new Promise((resolve, reject) => {
 		popup(MkPasswordDialog, {}, {
 			done: result => {
 				resolve(result ? { canceled: false, result } : { canceled: true, result: undefined });
@@ -444,53 +367,34 @@ export function authenticateDialog(): Promise<{
 	});
 }
 
-// default が指定されていたら result は null になり得ないことを保証する overload function
-export function select<C = any>(props: {
-	title?: string;
-	text?: string;
-	default: string;
-	items: {
-		value: C;
-		text: string;
-	}[];
-}): Promise<{
-	canceled: true; result: undefined;
-} | {
-	canceled: false; result: C;
-}>;
 export function select<C = any>(props: {
-	title?: string;
-	text?: string;
+	title?: string | null;
+	text?: string | null;
 	default?: string | null;
+} & ({
 	items: {
 		value: C;
 		text: string;
 	}[];
-}): Promise<{
-	canceled: true; result: undefined;
 } | {
-	canceled: false; result: C | null;
-}>;
-export function select<C = any>(props: {
-	title?: string;
-	text?: string;
-	default?: string | null;
-	items: {
-		value: C;
-		text: string;
+	groupedItems: {
+		label: string;
+		items: {
+			value: C;
+			text: string;
+		}[];
 	}[];
-}): Promise<{
-	canceled: true; result: undefined;
-} | {
-	canceled: false; result: C | null;
+})): Promise<{ canceled: true; result: undefined; } | {
+	canceled: false; result: C;
 }> {
-	return new Promise(resolve => {
+	return new Promise((resolve, reject) => {
 		popup(MkDialog, {
 			title: props.title,
 			text: props.text,
 			select: {
 				items: props.items,
-				default: props.default ?? null,
+				groupedItems: props.groupedItems,
+				default: props.default,
 			},
 		}, {
 			done: result => {
@@ -501,7 +405,7 @@ export function select<C = any>(props: {
 }
 
 export function success(): Promise<void> {
-	return new Promise(resolve => {
+	return new Promise((resolve, reject) => {
 		const showing = ref(true);
 		window.setTimeout(() => {
 			showing.value = false;
@@ -516,7 +420,7 @@ export function success(): Promise<void> {
 }
 
 export function waiting(): Promise<void> {
-	return new Promise(resolve => {
+	return new Promise((resolve, reject) => {
 		const showing = ref(true);
 		popup(MkWaitingDialog, {
 			success: false,
@@ -527,9 +431,9 @@ export function waiting(): Promise<void> {
 	});
 }
 
-export function form<F extends Form>(title: string, f: F): Promise<{ canceled: true } | { result: GetFormResultType<F> }> {
-	return new Promise(resolve => {
-		popup(defineAsyncComponent(() => import('@/components/MkFormDialog.vue')), { title, form: f }, {
+export function form(title, form) {
+	return new Promise((resolve, reject) => {
+		popup(defineAsyncComponent(() => import('@/components/MkFormDialog.vue')), { title, form }, {
 			done: result => {
 				resolve(result);
 			},
@@ -538,7 +442,7 @@ export function form<F extends Form>(title: string, f: F): Promise<{ canceled: t
 }
 
 export async function selectUser(opts: { includeSelf?: boolean; localOnly?: boolean; } = {}): Promise<Misskey.entities.UserDetailed> {
-	return new Promise(resolve => {
+	return new Promise((resolve, reject) => {
 		popup(defineAsyncComponent(() => import('@/components/MkUserSelectDialog.vue')), {
 			includeSelf: opts.includeSelf,
 			localOnly: opts.localOnly,
@@ -551,7 +455,7 @@ export async function selectUser(opts: { includeSelf?: boolean; localOnly?: bool
 }
 
 export async function selectDriveFile(multiple: boolean): Promise<Misskey.entities.DriveFile[]> {
-	return new Promise(resolve => {
+	return new Promise((resolve, reject) => {
 		popup(defineAsyncComponent(() => import('@/components/MkDriveSelectDialog.vue')), {
 			type: 'file',
 			multiple,
@@ -565,23 +469,23 @@ export async function selectDriveFile(multiple: boolean): Promise<Misskey.entiti
 	});
 }
 
-export async function selectDriveFolder(multiple: boolean): Promise<Misskey.entities.DriveFolder[]> {
-	return new Promise(resolve => {
+export async function selectDriveFolder(multiple: boolean) {
+	return new Promise((resolve, reject) => {
 		popup(defineAsyncComponent(() => import('@/components/MkDriveSelectDialog.vue')), {
 			type: 'folder',
 			multiple,
 		}, {
 			done: folders => {
 				if (folders) {
-					resolve(folders);
+					resolve(multiple ? folders : folders[0]);
 				}
 			},
 		}, 'closed');
 	});
 }
 
-export async function pickEmoji(src: HTMLElement, opts: ComponentProps<typeof MkEmojiPickerDialog>): Promise<string> {
-	return new Promise(resolve => {
+export async function pickEmoji(src: HTMLElement | null, opts) {
+	return new Promise((resolve, reject) => {
 		popup(MkEmojiPickerDialog, {
 			src,
 			...opts,
@@ -597,7 +501,7 @@ export async function cropImage(image: Misskey.entities.DriveFile, options: {
 	aspectRatio: number;
 	uploadFolder?: string | null;
 }): Promise<Misskey.entities.DriveFile> {
-	return new Promise(resolve => {
+	return new Promise((resolve, reject) => {
 		popup(defineAsyncComponent(() => import('@/components/MkCropperDialog.vue')), {
 			file: image,
 			aspectRatio: options.aspectRatio,
@@ -610,13 +514,67 @@ export async function cropImage(image: Misskey.entities.DriveFile, options: {
 	});
 }
 
-export function popupMenu(items: MenuItem[], src?: HTMLElement | EventTarget | null, options?: {
+type AwaitType<T> =
+	T extends Promise<infer U> ? U :
+	T extends (...args: any[]) => Promise<infer V> ? V :
+	T;
+let openingEmojiPicker: AwaitType<ReturnType<typeof popup>> | null = null;
+let activeTextarea: HTMLTextAreaElement | HTMLInputElement | null = null;
+export async function openEmojiPicker(src?: HTMLElement, opts, initialTextarea: typeof activeTextarea) {
+	if (openingEmojiPicker) return;
+
+	activeTextarea = initialTextarea;
+
+	const textareas = document.querySelectorAll('textarea, input');
+	for (const textarea of Array.from(textareas)) {
+		textarea.addEventListener('focus', () => {
+			activeTextarea = textarea;
+		});
+	}
+
+	const observer = new MutationObserver(records => {
+		for (const record of records) {
+			for (const node of Array.from(record.addedNodes).filter(node => node instanceof HTMLElement) as HTMLElement[]) {
+				const textareas = node.querySelectorAll('textarea, input') as NodeListOf<NonNullable<typeof activeTextarea>>;
+				for (const textarea of Array.from(textareas).filter(textarea => textarea.dataset.preventEmojiInsert == null)) {
+					if (document.activeElement === textarea) activeTextarea = textarea;
+					textarea.addEventListener('focus', () => {
+						activeTextarea = textarea;
+					});
+				}
+			}
+		}
+	});
+
+	observer.observe(document.body, {
+		childList: true,
+		subtree: true,
+		attributes: false,
+		characterData: false,
+	});
+
+	openingEmojiPicker = await popup(MkEmojiPickerWindow, {
+		src,
+		...opts,
+	}, {
+		chosen: emoji => {
+			insertTextAtCursor(activeTextarea, emoji);
+		},
+		closed: () => {
+			openingEmojiPicker!.dispose();
+			openingEmojiPicker = null;
+			observer.disconnect();
+		},
+	});
+}
+
+export function popupMenu(items: MenuItem[] | Ref<MenuItem[]>, src?: HTMLElement | EventTarget | null, options?: {
 	align?: string;
 	width?: number;
 	viaKeyboard?: boolean;
 	onClosing?: () => void;
 }): Promise<void> {
-	return new Promise(resolve => {
+	return new Promise((resolve, reject) => {
 		let dispose;
 		popup(MkPopupMenu, {
 			items,
@@ -638,9 +596,9 @@ export function popupMenu(items: MenuItem[], src?: HTMLElement | EventTarget | n
 	});
 }
 
-export function contextMenu(items: MenuItem[], ev: MouseEvent): Promise<void> {
+export function contextMenu(items: MenuItem[] | Ref<MenuItem[]>, ev: MouseEvent): Promise<void> {
 	ev.preventDefault();
-	return new Promise(resolve => {
+	return new Promise((resolve, reject) => {
 		let dispose;
 		popup(MkContextMenu, {
 			items,
@@ -659,7 +617,7 @@ export function contextMenu(items: MenuItem[], ev: MouseEvent): Promise<void> {
 export function post(props: Record<string, any> = {}): Promise<void> {
 	showMovedDialog();
 
-	return new Promise(resolve => {
+	return new Promise((resolve, reject) => {
 		// NOTE: MkPostFormDialogをdynamic importするとiOSでテキストエリアに自動フォーカスできない
 		// NOTE: ただ、dynamic importしない場合、MkPostFormDialogインスタンスが使いまわされ、
 		//       Vueが渡されたコンポーネントに内部的に__propsというプロパティを生やす影響で、
diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index 99dbffb30d..e176071d14 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -16,7 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<div class="version" @click="whatIsNewCherryPick">v{{ version }}</div>
 						<div class="version" style="font-size: 11px;" @click="whatIsNewMisskey">v{{ basedMisskeyVersion }} (Based on Misskey)</div>
 						<span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }">
-							<MkCustomEmoji v-if="emoji.emoji[0] === ':'" class="emoji" :name="emoji.emoji" :normal="true" :noStyle="true" :fallbackToImage="true"/>
+							<MkCustomEmoji v-if="emoji.emoji[0] === ':'" class="emoji" :name="emoji.emoji" :normal="true" :noStyle="true"/>
 							<MkEmoji v-else class="emoji" :emoji="emoji.emoji" :normal="true" :noStyle="true"/>
 						</span>
 					</div>
@@ -312,15 +312,6 @@ const patronsWithIconWithMisskey = [{
 }, {
 	name: '有栖かずみ',
 	icon: 'https://assets.misskey-hub.net/patrons/9240e8e0ba294a8884143e99ac7ed6a0.jpg',
-}, {
-	name: 'イカロ(コアラ)',
-	icon: 'https://assets.misskey-hub.net/patrons/50b9bdc03735412c80807dbdf32cecb6.jpg',
-}, {
-	name: 'ハチノス３号',
-	icon: 'https://assets.misskey-hub.net/patrons/030347a6f8ce4e82bc5184b5aad09a18.jpg',
-}, {
-	name: 'Takeno',
-	icon: 'https://assets.misskey-hub.net/patrons/6fba81536aea48fe94a30909c502dfa1.jpg',
 }];
 
 const patronsWithCherryPick = [
@@ -427,8 +418,6 @@ const patronsWithMisskey = [
 	'てば',
 	'たっくん',
 	'SHO SEKIGUCHI',
-	'塩キャベツ',
-	'はとぽぷさん',
 ];
 
 let isKokonect = false;
diff --git a/packages/frontend/src/pages/admin/RolesEditorFormula.vue b/packages/frontend/src/pages/admin/RolesEditorFormula.vue
index 2f5b4c47d8..f4a8f44955 100644
--- a/packages/frontend/src/pages/admin/RolesEditorFormula.vue
+++ b/packages/frontend/src/pages/admin/RolesEditorFormula.vue
@@ -9,7 +9,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkSelect v-model="type" :class="$style.typeSelect">
 			<option value="isLocal">{{ i18n.ts._role._condition.isLocal }}</option>
 			<option value="isRemote">{{ i18n.ts._role._condition.isRemote }}</option>
-			<option value="roleAssignedTo">{{ i18n.ts._role._condition.roleAssignedTo }}</option>
 			<option value="createdLessThan">{{ i18n.ts._role._condition.createdLessThan }}</option>
 			<option value="createdMoreThan">{{ i18n.ts._role._condition.createdMoreThan }}</option>
 			<option value="followersLessThanOrEq">{{ i18n.ts._role._condition.followersLessThanOrEq }}</option>
@@ -52,10 +51,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 	<MkInput v-else-if="['followersLessThanOrEq', 'followersMoreThanOrEq', 'followingLessThanOrEq', 'followingMoreThanOrEq', 'notesLessThanOrEq', 'notesMoreThanOrEq'].includes(type)" v-model="v.value" type="number">
 	</MkInput>
-
-	<MkSelect v-else-if="type === 'roleAssignedTo'" v-model="v.roleId">
-		<option v-for="role in roles.filter(r => r.target === 'manual')" :key="role.id" :value="role.id">{{ role.name }}</option>
-	</MkSelect>
 </div>
 </template>
 
@@ -67,7 +62,6 @@ import MkSelect from '@/components/MkSelect.vue';
 import MkButton from '@/components/MkButton.vue';
 import { i18n } from '@/i18n.js';
 import { deepClone } from '@/scripts/clone.js';
-import { rolesCache } from '@/cache.js';
 
 const Sortable = defineAsyncComponent(() => import('vuedraggable').then(x => x.default));
 
@@ -83,8 +77,6 @@ const props = defineProps<{
 
 const v = ref(deepClone(props.modelValue));
 
-const roles = await rolesCache.fetch();
-
 watch(() => props.modelValue, () => {
 	if (JSON.stringify(props.modelValue) === JSON.stringify(v.value)) return;
 	v.value = deepClone(props.modelValue);
@@ -100,7 +92,6 @@ const type = computed({
 		if (t === 'and') v.value.values = [];
 		if (t === 'or') v.value.values = [];
 		if (t === 'not') v.value.value = { id: uuid(), type: 'isRemote' };
-		if (t === 'roleAssignedTo') v.value.roleId = '';
 		if (t === 'createdLessThan') v.value.sec = 86400;
 		if (t === 'createdMoreThan') v.value.sec = 86400;
 		if (t === 'followersLessThanOrEq') v.value.value = 10;
diff --git a/packages/frontend/src/pages/admin/bot-protection.vue b/packages/frontend/src/pages/admin/bot-protection.vue
index 73c5e1919f..e5e04fdeb8 100644
--- a/packages/frontend/src/pages/admin/bot-protection.vue
+++ b/packages/frontend/src/pages/admin/bot-protection.vue
@@ -142,7 +142,7 @@ function save() {
 		turnstileSiteKey: turnstileSiteKey.value,
 		turnstileSecretKey: turnstileSecretKey.value,
 	}).then(() => {
-		fetchInstance(true);
+		fetchInstance();
 	});
 }
 </script>
diff --git a/packages/frontend/src/pages/admin/branding.vue b/packages/frontend/src/pages/admin/branding.vue
index fe1b7c561d..2b559f92c9 100644
--- a/packages/frontend/src/pages/admin/branding.vue
+++ b/packages/frontend/src/pages/admin/branding.vue
@@ -169,7 +169,7 @@ function save() {
 		feedbackUrl: feedbackUrl.value === '' ? null : feedbackUrl.value,
 		manifestJsonOverride: manifestJsonOverride.value === '' ? '{}' : JSON.stringify(JSON5.parse(manifestJsonOverride.value)),
 	}).then(() => {
-		fetchInstance(true);
+		fetchInstance();
 	});
 }
 
diff --git a/packages/frontend/src/pages/admin/email-settings.vue b/packages/frontend/src/pages/admin/email-settings.vue
index 4a858887f3..839b9bee16 100644
--- a/packages/frontend/src/pages/admin/email-settings.vue
+++ b/packages/frontend/src/pages/admin/email-settings.vue
@@ -124,7 +124,7 @@ function save() {
 		smtpUser: smtpUser.value,
 		smtpPass: smtpPass.value,
 	}).then(() => {
-		fetchInstance(true);
+		fetchInstance();
 	});
 }
 
diff --git a/packages/frontend/src/pages/admin/external-services.vue b/packages/frontend/src/pages/admin/external-services.vue
index 754ff3b698..6ac1f79a59 100644
--- a/packages/frontend/src/pages/admin/external-services.vue
+++ b/packages/frontend/src/pages/admin/external-services.vue
@@ -123,7 +123,7 @@ function save() {
 		ctav3Model: ctav3Model.value,
 		ctav3Glossary: ctav3Glossary.value,
 	}).then(() => {
-		fetchInstance(true);
+		fetchInstance();
 	});
 }
 
diff --git a/packages/frontend/src/pages/admin/instance-block.vue b/packages/frontend/src/pages/admin/instance-block.vue
index 6b14bd42c2..5167b2e6b2 100644
--- a/packages/frontend/src/pages/admin/instance-block.vue
+++ b/packages/frontend/src/pages/admin/instance-block.vue
@@ -50,7 +50,7 @@ function save() {
 		silencedHosts: silencedHosts.value.split('\n') || [],
 
 	}).then(() => {
-		fetchInstance(true);
+		fetchInstance();
 	});
 }
 
diff --git a/packages/frontend/src/pages/admin/moderation.vue b/packages/frontend/src/pages/admin/moderation.vue
index 9efb34ac9a..d6cb1e39a7 100644
--- a/packages/frontend/src/pages/admin/moderation.vue
+++ b/packages/frontend/src/pages/admin/moderation.vue
@@ -110,7 +110,7 @@ function save() {
 		hiddenTags: hiddenTags.value.split('\n'),
 		preservedUsernames: preservedUsernames.value.split('\n'),
 	}).then(() => {
-		fetchInstance(true);
+		fetchInstance();
 	});
 }
 
diff --git a/packages/frontend/src/pages/admin/modlog.ModLog.vue b/packages/frontend/src/pages/admin/modlog.ModLog.vue
index d573b62824..778e62342c 100644
--- a/packages/frontend/src/pages/admin/modlog.ModLog.vue
+++ b/packages/frontend/src/pages/admin/modlog.ModLog.vue
@@ -110,12 +110,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<CodeDiff :context="5" :hideHeader="true" :oldString="JSON5.stringify(log.info.before, null, '\t')" :newString="JSON5.stringify(log.info.after, null, '\t')" language="javascript" maxHeight="300px"/>
 			</div>
 		</template>
-		<template v-else-if="log.type === 'updateRemoteInstanceNote'">
-			<div>{{ i18n.ts.user }}: {{ log.info.userId }}</div>
-			<div :class="$style.diff">
-				<CodeDiff :context="5" :hideHeader="true" :oldString="log.info.before ?? ''" :newString="log.info.after ?? ''" maxHeight="300px"/>
-			</div>
-		</template>
 
 		<details>
 			<summary>raw</summary>
diff --git a/packages/frontend/src/pages/admin/modlog.vue b/packages/frontend/src/pages/admin/modlog.vue
index d1a620bc5d..8dc93d92a8 100644
--- a/packages/frontend/src/pages/admin/modlog.vue
+++ b/packages/frontend/src/pages/admin/modlog.vue
@@ -54,6 +54,8 @@ const pagination = {
 	})),
 };
 
+console.log(Misskey);
+
 const headerActions = computed(() => []);
 
 const headerTabs = computed(() => []);
diff --git a/packages/frontend/src/pages/admin/object-storage.vue b/packages/frontend/src/pages/admin/object-storage.vue
index 794d301892..bff135b94f 100644
--- a/packages/frontend/src/pages/admin/object-storage.vue
+++ b/packages/frontend/src/pages/admin/object-storage.vue
@@ -259,7 +259,7 @@ function save() {
 		objectStorageRemoteSetPublicRead: objectStorageRemoteSetPublicRead.value,
 		objectStorageRemoteS3ForcePathStyle: objectStorageRemoteS3ForcePathStyle.value,
 	}).then(() => {
-		fetchInstance(true);
+		fetchInstance();
 	});
 }
 
diff --git a/packages/frontend/src/pages/admin/other-settings.vue b/packages/frontend/src/pages/admin/other-settings.vue
index b5f9740937..e708f16b4b 100644
--- a/packages/frontend/src/pages/admin/other-settings.vue
+++ b/packages/frontend/src/pages/admin/other-settings.vue
@@ -85,7 +85,7 @@ function save() {
 		enableChartsForFederatedInstances: enableChartsForFederatedInstances.value,
 		doNotSendNotificationEmailsForAbuseReport: doNotSendNotificationEmailsForAbuseReport.value,
 	}).then(() => {
-		fetchInstance(true);
+		fetchInstance();
 	});
 }
 
diff --git a/packages/frontend/src/pages/admin/proxy-account.vue b/packages/frontend/src/pages/admin/proxy-account.vue
index e7f103af79..2f06cafcba 100644
--- a/packages/frontend/src/pages/admin/proxy-account.vue
+++ b/packages/frontend/src/pages/admin/proxy-account.vue
@@ -56,7 +56,7 @@ function save() {
 	os.apiWithDialog('admin/update-meta', {
 		proxyAccountId: proxyAccountId.value,
 	}).then(() => {
-		fetchInstance(true);
+		fetchInstance();
 	});
 }
 
diff --git a/packages/frontend/src/pages/admin/roles.editor.vue b/packages/frontend/src/pages/admin/roles.editor.vue
index 1104f5f145..3c9696c883 100644
--- a/packages/frontend/src/pages/admin/roles.editor.vue
+++ b/packages/frontend/src/pages/admin/roles.editor.vue
@@ -180,25 +180,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</div>
 			</MkFolder>
 
-			<MkFolder v-if="matchQuery([i18n.ts._role._options.mentionMax, 'mentionLimit'])">
-				<template #label>{{ i18n.ts._role._options.mentionMax }}</template>
-				<template #suffix>
-					<span v-if="role.policies.mentionLimit.useDefault" :class="$style.useDefaultLabel">{{ i18n.ts._role.useBaseValue }}</span>
-					<span v-else>{{ role.policies.mentionLimit.value }}</span>
-					<span :class="$style.priorityIndicator"><i :class="getPriorityIcon(role.policies.mentionLimit)"></i></span>
-				</template>
-				<div class="_gaps">
-					<MkSwitch v-model="role.policies.mentionLimit.useDefault" :readonly="readonly">
-						<template #label>{{ i18n.ts._role.useBaseValue }}</template>
-					</MkSwitch>
-					<MkInput v-model="role.policies.mentionLimit.value" :disabled="role.policies.mentionLimit.useDefault" type="number" :readonly="readonly">
-					</MkInput>
-					<MkRange v-model="role.policies.mentionLimit.priority" :min="0" :max="2" :step="1" easing :textConverter="(v) => v === 0 ? i18n.ts._role._priority.low : v === 1 ? i18n.ts._role._priority.middle : v === 2 ? i18n.ts._role._priority.high : ''">
-						<template #label>{{ i18n.ts._role.priority }}</template>
-					</MkRange>
-				</div>
-			</MkFolder>
-
 			<MkFolder v-if="matchQuery([i18n.ts._role._options.canInvite, 'canInvite'])">
 				<template #label>{{ i18n.ts._role._options.canInvite }}</template>
 				<template #suffix>
diff --git a/packages/frontend/src/pages/admin/roles.vue b/packages/frontend/src/pages/admin/roles.vue
index ccdbbe48d5..f393cbb389 100644
--- a/packages/frontend/src/pages/admin/roles.vue
+++ b/packages/frontend/src/pages/admin/roles.vue
@@ -56,13 +56,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 							</MkSwitch>
 						</MkFolder>
 
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.mentionMax, 'mentionLimit'])">
-							<template #label>{{ i18n.ts._role._options.mentionMax }}</template>
-							<template #suffix>{{ policies.mentionLimit }}</template>
-							<MkInput v-model="policies.mentionLimit" type="number">
-							</MkInput>
-						</MkFolder>
-
 						<MkFolder v-if="matchQuery([i18n.ts._role._options.canInvite, 'canInvite'])">
 							<template #label>{{ i18n.ts._role._options.canInvite }}</template>
 							<template #suffix>{{ policies.canInvite ? i18n.ts.yes : i18n.ts.no }}</template>
diff --git a/packages/frontend/src/pages/admin/security.vue b/packages/frontend/src/pages/admin/security.vue
index c4745978df..fbf58ba35f 100644
--- a/packages/frontend/src/pages/admin/security.vue
+++ b/packages/frontend/src/pages/admin/security.vue
@@ -221,7 +221,7 @@ function save() {
 		truemailAuthKey: truemailAuthKey.value,
 		bannedEmailDomains: bannedEmailDomains.value.split('\n'),
 	}).then(() => {
-		fetchInstance(true);
+		fetchInstance();
 	});
 }
 
diff --git a/packages/frontend/src/pages/admin/server-rules.vue b/packages/frontend/src/pages/admin/server-rules.vue
index ff9b8d6299..87318bccce 100644
--- a/packages/frontend/src/pages/admin/server-rules.vue
+++ b/packages/frontend/src/pages/admin/server-rules.vue
@@ -58,7 +58,7 @@ const save = async () => {
 	await os.apiWithDialog('admin/update-meta', {
 		serverRules: serverRules.value,
 	});
-	fetchInstance(true);
+	fetchInstance();
 };
 
 const remove = (index: number): void => {
diff --git a/packages/frontend/src/pages/admin/settings.vue b/packages/frontend/src/pages/admin/settings.vue
index 7b617a0b17..efbe195f45 100644
--- a/packages/frontend/src/pages/admin/settings.vue
+++ b/packages/frontend/src/pages/admin/settings.vue
@@ -266,7 +266,7 @@ async function save(): void {
 		notesPerOneAd: notesPerOneAd.value,
 	});
 
-	fetchInstance(true);
+	fetchInstance();
 }
 
 const headerTabs = computed(() => []);
diff --git a/packages/frontend/src/pages/drop-and-fusion.game.vue b/packages/frontend/src/pages/drop-and-fusion.game.vue
index a8bb6fcc1a..eb07841339 100644
--- a/packages/frontend/src/pages/drop-and-fusion.game.vue
+++ b/packages/frontend/src/pages/drop-and-fusion.game.vue
@@ -7,7 +7,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 <MkSpacer :contentMax="800">
 	<div :class="$style.root">
 		<div v-if="!gameLoaded" :class="$style.loadingScreen">
-			<div>{{ i18n.ts.loading }}<MkEllipsis/></div>
+			<div>
+				Loading...
+			</div>
 		</div>
 		<!-- ↓に対してTransitionコンポーネントを使うと何故かkeyを指定していてもキャッシュが効かず様々なコンポーネントが都度再評価されてパフォーマンスが低下する -->
 		<div v-show="gameLoaded" class="_gaps_s">
@@ -30,18 +32,18 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</Transition>
 
 			<div :class="$style.header">
-				<div class="_woodenFrame" :class="[$style.headerTitle]">
-					<div class="_woodenFrameInner">
-						<b>{{ i18n.ts.bubbleGame }}</b>
-						<div>- {{ gameMode.toUpperCase() }} -</div>
+				<div :class="[$style.frame, $style.headerTitle]">
+					<div :class="$style.frameInner">
+						<b>BUBBLE GAME</b>
+						<div>- {{ gameMode }} -</div>
 					</div>
 				</div>
-				<div class="_woodenFrame _woodenFrameH">
-					<div class="_woodenFrameInner">
-						<MkButton inline small @click="hold">{{ i18n.ts._bubbleGame.hold }}</MkButton>
+				<div :class="[$style.frame, $style.frameH]">
+					<div :class="$style.frameInner">
+						<MkButton inline small @click="hold">HOLD</MkButton>
 						<img v-if="holdingStock" :src="getTextureImageUrl(holdingStock.mono)" style="width: 32px; margin-left: 8px; vertical-align: bottom;"/>
 					</div>
-					<div class="_woodenFrameInner" :class="$style.stock" style="text-align: center;">
+					<div :class="[$style.frameInner, $style.stock]" style="text-align: center;">
 						<TransitionGroup
 							:enterActiveClass="$style.transition_stock_enterActive"
 							:leaveActiveClass="$style.transition_stock_leaveActive"
@@ -88,74 +90,58 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<div v-if="isGameOver && !replaying" :class="$style.gameOverLabel">
 					<div class="_gaps_s">
 						<img src="/client-assets/drop-and-fusion/gameover.png" style="width: 200px; max-width: 100%; display: block; margin: auto; margin-bottom: -5px;"/>
-						<div>{{ i18n.ts._bubbleGame._score.score }}: <MkNumber :value="score"/>{{ getScoreUnit(gameMode) }}</div>
-						<div>{{ i18n.ts._bubbleGame._score.maxChain }}: <MkNumber :value="maxCombo"/></div>
-						<div v-if="gameMode === 'yen'">
-							{{ i18n.ts._bubbleGame._score.scoreYen }}:
-							<I18n :src="i18n.ts._bubbleGame._score.yen" tag="b">
-								<template #yen><MkNumber :value="yenTotal ?? score"/></template>
-							</I18n>
-						</div>
-						<I18n v-if="gameMode === 'sweets'" :src="i18n.ts._bubbleGame._score.scoreSweets" tag="div">
-							<template #onigiriQtyWithUnit>
-								<I18n :src="i18n.ts._bubbleGame._score.estimatedQty" tag="b">
-									<template #qty><MkNumber :value="score / 130"/></template>
-								</I18n>
-							</template>
-						</I18n>
+						<div>SCORE: <MkNumber :value="score"/>{{ getScoreUnit(gameMode) }}</div>
+						<div>MAX CHAIN: <MkNumber :value="maxCombo"/></div>
+						<div v-if="gameMode === 'yen'">TOTAL EARNINGS: <b><MkNumber :value="yenTotal ?? score"/>円</b></div>
+						<div v-if="gameMode === 'sweets'"><b>おにぎり<MkNumber :value="score / 130"/>個分</b></div>
 					</div>
 				</div>
 				<div v-if="replaying" :class="$style.replayIndicator"><span :class="$style.replayIndicatorText"><i class="ti ti-player-play"></i> {{ i18n.ts.replaying }}</span></div>
 			</div>
 
-			<div v-if="replaying" class="_woodenFrame">
-				<div class="_woodenFrameInner">
+			<div v-if="replaying" :class="$style.frame">
+				<div :class="$style.frameInner">
 					<div style="background: #0004;">
 						<div style="height: 10px; background: var(--accent); will-change: width;" :style="{ width: `${(currentFrame / endedAtFrame) * 100}%` }"></div>
 					</div>
 				</div>
-				<div class="_woodenFrameInner">
+				<div :class="$style.frameInner">
 					<div class="_buttonsCenter">
-						<MkButton @click="endReplay"><i class="ti ti-player-stop"></i> {{ i18n.ts.endReplay }}</MkButton>
+						<MkButton @click="endReplay"><i class="ti ti-player-stop"></i> END</MkButton>
 						<MkButton :primary="replayPlaybackRate === 4" @click="replayPlaybackRate = replayPlaybackRate === 4 ? 1 : 4"><i class="ti ti-player-track-next"></i> x4</MkButton>
 						<MkButton :primary="replayPlaybackRate === 16" @click="replayPlaybackRate = replayPlaybackRate === 16 ? 1 : 16"><i class="ti ti-player-track-next"></i> x16</MkButton>
 					</div>
 				</div>
 			</div>
 
-			<div v-if="isGameOver" class="_woodenFrame">
-				<div class="_woodenFrameInner">
+			<div v-if="isGameOver" :class="$style.frame">
+				<div :class="$style.frameInner">
 					<div class="_buttonsCenter">
 						<MkButton primary rounded @click="backToTitle">{{ i18n.ts.backToTitle }}</MkButton>
 						<MkButton primary rounded @click="replay">{{ i18n.ts.showReplay }}</MkButton>
 						<MkButton primary rounded @click="share">{{ i18n.ts.share }}</MkButton>
-						<MkButton rounded @click="exportLog">{{ i18n.ts.copyReplayData }}</MkButton>
+						<MkButton rounded @click="exportLog">Copy replay data</MkButton>
 					</div>
 				</div>
 			</div>
 
 			<div style="display: flex;">
-				<div class="_woodenFrame" style="flex: 1; margin-right: 10px;">
-					<div class="_woodenFrameInner">
-						<div>{{ i18n.ts._bubbleGame._score.score }}: <MkNumber :value="score"/>{{ getScoreUnit(gameMode) }}</div>
-						<div>{{ i18n.ts._bubbleGame._score.highScore }}: <b v-if="highScore"><MkNumber :value="highScore"/>{{ getScoreUnit(gameMode) }}</b><b v-else>-</b></div>
-						<div v-if="gameMode === 'yen'">
-							{{ i18n.ts._bubbleGame._score.scoreYen }}:
-							<I18n :src="i18n.ts._bubbleGame._score.yen" tag="b">
-								<template #yen><MkNumber :value="yenTotal ?? score"/></template>
-							</I18n>
-						</div>
+				<div :class="$style.frame" style="flex: 1; margin-right: 10px;">
+					<div :class="$style.frameInner">
+						<div>SCORE: <b><MkNumber :value="score"/>{{ getScoreUnit(gameMode) }}</b></div>
+						<div>HIGH SCORE: <b v-if="highScore"><MkNumber :value="highScore"/>{{ getScoreUnit(gameMode) }}</b><b v-else>-</b></div>
+						<div v-if="gameMode === 'yen'">TOTAL EARNINGS: <b v-if="yenTotal"><MkNumber :value="yenTotal"/>円</b><b v-else>-</b></div>
 					</div>
 				</div>
-				<div class="_woodenFrame" style="margin-left: auto;">
-					<div class="_woodenFrameInner" style="text-align: center;">
+				<div :class="[$style.frame]" style="margin-left: auto;">
+					<div :class="$style.frameInner" style="text-align: center;">
 						<div @click="showConfig = !showConfig"><i class="ti ti-settings"></i></div>
 					</div>
 				</div>
 			</div>
 
-			<div v-if="showConfig" class="_woodenFrame">
-				<div class="_woodenFrameInner">
+			<div v-if="showConfig" :class="$style.frame">
+				<div :class="$style.frameInner">
 					<div class="_gaps">
 						<MkRange v-model="bgmVolume" :min="0" :max="1" :step="0.01" :textConverter="(v) => `${Math.floor(v * 100)}%`" :continuousUpdate="true" @dragEnded="(v) => updateSettings('bgmVolume', v)">
 							<template #label>BGM {{ i18n.ts.volume }}</template>
@@ -167,8 +153,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</div>
 			</div>
 
-			<div class="_woodenFrame">
-				<div class="_woodenFrameInner">
+			<div :class="$style.frame">
+				<div :class="$style.frameInner">
 					<div>FUSION RECIPE</div>
 					<div>
 						<div v-for="(mono, i) in game.monoDefinitions.sort((a, b) => a.level - b.level)" :key="mono.id" style="display: inline-block;">
@@ -179,10 +165,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</div>
 			</div>
 
-			<div class="_woodenFrame">
-				<div class="_woodenFrameInner">
-					<MkButton v-if="!isGameOver && !replaying" full danger @click="surrender">{{ i18n.ts.surrender }}</MkButton>
-					<MkButton v-else full @click="restart">{{ i18n.ts.gameRetry }}</MkButton>
+			<div :class="$style.frame">
+				<div :class="$style.frameInner">
+					<MkButton v-if="!isGameOver && !replaying" full danger @click="surrender">Surrender</MkButton>
+					<MkButton v-else full @click="restart">Retry</MkButton>
 				</div>
 			</div>
 		</div>
@@ -1327,6 +1313,38 @@ definePageMetadata(() => ({
 	max-width: 100%;
 }
 
+.frame {
+	padding: 7px;
+	background: #8C4F26;
+	box-shadow: 0 6px 16px #0007, 0 0 1px 1px #693410, inset 0 0 2px 1px #ce8a5c;
+	border-radius: 10px;
+}
+
+.frameH {
+	display: flex;
+	gap: 6px;
+}
+
+.frameInner {
+	padding: 8px;
+	margin-top: 8px;
+	background: #F1E8DC;
+	box-shadow: 0 0 2px 1px #ce8a5c, inset 0 0 1px 1px #693410;
+	border-radius: 6px;
+	color: #693410;
+
+	&:first-child {
+		margin-top: 0;
+	}
+}
+
+.frameDivider {
+	height: 0;
+	border: none;
+	border-top: 1px solid #693410;
+	border-bottom: 1px solid #ce8a5c;
+}
+
 .header {
 	position: relative;
 	z-index: 10;
diff --git a/packages/frontend/src/pages/drop-and-fusion.vue b/packages/frontend/src/pages/drop-and-fusion.vue
index 54352c9b0d..1b11457988 100644
--- a/packages/frontend/src/pages/drop-and-fusion.vue
+++ b/packages/frontend/src/pages/drop-and-fusion.vue
@@ -15,13 +15,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<MkSpacer v-if="!gameStarted" :contentMax="800">
 		<div :class="$style.root">
 			<div class="_gaps">
-				<div class="_woodenFrame" style="text-align: center;">
-					<div class="_woodenFrameInner">
+				<div :class="$style.frame" style="text-align: center;">
+					<div :class="$style.frameInner">
 						<img src="/client-assets/drop-and-fusion/logo.png" style="display: block; max-width: 100%; max-height: 200px; margin: auto;"/>
 					</div>
 				</div>
-				<div class="_woodenFrame" style="text-align: center;">
-					<div class="_woodenFrameInner">
+				<div :class="$style.frame" style="text-align: center;">
+					<div :class="$style.frameInner">
 						<div class="_gaps" style="padding: 16px;">
 							<MkSelect v-model="gameMode">
 								<option value="normal">NORMAL</option>
@@ -33,7 +33,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 							<MkButton primary gradate large rounded inline @click="start">{{ i18n.ts.start }}</MkButton>
 						</div>
 					</div>
-					<div class="_woodenFrameInner">
+					<div :class="$style.frameInner">
 						<div class="_gaps" style="padding: 16px;">
 							<div style="font-size: 90%;"><i class="ti ti-music"></i> {{ i18n.ts.soundWillBePlayed }}</div>
 							<MkSwitch v-model="mute">
@@ -42,10 +42,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 						</div>
 					</div>
 				</div>
-				<div class="_woodenFrame">
-					<div class="_woodenFrameInner">
+				<div :class="$style.frame">
+					<div :class="$style.frameInner">
 						<div class="_gaps_s" style="padding: 16px;">
-							<div><b>{{ i18n.tsx.lastNDays({ n: 7 }) }} {{ i18n.ts.ranking }}</b> ({{ gameMode.toUpperCase() }})</div>
+							<div><b>{{ i18n.tsx.lastNDays({ n: 7 }) }} {{ i18n.ts.ranking }}</b> ({{ gameMode }})</div>
 							<div v-if="ranking" class="_gaps_s">
 								<div v-for="r in ranking" :key="r.id" :class="$style.rankingRecord">
 									<MkAvatar :link="true" style="width: 24px; height: 24px; margin-right: 4px;" :user="r.user"/>
@@ -57,8 +57,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 						</div>
 					</div>
 				</div>
-				<div class="_woodenFrame">
-					<div class="_woodenFrameInner" style="padding: 16px;">
+				<div :class="$style.frame">
+					<div :class="$style.frameInner" style="padding: 16px;">
 						<div style="font-weight: bold;">{{ i18n.ts._bubbleGame.howToPlay }}</div>
 						<ol>
 							<li>{{ i18n.ts._bubbleGame._howToPlay.section1 }}</li>
@@ -67,8 +67,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 						</ol>
 					</div>
 				</div>
-				<div class="_woodenFrame">
-					<div class="_woodenFrameInner">
+				<div :class="$style.frame">
+					<div :class="$style.frameInner">
 						<div class="_gaps_s" style="padding: 16px;">
 							<div><b>Credit</b></div>
 							<div>
@@ -149,6 +149,38 @@ definePageMetadata(() => ({
 	}
 }
 
+.frame {
+	padding: 7px;
+	background: #8C4F26;
+	box-shadow: 0 6px 16px #0007, 0 0 1px 1px #693410, inset 0 0 2px 1px #ce8a5c;
+	border-radius: 10px;
+}
+
+.frameH {
+	display: flex;
+	gap: 6px;
+}
+
+.frameInner {
+	padding: 8px;
+	margin-top: 8px;
+	background: #F1E8DC;
+	box-shadow: 0 0 2px 1px #ce8a5c, inset 0 0 1px 1px #693410;
+	border-radius: 6px;
+	color: #693410;
+
+	&:first-child {
+		margin-top: 0;
+	}
+}
+
+.frameDivider {
+	height: 0;
+	border: none;
+	border-top: 1px solid #693410;
+	border-bottom: 1px solid #ce8a5c;
+}
+
 .rankingRecord {
 	display: flex;
 	line-height: 24px;
diff --git a/packages/frontend/src/pages/emoji-edit-dialog.vue b/packages/frontend/src/pages/emoji-edit-dialog.vue
index d9cbb101f6..fc59b9cff7 100644
--- a/packages/frontend/src/pages/emoji-edit-dialog.vue
+++ b/packages/frontend/src/pages/emoji-edit-dialog.vue
@@ -136,7 +136,7 @@ async function addRole() {
 	const { canceled, result: role } = await os.select({
 		items: roles.filter(r => r.isPublic).filter(r => !currentRoleIds.includes(r.id)).map(r => ({ text: r.name, value: r })),
 	});
-	if (canceled || role == null) return;
+	if (canceled) return;
 
 	rolesThatCanBeUsedThisEmojiAsReaction.value.push(role);
 }
diff --git a/packages/frontend/src/pages/flash/flash-edit.vue b/packages/frontend/src/pages/flash/flash-edit.vue
index 2af2d2c530..c891847409 100644
--- a/packages/frontend/src/pages/flash/flash-edit.vue
+++ b/packages/frontend/src/pages/flash/flash-edit.vue
@@ -18,17 +18,16 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkCodeEditor v-model="script" lang="is">
 				<template #label>{{ i18n.ts._play.script }}</template>
 			</MkCodeEditor>
-			<MkSelect v-model="visibility">
-				<template #label>{{ i18n.ts.visibility }}</template>
-				<template #caption>{{ i18n.ts._play.visibilityDescription }}</template>
-				<option :key="'public'" :value="'public'">{{ i18n.ts.public }}</option>
-				<option :key="'private'" :value="'private'">{{ i18n.ts.private }}</option>
-			</MkSelect>
 			<div class="_buttons">
 				<MkButton primary @click="save"><i class="ti ti-check"></i> {{ i18n.ts.save }}</MkButton>
 				<MkButton @click="show"><i class="ti ti-eye"></i> {{ i18n.ts.show }}</MkButton>
 				<MkButton v-if="flash" danger @click="del"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
 			</div>
+			<MkSelect v-model="visibility">
+				<template #label>{{ i18n.ts.visibility }}</template>
+				<option :key="'public'" :value="'public'">{{ i18n.ts.public }}</option>
+				<option :key="'private'" :value="'private'">{{ i18n.ts.private }}</option>
+			</MkSelect>
 		</div>
 	</MkSpacer>
 </MkStickyContainer>
@@ -368,7 +367,7 @@ const props = defineProps<{
 }>();
 
 const flash = ref<Misskey.entities.Flash | null>(null);
-const visibility = ref<'private' | 'public'>('public');
+const visibility = ref<Misskey.entities.FlashUpdateRequest['visibility']>('public');
 
 if (props.id) {
 	flash.value = await misskeyApi('flash/show', {
@@ -421,7 +420,6 @@ async function save() {
 			summary: summary.value,
 			permissions: permissions.value,
 			script: script.value,
-			visibility: visibility.value,
 		});
 		router.push('/play/' + created.id + '/edit');
 	}
diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index f14da9a1c8..eb939b98eb 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -39,9 +39,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<MkSwitch v-model="isBlocked" :disabled="!meta || !instance" @update:modelValue="toggleBlock">{{ i18n.ts.blockThisInstance }}</MkSwitch>
 						<MkSwitch v-model="isSilenced" :disabled="!meta || !instance" @update:modelValue="toggleSilenced">{{ i18n.ts.silenceThisInstance }}</MkSwitch>
 						<MkButton @click="refreshMetadata"><i class="ti ti-refresh"></i> Refresh metadata</MkButton>
-						<MkTextarea v-model="moderationNote" manualSave>
-							<template #label>{{ i18n.ts.moderationNote }}</template>
-						</MkTextarea>
 					</div>
 				</FormSection>
 
@@ -122,7 +119,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, watch } from 'vue';
+import { ref, computed } from 'vue';
 import * as Misskey from 'cherrypick-js';
 import MkChart from '@/components/MkChart.vue';
 import MkObjectView from '@/components/MkObjectView.vue';
@@ -144,7 +141,6 @@ import MkPagination from '@/components/MkPagination.vue';
 import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 import { getProxiedImageUrlNullable } from '@/scripts/media-proxy.js';
 import { dateString } from '@/filters/date.js';
-import MkTextarea from '@/components/MkTextarea.vue';
 
 const props = defineProps<{
 	host: string;
@@ -159,7 +155,6 @@ const suspended = ref(false);
 const isBlocked = ref(false);
 const isSilenced = ref(false);
 const faviconUrl = ref<string | null>(null);
-const moderationNote = ref('');
 
 const usersPagination = {
 	endpoint: iAmModerator ? 'admin/show-users' : 'users' as const,
@@ -172,10 +167,6 @@ const usersPagination = {
 	offsetMode: true,
 };
 
-watch(moderationNote, async () => {
-	await misskeyApi('admin/federation/update-instance', { host: instance.value.host, moderationNote: moderationNote.value });
-});
-
 async function fetch(): Promise<void> {
 	if (iAmAdmin) {
 		meta.value = await misskeyApi('admin/meta');
@@ -187,7 +178,6 @@ async function fetch(): Promise<void> {
 	isBlocked.value = instance.value?.isBlocked ?? false;
 	isSilenced.value = instance.value?.isSilenced ?? false;
 	faviconUrl.value = getProxiedImageUrlNullable(instance.value?.faviconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.value?.iconUrl, 'preview');
-	moderationNote.value = instance.value?.moderationNote;
 }
 
 async function toggleBlock(): Promise<void> {
diff --git a/packages/frontend/src/pages/notifications.vue b/packages/frontend/src/pages/notifications.vue
index 3c2b18e723..cfbd8caf95 100644
--- a/packages/frontend/src/pages/notifications.vue
+++ b/packages/frontend/src/pages/notifications.vue
@@ -58,7 +58,7 @@ const directNotesPagination = {
 function setFilter(ev) {
 	const typeItems = notificationTypes.map(t => ({
 		text: i18n.ts._notification._types[t],
-		active: (includeTypes.value && includeTypes.value.includes(t)) ?? false,
+		active: includeTypes.value && includeTypes.value.includes(t),
 		action: () => {
 			includeTypes.value = [t];
 		},
@@ -69,7 +69,7 @@ function setFilter(ev) {
 		action: () => {
 			includeTypes.value = null;
 		},
-	}, { type: 'divider' as const }, ...typeItems] : typeItems;
+	}, { type: 'divider' }, ...typeItems] : typeItems;
 	os.popupMenu(items, ev.currentTarget ?? ev.target);
 }
 
diff --git a/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue b/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue
index 79b0d684d8..8ce7942be9 100644
--- a/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue
+++ b/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue
@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <XContainer :draggable="true" @remove="() => $emit('remove')">
 	<template #header><i class="ti ti-note"></i> {{ i18n.ts._pages.blocks.note }}</template>
 
-	<section style="padding: 16px;" class="_gaps_s">
+	<section style="padding: 0 16px 0 16px;">
 		<MkInput v-model="id">
 			<template #label>{{ i18n.ts._pages.blocks._note.id }}</template>
 			<template #caption>{{ i18n.ts._pages.blocks._note.idDescription }}</template>
diff --git a/packages/frontend/src/pages/page-editor/page-editor.vue b/packages/frontend/src/pages/page-editor/page-editor.vue
index 26a06b847d..3516ff338c 100644
--- a/packages/frontend/src/pages/page-editor/page-editor.vue
+++ b/packages/frontend/src/pages/page-editor/page-editor.vue
@@ -286,8 +286,8 @@ const headerTabs = computed(() => [{
 
 definePageMetadata(() => ({
 	title: props.initPageId ? i18n.ts._pages.editPage
-	: props.initPageName && props.initUser ? i18n.ts._pages.readPage
-	: i18n.ts._pages.newPage,
+				: props.initPageName && props.initUser ? i18n.ts._pages.readPage
+				: i18n.ts._pages.newPage,
 	icon: 'ti ti-pencil',
 }));
 </script>
diff --git a/packages/frontend/src/pages/page.vue b/packages/frontend/src/pages/page.vue
index b7cce821b7..54afa399e8 100644
--- a/packages/frontend/src/pages/page.vue
+++ b/packages/frontend/src/pages/page.vue
@@ -6,73 +6,48 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <MkStickyContainer>
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :contentMax="800">
-		<Transition
-			:enterActiveClass="defaultStore.state.animation ? $style.fadeEnterActive : ''"
-			:leaveActiveClass="defaultStore.state.animation ? $style.fadeLeaveActive : ''"
-			:enterFromClass="defaultStore.state.animation ? $style.fadeEnterFrom : ''"
-			:leaveToClass="defaultStore.state.animation ? $style.fadeLeaveTo : ''"
-		>
-			<div v-if="page" :key="page.id" class="_gaps">
-				<div :class="$style.pageMain">
-					<div :class="$style.pageBanner">
-						<div :class="$style.pageBannerBgRoot">
-							<MkImgWithBlurhash
-								v-if="page.eyeCatchingImageId"
-								:class="$style.pageBannerBg"
-								:hash="page.eyeCatchingImage?.blurhash"
-								:cover="true"
-								:forceBlurhash="true"
-							/>
-							<img
-								v-else-if="instance.backgroundImageUrl || instance.bannerUrl"
-								:class="[$style.pageBannerBg, $style.pageBannerBgFallback1]"
-								:src="getStaticImageUrl(instance.backgroundImageUrl ?? instance.bannerUrl!)"
-							/>
-							<div v-else :class="[$style.pageBannerBg, $style.pageBannerBgFallback2]"></div>
-						</div>
-						<div v-if="page.eyeCatchingImageId" :class="$style.pageBannerImage">
-							<MkMediaImage
-								:image="page.eyeCatchingImage!"
-								:cover="true"
-								:disableImageLink="true"
-								:class="$style.thumbnail"
-							/>
-						</div>
-						<div :class="$style.pageBannerTitle" class="_gaps_s">
-							<h1>{{ page.title || page.name }}</h1>
-							<div v-if="page.user" :class="$style.pageBannerTitleUser">
-								<MkAvatar :user="page.user" :class="$style.avatar" indicator link preview/> <MkA :to="`/@${username}`"><MkUserName :user="page.user" :nowrap="false"/></MkA>
-							</div>
-						</div>
+	<MkSpacer :contentMax="700">
+		<Transition :name="defaultStore.state.animation ? 'fade' : ''" mode="out-in">
+			<div v-if="page" :key="page.id" class="xcukqgmh">
+				<div class="main">
+					<!--
+				<div class="header">
+					<h1>{{ page.title }}</h1>
+				</div>
+				-->
+					<div class="banner">
+						<MkMediaImage
+							v-if="page.eyeCatchingImageId"
+							:image="page.eyeCatchingImage"
+							:cover="true"
+							:disableImageLink="true"
+							class="thumbnail"
+						/>
 					</div>
-					<div :class="$style.pageContent">
+					<div class="content">
 						<XPage :page="page"/>
 					</div>
-					<div :class="$style.pageActions">
-						<div>
+					<div class="actions">
+						<div class="like">
 							<MkButton v-if="page.isLiked" v-tooltip="i18n.ts._pages.unlike" class="button" asLike primary @click="unlike()"><i class="ti ti-heart-off"></i><span v-if="page.likedCount > 0" class="count">{{ page.likedCount }}</span></MkButton>
 							<MkButton v-else v-tooltip="i18n.ts._pages.like" class="button" asLike @click="like()"><i class="ti ti-heart"></i><span v-if="page.likedCount > 0" class="count">{{ page.likedCount }}</span></MkButton>
 						</div>
-						<div :class="$style.other">
-							<button v-tooltip="i18n.ts.copyLink" class="_button" :class="$style.generalActionButton" @click="copyLink"><i class="ti ti-link ti-fw"></i></button>
-							<button v-tooltip="i18n.ts.share" class="_button" :class="$style.generalActionButton" @click="share"><i class="ti ti-share ti-fw"></i></button>
+						<div class="other">
+							<button v-tooltip="i18n.ts.shareWithNote" v-click-anime class="_button" @click="shareWithNote"><i class="ti ti-repeat ti-fw"></i></button>
+							<button v-tooltip="i18n.ts.copyLink" v-click-anime class="_button" @click="copyLink"><i class="ti ti-link ti-fw"></i></button>
+							<button v-if="isSupportShare()" v-tooltip="i18n.ts.share" v-click-anime class="_button" @click="share"><i class="ti ti-share ti-fw"></i></button>
 						</div>
 					</div>
-					<div :class="$style.pageUser">
-						<MkAvatar :user="page.user" :class="$style.avatar" link preview/>
-						<MkA :to="`/@${username}`">
-							<MkUserName :user="page.user" :class="$style.name"/>
-							<MkAcct :user="page.user" :class="$style.acct"/>
-						</MkA>
-						<MkFollowButton v-if="!$i || $i.id != page.user.id" :user="page.user!" :inline="true" :transparent="false" :full="true" :class="$style.follow"/>
-					</div>
-					<div :class="$style.pageDate">
-						<div><i class="ti ti-clock"></i> {{ i18n.ts.createdAt }}: <MkTime :time="page.createdAt" mode="detail"/></div>
-						<div v-if="page.createdAt != page.updatedAt"><i class="ti ti-clock-edit"></i> {{ i18n.ts.updatedAt }}: <MkTime :time="page.updatedAt" mode="detail"/></div>
+					<div class="user">
+						<MkAvatar :user="page.user" class="avatar" link preview/>
+						<div class="name">
+							<MkUserName :user="page.user" style="display: block;"/>
+							<MkAcct :user="page.user"/>
+						</div>
+						<MkFollowButton v-if="!$i || $i.id != page.user.id" :user="page.user" :inline="true" :transparent="false" :full="true" large class="koudoku"/>
 					</div>
-					<div :class="$style.pageLinks">
-						<MkA v-if="!$i || $i.id !== page.userId" :to="`/@${username}/pages/${pageName}/view-source`" class="link">{{ i18n.ts._pages.viewSource }}</MkA>
+					<div class="links">
+						<MkA :to="`/@${username}/pages/${pageName}/view-source`" class="link">{{ i18n.ts._pages.viewSource }}</MkA>
 						<template v-if="$i && $i.id === page.userId">
 							<MkA :to="`/pages/edit/${page.id}`" class="link">{{ i18n.ts._pages.editThisPage }}</MkA>
 							<button v-if="$i.pinnedPageId === page.id" class="link _textButton" @click="pin(false)">{{ i18n.ts.unpin }}</button>
@@ -80,6 +55,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 						</template>
 					</div>
 				</div>
+				<div class="footer">
+					<div><i class="ti ti-clock"></i> {{ i18n.ts.createdAt }}: <MkTime :time="page.createdAt" mode="detail"/></div>
+					<div v-if="page.createdAt != page.updatedAt"><i class="ti ti-clock"></i> {{ i18n.ts.updatedAt }}: <MkTime :time="page.updatedAt" mode="detail"/></div>
+				</div>
 				<MkAd :prefer="['horizontal', 'horizontal-big']"/>
 				<MkContainer :max-height="300" :foldable="true" class="other">
 					<template #icon><i class="ti ti-clock"></i></template>
@@ -105,7 +84,6 @@ import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { url } from '@/config.js';
 import MkMediaImage from '@/components/MkMediaImage.vue';
-import MkImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
 import MkFollowButton from '@/components/MkFollowButton.vue';
 import MkContainer from '@/components/MkContainer.vue';
 import MkPagination from '@/components/MkPagination.vue';
@@ -116,8 +94,6 @@ import { pageViewInterruptors, defaultStore } from '@/store.js';
 import { deepClone } from '@/scripts/clone.js';
 import { $i } from '@/account.js';
 import { isSupportShare } from '@/scripts/navigator.js';
-import { instance } from '@/instance.js';
-import { getStaticImageUrl } from '@/scripts/media-proxy.js';
 import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 
 const props = defineProps<{
@@ -157,63 +133,35 @@ function fetchPage() {
 	});
 }
 
-function share(ev: MouseEvent) {
-	if (!page.value) return;
-
-	os.popupMenu([
-		{
-			text: i18n.ts.shareWithNote,
-			icon: 'ti ti-pencil',
-			action: shareWithNote,
-		},
-		...(isSupportShare() ? [{
-			text: i18n.ts.share,
-			icon: 'ti ti-share',
-			action: shareWithNavigator,
-		}] : []),
-	], ev.currentTarget ?? ev.target);
+function share() {
+	navigator.share({
+		title: page.value.title ?? page.value.name,
+		text: page.value.summary,
+		url: `${url}/@${page.value.user.username}/pages/${page.value.name}`,
+	});
 }
 
 function copyLink() {
-	if (!page.value) return;
-
 	copyToClipboard(`${url}/@${page.value.user.username}/pages/${page.value.name}`);
 	os.success();
 }
 
 function shareWithNote() {
-	if (!page.value) return;
-
 	os.post({
-		initialText: `${page.value.title || page.value.name}\n${url}/@${page.value.user.username}/pages/${page.value.name}`,
-		instant: true,
-	});
-}
-
-function shareWithNavigator() {
-	if (!page.value) return;
-
-	navigator.share({
-		title: page.value.title ?? page.value.name,
-		text: page.value.summary ?? undefined,
-		url: `${url}/@${page.value.user.username}/pages/${page.value.name}`,
+		initialText: `${page.value.title || page.value.name} ${url}/@${page.value.user.username}/pages/${page.value.name}`,
 	});
 }
 
 function like() {
-	if (!page.value) return;
-
 	os.apiWithDialog('pages/like', {
 		pageId: page.value.id,
 	}).then(() => {
-		page.value!.isLiked = true;
-		page.value!.likedCount++;
+		page.value.isLiked = true;
+		page.value.likedCount++;
 	});
 }
 
 async function unlike() {
-	if (!page.value) return;
-
 	const confirm = await os.confirm({
 		type: 'warning',
 		text: i18n.ts.unlikeConfirm,
@@ -222,14 +170,12 @@ async function unlike() {
 	os.apiWithDialog('pages/unlike', {
 		pageId: page.value.id,
 	}).then(() => {
-		page.value!.isLiked = false;
-		page.value!.likedCount--;
+		page.value.isLiked = false;
+		page.value.likedCount--;
 	});
 }
 
 function pin(pin) {
-	if (!page.value) return;
-
 	os.apiWithDialog('i/update', {
 		pinnedPageId: pin ? page.value.id : null,
 	});
@@ -254,185 +200,109 @@ definePageMetadata(() => ({
 }));
 </script>
 
-<style lang="scss" module>
-.fadeEnterActive,
-.fadeLeaveActive {
+<style lang="scss" scoped>
+.fade-enter-active,
+.fade-leave-active {
 	transition: opacity 0.125s ease;
 }
-.fadeEnterFrom,
-.fadeLeaveTo {
+.fade-enter-from,
+.fade-leave-to {
 	opacity: 0;
 }
 
-.generalActionButton {
-	height: 2.5rem;
-	width: 2.5rem;
-	text-align: center;
-	border-radius: 99rem;
+.xcukqgmh {
+	> .main {
+		padding: 32px;
 
-	& :global(.ti) {
-		line-height: 2.5rem;
-	}
-
-	&:hover,
-	&:focus-visible {
-		background-color: var(--accentedBg);
-		color: var(--accent);
-		text-decoration: none;
-	}
-}
-
-.pageMain {
-	border-radius: var(--radius);
-	padding: 2rem;
-	background: var(--panel);
-	box-sizing: border-box;
-}
-
-.pageBanner {
-	width: calc(100% + 4rem);
-	margin: -2rem -2rem 1.5rem;
-	border-radius: var(--radius) var(--radius) 0 0;
-	overflow: hidden;
-	position: relative;
-
-	> .pageBannerBgRoot {
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		overflow: hidden;
-
-		.pageBannerBg {
-			width: 100%;
-			height: 100%;
-			object-fit: cover;
-			opacity: .2;
-			filter: brightness(1.2);
-		}
+		> .header {
+			padding: 16px;
 
-		.pageBannerBgFallback1 {
-			filter: blur(20px);
-		}
-
-		.pageBannerBgFallback2 {
-			background-color: var(--accentedBg);
+			> h1 {
+				margin: 0;
+			}
 		}
 
-		&::after {
-			content: '';
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 100%;
-			height: 100px;
-			background: linear-gradient(0deg, var(--panel), transparent);
+		> .banner {
+			> .thumbnail {
+				// TODO: 良い感じのアスペクト比で表示
+				display: block;
+				width: 100%;
+				height: auto;
+				aspect-ratio: 3/1;
+				border-radius: var(--radius);
+				overflow: hidden;
+				object-fit: cover;
+			}
 		}
-	}
-
-	> .pageBannerImage {
-		position: relative;
-		padding-top: 56.25%;
 
-		> .thumbnail {
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 100%;
+		> .content {
+			margin-top: 16px;
+			padding: 16px 0 0 0;
 		}
-	}
 
-	> .pageBannerTitle {
-		position: relative;
-		padding: 1.5rem 2rem;
+		> .actions {
+			display: flex;
+			align-items: center;
+			margin-top: 16px;
+			padding: 16px 0 0 0;
+			border-top: solid 0.5px var(--divider);
 
-		h1 {
-			font-size: 2rem;
-			font-weight: 700;
-			color: var(--fg);
-			margin: 0;
-		}
+			> .other {
+				margin-left: auto;
 
-		.pageBannerTitleUser {
-			--height: 32px;
+				> button {
+					padding: 8px;
+					margin: 0 8px;
 
-			.avatar {
-				height: var(--height);
-				width: var(--height);
+					&:hover {
+						color: var(--fgHighlighted);
+					}
+				}
 			}
-
-			line-height: var(--height);
 		}
-	}
-}
-
-.pageContent {
-	margin-bottom: 1.5rem;
-}
-
-.pageActions {
-	display: flex;
-	align-items: center;
-
-	border-top: 1px solid var(--divider);
-	padding-top: 1.5rem;
-	margin-bottom: 1.5rem;
-
-	> .other {
-		margin-left: auto;
-		display: flex;
-		gap: var(--marginHalf);
-	}
-}
 
-.pageUser {
-	display: flex;
-	align-items: center;
+		> .user {
+			margin-top: 16px;
+			padding: 16px 0 0 0;
+			border-top: solid 0.5px var(--divider);
+			display: flex;
+			align-items: center;
 
-	border-top: 1px solid var(--divider);
-	padding-top: 1.5rem;
-	margin-bottom: 1.5rem;
+			> .avatar {
+				width: 52px;
+				height: 52px;
+			}
 
-	.avatar,
-	.name,
-	.acct {
-		display: block;
-	}
+			> .name {
+				margin: 0 0 0 12px;
+				font-size: 90%;
+			}
 
-	.avatar {
-		width: 4rem;
-		height: 4rem;
-		margin-right: 1rem;
-	}
+			> .koudoku {
+				margin-left: auto;
+			}
+		}
 
-	.name {
-		font-size: 110%;
-		font-weight: 700;
-	}
+		> .links {
+			margin-top: 16px;
+			padding: 24px 0 0 0;
+			border-top: solid 0.5px var(--divider);
 
-	.acct {
-		font-size: 90%;
-		opacity: 0.7;
+			> .link {
+				margin-right: 0.75em;
+			}
+		}
 	}
 
-	.follow {
-		margin-left: auto;
+	> .footer {
+		margin: var(--margin) 0 var(--margin) 0;
+		font-size: 85%;
+		opacity: 0.75;
 	}
 }
+</style>
 
-.pageDate {
-	margin-bottom: 1.5rem;
-}
-
-.pageLinks {
-	display: flex;
-	align-items: center;
-	flex-wrap: wrap;
-	gap: var(--marginHalf);
-}
-
+<style module>
 .relatedPagesRoot {
 	padding: var(--margin);
 }
diff --git a/packages/frontend/src/pages/reversi/game.board.vue b/packages/frontend/src/pages/reversi/game.board.vue
index 07b3cf5baf..7e55d91b74 100644
--- a/packages/frontend/src/pages/reversi/game.board.vue
+++ b/packages/frontend/src/pages/reversi/game.board.vue
@@ -34,7 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 		</div>
 
-		<div class="_woodenFrame">
+		<div :class="$style.board">
 			<div :class="$style.boardInner">
 				<div v-if="showBoardLabels" :class="$style.labelsX">
 					<span v-for="i in game.map[0].length" :key="i" :class="$style.labelsXLabel">{{ String.fromCharCode(64 + i) }}</span>
@@ -128,8 +128,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkFolder>
 			<template #label>{{ i18n.ts.options }}</template>
 			<div class="_gaps_s" style="text-align: left;">
-				<MkSwitch v-model="showBoardLabels">{{ i18n.ts._reversi.showBoardLabels }}</MkSwitch>
-				<MkSwitch v-model="useAvatarAsStone">{{ i18n.ts._reversi.useAvatarAsStone }}</MkSwitch>
+				<MkSwitch v-model="showBoardLabels">Show labels</MkSwitch>
+				<MkSwitch v-model="useAvatarAsStone">useAvatarAsStone</MkSwitch>
 			</div>
 		</MkFolder>
 
@@ -268,7 +268,7 @@ if (game.value.isStarted && !game.value.isEnded) {
 			crc32: crc32.toString(),
 		}).then((res) => {
 			if (res.desynced) {
-				if (_DEV_) console.log('resynced');
+				console.log('resynced');
 				restoreGame(res.game!);
 			}
 		});
@@ -538,6 +538,17 @@ $gap: 4px;
 	text-align: center;
 }
 
+.board {
+	width: 100%;
+	box-sizing: border-box;
+	margin: 0 auto;
+
+	padding: 7px;
+	background: #8C4F26;
+	box-shadow: 0 6px 16px #0007, 0 0 1px 1px #693410, inset 0 0 2px 1px #ce8a5c;
+	border-radius: 12px;
+}
+
 .boardInner {
 	padding: 32px;
 
diff --git a/packages/frontend/src/pages/settings/drive.vue b/packages/frontend/src/pages/settings/drive.vue
index b79a6522be..1ad78c93dd 100644
--- a/packages/frontend/src/pages/settings/drive.vue
+++ b/packages/frontend/src/pages/settings/drive.vue
@@ -123,7 +123,7 @@ if (defaultStore.state.uploadFolder) {
 
 function chooseUploadFolder() {
 	os.selectDriveFolder(false).then(async folder => {
-		defaultStore.set('uploadFolder', folder[0] ? folder[0].id : null);
+		defaultStore.set('uploadFolder', folder ? folder.id : null);
 		os.success();
 		if (defaultStore.state.uploadFolder) {
 			uploadFolder.value = await misskeyApi('drive/folders/show', {
diff --git a/packages/frontend/src/pages/settings/emoji-picker.vue b/packages/frontend/src/pages/settings/emoji-picker.vue
index dc3e3ee503..79969427ec 100644
--- a/packages/frontend/src/pages/settings/emoji-picker.vue
+++ b/packages/frontend/src/pages/settings/emoji-picker.vue
@@ -23,7 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					>
 						<template #item="{element}">
 							<button class="_button" :class="$style.emojisItem" @click="removeReaction(element, $event)">
-								<MkCustomEmoji v-if="element[0] === ':'" :name="element" :normal="true" :fallbackToImage="true"/>
+								<MkCustomEmoji v-if="element[0] === ':'" :name="element" :normal="true"/>
 								<MkEmoji v-else :emoji="element" :normal="true"/>
 							</button>
 						</template>
@@ -63,7 +63,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					>
 						<template #item="{element}">
 							<button class="_button" :class="$style.emojisItem" @click="removeEmoji(element, $event)">
-								<MkCustomEmoji v-if="element[0] === ':'" :name="element" :normal="true" :fallbackToImage="true"/>
+								<MkCustomEmoji v-if="element[0] === ':'" :name="element" :normal="true"/>
 								<MkEmoji v-else :emoji="element" :normal="true"/>
 							</button>
 						</template>
@@ -213,7 +213,7 @@ async function pickEmoji(itemsRef: Ref<string[]>, ev: MouseEvent) {
 	os.pickEmoji(getHTMLElement(ev), {
 		showPinned: false,
 	}).then(it => {
-		const emoji = it;
+		const emoji = it as string;
 		if (!itemsRef.value.includes(emoji)) {
 			itemsRef.value.push(emoji);
 		}
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 3416bc0524..e44db14650 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -66,7 +66,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</div>
 				</div>
 				<MkSwitch v-if="advancedMfm" v-model="enableQuickAddMfmFunction">{{ i18n.ts.enableQuickAddMfmFunction }}</MkSwitch>
-				<MkSwitch v-model="showReactionsCount">{{ i18n.ts.showReactionsCount }}</MkSwitch>
 				<MkSwitch v-model="showGapBetweenNotesInTimeline">{{ i18n.ts.showGapBetweenNotesInTimeline }}</MkSwitch>
 				<MkSwitch v-model="loadRawImages">{{ i18n.ts.loadRawImages }}</MkSwitch>
 				<MkRadios v-model="reactionsDisplaySize">
@@ -410,7 +409,6 @@ const removeModalBgColorForBlur = computed(defaultStore.makeGetterSetter('remove
 const showGapBetweenNotesInTimeline = computed(defaultStore.makeGetterSetter('showGapBetweenNotesInTimeline'));
 const animatedMfm = computed(defaultStore.makeGetterSetter('animatedMfm'));
 const advancedMfm = computed(defaultStore.makeGetterSetter('advancedMfm'));
-const showReactionsCount = computed(defaultStore.makeGetterSetter('showReactionsCount'));
 const enableQuickAddMfmFunction = computed(defaultStore.makeGetterSetter('enableQuickAddMfmFunction'));
 const emojiStyle = computed(defaultStore.makeGetterSetter('emojiStyle'));
 const disableDrawer = computed(defaultStore.makeGetterSetter('disableDrawer'));
@@ -466,7 +464,7 @@ watch(fontSize, () => {
 	if (fontSize.value == null) {
 		miLocalStorage.removeItem('fontSize');
 	} else {
-		miLocalStorage.setItem('fontSize', fontSize.value as number);
+		miLocalStorage.setItem('fontSize', fontSize.value as string);
 	}
 });
 
diff --git a/packages/frontend/src/pages/settings/notifications.notification-config.vue b/packages/frontend/src/pages/settings/notifications.notification-config.vue
index c74b325ba5..5f5a44c976 100644
--- a/packages/frontend/src/pages/settings/notifications.notification-config.vue
+++ b/packages/frontend/src/pages/settings/notifications.notification-config.vue
@@ -10,7 +10,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<option value="following">{{ i18n.ts.following }}</option>
 		<option value="follower">{{ i18n.ts.followers }}</option>
 		<option value="mutualFollow">{{ i18n.ts.mutualFollow }}</option>
-		<option value="followingOrFollower">{{ i18n.ts.followingOrFollower }}</option>
 		<option value="list">{{ i18n.ts.userList }}</option>
 		<option value="never">{{ i18n.ts.none }}</option>
 	</MkSelect>
diff --git a/packages/frontend/src/pages/settings/notifications.vue b/packages/frontend/src/pages/settings/notifications.vue
index 9ba0b8dfd4..cd20f87953 100644
--- a/packages/frontend/src/pages/settings/notifications.vue
+++ b/packages/frontend/src/pages/settings/notifications.vue
@@ -16,7 +16,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 						$i.notificationRecieveConfig[type]?.type === 'following' ? i18n.ts.following :
 						$i.notificationRecieveConfig[type]?.type === 'follower' ? i18n.ts.followers :
 						$i.notificationRecieveConfig[type]?.type === 'mutualFollow' ? i18n.ts.mutualFollow :
-						$i.notificationRecieveConfig[type]?.type === 'followingOrFollower' ? i18n.ts.followingOrFollower :
 						$i.notificationRecieveConfig[type]?.type === 'list' ? i18n.ts.userList :
 						i18n.ts.all
 					}}
@@ -36,7 +35,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<FormSection>
 		<div class="_gaps_m">
 			<FormLink @click="testNotification">{{ i18n.ts._notification.sendTestNotification }}</FormLink>
-			<FormLink @click="flushNotification">{{ i18n.ts._notification.flushNotification }}</FormLink>
 		</div>
 	</FormSection>
 	<FormSection>
@@ -120,17 +118,6 @@ function testNotification(): void {
 	misskeyApi('notifications/test-notification');
 }
 
-async function flushNotification() {
-	const { canceled } = await os.confirm({
-		type: 'warning',
-		text: i18n.ts.resetAreYouSure,
-	});
-
-	if (canceled) return;
-
-	os.apiWithDialog('notifications/flush');
-}
-
 const headerActions = computed(() => []);
 
 const headerTabs = computed(() => []);
diff --git a/packages/frontend/src/pages/settings/plugin.vue b/packages/frontend/src/pages/settings/plugin.vue
index 9804454e66..0ab75b95a2 100644
--- a/packages/frontend/src/pages/settings/plugin.vue
+++ b/packages/frontend/src/pages/settings/plugin.vue
@@ -41,26 +41,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkButton inline danger @click="uninstall(plugin)"><i class="ti ti-trash"></i> {{ i18n.ts.uninstall }}</MkButton>
 				</div>
 
-				<MkFolder>
-					<template #icon><i class="ti ti-terminal-2"></i></template>
-					<template #label>{{ i18n.ts._plugin.viewLog }}</template>
-
-					<div class="_gaps_s">
-						<div class="_buttons">
-							<MkButton inline @click="copy(pluginLogs.get(plugin.id)?.join('\n'))"><i class="ti ti-copy"></i> {{ i18n.ts.copy }}</MkButton>
-						</div>
-
-						<MkCode :code="pluginLogs.get(plugin.id)?.join('\n') ?? ''"/>
-					</div>
-				</MkFolder>
-
 				<MkFolder>
 					<template #icon><i class="ti ti-code"></i></template>
 					<template #label>{{ i18n.ts._plugin.viewSource }}</template>
 
 					<div class="_gaps_s">
 						<div class="_buttons">
-							<MkButton inline @click="copy(plugin.src)"><i class="ti ti-copy"></i> {{ i18n.ts.copy }}</MkButton>
+							<MkButton inline @click="copy(plugin)"><i class="ti ti-copy"></i> {{ i18n.ts.copy }}</MkButton>
 						</div>
 
 						<MkCode :code="plugin.src ?? ''" lang="is"/>
@@ -87,7 +74,6 @@ import { ColdDeviceStorage } from '@/store.js';
 import { unisonReload } from '@/scripts/unison-reload.js';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
-import { pluginLogs } from '@/plugin.js';
 
 const plugins = ref(ColdDeviceStorage.get('plugins'));
 
@@ -101,8 +87,8 @@ async function uninstall(plugin) {
 	});
 }
 
-function copy(text) {
-	copyToClipboard(text ?? '');
+function copy(plugin) {
+	copyToClipboard(plugin.src ?? '');
 	os.success();
 }
 
diff --git a/packages/frontend/src/pages/settings/preferences-backups.vue b/packages/frontend/src/pages/settings/preferences-backups.vue
index 57036a177f..3ec2a46d3e 100644
--- a/packages/frontend/src/pages/settings/preferences-backups.vue
+++ b/packages/frontend/src/pages/settings/preferences-backups.vue
@@ -70,7 +70,6 @@ const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [
 	'animation',
 	'animatedMfm',
 	'advancedMfm',
-	'showReactionsCount',
 	'loadRawImages',
 	'imageNewTab',
 	'dataSaver',
@@ -245,7 +244,6 @@ async function saveNew(): Promise<void> {
 
 	const { canceled, result: name } = await os.inputText({
 		title: ts._preferencesBackups.inputName,
-		default: '',
 	});
 	if (canceled) return;
 
@@ -416,7 +414,6 @@ async function rename(id: string): Promise<void> {
 
 	const { canceled: cancel1, result: name } = await os.inputText({
 		title: ts._preferencesBackups.inputName,
-		default: '',
 	});
 	if (cancel1 || profiles.value[id].name === name) return;
 
diff --git a/packages/frontend/src/pages/welcome.entrance.a.vue b/packages/frontend/src/pages/welcome.entrance.a.vue
index 853d208e5e..dfcca1aa8b 100644
--- a/packages/frontend/src/pages/welcome.entrance.a.vue
+++ b/packages/frontend/src/pages/welcome.entrance.a.vue
@@ -9,10 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<XTimeline class="tl"/>
 	<div class="shape1"></div>
 	<div class="shape2"></div>
-	<div class="logo-wrapper">
-		<div class="powered-by">Powered by</div>
-		<img :src="cherrypicksvg" class="cherrypick"/>
-	</div>
+	<img :src="cherrypicksvg" class="cherrypick"/>
 	<div class="emojis">
 		<MkEmoji :normal="true" :noStyle="true" emoji="👍"/>
 		<MkEmoji :normal="true" :noStyle="true" emoji="❤"/>
@@ -117,31 +114,14 @@ misskeyApiGet('federation/instances', {
 		opacity: 0.5;
 	}
 
-	> .logo-wrapper {
+	> .cherrypick, .misskey {
 		position: fixed;
-		top: 36px;
-		left: 36px;
-		flex: auto;
-		color: #fff;
-		user-select: none;
-		pointer-events: none;
-
-		> .powered-by {
-			margin-bottom: 2px;
-		}
-
-		> .misskey {
-			width: 140px;
-			@media (max-width: 450px) {
-				width: 130px;
-			}
-		}
+		top: 42px;
+		left: 42px;
+		width: 180px;
 
-		> .cherrypick {
-			width: 180px;
-			@media (max-width: 450px) {
-				width: 130px;
-			}
+		@media (max-width: 450px) {
+			width: 130px;
 		}
 	}
 
diff --git a/packages/frontend/src/plugin.ts b/packages/frontend/src/plugin.ts
index a7b3d9705d..8fb42b2aae 100644
--- a/packages/frontend/src/plugin.ts
+++ b/packages/frontend/src/plugin.ts
@@ -3,14 +3,12 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { ref } from 'vue';
 import { Interpreter, Parser, utils, values } from '@syuilo/aiscript';
 import { aiScriptReadline, createAiScriptEnv } from '@/scripts/aiscript/api.js';
 import { Plugin, noteActions, notePostInterruptors, noteViewInterruptors, postFormActions, userActions, pageViewInterruptors } from '@/store.js';
 
 const parser = new Parser();
 const pluginContexts = new Map<string, Interpreter>();
-export const pluginLogs = ref(new Map<string, string[]>());
 
 export async function install(plugin: Plugin): Promise<void> {
 	// 後方互換性のため
@@ -23,27 +21,21 @@ export async function install(plugin: Plugin): Promise<void> {
 		in: aiScriptReadline,
 		out: (value): void => {
 			console.log(value);
-			pluginLogs.value.get(plugin.id).push(utils.reprValue(value));
 		},
 		log: (): void => {
 		},
-		err: (err): void => {
-			pluginLogs.value.get(plugin.id).push(`${err}`);
-			throw err; // install時のtry-catchに反応させる
-		},
 	});
 
 	initPlugin({ plugin, aiscript });
 
-	aiscript.exec(parser.parse(plugin.src)).then(
-		() => {
-			console.info('Plugin installed:', plugin.name, 'v' + plugin.version);
-		},
-		(err) => {
-			console.error('Plugin install failed:', plugin.name, 'v' + plugin.version);
-			throw err;
-		},
-	);
+	try {
+		await aiscript.exec(parser.parse(plugin.src));
+	} catch (err) {
+		console.error('Plugin install failed:', plugin.name, 'v' + plugin.version);
+		return;
+	}
+
+	console.info('Plugin installed:', plugin.name, 'v' + plugin.version);
 }
 
 function createPluginEnv(opts: { plugin: Plugin; storageKey: string }): Record<string, values.Value> {
@@ -99,7 +91,6 @@ function createPluginEnv(opts: { plugin: Plugin; storageKey: string }): Record<s
 
 function initPlugin({ plugin, aiscript }): void {
 	pluginContexts.set(plugin.id, aiscript);
-	pluginLogs.value.set(plugin.id, []);
 }
 
 function registerPostFormAction({ pluginId, title, handler }): void {
diff --git a/packages/frontend/src/scripts/add-dividers-between-menu-sections.ts b/packages/frontend/src/scripts/add-dividers-between-menu-sections.ts
index 050c0f5cc1..31c941dc3b 100644
--- a/packages/frontend/src/scripts/add-dividers-between-menu-sections.ts
+++ b/packages/frontend/src/scripts/add-dividers-between-menu-sections.ts
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 import { MenuItem } from '@/types/menu.js';
 
 // Add dividers between menu sections. if some menu section has menu item
diff --git a/packages/frontend/src/scripts/autocomplete.ts b/packages/frontend/src/scripts/autocomplete.ts
index 10022c107e..2558667e0e 100644
--- a/packages/frontend/src/scripts/autocomplete.ts
+++ b/packages/frontend/src/scripts/autocomplete.ts
@@ -99,7 +99,7 @@ export class Autocomplete {
 
 		const isMention = mentionIndex !== -1;
 		const isHashtag = hashtagIndex !== -1;
-		const isMfmParam = mfmParamIndex !== -1 && afterLastMfmParam?.includes('.') && !afterLastMfmParam.includes(' ');
+		const isMfmParam = mfmParamIndex !== -1 && afterLastMfmParam?.includes('.') && !afterLastMfmParam?.includes(' ');
 		const isMfmTag = mfmTagIndex !== -1 && !isMfmParam;
 		const isHtmlTag = htmlTagIndex !== -1;
 		const isEmoji = emojiIndex !== -1 && text.split(/:[a-z0-9_+\-]+:/).pop()!.includes(':');
diff --git a/packages/frontend/src/scripts/check-reaction-permissions.ts b/packages/frontend/src/scripts/check-reaction-permissions.ts
index cb58b03dc0..e60fa3cc94 100644
--- a/packages/frontend/src/scripts/check-reaction-permissions.ts
+++ b/packages/frontend/src/scripts/check-reaction-permissions.ts
@@ -1,15 +1,6 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 import * as Misskey from 'cherrypick-js';
-import { UnicodeEmojiDef } from './emojilist.js';
-
-export function checkReactionPermissions(me: Misskey.entities.MeDetailed, note: Misskey.entities.Note, emoji: Misskey.entities.EmojiSimple | UnicodeEmojiDef | string): boolean {
-	if (typeof emoji === 'string') return true; // UnicodeEmojiDefにも無い絵文字であれば文字列で来る。Unicode絵文字であることには変わりないので常にリアクション可能とする;
-	if ('char' in emoji) return true; // UnicodeEmojiDefなら常にリアクション可能
 
+export function checkReactionPermissions(me: Misskey.entities.MeDetailed, note: Misskey.entities.Note, emoji: Misskey.entities.EmojiSimple): boolean {
 	const roleIdsThatCanBeUsedThisEmojiAsReaction = emoji.roleIdsThatCanBeUsedThisEmojiAsReaction ?? [];
 	return !(emoji.localOnly && note.user.host !== me.host)
       && !(emoji.isSensitive && (note.reactionAcceptance === 'nonSensitiveOnly' || note.reactionAcceptance === 'nonSensitiveOnlyForLocalLikeOnlyForRemote'))
diff --git a/packages/frontend/src/scripts/clear-cache.ts b/packages/frontend/src/scripts/clear-cache.ts
index 71d1232710..f2db87c4fb 100644
--- a/packages/frontend/src/scripts/clear-cache.ts
+++ b/packages/frontend/src/scripts/clear-cache.ts
@@ -1,24 +1,15 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 import { unisonReload } from '@/scripts/unison-reload.js';
 import * as os from '@/os.js';
 import { miLocalStorage } from '@/local-storage.js';
 import { fetchCustomEmojis } from '@/custom-emojis.js';
-import { fetchInstance } from '@/instance.js';
 
 export async function clearCache() {
 	os.waiting();
-	miLocalStorage.removeItem('instance');
-	miLocalStorage.removeItem('instanceCachedAt');
 	miLocalStorage.removeItem('locale');
 	miLocalStorage.removeItem('localeVersion');
 	miLocalStorage.removeItem('theme');
 	miLocalStorage.removeItem('emojis');
 	miLocalStorage.removeItem('lastEmojisFetchedAt');
-	await fetchInstance(true);
 	await fetchCustomEmojis(true);
 	unisonReload();
 }
diff --git a/packages/frontend/src/scripts/code-highlighter.ts b/packages/frontend/src/scripts/code-highlighter.ts
index e94027d302..2733897bab 100644
--- a/packages/frontend/src/scripts/code-highlighter.ts
+++ b/packages/frontend/src/scripts/code-highlighter.ts
@@ -1,21 +1,15 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
+import { bundledThemesInfo } from 'shiki';
 import { getHighlighterCore, loadWasm } from 'shiki/core';
 import darkPlus from 'shiki/themes/dark-plus.mjs';
-import { bundledThemesInfo } from 'shiki/themes';
-import { bundledLanguagesInfo } from 'shiki/langs';
 import { unique } from './array.js';
 import { deepClone } from './clone.js';
 import { deepMerge } from './merge.js';
-import type { HighlighterCore, LanguageRegistration, ThemeRegistration, ThemeRegistrationRaw } from 'shiki/core';
+import type { Highlighter, LanguageRegistration, ThemeRegistration, ThemeRegistrationRaw } from 'shiki';
 import { ColdDeviceStorage } from '@/store.js';
 import lightTheme from '@/themes/_light.json5';
 import darkTheme from '@/themes/_dark.json5';
 
-let _highlighter: HighlighterCore | null = null;
+let _highlighter: Highlighter | null = null;
 
 export async function getTheme(mode: 'light' | 'dark', getName: true): Promise<string>;
 export async function getTheme(mode: 'light' | 'dark', getName?: false): Promise<ThemeRegistration | ThemeRegistrationRaw>;
@@ -52,14 +46,16 @@ export async function getTheme(mode: 'light' | 'dark', getName = false): Promise
 	return darkPlus;
 }
 
-export async function getHighlighter(): Promise<HighlighterCore> {
+export async function getHighlighter(): Promise<Highlighter> {
 	if (!_highlighter) {
 		return await initHighlighter();
 	}
 	return _highlighter;
 }
 
-async function initHighlighter() {
+export async function initHighlighter() {
+	const aiScriptGrammar = await import('aiscript-vscode/aiscript/syntaxes/aiscript.tmLanguage.json');
+
 	await loadWasm(import('shiki/onig.wasm?init'));
 
 	// テーマの重複を消す
@@ -68,12 +64,11 @@ async function initHighlighter() {
 		...(await Promise.all([getTheme('light'), getTheme('dark')])),
 	]);
 
-	const jsLangInfo = bundledLanguagesInfo.find(t => t.id === 'javascript');
 	const highlighter = await getHighlighterCore({
 		themes,
 		langs: [
-			...(jsLangInfo ? [async () => await jsLangInfo.import()] : []),
-			async () => (await import('aiscript-vscode/aiscript/syntaxes/aiscript.tmLanguage.json')).default as unknown as LanguageRegistration,
+			import('shiki/langs/javascript.mjs'),
+			aiScriptGrammar.default as unknown as LanguageRegistration,
 		],
 	});
 
diff --git a/packages/frontend/src/scripts/detect-language.ts b/packages/frontend/src/scripts/detect-language.ts
index 0f020bf0d3..d0e46c955a 100644
--- a/packages/frontend/src/scripts/detect-language.ts
+++ b/packages/frontend/src/scripts/detect-language.ts
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 import { detect } from 'tinyld';
 import * as mfm from 'cherrypick-mfm-js';
 
diff --git a/packages/frontend/src/scripts/emojilist.ts b/packages/frontend/src/scripts/emojilist.ts
index 6565feba97..54d45e025f 100644
--- a/packages/frontend/src/scripts/emojilist.ts
+++ b/packages/frontend/src/scripts/emojilist.ts
@@ -20,10 +20,6 @@ export const emojilist: UnicodeEmojiDef[] = _emojilist.map(x => ({
 	category: unicodeEmojiCategories[x[2]],
 }));
 
-const unicodeEmojisMap = new Map<string, UnicodeEmojiDef>(
-	emojilist.map(x => [x.char, x]),
-);
-
 const _indexByChar = new Map<string, number>();
 const _charGroupByCategory = new Map<string, string[]>();
 for (let i = 0; i < emojilist.length; i++) {
@@ -39,29 +35,16 @@ for (let i = 0; i < emojilist.length; i++) {
 
 export const emojiCharByCategory = _charGroupByCategory;
 
-export function getUnicodeEmoji(char: string): UnicodeEmojiDef | string {
+export function getEmojiName(char: string): string | null {
 	// Colorize it because emojilist.json assumes that
-	return unicodeEmojisMap.get(colorizeEmoji(char))
-		// カラースタイル絵文字がjsonに無い場合はテキストスタイル絵文字にフォールバックする
-		?? unicodeEmojisMap.get(char)
-		// それでも見つからない場合はそのまま返す（絵文字情報がjsonに無い場合、このフォールバックが無いとレンダリングに失敗する）
-		?? char;
-}
-
-export function getEmojiName(char: string): string {
-	// Colorize it because emojilist.json assumes that
-	const idx = _indexByChar.get(colorizeEmoji(char)) ?? _indexByChar.get(char);
-	if (idx === undefined) {
-		// 絵文字情報がjsonに無い場合は名前の取得が出来ないのでそのまま返すしか無い
-		return char;
+	const idx = _indexByChar.get(colorizeEmoji(char));
+	if (idx == null) {
+		return null;
 	} else {
 		return emojilist[idx].name;
 	}
 }
 
-/**
- * テキストスタイル絵文字（U+260Eなどの1文字で表現される絵文字）をカラースタイル絵文字に変換します（VS16:U+FE0Fを付与）。
- */
 export function colorizeEmoji(char: string) {
 	return char.length === 1 ? `${char}\uFE0F` : char;
 }
diff --git a/packages/frontend/src/scripts/form.ts b/packages/frontend/src/scripts/form.ts
index b0db404f28..26a027f461 100644
--- a/packages/frontend/src/scripts/form.ts
+++ b/packages/frontend/src/scripts/form.ts
@@ -12,37 +12,29 @@ export type FormItem = {
 	label?: string;
 	type: 'string';
 	default: string | null;
-	description?: string;
-	required?: boolean;
 	hidden?: boolean;
 	multiline?: boolean;
-	treatAsMfm?: boolean;
 } | {
 	label?: string;
 	type: 'number';
 	default: number | null;
-	description?: string;
-	required?: boolean;
 	hidden?: boolean;
 	step?: number;
 } | {
 	label?: string;
 	type: 'boolean';
 	default: boolean | null;
-	description?: string;
 	hidden?: boolean;
 } | {
 	label?: string;
 	type: 'enum';
 	default: string | null;
-	required?: boolean;
 	hidden?: boolean;
 	enum: EnumItem[];
 } | {
 	label?: string;
 	type: 'radio';
 	default: unknown | null;
-	required?: boolean;
 	hidden?: boolean;
 	options: {
 		label: string;
@@ -52,12 +44,9 @@ export type FormItem = {
 	label?: string;
 	type: 'range';
 	default: number | null;
-	description?: string;
-	required?: boolean;
-	step?: number;
+	step: number;
 	min: number;
 	max: number;
-	textConverter?: (value: number) => string;
 } | {
 	label?: string;
 	type: 'object';
@@ -68,10 +57,6 @@ export type FormItem = {
 	type: 'array';
 	default: unknown[] | null;
 	hidden: boolean;
-} | {
-	type: 'button';
-	content?: string;
-	action: (ev: MouseEvent, v: any) => void;
 };
 
 export type Form = Record<string, FormItem>;
diff --git a/packages/frontend/src/scripts/media-has-audio.ts b/packages/frontend/src/scripts/media-has-audio.ts
index 4bf3ee5d97..3421a38a76 100644
--- a/packages/frontend/src/scripts/media-has-audio.ts
+++ b/packages/frontend/src/scripts/media-has-audio.ts
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export default async function hasAudio(media: HTMLMediaElement) {
 	const cloned = media.cloneNode() as HTMLMediaElement;
 	cloned.muted = (cloned as typeof cloned & Partial<HTMLVideoElement>).playsInline = true;
diff --git a/packages/frontend/src/scripts/search-emoji.ts b/packages/frontend/src/scripts/search-emoji.ts
deleted file mode 100644
index 371f69b9a7..0000000000
--- a/packages/frontend/src/scripts/search-emoji.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export type EmojiDef = {
-	emoji: string;
-	name: string;
-	url: string;
-	aliasOf?: string;
-} | {
-	emoji: string;
-	name: string;
-	aliasOf?: string;
-	isCustomEmoji?: true;
-};
-type EmojiScore = { emoji: EmojiDef, score: number };
-
-export function searchEmoji(query: string | null, emojiDb: EmojiDef[], max = 30): EmojiDef[] {
-	if (!query) {
-		return [];
-	}
-
-	const matched = new Map<string, EmojiScore>();
-	// 完全一致（エイリアスなし）
-	emojiDb.some(x => {
-		if (x.name === query && !x.aliasOf) {
-			matched.set(x.name, { emoji: x, score: query.length + 3 });
-		}
-		return matched.size === max;
-	});
-
-	// 完全一致（エイリアス込み）
-	if (matched.size < max) {
-		emojiDb.some(x => {
-			if (x.name === query && !matched.has(x.aliasOf ?? x.name)) {
-				matched.set(x.aliasOf ?? x.name, { emoji: x, score: query.length + 2 });
-			}
-			return matched.size === max;
-		});
-	}
-
-	// 前方一致（エイリアスなし）
-	if (matched.size < max) {
-		emojiDb.some(x => {
-			if (x.name.startsWith(query) && !x.aliasOf && !matched.has(x.name)) {
-				matched.set(x.name, { emoji: x, score: query.length + 1 });
-			}
-			return matched.size === max;
-		});
-	}
-
-	// 前方一致（エイリアス込み）
-	if (matched.size < max) {
-		emojiDb.some(x => {
-			if (x.name.startsWith(query) && !matched.has(x.aliasOf ?? x.name)) {
-				matched.set(x.aliasOf ?? x.name, { emoji: x, score: query.length });
-			}
-			return matched.size === max;
-		});
-	}
-
-	// 部分一致（エイリアス込み）
-	if (matched.size < max) {
-		emojiDb.some(x => {
-			if (x.name.includes(query) && !matched.has(x.aliasOf ?? x.name)) {
-				matched.set(x.aliasOf ?? x.name, { emoji: x, score: query.length - 1 });
-			}
-			return matched.size === max;
-		});
-	}
-
-	// 簡易あいまい検索（3文字以上）
-	if (matched.size < max && query.length > 3) {
-		const queryChars = [...query];
-		const hitEmojis = new Map<string, EmojiScore>();
-
-		for (const x of emojiDb) {
-			// 文字列の位置を進めながら、クエリの文字を順番に探す
-
-			let pos = 0;
-			let hit = 0;
-			for (const c of queryChars) {
-				pos = x.name.indexOf(c, pos);
-				if (pos <= -1) break;
-				hit++;
-			}
-
-			// 半分以上の文字が含まれていればヒットとする
-			if (hit > Math.ceil(queryChars.length / 2) && hit - 2 > (matched.get(x.aliasOf ?? x.name)?.score ?? 0)) {
-				hitEmojis.set(x.aliasOf ?? x.name, { emoji: x, score: hit - 2 });
-			}
-		}
-
-		// ヒットしたものを全部追加すると雑多になるので、先頭の6件程度だけにしておく（6件＝オートコンプリートのポップアップのサイズ分）
-		[...hitEmojis.values()]
-			.sort((x, y) => y.score - x.score)
-			.slice(0, 6)
-			.forEach(it => matched.set(it.emoji.name, it));
-	}
-
-	return [...matched.values()]
-		.sort((x, y) => y.score - x.score)
-		.slice(0, max)
-		.map(it => it.emoji);
-}
diff --git a/packages/frontend/src/scripts/snowfall-effect.ts b/packages/frontend/src/scripts/snowfall-effect.ts
index d88bdb6660..11fcaa0716 100644
--- a/packages/frontend/src/scripts/snowfall-effect.ts
+++ b/packages/frontend/src/scripts/snowfall-effect.ts
@@ -155,9 +155,7 @@ export class SnowfallEffect {
 		max: 0.125,
 		easing: 0.0005,
 	};
-	/**
-	 * @throws {Error} - Thrown when it fails to get WebGL context for the canvas 
-	 */
+
 	constructor(options: {
 		sakura?: boolean;
 	}) {
diff --git a/packages/frontend/src/scripts/sound.ts b/packages/frontend/src/scripts/sound.ts
index 7a773e1405..445bc1c68a 100644
--- a/packages/frontend/src/scripts/sound.ts
+++ b/packages/frontend/src/scripts/sound.ts
@@ -129,7 +129,7 @@ export async function loadAudio(url: string, options?: { useCache?: boolean; })
  */
 export function playMisskeySfx(operationType: OperationType) {
 	const sound = defaultStore.state[`sound_${operationType}`];
-	if (sound.type == null || !canPlay || ('userActivation' in navigator && !navigator.userActivation.hasBeenActive)) return;
+	if (sound.type == null || !canPlay || !navigator.userActivation.hasBeenActive) return;
 
 	canPlay = false;
 	playMisskeySfxFile(sound).finally(() => {
diff --git a/packages/frontend/src/scripts/theme.ts b/packages/frontend/src/scripts/theme.ts
index 9901728210..fab17008dc 100644
--- a/packages/frontend/src/scripts/theme.ts
+++ b/packages/frontend/src/scripts/theme.ts
@@ -6,7 +6,7 @@
 import { ref } from 'vue';
 import tinycolor from 'tinycolor2';
 import { deepClone } from './clone.js';
-import type { BundledTheme } from 'shiki/themes';
+import type { BuiltinTheme } from 'shiki';
 import { globalEvents } from '@/events.js';
 import lightTheme from '@/themes/_light.json5';
 import darkTheme from '@/themes/_dark.json5';
@@ -20,7 +20,7 @@ export type Theme = {
 	base?: 'dark' | 'light';
 	props: Record<string, string>;
 	codeHighlighter?: {
-		base: BundledTheme;
+		base: BuiltinTheme;
 		overrides?: Record<string, any>;
 	} | {
 		base: '_none_';
diff --git a/packages/frontend/src/scripts/use-note-capture.ts b/packages/frontend/src/scripts/use-note-capture.ts
index c371cebb45..14be1f4553 100644
--- a/packages/frontend/src/scripts/use-note-capture.ts
+++ b/packages/frontend/src/scripts/use-note-capture.ts
@@ -35,7 +35,6 @@ export function useNoteCapture(props: {
 				const currentCount = (note.value.reactions || {})[reaction] || 0;
 
 				note.value.reactions[reaction] = currentCount + 1;
-				note.value.reactionCount += 1;
 
 				if ($i && (body.userId === $i.id)) {
 					note.value.myReaction = reaction;
@@ -50,7 +49,6 @@ export function useNoteCapture(props: {
 				const currentCount = (note.value.reactions || {})[reaction] || 0;
 
 				note.value.reactions[reaction] = Math.max(0, currentCount - 1);
-				note.value.reactionCount = Math.max(0, note.value.reactionCount - 1);
 				if (note.value.reactions[reaction] === 0) delete note.value.reactions[reaction];
 
 				if ($i && (body.userId === $i.id)) {
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 5c5153c77e..6737445d82 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -7,6 +7,7 @@ import { markRaw, ref } from 'vue';
 import * as Misskey from 'cherrypick-js';
 import { miLocalStorage } from './local-storage.js';
 import type { SoundType } from '@/scripts/sound.js';
+import type { BuiltinTheme as ShikiBuiltinTheme } from 'shiki';
 import { Storage } from '@/pizzax.js';
 import { hemisphere } from '@/scripts/intl-const.js';
 
@@ -236,10 +237,6 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: true,
 	},
-	showReactionsCount: {
-		where: 'device',
-		default: true,
-	},
 	enableQuickAddMfmFunction: {
 		where: 'device',
 		default: true,
diff --git a/packages/frontend/src/stream.ts b/packages/frontend/src/stream.ts
index b6f2af9feb..6494113798 100644
--- a/packages/frontend/src/stream.ts
+++ b/packages/frontend/src/stream.ts
@@ -8,12 +8,7 @@ import { markRaw } from 'vue';
 import { $i } from '@/account.js';
 import { wsOrigin } from '@/config.js';
 
-// heart beat interval in ms
-const HEART_BEAT_INTERVAL = 1000 * 60;
-
 let stream: Misskey.Stream | null = null;
-let timeoutHeartBeat: ReturnType<typeof setTimeout> | null = null;
-let lastHeartbeatCall = 0;
 
 export function useStream(): Misskey.Stream {
 	if (stream) return stream;
@@ -22,18 +17,7 @@ export function useStream(): Misskey.Stream {
 		token: $i.token,
 	} : null));
 
-	if (timeoutHeartBeat) window.clearTimeout(timeoutHeartBeat);
-	timeoutHeartBeat = window.setTimeout(heartbeat, HEART_BEAT_INTERVAL);
-
-	// send heartbeat right now when last send time is over HEART_BEAT_INTERVAL
-	document.addEventListener('visibilitychange', () => {
-		if (
-			!stream
-			|| document.visibilityState !== 'visible'
-			|| Date.now() - lastHeartbeatCall < HEART_BEAT_INTERVAL
-		) return;
-		heartbeat();
-	});
+	window.setTimeout(heartbeat, 1000 * 60);
 
 	return stream;
 }
@@ -42,7 +26,5 @@ function heartbeat(): void {
 	if (stream != null && document.visibilityState === 'visible') {
 		stream.heartbeat();
 	}
-	lastHeartbeatCall = Date.now();
-	if (timeoutHeartBeat) window.clearTimeout(timeoutHeartBeat);
-	timeoutHeartBeat = window.setTimeout(heartbeat, HEART_BEAT_INTERVAL);
+	window.setTimeout(heartbeat, 1000 * 60);
 }
diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index 85c81429e4..87341438aa 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -48,13 +48,6 @@ $code-monospace-font: "JetBrains Mono", "Pretendard JP", Pretendard, Consolas, M
 	}
 
 	//--ad: rgb(255 169 0 / 10%);
-	--eventFollow: #36aed2;
-	--eventRenote: #36d298;
-	--eventReply: #007aff;
-	--eventReactionHeart: #dd2e44;
-	--eventReaction: #e99a0b;
-	--eventAchievement: #cb9a11;
-	--eventOther: #88a6b7;
 
 	--cherry: rgb(255, 188, 220);
 	--pick: rgb(177, 211, 255);
@@ -539,40 +532,6 @@ pre[class*="language-"] {
 	transition-timing-function: cubic-bezier(0,.5,.5,1);
 }
 
-._woodenFrame {
-	padding: 7px;
-	background: #8C4F26;
-	box-shadow: 0 6px 16px #0007, 0 0 1px 1px #693410, inset 0 0 2px 1px #ce8a5c;
-	border-radius: 10px;
-
-	--bg: #F1E8DC;
-	--fg: #693410;
-}
-
-html[data-color-mode=dark] ._woodenFrame {
-	--bg: #1d0c02;
-	--fg: #F1E8DC;
-	--panel: #192320;
-}
-
-._woodenFrameH {
-	display: flex;
-	gap: 6px;
-}
-
-._woodenFrameInner {
-	padding: 8px;
-	margin-top: 8px;
-	background: var(--bg);
-	box-shadow: 0 0 2px 1px #ce8a5c, inset 0 0 1px 1px #693410;
-	border-radius: 6px;
-	color: var(--fg);
-
-	&:first-child {
-		margin-top: 0;
-	}
-}
-
 ._transition_zoom-enter-active, ._transition_zoom-leave-active {
 	transition: opacity 0.5s, transform 0.5s !important;
 }
diff --git a/packages/frontend/src/type.ts b/packages/frontend/src/type.ts
index 5ff27158d2..9c0fc2a11e 100644
--- a/packages/frontend/src/type.ts
+++ b/packages/frontend/src/type.ts
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 export type WithRequired<T, K extends keyof T> = T & { [P in K]-?: T[P] };
 
 export type WithNonNullable<T, K extends keyof T> = T & { [P in K]-?: NonNullable<T[P]> };
diff --git a/packages/frontend/src/ui/deck.vue b/packages/frontend/src/ui/deck.vue
index d50f1e1c12..e00294a94e 100644
--- a/packages/frontend/src/ui/deck.vue
+++ b/packages/frontend/src/ui/deck.vue
@@ -118,7 +118,6 @@ 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 { MenuItem } from '@/types/menu.js';
 const XStatusBars = defineAsyncComponent(() => import('@/ui/_common_/statusbars.vue'));
 const XAnnouncements = defineAsyncComponent(() => import('@/ui/_common_/announcements.vue'));
 
@@ -223,19 +222,21 @@ document.documentElement.style.scrollBehavior = 'auto';
 loadDeck();
 
 function changeProfile(ev: MouseEvent) {
-	let items: MenuItem[] = [{
+	const items = ref([{
 		text: deckStore.state.profile,
-		active: true,
-		action: () => {},
-	}];
+		active: true.valueOf,
+	}]);
 	getProfiles().then(profiles => {
-		items.push(...(profiles.filter(k => k !== deckStore.state.profile).map(k => ({
+		items.value = [{
+			text: deckStore.state.profile,
+			active: true.valueOf,
+		}, ...(profiles.filter(k => k !== deckStore.state.profile).map(k => ({
 			text: k,
 			action: () => {
 				deckStore.set('profile', k);
 				unisonReload();
 			},
-		}))), { type: 'divider' as const }, {
+		}))), { type: 'divider' }, {
 			text: i18n.ts._deck.newProfile,
 			icon: 'ti ti-plus',
 			action: async () => {
@@ -248,10 +249,9 @@ function changeProfile(ev: MouseEvent) {
 				deckStore.set('profile', name);
 				unisonReload();
 			},
-		});
-	}).then(() => {
-		os.popupMenu(items, ev.currentTarget ?? ev.target);
+		}];
 	});
+	os.popupMenu(items, ev.currentTarget ?? ev.target);
 }
 
 async function deleteProfile() {
diff --git a/packages/frontend/src/ui/deck/channel-column.vue b/packages/frontend/src/ui/deck/channel-column.vue
index c6e31b9ae4..d73129eae6 100644
--- a/packages/frontend/src/ui/deck/channel-column.vue
+++ b/packages/frontend/src/ui/deck/channel-column.vue
@@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 	<template v-if="column.channelId">
 		<div style="padding: 8px; text-align: center;">
-			<MkButton primary gradate rounded inline small @click="post"><i class="ti ti-pencil"></i></MkButton>
+			<MkButton primary gradate rounded inline @click="post"><i class="ti ti-pencil"></i></MkButton>
 		</div>
 		<MkTimeline ref="timeline" src="channel" :channel="column.channelId"/>
 	</template>
diff --git a/packages/frontend/src/widgets/WidgetSlideshow.vue b/packages/frontend/src/widgets/WidgetSlideshow.vue
index 6894a31886..01d06b9df2 100644
--- a/packages/frontend/src/widgets/WidgetSlideshow.vue
+++ b/packages/frontend/src/widgets/WidgetSlideshow.vue
@@ -93,10 +93,10 @@ const fetch = () => {
 
 const choose = () => {
 	os.selectDriveFolder(false).then(folder => {
-		if (folder[0] == null) {
+		if (folder == null) {
 			return;
 		}
-		widgetProps.folderId = folder[0].id;
+		widgetProps.folderId = folder.id;
 		save();
 		fetch();
 	});
diff --git a/packages/frontend/test/autocomplete.test.ts b/packages/frontend/test/autocomplete.test.ts
deleted file mode 100644
index 394ac3a821..0000000000
--- a/packages/frontend/test/autocomplete.test.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { assert, describe, test } from 'vitest';
-import { searchEmoji } from '@/scripts/search-emoji.js';
-
-describe('emoji autocomplete', () => {
-	test('名前の完全一致は名前の前方一致より優先される', async () => {
-		const result = searchEmoji('foooo', [{ emoji: ':foooo:', name: 'foooo' }, { emoji: ':foooobaaar:', name: 'foooobaaar' }]);
-		assert.equal(result[0].emoji, ':foooo:');
-	});
-
-	test('名前の前方一致は名前の部分一致より優先される', async () => {
-		const result = searchEmoji('baaa', [{ emoji: ':baaar:', name: 'baaar' }, { emoji: ':foooobaaar:', name: 'foooobaaar' }]);
-		assert.equal(result[0].emoji, ':baaar:');
-	});
-
-	test('名前の完全一致はタグの完全一致より優先される', async () => {
-		const result = searchEmoji('foooo', [{ emoji: ':foooo:', name: 'foooo' }, { emoji: ':baaar:', name: 'foooo', aliasOf: 'baaar' }]);
-		assert.equal(result[0].emoji, ':foooo:');
-	});
-
-	test('名前の前方一致はタグの前方一致より優先される', async () => {
-		const result = searchEmoji('foo', [{ emoji: ':foooo:', name: 'foooo' }, { emoji: ':baaar:', name: 'foooo', aliasOf: 'baaar' }]);
-		assert.equal(result[0].emoji, ':foooo:');
-	});
-
-	test('名前の部分一致はタグの部分一致より優先される', async () => {
-		const result = searchEmoji('oooo', [{ emoji: ':foooo:', name: 'foooo' }, { emoji: ':baaar:', name: 'foooo', aliasOf: 'baaar' }]);
-		assert.equal(result[0].emoji, ':foooo:');
-	});
-});
diff --git a/packages/frontend/test/scroll.test.ts b/packages/frontend/test/scroll.test.ts
index a0b56b7221..e49ec270d5 100644
--- a/packages/frontend/test/scroll.test.ts
+++ b/packages/frontend/test/scroll.test.ts
@@ -9,7 +9,6 @@ import { onScrollBottom, onScrollTop } from '@/scripts/scroll.js';
 
 describe('Scroll', () => {
 	describe('onScrollTop', () => {
-		/* 動作しない(happy-domのバグ？)
 		test('Initial onScrollTop callback for connected elements', () => {
 			const { document } = new Window();
 			const div = document.createElement('div');
@@ -22,7 +21,6 @@ describe('Scroll', () => {
 
 			assert.ok(called);
 		});
-		*/
 
 		test('No onScrollTop callback for disconnected elements', () => {
 			const { document } = new Window();
@@ -37,11 +35,11 @@ describe('Scroll', () => {
 	});
 
 	describe('onScrollBottom', () => {
-		/* 動作しない(happy-domのバグ？)
 		test('Initial onScrollBottom callback for connected elements', () => {
 			const { document } = new Window();
 			const div = document.createElement('div');
 			assert.strictEqual(div.scrollTop, 0);
+			(div as any).scrollHeight = 100; // happy-dom has no scrollHeight
 
 			document.body.append(div);
 
@@ -50,12 +48,12 @@ describe('Scroll', () => {
 
 			assert.ok(called);
 		});
-		*/
 
 		test('No onScrollBottom callback for disconnected elements', () => {
 			const { document } = new Window();
 			const div = document.createElement('div');
 			assert.strictEqual(div.scrollTop, 0);
+			(div as any).scrollHeight = 100; // happy-dom has no scrollHeight
 
 			let called = false;
 			onScrollBottom(div as any as HTMLElement, () => called = true);
diff --git a/packages/frontend/vite.config.local-dev.ts b/packages/frontend/vite.config.local-dev.ts
index 460787fd05..6d9488797c 100644
--- a/packages/frontend/vite.config.local-dev.ts
+++ b/packages/frontend/vite.config.local-dev.ts
@@ -48,9 +48,6 @@ const devConfig = {
 			},
 			'/url': httpUrl,
 			'/proxy': httpUrl,
-			'/_info_card_': httpUrl,
-			'/bios': httpUrl,
-			'/cli': httpUrl,
 		},
 	},
 	build: {
diff --git a/packages/frontend/vite.config.ts b/packages/frontend/vite.config.ts
index 716f0fb7dd..b480a5209a 100644
--- a/packages/frontend/vite.config.ts
+++ b/packages/frontend/vite.config.ts
@@ -5,30 +5,11 @@ import { type UserConfig, defineConfig } from 'vite';
 
 import locales from '../../locales/index.js';
 import meta from '../../package.json';
-import packageInfo from './package.json' assert { type: 'json' };
 import pluginUnwindCssModuleClassName from './lib/rollup-plugin-unwind-css-module-class-name.js';
 import pluginJson5 from './vite.json5.js';
 
 const extensions = ['.ts', '.tsx', '.js', '.jsx', '.mjs', '.json', '.json5', '.svg', '.sass', '.scss', '.css', '.vue'];
 
-/**
- * Misskeyのフロントエンドにバンドルせず、CDNなどから別途読み込むリソースを記述する。
- * CDNを使わずにバンドルしたい場合、以下の配列から該当要素を削除orコメントアウトすればOK
- */
-const externalPackages = [
-	// shiki（コードブロックのシンタックスハイライトで使用中）はテーマ・言語の定義の容量が大きいため、それらはCDNから読み込む
-	{
-		name: 'shiki',
-		match: /^shiki\/(?<subPkg>(langs|themes))$/,
-		path(id: string, pattern: RegExp): string {
-			const match = pattern.exec(id)?.groups;
-			return match
-				? `https://esm.sh/shiki@${packageInfo.dependencies.shiki}/${match['subPkg']}`
-				: id;
-		},
-	},
-];
-
 const hash = (str: string, seed = 0): number => {
 	let h1 = 0xdeadbeef ^ seed,
 		h2 = 0x41c6ce57 ^ seed;
@@ -132,24 +113,14 @@ export function getConfig(): UserConfig {
 				input: {
 					app: './src/_boot_.ts',
 				},
-				external: externalPackages.map(p => p.match),
 				output: {
 					manualChunks: {
 						vue: ['vue'],
 						photoswipe: ['photoswipe', 'photoswipe/lightbox', 'photoswipe/style.css'],
 					},
-					entryFileNames: process.env.NODE_ENV === 'production' ? `${meta.version}.[hash:8].js` : `${meta.version}.[name]-[hash:8].js`,
-					chunkFileNames: process.env.NODE_ENV === 'production' ? `${meta.version}.[hash:8].js` : `${meta.version}.[name]-[hash:8].js`,
-					assetFileNames: process.env.NODE_ENV === 'production' ? `${meta.version}.[hash:8][extname]` : `${meta.version}.[name]-[hash:8][extname]`,
-					paths(id) {
-						for (const p of externalPackages) {
-							if (p.match.test(id)) {
-								return p.path(id, p.match);
-							}
-						}
-
-						return id;
-					},
+					entryFileNames: `${meta.version}.[hash].js`,
+					chunkFileNames: `${meta.version}.[hash].js`,
+					assetFileNames: `${meta.version}.[hash][extname]`,
 				},
 			},
 			cssCodeSplit: true,
diff --git a/packages/misskey-bubble-game/package.json b/packages/misskey-bubble-game/package.json
index ddc4c2134b..9de7ba005f 100644
--- a/packages/misskey-bubble-game/package.json
+++ b/packages/misskey-bubble-game/package.json
@@ -29,9 +29,9 @@
 		"@types/matter-js": "0.19.6",
 		"@types/node": "20.11.5",
 		"@types/seedrandom": "3.0.8",
-		"@typescript-eslint/eslint-plugin": "7.1.0",
-		"@typescript-eslint/parser": "7.1.0",
-		"eslint": "8.57.0",
+		"@typescript-eslint/eslint-plugin": "6.18.1",
+		"@typescript-eslint/parser": "6.18.1",
+		"eslint": "8.56.0",
 		"nodemon": "3.0.2",
 		"typescript": "5.3.3"
 	},
diff --git a/packages/misskey-reversi/package.json b/packages/misskey-reversi/package.json
index 7bfc890fef..52d497d3f8 100644
--- a/packages/misskey-reversi/package.json
+++ b/packages/misskey-reversi/package.json
@@ -27,9 +27,9 @@
 	"devDependencies": {
 		"@misskey-dev/eslint-plugin": "1.0.0",
 		"@types/node": "20.11.5",
-		"@typescript-eslint/eslint-plugin": "7.1.0",
-		"@typescript-eslint/parser": "7.1.0",
-		"eslint": "8.57.0",
+		"@typescript-eslint/eslint-plugin": "6.18.1",
+		"@typescript-eslint/parser": "6.18.1",
+		"eslint": "8.56.0",
 		"nodemon": "3.0.2",
 		"typescript": "5.3.3"
 	},
diff --git a/packages/sw/package.json b/packages/sw/package.json
index 5d1ed1dbb6..3118c943e0 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -15,11 +15,11 @@
 	},
 	"devDependencies": {
 		"@misskey-dev/eslint-plugin": "1.0.0",
-		"@typescript-eslint/parser": "7.1.0",
+		"@typescript-eslint/parser": "6.18.1",
 		"@typescript/lib-webworker": "npm:@types/serviceworker@0.0.67",
-		"eslint": "8.57.0",
+		"eslint": "8.56.0",
 		"eslint-plugin-import": "2.29.1",
-		"nodemon": "3.1.0",
+		"nodemon": "3.0.3",
 		"typescript": "5.3.3"
 	},
 	"type": "module"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 91355b3195..e318b65659 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,8 +13,8 @@ importers:
   .:
     dependencies:
       cssnano:
-        specifier: 6.0.5
-        version: 6.0.5(postcss@8.4.35)
+        specifier: 6.0.3
+        version: 6.0.3(postcss@8.4.33)
       execa:
         specifier: 8.0.1
         version: 8.0.1
@@ -28,14 +28,14 @@ importers:
         specifier: 4.1.0
         version: 4.1.0
       postcss:
-        specifier: 8.4.35
-        version: 8.4.35
+        specifier: 8.4.33
+        version: 8.4.33
       tar:
         specifier: 6.2.0
         version: 6.2.0
       terser:
-        specifier: 5.28.1
-        version: 5.28.1
+        specifier: 5.27.0
+        version: 5.27.0
       typescript:
         specifier: 5.3.3
         version: 5.3.3
@@ -44,24 +44,21 @@ importers:
         specifier: 4.4.0
         version: 4.4.0
     devDependencies:
-      '@types/node':
-        specifier: ^20.11.28
-        version: 20.11.28
       '@typescript-eslint/eslint-plugin':
-        specifier: 7.1.0
-        version: 7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.3.3)
+        specifier: 6.18.1
+        version: 6.18.1(@typescript-eslint/parser@6.18.1)(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
-        specifier: 7.1.0
-        version: 7.1.0(eslint@8.57.0)(typescript@5.3.3)
+        specifier: 6.18.1
+        version: 6.18.1(eslint@8.56.0)(typescript@5.3.3)
       cross-env:
         specifier: 7.0.3
         version: 7.0.3
       cypress:
-        specifier: 13.6.6
-        version: 13.6.6
+        specifier: 13.6.3
+        version: 13.6.3
       eslint:
-        specifier: 8.57.0
-        version: 8.57.0
+        specifier: 8.56.0
+        version: 8.56.0
       ncp:
         specifier: 2.0.0
         version: 2.0.0
@@ -78,14 +75,14 @@ importers:
         specifier: 3.412.0
         version: 3.412.0(@aws-sdk/client-s3@3.412.0)
       '@bull-board/api':
-        specifier: 5.14.2
-        version: 5.14.2(@bull-board/ui@5.14.2)
+        specifier: 5.14.0
+        version: 5.14.0(@bull-board/ui@5.14.0)
       '@bull-board/fastify':
-        specifier: 5.14.2
-        version: 5.14.2
+        specifier: 5.14.0
+        version: 5.14.0
       '@bull-board/ui':
-        specifier: 5.14.2
-        version: 5.14.2
+        specifier: 5.14.0
+        version: 5.14.0
       '@discordapp/twemoji':
         specifier: 15.0.2
         version: 15.0.2
@@ -120,26 +117,26 @@ importers:
         specifier: ^7.2.1
         version: 7.2.1
       '@misskey-dev/sharp-read-bmp':
-        specifier: 1.2.0
-        version: 1.2.0
+        specifier: ^1.1.1
+        version: 1.1.1
       '@misskey-dev/summaly':
-        specifier: 5.0.3
+        specifier: ^5.0.3
         version: 5.0.3
       '@nestjs/common':
-        specifier: 10.3.3
-        version: 10.3.3(reflect-metadata@0.2.1)(rxjs@7.8.1)
+        specifier: 10.2.10
+        version: 10.2.10(reflect-metadata@0.1.14)(rxjs@7.8.1)
       '@nestjs/core':
-        specifier: 10.3.3
-        version: 10.3.3(@nestjs/common@10.3.3)(@nestjs/platform-express@10.3.3)(reflect-metadata@0.2.1)(rxjs@7.8.1)
+        specifier: 10.2.10
+        version: 10.2.10(@nestjs/common@10.2.10)(@nestjs/platform-express@10.3.1)(reflect-metadata@0.1.14)(rxjs@7.8.1)
       '@nestjs/testing':
-        specifier: 10.3.3
-        version: 10.3.3(@nestjs/common@10.3.3)(@nestjs/core@10.3.3)(@nestjs/platform-express@10.3.3)
+        specifier: 10.2.10
+        version: 10.2.10(@nestjs/common@10.2.10)(@nestjs/core@10.2.10)(@nestjs/platform-express@10.3.1)
       '@peertube/http-signature':
         specifier: 1.7.0
         version: 1.7.0
       '@simplewebauthn/server':
-        specifier: 9.0.3
-        version: 9.0.3
+        specifier: 9.0.2
+        version: 9.0.2
       '@sinonjs/fake-timers':
         specifier: 11.2.2
         version: 11.2.2
@@ -180,8 +177,8 @@ importers:
         specifier: 1.20.2
         version: 1.20.2
       bullmq:
-        specifier: 5.4.0
-        version: 5.4.0
+        specifier: 5.1.9
+        version: 5.1.9
       cacheable-lookup:
         specifier: 7.0.0
         version: 7.0.0
@@ -237,20 +234,17 @@ importers:
         specifier: 4.0.0
         version: 4.0.0
       got:
-        specifier: 14.2.0
-        version: 14.2.0
+        specifier: 14.1.0
+        version: 14.1.0
       happy-dom:
         specifier: 10.0.3
         version: 10.0.3
       hpagent:
         specifier: 1.2.0
         version: 1.2.0
-      htmlescape:
+      http-link-header:
         specifier: 1.1.1
         version: 1.1.1
-      http-link-header:
-        specifier: 1.1.2
-        version: 1.1.2
       ioredis:
         specifier: 5.3.2
         version: 5.3.2
@@ -276,8 +270,8 @@ importers:
         specifier: 8.3.2
         version: 8.3.2
       jsrsasign:
-        specifier: 11.1.0
-        version: 11.1.0
+        specifier: 11.0.0
+        version: 11.0.0
       meilisearch:
         specifier: 0.37.0
         version: 0.37.0
@@ -294,8 +288,8 @@ importers:
         specifier: 3.0.0-canary.1
         version: 3.0.0-canary.1
       nanoid:
-        specifier: 5.0.6
-        version: 5.0.6
+        specifier: 5.0.4
+        version: 5.0.4
       nested-property:
         specifier: 4.0.0
         version: 4.0.0
@@ -303,8 +297,8 @@ importers:
         specifier: 3.3.2
         version: 3.3.2
       nodemailer:
-        specifier: 6.9.10
-        version: 6.9.10
+        specifier: 6.9.8
+        version: 6.9.8
       nsfwjs:
         specifier: 2.4.2
         version: 2.4.2(@tensorflow/tfjs@4.4.0)
@@ -363,8 +357,8 @@ importers:
         specifier: 0.1.4
         version: 0.1.4
       reflect-metadata:
-        specifier: 0.2.1
-        version: 0.2.1
+        specifier: 0.1.14
+        version: 0.1.14
       rename:
         specifier: 1.0.4
         version: 1.0.4
@@ -375,14 +369,14 @@ importers:
         specifier: 7.8.1
         version: 7.8.1
       sanitize-html:
-        specifier: 2.12.1
-        version: 2.12.1
+        specifier: 2.11.0
+        version: 2.11.0
       secure-json-parse:
         specifier: 2.7.0
         version: 2.7.0
       sharp:
-        specifier: 0.33.2
-        version: 0.33.2
+        specifier: 0.32.6
+        version: 0.32.6
       slacc:
         specifier: 0.0.10
         version: 0.0.10
@@ -396,14 +390,14 @@ importers:
         specifier: ^7.1.0
         version: 7.1.0
       systeminformation:
-        specifier: 5.22.0
-        version: 5.22.0
+        specifier: 5.21.24
+        version: 5.21.24
       tinycolor2:
         specifier: 1.6.0
         version: 1.6.0
       tmp:
-        specifier: 0.2.2
-        version: 0.2.2
+        specifier: 0.2.1
+        version: 0.2.1
       tsc-alias:
         specifier: 1.8.8
         version: 1.8.8
@@ -525,10 +519,10 @@ importers:
         version: 29.7.0
       '@misskey-dev/eslint-plugin':
         specifier: 1.0.0
-        version: 1.0.0(@typescript-eslint/eslint-plugin@7.1.0)(@typescript-eslint/parser@7.1.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0)
+        version: 1.0.0(@typescript-eslint/eslint-plugin@6.18.1)(@typescript-eslint/parser@6.18.1)(eslint-plugin-import@2.29.1)(eslint@8.56.0)
       '@nestjs/platform-express':
-        specifier: 10.3.3
-        version: 10.3.3(@nestjs/common@10.3.3)(@nestjs/core@10.3.3)
+        specifier: 10.3.1
+        version: 10.3.1(@nestjs/common@10.2.10)(@nestjs/core@10.2.10)
       '@simplewebauthn/types':
         specifier: 9.0.1
         version: 9.0.1
@@ -556,9 +550,6 @@ importers:
       '@types/fluent-ffmpeg':
         specifier: 2.1.24
         version: 2.1.24
-      '@types/htmlescape':
-        specifier: ^1.1.3
-        version: 1.1.3
       '@types/http-link-header':
         specifier: 1.0.5
         version: 1.0.5
@@ -584,8 +575,8 @@ importers:
         specifier: 0.7.34
         version: 0.7.34
       '@types/node':
-        specifier: 20.11.22
-        version: 20.11.22
+        specifier: 20.11.17
+        version: 20.11.17
       '@types/node-fetch':
         specifier: 3.0.3
         version: 3.0.3
@@ -602,14 +593,14 @@ importers:
         specifier: 0.1.2
         version: 0.1.2
       '@types/pg':
-        specifier: 8.11.2
-        version: 8.11.2
+        specifier: 8.11.0
+        version: 8.11.0
       '@types/pug':
         specifier: 2.0.10
         version: 2.0.10
       '@types/punycode':
-        specifier: 2.1.4
-        version: 2.1.4
+        specifier: 2.1.3
+        version: 2.1.3
       '@types/qrcode':
         specifier: 1.5.5
         version: 1.5.5
@@ -623,11 +614,11 @@ importers:
         specifier: 1.0.7
         version: 1.0.7
       '@types/sanitize-html':
-        specifier: 2.11.0
-        version: 2.11.0
+        specifier: 2.9.5
+        version: 2.9.5
       '@types/semver':
-        specifier: 7.5.8
-        version: 7.5.8
+        specifier: 7.5.6
+        version: 7.5.6
       '@types/simple-oauth2':
         specifier: 5.0.7
         version: 5.0.7
@@ -650,11 +641,11 @@ importers:
         specifier: 8.5.10
         version: 8.5.10
       '@typescript-eslint/eslint-plugin':
-        specifier: 7.1.0
-        version: 7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.3.3)
+        specifier: 6.18.1
+        version: 6.18.1(@typescript-eslint/parser@6.18.1)(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
-        specifier: 7.1.0
-        version: 7.1.0(eslint@8.57.0)(typescript@5.3.3)
+        specifier: 6.18.1
+        version: 6.18.1(eslint@8.56.0)(typescript@5.3.3)
       aws-sdk-client-mock:
         specifier: 3.0.1
         version: 3.0.1
@@ -662,11 +653,11 @@ importers:
         specifier: 7.0.3
         version: 7.0.3
       eslint:
-        specifier: 8.57.0
-        version: 8.57.0
+        specifier: 8.56.0
+        version: 8.56.0
       eslint-plugin-import:
         specifier: 2.29.1
-        version: 2.29.1(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)
+        version: 2.29.1(@typescript-eslint/parser@6.18.1)(eslint@8.56.0)
       execa:
         specifier: 8.0.1
         version: 8.0.1
@@ -675,13 +666,13 @@ importers:
         version: 9.0.0
       jest:
         specifier: 29.7.0
-        version: 29.7.0(@types/node@20.11.22)
+        version: 29.7.0(@types/node@20.11.17)
       jest-mock:
         specifier: 29.7.0
         version: 29.7.0
       nodemon:
-        specifier: 3.1.0
-        version: 3.1.0
+        specifier: 3.0.3
+        version: 3.0.3
       pid-port:
         specifier: 1.0.0
         version: 1.0.0
@@ -706,31 +697,31 @@ importers:
     devDependencies:
       '@microsoft/api-extractor':
         specifier: 7.39.1
-        version: 7.39.1(@types/node@20.11.22)
+        version: 7.39.1(@types/node@20.11.17)
       '@misskey-dev/eslint-plugin':
         specifier: 1.0.0
-        version: 1.0.0(@typescript-eslint/eslint-plugin@7.1.0)(@typescript-eslint/parser@7.1.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0)
+        version: 1.0.0(@typescript-eslint/eslint-plugin@6.18.1)(@typescript-eslint/parser@6.18.1)(eslint-plugin-import@2.29.1)(eslint@8.56.0)
       '@swc/jest':
         specifier: 0.2.31
         version: 0.2.31(@swc/core@1.3.105)
       '@types/jest':
-        specifier: 29.5.12
-        version: 29.5.12
+        specifier: 29.5.11
+        version: 29.5.11
       '@types/node':
-        specifier: 20.11.22
-        version: 20.11.22
+        specifier: 20.11.17
+        version: 20.11.17
       '@typescript-eslint/eslint-plugin':
-        specifier: 7.1.0
-        version: 7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.3.3)
+        specifier: 6.18.1
+        version: 6.18.1(@typescript-eslint/parser@6.18.1)(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
-        specifier: 7.1.0
-        version: 7.1.0(eslint@8.57.0)(typescript@5.3.3)
+        specifier: 6.18.1
+        version: 6.18.1(eslint@8.56.0)(typescript@5.3.3)
       eslint:
-        specifier: 8.57.0
-        version: 8.57.0
+        specifier: 8.56.0
+        version: 8.56.0
       jest:
         specifier: 29.7.0
-        version: 29.7.0(@types/node@20.11.22)
+        version: 29.7.0(@types/node@20.11.17)
       jest-fetch-mock:
         specifier: 3.0.3
         version: 3.0.3
@@ -744,11 +735,11 @@ importers:
         specifier: 2.0.0
         version: 2.0.0
       nodemon:
-        specifier: 3.1.0
-        version: 3.1.0
+        specifier: 3.0.3
+        version: 3.0.3
       tsd:
-        specifier: 0.30.7
-        version: 0.30.7
+        specifier: 0.30.4
+        version: 0.30.4
       typescript:
         specifier: 5.3.3
         version: 5.3.3
@@ -808,13 +799,13 @@ importers:
         version: 2024.1.0
       '@rollup/plugin-json':
         specifier: 6.1.0
-        version: 6.1.0(rollup@4.12.0)
+        version: 6.1.0(rollup@4.9.6)
       '@rollup/plugin-replace':
         specifier: 5.0.5
-        version: 5.0.5(rollup@4.12.0)
+        version: 5.0.5(rollup@4.9.6)
       '@rollup/pluginutils':
         specifier: 5.1.0
-        version: 5.1.0(rollup@4.12.0)
+        version: 5.1.0(rollup@4.9.6)
       '@syuilo/aiscript':
         specifier: 0.17.0
         version: 0.17.0
@@ -825,11 +816,11 @@ importers:
         specifier: 15.0.0
         version: 15.0.0
       '@vitejs/plugin-vue':
-        specifier: 5.0.4
-        version: 5.0.4(vite@5.1.4)(vue@3.4.21)
+        specifier: 5.0.3
+        version: 5.0.3(vite@5.1.0)(vue@3.4.18)
       '@vue/compiler-sfc':
-        specifier: 3.4.21
-        version: 3.4.21
+        specifier: 3.4.18
+        version: 3.4.18
       aiscript-vscode:
         specifier: github:aiscript-dev/aiscript-vscode#v0.1.2
         version: github.com/aiscript-dev/aiscript-vscode/793211d40243c8775f6b85f015c221c82cbffb07
@@ -846,23 +837,23 @@ importers:
         specifier: 0.0.1
         version: 0.0.1
       canvas-confetti:
-        specifier: 1.9.2
-        version: 1.9.2
+        specifier: 1.6.1
+        version: 1.6.1
       chart.js:
-        specifier: 4.4.2
-        version: 4.4.2
+        specifier: 4.4.1
+        version: 4.4.1
       chartjs-adapter-date-fns:
         specifier: 3.0.0
-        version: 3.0.0(chart.js@4.4.2)(date-fns@2.30.0)
+        version: 3.0.0(chart.js@4.4.1)(date-fns@2.30.0)
       chartjs-chart-matrix:
         specifier: 2.0.1
-        version: 2.0.1(chart.js@4.4.2)
+        version: 2.0.1(chart.js@4.4.1)
       chartjs-plugin-gradient:
         specifier: 0.6.1
-        version: 0.6.1(chart.js@4.4.2)
+        version: 0.6.1(chart.js@4.4.1)
       chartjs-plugin-zoom:
         specifier: 2.0.1
-        version: 2.0.1(chart.js@4.4.2)
+        version: 2.0.1(chart.js@4.4.1)
       cherrypick-js:
         specifier: workspace:*
         version: link:../cherrypick-js
@@ -870,8 +861,8 @@ importers:
         specifier: 0.24.0-cherrypick.4
         version: 0.24.0-cherrypick.4
       chromatic:
-        specifier: 11.0.0
-        version: 11.0.0
+        specifier: 10.6.1
+        version: 10.6.1
       compare-versions:
         specifier: 6.1.0
         version: 6.1.0
@@ -927,17 +918,17 @@ importers:
         specifier: 2.3.1
         version: 2.3.1
       rollup:
-        specifier: 4.12.0
-        version: 4.12.0
+        specifier: 4.9.6
+        version: 4.9.6
       sanitize-html:
-        specifier: 2.12.1
-        version: 2.12.1
+        specifier: 2.11.0
+        version: 2.11.0
       sass:
-        specifier: 1.71.1
-        version: 1.71.1
+        specifier: 1.70.0
+        version: 1.70.0
       shiki:
-        specifier: 1.2.0
-        version: 1.2.0
+        specifier: 1.0.0-beta.3
+        version: 1.0.0-beta.3
       strict-event-emitter-types:
         specifier: 2.0.0
         version: 2.0.0
@@ -948,8 +939,8 @@ importers:
         specifier: 3.1.0
         version: 3.1.0
       three:
-        specifier: 0.162.0
-        version: 0.162.0
+        specifier: 0.160.1
+        version: 0.160.1
       throttle-debounce:
         specifier: 5.0.0
         version: 5.0.0
@@ -972,84 +963,84 @@ importers:
         specifier: 9.0.1
         version: 9.0.1
       v-code-diff:
-        specifier: 1.9.0
-        version: 1.9.0(vue@3.4.21)
+        specifier: 1.7.2
+        version: 1.7.2(vue@3.4.18)
       vite:
-        specifier: 5.1.4
-        version: 5.1.4(@types/node@20.11.22)(sass@1.71.1)(terser@5.28.1)
+        specifier: 5.1.0
+        version: 5.1.0(@types/node@20.11.17)(sass@1.70.0)(terser@5.27.0)
       vue:
-        specifier: 3.4.21
-        version: 3.4.21(typescript@5.3.3)
+        specifier: 3.4.18
+        version: 3.4.18(typescript@5.3.3)
       vue-prism-editor:
         specifier: 2.0.0-alpha.2
-        version: 2.0.0-alpha.2(vue@3.4.21)
+        version: 2.0.0-alpha.2(vue@3.4.18)
       vuedraggable:
         specifier: next
-        version: 4.1.0(vue@3.4.21)
+        version: 4.1.0(vue@3.4.18)
     devDependencies:
       '@misskey-dev/eslint-plugin':
         specifier: 1.0.0
-        version: 1.0.0(@typescript-eslint/eslint-plugin@7.1.0)(@typescript-eslint/parser@7.1.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0)
+        version: 1.0.0(@typescript-eslint/eslint-plugin@6.18.1)(@typescript-eslint/parser@6.18.1)(eslint-plugin-import@2.29.1)(eslint@8.56.0)
       '@misskey-dev/summaly':
         specifier: 5.0.3
         version: 5.0.3
       '@storybook/addon-actions':
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2
       '@storybook/addon-essentials':
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
       '@storybook/addon-interactions':
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2
       '@storybook/addon-links':
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6(react@18.2.0)
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2(react@18.2.0)
       '@storybook/addon-mdx-gfm':
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2
       '@storybook/addon-storysource':
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2
       '@storybook/blocks':
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
       '@storybook/components':
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
       '@storybook/core-events':
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2
       '@storybook/manager-api':
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)
       '@storybook/preview-api':
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2
       '@storybook/react':
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3)
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3)
       '@storybook/react-vite':
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)(rollup@4.12.0)(typescript@5.3.3)(vite@5.1.4)
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)(rollup@4.9.6)(typescript@5.3.3)(vite@5.1.0)
       '@storybook/test':
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6(vitest@0.34.6)
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2(vitest@0.34.6)
       '@storybook/theming':
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)
       '@storybook/types':
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2
       '@storybook/vue3':
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6(vue@3.4.21)
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2(vue@3.4.18)
       '@storybook/vue3-vite':
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)(vite@5.1.4)(vue@3.4.21)
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3)(vite@5.1.0)(vue@3.4.18)
       '@testing-library/vue':
         specifier: 8.0.2
-        version: 8.0.2(@vue/compiler-sfc@3.4.21)(vue@3.4.21)
+        version: 8.0.2(@vue/compiler-sfc@3.4.18)(vue@3.4.18)
       '@types/autosize':
         specifier: ^4.0.1
         version: 4.0.1
@@ -1066,17 +1057,17 @@ importers:
         specifier: 4.0.6
         version: 4.0.6
       '@types/node':
-        specifier: 20.11.22
-        version: 20.11.22
+        specifier: 20.11.17
+        version: 20.11.17
       '@types/prismjs':
         specifier: ^1.26.0
         version: 1.26.2
       '@types/punycode':
-        specifier: 2.1.4
-        version: 2.1.4
+        specifier: 2.1.3
+        version: 2.1.3
       '@types/sanitize-html':
-        specifier: 2.11.0
-        version: 2.11.0
+        specifier: 2.9.5
+        version: 2.9.5
       '@types/throttle-debounce':
         specifier: 5.0.2
         version: 5.0.2
@@ -1090,17 +1081,17 @@ importers:
         specifier: 8.5.10
         version: 8.5.10
       '@typescript-eslint/eslint-plugin':
-        specifier: 7.1.0
-        version: 7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.3.3)
+        specifier: 6.18.1
+        version: 6.18.1(@typescript-eslint/parser@6.18.1)(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
-        specifier: 7.1.0
-        version: 7.1.0(eslint@8.57.0)(typescript@5.3.3)
+        specifier: 6.18.1
+        version: 6.18.1(eslint@8.56.0)(typescript@5.3.3)
       '@vitest/coverage-v8':
         specifier: 0.34.6
         version: 0.34.6(vitest@0.34.6)
       '@vue/runtime-core':
-        specifier: 3.4.21
-        version: 3.4.21
+        specifier: 3.4.18
+        version: 3.4.18
       acorn:
         specifier: 8.11.3
         version: 8.11.3
@@ -1108,26 +1099,26 @@ importers:
         specifier: 7.0.3
         version: 7.0.3
       cypress:
-        specifier: 13.6.6
-        version: 13.6.6
+        specifier: 13.6.4
+        version: 13.6.4
       eslint:
-        specifier: 8.57.0
-        version: 8.57.0
+        specifier: 8.56.0
+        version: 8.56.0
       eslint-plugin-import:
         specifier: 2.29.1
-        version: 2.29.1(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)
+        version: 2.29.1(@typescript-eslint/parser@6.18.1)(eslint@8.56.0)
       eslint-plugin-storybook:
         specifier: ^0.6.13
-        version: 0.6.13(eslint@8.57.0)(typescript@5.3.3)
+        version: 0.6.13(eslint@8.56.0)(typescript@5.3.3)
       eslint-plugin-vue:
-        specifier: 9.22.0
-        version: 9.22.0(eslint@8.57.0)
+        specifier: 9.20.1
+        version: 9.20.1(eslint@8.56.0)
       fast-glob:
         specifier: 3.3.2
         version: 3.3.2
       happy-dom:
-        specifier: 13.6.2
-        version: 13.6.2
+        specifier: 10.0.3
+        version: 10.0.3
       intersection-observer:
         specifier: 0.12.2
         version: 0.12.2
@@ -1141,8 +1132,8 @@ importers:
         specifier: 2.0.0-beta.1
         version: 2.0.0-beta.1(msw@2.1.7)
       nodemon:
-        specifier: 3.1.0
-        version: 3.1.0
+        specifier: 3.0.3
+        version: 3.0.3
       prettier:
         specifier: 3.2.5
         version: 3.2.5
@@ -1156,17 +1147,17 @@ importers:
         specifier: 2.0.3
         version: 2.0.3
       storybook:
-        specifier: 8.0.0-beta.6
-        version: 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)
+        specifier: 8.0.0-beta.2
+        version: 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)
       storybook-addon-misskey-theme:
         specifier: github:misskey-dev/storybook-addon-misskey-theme
-        version: github.com/misskey-dev/storybook-addon-misskey-theme/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@8.0.0-beta.6)(@storybook/components@8.0.0-beta.6)(@storybook/core-events@8.0.0-beta.6)(@storybook/manager-api@8.0.0-beta.6)(@storybook/preview-api@8.0.0-beta.6)(@storybook/theming@8.0.0-beta.6)(@storybook/types@8.0.0-beta.6)(react-dom@18.2.0)(react@18.2.0)
+        version: github.com/misskey-dev/storybook-addon-misskey-theme/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@8.0.0-beta.2)(@storybook/components@8.0.0-beta.2)(@storybook/core-events@8.0.0-beta.2)(@storybook/manager-api@8.0.0-beta.2)(@storybook/preview-api@8.0.0-beta.2)(@storybook/theming@8.0.0-beta.2)(@storybook/types@8.0.0-beta.2)(react-dom@18.2.0)(react@18.2.0)
       vite-plugin-turbosnap:
         specifier: 1.0.3
         version: 1.0.3
       vitest:
         specifier: 0.34.6
-        version: 0.34.6(happy-dom@13.6.2)(sass@1.71.1)(terser@5.28.1)
+        version: 0.34.6(happy-dom@10.0.3)(sass@1.70.0)(terser@5.27.0)
       vitest-fetch-mock:
         specifier: 0.2.2
         version: 0.2.2(vitest@0.34.6)
@@ -1175,7 +1166,7 @@ importers:
         version: 1.8.27
       vue-eslint-parser:
         specifier: 9.4.2
-        version: 9.4.2(eslint@8.57.0)
+        version: 9.4.2(eslint@8.56.0)
       vue-tsc:
         specifier: 1.8.27
         version: 1.8.27(typescript@5.3.3)
@@ -1200,7 +1191,7 @@ importers:
     devDependencies:
       '@misskey-dev/eslint-plugin':
         specifier: 1.0.0
-        version: 1.0.0(@typescript-eslint/eslint-plugin@7.1.0)(@typescript-eslint/parser@7.1.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0)
+        version: 1.0.0(@typescript-eslint/eslint-plugin@6.18.1)(@typescript-eslint/parser@6.18.1)(eslint-plugin-import@2.29.1)(eslint@8.56.0)
       '@types/matter-js':
         specifier: 0.19.6
         version: 0.19.6
@@ -1211,14 +1202,14 @@ importers:
         specifier: 3.0.8
         version: 3.0.8
       '@typescript-eslint/eslint-plugin':
-        specifier: 7.1.0
-        version: 7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.3.3)
+        specifier: 6.18.1
+        version: 6.18.1(@typescript-eslint/parser@6.18.1)(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
-        specifier: 7.1.0
-        version: 7.1.0(eslint@8.57.0)(typescript@5.3.3)
+        specifier: 6.18.1
+        version: 6.18.1(eslint@8.56.0)(typescript@5.3.3)
       eslint:
-        specifier: 8.57.0
-        version: 8.57.0
+        specifier: 8.56.0
+        version: 8.56.0
       nodemon:
         specifier: 3.0.2
         version: 3.0.2
@@ -1240,19 +1231,19 @@ importers:
     devDependencies:
       '@misskey-dev/eslint-plugin':
         specifier: 1.0.0
-        version: 1.0.0(@typescript-eslint/eslint-plugin@7.1.0)(@typescript-eslint/parser@7.1.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0)
+        version: 1.0.0(@typescript-eslint/eslint-plugin@6.18.1)(@typescript-eslint/parser@6.18.1)(eslint-plugin-import@2.29.1)(eslint@8.56.0)
       '@types/node':
         specifier: 20.11.5
         version: 20.11.5
       '@typescript-eslint/eslint-plugin':
-        specifier: 7.1.0
-        version: 7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.3.3)
+        specifier: 6.18.1
+        version: 6.18.1(@typescript-eslint/parser@6.18.1)(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
-        specifier: 7.1.0
-        version: 7.1.0(eslint@8.57.0)(typescript@5.3.3)
+        specifier: 6.18.1
+        version: 6.18.1(eslint@8.56.0)(typescript@5.3.3)
       eslint:
-        specifier: 8.57.0
-        version: 8.57.0
+        specifier: 8.56.0
+        version: 8.56.0
       nodemon:
         specifier: 3.0.2
         version: 3.0.2
@@ -1274,22 +1265,22 @@ importers:
     devDependencies:
       '@misskey-dev/eslint-plugin':
         specifier: 1.0.0
-        version: 1.0.0(@typescript-eslint/eslint-plugin@7.1.0)(@typescript-eslint/parser@7.1.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0)
+        version: 1.0.0(@typescript-eslint/eslint-plugin@6.18.1)(@typescript-eslint/parser@6.18.1)(eslint-plugin-import@2.29.1)(eslint@8.56.0)
       '@typescript-eslint/parser':
-        specifier: 7.1.0
-        version: 7.1.0(eslint@8.57.0)(typescript@5.3.3)
+        specifier: 6.18.1
+        version: 6.18.1(eslint@8.56.0)(typescript@5.3.3)
       '@typescript/lib-webworker':
         specifier: npm:@types/serviceworker@0.0.67
         version: /@types/serviceworker@0.0.67
       eslint:
-        specifier: 8.57.0
-        version: 8.57.0
+        specifier: 8.56.0
+        version: 8.56.0
       eslint-plugin-import:
         specifier: 2.29.1
-        version: 2.29.1(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)
+        version: 2.29.1(@typescript-eslint/parser@6.18.1)(eslint@8.56.0)
       nodemon:
-        specifier: 3.1.0
-        version: 3.1.0
+        specifier: 3.0.3
+        version: 3.0.3
       typescript:
         specifier: 5.3.3
         version: 5.3.3
@@ -1911,14 +1902,6 @@ packages:
       chalk: 2.4.2
     dev: true
 
-  /@babel/code-frame@7.24.1:
-    resolution: {integrity: sha512-bC49z4spJQR3j8vFtJBLqzyzFV0ciuL5HYX7qfSl3KEqeMVV+eTquRvmXxpvB0AMubRrvv7y5DILiLLPi57Ewg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/highlight': 7.24.1
-      picocolors: 1.0.0
-    dev: true
-
   /@babel/compat-data@7.23.5:
     resolution: {integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==}
     engines: {node: '>=6.9.0'}
@@ -1934,7 +1917,7 @@ packages:
       '@babel/helper-compilation-targets': 7.22.15
       '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.5)
       '@babel/helpers': 7.23.5
-      '@babel/parser': 7.23.9
+      '@babel/parser': 7.23.6
       '@babel/template': 7.22.15
       '@babel/traverse': 7.23.5
       '@babel/types': 7.23.5
@@ -1947,29 +1930,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/core@7.24.1:
-    resolution: {integrity: sha512-F82udohVyIgGAY2VVj/g34TpFUG606rumIHjTfVbssPg2zTR7PuuEpZcX8JA6sgBfIYmJrFtWgPvHQuJamVqZQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@ampproject/remapping': 2.2.1
-      '@babel/code-frame': 7.24.1
-      '@babel/generator': 7.24.1
-      '@babel/helper-compilation-targets': 7.23.6
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.1)
-      '@babel/helpers': 7.24.1
-      '@babel/parser': 7.24.1
-      '@babel/template': 7.24.0
-      '@babel/traverse': 7.24.1
-      '@babel/types': 7.24.0
-      convert-source-map: 2.0.0
-      debug: 4.3.4(supports-color@8.1.1)
-      gensync: 1.0.0-beta.2
-      json5: 2.2.3
-      semver: 6.3.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/generator@7.23.5:
     resolution: {integrity: sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==}
     engines: {node: '>=6.9.0'}
@@ -1980,16 +1940,6 @@ packages:
       jsesc: 2.5.2
     dev: true
 
-  /@babel/generator@7.24.1:
-    resolution: {integrity: sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.24.0
-      '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
-      jsesc: 2.5.2
-    dev: true
-
   /@babel/helper-annotate-as-pure@7.22.5:
     resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==}
     engines: {node: '>=6.9.0'}
@@ -2015,17 +1965,6 @@ packages:
       semver: 6.3.1
     dev: true
 
-  /@babel/helper-compilation-targets@7.23.6:
-    resolution: {integrity: sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/compat-data': 7.23.5
-      '@babel/helper-validator-option': 7.23.5
-      browserslist: 4.22.2
-      lru-cache: 5.1.1
-      semver: 6.3.1
-    dev: true
-
   /@babel/helper-create-class-features-plugin@7.23.5(@babel/core@7.23.5):
     resolution: {integrity: sha512-QELlRWxSpgdwdJzSJn4WAhKC+hvw/AtHbbrIoncKHkhKKR/luAlKkgBDcri1EzWAo8f8VvYVryEHN4tax/V67A==}
     engines: {node: '>=6.9.0'}
@@ -2119,20 +2058,6 @@ packages:
       '@babel/helper-validator-identifier': 7.22.20
     dev: true
 
-  /@babel/helper-module-transforms@7.23.3(@babel/core@7.24.1):
-    resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.24.1
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-module-imports': 7.22.15
-      '@babel/helper-simple-access': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/helper-validator-identifier': 7.22.20
-    dev: true
-
   /@babel/helper-optimise-call-expression@7.22.5:
     resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==}
     engines: {node: '>=6.9.0'}
@@ -2231,17 +2156,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/helpers@7.24.1:
-    resolution: {integrity: sha512-BpU09QqEe6ZCHuIHFphEFgvNSrubve1FtyMton26ekZ85gRGi6LrTF7zArARp2YvyFxloeiRmtSCq5sjh1WqIg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/template': 7.24.0
-      '@babel/traverse': 7.24.1
-      '@babel/types': 7.24.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/highlight@7.23.4:
     resolution: {integrity: sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==}
     engines: {node: '>=6.9.0'}
@@ -2251,16 +2165,6 @@ packages:
       js-tokens: 4.0.0
     dev: true
 
-  /@babel/highlight@7.24.1:
-    resolution: {integrity: sha512-EPmDPxidWe/Ex+HTFINpvXdPHRmgSF3T8hGvzondYjmgzTQ/0EbLpSxyt+w3zzlYSk9cNBQNF9k0dT5Z2NiBjw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-validator-identifier': 7.22.20
-      chalk: 2.4.2
-      js-tokens: 4.0.0
-      picocolors: 1.0.0
-    dev: true
-
   /@babel/parser@7.22.4:
     resolution: {integrity: sha512-VLLsx06XkEYqBtE5YGPwfSGwfrjnyPP5oiGty3S8pQLFDFLaS8VwWSIxkTXpcvr5zeYLE6+MBNl2npl/YnfofA==}
     engines: {node: '>=6.0.0'}
@@ -2274,7 +2178,6 @@ packages:
     hasBin: true
     dependencies:
       '@babel/types': 7.23.5
-    dev: true
 
   /@babel/parser@7.23.9:
     resolution: {integrity: sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==}
@@ -2283,14 +2186,6 @@ packages:
     dependencies:
       '@babel/types': 7.23.5
 
-  /@babel/parser@7.24.1:
-    resolution: {integrity: sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-    dependencies:
-      '@babel/types': 7.24.0
-    dev: true
-
   /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.23.3(@babel/core@7.23.5):
     resolution: {integrity: sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==}
     engines: {node: '>=6.9.0'}
@@ -3261,19 +3156,10 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/code-frame': 7.23.5
-      '@babel/parser': 7.23.9
+      '@babel/parser': 7.23.6
       '@babel/types': 7.23.5
     dev: true
 
-  /@babel/template@7.24.0:
-    resolution: {integrity: sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.24.1
-      '@babel/parser': 7.24.1
-      '@babel/types': 7.24.0
-    dev: true
-
   /@babel/traverse@7.23.5:
     resolution: {integrity: sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==}
     engines: {node: '>=6.9.0'}
@@ -3284,7 +3170,7 @@ packages:
       '@babel/helper-function-name': 7.23.0
       '@babel/helper-hoist-variables': 7.22.5
       '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/parser': 7.23.9
+      '@babel/parser': 7.23.6
       '@babel/types': 7.23.5
       debug: 4.3.4(supports-color@8.1.1)
       globals: 11.12.0
@@ -3292,24 +3178,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/traverse@7.24.1:
-    resolution: {integrity: sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.24.1
-      '@babel/generator': 7.24.1
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-function-name': 7.23.0
-      '@babel/helper-hoist-variables': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/parser': 7.24.1
-      '@babel/types': 7.24.0
-      debug: 4.3.4(supports-color@8.1.1)
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/types@7.22.4:
     resolution: {integrity: sha512-Tx9x3UBHTTsMSW85WB2kphxYQVvrZ/t1FxD88IpSgIjiUJlCm9z+xWIDwyo1vffTwSqteqyznB8ZE9vYYk16zA==}
     engines: {node: '>=6.9.0'}
@@ -3326,15 +3194,6 @@ packages:
       '@babel/helper-validator-identifier': 7.22.20
       to-fast-properties: 2.0.0
 
-  /@babel/types@7.24.0:
-    resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-string-parser': 7.23.4
-      '@babel/helper-validator-identifier': 7.22.20
-      to-fast-properties: 2.0.0
-    dev: true
-
   /@base2/pretty-print-object@1.0.1:
     resolution: {integrity: sha512-4iri8i1AqYHJE2DstZYkyEprg6Pq6sKx3xn5FpySk9sNhH7qN2LLlHJCfDTZRILNwQNPD7mATWM0TBui7uC1pA==}
     dev: true
@@ -3343,29 +3202,29 @@ packages:
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
     dev: true
 
-  /@bull-board/api@5.14.2(@bull-board/ui@5.14.2):
-    resolution: {integrity: sha512-0wppAGPU7ZMwWMpzkmtrlmm7ySI5immymyaRS1cVNJ54rUiGOZP5tnm+Sj7MwPdf63rxqIM843un8+PvQyARGg==}
+  /@bull-board/api@5.14.0(@bull-board/ui@5.14.0):
+    resolution: {integrity: sha512-ppN9GeCH8QmCzs47CpDFwVb4Q5W2nK2QvcnbxKpjktCTonZ+5PnoWyXQvLStbcKU9SbMKAM0/OXhj4xOcSRllQ==}
     peerDependencies:
-      '@bull-board/ui': 5.14.2
+      '@bull-board/ui': 5.14.0
     dependencies:
-      '@bull-board/ui': 5.14.2
+      '@bull-board/ui': 5.14.0
       redis-info: 3.1.0
     dev: false
 
-  /@bull-board/fastify@5.14.2:
-    resolution: {integrity: sha512-GQMK70tKOu2gjBi2pjWXMXcftzWRvQNSm+deLmGlJUgqUUbNlzIGRyvaTk7giT4CFzgKcP+hT+lphcAsGTKBQw==}
+  /@bull-board/fastify@5.14.0:
+    resolution: {integrity: sha512-MEZbfUY74wL2dc9OJZGgYABZADlohp62MP1ZMOlC+6ZF4i7X95yxTQ9DmtIV6kkva7+abJgFGNUhtKi7Mq15Fg==}
     dependencies:
-      '@bull-board/api': 5.14.2(@bull-board/ui@5.14.2)
-      '@bull-board/ui': 5.14.2
+      '@bull-board/api': 5.14.0(@bull-board/ui@5.14.0)
+      '@bull-board/ui': 5.14.0
       '@fastify/static': 6.12.0
       '@fastify/view': 8.2.0
       ejs: 3.1.9
     dev: false
 
-  /@bull-board/ui@5.14.2:
-    resolution: {integrity: sha512-NiyKWLjKjy29I6ySCnSYbzGX4ZJyPE4xlS5/Z5dVsF2bJLoAV+yD1obflxteJMt60FiEgLV7tfs6tMSVa+Htew==}
+  /@bull-board/ui@5.14.0:
+    resolution: {integrity: sha512-quustWmLsLbqdbCQd4Mud9Eo/2BQzfJSNSiyJt9OrtYT4AXHMgGtbFUy2Ycyda7iQjC4ScKl8f+WdFs4y+KUJA==}
     dependencies:
-      '@bull-board/api': 5.14.2(@bull-board/ui@5.14.2)
+      '@bull-board/api': 5.14.0(@bull-board/ui@5.14.0)
     dev: false
 
   /@bundled-es-modules/cookie@2.0.0:
@@ -3384,6 +3243,54 @@ packages:
     resolution: {integrity: sha512-BxOqI5LgsIQP1odU5KMwV9yoijleOPzHL18/YvNqF9KFSGF2K/DLlYAbDQsWqd/1nbaFuSkYD/191dpMtNh4vw==}
     dev: false
 
+  /@cbor-extract/cbor-extract-darwin-arm64@2.1.1:
+    resolution: {integrity: sha512-blVBy5MXz6m36Vx0DfLd7PChOQKEs8lK2bD1WJn/vVgG4FXZiZmZb2GECHFvVPA5T7OnODd9xZiL3nMCv6QUhA==}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /@cbor-extract/cbor-extract-darwin-x64@2.1.1:
+    resolution: {integrity: sha512-h6KFOzqk8jXTvkOftyRIWGrd7sKQzQv2jVdTL9nKSf3D2drCvQB/LHUxAOpPXo3pv2clDtKs3xnHalpEh3rDsw==}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /@cbor-extract/cbor-extract-linux-arm64@2.1.1:
+    resolution: {integrity: sha512-SxAaRcYf8S0QHaMc7gvRSiTSr7nUYMqbUdErBEu+HYA4Q6UNydx1VwFE68hGcp1qvxcy9yT5U7gA+a5XikfwSQ==}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /@cbor-extract/cbor-extract-linux-arm@2.1.1:
+    resolution: {integrity: sha512-ds0uikdcIGUjPyraV4oJqyVE5gl/qYBpa/Wnh6l6xLE2lj/hwnjT2XcZCChdXwW/YFZ1LUHs6waoYN8PmK0nKQ==}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /@cbor-extract/cbor-extract-linux-x64@2.1.1:
+    resolution: {integrity: sha512-GVK+8fNIE9lJQHAlhOROYiI0Yd4bAZ4u++C2ZjlkS3YmO6hi+FUxe6Dqm+OKWTcMpL/l71N6CQAmaRcb4zyJuA==}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /@cbor-extract/cbor-extract-win32-x64@2.1.1:
+    resolution: {integrity: sha512-2Niq1C41dCRIDeD8LddiH+mxGlO7HJ612Ll3D/E73ZWBmycued+8ghTr/Ho3CMOWPUEr08XtyBMVXAjqF+TcKw==}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@colors/colors@1.5.0:
     resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
     engines: {node: '>=0.1.90'}
@@ -3537,14 +3444,6 @@ packages:
     engines: {node: '>=10.0.0'}
     dev: true
 
-  /@emnapi/runtime@0.45.0:
-    resolution: {integrity: sha512-Txumi3td7J4A/xTTwlssKieHKTGl3j4A1tglBx72auZ49YK7ePY6XZricgIg9mnZT4xPfA+UPCUdnhRuEFDL+w==}
-    requiresBuild: true
-    dependencies:
-      tslib: 2.6.2
-    dev: false
-    optional: true
-
   /@emotion/use-insertion-effect-with-fallbacks@1.0.1(react@18.2.0):
     resolution: {integrity: sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==}
     peerDependencies:
@@ -3945,13 +3844,13 @@ packages:
       eslint-visitor-keys: 3.4.3
     dev: true
 
-  /@eslint-community/eslint-utils@4.4.0(eslint@8.57.0):
+  /@eslint-community/eslint-utils@4.4.0(eslint@8.56.0):
     resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
     dependencies:
-      eslint: 8.57.0
+      eslint: 8.56.0
       eslint-visitor-keys: 3.4.3
     dev: true
 
@@ -3999,8 +3898,8 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@eslint/js@8.57.0:
-    resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==}
+  /@eslint/js@8.56.0:
+    resolution: {integrity: sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
@@ -4228,7 +4127,7 @@ packages:
     engines: {node: ^8.13.0 || >=10.10.0}
     dependencies:
       '@grpc/proto-loader': 0.7.7
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: false
 
   /@grpc/proto-loader@0.7.7:
@@ -4294,17 +4193,6 @@ packages:
       - supports-color
     dev: true
 
-  /@humanwhocodes/config-array@0.11.14:
-    resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==}
-    engines: {node: '>=10.10.0'}
-    dependencies:
-      '@humanwhocodes/object-schema': 2.0.2
-      debug: 4.3.4(supports-color@8.1.1)
-      minimatch: 3.1.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@humanwhocodes/module-importer@1.0.1:
     resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
     engines: {node: '>=12.22'}
@@ -4319,198 +4207,6 @@ packages:
     resolution: {integrity: sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==}
     dev: true
 
-  /@humanwhocodes/object-schema@2.0.2:
-    resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==}
-    dev: true
-
-  /@img/sharp-darwin-arm64@0.33.2:
-    resolution: {integrity: sha512-itHBs1rPmsmGF9p4qRe++CzCgd+kFYktnsoR1sbIAfsRMrJZau0Tt1AH9KVnufc2/tU02Gf6Ibujx+15qRE03w==}
-    engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    optionalDependencies:
-      '@img/sharp-libvips-darwin-arm64': 1.0.1
-    dev: false
-    optional: true
-
-  /@img/sharp-darwin-x64@0.33.2:
-    resolution: {integrity: sha512-/rK/69Rrp9x5kaWBjVN07KixZanRr+W1OiyKdXcbjQD6KbW+obaTeBBtLUAtbBsnlTTmWthw99xqoOS7SsySDg==}
-    engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    optionalDependencies:
-      '@img/sharp-libvips-darwin-x64': 1.0.1
-    dev: false
-    optional: true
-
-  /@img/sharp-libvips-darwin-arm64@1.0.1:
-    resolution: {integrity: sha512-kQyrSNd6lmBV7O0BUiyu/OEw9yeNGFbQhbxswS1i6rMDwBBSX+e+rPzu3S+MwAiGU3HdLze3PanQ4Xkfemgzcw==}
-    engines: {macos: '>=11', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-libvips-darwin-x64@1.0.1:
-    resolution: {integrity: sha512-eVU/JYLPVjhhrd8Tk6gosl5pVlvsqiFlt50wotCvdkFGf+mDNBJxMh+bvav+Wt3EBnNZWq8Sp2I7XfSjm8siog==}
-    engines: {macos: '>=10.13', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-libvips-linux-arm64@1.0.1:
-    resolution: {integrity: sha512-bnGG+MJjdX70mAQcSLxgeJco11G+MxTz+ebxlz8Y3dxyeb3Nkl7LgLI0mXupoO+u1wRNx/iRj5yHtzA4sde1yA==}
-    engines: {glibc: '>=2.26', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-libvips-linux-arm@1.0.1:
-    resolution: {integrity: sha512-FtdMvR4R99FTsD53IA3LxYGghQ82t3yt0ZQ93WMZ2xV3dqrb0E8zq4VHaTOuLEAuA83oDawHV3fd+BsAPadHIQ==}
-    engines: {glibc: '>=2.28', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-libvips-linux-s390x@1.0.1:
-    resolution: {integrity: sha512-3+rzfAR1YpMOeA2zZNp+aYEzGNWK4zF3+sdMxuCS3ey9HhDbJ66w6hDSHDMoap32DueFwhhs3vwooAB2MaK4XQ==}
-    engines: {glibc: '>=2.28', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-libvips-linux-x64@1.0.1:
-    resolution: {integrity: sha512-3NR1mxFsaSgMMzz1bAnnKbSAI+lHXVTqAHgc1bgzjHuXjo4hlscpUxc0vFSAPKI3yuzdzcZOkq7nDPrP2F8Jgw==}
-    engines: {glibc: '>=2.26', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-libvips-linuxmusl-arm64@1.0.1:
-    resolution: {integrity: sha512-5aBRcjHDG/T6jwC3Edl3lP8nl9U2Yo8+oTl5drd1dh9Z1EBfzUKAJFUDTDisDjUwc7N4AjnPGfCA3jl3hY8uDg==}
-    engines: {musl: '>=1.2.2', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-libvips-linuxmusl-x64@1.0.1:
-    resolution: {integrity: sha512-dcT7inI9DBFK6ovfeWRe3hG30h51cBAP5JXlZfx6pzc/Mnf9HFCQDLtYf4MCBjxaaTfjCCjkBxcy3XzOAo5txw==}
-    engines: {musl: '>=1.2.2', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-linux-arm64@0.33.2:
-    resolution: {integrity: sha512-pz0NNo882vVfqJ0yNInuG9YH71smP4gRSdeL09ukC2YLE6ZyZePAlWKEHgAzJGTiOh8Qkaov6mMIMlEhmLdKew==}
-    engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    optionalDependencies:
-      '@img/sharp-libvips-linux-arm64': 1.0.1
-    dev: false
-    optional: true
-
-  /@img/sharp-linux-arm@0.33.2:
-    resolution: {integrity: sha512-Fndk/4Zq3vAc4G/qyfXASbS3HBZbKrlnKZLEJzPLrXoJuipFNNwTes71+Ki1hwYW5lch26niRYoZFAtZVf3EGA==}
-    engines: {glibc: '>=2.28', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    optionalDependencies:
-      '@img/sharp-libvips-linux-arm': 1.0.1
-    dev: false
-    optional: true
-
-  /@img/sharp-linux-s390x@0.33.2:
-    resolution: {integrity: sha512-MBoInDXDppMfhSzbMmOQtGfloVAflS2rP1qPcUIiITMi36Mm5YR7r0ASND99razjQUpHTzjrU1flO76hKvP5RA==}
-    engines: {glibc: '>=2.28', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    optionalDependencies:
-      '@img/sharp-libvips-linux-s390x': 1.0.1
-    dev: false
-    optional: true
-
-  /@img/sharp-linux-x64@0.33.2:
-    resolution: {integrity: sha512-xUT82H5IbXewKkeF5aiooajoO1tQV4PnKfS/OZtb5DDdxS/FCI/uXTVZ35GQ97RZXsycojz/AJ0asoz6p2/H/A==}
-    engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    optionalDependencies:
-      '@img/sharp-libvips-linux-x64': 1.0.1
-    dev: false
-    optional: true
-
-  /@img/sharp-linuxmusl-arm64@0.33.2:
-    resolution: {integrity: sha512-F+0z8JCu/UnMzg8IYW1TMeiViIWBVg7IWP6nE0p5S5EPQxlLd76c8jYemG21X99UzFwgkRo5yz2DS+zbrnxZeA==}
-    engines: {musl: '>=1.2.2', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    optionalDependencies:
-      '@img/sharp-libvips-linuxmusl-arm64': 1.0.1
-    dev: false
-    optional: true
-
-  /@img/sharp-linuxmusl-x64@0.33.2:
-    resolution: {integrity: sha512-+ZLE3SQmSL+Fn1gmSaM8uFusW5Y3J9VOf+wMGNnTtJUMUxFhv+P4UPaYEYT8tqnyYVaOVGgMN/zsOxn9pSsO2A==}
-    engines: {musl: '>=1.2.2', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    optionalDependencies:
-      '@img/sharp-libvips-linuxmusl-x64': 1.0.1
-    dev: false
-    optional: true
-
-  /@img/sharp-wasm32@0.33.2:
-    resolution: {integrity: sha512-fLbTaESVKuQcpm8ffgBD7jLb/CQLcATju/jxtTXR1XCLwbOQt+OL5zPHSDMmp2JZIeq82e18yE0Vv7zh6+6BfQ==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [wasm32]
-    requiresBuild: true
-    dependencies:
-      '@emnapi/runtime': 0.45.0
-    dev: false
-    optional: true
-
-  /@img/sharp-win32-ia32@0.33.2:
-    resolution: {integrity: sha512-okBpql96hIGuZ4lN3+nsAjGeggxKm7hIRu9zyec0lnfB8E7Z6p95BuRZzDDXZOl2e8UmR4RhYt631i7mfmKU8g==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-win32-x64@0.33.2:
-    resolution: {integrity: sha512-E4magOks77DK47FwHUIGH0RYWSgRBfGdK56kIHSVeB9uIS4pPFr4N2kIVsXdQQo4LzOsENKV5KAhRlRL7eMAdg==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@ioredis/commands@1.2.0:
     resolution: {integrity: sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==}
     dev: false
@@ -4547,7 +4243,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       chalk: 4.1.2
       jest-message-util: 29.7.0
       jest-util: 29.7.0
@@ -4568,14 +4264,14 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       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@20.11.22)
+      jest-config: 29.7.0(@types/node@20.11.17)
       jest-haste-map: 29.7.0
       jest-message-util: 29.7.0
       jest-regex-util: 29.6.3
@@ -4610,7 +4306,7 @@ packages:
     dependencies:
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       jest-mock: 29.7.0
     dev: true
 
@@ -4637,7 +4333,7 @@ packages:
     dependencies:
       '@jest/types': 29.6.3
       '@sinonjs/fake-timers': 10.3.0
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       jest-message-util: 29.7.0
       jest-mock: 29.7.0
       jest-util: 29.7.0
@@ -4670,7 +4366,7 @@ packages:
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
       '@jridgewell/trace-mapping': 0.3.18
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       chalk: 4.1.2
       collect-v8-coverage: 1.0.1
       exit: 0.1.2
@@ -4757,7 +4453,7 @@ packages:
     dependencies:
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       '@types/yargs': 16.0.5
       chalk: 4.1.2
     dev: true
@@ -4769,12 +4465,12 @@ packages:
       '@jest/schemas': 29.6.3
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       '@types/yargs': 17.0.19
       chalk: 4.1.2
     dev: true
 
-  /@joshwooding/vite-plugin-react-docgen-typescript@0.3.0(typescript@5.3.3)(vite@5.1.4):
+  /@joshwooding/vite-plugin-react-docgen-typescript@0.3.0(typescript@5.3.3)(vite@5.1.0):
     resolution: {integrity: sha512-2D6y7fNvFmsLmRt6UCOFJPvFoPMJGT0Uh1Wg0RaigUp7kdQPs6yYn8Dmx6GZkOH/NW0yMTwRz/p0SRMMRo50vA==}
     peerDependencies:
       typescript: '>= 4.3.x'
@@ -4788,7 +4484,7 @@ packages:
       magic-string: 0.27.0
       react-docgen-typescript: 2.2.2(typescript@5.3.3)
       typescript: 5.3.3
-      vite: 5.1.4(@types/node@20.11.22)(sass@1.71.1)(terser@5.28.1)
+      vite: 5.1.0(@types/node@20.11.17)(sass@1.70.0)(terser@5.27.0)
     dev: true
 
   /@jridgewell/gen-mapping@0.3.2:
@@ -4799,15 +4495,6 @@ packages:
       '@jridgewell/sourcemap-codec': 1.4.15
       '@jridgewell/trace-mapping': 0.3.18
 
-  /@jridgewell/gen-mapping@0.3.5:
-    resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==}
-    engines: {node: '>=6.0.0'}
-    dependencies:
-      '@jridgewell/set-array': 1.2.1
-      '@jridgewell/sourcemap-codec': 1.4.15
-      '@jridgewell/trace-mapping': 0.3.25
-    dev: true
-
   /@jridgewell/resolve-uri@3.1.0:
     resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==}
     engines: {node: '>=6.0.0'}
@@ -4816,11 +4503,6 @@ packages:
     resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==}
     engines: {node: '>=6.0.0'}
 
-  /@jridgewell/set-array@1.2.1:
-    resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==}
-    engines: {node: '>=6.0.0'}
-    dev: true
-
   /@jridgewell/source-map@0.3.5:
     resolution: {integrity: sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==}
     dependencies:
@@ -4839,13 +4521,6 @@ packages:
       '@jridgewell/resolve-uri': 3.1.0
       '@jridgewell/sourcemap-codec': 1.4.14
 
-  /@jridgewell/trace-mapping@0.3.25:
-    resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
-    dependencies:
-      '@jridgewell/resolve-uri': 3.1.0
-      '@jridgewell/sourcemap-codec': 1.4.15
-    dev: true
-
   /@jsdevtools/ono@7.1.3:
     resolution: {integrity: sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==}
     dev: true
@@ -4861,10 +4536,6 @@ packages:
     resolution: {integrity: sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==}
     dev: false
 
-  /@levischuck/tiny-cbor@0.2.2:
-    resolution: {integrity: sha512-f5CnPw997Y2GQ8FAvtuVVC19FX8mwNNC+1XJcIi16n/LTJifKO6QBgGLgN3YEmqtGMk17SKSuoWES3imJVxAVw==}
-    dev: false
-
   /@lukeed/csprng@1.0.1:
     resolution: {integrity: sha512-uSvJdwQU5nK+Vdf6zxcWAY2A8r7uqe+gePwLWzJ+fsQehq18pc0I2hJKwypZ2aLM90+Er9u1xn4iLJPZ+xlL4g==}
     engines: {node: '>=8'}
@@ -4915,24 +4586,24 @@ packages:
       react: 18.2.0
     dev: true
 
-  /@microsoft/api-extractor-model@7.28.4(@types/node@20.11.22):
+  /@microsoft/api-extractor-model@7.28.4(@types/node@20.11.17):
     resolution: {integrity: sha512-vucgyPmgHrJ/D4/xQywAmjTmSfxAx2/aDmD6TkIoLu51FdsAfuWRbijWA48AePy60OO+l+mmy9p2P/CEeBZqig==}
     dependencies:
       '@microsoft/tsdoc': 0.14.2
       '@microsoft/tsdoc-config': 0.16.2
-      '@rushstack/node-core-library': 3.63.0(@types/node@20.11.22)
+      '@rushstack/node-core-library': 3.63.0(@types/node@20.11.17)
     transitivePeerDependencies:
       - '@types/node'
     dev: true
 
-  /@microsoft/api-extractor@7.39.1(@types/node@20.11.22):
+  /@microsoft/api-extractor@7.39.1(@types/node@20.11.17):
     resolution: {integrity: sha512-V0HtCufWa8hZZvSmlEzQZfINcJkHAU/bmpyJQj6w+zpI87EkR8DuBOW6RWrO9c7mUYFZoDaNgUTyKo83ytv+QQ==}
     hasBin: true
     dependencies:
-      '@microsoft/api-extractor-model': 7.28.4(@types/node@20.11.22)
+      '@microsoft/api-extractor-model': 7.28.4(@types/node@20.11.17)
       '@microsoft/tsdoc': 0.14.2
       '@microsoft/tsdoc-config': 0.16.2
-      '@rushstack/node-core-library': 3.63.0(@types/node@20.11.22)
+      '@rushstack/node-core-library': 3.63.0(@types/node@20.11.17)
       '@rushstack/rig-package': 0.5.1
       '@rushstack/ts-command-line': 4.17.1
       colors: 1.2.5
@@ -4976,7 +4647,7 @@ packages:
       eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.11.0)(eslint@8.53.0)
     dev: true
 
-  /@misskey-dev/eslint-plugin@1.0.0(@typescript-eslint/eslint-plugin@7.1.0)(@typescript-eslint/parser@7.1.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0):
+  /@misskey-dev/eslint-plugin@1.0.0(@typescript-eslint/eslint-plugin@6.18.1)(@typescript-eslint/parser@6.18.1)(eslint-plugin-import@2.29.1)(eslint@8.56.0):
     resolution: {integrity: sha512-dh6UbcrNDVg5DD8k8Qh4ab30OPpuEYIlJCqaBV/lkIV8wNN/AfCJ2V7iTP8V8KjryM4t+sf5IqzQLQnT0mWI4A==}
     peerDependencies:
       '@typescript-eslint/eslint-plugin': '>= 6'
@@ -4984,18 +4655,18 @@ packages:
       eslint: '>= 3'
       eslint-plugin-import: '>= 2'
     dependencies:
-      '@typescript-eslint/eslint-plugin': 7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.3.3)
-      '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
-      eslint: 8.57.0
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)
+      '@typescript-eslint/eslint-plugin': 6.18.1(@typescript-eslint/parser@6.18.1)(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/parser': 6.18.1(eslint@8.56.0)(typescript@5.3.3)
+      eslint: 8.56.0
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.18.1)(eslint@8.56.0)
     dev: true
 
-  /@misskey-dev/sharp-read-bmp@1.2.0:
-    resolution: {integrity: sha512-er4pRakXzHYfEgOFAFfQagqDouG+wLm+kwNq1I30oSdIHDa0wM3KjFpfIGQ25Fks4GcmOl1s7Zh6xoQu5dNjTw==}
+  /@misskey-dev/sharp-read-bmp@1.1.1:
+    resolution: {integrity: sha512-X52BQYL/I9mafypQ+wBhst+BUlYiPWnHhKGcF6ybcYSLl+zhcV0q5mezIXHozhM0Sv0A7xCdrWmR7TCNxHLrtQ==}
     dependencies:
       decode-bmp: 0.2.1
       decode-ico: 0.4.1
-      sharp: 0.33.2
+      sharp: 0.32.6
     dev: false
 
   /@misskey-dev/summaly@5.0.3:
@@ -5097,12 +4768,12 @@ packages:
       tar-fs: 2.1.1
     dev: true
 
-  /@nestjs/common@10.3.3(reflect-metadata@0.2.1)(rxjs@7.8.1):
-    resolution: {integrity: sha512-LAkTe8/CF0uNWM0ecuDwUNTHCi1lVSITmmR4FQ6Ftz1E7ujQCnJ5pMRzd8JRN14vdBkxZZ8VbVF0BDUKoKNxMQ==}
+  /@nestjs/common@10.2.10(reflect-metadata@0.1.14)(rxjs@7.8.1):
+    resolution: {integrity: sha512-fwAk931rjW8CNH2Mgwawq/7HWHH1dxkOLdcgs7U52ddLk8CtHXjejm1cbNahewlSbNhvlOl7y1STLHutE6sUqw==}
     peerDependencies:
       class-transformer: '*'
       class-validator: '*'
-      reflect-metadata: ^0.1.12 || ^0.2.0
+      reflect-metadata: ^0.1.12
       rxjs: ^7.1.0
     peerDependenciesMeta:
       class-transformer:
@@ -5111,20 +4782,20 @@ packages:
         optional: true
     dependencies:
       iterare: 1.2.1
-      reflect-metadata: 0.2.1
+      reflect-metadata: 0.1.14
       rxjs: 7.8.1
       tslib: 2.6.2
       uid: 2.0.2
 
-  /@nestjs/core@10.3.3(@nestjs/common@10.3.3)(@nestjs/platform-express@10.3.3)(reflect-metadata@0.2.1)(rxjs@7.8.1):
-    resolution: {integrity: sha512-kxJWggQAPX3RuZx9JVec69eSLaYLNIox2emkZJpfBJ5Qq7cAq7edQIt1r4LGjTKq6kFubNTPsqhWf5y7yFRBPw==}
+  /@nestjs/core@10.2.10(@nestjs/common@10.2.10)(@nestjs/platform-express@10.3.1)(reflect-metadata@0.1.14)(rxjs@7.8.1):
+    resolution: {integrity: sha512-+ckOI6BPi2ZMHikT9MCG4ctHDc4OnjhoIytrn7f2AYMMXI4bnutJhqyQKc30VDka5x3Wq6QAD57pgSP7y+JjJg==}
     requiresBuild: true
     peerDependencies:
       '@nestjs/common': ^10.0.0
       '@nestjs/microservices': ^10.0.0
       '@nestjs/platform-express': ^10.0.0
       '@nestjs/websockets': ^10.0.0
-      reflect-metadata: ^0.1.12 || ^0.2.0
+      reflect-metadata: ^0.1.12
       rxjs: ^7.1.0
     peerDependenciesMeta:
       '@nestjs/microservices':
@@ -5134,27 +4805,27 @@ packages:
       '@nestjs/websockets':
         optional: true
     dependencies:
-      '@nestjs/common': 10.3.3(reflect-metadata@0.2.1)(rxjs@7.8.1)
-      '@nestjs/platform-express': 10.3.3(@nestjs/common@10.3.3)(@nestjs/core@10.3.3)
+      '@nestjs/common': 10.2.10(reflect-metadata@0.1.14)(rxjs@7.8.1)
+      '@nestjs/platform-express': 10.3.1(@nestjs/common@10.2.10)(@nestjs/core@10.2.10)
       '@nuxtjs/opencollective': 0.3.2
       fast-safe-stringify: 2.1.1
       iterare: 1.2.1
       path-to-regexp: 3.2.0
-      reflect-metadata: 0.2.1
+      reflect-metadata: 0.1.14
       rxjs: 7.8.1
       tslib: 2.6.2
       uid: 2.0.2
     transitivePeerDependencies:
       - encoding
 
-  /@nestjs/platform-express@10.3.3(@nestjs/common@10.3.3)(@nestjs/core@10.3.3):
-    resolution: {integrity: sha512-GGKSEU48Os7nYFIsUM0nutuFUGn5AbeP8gzFBiBCAtiuJWrXZXpZ58pMBYxAbMf7IrcOZFInHEukjHGAQU0OZw==}
+  /@nestjs/platform-express@10.3.1(@nestjs/common@10.2.10)(@nestjs/core@10.2.10):
+    resolution: {integrity: sha512-Rj21quI5h4Lry7q9an+nO4ADQiQUy9A6XK74o5aTUHo3Ysm25ujqh2NgU4XbT3M2oXU9qzhE59OfhkQ7ZUvTAg==}
     peerDependencies:
       '@nestjs/common': ^10.0.0
       '@nestjs/core': ^10.0.0
     dependencies:
-      '@nestjs/common': 10.3.3(reflect-metadata@0.2.1)(rxjs@7.8.1)
-      '@nestjs/core': 10.3.3(@nestjs/common@10.3.3)(@nestjs/platform-express@10.3.3)(reflect-metadata@0.2.1)(rxjs@7.8.1)
+      '@nestjs/common': 10.2.10(reflect-metadata@0.1.14)(rxjs@7.8.1)
+      '@nestjs/core': 10.2.10(@nestjs/common@10.2.10)(@nestjs/platform-express@10.3.1)(reflect-metadata@0.1.14)(rxjs@7.8.1)
       body-parser: 1.20.2
       cors: 2.8.5
       express: 4.18.2
@@ -5163,8 +4834,8 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@nestjs/testing@10.3.3(@nestjs/common@10.3.3)(@nestjs/core@10.3.3)(@nestjs/platform-express@10.3.3):
-    resolution: {integrity: sha512-kX20GfjAImL5grd/i69uD/x7sc00BaqGcP2dRG3ilqshQUuy5DOmspLCr3a2C8xmVU7kzK4spT0oTxhe6WcCAA==}
+  /@nestjs/testing@10.2.10(@nestjs/common@10.2.10)(@nestjs/core@10.2.10)(@nestjs/platform-express@10.3.1):
+    resolution: {integrity: sha512-IVLUnPz/+fkBtPATYfqTIP+phN9yjkXejmj+JyhmcfPJZpxBmD1i9VSMqa4u54l37j0xkGPscQ0IXpbhqMYUKw==}
     peerDependencies:
       '@nestjs/common': ^10.0.0
       '@nestjs/core': ^10.0.0
@@ -5176,9 +4847,9 @@ packages:
       '@nestjs/platform-express':
         optional: true
     dependencies:
-      '@nestjs/common': 10.3.3(reflect-metadata@0.2.1)(rxjs@7.8.1)
-      '@nestjs/core': 10.3.3(@nestjs/common@10.3.3)(@nestjs/platform-express@10.3.3)(reflect-metadata@0.2.1)(rxjs@7.8.1)
-      '@nestjs/platform-express': 10.3.3(@nestjs/common@10.3.3)(@nestjs/core@10.3.3)
+      '@nestjs/common': 10.2.10(reflect-metadata@0.1.14)(rxjs@7.8.1)
+      '@nestjs/core': 10.2.10(@nestjs/common@10.2.10)(@nestjs/platform-express@10.3.1)(reflect-metadata@0.1.14)(rxjs@7.8.1)
+      '@nestjs/platform-express': 10.3.1(@nestjs/common@10.2.10)(@nestjs/core@10.2.10)
       tslib: 2.6.2
     dev: false
 
@@ -5441,7 +5112,7 @@ packages:
       openapi-types: 12.1.3
     dev: true
 
-  /@rollup/plugin-json@6.1.0(rollup@4.12.0):
+  /@rollup/plugin-json@6.1.0(rollup@4.9.6):
     resolution: {integrity: sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -5450,11 +5121,11 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.12.0)
-      rollup: 4.12.0
+      '@rollup/pluginutils': 5.1.0(rollup@4.9.6)
+      rollup: 4.9.6
     dev: false
 
-  /@rollup/plugin-replace@5.0.5(rollup@4.12.0):
+  /@rollup/plugin-replace@5.0.5(rollup@4.9.6):
     resolution: {integrity: sha512-rYO4fOi8lMaTg/z5Jb+hKnrHHVn8j2lwkqwyS4kTRhKyWOLf2wST2sWXr4WzWiTcoHTp2sTjqUbqIj2E39slKQ==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -5463,12 +5134,12 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.12.0)
+      '@rollup/pluginutils': 5.1.0(rollup@4.9.6)
       magic-string: 0.30.5
-      rollup: 4.12.0
+      rollup: 4.9.6
     dev: false
 
-  /@rollup/pluginutils@5.1.0(rollup@4.12.0):
+  /@rollup/pluginutils@5.1.0(rollup@4.9.6):
     resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -5480,100 +5151,100 @@ packages:
       '@types/estree': 1.0.5
       estree-walker: 2.0.2
       picomatch: 2.3.1
-      rollup: 4.12.0
+      rollup: 4.9.6
 
-  /@rollup/rollup-android-arm-eabi@4.12.0:
-    resolution: {integrity: sha512-+ac02NL/2TCKRrJu2wffk1kZ+RyqxVUlbjSagNgPm94frxtr+XDL12E5Ll1enWskLrtrZ2r8L3wED1orIibV/w==}
+  /@rollup/rollup-android-arm-eabi@4.9.6:
+    resolution: {integrity: sha512-MVNXSSYN6QXOulbHpLMKYi60ppyO13W9my1qogeiAqtjb2yR4LSmfU2+POvDkLzhjYLXz9Rf9+9a3zFHW1Lecg==}
     cpu: [arm]
     os: [android]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-android-arm64@4.12.0:
-    resolution: {integrity: sha512-OBqcX2BMe6nvjQ0Nyp7cC90cnumt8PXmO7Dp3gfAju/6YwG0Tj74z1vKrfRz7qAv23nBcYM8BCbhrsWqO7PzQQ==}
+  /@rollup/rollup-android-arm64@4.9.6:
+    resolution: {integrity: sha512-T14aNLpqJ5wzKNf5jEDpv5zgyIqcpn1MlwCrUXLrwoADr2RkWA0vOWP4XxbO9aiO3dvMCQICZdKeDrFl7UMClw==}
     cpu: [arm64]
     os: [android]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-darwin-arm64@4.12.0:
-    resolution: {integrity: sha512-X64tZd8dRE/QTrBIEs63kaOBG0b5GVEd3ccoLtyf6IdXtHdh8h+I56C2yC3PtC9Ucnv0CpNFJLqKFVgCYe0lOQ==}
+  /@rollup/rollup-darwin-arm64@4.9.6:
+    resolution: {integrity: sha512-CqNNAyhRkTbo8VVZ5R85X73H3R5NX9ONnKbXuHisGWC0qRbTTxnF1U4V9NafzJbgGM0sHZpdO83pLPzq8uOZFw==}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-darwin-x64@4.12.0:
-    resolution: {integrity: sha512-cc71KUZoVbUJmGP2cOuiZ9HSOP14AzBAThn3OU+9LcA1+IUqswJyR1cAJj3Mg55HbjZP6OLAIscbQsQLrpgTOg==}
+  /@rollup/rollup-darwin-x64@4.9.6:
+    resolution: {integrity: sha512-zRDtdJuRvA1dc9Mp6BWYqAsU5oeLixdfUvkTHuiYOHwqYuQ4YgSmi6+/lPvSsqc/I0Omw3DdICx4Tfacdzmhog==}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-linux-arm-gnueabihf@4.12.0:
-    resolution: {integrity: sha512-a6w/Y3hyyO6GlpKL2xJ4IOh/7d+APaqLYdMf86xnczU3nurFTaVN9s9jOXQg97BE4nYm/7Ga51rjec5nfRdrvA==}
+  /@rollup/rollup-linux-arm-gnueabihf@4.9.6:
+    resolution: {integrity: sha512-oNk8YXDDnNyG4qlNb6is1ojTOGL/tRhbbKeE/YuccItzerEZT68Z9gHrY3ROh7axDc974+zYAPxK5SH0j/G+QQ==}
     cpu: [arm]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-linux-arm64-gnu@4.12.0:
-    resolution: {integrity: sha512-0fZBq27b+D7Ar5CQMofVN8sggOVhEtzFUwOwPppQt0k+VR+7UHMZZY4y+64WJ06XOhBTKXtQB/Sv0NwQMXyNAA==}
+  /@rollup/rollup-linux-arm64-gnu@4.9.6:
+    resolution: {integrity: sha512-Z3O60yxPtuCYobrtzjo0wlmvDdx2qZfeAWTyfOjEDqd08kthDKexLpV97KfAeUXPosENKd8uyJMRDfFMxcYkDQ==}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-linux-arm64-musl@4.12.0:
-    resolution: {integrity: sha512-eTvzUS3hhhlgeAv6bfigekzWZjaEX9xP9HhxB0Dvrdbkk5w/b+1Sxct2ZuDxNJKzsRStSq1EaEkVSEe7A7ipgQ==}
+  /@rollup/rollup-linux-arm64-musl@4.9.6:
+    resolution: {integrity: sha512-gpiG0qQJNdYEVad+1iAsGAbgAnZ8j07FapmnIAQgODKcOTjLEWM9sRb+MbQyVsYCnA0Im6M6QIq6ax7liws6eQ==}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-linux-riscv64-gnu@4.12.0:
-    resolution: {integrity: sha512-ix+qAB9qmrCRiaO71VFfY8rkiAZJL8zQRXveS27HS+pKdjwUfEhqo2+YF2oI+H/22Xsiski+qqwIBxVewLK7sw==}
+  /@rollup/rollup-linux-riscv64-gnu@4.9.6:
+    resolution: {integrity: sha512-+uCOcvVmFUYvVDr27aiyun9WgZk0tXe7ThuzoUTAukZJOwS5MrGbmSlNOhx1j80GdpqbOty05XqSl5w4dQvcOA==}
     cpu: [riscv64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-linux-x64-gnu@4.12.0:
-    resolution: {integrity: sha512-TenQhZVOtw/3qKOPa7d+QgkeM6xY0LtwzR8OplmyL5LrgTWIXpTQg2Q2ycBf8jm+SFW2Wt/DTn1gf7nFp3ssVA==}
+  /@rollup/rollup-linux-x64-gnu@4.9.6:
+    resolution: {integrity: sha512-HUNqM32dGzfBKuaDUBqFB7tP6VMN74eLZ33Q9Y1TBqRDn+qDonkAUyKWwF9BR9unV7QUzffLnz9GrnKvMqC/fw==}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-linux-x64-musl@4.12.0:
-    resolution: {integrity: sha512-LfFdRhNnW0zdMvdCb5FNuWlls2WbbSridJvxOvYWgSBOYZtgBfW9UGNJG//rwMqTX1xQE9BAodvMH9tAusKDUw==}
+  /@rollup/rollup-linux-x64-musl@4.9.6:
+    resolution: {integrity: sha512-ch7M+9Tr5R4FK40FHQk8VnML0Szi2KRujUgHXd/HjuH9ifH72GUmw6lStZBo3c3GB82vHa0ZoUfjfcM7JiiMrQ==}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-win32-arm64-msvc@4.12.0:
-    resolution: {integrity: sha512-JPDxovheWNp6d7AHCgsUlkuCKvtu3RB55iNEkaQcf0ttsDU/JZF+iQnYcQJSk/7PtT4mjjVG8N1kpwnI9SLYaw==}
+  /@rollup/rollup-win32-arm64-msvc@4.9.6:
+    resolution: {integrity: sha512-VD6qnR99dhmTQ1mJhIzXsRcTBvTjbfbGGwKAHcu+52cVl15AC/kplkhxzW/uT0Xl62Y/meBKDZvoJSJN+vTeGA==}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-win32-ia32-msvc@4.12.0:
-    resolution: {integrity: sha512-fjtuvMWRGJn1oZacG8IPnzIV6GF2/XG+h71FKn76OYFqySXInJtseAqdprVTDTyqPxQOG9Exak5/E9Z3+EJ8ZA==}
+  /@rollup/rollup-win32-ia32-msvc@4.9.6:
+    resolution: {integrity: sha512-J9AFDq/xiRI58eR2NIDfyVmTYGyIZmRcvcAoJ48oDld/NTR8wyiPUu2X/v1navJ+N/FGg68LEbX3Ejd6l8B7MQ==}
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-win32-x64-msvc@4.12.0:
-    resolution: {integrity: sha512-ZYmr5mS2wd4Dew/JjT0Fqi2NPB/ZhZ2VvPp7SmvPZb4Y1CG/LRcS6tcRo2cYU7zLK5A7cdbhWnnWmUjoI4qapg==}
+  /@rollup/rollup-win32-x64-msvc@4.9.6:
+    resolution: {integrity: sha512-jqzNLhNDvIZOrt69Ce4UjGRpXJBzhUBzawMwnaDAwyHriki3XollsewxWzOzz+4yOFDkuJHtTsZFwMxhYJWmLQ==}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
     optional: true
 
-  /@rushstack/node-core-library@3.63.0(@types/node@20.11.22):
+  /@rushstack/node-core-library@3.63.0(@types/node@20.11.17):
     resolution: {integrity: sha512-Q7B3dVpBQF1v+mUfxNcNZh5uHVR8ntcnkN5GYjbBLrxUYHBGKbnCM+OdcN+hzCpFlLBH6Ob0dEHhZ0spQwf24A==}
     peerDependencies:
       '@types/node': '*'
@@ -5581,7 +5252,7 @@ packages:
       '@types/node':
         optional: true
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       colors: 1.2.5
       fs-extra: 7.0.1
       import-lazy: 4.0.0
@@ -5607,8 +5278,8 @@ packages:
       string-argv: 0.3.1
     dev: true
 
-  /@shikijs/core@1.2.0:
-    resolution: {integrity: sha512-OlFvx+nyr5C8zpcMBnSGir0YPD6K11uYhouqhNmm1qLiis4GA7SsGtu07r9gKS9omks8RtQqHrJL4S+lqWK01A==}
+  /@shikijs/core@1.0.0-beta.3:
+    resolution: {integrity: sha512-SCwPom2Wn8XxNlEeqdzycU93SKgzYeVsedjqDsgZaz4XiiPpZUzlHt2NAEQTwTnPcHNZapZ6vbkwJ8P11ggL3Q==}
     dev: false
 
   /@sideway/address@4.1.4:
@@ -5625,18 +5296,18 @@ packages:
     resolution: {integrity: sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==}
     dev: true
 
-  /@simplewebauthn/server@9.0.3:
-    resolution: {integrity: sha512-FMZieoBosrVLFxCnxPFD9Enhd1U7D8nidVDT4MsHc6l4fdVcjoeHjDueeXCloO1k5O/fZg1fsSXXPKbY2XTzDA==}
+  /@simplewebauthn/server@9.0.2:
+    resolution: {integrity: sha512-aaWA+qVOU4byk5IDb/l+M1+7dmrAJhTb4ISJHucpsgRQcMMEes76tbGIqO2JQuA7N50tc/OBrnGKBjoKYG1kSw==}
     engines: {node: '>=16.0.0'}
     dependencies:
       '@hexagon/base64': 1.1.27
-      '@levischuck/tiny-cbor': 0.2.2
       '@peculiar/asn1-android': 2.3.10
       '@peculiar/asn1-ecc': 2.3.8
       '@peculiar/asn1-rsa': 2.3.8
       '@peculiar/asn1-schema': 2.3.8
       '@peculiar/asn1-x509': 2.3.8
       '@simplewebauthn/types': 9.0.1
+      cbor-x: 1.5.4
       cross-fetch: 4.0.0
     transitivePeerDependencies:
       - encoding
@@ -6220,10 +5891,10 @@ packages:
     resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
     dev: false
 
-  /@storybook/addon-actions@8.0.0-beta.6:
-    resolution: {integrity: sha512-g+X2M6Awg21vkXzRP7hWBYCdbXnxJ3BJWsP7BblYmPo2J7eJDzhQascNyTmSr0pb1/7nv+tworGviXThgvlUgw==}
+  /@storybook/addon-actions@8.0.0-beta.2:
+    resolution: {integrity: sha512-sw51iot8E4aZP+z96fWLG7idrpCj/LqTV5lOcE06MU3T6/mW0OqoS7nFF+ncOtjcDsOjValmLiVQCL8m759mTQ==}
     dependencies:
-      '@storybook/core-events': 8.0.0-beta.6
+      '@storybook/core-events': 8.0.0-beta.2
       '@storybook/global': 5.0.0
       '@types/uuid': 9.0.8
       dequal: 2.0.3
@@ -6231,18 +5902,18 @@ packages:
       uuid: 9.0.1
     dev: true
 
-  /@storybook/addon-backgrounds@8.0.0-beta.6:
-    resolution: {integrity: sha512-C8MS635knAOSat5JbkpZXOiAqkDm1bKWvuVqiQfbX2into45/aAuyN3mYxveGIRTRjPJCv/UpostkLSNvfH/NQ==}
+  /@storybook/addon-backgrounds@8.0.0-beta.2:
+    resolution: {integrity: sha512-cyDbV7srhuh/qaEMCvfz4dTLwnJV0VjHMivLtqSZgzhU24kekc7145KnLOOpDKzEQiAl1mVXb/7HBrykQcbKtg==}
     dependencies:
       '@storybook/global': 5.0.0
       memoizerific: 1.11.3
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/addon-controls@8.0.0-beta.6(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-G96MH7yU/KShq3lTrkgtU1IbNQXLVc3BG7miaLqzQgWFN8SSAivlu3vk1Vffui3+3Dv52WZhMKi3hueNfnM1Xw==}
+  /@storybook/addon-controls@8.0.0-beta.2(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-9rvjv4Er7WJkSeXPvCJ78GnKeUqbc7NFGZVlWl2gS3gFeLrXRgtrA5raOR+XneI51UtvAPZX89Mdeg/bQueUvQ==}
     dependencies:
-      '@storybook/blocks': 8.0.0-beta.6(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/blocks': 8.0.0-beta.2(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
       lodash: 4.17.21
       ts-dedent: 2.2.0
     transitivePeerDependencies:
@@ -6253,22 +5924,22 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/addon-docs@8.0.0-beta.6:
-    resolution: {integrity: sha512-VLys4EuL8XVhmu1QxUiUG5keID8v/FsC5L71Y0Wcf5D+ll6ZD8vCqEtbMY3TiJJ9NqqNIcmcG3bG6JVXOYcD8g==}
+  /@storybook/addon-docs@8.0.0-beta.2:
+    resolution: {integrity: sha512-ax9Nto8pXGmNh13IfYalBoQ/6YLYjlQkhURM5eGDqhz6lZdMLQZF/GMz3gMwSXTD8edcfamXtmMOfzWc8qR1kw==}
     dependencies:
       '@babel/core': 7.23.5
       '@mdx-js/react': 3.0.1(@types/react@18.0.28)(react@18.2.0)
-      '@storybook/blocks': 8.0.0-beta.6(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/client-logger': 8.0.0-beta.6
-      '@storybook/components': 8.0.0-beta.6(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/csf-plugin': 8.0.0-beta.6
-      '@storybook/csf-tools': 8.0.0-beta.6
+      '@storybook/blocks': 8.0.0-beta.2(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/client-logger': 8.0.0-beta.2
+      '@storybook/components': 8.0.0-beta.2(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/csf-plugin': 8.0.0-beta.2
+      '@storybook/csf-tools': 8.0.0-beta.2
       '@storybook/global': 5.0.0
-      '@storybook/node-logger': 8.0.0-beta.6
-      '@storybook/preview-api': 8.0.0-beta.6
-      '@storybook/react-dom-shim': 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/theming': 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/types': 8.0.0-beta.6
+      '@storybook/node-logger': 8.0.0-beta.2
+      '@storybook/preview-api': 8.0.0-beta.2
+      '@storybook/react-dom-shim': 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/theming': 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 8.0.0-beta.2
       '@types/react': 18.0.28
       fs-extra: 11.1.1
       react: 18.2.0
@@ -6281,22 +5952,22 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/addon-essentials@8.0.0-beta.6(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-6Vjf03c0oIavXqOK9DIN0UeH0iJFmBoVrFt1mTwydMxchyJBSP785MSd9DuFhLdYZPQTMHaR4/JhOIjdDV8mbA==}
-    dependencies:
-      '@storybook/addon-actions': 8.0.0-beta.6
-      '@storybook/addon-backgrounds': 8.0.0-beta.6
-      '@storybook/addon-controls': 8.0.0-beta.6(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/addon-docs': 8.0.0-beta.6
-      '@storybook/addon-highlight': 8.0.0-beta.6
-      '@storybook/addon-measure': 8.0.0-beta.6
-      '@storybook/addon-outline': 8.0.0-beta.6
-      '@storybook/addon-toolbars': 8.0.0-beta.6
-      '@storybook/addon-viewport': 8.0.0-beta.6
-      '@storybook/core-common': 8.0.0-beta.6
-      '@storybook/manager-api': 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/node-logger': 8.0.0-beta.6
-      '@storybook/preview-api': 8.0.0-beta.6
+  /@storybook/addon-essentials@8.0.0-beta.2(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-zB1sRf/ynxddBcWkzxZ55YVN5trbh2sMh9iPA+MLmKwz/tWK+f8/EoV8jfevu1ou2MS/2Jkjyk90jyZEXloVjg==}
+    dependencies:
+      '@storybook/addon-actions': 8.0.0-beta.2
+      '@storybook/addon-backgrounds': 8.0.0-beta.2
+      '@storybook/addon-controls': 8.0.0-beta.2(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-docs': 8.0.0-beta.2
+      '@storybook/addon-highlight': 8.0.0-beta.2
+      '@storybook/addon-measure': 8.0.0-beta.2
+      '@storybook/addon-outline': 8.0.0-beta.2
+      '@storybook/addon-toolbars': 8.0.0-beta.2
+      '@storybook/addon-viewport': 8.0.0-beta.2
+      '@storybook/core-common': 8.0.0-beta.2
+      '@storybook/manager-api': 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/node-logger': 8.0.0-beta.2
+      '@storybook/preview-api': 8.0.0-beta.2
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - '@types/react'
@@ -6306,24 +5977,24 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/addon-highlight@8.0.0-beta.6:
-    resolution: {integrity: sha512-U+qz4TNLrw24t1eZ2Zmhl2FZKZKiwHbibq4qR5ruAFe9W5/aMHqPuBB0POroaGu3P+tyDP2G46dckMNXVraiWA==}
+  /@storybook/addon-highlight@8.0.0-beta.2:
+    resolution: {integrity: sha512-Y5/I4WkhcwiE6/p3kaWz+wN1IMr6GNK8ytxsVnIQHOCUfpu1lArGuHzU4E6nN7/bmXahDO+Hz3dWGdnS5YeLXw==}
     dependencies:
       '@storybook/global': 5.0.0
     dev: true
 
-  /@storybook/addon-interactions@8.0.0-beta.6:
-    resolution: {integrity: sha512-KSigq+7vCA1tnj31MjhM7xaqickR1guZdjyXVRx7gi7qbdhSuCQv52gAkVpDapwlEuvGFCCYxzt7tmcn6dkLZQ==}
+  /@storybook/addon-interactions@8.0.0-beta.2:
+    resolution: {integrity: sha512-L4XLTkF8z3f6V9Z61N+t/8i1d0tECyHkaeexsRjWgXaiJst+9iSdDFCApalxemLzI6mA8tIiOkRH0+DqewvpNQ==}
     dependencies:
       '@storybook/global': 5.0.0
-      '@storybook/types': 8.0.0-beta.6
+      '@storybook/types': 8.0.0-beta.2
       jest-mock: 27.5.1
       polished: 4.2.2
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/addon-links@8.0.0-beta.6(react@18.2.0):
-    resolution: {integrity: sha512-+5knw5CHEb23n6Bm9Xp9nmoLRqWZ3QVGb1gNI3mGwmkpLwesohFR4fW7OrdRmzYHpS0PyYToZyfTCMYrmjBDvg==}
+  /@storybook/addon-links@8.0.0-beta.2(react@18.2.0):
+    resolution: {integrity: sha512-hP1sBcG7/yVz6s81xW3mMS39G4rGcBiw4PWLKmILCqpBhAyog9EGXJrKrYMTdDlX9EcPd11fHbdLgRNw+UPIDg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
     peerDependenciesMeta:
@@ -6336,50 +6007,50 @@ packages:
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/addon-mdx-gfm@8.0.0-beta.6:
-    resolution: {integrity: sha512-b4pb59rrX+C/oYFeEiHb8jJn0h9WZSkHVkLIgaj0G64Nd9OpyKZXMbGpDxwMq4LTi1w65Wddi1UUQbUVVDNHRw==}
+  /@storybook/addon-mdx-gfm@8.0.0-beta.2:
+    resolution: {integrity: sha512-yFRBEoJzeGsLcXKQmDfiT+tr1EjLJ1ktsFDjS3ymVK9DzxSbnZa1u+wIA8spAn6F5qC9uSSAng64UrVyU9JbWQ==}
     dependencies:
-      '@storybook/node-logger': 8.0.0-beta.6
+      '@storybook/node-logger': 8.0.0-beta.2
       remark-gfm: 4.0.0
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@storybook/addon-measure@8.0.0-beta.6:
-    resolution: {integrity: sha512-D+KzWRULcbwR8/ysD7Qbw4uWBn9gwNm9s3IeVuhupawUb3u+H4XfVCOW2rA5qry/x8aroKOhAmyKd9v4i+l3pg==}
+  /@storybook/addon-measure@8.0.0-beta.2:
+    resolution: {integrity: sha512-V0kVtV9EihgsBHZ698QtH0tPr6bwFpwjLvK/Oz/PYh97jBfjzYI1A0qfAV1ixFAr12W/Aco1BBsw+ascI+0AjA==}
     dependencies:
       '@storybook/global': 5.0.0
       tiny-invariant: 1.3.1
     dev: true
 
-  /@storybook/addon-outline@8.0.0-beta.6:
-    resolution: {integrity: sha512-U+5TFTj+gtkIiIJCk6h7zbrP588CUipzVVsiDTSLl4pc+H3ylGTGncq3ZGtOyl+DCoBsQCgKxy2YWQtKHrESOw==}
+  /@storybook/addon-outline@8.0.0-beta.2:
+    resolution: {integrity: sha512-0FNcGgUvftiML5c5j9nRbKlaYcsXKISAdHxvku/dFBd16HctX/krf4neHVcSBpP1VfU2wT/782s3BXQcRwC/4Q==}
     dependencies:
       '@storybook/global': 5.0.0
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/addon-storysource@8.0.0-beta.6:
-    resolution: {integrity: sha512-J9sCZ5/KQW2hbfKsom8LmgSWJxw+Kp/7LjIHGevFfov/i9DR8i9xbh5htUwC9fx+vWGR87tez03b+oUJbyHPog==}
+  /@storybook/addon-storysource@8.0.0-beta.2:
+    resolution: {integrity: sha512-t3Nsr8MvcWlS+OONimYQ01CI3pPM5CKb+spS3BI7g89gnt7nz/OdrvbTZjOVLp6AqUo0lYnmVgEcjsOL09Zdfg==}
     dependencies:
-      '@storybook/source-loader': 8.0.0-beta.6
+      '@storybook/source-loader': 8.0.0-beta.2
       estraverse: 5.3.0
       tiny-invariant: 1.3.1
     dev: true
 
-  /@storybook/addon-toolbars@8.0.0-beta.6:
-    resolution: {integrity: sha512-ClT5spwh6S1rUvyFEIFQndE3VK6tpwI2cyIW4E20LajtfUmj3dOfJQX/ZbnhEH3sDBsCm97ysZ/mNR0mbBHZrg==}
+  /@storybook/addon-toolbars@8.0.0-beta.2:
+    resolution: {integrity: sha512-VoTZeLZo156QE4ZkymIH2OFHaZvfDWNBG2YdG/2vcBz3XG5xqlBtM+8IIAwIQik4vHIGVqFVDwPpjzWayQFr2A==}
     dev: true
 
-  /@storybook/addon-viewport@8.0.0-beta.6:
-    resolution: {integrity: sha512-KNYGM6nVrz/Ej25W3lcpaxxJDYVXBYeGl60FWN/WlqRnjo4c4Fyufl6Xev2plQ3eI8jIvWEdGNC/Z/NQnDx1+Q==}
+  /@storybook/addon-viewport@8.0.0-beta.2:
+    resolution: {integrity: sha512-OZzMtkOSIvLGXbODGd5UZb3KXvJNAuXfqkcrrtkSnC+8baJi+3xscVDTU5Tn8gfLz7wsGInrWchxNnXX+DKfmg==}
     dependencies:
       memoizerific: 1.11.3
     dev: true
 
-  /@storybook/blocks@8.0.0-beta.6(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-QkrWT0BELNv3UGv/dtNuB/ROZn0f9VpERbadhXLE/oNXMJLalyjEbRGM635l0lDeoqjYnWHl+tuM6DTe1Xpk2w==}
+  /@storybook/blocks@8.0.0-beta.2(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-IH8hEfPtR5N81PGydrPQdpBWGqOf6l1mXFjRjWwp1BkWvrvWv4lLk4bQ9JqpMF0zH2soKl5BUa5aP0yiufFtlg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6389,18 +6060,18 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/channels': 8.0.0-beta.6
-      '@storybook/client-logger': 8.0.0-beta.6
-      '@storybook/components': 8.0.0-beta.6(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/core-events': 8.0.0-beta.6
+      '@storybook/channels': 8.0.0-beta.2
+      '@storybook/client-logger': 8.0.0-beta.2
+      '@storybook/components': 8.0.0-beta.2(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-events': 8.0.0-beta.2
       '@storybook/csf': 0.1.2
-      '@storybook/docs-tools': 8.0.0-beta.6
+      '@storybook/docs-tools': 8.0.0-beta.2
       '@storybook/global': 5.0.0
       '@storybook/icons': 1.2.5(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/manager-api': 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/preview-api': 8.0.0-beta.6
-      '@storybook/theming': 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/types': 8.0.0-beta.6
+      '@storybook/manager-api': 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 8.0.0-beta.2
+      '@storybook/theming': 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 8.0.0-beta.2
       '@types/lodash': 4.14.191
       color-convert: 2.0.1
       dequal: 2.0.3
@@ -6421,13 +6092,13 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/builder-manager@8.0.0-beta.6:
-    resolution: {integrity: sha512-bB/gSsPIpU22Tc6YTjPZdw1RM6nrsuJJ9aYXGqEJTqA4l4lBUN7fwIZQ1x/pS+5LbeUO0J9lAhGXurS+m8rI2A==}
+  /@storybook/builder-manager@8.0.0-beta.2:
+    resolution: {integrity: sha512-YC9UFESllCLmo69R8xktieWcesCbJiDxeAhMdn9mosQLSOvPlZ/ElivTx423Ombrs3saXAxtLVY5rQJQKSUHEw==}
     dependencies:
       '@fal-works/esbuild-plugin-global-externals': 2.1.2
-      '@storybook/core-common': 8.0.0-beta.6
-      '@storybook/manager': 8.0.0-beta.6
-      '@storybook/node-logger': 8.0.0-beta.6
+      '@storybook/core-common': 8.0.0-beta.2
+      '@storybook/manager': 8.0.0-beta.2
+      '@storybook/node-logger': 8.0.0-beta.2
       '@types/ejs': 3.1.2
       '@yarnpkg/esbuild-plugin-pnp': 3.0.0-rc.15(esbuild@0.18.20)
       browser-assert: 1.2.1
@@ -6443,8 +6114,8 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/builder-vite@8.0.0-beta.6(typescript@5.3.3)(vite@5.1.4):
-    resolution: {integrity: sha512-3P5uTZqwwcUW64Hep/VtJXpQYi5vTkmqAjwZvr8gmzr37NYq3YT/PiSGn4CaZswSx5Z/lSYq3In8oIwmj/a1/g==}
+  /@storybook/builder-vite@8.0.0-beta.2(typescript@5.3.3)(vite@5.1.0):
+    resolution: {integrity: sha512-dtkEef/pZMRkv3f+byj6rNlotXK3L+93q1kZRPkICq3V46F4D8EhPZmN/KYi8LHoyKHP/8zE9aI3Mi7GBjQZiA==}
     peerDependencies:
       '@preact/preset-vite': '*'
       typescript: '>= 4.3.x'
@@ -6458,57 +6129,55 @@ packages:
       vite-plugin-glimmerx:
         optional: true
     dependencies:
-      '@storybook/channels': 8.0.0-beta.6
-      '@storybook/client-logger': 8.0.0-beta.6
-      '@storybook/core-common': 8.0.0-beta.6
-      '@storybook/core-events': 8.0.0-beta.6
-      '@storybook/csf-plugin': 8.0.0-beta.6
-      '@storybook/node-logger': 8.0.0-beta.6
-      '@storybook/preview': 8.0.0-beta.6
-      '@storybook/preview-api': 8.0.0-beta.6
-      '@storybook/types': 8.0.0-beta.6
+      '@storybook/channels': 8.0.0-beta.2
+      '@storybook/client-logger': 8.0.0-beta.2
+      '@storybook/core-common': 8.0.0-beta.2
+      '@storybook/csf-plugin': 8.0.0-beta.2
+      '@storybook/node-logger': 8.0.0-beta.2
+      '@storybook/preview': 8.0.0-beta.2
+      '@storybook/preview-api': 8.0.0-beta.2
+      '@storybook/types': 8.0.0-beta.2
       '@types/find-cache-dir': 3.2.1
       browser-assert: 1.2.1
       es-module-lexer: 0.9.3
       express: 4.18.2
       find-cache-dir: 3.3.2
       fs-extra: 11.1.1
-      magic-string: 0.30.7
+      magic-string: 0.30.5
       ts-dedent: 2.2.0
       typescript: 5.3.3
-      vite: 5.1.4(@types/node@20.11.22)(sass@1.71.1)(terser@5.28.1)
+      vite: 5.1.0(@types/node@20.11.17)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
       - encoding
       - supports-color
     dev: true
 
-  /@storybook/channels@8.0.0-beta.6:
-    resolution: {integrity: sha512-DjwJhty45gQifo+TvGqddLX+NX1iGTmZyGLxlqPMpdp+x/yq8WwVZ316Q7tLt6z6fyAmsroc3ma5p1iLhqpV7g==}
+  /@storybook/channels@8.0.0-beta.2:
+    resolution: {integrity: sha512-6PoOkce/T3g5pf5wA/tE9JRo9ZoyhdjzZqS2gVsxKza1Ie3gICVKWA+Cu3IM7s05+fX5syHmTvzOLykwfMh9QQ==}
     dependencies:
-      '@storybook/client-logger': 8.0.0-beta.6
-      '@storybook/core-events': 8.0.0-beta.6
+      '@storybook/client-logger': 8.0.0-beta.2
+      '@storybook/core-events': 8.0.0-beta.2
       '@storybook/global': 5.0.0
       qs: 6.11.1
       telejson: 7.2.0
       tiny-invariant: 1.3.1
     dev: true
 
-  /@storybook/cli@8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-sREQYnPds2bwQS7FLbRy7oaxGvOmYhPEYVf93pWKyo/qwSWyXEXbqGCGT6bNhSl/xzqXX7VryLDmuOoHmVTh1g==}
+  /@storybook/cli@8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-IfCYCpkOZvMQnf3i+AIdTZ4x45lfuEYNRWZYAZT8Nmnuz2gc0AKui3So4IgNB276Zmbru+OCudf05xHgoxxu3A==}
     hasBin: true
     dependencies:
-      '@babel/core': 7.23.5
       '@babel/types': 7.23.5
       '@ndelangen/get-tarball': 3.0.7
-      '@storybook/codemod': 8.0.0-beta.6
-      '@storybook/core-common': 8.0.0-beta.6
-      '@storybook/core-events': 8.0.0-beta.6
-      '@storybook/core-server': 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/csf-tools': 8.0.0-beta.6
-      '@storybook/node-logger': 8.0.0-beta.6
-      '@storybook/telemetry': 8.0.0-beta.6
-      '@storybook/types': 8.0.0-beta.6
-      '@types/semver': 7.5.8
+      '@storybook/codemod': 8.0.0-beta.2
+      '@storybook/core-common': 8.0.0-beta.2
+      '@storybook/core-events': 8.0.0-beta.2
+      '@storybook/core-server': 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/csf-tools': 8.0.0-beta.2
+      '@storybook/node-logger': 8.0.0-beta.2
+      '@storybook/telemetry': 8.0.0-beta.2
+      '@storybook/types': 8.0.0-beta.2
+      '@types/semver': 7.5.6
       '@yarnpkg/fslib': 2.10.3
       '@yarnpkg/libzip': 2.3.0
       chalk: 4.1.2
@@ -6543,22 +6212,22 @@ packages:
       - utf-8-validate
     dev: true
 
-  /@storybook/client-logger@8.0.0-beta.6:
-    resolution: {integrity: sha512-XX9CSWt9NDO/1K8tTYV+yuj0ur4HznM1Vc5mY5AwT5xh0RP5HtWZ+VoJfrWYXlBoRXaj0gf8si+FO+lSW82DcQ==}
+  /@storybook/client-logger@8.0.0-beta.2:
+    resolution: {integrity: sha512-Sp2tRQO7NmwUjFgN7WTptzJhcyT75rJ+PV9TeSi5BxJXSPTKvA/e6VKFA5k83MS5AI3VBzKV//rFsqyd5+EVkg==}
     dependencies:
       '@storybook/global': 5.0.0
     dev: true
 
-  /@storybook/codemod@8.0.0-beta.6:
-    resolution: {integrity: sha512-ttQYDkhKmtU6Qbg+Kgn4K2XXf8XMpa2euuC6PmYffBD7/qLiGfABfBc4FHKRv4yScnvKK7Ehy7K0lvipfg6tXw==}
+  /@storybook/codemod@8.0.0-beta.2:
+    resolution: {integrity: sha512-s0QcLCdFsMjQmMYRfLQwPaVaYwBmT+CYp0p43xLJ9EVMydSj+So9zs2L0Tp4BN+w9yMz+QvjSq0UZvexuFmC9Q==}
     dependencies:
       '@babel/core': 7.23.5
       '@babel/preset-env': 7.23.5(@babel/core@7.23.5)
       '@babel/types': 7.23.5
       '@storybook/csf': 0.1.2
-      '@storybook/csf-tools': 8.0.0-beta.6
-      '@storybook/node-logger': 8.0.0-beta.6
-      '@storybook/types': 8.0.0-beta.6
+      '@storybook/csf-tools': 8.0.0-beta.2
+      '@storybook/node-logger': 8.0.0-beta.2
+      '@storybook/types': 8.0.0-beta.2
       '@types/cross-spawn': 6.0.3
       cross-spawn: 7.0.3
       globby: 11.1.0
@@ -6571,19 +6240,19 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/components@8.0.0-beta.6(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-J3aJtPgaSco0sefvRMBLFsWbslhKMhaS3U+5baRqlV5bjPLZN+d4P18gP1RMaw/coh6DiKEQJZuHRoPIOdt4CA==}
+  /@storybook/components@8.0.0-beta.2(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-FsY+Sk6i/62RSPRTupUkBJEBb02Ry5Cg9XEfAa7eH5MpaxxLLIBBDxJ8y1FPepvr0Hkzqo0sBa8w3KMbTfo2ow==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
       '@radix-ui/react-slot': 1.0.2(@types/react@18.0.28)(react@18.2.0)
-      '@storybook/client-logger': 8.0.0-beta.6
+      '@storybook/client-logger': 8.0.0-beta.2
       '@storybook/csf': 0.1.2
       '@storybook/global': 5.0.0
       '@storybook/icons': 1.2.5(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/theming': 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/types': 8.0.0-beta.6
+      '@storybook/theming': 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 8.0.0-beta.2
       memoizerific: 1.11.3
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
@@ -6592,13 +6261,13 @@ packages:
       - '@types/react'
     dev: true
 
-  /@storybook/core-common@8.0.0-beta.6:
-    resolution: {integrity: sha512-Mah4Kx/VBNhHaX6neYHTiVwfD93yf3LVVfLTS9WcJFOpek74EAAqbARV3vzOn/utOI75N7yu2PCVoKi5KkDoVw==}
+  /@storybook/core-common@8.0.0-beta.2:
+    resolution: {integrity: sha512-il2D+GpFg0MdVrQ04f2g5dopynleY9SbkDIfd28RCwTuMefy2exe9DEQoGFiEgBx9inJPS7L3WR0h0p6OMO9KA==}
     dependencies:
-      '@storybook/core-events': 8.0.0-beta.6
-      '@storybook/csf-tools': 8.0.0-beta.6
-      '@storybook/node-logger': 8.0.0-beta.6
-      '@storybook/types': 8.0.0-beta.6
+      '@storybook/core-events': 8.0.0-beta.2
+      '@storybook/csf-tools': 8.0.0-beta.2
+      '@storybook/node-logger': 8.0.0-beta.2
+      '@storybook/types': 8.0.0-beta.2
       '@yarnpkg/fslib': 2.10.3
       '@yarnpkg/libzip': 2.3.0
       chalk: 4.1.2
@@ -6628,36 +6297,35 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/core-events@8.0.0-beta.6:
-    resolution: {integrity: sha512-ZyEVkOJ5gGGTfHjyasyeZgNGoeVJwVkLFRpV6cUl8hzOT29R5iDsf5PbJdrpF1x2pm1oLumeRckYQ7sYhr+R/w==}
+  /@storybook/core-events@8.0.0-beta.2:
+    resolution: {integrity: sha512-C2o0ShpfIFvSDyqaNaXwEfvJaaFlR0rRfvD1a65FMEFM6YAttA/es6z2yjUySUR2vfJ/vwnEtJxs7eGmuQuBmA==}
     dependencies:
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/core-server@8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-0ciJTWZs+mCnQOUzB3WuSfkhwXKpO033M5iYK92PKu9A6KSrwdc/WCwIJHeBNnIpmxC0GEh9j6/CgIsWehwJvg==}
+  /@storybook/core-server@8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-J96aic++0180m6KrIerWxNAbDxjUnUor7smbVWFWcvvZAM2cW77Th2tIXxs5gcyJ6LEEAea/jYV0P+/I+afdoA==}
     dependencies:
       '@aw-web-design/x-default-browser': 1.4.126
-      '@babel/core': 7.24.1
       '@discoveryjs/json-ext': 0.5.7
-      '@storybook/builder-manager': 8.0.0-beta.6
-      '@storybook/channels': 8.0.0-beta.6
-      '@storybook/core-common': 8.0.0-beta.6
-      '@storybook/core-events': 8.0.0-beta.6
+      '@storybook/builder-manager': 8.0.0-beta.2
+      '@storybook/channels': 8.0.0-beta.2
+      '@storybook/core-common': 8.0.0-beta.2
+      '@storybook/core-events': 8.0.0-beta.2
       '@storybook/csf': 0.1.2
-      '@storybook/csf-tools': 8.0.0-beta.6
+      '@storybook/csf-tools': 8.0.0-beta.2
       '@storybook/docs-mdx': 3.0.0
       '@storybook/global': 5.0.0
-      '@storybook/manager': 8.0.0-beta.6
-      '@storybook/manager-api': 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/node-logger': 8.0.0-beta.6
-      '@storybook/preview-api': 8.0.0-beta.6
-      '@storybook/telemetry': 8.0.0-beta.6
-      '@storybook/types': 8.0.0-beta.6
+      '@storybook/manager': 8.0.0-beta.2
+      '@storybook/manager-api': 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/node-logger': 8.0.0-beta.2
+      '@storybook/preview-api': 8.0.0-beta.2
+      '@storybook/telemetry': 8.0.0-beta.2
+      '@storybook/types': 8.0.0-beta.2
       '@types/detect-port': 1.3.2
       '@types/node': 18.17.15
       '@types/pretty-hrtime': 1.0.1
-      '@types/semver': 7.5.8
+      '@types/semver': 7.5.6
       better-opn: 3.0.2
       chalk: 4.1.2
       cli-table3: 0.6.3
@@ -6666,7 +6334,7 @@ packages:
       express: 4.18.2
       fs-extra: 11.1.1
       globby: 11.1.0
-      ip: 2.0.1
+      ip: 2.0.0
       lodash: 4.17.21
       open: 8.4.2
       pretty-hrtime: 1.0.3
@@ -6689,24 +6357,24 @@ packages:
       - utf-8-validate
     dev: true
 
-  /@storybook/csf-plugin@8.0.0-beta.6:
-    resolution: {integrity: sha512-cYI/4OndODf0utV0DxJs8AOKbmjCG+pEgxQGcmPtGnkSmEuieUwpQpN7v+fEIN7IPUQLYvs0wspR0njZQAIzyA==}
+  /@storybook/csf-plugin@8.0.0-beta.2:
+    resolution: {integrity: sha512-gdOiI57mkMwgPXnONE1bY4myX2dkol2UdzHYB12QEp9rxE+DHFudCYhxHIj4uyTybTXCjffXAgjlFyT8vBfYUA==}
     dependencies:
-      '@storybook/csf-tools': 8.0.0-beta.6
+      '@storybook/csf-tools': 8.0.0-beta.2
       unplugin: 1.5.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@storybook/csf-tools@8.0.0-beta.6:
-    resolution: {integrity: sha512-wwzbE6f8ykrvIeZlXYTba0IA8D5GPSyZ4L0+PqRAYHm3ozu0DXqtm4USDHKrjYAzuD+W+fG/6qIOQmsWYbNmpA==}
+  /@storybook/csf-tools@8.0.0-beta.2:
+    resolution: {integrity: sha512-vujr640EkjkCj8h9r579wugSuKdc3Hbd8GWWiWnCQCRMYW6j9Axj79W8lNOz+u3yWSy6FhqWXqUxr0eMcAv1NQ==}
     dependencies:
       '@babel/generator': 7.23.5
-      '@babel/parser': 7.23.9
+      '@babel/parser': 7.23.6
       '@babel/traverse': 7.23.5
       '@babel/types': 7.23.5
       '@storybook/csf': 0.1.2
-      '@storybook/types': 8.0.0-beta.6
+      '@storybook/types': 8.0.0-beta.2
       fs-extra: 11.1.1
       recast: 0.23.4
       ts-dedent: 2.2.0
@@ -6730,12 +6398,12 @@ packages:
     resolution: {integrity: sha512-NmiGXl2HU33zpwTv1XORe9XG9H+dRUC1Jl11u92L4xr062pZtrShLmD4VKIsOQujxhhOrbxpwhNOt+6TdhyIdQ==}
     dev: true
 
-  /@storybook/docs-tools@8.0.0-beta.6:
-    resolution: {integrity: sha512-fSKXEu0vegzqC2HT1RaOKqi0+W/vIn+qa5D+dZHkj2BnceYxWAGYsX9ZZPHW6DUvvwp0WZp1vz57nPUhsLvcQg==}
+  /@storybook/docs-tools@8.0.0-beta.2:
+    resolution: {integrity: sha512-uw2F9bhbotZ/v6+FFFv2jj+Oflfd+7gVj5vQttAVQ4o+f6hSsOQkvLeRc5pbs9/ANhB4OVKp23CZBcuySfDtTg==}
     dependencies:
-      '@storybook/core-common': 8.0.0-beta.6
-      '@storybook/preview-api': 8.0.0-beta.6
-      '@storybook/types': 8.0.0-beta.6
+      '@storybook/core-common': 8.0.0-beta.2
+      '@storybook/preview-api': 8.0.0-beta.2
+      '@storybook/types': 8.0.0-beta.2
       '@types/doctrine': 0.0.3
       assert: 2.1.0
       doctrine: 3.0.0
@@ -6760,29 +6428,29 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@storybook/instrumenter@8.0.0-beta.6:
-    resolution: {integrity: sha512-xJ3qkvj8dce7nJEa6hmp4PDDZJMBuP5UlSKPidiMAfEsB0MeUbDulTFNDb0t1DwcH9ywinDl8TilSzG4+r1kDA==}
+  /@storybook/instrumenter@8.0.0-beta.2:
+    resolution: {integrity: sha512-44W0krseJHhJ4u8auD2QB6civNjBWdAuc7pxJ/IYgIO7Hd3yGnJpDrcOUpaUpPT3WhLFpbbASjQIlauED0DiXw==}
     dependencies:
-      '@storybook/channels': 8.0.0-beta.6
-      '@storybook/client-logger': 8.0.0-beta.6
-      '@storybook/core-events': 8.0.0-beta.6
+      '@storybook/channels': 8.0.0-beta.2
+      '@storybook/client-logger': 8.0.0-beta.2
+      '@storybook/core-events': 8.0.0-beta.2
       '@storybook/global': 5.0.0
-      '@storybook/preview-api': 8.0.0-beta.6
+      '@storybook/preview-api': 8.0.0-beta.2
       '@vitest/utils': 0.34.6
       util: 0.12.5
     dev: true
 
-  /@storybook/manager-api@8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-kOGOT/yGFgKzld9IL1HREouFwZ0LpFuXZZOHBih5ydK8XT+bkWF6e3SiqthB3qtqpd0eVLAbNiPfY9R8t3qfWg==}
+  /@storybook/manager-api@8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-LMgxSXqpB8Zdtmvs0rthityGE77rVgQ82gq+LBMaBEEFlwdSfYhoLLnlNLHrc3m8A2mTXJ4/aDhvTTjh9PPG5w==}
     dependencies:
-      '@storybook/channels': 8.0.0-beta.6
-      '@storybook/client-logger': 8.0.0-beta.6
-      '@storybook/core-events': 8.0.0-beta.6
+      '@storybook/channels': 8.0.0-beta.2
+      '@storybook/client-logger': 8.0.0-beta.2
+      '@storybook/core-events': 8.0.0-beta.2
       '@storybook/csf': 0.1.2
       '@storybook/global': 5.0.0
-      '@storybook/router': 8.0.0-beta.6
-      '@storybook/theming': 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/types': 8.0.0-beta.6
+      '@storybook/router': 8.0.0-beta.2
+      '@storybook/theming': 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 8.0.0-beta.2
       dequal: 2.0.3
       lodash: 4.17.21
       memoizerific: 1.11.3
@@ -6794,23 +6462,23 @@ packages:
       - react-dom
     dev: true
 
-  /@storybook/manager@8.0.0-beta.6:
-    resolution: {integrity: sha512-FeQ2/CIasSOgcTMEE3QYMFa92KeMnfEMyUVO4hHEmPh3SqPsz6OOv8p0bQvN0SWWBgZarbhFR0dKC3W10yYrXg==}
+  /@storybook/manager@8.0.0-beta.2:
+    resolution: {integrity: sha512-eho+n+gUjuNlX5HQYoOKKvWjTcL96kwp9KdAmrhUn3KMNLkG8kax9iEUSFKG2p+tR+YAxsJJzDlC9gV4XzbBGA==}
     dev: true
 
-  /@storybook/node-logger@8.0.0-beta.6:
-    resolution: {integrity: sha512-nmBlmZ8wzJiU1/ubhUmFeWQaJPBv6l6s0Cndk04omPSjROa+O1whoPhDTVGvWC28zm17tmAYVcQRujkdoi+YBA==}
+  /@storybook/node-logger@8.0.0-beta.2:
+    resolution: {integrity: sha512-bBTayxV0B87FPL+suMGxpMfPzUhAwu/yO8c6glLJ4xVHJlUNn+tVQpLDehU6NeqgYTdAg9oh0fi9ufZoROVfMw==}
     dev: true
 
-  /@storybook/preview-api@8.0.0-beta.6:
-    resolution: {integrity: sha512-V07MF1ArjBGi2EPSjrEW8pjCoW/TIwxNDilcO9cD12LHrDQGXuo/iKyR47TGUYmcJ/u1I2Eu9cjyVj9DVyppag==}
+  /@storybook/preview-api@8.0.0-beta.2:
+    resolution: {integrity: sha512-eekdhIwSOI3RnLDHJViLBBoTuSmQUo7Oa1FGU/gDx7ZEofNF+k2N4FdFPRc72Dkv4SI7hGmoJJWbPA6BR2ZHww==}
     dependencies:
-      '@storybook/channels': 8.0.0-beta.6
-      '@storybook/client-logger': 8.0.0-beta.6
-      '@storybook/core-events': 8.0.0-beta.6
+      '@storybook/channels': 8.0.0-beta.2
+      '@storybook/client-logger': 8.0.0-beta.2
+      '@storybook/core-events': 8.0.0-beta.2
       '@storybook/csf': 0.1.2
       '@storybook/global': 5.0.0
-      '@storybook/types': 8.0.0-beta.6
+      '@storybook/types': 8.0.0-beta.2
       '@types/qs': 6.9.7
       dequal: 2.0.3
       lodash: 4.17.21
@@ -6821,12 +6489,12 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/preview@8.0.0-beta.6:
-    resolution: {integrity: sha512-tp3Wyvjsbf5r5RhbCQSafArQWJAir1bmIJWGG2S4o2E3YT6TlHFpR078tNJtgXqsPyG0yhF9vhRRkDczrPX/Gw==}
+  /@storybook/preview@8.0.0-beta.2:
+    resolution: {integrity: sha512-n9OqS5KRdUGD3oImCG5NzUIZabcV/A3LifD2YOYCyJHS4U9yg4Wse2o6Px8niklAstAdFFOP2iyMQxjt0iQ0DA==}
     dev: true
 
-  /@storybook/react-dom-shim@8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-l14oDKAW2jyrXynHKP6SoNGal78gXcWCgj0zLwSDWpKgAFWC7SuIneuxLv6weU1D4+f9Y9FBrz+K3CCaMgMtOA==}
+  /@storybook/react-dom-shim@8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-z372LCk+5WbSX/nWpnYaxP4oWoeKTtmq7CHqK7pWrdtZJRwZJbsIKZdZragzO4yyfZLEuAybw7kR9qgCqz1ToA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6835,23 +6503,23 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@storybook/react-vite@8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)(rollup@4.12.0)(typescript@5.3.3)(vite@5.1.4):
-    resolution: {integrity: sha512-Tvz25pTXmhncDxprjIYsnXc68Lfa9idDybpRTRRbtvjsJyVpZogUdgz2/kddGNTuX3mqz6vmTMWiLiIVh+ytQA==}
+  /@storybook/react-vite@8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)(rollup@4.9.6)(typescript@5.3.3)(vite@5.1.0):
+    resolution: {integrity: sha512-PKbOW0JP03e0x9cndFkCXoCUUQ+P7C7JzUnURRz/uRGXl/DUiR1IcjxL0aNT7uv9Gm+whpnGCP977RHFrvMlqA==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
       vite: ^4.0.0 || ^5.0.0
     dependencies:
-      '@joshwooding/vite-plugin-react-docgen-typescript': 0.3.0(typescript@5.3.3)(vite@5.1.4)
-      '@rollup/pluginutils': 5.1.0(rollup@4.12.0)
-      '@storybook/builder-vite': 8.0.0-beta.6(typescript@5.3.3)(vite@5.1.4)
-      '@storybook/react': 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3)
-      magic-string: 0.30.7
+      '@joshwooding/vite-plugin-react-docgen-typescript': 0.3.0(typescript@5.3.3)(vite@5.1.0)
+      '@rollup/pluginutils': 5.1.0(rollup@4.9.6)
+      '@storybook/builder-vite': 8.0.0-beta.2(typescript@5.3.3)(vite@5.1.0)
+      '@storybook/react': 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3)
+      magic-string: 0.30.5
       react: 18.2.0
       react-docgen: 7.0.1
       react-dom: 18.2.0(react@18.2.0)
-      vite: 5.1.4(@types/node@20.11.22)(sass@1.71.1)(terser@5.28.1)
+      vite: 5.1.0(@types/node@20.11.17)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
       - '@preact/preset-vite'
       - encoding
@@ -6861,8 +6529,8 @@ packages:
       - vite-plugin-glimmerx
     dev: true
 
-  /@storybook/react@8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-69B0c08HDYHEgZRRnkB+3z4dY/HO/GMSiRzRCNpzI0SBQzk1YwDzG9MOtkNgGqzdLK3e3DveSXb5Uyy1cB0ZiQ==}
+  /@storybook/react@8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3):
+    resolution: {integrity: sha512-6Snd+u9UQHrzYkmEYi/BxJMl1FNnJI+3aXdopiwdslze9bosZg0glK4TKBvhqGwCBYLnKgzKHXhttMECWQApFA==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6872,12 +6540,12 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@storybook/client-logger': 8.0.0-beta.6
-      '@storybook/docs-tools': 8.0.0-beta.6
+      '@storybook/client-logger': 8.0.0-beta.2
+      '@storybook/docs-tools': 8.0.0-beta.2
       '@storybook/global': 5.0.0
-      '@storybook/preview-api': 8.0.0-beta.6
-      '@storybook/react-dom-shim': 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/types': 8.0.0-beta.6
+      '@storybook/preview-api': 8.0.0-beta.2
+      '@storybook/react-dom-shim': 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 8.0.0-beta.2
       '@types/escodegen': 0.0.6
       '@types/estree': 0.0.51
       '@types/node': 18.17.15
@@ -6901,30 +6569,30 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/router@8.0.0-beta.6:
-    resolution: {integrity: sha512-JjLyDaVzCH3kmNsOkuJ8/U2bPIoReZZ/QsgHJdfvm22T2wKNjQ+lfNrQptBgNybfi1o/Tmn9VbCdRqurSlh9Dw==}
+  /@storybook/router@8.0.0-beta.2:
+    resolution: {integrity: sha512-bnNEayh3g4KZUVmH7zlJZ0tdSE6lJZZhUDE61bjPHjweLx3xYLlev0A8EwzAjz1BBpr4H8UtyYa32C7+G1Urxw==}
     dependencies:
-      '@storybook/client-logger': 8.0.0-beta.6
+      '@storybook/client-logger': 8.0.0-beta.2
       memoizerific: 1.11.3
       qs: 6.11.1
     dev: true
 
-  /@storybook/source-loader@8.0.0-beta.6:
-    resolution: {integrity: sha512-cYtjnuJZgm8MS9SsNsbuhuFz2d7j6BKRLZByBUqELrK+ftup0qqOWM+78w26qn3nPgA8myZXWxGa+V/Pjxio5w==}
+  /@storybook/source-loader@8.0.0-beta.2:
+    resolution: {integrity: sha512-nSGtn7y/o4aaHVI2mw2Xi/GIElfqMUah9uHFtEzl+vT0JIOs7jImR9dblpR5jGFRZM/2Waod8aXJ+hYkQ7MaQA==}
     dependencies:
       '@storybook/csf': 0.1.2
-      '@storybook/types': 8.0.0-beta.6
+      '@storybook/types': 8.0.0-beta.2
       estraverse: 5.3.0
       lodash: 4.17.21
       prettier: 3.2.5
     dev: true
 
-  /@storybook/telemetry@8.0.0-beta.6:
-    resolution: {integrity: sha512-3CU5Sdj8eVm0tb35GriMkDrxJyTpdGcfU/hgUnsuw+I4eHYdZsc4Boh9uXWTVNsaBaoqbD/MP1aqbfxkElqPxQ==}
+  /@storybook/telemetry@8.0.0-beta.2:
+    resolution: {integrity: sha512-jc2w//1ZYn0EuDOjtBx27uTpThjFj2+0fNf0G83+BmZR8yJciBj+YXrzQB6FWdiKyT4WLaH4la1ZlaiJP+ZdYQ==}
     dependencies:
-      '@storybook/client-logger': 8.0.0-beta.6
-      '@storybook/core-common': 8.0.0-beta.6
-      '@storybook/csf-tools': 8.0.0-beta.6
+      '@storybook/client-logger': 8.0.0-beta.2
+      '@storybook/core-common': 8.0.0-beta.2
+      '@storybook/csf-tools': 8.0.0-beta.2
       chalk: 4.1.2
       detect-package-manager: 2.0.1
       fetch-retry: 5.0.4
@@ -6935,16 +6603,16 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/test@8.0.0-beta.6(vitest@0.34.6):
-    resolution: {integrity: sha512-GcV76EX3U77G+k8+0V+jAa/sJQZEuNb/4W+g/RaqGLRCEG73UADzkgRuFm60UQUBGtltvvRZU9sIPVbFTJFxuA==}
+  /@storybook/test@8.0.0-beta.2(vitest@0.34.6):
+    resolution: {integrity: sha512-sMo5mUKMOLoPMOWvAvK++V9Db6qO5bgGr1JLmnX+1YTh3mzZzOlsKe5nEKdEBjT1iI1OstypDg+oKHAEfg5Oag==}
     dependencies:
-      '@storybook/client-logger': 8.0.0-beta.6
-      '@storybook/core-events': 8.0.0-beta.6
-      '@storybook/instrumenter': 8.0.0-beta.6
-      '@storybook/preview-api': 8.0.0-beta.6
+      '@storybook/client-logger': 8.0.0-beta.2
+      '@storybook/core-events': 8.0.0-beta.2
+      '@storybook/instrumenter': 8.0.0-beta.2
+      '@storybook/preview-api': 8.0.0-beta.2
       '@testing-library/dom': 9.3.3
       '@testing-library/jest-dom': 6.4.2(vitest@0.34.6)
-      '@testing-library/user-event': 14.5.2(@testing-library/dom@9.3.3)
+      '@testing-library/user-event': 14.3.0(@testing-library/dom@9.3.3)
       '@vitest/expect': 1.1.3
       '@vitest/spy': 1.3.1
       chai: 4.3.10
@@ -6957,8 +6625,8 @@ packages:
       - vitest
     dev: true
 
-  /@storybook/theming@8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-WXvDbV257fKbHM5jHd7hOHefRSBnyZec08NGpcVOG6muJjLu8nPjazcYgISqFc97MkFmxvEDPFfX8CvBEeefzA==}
+  /@storybook/theming@8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-Nl3eCdsBVjh98sghb7YF/v+65bUWEyJfvhU7aQHxRcYoBw+UKJIX5FKSd+PFnC/BOkH0So2ngDU2XFoOdA6BPg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6969,36 +6637,33 @@ packages:
         optional: true
     dependencies:
       '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0)
-      '@storybook/client-logger': 8.0.0-beta.6
+      '@storybook/client-logger': 8.0.0-beta.2
       '@storybook/global': 5.0.0
       memoizerific: 1.11.3
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@storybook/types@8.0.0-beta.6:
-    resolution: {integrity: sha512-w3jq8mBcxir4P0RK3gQePeUJ0rXbnUbCKg91YBOKeitmU0+4jSr4e1EwTWOYgsyz7KtikzSNr8JXtMQn2TJD5A==}
+  /@storybook/types@8.0.0-beta.2:
+    resolution: {integrity: sha512-MK6QFpMGWxu+sLCw8VrXmL0gOJ3g6XPpV85T5s+CEMsfMhSH5wCMdhtWkCRbHGfVEPKa5fEtA0SaGLqJhnSpQw==}
     dependencies:
-      '@storybook/channels': 8.0.0-beta.6
+      '@storybook/channels': 8.0.0-beta.2
       '@types/express': 4.17.17
       file-system-cache: 2.3.0
     dev: true
 
-  /@storybook/vue3-vite@8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)(vite@5.1.4)(vue@3.4.21):
-    resolution: {integrity: sha512-Pf9W7hcHjx1FE3JmhY1iSxGq9k/Tp5n/obOCd4FJGUdIttPYFclG9km49DrCJtNfhK7M6+d2QTZ6Uds4ORWZPg==}
+  /@storybook/vue3-vite@8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3)(vite@5.1.0)(vue@3.4.18):
+    resolution: {integrity: sha512-Pzth2PEEmLyI2hW827x+Cd4nYO6xayAsWk46JdXjfHOVnHDgp6CZPSi1zr79J+bbjvQtHHb+9BV4TljdiM0zxw==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
       vite: ^4.0.0 || ^5.0.0
     dependencies:
-      '@storybook/builder-vite': 8.0.0-beta.6(typescript@5.3.3)(vite@5.1.4)
-      '@storybook/core-server': 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/vue3': 8.0.0-beta.6(vue@3.4.21)
-      find-package-json: 1.2.0
-      magic-string: 0.30.7
-      typescript: 5.3.3
-      vite: 5.1.4(@types/node@20.11.22)(sass@1.71.1)(terser@5.28.1)
-      vue-component-meta: 1.8.27(typescript@5.3.3)
-      vue-docgen-api: 4.76.0(vue@3.4.21)
+      '@storybook/builder-vite': 8.0.0-beta.2(typescript@5.3.3)(vite@5.1.0)
+      '@storybook/core-server': 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/vue3': 8.0.0-beta.2(vue@3.4.18)
+      magic-string: 0.30.5
+      vite: 5.1.0(@types/node@20.11.17)(sass@1.70.0)(terser@5.27.0)
+      vue-docgen-api: 4.64.1(vue@3.4.18)
     transitivePeerDependencies:
       - '@preact/preset-vite'
       - bufferutil
@@ -7006,27 +6671,28 @@ packages:
       - react
       - react-dom
       - supports-color
+      - typescript
       - utf-8-validate
       - vite-plugin-glimmerx
       - vue
     dev: true
 
-  /@storybook/vue3@8.0.0-beta.6(vue@3.4.21):
-    resolution: {integrity: sha512-027KDM1f6y0XzMK1yE5W4JKY/VsbGpr1kj0mvEKxaPUYgBJV9wTHADWgmluiJS/e/MWrCCZql5mE+D9lVJUjoA==}
+  /@storybook/vue3@8.0.0-beta.2(vue@3.4.18):
+    resolution: {integrity: sha512-lGupXqWl+/gx5in8jJEzxCHvtTfFHCemYFVMXUqNhJ+Chudwx7LRyy3frQ+0AE4FzGIIYWM/tJjkaKvtBQvEDg==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
       vue: ^3.0.0
     dependencies:
-      '@storybook/docs-tools': 8.0.0-beta.6
+      '@storybook/docs-tools': 8.0.0-beta.2
       '@storybook/global': 5.0.0
-      '@storybook/preview-api': 8.0.0-beta.6
-      '@storybook/types': 8.0.0-beta.6
-      '@vue/compiler-core': 3.4.18
+      '@storybook/preview-api': 8.0.0-beta.2
+      '@storybook/types': 8.0.0-beta.2
+      '@vue/compiler-core': 3.4.15
       lodash: 4.17.21
       ts-dedent: 2.2.0
       type-fest: 2.19.0
-      vue: 3.4.21(typescript@5.3.3)
-      vue-component-type-helpers: 2.0.7
+      vue: 3.4.18(typescript@5.3.3)
+      vue-component-type-helpers: 1.8.27
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -7620,11 +7286,11 @@ packages:
       dom-accessibility-api: 0.6.3
       lodash: 4.17.21
       redent: 3.0.0
-      vitest: 0.34.6(happy-dom@13.6.2)(sass@1.71.1)(terser@5.28.1)
+      vitest: 0.34.6(happy-dom@10.0.3)(sass@1.70.0)(terser@5.27.0)
     dev: true
 
-  /@testing-library/user-event@14.5.2(@testing-library/dom@9.3.3):
-    resolution: {integrity: sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ==}
+  /@testing-library/user-event@14.3.0(@testing-library/dom@9.3.3):
+    resolution: {integrity: sha512-P02xtBBa8yMaLhK8CzJCIns8rqwnF6FxhR9zs810flHOBXUYCFjLd8Io1rQrAkQRWEmW2PGdZIEdMxf/KLsqFA==}
     engines: {node: '>=12', npm: '>=6'}
     peerDependencies:
       '@testing-library/dom': '>=7.21.4'
@@ -7632,7 +7298,7 @@ packages:
       '@testing-library/dom': 9.3.3
     dev: true
 
-  /@testing-library/vue@8.0.2(@vue/compiler-sfc@3.4.21)(vue@3.4.21):
+  /@testing-library/vue@8.0.2(@vue/compiler-sfc@3.4.18)(vue@3.4.18):
     resolution: {integrity: sha512-A8wWX+qQn0o0izpQWnGCpwQt8wAdpsVP8vPP2h5Q/jcGhZ5yKXz9PPUqhQv+45LTFaWlyRf8bArTVaB/KFFd5A==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -7644,9 +7310,9 @@ packages:
     dependencies:
       '@babel/runtime': 7.23.4
       '@testing-library/dom': 9.3.3
-      '@vue/compiler-sfc': 3.4.21
-      '@vue/test-utils': 2.4.1(vue@3.4.21)
-      vue: 3.4.21(typescript@5.3.3)
+      '@vue/compiler-sfc': 3.4.18
+      '@vue/test-utils': 2.4.1(vue@3.4.18)
+      vue: 3.4.18(typescript@5.3.3)
     transitivePeerDependencies:
       - '@vue/server-renderer'
     dev: true
@@ -7677,7 +7343,7 @@ packages:
   /@types/accepts@1.3.7:
     resolution: {integrity: sha512-Pay9fq2lM2wXPWbteBsRAGiWH2hig4ZE2asK+mm7kUzlxRTfL961rj89I6zV/E3PcIkDqyuBEcMxFT7rccugeQ==}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
 
   /@types/archiver@6.0.2:
@@ -7701,7 +7367,7 @@ packages:
   /@types/babel__core@7.20.0:
     resolution: {integrity: sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==}
     dependencies:
-      '@babel/parser': 7.23.9
+      '@babel/parser': 7.23.6
       '@babel/types': 7.23.5
       '@types/babel__generator': 7.6.4
       '@types/babel__template': 7.4.1
@@ -7717,7 +7383,7 @@ packages:
   /@types/babel__template@7.4.1:
     resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
     dependencies:
-      '@babel/parser': 7.23.9
+      '@babel/parser': 7.23.6
       '@babel/types': 7.23.5
     dev: true
 
@@ -7735,7 +7401,7 @@ packages:
     resolution: {integrity: sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==}
     dependencies:
       '@types/connect': 3.4.35
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
 
   /@types/braces@3.0.1:
@@ -7745,9 +7411,9 @@ packages:
   /@types/cacheable-request@6.0.3:
     resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==}
     dependencies:
-      '@types/http-cache-semantics': 4.0.4
+      '@types/http-cache-semantics': 4.0.1
       '@types/keyv': 3.1.4
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       '@types/responselike': 1.0.0
     dev: false
 
@@ -7774,7 +7440,7 @@ packages:
   /@types/connect@3.4.35:
     resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
 
   /@types/content-disposition@0.5.8:
@@ -7788,7 +7454,7 @@ packages:
   /@types/cross-spawn@6.0.3:
     resolution: {integrity: sha512-BDAkU7WHHRHnvBf5z89lcvACsvkz/n7Tv+HyD/uW76O29HoH1Tk/W6iQrepaZVbisvlEek4ygwT8IW7ow9XLAA==}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
 
   /@types/debug@4.1.12:
@@ -7846,7 +7512,7 @@ packages:
   /@types/express-serve-static-core@4.17.33:
     resolution: {integrity: sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA==}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       '@types/qs': 6.9.7
       '@types/range-parser': 1.2.4
     dev: true
@@ -7867,38 +7533,38 @@ packages:
   /@types/fluent-ffmpeg@2.1.24:
     resolution: {integrity: sha512-g5oQO8Jgi2kFS3tTub7wLvfLztr1s8tdXmRd8PiL/hLMLzTIAyMR2sANkTggM/rdEDAg3d63nYRRVepwBiCw5A==}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
 
   /@types/glob@7.2.0:
     resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==}
     dependencies:
       '@types/minimatch': 5.1.2
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
 
   /@types/glob@8.1.0:
     resolution: {integrity: sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==}
     dependencies:
       '@types/minimatch': 5.1.2
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: false
 
   /@types/graceful-fs@4.1.6:
     resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
 
   /@types/hast@3.0.4:
     resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
     dependencies:
-      '@types/unist': 3.0.2
+      '@types/unist': 2.0.6
     dev: true
 
-  /@types/htmlescape@1.1.3:
-    resolution: {integrity: sha512-tuC81YJXGUe0q8WRtBNW+uyx79rkkzWK651ALIXXYq5/u/IxjX4iHneGF2uUqzsNp+F+9J2mFZOv9jiLTtIq0w==}
-    dev: true
+  /@types/http-cache-semantics@4.0.1:
+    resolution: {integrity: sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==}
+    dev: false
 
   /@types/http-cache-semantics@4.0.4:
     resolution: {integrity: sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==}
@@ -7910,7 +7576,7 @@ packages:
   /@types/http-link-header@1.0.5:
     resolution: {integrity: sha512-AxhIKR8UbyoqCTNp9rRepkktHuUOw3DjfOfDCaO9kwI8AYzjhxyrvZq4+mRw/2daD3hYDknrtSeV6SsPwmc71w==}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
 
   /@types/istanbul-lib-coverage@2.0.4:
@@ -7936,13 +7602,6 @@ packages:
       pretty-format: 29.7.0
     dev: true
 
-  /@types/jest@29.5.12:
-    resolution: {integrity: sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==}
-    dependencies:
-      expect: 29.7.0
-      pretty-format: 29.7.0
-    dev: true
-
   /@types/js-yaml@4.0.9:
     resolution: {integrity: sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==}
     dev: true
@@ -7950,7 +7609,7 @@ packages:
   /@types/jsdom@21.1.6:
     resolution: {integrity: sha512-/7kkMsC+/kMs7gAYmmBR9P0vGTnOoLhQhyhQJSlXGI5bzTHp6xdo0TtKWQAsz6pmSAeVqKSbqeyP6hytqr9FDw==}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       '@types/tough-cookie': 4.0.2
       parse5: 7.1.2
     dev: true
@@ -7974,7 +7633,7 @@ packages:
   /@types/keyv@3.1.4:
     resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: false
 
   /@types/linkify-it@3.0.2:
@@ -8003,7 +7662,7 @@ packages:
   /@types/mdast@4.0.3:
     resolution: {integrity: sha512-LsjtqsyF+d2/yFOYaN22dHZI1Cpwkrj+g06G8+qtUKlhovPW89YhqSnfKtMbkgmEtYpH2gydRNULd6y8mciAFg==}
     dependencies:
-      '@types/unist': 3.0.2
+      '@types/unist': 2.0.6
     dev: true
 
   /@types/mdurl@1.0.2:
@@ -8043,7 +7702,7 @@ packages:
     resolution: {integrity: sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==}
     requiresBuild: true
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       form-data: 3.0.1
     dev: false
 
@@ -8057,17 +7716,11 @@ packages:
     resolution: {integrity: sha512-2yrWpBk32tvV/JAd3HNHWuZn/VDN1P+72hWirHnvsvTGSqbANi+kSeuQR9yAHnbvaBvHDsoTdXV0Fe+iRtHLKA==}
     dev: true
 
-  /@types/node@20.11.22:
-    resolution: {integrity: sha512-/G+IxWxma6V3E+pqK1tSl2Fo1kl41pK1yeCyDsgkF9WlVAme4j5ISYM2zR11bgLFJGLN5sVK40T4RJNuiZbEjA==}
+  /@types/node@20.11.17:
+    resolution: {integrity: sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw==}
     dependencies:
       undici-types: 5.26.5
 
-  /@types/node@20.11.28:
-    resolution: {integrity: sha512-M/GPWVS2wLkSkNHVeLkrF2fD5Lx5UC4PxA0uZcKc6QqbIQUJyW1jVjueJYi1z8n0I5PxYrtpnPnWglE+y9A0KA==}
-    dependencies:
-      undici-types: 5.26.5
-    dev: true
-
   /@types/node@20.11.5:
     resolution: {integrity: sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==}
     dependencies:
@@ -8083,7 +7736,7 @@ packages:
   /@types/nodemailer@6.4.14:
     resolution: {integrity: sha512-fUWthHO9k9DSdPCSPRqcu6TWhYyxTBg382vlNIttSe9M7XfsT06y0f24KHXtbnijPGGRIcVvdKHTNikOI6qiHA==}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
 
   /@types/normalize-package-data@2.4.1:
@@ -8100,13 +7753,13 @@ packages:
     resolution: {integrity: sha512-Ali0fUUn+zgr4Yy/pCTFbuiaiJpq7l7OQwFnxYVchNbNGIx0c4Wkcdje6WO89I91RAaYF+gVc1pOaizA4YKZmA==}
     dependencies:
       '@types/express': 4.17.17
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
 
   /@types/oauth@0.9.4:
     resolution: {integrity: sha512-qk9orhti499fq5XxKCCEbd0OzdPZuancneyse3KtR+vgMiHRbh+mn8M4G6t64ob/Fg+GZGpa565MF/2dKWY32A==}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
 
   /@types/offscreencanvas@2019.3.0:
@@ -8119,10 +7772,10 @@ packages:
     requiresBuild: true
     dev: false
 
-  /@types/pg@8.11.2:
-    resolution: {integrity: sha512-G2Mjygf2jFMU/9hCaTYxJrwdObdcnuQde1gndooZSOHsNSaCehAuwc7EIuSA34Do8Jx2yZ19KtvW8P0j4EuUXw==}
+  /@types/pg@8.11.0:
+    resolution: {integrity: sha512-sDAlRiBNthGjNFfvt0k6mtotoVYVQ63pA8R4EMWka7crawSR60waVYR0HAgmPRs/e2YaeJTD/43OoZ3PFw80pw==}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       pg-protocol: 1.6.0
       pg-types: 4.0.1
     dev: true
@@ -8143,14 +7796,14 @@ packages:
     resolution: {integrity: sha512-Sk/uYFOBAB7mb74XcpizmH0KOR2Pv3D2Hmrh1Dmy5BmK3MpdSa5kqZcg6EKBdklU0bFXX9gCfzvpnyUehrPIuA==}
     dev: true
 
-  /@types/punycode@2.1.4:
-    resolution: {integrity: sha512-trzh6NzBnq8yw5e35f8xe8VTYjqM3NE7bohBtvDVf/dtUer3zYTLK1Ka3DG3p7bdtoaOHZucma6FfVKlQ134pQ==}
+  /@types/punycode@2.1.3:
+    resolution: {integrity: sha512-dFkH9Mz0yY5UfQVSrpj1grQyqRwe4TohTLlHFx4Gli8/fsaNyoOVUAsiEBZk5JBwbEJVZ49W6st8D5g6dRJb/w==}
     dev: true
 
   /@types/qrcode@1.5.5:
     resolution: {integrity: sha512-CdfBi/e3Qk+3Z/fXYShipBT13OJ2fDO2Q2w5CIP5anLTLIndQG9z6P1cnm+8zCWSpm5dnxMFd/uREtb0EXuQzg==}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
 
   /@types/qs@6.9.7:
@@ -8180,7 +7833,7 @@ packages:
   /@types/readdir-glob@1.1.1:
     resolution: {integrity: sha512-ImM6TmoF8bgOwvehGviEj3tRdRBbQujr1N+0ypaln/GWjaerOB26jb93vsRHmdMtvVQZQebOlqt2HROark87mQ==}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
 
   /@types/rename@1.0.7:
@@ -8194,18 +7847,18 @@ packages:
   /@types/responselike@1.0.0:
     resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: false
 
   /@types/rimraf@3.0.2:
     resolution: {integrity: sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==}
     dependencies:
       '@types/glob': 8.1.0
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: false
 
-  /@types/sanitize-html@2.11.0:
-    resolution: {integrity: sha512-7oxPGNQHXLHE48r/r/qjn7q0hlrs3kL7oZnGj0Wf/h9tj/6ibFyRkNbsDxaBBZ4XUZ0Dx5LGCyDJ04ytSofacQ==}
+  /@types/sanitize-html@2.9.5:
+    resolution: {integrity: sha512-2Sr1vd8Dw+ypsg/oDDfZ57OMSG2Befs+l2CMyCC5bVSK3CpE7lTB2aNlbbWzazgVA+Qqfuholwom6x/mWd1qmw==}
     dependencies:
       htmlparser2: 8.0.1
     dev: true
@@ -8223,15 +7876,15 @@ packages:
     resolution: {integrity: sha512-TY1eezMU2zH2ozQoAFAQFOPpvP15g+ZgSfTZt31AUUH/Rxtnz3H+A/Sv1Snw2/amp//omibc+AEkTaA8KUeOLQ==}
     dev: true
 
-  /@types/semver@7.5.8:
-    resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==}
+  /@types/semver@7.5.6:
+    resolution: {integrity: sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==}
     dev: true
 
   /@types/serve-static@1.15.1:
     resolution: {integrity: sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==}
     dependencies:
       '@types/mime': 3.0.1
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
 
   /@types/serviceworker@0.0.67:
@@ -8284,6 +7937,10 @@ packages:
     resolution: {integrity: sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==}
     dev: true
 
+  /@types/unist@2.0.6:
+    resolution: {integrity: sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==}
+    dev: true
+
   /@types/unist@3.0.2:
     resolution: {integrity: sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==}
     dev: true
@@ -8295,13 +7952,13 @@ packages:
   /@types/vary@1.1.3:
     resolution: {integrity: sha512-XJT8/ZQCL7NUut9QDLf6l24JfAEl7bnNdgxfj50cHIpEPRJLHHDDFOAq6i+GsEmeFfH7NamhBE4c4Thtb2egWg==}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
 
   /@types/web-push@3.6.3:
     resolution: {integrity: sha512-v3oT4mMJsHeJ/rraliZ+7TbZtr5bQQuxcgD7C3/1q/zkAj29c8RE0F9lVZVu3hiQe5Z9fYcBreV7TLnfKR+4mg==}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
 
   /@types/webgl-ext@0.0.30:
@@ -8312,7 +7969,7 @@ packages:
   /@types/ws@8.5.10:
     resolution: {integrity: sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
 
   /@types/yargs-parser@21.0.0:
@@ -8335,7 +7992,7 @@ packages:
     resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==}
     requiresBuild: true
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
     optional: true
 
@@ -8368,25 +8025,25 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/eslint-plugin@7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-j6vT/kCulhG5wBmGtstKeiVr1rdXE4nk+DT1k6trYkwlrvW9eOF5ZbgKnd/YR6PcM4uTEXa0h6Fcvf6X7Dxl0w==}
+  /@typescript-eslint/eslint-plugin@6.18.1(@typescript-eslint/parser@6.18.1)(eslint@8.56.0)(typescript@5.3.3):
+    resolution: {integrity: sha512-nISDRYnnIpk7VCFrGcu1rnZfM1Dh9LRHnfgdkjcbi/l7g16VYRri3TjXi9Ir4lOZSw5N/gnV/3H7jIPQ8Q4daA==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^7.0.0
-      eslint: ^8.56.0
+      '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha
+      eslint: ^7.0.0 || ^8.0.0
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
       '@eslint-community/regexpp': 4.6.2
-      '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
-      '@typescript-eslint/scope-manager': 7.1.0
-      '@typescript-eslint/type-utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
-      '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
-      '@typescript-eslint/visitor-keys': 7.1.0
+      '@typescript-eslint/parser': 6.18.1(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/scope-manager': 6.18.1
+      '@typescript-eslint/type-utils': 6.18.1(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/utils': 6.18.1(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/visitor-keys': 6.18.1
       debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.57.0
+      eslint: 8.56.0
       graphemer: 1.4.0
       ignore: 5.2.4
       natural-compare: 1.4.0
@@ -8418,22 +8075,22 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-V1EknKUubZ1gWFjiOZhDSNToOjs63/9O0puCgGS8aDOgpZY326fzFu15QAUjwaXzRZjf/qdsdBrckYdv9YxB8w==}
+  /@typescript-eslint/parser@6.18.1(eslint@8.56.0)(typescript@5.3.3):
+    resolution: {integrity: sha512-zct/MdJnVaRRNy9e84XnVtRv9Vf91/qqe+hZJtKanjojud4wAVy/7lXxJmMyX6X6J+xc6c//YEWvpeif8cAhWA==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
-      eslint: ^8.56.0
+      eslint: ^7.0.0 || ^8.0.0
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 7.1.0
-      '@typescript-eslint/types': 7.1.0
-      '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
-      '@typescript-eslint/visitor-keys': 7.1.0
+      '@typescript-eslint/scope-manager': 6.18.1
+      '@typescript-eslint/types': 6.18.1
+      '@typescript-eslint/typescript-estree': 6.18.1(typescript@5.3.3)
+      '@typescript-eslint/visitor-keys': 6.18.1
       debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.57.0
+      eslint: 8.56.0
       typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
@@ -8455,12 +8112,12 @@ packages:
       '@typescript-eslint/visitor-keys': 6.11.0
     dev: true
 
-  /@typescript-eslint/scope-manager@7.1.0:
-    resolution: {integrity: sha512-6TmN4OJiohHfoOdGZ3huuLhpiUgOGTpgXNUPJgeZOZR3DnIpdSgtt83RS35OYNNXxM4TScVlpVKC9jyQSETR1A==}
+  /@typescript-eslint/scope-manager@6.18.1:
+    resolution: {integrity: sha512-BgdBwXPFmZzaZUuw6wKiHKIovms97a7eTImjkXCZE04TGHysG+0hDQPmygyvgtkoB/aOQwSM/nWv3LzrOIQOBw==}
     engines: {node: ^16.0.0 || >=18.0.0}
     dependencies:
-      '@typescript-eslint/types': 7.1.0
-      '@typescript-eslint/visitor-keys': 7.1.0
+      '@typescript-eslint/types': 6.18.1
+      '@typescript-eslint/visitor-keys': 6.18.1
     dev: true
 
   /@typescript-eslint/type-utils@6.11.0(eslint@8.53.0)(typescript@5.3.3):
@@ -8483,20 +8140,20 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/type-utils@7.1.0(eslint@8.57.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-UZIhv8G+5b5skkcuhgvxYWHjk7FW7/JP5lPASMEUoliAPwIH/rxoUSQPia2cuOj9AmDZmwUl1usKm85t5VUMew==}
+  /@typescript-eslint/type-utils@6.18.1(eslint@8.56.0)(typescript@5.3.3):
+    resolution: {integrity: sha512-wyOSKhuzHeU/5pcRDP2G2Ndci+4g653V43gXTpt4nbyoIOAASkGDA9JIAgbQCdCkcr1MvpSYWzxTz0olCn8+/Q==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
-      eslint: ^8.56.0
+      eslint: ^7.0.0 || ^8.0.0
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
-      '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
+      '@typescript-eslint/typescript-estree': 6.18.1(typescript@5.3.3)
+      '@typescript-eslint/utils': 6.18.1(eslint@8.56.0)(typescript@5.3.3)
       debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.57.0
+      eslint: 8.56.0
       ts-api-utils: 1.0.1(typescript@5.3.3)
       typescript: 5.3.3
     transitivePeerDependencies:
@@ -8513,8 +8170,8 @@ packages:
     engines: {node: ^16.0.0 || >=18.0.0}
     dev: true
 
-  /@typescript-eslint/types@7.1.0:
-    resolution: {integrity: sha512-qTWjWieJ1tRJkxgZYXx6WUYtWlBc48YRxgY2JN1aGeVpkhmnopq+SUC8UEVGNXIvWH7XyuTjwALfG6bFEgCkQA==}
+  /@typescript-eslint/types@6.18.1:
+    resolution: {integrity: sha512-4TuMAe+tc5oA7wwfqMtB0Y5OrREPF1GeJBAjqwgZh1lEMH5PJQgWgHGfYufVB51LtjD+peZylmeyxUXPfENLCw==}
     engines: {node: ^16.0.0 || >=18.0.0}
     dev: true
 
@@ -8560,8 +8217,8 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/typescript-estree@7.1.0(typescript@5.3.3):
-    resolution: {integrity: sha512-k7MyrbD6E463CBbSpcOnwa8oXRdHzH1WiVzOipK3L5KSML92ZKgUBrTlehdi7PEIMT8k0bQixHUGXggPAlKnOQ==}
+  /@typescript-eslint/typescript-estree@6.18.1(typescript@5.3.3):
+    resolution: {integrity: sha512-fv9B94UAhywPRhUeeV/v+3SBDvcPiLxRZJw/xZeeGgRLQZ6rLMG+8krrJUyIf6s1ecWTzlsbp0rlw7n9sjufHA==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
       typescript: '*'
@@ -8569,8 +8226,8 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 7.1.0
-      '@typescript-eslint/visitor-keys': 7.1.0
+      '@typescript-eslint/types': 6.18.1
+      '@typescript-eslint/visitor-keys': 6.18.1
       debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
@@ -8582,19 +8239,19 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils@5.62.0(eslint@8.57.0)(typescript@5.3.3):
+  /@typescript-eslint/utils@5.62.0(eslint@8.56.0)(typescript@5.3.3):
     resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
       '@types/json-schema': 7.0.12
-      '@types/semver': 7.5.8
+      '@types/semver': 7.5.6
       '@typescript-eslint/scope-manager': 5.62.0
       '@typescript-eslint/types': 5.62.0
       '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.3)
-      eslint: 8.57.0
+      eslint: 8.56.0
       eslint-scope: 5.1.1
       semver: 7.5.4
     transitivePeerDependencies:
@@ -8610,7 +8267,7 @@ packages:
     dependencies:
       '@eslint-community/eslint-utils': 4.4.0(eslint@8.53.0)
       '@types/json-schema': 7.0.12
-      '@types/semver': 7.5.8
+      '@types/semver': 7.5.6
       '@typescript-eslint/scope-manager': 6.11.0
       '@typescript-eslint/types': 6.11.0
       '@typescript-eslint/typescript-estree': 6.11.0(typescript@5.3.3)
@@ -8621,19 +8278,19 @@ packages:
       - typescript
     dev: true
 
-  /@typescript-eslint/utils@7.1.0(eslint@8.57.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-WUFba6PZC5OCGEmbweGpnNJytJiLG7ZvDBJJoUcX4qZYf1mGZ97mO2Mps6O2efxJcJdRNpqweCistDbZMwIVHw==}
+  /@typescript-eslint/utils@6.18.1(eslint@8.56.0)(typescript@5.3.3):
+    resolution: {integrity: sha512-zZmTuVZvD1wpoceHvoQpOiewmWu3uP9FuTWo8vqpy2ffsmfCE8mklRPi+vmnIYAIk9t/4kOThri2QCDgor+OpQ==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
-      eslint: ^8.56.0
+      eslint: ^7.0.0 || ^8.0.0
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
       '@types/json-schema': 7.0.12
-      '@types/semver': 7.5.8
-      '@typescript-eslint/scope-manager': 7.1.0
-      '@typescript-eslint/types': 7.1.0
-      '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
-      eslint: 8.57.0
+      '@types/semver': 7.5.6
+      '@typescript-eslint/scope-manager': 6.18.1
+      '@typescript-eslint/types': 6.18.1
+      '@typescript-eslint/typescript-estree': 6.18.1(typescript@5.3.3)
+      eslint: 8.56.0
       semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
@@ -8656,11 +8313,11 @@ packages:
       eslint-visitor-keys: 3.4.3
     dev: true
 
-  /@typescript-eslint/visitor-keys@7.1.0:
-    resolution: {integrity: sha512-FhUqNWluiGNzlvnDZiXad4mZRhtghdoKW6e98GoEOYSu5cND+E39rG5KwJMUzeENwm1ztYBRqof8wMLP+wNPIA==}
+  /@typescript-eslint/visitor-keys@6.18.1:
+    resolution: {integrity: sha512-/kvt0C5lRqGoCfsbmm7/CwMqoSkY3zzHLIjdhHZQW3VFrnz7ATecOHR7nb7V+xn4286MBxfnQfQhAmCI0u+bJA==}
     engines: {node: ^16.0.0 || >=18.0.0}
     dependencies:
-      '@typescript-eslint/types': 7.1.0
+      '@typescript-eslint/types': 6.18.1
       eslint-visitor-keys: 3.4.3
     dev: true
 
@@ -8679,15 +8336,15 @@ packages:
       - encoding
     dev: false
 
-  /@vitejs/plugin-vue@5.0.4(vite@5.1.4)(vue@3.4.21):
-    resolution: {integrity: sha512-WS3hevEszI6CEVEx28F8RjTX97k3KsrcY6kvTg7+Whm5y3oYvcqzVeGCU3hxSAn4uY2CLCkeokkGKpoctccilQ==}
+  /@vitejs/plugin-vue@5.0.3(vite@5.1.0)(vue@3.4.18):
+    resolution: {integrity: sha512-b8S5dVS40rgHdDrw+DQi/xOM9ed+kSRZzfm1T74bMmBDCd8XO87NKlFYInzCtwvtWwXZvo1QxE2OSspTATWrbA==}
     engines: {node: ^18.0.0 || >=20.0.0}
     peerDependencies:
       vite: ^5.0.0
       vue: ^3.2.25
     dependencies:
-      vite: 5.1.4(@types/node@20.11.22)(sass@1.71.1)(terser@5.28.1)
-      vue: 3.4.21(typescript@5.3.3)
+      vite: 5.1.0(@types/node@20.11.17)(sass@1.70.0)(terser@5.27.0)
+      vue: 3.4.18(typescript@5.3.3)
     dev: false
 
   /@vitest/coverage-v8@0.34.6(vitest@0.34.6):
@@ -8706,7 +8363,7 @@ packages:
       std-env: 3.7.0
       test-exclude: 6.0.0
       v8-to-istanbul: 9.2.0
-      vitest: 0.34.6(happy-dom@13.6.2)(sass@1.71.1)(terser@5.28.1)
+      vitest: 0.34.6(happy-dom@10.0.3)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -8738,7 +8395,7 @@ packages:
   /@vitest/snapshot@0.34.6:
     resolution: {integrity: sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==}
     dependencies:
-      magic-string: 0.30.7
+      magic-string: 0.30.5
       pathe: 1.1.1
       pretty-format: 29.7.0
     dev: true
@@ -8797,21 +8454,21 @@ packages:
       path-browserify: 1.0.1
     dev: true
 
-  /@vue/compiler-core@3.4.18:
-    resolution: {integrity: sha512-F7YK8lMK0iv6b9/Gdk15A67wM0KKZvxDxed0RR60C1z9tIJTKta+urs4j0RTN5XqHISzI3etN3mX0uHhjmoqjQ==}
+  /@vue/compiler-core@3.4.15:
+    resolution: {integrity: sha512-XcJQVOaxTKCnth1vCxEChteGuwG6wqnUHxAm1DO3gCz0+uXKaJNx8/digSz4dLALCy8n2lKq24jSUs8segoqIw==}
     dependencies:
-      '@babel/parser': 7.23.9
-      '@vue/shared': 3.4.18
+      '@babel/parser': 7.23.6
+      '@vue/shared': 3.4.15
       entities: 4.5.0
       estree-walker: 2.0.2
       source-map-js: 1.0.2
     dev: true
 
-  /@vue/compiler-core@3.4.21:
-    resolution: {integrity: sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==}
+  /@vue/compiler-core@3.4.18:
+    resolution: {integrity: sha512-F7YK8lMK0iv6b9/Gdk15A67wM0KKZvxDxed0RR60C1z9tIJTKta+urs4j0RTN5XqHISzI3etN3mX0uHhjmoqjQ==}
     dependencies:
       '@babel/parser': 7.23.9
-      '@vue/shared': 3.4.21
+      '@vue/shared': 3.4.18
       entities: 4.5.0
       estree-walker: 2.0.2
       source-map-js: 1.0.2
@@ -8826,18 +8483,18 @@ packages:
       source-map-js: 1.0.2
     dev: true
 
+  /@vue/compiler-dom@3.4.15:
+    resolution: {integrity: sha512-wox0aasVV74zoXyblarOM3AZQz/Z+OunYcIHe1OsGclCHt8RsRm04DObjefaI82u6XDzv+qGWZ24tIsRAIi5MQ==}
+    dependencies:
+      '@vue/compiler-core': 3.4.15
+      '@vue/shared': 3.4.15
+    dev: true
+
   /@vue/compiler-dom@3.4.18:
     resolution: {integrity: sha512-24Eb8lcMfInefvQ6YlEVS18w5Q66f4+uXWVA+yb7praKbyjHRNuKVWGuinfSSjM0ZIiPi++QWukhkgznBaqpEA==}
     dependencies:
       '@vue/compiler-core': 3.4.18
       '@vue/shared': 3.4.18
-    dev: true
-
-  /@vue/compiler-dom@3.4.21:
-    resolution: {integrity: sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==}
-    dependencies:
-      '@vue/compiler-core': 3.4.21
-      '@vue/shared': 3.4.21
 
   /@vue/compiler-dom@3.4.3:
     resolution: {integrity: sha512-oGF1E9/htI6JWj/lTJgr6UgxNCtNHbM6xKVreBWeZL9QhRGABRVoWGAzxmtBfSOd+w0Zi5BY0Es/tlJrN6WgEg==}
@@ -8846,24 +8503,24 @@ packages:
       '@vue/shared': 3.4.3
     dev: true
 
-  /@vue/compiler-sfc@3.4.21:
-    resolution: {integrity: sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==}
+  /@vue/compiler-sfc@3.4.18:
+    resolution: {integrity: sha512-rG5tqtnzwrVpMqAQ7FHtvHaV70G6LLfJIWLYZB/jZ9m/hrnZmIQh+H3ewnC5onwe/ibljm9+ZupxeElzqCkTAw==}
     dependencies:
       '@babel/parser': 7.23.9
-      '@vue/compiler-core': 3.4.21
-      '@vue/compiler-dom': 3.4.21
-      '@vue/compiler-ssr': 3.4.21
-      '@vue/shared': 3.4.21
+      '@vue/compiler-core': 3.4.18
+      '@vue/compiler-dom': 3.4.18
+      '@vue/compiler-ssr': 3.4.18
+      '@vue/shared': 3.4.18
       estree-walker: 2.0.2
       magic-string: 0.30.7
-      postcss: 8.4.35
+      postcss: 8.4.33
       source-map-js: 1.0.2
 
-  /@vue/compiler-ssr@3.4.21:
-    resolution: {integrity: sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==}
+  /@vue/compiler-ssr@3.4.18:
+    resolution: {integrity: sha512-hSlv20oUhPxo2UYUacHgGaxtqP0tvFo6ixxxD6JlXIkwzwoZ9eKK6PFQN4hNK/R13JlNyldwWt/fqGBKgWJ6nQ==}
     dependencies:
-      '@vue/compiler-dom': 3.4.21
-      '@vue/shared': 3.4.21
+      '@vue/compiler-dom': 3.4.18
+      '@vue/shared': 3.4.18
 
   /@vue/language-core@1.8.27(typescript@5.3.3):
     resolution: {integrity: sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==}
@@ -8885,45 +8542,45 @@ packages:
       vue-template-compiler: 2.7.14
     dev: true
 
-  /@vue/reactivity@3.4.21:
-    resolution: {integrity: sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==}
+  /@vue/reactivity@3.4.18:
+    resolution: {integrity: sha512-7uda2/I0jpLiRygprDo5Jxs2HJkOVXcOMlyVlY54yRLxoycBpwGJRwJT9EdGB4adnoqJDXVT2BilUAYwI7qvmg==}
     dependencies:
-      '@vue/shared': 3.4.21
+      '@vue/shared': 3.4.18
 
-  /@vue/runtime-core@3.4.21:
-    resolution: {integrity: sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==}
+  /@vue/runtime-core@3.4.18:
+    resolution: {integrity: sha512-7mU9diCa+4e+8/wZ7Udw5pwTH10A11sZ1nldmHOUKJnzCwvZxfJqAtw31mIf4T5H2FsLCSBQT3xgioA9vIjyDQ==}
     dependencies:
-      '@vue/reactivity': 3.4.21
-      '@vue/shared': 3.4.21
+      '@vue/reactivity': 3.4.18
+      '@vue/shared': 3.4.18
 
-  /@vue/runtime-dom@3.4.21:
-    resolution: {integrity: sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==}
+  /@vue/runtime-dom@3.4.18:
+    resolution: {integrity: sha512-2y1Mkzcw1niSfG7z3Qx+2ir9Gb4hdTkZe5p/I8x1aTIKQE0vY0tPAEUPhZm5tx6183gG3D/KwHG728UR0sIufA==}
     dependencies:
-      '@vue/runtime-core': 3.4.21
-      '@vue/shared': 3.4.21
+      '@vue/runtime-core': 3.4.18
+      '@vue/shared': 3.4.18
       csstype: 3.1.3
 
-  /@vue/server-renderer@3.4.21(vue@3.4.21):
-    resolution: {integrity: sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==}
+  /@vue/server-renderer@3.4.18(vue@3.4.18):
+    resolution: {integrity: sha512-YJd1wa7mzUN3NRqLEsrwEYWyO+PUBSROIGlCc3J/cvn7Zu6CxhNLgXa8Z4zZ5ja5/nviYO79J1InoPeXgwBTZA==}
     peerDependencies:
-      vue: 3.4.21
+      vue: 3.4.18
     dependencies:
-      '@vue/compiler-ssr': 3.4.21
-      '@vue/shared': 3.4.21
-      vue: 3.4.21(typescript@5.3.3)
+      '@vue/compiler-ssr': 3.4.18
+      '@vue/shared': 3.4.18
+      vue: 3.4.18(typescript@5.3.3)
 
-  /@vue/shared@3.4.18:
-    resolution: {integrity: sha512-CxouGFxxaW5r1WbrSmWwck3No58rApXgRSBxrqgnY1K+jk20F6DrXJkHdH9n4HVT+/B6G2CAn213Uq3npWiy8Q==}
+  /@vue/shared@3.4.15:
+    resolution: {integrity: sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g==}
     dev: true
 
-  /@vue/shared@3.4.21:
-    resolution: {integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==}
+  /@vue/shared@3.4.18:
+    resolution: {integrity: sha512-CxouGFxxaW5r1WbrSmWwck3No58rApXgRSBxrqgnY1K+jk20F6DrXJkHdH9n4HVT+/B6G2CAn213Uq3npWiy8Q==}
 
   /@vue/shared@3.4.3:
     resolution: {integrity: sha512-rIwlkkP1n4uKrRzivAKPZIEkHiuwY5mmhMJ2nZKCBLz8lTUlE73rQh4n1OnnMurXt1vcUNyH4ZPfdh8QweTjpQ==}
     dev: true
 
-  /@vue/test-utils@2.4.1(vue@3.4.21):
+  /@vue/test-utils@2.4.1(vue@3.4.18):
     resolution: {integrity: sha512-VO8nragneNzUZUah6kOjiFmD/gwRjUauG9DROh6oaOeFwX1cZRUNHhdeogE8635cISigXFTtGLUQWx5KCb0xeg==}
     peerDependencies:
       '@vue/server-renderer': ^3.0.1
@@ -8933,7 +8590,7 @@ packages:
         optional: true
     dependencies:
       js-beautify: 1.14.9
-      vue: 3.4.21(typescript@5.3.3)
+      vue: 3.4.18(typescript@5.3.3)
       vue-component-type-helpers: 1.8.4
     dev: true
 
@@ -9376,6 +9033,20 @@ packages:
     resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==}
     dev: true
 
+  /ast-types@0.14.2:
+    resolution: {integrity: sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==}
+    engines: {node: '>=4'}
+    dependencies:
+      tslib: 2.6.2
+    dev: true
+
+  /ast-types@0.15.2:
+    resolution: {integrity: sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==}
+    engines: {node: '>=4'}
+    dependencies:
+      tslib: 2.6.2
+    dev: true
+
   /ast-types@0.16.1:
     resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==}
     engines: {node: '>=4'}
@@ -9668,7 +9339,6 @@ packages:
       buffer: 5.7.1
       inherits: 2.0.4
       readable-stream: 3.6.0
-    dev: true
 
   /blob-util@2.0.2:
     resolution: {integrity: sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==}
@@ -9782,18 +9452,6 @@ packages:
       electron-to-chromium: 1.4.603
       node-releases: 2.0.14
       update-browserslist-db: 1.0.13(browserslist@4.22.2)
-    dev: true
-
-  /browserslist@4.23.0:
-    resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==}
-    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
-    hasBin: true
-    dependencies:
-      caniuse-lite: 1.0.30001599
-      electron-to-chromium: 1.4.710
-      node-releases: 2.0.14
-      update-browserslist-db: 1.0.13(browserslist@4.23.0)
-    dev: false
 
   /bser@2.1.1:
     resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
@@ -9828,7 +9486,6 @@ packages:
     dependencies:
       base64-js: 1.5.1
       ieee754: 1.2.1
-    dev: true
 
   /buffer@6.0.3:
     resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
@@ -9844,14 +9501,13 @@ packages:
     dependencies:
       node-gyp-build: 4.6.0
 
-  /bullmq@5.4.0:
-    resolution: {integrity: sha512-QNOT+Vp/OFctwKa1/LYvrfIMXqb6Hu8a1VwXxQpa/JXoFAQ9E4ZcqW4fyEjx9iYrXakpV6cAGPbmdgWaKTGXOQ==}
+  /bullmq@5.1.9:
+    resolution: {integrity: sha512-9MfcQxYyfkG8kxpIxRsRXWYlTRQ1o8xWqgdoFR5pLClVTjtMI8qeDO5basRQLZPfp/uiPtv+gpzJ3OTNrm2ZNg==}
     dependencies:
       cron-parser: 4.8.1
-      fast-glob: 3.3.2
+      glob: 8.1.0
       ioredis: 5.3.2
       lodash: 4.17.21
-      minimatch: 9.0.3
       msgpackr: 1.10.1
       node-abort-controller: 3.1.1
       semver: 7.5.4
@@ -9931,7 +9587,7 @@ packages:
       clone-response: 1.0.3
       get-stream: 5.2.0
       http-cache-semantics: 4.1.1
-      keyv: 4.5.4
+      keyv: 4.5.2
       lowercase-keys: 2.0.0
       normalize-url: 6.1.0
       responselike: 2.0.1
@@ -9978,7 +9634,7 @@ packages:
   /caniuse-api@3.0.0:
     resolution: {integrity: sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==}
     dependencies:
-      browserslist: 4.23.0
+      browserslist: 4.22.2
       caniuse-lite: 1.0.30001566
       lodash.memoize: 4.1.2
       lodash.uniq: 4.5.0
@@ -9987,16 +9643,12 @@ packages:
   /caniuse-lite@1.0.30001566:
     resolution: {integrity: sha512-ggIhCsTxmITBAMmK8yZjEhCO5/47jKXPu6Dha/wuCS4JePVL+3uiDEBuhu2aIoT+bqTOR8L76Ip1ARL9xYsEJA==}
 
-  /caniuse-lite@1.0.30001599:
-    resolution: {integrity: sha512-LRAQHZ4yT1+f9LemSMeqdMpMxZcc4RMWdj4tiFe3G8tNkWK+E58g+/tzotb5cU6TbcVJLr4fySiAW7XmxQvZQA==}
-    dev: false
-
   /canonicalize@1.0.8:
     resolution: {integrity: sha512-0CNTVCLZggSh7bc5VkX5WWPWO+cyZbNd07IHIsSXLia/eAq+r836hgk+8BKoEh7949Mda87VUOitx5OddVj64A==}
     dev: false
 
-  /canvas-confetti@1.9.2:
-    resolution: {integrity: sha512-6Xi7aHHzKwxZsem4mCKoqP6YwUG3HamaHHAlz1hTNQPCqXhARFpSXnkC9TWlahHY5CG6hSL5XexNjxK8irVErg==}
+  /canvas-confetti@1.6.1:
+    resolution: {integrity: sha512-CgGR5DL9+dkne4AwcpvWQc0LIQq43yDIxlwdZcyrq3yklricNfuPHoOSoM6Ya7yCQ+sXmZ2iNV2feiKjVG8C1g==}
     dev: false
 
   /caseless@0.12.0:
@@ -10009,6 +9661,28 @@ packages:
       lodash: 4.17.21
     dev: false
 
+  /cbor-extract@2.1.1:
+    resolution: {integrity: sha512-1UX977+L+zOJHsp0mWFG13GLwO6ucKgSmSW6JTl8B9GUvACvHeIVpFqhU92299Z6PfD09aTXDell5p+lp1rUFA==}
+    hasBin: true
+    requiresBuild: true
+    dependencies:
+      node-gyp-build-optional-packages: 5.0.3
+    optionalDependencies:
+      '@cbor-extract/cbor-extract-darwin-arm64': 2.1.1
+      '@cbor-extract/cbor-extract-darwin-x64': 2.1.1
+      '@cbor-extract/cbor-extract-linux-arm': 2.1.1
+      '@cbor-extract/cbor-extract-linux-arm64': 2.1.1
+      '@cbor-extract/cbor-extract-linux-x64': 2.1.1
+      '@cbor-extract/cbor-extract-win32-x64': 2.1.1
+    dev: false
+    optional: true
+
+  /cbor-x@1.5.4:
+    resolution: {integrity: sha512-PVKILDn+Rf6MRhhcyzGXi5eizn1i0i3F8Fe6UMMxXBnWkalq9+C5+VTmlIjAYM4iF2IYF2N+zToqAfYOp+3rfw==}
+    optionalDependencies:
+      cbor-extract: 2.1.1
+    dev: false
+
   /cbor@9.0.2:
     resolution: {integrity: sha512-JPypkxsB10s9QOWwa6zwPzqE1Md3vqpPc+cai4sAecuCsRyAtAl/pMyhPlMbT/xtPnm2dznJZYRLui57qiRhaQ==}
     engines: {node: '>=16'}
@@ -10086,45 +9760,45 @@ packages:
     resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
     dev: true
 
-  /chart.js@4.4.2:
-    resolution: {integrity: sha512-6GD7iKwFpP5kbSD4MeRRRlTnQvxfQREy36uEtm1hzHzcOqwWx0YEHuspuoNlslu+nciLIB7fjjsHkUv/FzFcOg==}
-    engines: {pnpm: '>=8'}
+  /chart.js@4.4.1:
+    resolution: {integrity: sha512-C74QN1bxwV1v2PEujhmKjOZ7iUM4w6BWs23Md/6aOZZSlwMzeCIDGuZay++rBgChYru7/+QFeoQW0fQoP534Dg==}
+    engines: {pnpm: '>=7'}
     dependencies:
       '@kurkle/color': 0.3.2
     dev: false
 
-  /chartjs-adapter-date-fns@3.0.0(chart.js@4.4.2)(date-fns@2.30.0):
+  /chartjs-adapter-date-fns@3.0.0(chart.js@4.4.1)(date-fns@2.30.0):
     resolution: {integrity: sha512-Rs3iEB3Q5pJ973J93OBTpnP7qoGwvq3nUnoMdtxO+9aoJof7UFcRbWcIDteXuYd1fgAvct/32T9qaLyLuZVwCg==}
     peerDependencies:
       chart.js: '>=2.8.0'
       date-fns: '>=2.0.0'
     dependencies:
-      chart.js: 4.4.2
+      chart.js: 4.4.1
       date-fns: 2.30.0
     dev: false
 
-  /chartjs-chart-matrix@2.0.1(chart.js@4.4.2):
+  /chartjs-chart-matrix@2.0.1(chart.js@4.4.1):
     resolution: {integrity: sha512-BGfeY+/PHnITyDlc7WfnKJ1RyOfgOzIqWp/gxzzl7pUjyoGzHDcw51qd2xJF9gdT9Def7ZwOnOMm8GJUXDxI0w==}
     peerDependencies:
       chart.js: '>=3.0.0'
     dependencies:
-      chart.js: 4.4.2
+      chart.js: 4.4.1
     dev: false
 
-  /chartjs-plugin-gradient@0.6.1(chart.js@4.4.2):
+  /chartjs-plugin-gradient@0.6.1(chart.js@4.4.1):
     resolution: {integrity: sha512-TGHNIh8KqQMLdb+UfY80cBHYRyOC47eeokmgkeajRdKGbFt462lJiyiq4ZJ25fiM7BGsmzoBLhmVyEw4B3gQxw==}
     peerDependencies:
       chart.js: '>=2.6.0'
     dependencies:
-      chart.js: 4.4.2
+      chart.js: 4.4.1
     dev: false
 
-  /chartjs-plugin-zoom@2.0.1(chart.js@4.4.2):
+  /chartjs-plugin-zoom@2.0.1(chart.js@4.4.1):
     resolution: {integrity: sha512-ogOmLu6e+Q7E1XWOCOz9YwybMslz9qNfGV2a+qjfmqJYpsw5ZMoRHZBUyW+NGhkpQ5PwwPA/+rikHpBZb7PZuA==}
     peerDependencies:
       chart.js: '>=3.2.0'
     dependencies:
-      chart.js: 4.4.2
+      chart.js: 4.4.1
       hammerjs: 2.0.8
     dev: false
 
@@ -10189,16 +9863,16 @@ packages:
     engines: {node: '>=10'}
     requiresBuild: true
 
-  /chromatic@11.0.0:
-    resolution: {integrity: sha512-utzRVqdMrpzYwZNf7dHWU0z0/rx6SH/FUVNozQxYHDtQfYUdEj+Ro4OSch5+Wsk2FoUmznJyLkaC2J839z1N7A==}
+  /chromatic@10.6.1:
+    resolution: {integrity: sha512-bd4C5sEEtN83uUmbc4Fu+x7+lJIPdMUdu4D6HRDQEIDl/Tatc8+By4bZluH1pzg/MbP9vllkL6Ua9vF4EEA7VA==}
     hasBin: true
     peerDependencies:
-      '@chromatic-com/cypress': ^0.5.2 || ^1.0.0
-      '@chromatic-com/playwright': ^0.5.2 || ^1.0.0
+      chromatic-cypress: ^0.4.0 || ^1.0.0
+      chromatic-playwright: ^0.4.0 || ^1.0.0
     peerDependenciesMeta:
-      '@chromatic-com/cypress':
+      chromatic-cypress:
         optional: true
-      '@chromatic-com/playwright':
+      chromatic-playwright:
         optional: true
     dev: false
 
@@ -10564,7 +10238,7 @@ packages:
       readable-stream: 3.6.0
     dev: false
 
-  /create-jest@29.7.0(@types/node@20.11.22):
+  /create-jest@29.7.0(@types/node@20.11.17):
     resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -10573,7 +10247,7 @@ packages:
       chalk: 4.1.2
       exit: 0.1.2
       graceful-fs: 4.2.11
-      jest-config: 29.7.0(@types/node@20.11.22)
+      jest-config: 29.7.0(@types/node@20.11.17)
       jest-util: 29.7.0
       prompts: 2.4.2
     transitivePeerDependencies:
@@ -10648,13 +10322,13 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /css-declaration-sorter@7.1.1(postcss@8.4.35):
+  /css-declaration-sorter@7.1.1(postcss@8.4.33):
     resolution: {integrity: sha512-dZ3bVTEEc1vxr3Bek9vGwfB5Z6ESPULhcRvO472mfjVnj8jRcTnKO8/JTczlvxM10Myb+wBM++1MtdO76eWcaQ==}
     engines: {node: ^14 || ^16 || >=18}
     peerDependencies:
       postcss: ^8.0.9
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
     dev: false
 
   /css-select@5.1.0:
@@ -10694,63 +10368,62 @@ packages:
     engines: {node: '>=4'}
     hasBin: true
 
-  /cssnano-preset-default@6.1.0(postcss@8.4.35):
-    resolution: {integrity: sha512-4DUXZoDj+PI3fRl3MqMjl9DwLGjcsFP4qt+92nLUcN1RGfw2TY+GwNoG2B38Usu1BrcTs8j9pxNfSusmvtSjfg==}
+  /cssnano-preset-default@6.0.3(postcss@8.4.33):
+    resolution: {integrity: sha512-4y3H370aZCkT9Ev8P4SO4bZbt+AExeKhh8wTbms/X7OLDo5E7AYUUy6YPxa/uF5Grf+AJwNcCnxKhZynJ6luBA==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      browserslist: 4.23.0
-      css-declaration-sorter: 7.1.1(postcss@8.4.35)
-      cssnano-utils: 4.0.2(postcss@8.4.35)
-      postcss: 8.4.35
-      postcss-calc: 9.0.1(postcss@8.4.35)
-      postcss-colormin: 6.1.0(postcss@8.4.35)
-      postcss-convert-values: 6.1.0(postcss@8.4.35)
-      postcss-discard-comments: 6.0.2(postcss@8.4.35)
-      postcss-discard-duplicates: 6.0.3(postcss@8.4.35)
-      postcss-discard-empty: 6.0.3(postcss@8.4.35)
-      postcss-discard-overridden: 6.0.2(postcss@8.4.35)
-      postcss-merge-longhand: 6.0.4(postcss@8.4.35)
-      postcss-merge-rules: 6.1.0(postcss@8.4.35)
-      postcss-minify-font-values: 6.0.3(postcss@8.4.35)
-      postcss-minify-gradients: 6.0.3(postcss@8.4.35)
-      postcss-minify-params: 6.1.0(postcss@8.4.35)
-      postcss-minify-selectors: 6.0.3(postcss@8.4.35)
-      postcss-normalize-charset: 6.0.2(postcss@8.4.35)
-      postcss-normalize-display-values: 6.0.2(postcss@8.4.35)
-      postcss-normalize-positions: 6.0.2(postcss@8.4.35)
-      postcss-normalize-repeat-style: 6.0.2(postcss@8.4.35)
-      postcss-normalize-string: 6.0.2(postcss@8.4.35)
-      postcss-normalize-timing-functions: 6.0.2(postcss@8.4.35)
-      postcss-normalize-unicode: 6.1.0(postcss@8.4.35)
-      postcss-normalize-url: 6.0.2(postcss@8.4.35)
-      postcss-normalize-whitespace: 6.0.2(postcss@8.4.35)
-      postcss-ordered-values: 6.0.2(postcss@8.4.35)
-      postcss-reduce-initial: 6.1.0(postcss@8.4.35)
-      postcss-reduce-transforms: 6.0.2(postcss@8.4.35)
-      postcss-svgo: 6.0.3(postcss@8.4.35)
-      postcss-unique-selectors: 6.0.3(postcss@8.4.35)
-    dev: false
-
-  /cssnano-utils@4.0.2(postcss@8.4.35):
-    resolution: {integrity: sha512-ZR1jHg+wZ8o4c3zqf1SIUSTIvm/9mU343FMR6Obe/unskbvpGhZOo1J6d/r8D1pzkRQYuwbcH3hToOuoA2G7oQ==}
+      css-declaration-sorter: 7.1.1(postcss@8.4.33)
+      cssnano-utils: 4.0.1(postcss@8.4.33)
+      postcss: 8.4.33
+      postcss-calc: 9.0.1(postcss@8.4.33)
+      postcss-colormin: 6.0.2(postcss@8.4.33)
+      postcss-convert-values: 6.0.2(postcss@8.4.33)
+      postcss-discard-comments: 6.0.1(postcss@8.4.33)
+      postcss-discard-duplicates: 6.0.1(postcss@8.4.33)
+      postcss-discard-empty: 6.0.1(postcss@8.4.33)
+      postcss-discard-overridden: 6.0.1(postcss@8.4.33)
+      postcss-merge-longhand: 6.0.2(postcss@8.4.33)
+      postcss-merge-rules: 6.0.3(postcss@8.4.33)
+      postcss-minify-font-values: 6.0.1(postcss@8.4.33)
+      postcss-minify-gradients: 6.0.1(postcss@8.4.33)
+      postcss-minify-params: 6.0.2(postcss@8.4.33)
+      postcss-minify-selectors: 6.0.2(postcss@8.4.33)
+      postcss-normalize-charset: 6.0.1(postcss@8.4.33)
+      postcss-normalize-display-values: 6.0.1(postcss@8.4.33)
+      postcss-normalize-positions: 6.0.1(postcss@8.4.33)
+      postcss-normalize-repeat-style: 6.0.1(postcss@8.4.33)
+      postcss-normalize-string: 6.0.1(postcss@8.4.33)
+      postcss-normalize-timing-functions: 6.0.1(postcss@8.4.33)
+      postcss-normalize-unicode: 6.0.2(postcss@8.4.33)
+      postcss-normalize-url: 6.0.1(postcss@8.4.33)
+      postcss-normalize-whitespace: 6.0.1(postcss@8.4.33)
+      postcss-ordered-values: 6.0.1(postcss@8.4.33)
+      postcss-reduce-initial: 6.0.2(postcss@8.4.33)
+      postcss-reduce-transforms: 6.0.1(postcss@8.4.33)
+      postcss-svgo: 6.0.2(postcss@8.4.33)
+      postcss-unique-selectors: 6.0.2(postcss@8.4.33)
+    dev: false
+
+  /cssnano-utils@4.0.1(postcss@8.4.33):
+    resolution: {integrity: sha512-6qQuYDqsGoiXssZ3zct6dcMxiqfT6epy7x4R0TQJadd4LWO3sPR6JH6ZByOvVLoZ6EdwPGgd7+DR1EmX3tiXQQ==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
     dev: false
 
-  /cssnano@6.0.5(postcss@8.4.35):
-    resolution: {integrity: sha512-tpTp/ukgrElwu3ESFY4IvWnGn8eTt8cJhC2aAbtA3lvUlxp6t6UPv8YCLjNnEGiFreT1O0LiOM1U3QyTBVFl2A==}
+  /cssnano@6.0.3(postcss@8.4.33):
+    resolution: {integrity: sha512-MRq4CIj8pnyZpcI2qs6wswoYoDD1t0aL28n+41c1Ukcpm56m1h6mCexIHBGjfZfnTqtGSSCP4/fB1ovxgjBOiw==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      cssnano-preset-default: 6.1.0(postcss@8.4.35)
-      lilconfig: 3.1.1
-      postcss: 8.4.35
+      cssnano-preset-default: 6.0.3(postcss@8.4.33)
+      lilconfig: 3.0.0
+      postcss: 8.4.33
     dev: false
 
   /csso@5.0.5:
@@ -10776,8 +10449,58 @@ packages:
       uniq: 1.0.1
     dev: false
 
-  /cypress@13.6.6:
-    resolution: {integrity: sha512-S+2S9S94611hXimH9a3EAYt81QM913ZVA03pUmGDfLTFa5gyp85NJ8dJGSlEAEmyRsYkioS1TtnWtbv/Fzt11A==}
+  /cypress@13.6.3:
+    resolution: {integrity: sha512-d/pZvgwjAyZsoyJ3FOsJT5lDsqnxQ/clMqnNc++rkHjbkkiF2h9s0JsZSyyH4QXhVFW3zPFg82jD25roFLOdZA==}
+    engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0}
+    hasBin: true
+    requiresBuild: true
+    dependencies:
+      '@cypress/request': 3.0.0
+      '@cypress/xvfb': 1.2.4(supports-color@8.1.1)
+      '@types/sinonjs__fake-timers': 8.1.1
+      '@types/sizzle': 2.3.3
+      arch: 2.2.0
+      blob-util: 2.0.2
+      bluebird: 3.7.2
+      buffer: 5.7.1
+      cachedir: 2.3.0
+      chalk: 4.1.2
+      check-more-types: 2.24.0
+      cli-cursor: 3.1.0
+      cli-table3: 0.6.3
+      commander: 6.2.1
+      common-tags: 1.8.2
+      dayjs: 1.11.7
+      debug: 4.3.4(supports-color@8.1.1)
+      enquirer: 2.3.6
+      eventemitter2: 6.4.7
+      execa: 4.1.0
+      executable: 4.1.1
+      extract-zip: 2.0.1(supports-color@8.1.1)
+      figures: 3.2.0
+      fs-extra: 9.1.0
+      getos: 3.2.1
+      is-ci: 3.0.1
+      is-installed-globally: 0.4.0
+      lazy-ass: 1.6.0
+      listr2: 3.14.0(enquirer@2.3.6)
+      lodash: 4.17.21
+      log-symbols: 4.1.0
+      minimist: 1.2.8
+      ospath: 1.2.2
+      pretty-bytes: 5.6.0
+      process: 0.11.10
+      proxy-from-env: 1.0.0
+      request-progress: 3.0.0
+      semver: 7.5.4
+      supports-color: 8.1.1
+      tmp: 0.2.1
+      untildify: 4.0.0
+      yauzl: 2.10.0
+    dev: true
+
+  /cypress@13.6.4:
+    resolution: {integrity: sha512-pYJjCfDYB+hoOoZuhysbbYhEmNW7DEDsqn+ToCLwuVowxUXppIWRr7qk4TVRIU471ksfzyZcH+mkoF0CQUKnpw==}
     engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0}
     hasBin: true
     requiresBuild: true
@@ -10821,7 +10544,7 @@ packages:
       request-progress: 3.0.0
       semver: 7.5.4
       supports-color: 8.1.1
-      tmp: 0.2.2
+      tmp: 0.2.1
       untildify: 4.0.0
       yauzl: 2.10.0
     dev: true
@@ -10858,6 +10581,10 @@ packages:
   /dayjs@1.11.10:
     resolution: {integrity: sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==}
 
+  /dayjs@1.11.7:
+    resolution: {integrity: sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==}
+    dev: true
+
   /de-indent@1.0.2:
     resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==}
     dev: true
@@ -11002,6 +10729,11 @@ packages:
       which-typed-array: 1.1.11
     dev: true
 
+  /deep-extend@0.6.0:
+    resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
+    engines: {node: '>=4.0.0'}
+    dev: false
+
   /deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
 
@@ -11290,11 +11022,6 @@ packages:
 
   /electron-to-chromium@1.4.603:
     resolution: {integrity: sha512-Dvo5OGjnl7AZTU632dFJtWj0uJK835eeOVQIuRcmBmsFsTNn3cL05FqOyHAfGQDIoHfLhyJ1Tya3PJ0ceMz54g==}
-    dev: true
-
-  /electron-to-chromium@1.4.710:
-    resolution: {integrity: sha512-w+9yAVHoHhysCa+gln7AzbO9CdjFcL/wN/5dd+XW/Msl2d/4+WisEaCF1nty0xbAKaxdaJfgLB2296U7zZB7BA==}
-    dev: false
 
   /emittery@0.13.1:
     resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
@@ -11653,7 +11380,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-module-utils@2.8.0(@typescript-eslint/parser@7.1.0)(eslint-import-resolver-node@0.3.9)(eslint@8.57.0):
+  /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.18.1)(eslint-import-resolver-node@0.3.9)(eslint@8.56.0):
     resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -11674,9 +11401,9 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
+      '@typescript-eslint/parser': 6.18.1(eslint@8.56.0)(typescript@5.3.3)
       debug: 3.2.7(supports-color@8.1.1)
-      eslint: 8.57.0
+      eslint: 8.56.0
       eslint-import-resolver-node: 0.3.9
     transitivePeerDependencies:
       - supports-color
@@ -11717,7 +11444,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.1.0)(eslint@8.57.0):
+  /eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.18.1)(eslint@8.56.0):
     resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -11727,16 +11454,16 @@ packages:
       '@typescript-eslint/parser':
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
+      '@typescript-eslint/parser': 6.18.1(eslint@8.56.0)(typescript@5.3.3)
       array-includes: 3.1.7
       array.prototype.findlastindex: 1.2.3
       array.prototype.flat: 1.3.2
       array.prototype.flatmap: 1.3.2
       debug: 3.2.7(supports-color@8.1.1)
       doctrine: 2.1.0
-      eslint: 8.57.0
+      eslint: 8.56.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.1.0)(eslint-import-resolver-node@0.3.9)(eslint@8.57.0)
+      eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.18.1)(eslint-import-resolver-node@0.3.9)(eslint@8.56.0)
       hasown: 2.0.0
       is-core-module: 2.13.1
       is-glob: 4.0.3
@@ -11752,15 +11479,15 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-storybook@0.6.13(eslint@8.57.0)(typescript@5.3.3):
+  /eslint-plugin-storybook@0.6.13(eslint@8.56.0)(typescript@5.3.3):
     resolution: {integrity: sha512-smd+CS0WH1jBqUEJ3znGS7DU4ayBE9z6lkQAK2yrSUv1+rq8BT/tiI5C/rKE7rmiqiAfojtNYZRhzo5HrulccQ==}
     engines: {node: 12.x || 14.x || >= 16}
     peerDependencies:
       eslint: '>=6'
     dependencies:
       '@storybook/csf': 0.0.1
-      '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.3.3)
-      eslint: 8.57.0
+      '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.3.3)
+      eslint: 8.56.0
       requireindex: 1.2.0
       ts-dedent: 2.2.0
     transitivePeerDependencies:
@@ -11768,19 +11495,19 @@ packages:
       - typescript
     dev: true
 
-  /eslint-plugin-vue@9.22.0(eslint@8.57.0):
-    resolution: {integrity: sha512-7wCXv5zuVnBtZE/74z4yZ0CM8AjH6bk4MQGm7hZjUC2DBppKU5ioeOk5LGSg/s9a1ZJnIsdPLJpXnu1Rc+cVHg==}
+  /eslint-plugin-vue@9.20.1(eslint@8.56.0):
+    resolution: {integrity: sha512-GyCs8K3lkEvoyC1VV97GJhP1SvqsKCiWGHnbn0gVUYiUhaH2+nB+Dv1uekv1THFMPbBfYxukrzQdltw950k+LQ==}
     engines: {node: ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
-      eslint: 8.57.0
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
+      eslint: 8.56.0
       natural-compare: 1.4.0
       nth-check: 2.1.1
-      postcss-selector-parser: 6.0.15
-      semver: 7.6.0
-      vue-eslint-parser: 9.4.2(eslint@8.57.0)
+      postcss-selector-parser: 6.0.13
+      semver: 7.5.4
+      vue-eslint-parser: 9.4.2(eslint@8.56.0)
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
       - supports-color
@@ -11857,16 +11584,16 @@ packages:
       - supports-color
     dev: true
 
-  /eslint@8.57.0:
-    resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==}
+  /eslint@8.56.0:
+    resolution: {integrity: sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
       '@eslint-community/regexpp': 4.6.2
       '@eslint/eslintrc': 2.1.4
-      '@eslint/js': 8.57.0
-      '@humanwhocodes/config-array': 0.11.14
+      '@eslint/js': 8.56.0
+      '@humanwhocodes/config-array': 0.11.13
       '@humanwhocodes/module-importer': 1.0.1
       '@nodelib/fs.walk': 1.2.8
       '@ungap/structured-clone': 1.2.0
@@ -11904,10 +11631,6 @@ packages:
       - supports-color
     dev: true
 
-  /esm-resolve@1.0.9:
-    resolution: {integrity: sha512-qVENG+4e2s5HO/TMV9LvjpOVNW4HlaZn98q7h0y9R524M1chXNAwrn2bKx+wQs9Qryb22qX8P0rQ5N3e3Udq/w==}
-    dev: true
-
   /espree@9.6.1:
     resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -12082,6 +11805,11 @@ packages:
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /expand-template@2.0.3:
+    resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
+    engines: {node: '>=6'}
+    dev: false
+
   /expect@29.7.0:
     resolution: {integrity: sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -12427,10 +12155,6 @@ packages:
       safe-regex2: 2.0.0
     dev: false
 
-  /find-package-json@1.2.0:
-    resolution: {integrity: sha512-+SOGcLGYDJHtyqHd87ysBhmaeQ95oWspDKnMXBrnQ9Eq4OkLNqejgoaD8xVWu6GPa0B6roa6KinCMEMcVeqONw==}
-    dev: true
-
   /find-up@3.0.0:
     resolution: {integrity: sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==}
     engines: {node: '>=6'}
@@ -12579,7 +12303,6 @@ packages:
 
   /fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
-    dev: true
 
   /fs-extra@11.1.1:
     resolution: {integrity: sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==}
@@ -12858,6 +12581,10 @@ packages:
       - supports-color
     dev: true
 
+  /github-from-package@0.0.0:
+    resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
+    dev: false
+
   /github-slugger@2.0.0:
     resolution: {integrity: sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw==}
     dev: true
@@ -13053,8 +12780,8 @@ packages:
       p-cancelable: 3.0.0
       responselike: 3.0.0
 
-  /got@14.2.0:
-    resolution: {integrity: sha512-dBq2KkHcQl3AwPoIWsLsQScCPpUgRulz1qZVthjPYKYOPmYfBnekR3vxecjZbm91Vc3JUGnV9mqFX7B+Fe2quw==}
+  /got@14.1.0:
+    resolution: {integrity: sha512-jGmSBfxa7jOGg464azcsf/cUlJBZldU8edFpiVebIJrVBE4vqVx0t3Z2f1kz1WrcMvLgQREoC/l2ttDmSHwyRg==}
     engines: {node: '>=20'}
     dependencies:
       '@sindresorhus/is': 6.1.0
@@ -13137,16 +12864,6 @@ packages:
       webidl-conversions: 7.0.0
       whatwg-encoding: 2.0.0
       whatwg-mimetype: 3.0.0
-    dev: false
-
-  /happy-dom@13.6.2:
-    resolution: {integrity: sha512-Ku+wDqcF/KwFA0dI+xIMZd9Jn020RXjuSil/Vz7gu2yhDC3FsDYZ55qqV9k+SGC4opwb4acisXqVSRxUJMlPbQ==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      entities: 4.5.0
-      webidl-conversions: 7.0.0
-      whatwg-mimetype: 3.0.0
-    dev: true
 
   /har-schema@2.0.0:
     resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==}
@@ -13258,8 +12975,8 @@ packages:
     resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==}
     dev: false
 
-  /highlight.js@11.9.0:
-    resolution: {integrity: sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==}
+  /highlight.js@11.8.0:
+    resolution: {integrity: sha512-MedQhoqVdr0U6SSnWPzfiadUcDHfN/Wzq25AkXiQv9oiOO/sG0S7XkvpFIqWBl9Yq1UYyYOOVORs5UW2XlPyzg==}
     engines: {node: '>=12.0.0'}
     dev: false
 
@@ -13297,11 +13014,6 @@ packages:
     resolution: {integrity: sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==}
     engines: {node: '>=8'}
 
-  /htmlescape@1.1.1:
-    resolution: {integrity: sha512-eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg==}
-    engines: {node: '>=0.10'}
-    dev: false
-
   /htmlparser2@8.0.1:
     resolution: {integrity: sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==}
     dependencies:
@@ -13323,8 +13035,8 @@ packages:
       statuses: 2.0.1
       toidentifier: 1.0.1
 
-  /http-link-header@1.1.2:
-    resolution: {integrity: sha512-6qz1XhMq/ryde52SZGzVhzi3jcG2KqO16KITkupyQxvW6u7iylm0Fq7r3OpCYsc0S0ELlCiFpuxDcccUwjbEqA==}
+  /http-link-header@1.1.1:
+    resolution: {integrity: sha512-mW3N/rTYpCn99s1do0zx6nzFZSwLH9HGfUM4ZqLWJ16ylmYaC2v5eYGqrNTQlByx8AzUgGI+V/32gXPugs1+Sw==}
     engines: {node: '>=6.0.0'}
     dev: false
 
@@ -13519,7 +13231,6 @@ packages:
 
   /ini@1.3.8:
     resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
-    dev: true
 
   /ini@2.0.0:
     resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==}
@@ -13612,11 +13323,6 @@ packages:
 
   /ip@2.0.0:
     resolution: {integrity: sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==}
-    dev: false
-
-  /ip@2.0.1:
-    resolution: {integrity: sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==}
-    dev: true
 
   /ipaddr.js@1.9.1:
     resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
@@ -14008,7 +13714,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       '@babel/core': 7.23.5
-      '@babel/parser': 7.23.9
+      '@babel/parser': 7.23.6
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.0
       semver: 6.3.1
@@ -14021,7 +13727,7 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       '@babel/core': 7.23.5
-      '@babel/parser': 7.23.9
+      '@babel/parser': 7.23.6
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.0
       semver: 7.5.4
@@ -14104,7 +13810,7 @@ packages:
       '@jest/expect': 29.7.0
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       chalk: 4.1.2
       co: 4.6.0
       dedent: 1.5.1
@@ -14125,7 +13831,7 @@ packages:
       - supports-color
     dev: true
 
-  /jest-cli@29.7.0(@types/node@20.11.22):
+  /jest-cli@29.7.0(@types/node@20.11.17):
     resolution: {integrity: sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -14139,10 +13845,10 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
       chalk: 4.1.2
-      create-jest: 29.7.0(@types/node@20.11.22)
+      create-jest: 29.7.0(@types/node@20.11.17)
       exit: 0.1.2
       import-local: 3.1.0
-      jest-config: 29.7.0(@types/node@20.11.22)
+      jest-config: 29.7.0(@types/node@20.11.17)
       jest-util: 29.7.0
       jest-validate: 29.7.0
       yargs: 17.7.2
@@ -14153,7 +13859,7 @@ packages:
       - ts-node
     dev: true
 
-  /jest-config@29.7.0(@types/node@20.11.22):
+  /jest-config@29.7.0(@types/node@20.11.17):
     resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
@@ -14168,7 +13874,7 @@ packages:
       '@babel/core': 7.23.5
       '@jest/test-sequencer': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       babel-jest: 29.7.0(@babel/core@7.23.5)
       chalk: 4.1.2
       ci-info: 3.7.1
@@ -14238,7 +13944,7 @@ packages:
       '@jest/environment': 29.7.0
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       jest-mock: 29.7.0
       jest-util: 29.7.0
     dev: true
@@ -14263,7 +13969,7 @@ packages:
     dependencies:
       '@jest/types': 29.6.3
       '@types/graceful-fs': 4.1.6
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.11
@@ -14314,7 +14020,7 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       '@jest/types': 27.5.1
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
     dev: true
 
   /jest-mock@29.7.0:
@@ -14322,7 +14028,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       jest-util: 29.7.0
     dev: true
 
@@ -14377,7 +14083,7 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       chalk: 4.1.2
       emittery: 0.13.1
       graceful-fs: 4.2.11
@@ -14408,7 +14114,7 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       chalk: 4.1.2
       cjs-module-lexer: 1.2.2
       collect-v8-coverage: 1.0.1
@@ -14460,7 +14166,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       chalk: 4.1.2
       ci-info: 3.7.1
       graceful-fs: 4.2.11
@@ -14485,7 +14191,7 @@ packages:
     dependencies:
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.13.1
@@ -14504,13 +14210,13 @@ packages:
     resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       jest-util: 29.7.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
 
-  /jest@29.7.0(@types/node@20.11.22):
+  /jest@29.7.0(@types/node@20.11.17):
     resolution: {integrity: sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -14523,7 +14229,7 @@ packages:
       '@jest/core': 29.7.0
       '@jest/types': 29.6.3
       import-local: 3.1.0
-      jest-cli: 29.7.0(@types/node@20.11.22)
+      jest-cli: 29.7.0(@types/node@20.11.17)
     transitivePeerDependencies:
       - '@types/node'
       - babel-plugin-macros
@@ -14621,7 +14327,7 @@ packages:
         optional: true
     dependencies:
       '@babel/core': 7.23.5
-      '@babel/parser': 7.23.9
+      '@babel/parser': 7.23.6
       '@babel/plugin-transform-class-properties': 7.23.3(@babel/core@7.23.5)
       '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.5)
       '@babel/plugin-transform-nullish-coalescing-operator': 7.23.4(@babel/core@7.23.5)
@@ -14650,7 +14356,7 @@ packages:
     engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
-      '@babel/parser': 7.23.9
+      '@babel/parser': 7.23.6
       '@jsdoc/salty': 0.2.5
       '@types/markdown-it': 12.2.3
       bluebird: 3.7.2
@@ -14824,8 +14530,8 @@ packages:
       verror: 1.10.0
     dev: true
 
-  /jsrsasign@11.1.0:
-    resolution: {integrity: sha512-Ov74K9GihaK9/9WncTe1mPmvrO7Py665TUfUKvraXBpu+xcTWitrtuOwcjf4KMU9maPaYn0OuaWy0HOzy/GBXg==}
+  /jsrsasign@11.0.0:
+    resolution: {integrity: sha512-BtRwVKS+5dsgPpAtzJcpo5OoWjSs1/zllSBG0+8o8/aV0Ki76m6iZwHnwnsqoTdhfFZDN1XIdcaZr5ZkP+H2gg==}
     dev: false
 
   /jssha@3.3.1:
@@ -14857,6 +14563,12 @@ packages:
       safe-buffer: 5.2.1
     dev: false
 
+  /keyv@4.5.2:
+    resolution: {integrity: sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==}
+    dependencies:
+      json-buffer: 3.0.1
+    dev: false
+
   /keyv@4.5.4:
     resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
     dependencies:
@@ -14948,8 +14660,8 @@ packages:
       set-cookie-parser: 2.6.0
     dev: false
 
-  /lilconfig@3.1.1:
-    resolution: {integrity: sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==}
+  /lilconfig@3.0.0:
+    resolution: {integrity: sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==}
     engines: {node: '>=14'}
     dev: false
 
@@ -15888,7 +15600,6 @@ packages:
 
   /mkdirp-classic@0.5.3:
     resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
-    dev: true
 
   /mkdirp@0.5.6:
     resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
@@ -16055,12 +15766,16 @@ packages:
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
-  /nanoid@5.0.6:
-    resolution: {integrity: sha512-rRq0eMHoGZxlvaFOUdK1Ev83Bd1IgzzR+WJ3IbDJ7QOSdAxYjlurSPqFs9s4lJg29RT6nPwizFtJhQS6V5xgiA==}
+  /nanoid@5.0.4:
+    resolution: {integrity: sha512-vAjmBf13gsmhXSgBrtIclinISzFFy22WwCYoyilZlsrRXNIHSwgFQ1bEdjRwMT3aoadeIF6HMuDRlOxzfXV8ig==}
     engines: {node: ^18 || >=20}
     hasBin: true
     dev: false
 
+  /napi-build-utils@1.0.2:
+    resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==}
+    dev: false
+
   /natural-compare@1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
     dev: true
@@ -16134,10 +15849,21 @@ packages:
       path-to-regexp: 1.8.0
     dev: true
 
+  /node-abi@3.31.0:
+    resolution: {integrity: sha512-eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      semver: 7.5.4
+    dev: false
+
   /node-abort-controller@3.1.1:
     resolution: {integrity: sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==}
     dev: false
 
+  /node-addon-api@6.1.0:
+    resolution: {integrity: sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==}
+    dev: false
+
   /node-bitmap@0.0.1:
     resolution: {integrity: sha512-Jx5lPaaLdIaOsj2mVLWMWulXF6GQVdyLvNSxmiYCvZ8Ma2hfKX0POoR2kgKOqz+oFsRreq0yYZjQ2wjE9VNzCA==}
     engines: {node: '>=v0.6.5'}
@@ -16204,6 +15930,13 @@ packages:
     engines: {node: '>= 6.13.0'}
     dev: false
 
+  /node-gyp-build-optional-packages@5.0.3:
+    resolution: {integrity: sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==}
+    hasBin: true
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /node-gyp-build-optional-packages@5.0.7:
     resolution: {integrity: sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==}
     hasBin: true
@@ -16242,8 +15975,8 @@ packages:
   /node-releases@2.0.14:
     resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==}
 
-  /nodemailer@6.9.10:
-    resolution: {integrity: sha512-qtoKfGFhvIFW5kLfrkw2R6Nm6Ur4LNUMykyqu6n9BRKJuyQrqEGwdXXUAbwWEKt33dlWUGXb7rzmJP/p4+O+CA==}
+  /nodemailer@6.9.8:
+    resolution: {integrity: sha512-cfrYUk16e67Ks051i4CntM9kshRYei1/o/Gi8K1d+R34OIs21xdFnW7Pt7EucmVKA0LKtqUGNcjMZ7ehjl49mQ==}
     engines: {node: '>=6.0.0'}
     dev: false
 
@@ -16264,8 +15997,8 @@ packages:
       undefsafe: 2.0.5
     dev: true
 
-  /nodemon@3.1.0:
-    resolution: {integrity: sha512-xqlktYlDMCepBJd43ZQhjWwMw2obW/JRvkrLxq5RCNcuDDX1DbcPT+qT1IlIIdf+DhnWs90JpTMe+Y5KxOchvA==}
+  /nodemon@3.0.3:
+    resolution: {integrity: sha512-7jH/NXbFPxVaMwmBCC2B9F/V6X1VkEdNgx3iu9jji8WxWcvhMWkmhNWhI5077zknOnZnBzba9hZP6bCPJLSReQ==}
     engines: {node: '>=10'}
     hasBin: true
     dependencies:
@@ -16794,7 +16527,6 @@ packages:
   /path-is-absolute@1.0.1:
     resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
     engines: {node: '>=0.10.0'}
-    requiresBuild: true
 
   /path-key@2.0.1:
     resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==}
@@ -17083,292 +16815,300 @@ packages:
       '@babel/runtime': 7.23.4
     dev: true
 
-  /postcss-calc@9.0.1(postcss@8.4.35):
+  /postcss-calc@9.0.1(postcss@8.4.33):
     resolution: {integrity: sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.2.2
     dependencies:
-      postcss: 8.4.35
-      postcss-selector-parser: 6.0.15
+      postcss: 8.4.33
+      postcss-selector-parser: 6.0.13
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-colormin@6.1.0(postcss@8.4.35):
-    resolution: {integrity: sha512-x9yX7DOxeMAR+BgGVnNSAxmAj98NX/YxEMNFP+SDCEeNLb2r3i6Hh1ksMsnW8Ub5SLCpbescQqn9YEbE9554Sw==}
+  /postcss-colormin@6.0.2(postcss@8.4.33):
+    resolution: {integrity: sha512-TXKOxs9LWcdYo5cgmcSHPkyrLAh86hX1ijmyy6J8SbOhyv6ua053M3ZAM/0j44UsnQNIWdl8gb5L7xX2htKeLw==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      browserslist: 4.23.0
+      browserslist: 4.22.2
       caniuse-api: 3.0.0
       colord: 2.9.3
-      postcss: 8.4.35
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-convert-values@6.1.0(postcss@8.4.35):
-    resolution: {integrity: sha512-zx8IwP/ts9WvUM6NkVSkiU902QZL1bwPhaVaLynPtCsOTqp+ZKbNi+s6XJg3rfqpKGA/oc7Oxk5t8pOQJcwl/w==}
+  /postcss-convert-values@6.0.2(postcss@8.4.33):
+    resolution: {integrity: sha512-aeBmaTnGQ+NUSVQT8aY0sKyAD/BaLJenEKZ03YK0JnDE1w1Rr8XShoxdal2V2H26xTJKr3v5haByOhJuyT4UYw==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      browserslist: 4.23.0
-      postcss: 8.4.35
+      browserslist: 4.22.2
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-discard-comments@6.0.2(postcss@8.4.35):
-    resolution: {integrity: sha512-65w/uIqhSBBfQmYnG92FO1mWZjJ4GL5b8atm5Yw2UgrwD7HiNiSSNwJor1eCFGzUgYnN/iIknhNRVqjrrpuglw==}
+  /postcss-discard-comments@6.0.1(postcss@8.4.33):
+    resolution: {integrity: sha512-f1KYNPtqYLUeZGCHQPKzzFtsHaRuECe6jLakf/RjSRqvF5XHLZnM2+fXLhb8Qh/HBFHs3M4cSLb1k3B899RYIg==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
     dev: false
 
-  /postcss-discard-duplicates@6.0.3(postcss@8.4.35):
-    resolution: {integrity: sha512-+JA0DCvc5XvFAxwx6f/e68gQu/7Z9ud584VLmcgto28eB8FqSFZwtrLwB5Kcp70eIoWP/HXqz4wpo8rD8gpsTw==}
+  /postcss-discard-duplicates@6.0.1(postcss@8.4.33):
+    resolution: {integrity: sha512-1hvUs76HLYR8zkScbwyJ8oJEugfPV+WchpnA+26fpJ7Smzs51CzGBHC32RS03psuX/2l0l0UKh2StzNxOrKCYg==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
     dev: false
 
-  /postcss-discard-empty@6.0.3(postcss@8.4.35):
-    resolution: {integrity: sha512-znyno9cHKQsK6PtxL5D19Fj9uwSzC2mB74cpT66fhgOadEUPyXFkbgwm5tvc3bt3NAy8ltE5MrghxovZRVnOjQ==}
+  /postcss-discard-empty@6.0.1(postcss@8.4.33):
+    resolution: {integrity: sha512-yitcmKwmVWtNsrrRqGJ7/C0YRy53i0mjexBDQ9zYxDwTWVBgbU4+C9jIZLmQlTDT9zhml+u0OMFJh8+31krmOg==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
     dev: false
 
-  /postcss-discard-overridden@6.0.2(postcss@8.4.35):
-    resolution: {integrity: sha512-j87xzI4LUggC5zND7KdjsI25APtyMuynXZSujByMaav2roV6OZX+8AaCUcZSWqckZpjAjRyFDdpqybgjFO0HJQ==}
+  /postcss-discard-overridden@6.0.1(postcss@8.4.33):
+    resolution: {integrity: sha512-qs0ehZMMZpSESbRkw1+inkf51kak6OOzNRaoLd/U7Fatp0aN2HQ1rxGOrJvYcRAN9VpX8kUF13R2ofn8OlvFVA==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
     dev: false
 
-  /postcss-merge-longhand@6.0.4(postcss@8.4.35):
-    resolution: {integrity: sha512-vAfWGcxUUGlFiPM3nDMZA+/Yo9sbpc3JNkcYZez8FfJDv41Dh7tAgA3QGVTocaHCZZL6aXPXPOaBMJsjujodsA==}
+  /postcss-merge-longhand@6.0.2(postcss@8.4.33):
+    resolution: {integrity: sha512-+yfVB7gEM8SrCo9w2lCApKIEzrTKl5yS1F4yGhV3kSim6JzbfLGJyhR1B6X+6vOT0U33Mgx7iv4X9MVWuaSAfw==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
-      stylehacks: 6.1.0(postcss@8.4.35)
+      stylehacks: 6.0.2(postcss@8.4.33)
     dev: false
 
-  /postcss-merge-rules@6.1.0(postcss@8.4.35):
-    resolution: {integrity: sha512-lER+W3Gr6XOvxOYk1Vi/6UsAgKMg6MDBthmvbNqi2XxAk/r9XfhdYZSigfWjuWWn3zYw2wLelvtM8XuAEFqRkA==}
+  /postcss-merge-rules@6.0.3(postcss@8.4.33):
+    resolution: {integrity: sha512-yfkDqSHGohy8sGYIJwBmIGDv4K4/WrJPX355XrxQb/CSsT4Kc/RxDi6akqn5s9bap85AWgv21ArcUWwWdGNSHA==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      browserslist: 4.23.0
+      browserslist: 4.22.2
       caniuse-api: 3.0.0
-      cssnano-utils: 4.0.2(postcss@8.4.35)
-      postcss: 8.4.35
+      cssnano-utils: 4.0.1(postcss@8.4.33)
+      postcss: 8.4.33
       postcss-selector-parser: 6.0.15
     dev: false
 
-  /postcss-minify-font-values@6.0.3(postcss@8.4.35):
-    resolution: {integrity: sha512-SmAeTA1We5rMnN3F8X9YBNo9bj9xB4KyDHnaNJnBfQIPi+60fNiR9OTRnIaMqkYzAQX0vObIw4Pn0vuKEOettg==}
+  /postcss-minify-font-values@6.0.1(postcss@8.4.33):
+    resolution: {integrity: sha512-tIwmF1zUPoN6xOtA/2FgVk1ZKrLcCvE0dpZLtzyyte0j9zUeB8RTbCqrHZGjJlxOvNWKMYtunLrrl7HPOiR46w==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-minify-gradients@6.0.3(postcss@8.4.35):
-    resolution: {integrity: sha512-4KXAHrYlzF0Rr7uc4VrfwDJ2ajrtNEpNEuLxFgwkhFZ56/7gaE4Nr49nLsQDZyUe+ds+kEhf+YAUolJiYXF8+Q==}
+  /postcss-minify-gradients@6.0.1(postcss@8.4.33):
+    resolution: {integrity: sha512-M1RJWVjd6IOLPl1hYiOd5HQHgpp6cvJVLrieQYS9y07Yo8itAr6jaekzJphaJFR0tcg4kRewCk3kna9uHBxn/w==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
       colord: 2.9.3
-      cssnano-utils: 4.0.2(postcss@8.4.35)
-      postcss: 8.4.35
+      cssnano-utils: 4.0.1(postcss@8.4.33)
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-minify-params@6.1.0(postcss@8.4.35):
-    resolution: {integrity: sha512-bmSKnDtyyE8ujHQK0RQJDIKhQ20Jq1LYiez54WiaOoBtcSuflfK3Nm596LvbtlFcpipMjgClQGyGr7GAs+H1uA==}
+  /postcss-minify-params@6.0.2(postcss@8.4.33):
+    resolution: {integrity: sha512-zwQtbrPEBDj+ApELZ6QylLf2/c5zmASoOuA4DzolyVGdV38iR2I5QRMsZcHkcdkZzxpN8RS4cN7LPskOkTwTZw==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      browserslist: 4.23.0
-      cssnano-utils: 4.0.2(postcss@8.4.35)
-      postcss: 8.4.35
+      browserslist: 4.22.2
+      cssnano-utils: 4.0.1(postcss@8.4.33)
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-minify-selectors@6.0.3(postcss@8.4.35):
-    resolution: {integrity: sha512-IcV7ZQJcaXyhx4UBpWZMsinGs2NmiUC60rJSkyvjPCPqhNjVGsrJUM+QhAtCaikZ0w0/AbZuH4wVvF/YMuMhvA==}
+  /postcss-minify-selectors@6.0.2(postcss@8.4.33):
+    resolution: {integrity: sha512-0b+m+w7OAvZejPQdN2GjsXLv5o0jqYHX3aoV0e7RBKPCsB7TYG5KKWBFhGnB/iP3213Ts8c5H4wLPLMm7z28Sg==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
       postcss-selector-parser: 6.0.15
     dev: false
 
-  /postcss-normalize-charset@6.0.2(postcss@8.4.35):
-    resolution: {integrity: sha512-a8N9czmdnrjPHa3DeFlwqst5eaL5W8jYu3EBbTTkI5FHkfMhFZh1EGbku6jhHhIzTA6tquI2P42NtZ59M/H/kQ==}
+  /postcss-normalize-charset@6.0.1(postcss@8.4.33):
+    resolution: {integrity: sha512-aW5LbMNRZ+oDV57PF9K+WI1Z8MPnF+A8qbajg/T8PP126YrGX1f9IQx21GI2OlGz7XFJi/fNi0GTbY948XJtXg==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
     dev: false
 
-  /postcss-normalize-display-values@6.0.2(postcss@8.4.35):
-    resolution: {integrity: sha512-8H04Mxsb82ON/aAkPeq8kcBbAtI5Q2a64X/mnRRfPXBq7XeogoQvReqxEfc0B4WPq1KimjezNC8flUtC3Qz6jg==}
+  /postcss-normalize-display-values@6.0.1(postcss@8.4.33):
+    resolution: {integrity: sha512-mc3vxp2bEuCb4LgCcmG1y6lKJu1Co8T+rKHrcbShJwUmKJiEl761qb/QQCfFwlrvSeET3jksolCR/RZuMURudw==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-normalize-positions@6.0.2(postcss@8.4.35):
-    resolution: {integrity: sha512-/JFzI441OAB9O7VnLA+RtSNZvQ0NCFZDOtp6QPFo1iIyawyXg0YI3CYM9HBy1WvwCRHnPep/BvI1+dGPKoXx/Q==}
+  /postcss-normalize-positions@6.0.1(postcss@8.4.33):
+    resolution: {integrity: sha512-HRsq8u/0unKNvm0cvwxcOUEcakFXqZ41fv3FOdPn916XFUrympjr+03oaLkuZENz3HE9RrQE9yU0Xv43ThWjQg==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-normalize-repeat-style@6.0.2(postcss@8.4.35):
-    resolution: {integrity: sha512-YdCgsfHkJ2jEXwR4RR3Tm/iOxSfdRt7jplS6XRh9Js9PyCR/aka/FCb6TuHT2U8gQubbm/mPmF6L7FY9d79VwQ==}
+  /postcss-normalize-repeat-style@6.0.1(postcss@8.4.33):
+    resolution: {integrity: sha512-Gbb2nmCy6tTiA7Sh2MBs3fj9W8swonk6lw+dFFeQT68B0Pzwp1kvisJQkdV6rbbMSd9brMlS8I8ts52tAGWmGQ==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-normalize-string@6.0.2(postcss@8.4.35):
-    resolution: {integrity: sha512-vQZIivlxlfqqMp4L9PZsFE4YUkWniziKjQWUtsxUiVsSSPelQydwS8Wwcuw0+83ZjPWNTl02oxlIvXsmmG+CiQ==}
+  /postcss-normalize-string@6.0.1(postcss@8.4.33):
+    resolution: {integrity: sha512-5Fhx/+xzALJD9EI26Aq23hXwmv97Zfy2VFrt5PLT8lAhnBIZvmaT5pQk+NuJ/GWj/QWaKSKbnoKDGLbV6qnhXg==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-normalize-timing-functions@6.0.2(postcss@8.4.35):
-    resolution: {integrity: sha512-a+YrtMox4TBtId/AEwbA03VcJgtyW4dGBizPl7e88cTFULYsprgHWTbfyjSLyHeBcK/Q9JhXkt2ZXiwaVHoMzA==}
+  /postcss-normalize-timing-functions@6.0.1(postcss@8.4.33):
+    resolution: {integrity: sha512-4zcczzHqmCU7L5dqTB9rzeqPWRMc0K2HoR+Bfl+FSMbqGBUcP5LRfgcH4BdRtLuzVQK1/FHdFoGT3F7rkEnY+g==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-normalize-unicode@6.1.0(postcss@8.4.35):
-    resolution: {integrity: sha512-QVC5TQHsVj33otj8/JD869Ndr5Xcc/+fwRh4HAsFsAeygQQXm+0PySrKbr/8tkDKzW+EVT3QkqZMfFrGiossDg==}
+  /postcss-normalize-unicode@6.0.2(postcss@8.4.33):
+    resolution: {integrity: sha512-Ff2VdAYCTGyMUwpevTZPZ4w0+mPjbZzLLyoLh/RMpqUqeQKZ+xMm31hkxBavDcGKcxm6ACzGk0nBfZ8LZkStKA==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      browserslist: 4.23.0
-      postcss: 8.4.35
+      browserslist: 4.22.2
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-normalize-url@6.0.2(postcss@8.4.35):
-    resolution: {integrity: sha512-kVNcWhCeKAzZ8B4pv/DnrU1wNh458zBNp8dh4y5hhxih5RZQ12QWMuQrDgPRw3LRl8mN9vOVfHl7uhvHYMoXsQ==}
+  /postcss-normalize-url@6.0.1(postcss@8.4.33):
+    resolution: {integrity: sha512-jEXL15tXSvbjm0yzUV7FBiEXwhIa9H88JOXDGQzmcWoB4mSjZIsmtto066s2iW9FYuIrIF4k04HA2BKAOpbsaQ==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-normalize-whitespace@6.0.2(postcss@8.4.35):
-    resolution: {integrity: sha512-sXZ2Nj1icbJOKmdjXVT9pnyHQKiSAyuNQHSgRCUgThn2388Y9cGVDR+E9J9iAYbSbLHI+UUwLVl1Wzco/zgv0Q==}
+  /postcss-normalize-whitespace@6.0.1(postcss@8.4.33):
+    resolution: {integrity: sha512-76i3NpWf6bB8UHlVuLRxG4zW2YykF9CTEcq/9LGAiz2qBuX5cBStadkk0jSkg9a9TCIXbMQz7yzrygKoCW9JuA==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-ordered-values@6.0.2(postcss@8.4.35):
-    resolution: {integrity: sha512-VRZSOB+JU32RsEAQrO94QPkClGPKJEL/Z9PCBImXMhIeK5KAYo6slP/hBYlLgrCjFxyqvn5VC81tycFEDBLG1Q==}
+  /postcss-ordered-values@6.0.1(postcss@8.4.33):
+    resolution: {integrity: sha512-XXbb1O/MW9HdEhnBxitZpPFbIvDgbo9NK4c/5bOfiKpnIGZDoL2xd7/e6jW5DYLsWxBbs+1nZEnVgnjnlFViaA==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      cssnano-utils: 4.0.2(postcss@8.4.35)
-      postcss: 8.4.35
+      cssnano-utils: 4.0.1(postcss@8.4.33)
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-reduce-initial@6.1.0(postcss@8.4.35):
-    resolution: {integrity: sha512-RarLgBK/CrL1qZags04oKbVbrrVK2wcxhvta3GCxrZO4zveibqbRPmm2VI8sSgCXwoUHEliRSbOfpR0b/VIoiw==}
+  /postcss-reduce-initial@6.0.2(postcss@8.4.33):
+    resolution: {integrity: sha512-YGKalhNlCLcjcLvjU5nF8FyeCTkCO5UtvJEt0hrPZVCTtRLSOH4z00T1UntQPj4dUmIYZgMj8qK77JbSX95hSw==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      browserslist: 4.23.0
+      browserslist: 4.22.2
       caniuse-api: 3.0.0
-      postcss: 8.4.35
+      postcss: 8.4.33
     dev: false
 
-  /postcss-reduce-transforms@6.0.2(postcss@8.4.35):
-    resolution: {integrity: sha512-sB+Ya++3Xj1WaT9+5LOOdirAxP7dJZms3GRcYheSPi1PiTMigsxHAdkrbItHxwYHr4kt1zL7mmcHstgMYT+aiA==}
+  /postcss-reduce-transforms@6.0.1(postcss@8.4.33):
+    resolution: {integrity: sha512-fUbV81OkUe75JM+VYO1gr/IoA2b/dRiH6HvMwhrIBSUrxq3jNZQZitSnugcTLDi1KkQh1eR/zi+iyxviUNBkcQ==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
+  /postcss-selector-parser@6.0.13:
+    resolution: {integrity: sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==}
+    engines: {node: '>=4'}
+    dependencies:
+      cssesc: 3.0.0
+      util-deprecate: 1.0.2
+
   /postcss-selector-parser@6.0.15:
     resolution: {integrity: sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==}
     engines: {node: '>=4'}
     dependencies:
       cssesc: 3.0.0
       util-deprecate: 1.0.2
+    dev: false
 
-  /postcss-svgo@6.0.3(postcss@8.4.35):
-    resolution: {integrity: sha512-dlrahRmxP22bX6iKEjOM+c8/1p+81asjKT+V5lrgOH944ryx/OHpclnIbGsKVd3uWOXFLYJwCVf0eEkJGvO96g==}
+  /postcss-svgo@6.0.2(postcss@8.4.33):
+    resolution: {integrity: sha512-IH5R9SjkTkh0kfFOQDImyy1+mTCb+E830+9SV1O+AaDcoHTvfsvt6WwJeo7KwcHbFnevZVCsXhDmjFiGVuwqFQ==}
     engines: {node: ^14 || ^16 || >= 18}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
       svgo: 3.2.0
     dev: false
 
-  /postcss-unique-selectors@6.0.3(postcss@8.4.35):
-    resolution: {integrity: sha512-NFXbYr8qdmCr/AFceaEfdcsKGCvWTeGO6QVC9h2GvtWgj0/0dklKQcaMMVzs6tr8bY+ase8hOtHW8OBTTRvS8A==}
+  /postcss-unique-selectors@6.0.2(postcss@8.4.33):
+    resolution: {integrity: sha512-8IZGQ94nechdG7Y9Sh9FlIY2b4uS8/k8kdKRX040XHsS3B6d1HrJAkXrBSsSu4SuARruSsUjW3nlSw8BHkaAYQ==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.35
+      postcss: 8.4.33
       postcss-selector-parser: 6.0.15
     dev: false
 
@@ -17376,6 +17116,23 @@ packages:
     resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
     dev: false
 
+  /postcss@8.4.32:
+    resolution: {integrity: sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==}
+    engines: {node: ^10 || ^12 || >=14}
+    dependencies:
+      nanoid: 3.3.7
+      picocolors: 1.0.0
+      source-map-js: 1.0.2
+    dev: false
+
+  /postcss@8.4.33:
+    resolution: {integrity: sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==}
+    engines: {node: ^10 || ^12 || >=14}
+    dependencies:
+      nanoid: 3.3.7
+      picocolors: 1.0.0
+      source-map-js: 1.0.2
+
   /postcss@8.4.35:
     resolution: {integrity: sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==}
     engines: {node: ^10 || ^12 || >=14}
@@ -17432,6 +17189,25 @@ packages:
     resolution: {integrity: sha512-VdlZoocy5lCP0c/t66xAfclglEapXPCIVhqqJRncYpvbCgImF0w67aPKfbqUMr72tO2k5q0TdTZwCLjPTI6C9g==}
     dev: true
 
+  /prebuild-install@7.1.1:
+    resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      detect-libc: 2.0.2
+      expand-template: 2.0.3
+      github-from-package: 0.0.0
+      minimist: 1.2.8
+      mkdirp-classic: 0.5.3
+      napi-build-utils: 1.0.2
+      node-abi: 3.31.0
+      pump: 3.0.0
+      rc: 1.2.8
+      simple-get: 4.0.1
+      tar-fs: 2.1.1
+      tunnel-agent: 0.6.0
+    dev: false
+
   /prelude-ls@1.1.2:
     resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==}
     engines: {node: '>= 0.8.0'}
@@ -17614,7 +17390,7 @@ packages:
       minimist: 1.2.8
       protobufjs: 7.2.3
       semver: 7.5.4
-      tmp: 0.2.2
+      tmp: 0.2.1
       uglify-js: 3.17.4
     dev: false
 
@@ -17633,7 +17409,7 @@ packages:
       '@protobufjs/path': 1.1.2
       '@protobufjs/pool': 1.1.0
       '@protobufjs/utf8': 1.1.0
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       long: 5.2.3
     dev: false
 
@@ -17912,6 +17688,16 @@ packages:
       iconv-lite: 0.4.24
       unpipe: 1.0.0
 
+  /rc@1.2.8:
+    resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
+    hasBin: true
+    dependencies:
+      deep-extend: 0.6.0
+      ini: 1.3.8
+      minimist: 1.2.8
+      strip-json-comments: 2.0.1
+    dev: false
+
   /rdf-canonize@3.4.0:
     resolution: {integrity: sha512-fUeWjrkOO0t1rg7B2fdyDTvngj+9RlUyL92vOdiB7c0FPguWVsniIMjEtHH+meLBO9rzkUlUzBVXgWrjI8P9LA==}
     engines: {node: '>=12'}
@@ -18093,6 +17879,17 @@ packages:
     engines: {node: '>= 12.13.0'}
     dev: false
 
+  /recast@0.22.0:
+    resolution: {integrity: sha512-5AAx+mujtXijsEavc5lWXBPQqrM4+Dl5qNH96N2aNeuJFUzpiiToKPsxQD/zAIJHspz7zz0maX0PCtCTFVlixQ==}
+    engines: {node: '>= 4'}
+    dependencies:
+      assert: 2.1.0
+      ast-types: 0.15.2
+      esprima: 4.0.1
+      source-map: 0.6.1
+      tslib: 2.6.2
+    dev: true
+
   /recast@0.23.4:
     resolution: {integrity: sha512-qtEDqIZGVcSZCHniWwZWbRy79Dc6Wp3kT/UmDA2RJKBPg7+7k51aQBZirHmUGn5uvHf2rg8DkjizrN26k61ATw==}
     engines: {node: '>= 4'}
@@ -18139,8 +17936,12 @@ packages:
       redis-errors: 1.2.0
     dev: false
 
+  /reflect-metadata@0.1.14:
+    resolution: {integrity: sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==}
+
   /reflect-metadata@0.2.1:
     resolution: {integrity: sha512-i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw==}
+    dev: false
 
   /regenerate-unicode-properties@10.1.0:
     resolution: {integrity: sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==}
@@ -18435,33 +18236,26 @@ packages:
     dependencies:
       glob: 7.2.3
 
-  /rimraf@5.0.5:
-    resolution: {integrity: sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==}
-    engines: {node: '>=14'}
-    hasBin: true
-    dependencies:
-      glob: 10.3.10
-
-  /rollup@4.12.0:
-    resolution: {integrity: sha512-wz66wn4t1OHIJw3+XU7mJJQV/2NAfw5OAk6G6Hoo3zcvz/XOfQ52Vgi+AN4Uxoxi0KBBwk2g8zPrTDA4btSB/Q==}
+  /rollup@4.9.6:
+    resolution: {integrity: sha512-05lzkCS2uASX0CiLFybYfVkwNbKZG5NFQ6Go0VWyogFTXXbR039UVsegViTntkk4OglHBdF54ccApXRRuXRbsg==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
     dependencies:
       '@types/estree': 1.0.5
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.12.0
-      '@rollup/rollup-android-arm64': 4.12.0
-      '@rollup/rollup-darwin-arm64': 4.12.0
-      '@rollup/rollup-darwin-x64': 4.12.0
-      '@rollup/rollup-linux-arm-gnueabihf': 4.12.0
-      '@rollup/rollup-linux-arm64-gnu': 4.12.0
-      '@rollup/rollup-linux-arm64-musl': 4.12.0
-      '@rollup/rollup-linux-riscv64-gnu': 4.12.0
-      '@rollup/rollup-linux-x64-gnu': 4.12.0
-      '@rollup/rollup-linux-x64-musl': 4.12.0
-      '@rollup/rollup-win32-arm64-msvc': 4.12.0
-      '@rollup/rollup-win32-ia32-msvc': 4.12.0
-      '@rollup/rollup-win32-x64-msvc': 4.12.0
+      '@rollup/rollup-android-arm-eabi': 4.9.6
+      '@rollup/rollup-android-arm64': 4.9.6
+      '@rollup/rollup-darwin-arm64': 4.9.6
+      '@rollup/rollup-darwin-x64': 4.9.6
+      '@rollup/rollup-linux-arm-gnueabihf': 4.9.6
+      '@rollup/rollup-linux-arm64-gnu': 4.9.6
+      '@rollup/rollup-linux-arm64-musl': 4.9.6
+      '@rollup/rollup-linux-riscv64-gnu': 4.9.6
+      '@rollup/rollup-linux-x64-gnu': 4.9.6
+      '@rollup/rollup-linux-x64-musl': 4.9.6
+      '@rollup/rollup-win32-arm64-msvc': 4.9.6
+      '@rollup/rollup-win32-ia32-msvc': 4.9.6
+      '@rollup/rollup-win32-x64-msvc': 4.9.6
       fsevents: 2.3.3
 
   /rrweb-cssom@0.6.0:
@@ -18528,19 +18322,19 @@ packages:
   /safer-buffer@2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
 
-  /sanitize-html@2.12.1:
-    resolution: {integrity: sha512-Plh+JAn0UVDpBRP/xEjsk+xDCoOvMBwQUf/K+/cBAVuTbtX8bj2VB7S1sL1dssVpykqp0/KPSesHrqXtokVBpA==}
+  /sanitize-html@2.11.0:
+    resolution: {integrity: sha512-BG68EDHRaGKqlsNjJ2xUB7gpInPA8gVx/mvjO743hZaeMCZ2DwzW7xvsqZ+KNU4QKwj86HJ3uu2liISf2qBBUA==}
     dependencies:
       deepmerge: 4.2.2
       escape-string-regexp: 4.0.0
       htmlparser2: 8.0.1
       is-plain-object: 5.0.0
       parse-srcset: 1.0.2
-      postcss: 8.4.35
+      postcss: 8.4.32
     dev: false
 
-  /sass@1.71.1:
-    resolution: {integrity: sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==}
+  /sass@1.70.0:
+    resolution: {integrity: sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ==}
     engines: {node: '>=14.0.0'}
     hasBin: true
     dependencies:
@@ -18601,14 +18395,6 @@ packages:
     dependencies:
       lru-cache: 6.0.0
 
-  /semver@7.6.0:
-    resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==}
-    engines: {node: '>=10'}
-    hasBin: true
-    dependencies:
-      lru-cache: 6.0.0
-    dev: true
-
   /send@0.18.0:
     resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
     engines: {node: '>= 0.8.0'}
@@ -18670,34 +18456,19 @@ packages:
       kind-of: 6.0.3
     dev: true
 
-  /sharp@0.33.2:
-    resolution: {integrity: sha512-WlYOPyyPDiiM07j/UO+E720ju6gtNtHjEGg5vovUk1Lgxyjm2LFO+37Nt/UI3MMh2l6hxTWQWi7qk3cXJTutcQ==}
-    engines: {libvips: '>=8.15.1', node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+  /sharp@0.32.6:
+    resolution: {integrity: sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==}
+    engines: {node: '>=14.15.0'}
     requiresBuild: true
     dependencies:
       color: 4.2.3
       detect-libc: 2.0.2
+      node-addon-api: 6.1.0
+      prebuild-install: 7.1.1
       semver: 7.5.4
-    optionalDependencies:
-      '@img/sharp-darwin-arm64': 0.33.2
-      '@img/sharp-darwin-x64': 0.33.2
-      '@img/sharp-libvips-darwin-arm64': 1.0.1
-      '@img/sharp-libvips-darwin-x64': 1.0.1
-      '@img/sharp-libvips-linux-arm': 1.0.1
-      '@img/sharp-libvips-linux-arm64': 1.0.1
-      '@img/sharp-libvips-linux-s390x': 1.0.1
-      '@img/sharp-libvips-linux-x64': 1.0.1
-      '@img/sharp-libvips-linuxmusl-arm64': 1.0.1
-      '@img/sharp-libvips-linuxmusl-x64': 1.0.1
-      '@img/sharp-linux-arm': 0.33.2
-      '@img/sharp-linux-arm64': 0.33.2
-      '@img/sharp-linux-s390x': 0.33.2
-      '@img/sharp-linux-x64': 0.33.2
-      '@img/sharp-linuxmusl-arm64': 0.33.2
-      '@img/sharp-linuxmusl-x64': 0.33.2
-      '@img/sharp-wasm32': 0.33.2
-      '@img/sharp-win32-ia32': 0.33.2
-      '@img/sharp-win32-x64': 0.33.2
+      simple-get: 4.0.1
+      tar-fs: 3.0.4
+      tunnel-agent: 0.6.0
     dev: false
 
   /shebang-command@1.2.0:
@@ -18722,10 +18493,10 @@ packages:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
 
-  /shiki@1.2.0:
-    resolution: {integrity: sha512-xLhiTMOIUXCv5DqJ4I70GgQCtdlzsTqFLZWcMHHG3TAieBUbvEGthdrlPDlX4mL/Wszx9C6rEcxU6kMlg4YlxA==}
+  /shiki@1.0.0-beta.3:
+    resolution: {integrity: sha512-z7cHTNSSvwGx2DfeLwjSNLo+HcVxifgNIzLm6Ye52eXcIwNHXT0wHbhy7FDOKSKveuEHBwt9opfj3Hoc8LE1Yg==}
     dependencies:
-      '@shikijs/core': 1.2.0
+      '@shikijs/core': 1.0.0-beta.3
     dev: false
 
   /side-channel@1.0.4:
@@ -18746,6 +18517,18 @@ packages:
     resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
     engines: {node: '>=14'}
 
+  /simple-concat@1.0.1:
+    resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
+    dev: false
+
+  /simple-get@4.0.1:
+    resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
+    dependencies:
+      decompress-response: 6.0.0
+      once: 1.4.0
+      simple-concat: 1.0.1
+    dev: false
+
   /simple-oauth2@5.0.0:
     resolution: {integrity: sha512-8291lo/z5ZdpmiOFzOs1kF3cxn22bMj5FFH+DNUppLJrpoIlM1QnFiE7KpshHu3J3i21TVcx4yW+gXYjdCKDLQ==}
     dependencies:
@@ -19133,11 +18916,11 @@ packages:
     resolution: {integrity: sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w==}
     dev: true
 
-  /storybook@8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-8d9gpKPDY9Ix64f0560rXIifmnuoswDdvSdTz4NXHGvPt7WrKNmaDTvWGyt1/fbTbv2dvvVp7bsWPgq1KGbrcg==}
+  /storybook@8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-iXPJck+USEAp9JIBgPvkHNOGzgbfcRoyrk18JMtypwoEXeMZgf6gPw9uKqH2rAoQ0opEYHKbU8FsJ2v+GX01yQ==}
     hasBin: true
     dependencies:
-      '@storybook/cli': 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/cli': 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)
     transitivePeerDependencies:
       - '@babel/preset-env'
       - bufferutil
@@ -19324,6 +19107,11 @@ packages:
       min-indent: 1.0.1
     dev: true
 
+  /strip-json-comments@2.0.1:
+    resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
   /strip-json-comments@3.1.1:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
@@ -19355,14 +19143,14 @@ packages:
     resolution: {integrity: sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==}
     dev: false
 
-  /stylehacks@6.1.0(postcss@8.4.35):
-    resolution: {integrity: sha512-ETErsPFgwlfYZ/CSjMO2Ddf+TsnkCVPBPaoB99Ro8WMAxf7cglzmFsRBhRmKObFjibtcvlNxFFPHuyr3sNlNUQ==}
+  /stylehacks@6.0.2(postcss@8.4.33):
+    resolution: {integrity: sha512-00zvJGnCu64EpMjX8b5iCZ3us2Ptyw8+toEkb92VdmkEaRaSGBNKAoK6aWZckhXxmQP8zWiTaFaiMGIU8Ve8sg==}
     engines: {node: ^14 || ^16 || >=18.0}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      browserslist: 4.23.0
-      postcss: 8.4.35
+      browserslist: 4.22.2
+      postcss: 8.4.33
       postcss-selector-parser: 6.0.15
     dev: false
 
@@ -19420,8 +19208,8 @@ packages:
     resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
     dev: false
 
-  /systeminformation@5.22.0:
-    resolution: {integrity: sha512-oAP80ymt8ssrAzjX8k3frbL7ys6AotqC35oikG6/SG15wBw+tG9nCk4oPaXIhEaAOAZ8XngxUv3ORq2IuR3r4Q==}
+  /systeminformation@5.21.24:
+    resolution: {integrity: sha512-xQada8ByGGFoRXJaUptGgddn3i7IjtSdqNdCKzB8xkzsM7pHnfLYBWxkPdGzhZ0Z/l+W1yo+aZQZ74d2isj8kw==}
     engines: {node: '>=8.0.0'}
     os: [darwin, linux, win32, freebsd, openbsd, netbsd, sunos, android]
     hasBin: true
@@ -19434,7 +19222,14 @@ packages:
       mkdirp-classic: 0.5.3
       pump: 3.0.0
       tar-stream: 2.2.0
-    dev: true
+
+  /tar-fs@3.0.4:
+    resolution: {integrity: sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==}
+    dependencies:
+      mkdirp-classic: 0.5.3
+      pump: 3.0.0
+      tar-stream: 3.1.6
+    dev: false
 
   /tar-stream@2.2.0:
     resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
@@ -19445,7 +19240,6 @@ packages:
       fs-constants: 1.0.0
       inherits: 2.0.4
       readable-stream: 3.6.0
-    dev: true
 
   /tar-stream@3.1.6:
     resolution: {integrity: sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==}
@@ -19536,8 +19330,8 @@ packages:
       unique-string: 2.0.0
     dev: true
 
-  /terser@5.28.1:
-    resolution: {integrity: sha512-wM+bZp54v/E9eRRGXb5ZFDvinrJIOaTapx3WUokyVGZu5ucVCK55zEgGd5Dl2fSr3jUo5sDiERErUWLY6QPFyA==}
+  /terser@5.27.0:
+    resolution: {integrity: sha512-bi1HRwVRskAjheeYl291n3JC4GgO/Ty4z1nVs5AAsmonJulGxpSektecnNedrwK9C7vpvVtcX3cw00VSLt7U2A==}
     engines: {node: '>=10'}
     hasBin: true
     dependencies:
@@ -19586,8 +19380,8 @@ packages:
       real-require: 0.2.0
     dev: false
 
-  /three@0.162.0:
-    resolution: {integrity: sha512-xfCYj4RnlozReCmUd+XQzj6/5OjDNHBy5nT6rVwrOKGENAvpXe2z1jL+DZYaMu4/9pNsjH/4Os/VvS9IrH7IOQ==}
+  /three@0.160.1:
+    resolution: {integrity: sha512-Bgl2wPJypDOZ1stAxwfWAcJ0WQf7QzlptsxkjYiURPz+n5k4RBDLsq+6f9Y75TYxn6aHLcWz+JNmwTOXWrQTBQ==}
     dev: false
 
   /throttle-debounce@5.0.0:
@@ -19653,11 +19447,11 @@ packages:
       os-tmpdir: 1.0.2
     dev: true
 
-  /tmp@0.2.2:
-    resolution: {integrity: sha512-ETcvHhaIc9J2MDEAH6N67j9bvBvu/3Gb764qaGhwtFvjtvhegqoqSpofgeyq1Sc24mW5pdyUDs9HP5j3ehkxRw==}
-    engines: {node: '>=14'}
+  /tmp@0.2.1:
+    resolution: {integrity: sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==}
+    engines: {node: '>=8.17.0'}
     dependencies:
-      rimraf: 5.0.5
+      rimraf: 3.0.2
 
   /tmpl@1.0.5:
     resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
@@ -19808,8 +19602,8 @@ packages:
       strip-bom: 3.0.0
     dev: false
 
-  /tsd@0.30.7:
-    resolution: {integrity: sha512-oTiJ28D6B/KXoU3ww/Eji+xqHJojiuPVMwA12g4KYX1O72N93Nb6P3P3h2OAhhf92Xl8NIhb/xFmBZd5zw/xUw==}
+  /tsd@0.30.4:
+    resolution: {integrity: sha512-ncC4SwAeUk0OTcXt5h8l0/gOLHJSp9ogosvOADT6QYzrl0ITm398B3wkz8YESqefIsEEwvYAU8bvo7/rcN/M0Q==}
     engines: {node: '>=14.16'}
     hasBin: true
     dependencies:
@@ -20242,18 +20036,6 @@ packages:
       browserslist: 4.22.2
       escalade: 3.1.1
       picocolors: 1.0.0
-    dev: true
-
-  /update-browserslist-db@1.0.13(browserslist@4.23.0):
-    resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==}
-    hasBin: true
-    peerDependencies:
-      browserslist: '>= 4.21.0'
-    dependencies:
-      browserslist: 4.23.0
-      escalade: 3.1.1
-      picocolors: 1.0.0
-    dev: false
 
   /uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
@@ -20308,8 +20090,8 @@ packages:
     resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
     hasBin: true
 
-  /v-code-diff@1.9.0(vue@3.4.21):
-    resolution: {integrity: sha512-alg6krCxFvwTob/rJq+3LzjdIbLb/ni8tS8YmBbI0wckOkbJuN1cShFJ6XEkm82tMgpv5NYEeWLEWhggeV7BDg==}
+  /v-code-diff@1.7.2(vue@3.4.18):
+    resolution: {integrity: sha512-y+q8ZHf8GfphYLhcZbjAKcId/h6vZujS71Ryq5u+dI6Jg4ZLTdLrBNVSzYpHywHSSFFfBMdilm6XvVryEaH4+A==}
     requiresBuild: true
     peerDependencies:
       '@vue/composition-api': ^1.4.9
@@ -20320,9 +20102,9 @@ packages:
     dependencies:
       diff: 5.1.0
       diff-match-patch: 1.0.5
-      highlight.js: 11.9.0
-      vue: 3.4.21(typescript@5.3.3)
-      vue-demi: 0.14.7(vue@3.4.21)
+      highlight.js: 11.8.0
+      vue: 3.4.18(typescript@5.3.3)
+      vue-demi: 0.13.11(vue@3.4.18)
     dev: false
 
   /v8-to-istanbul@9.1.0:
@@ -20382,7 +20164,7 @@ packages:
       vfile-message: 4.0.2
     dev: true
 
-  /vite-node@0.34.6(@types/node@20.11.22)(sass@1.71.1)(terser@5.28.1):
+  /vite-node@0.34.6(@types/node@20.11.17)(sass@1.70.0)(terser@5.27.0):
     resolution: {integrity: sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==}
     engines: {node: '>=v14.18.0'}
     hasBin: true
@@ -20392,7 +20174,7 @@ packages:
       mlly: 1.4.2
       pathe: 1.1.1
       picocolors: 1.0.0
-      vite: 5.1.4(@types/node@20.11.22)(sass@1.71.1)(terser@5.28.1)
+      vite: 5.1.0(@types/node@20.11.17)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -20408,8 +20190,8 @@ packages:
     resolution: {integrity: sha512-p4D8CFVhZS412SyQX125qxyzOgIFouwOcvjZWk6bQbNPR1wtaEzFT6jZxAjf1dejlGqa6fqHcuCvQea6EWUkUA==}
     dev: true
 
-  /vite@5.1.4(@types/node@20.11.22)(sass@1.71.1)(terser@5.28.1):
-    resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==}
+  /vite@5.1.0(@types/node@20.11.17)(sass@1.70.0)(terser@5.27.0):
+    resolution: {integrity: sha512-STmSFzhY4ljuhz14bg9LkMTk3d98IO6DIArnTY6MeBwiD1Za2StcQtz7fzOUnRCqrHSD5+OS2reg4HOz1eoLnw==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -20436,12 +20218,12 @@ packages:
       terser:
         optional: true
     dependencies:
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       esbuild: 0.19.11
       postcss: 8.4.35
-      rollup: 4.12.0
-      sass: 1.71.1
-      terser: 5.28.1
+      rollup: 4.9.6
+      sass: 1.70.0
+      terser: 5.27.0
     optionalDependencies:
       fsevents: 2.3.3
 
@@ -20452,12 +20234,12 @@ packages:
       vitest: '>=0.16.0'
     dependencies:
       cross-fetch: 3.1.5
-      vitest: 0.34.6(happy-dom@13.6.2)(sass@1.71.1)(terser@5.28.1)
+      vitest: 0.34.6(happy-dom@10.0.3)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
       - encoding
     dev: true
 
-  /vitest@0.34.6(happy-dom@13.6.2)(sass@1.71.1)(terser@5.28.1):
+  /vitest@0.34.6(happy-dom@10.0.3)(sass@1.70.0)(terser@5.27.0):
     resolution: {integrity: sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==}
     engines: {node: '>=v14.18.0'}
     hasBin: true
@@ -20490,7 +20272,7 @@ packages:
     dependencies:
       '@types/chai': 4.3.11
       '@types/chai-subset': 1.3.5
-      '@types/node': 20.11.22
+      '@types/node': 20.11.17
       '@vitest/expect': 0.34.6
       '@vitest/runner': 0.34.6
       '@vitest/snapshot': 0.34.6
@@ -20501,7 +20283,7 @@ packages:
       cac: 6.7.14
       chai: 4.3.10
       debug: 4.3.4(supports-color@8.1.1)
-      happy-dom: 13.6.2
+      happy-dom: 10.0.3
       local-pkg: 0.4.3
       magic-string: 0.30.5
       pathe: 1.1.1
@@ -20510,8 +20292,8 @@ packages:
       strip-literal: 1.3.0
       tinybench: 2.6.0
       tinypool: 0.7.0
-      vite: 5.1.4(@types/node@20.11.22)(sass@1.71.1)(terser@5.28.1)
-      vite-node: 0.34.6(@types/node@20.11.22)(sass@1.71.1)(terser@5.28.1)
+      vite: 5.1.0(@types/node@20.11.17)(sass@1.70.0)(terser@5.27.0)
+      vite-node: 0.34.6(@types/node@20.11.17)(sass@1.70.0)(terser@5.27.0)
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less
@@ -20563,21 +20345,6 @@ packages:
       vscode-languageserver-protocol: 3.17.5
     dev: false
 
-  /vue-component-meta@1.8.27(typescript@5.3.3):
-    resolution: {integrity: sha512-j3WJsyQHP4TDlvnjHc/eseo0/eVkf0FaCpkqGwez5zD+Tj31onBzWZEXTnWKs8xRj0n3dMNYdy3SpiS6NubSvg==}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@volar/typescript': 1.11.1
-      '@vue/language-core': 1.8.27(typescript@5.3.3)
-      path-browserify: 1.0.1
-      typescript: 5.3.3
-      vue-component-type-helpers: 1.8.27
-    dev: true
-
   /vue-component-type-helpers@1.8.27:
     resolution: {integrity: sha512-0vOfAtI67UjeO1G6UiX5Kd76CqaQ67wrRZiOe7UAb9Jm6GzlUr/fC7CV90XfwapJRjpCMaZFhv1V0ajWRmE9Dg==}
     dev: true
@@ -20586,12 +20353,8 @@ packages:
     resolution: {integrity: sha512-6bnLkn8O0JJyiFSIF0EfCogzeqNXpnjJ0vW/SZzNHfe6sPx30lTtTXlE5TFs2qhJlAtDFybStVNpL73cPe3OMQ==}
     dev: true
 
-  /vue-component-type-helpers@2.0.7:
-    resolution: {integrity: sha512-7e12Evdll7JcTIocojgnCgwocX4WzIYStGClBQ+QuWPinZo/vQolv2EMq4a3lg16TKfwWafLimG77bxb56UauA==}
-    dev: true
-
-  /vue-demi@0.14.7(vue@3.4.21):
-    resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==}
+  /vue-demi@0.13.11(vue@3.4.18):
+    resolution: {integrity: sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==}
     engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
@@ -20602,37 +20365,35 @@ packages:
       '@vue/composition-api':
         optional: true
     dependencies:
-      vue: 3.4.21(typescript@5.3.3)
+      vue: 3.4.18(typescript@5.3.3)
     dev: false
 
-  /vue-docgen-api@4.76.0(vue@3.4.21):
-    resolution: {integrity: sha512-Nykmg/Net1BhoS1tENGqcevDdgha4us0x2Xnin7n5SxxAH6+s10FXTWtg7E9+jhC3GWEE83lcFHMS/Ml4C1dog==}
-    peerDependencies:
-      vue: '>=2'
+  /vue-docgen-api@4.64.1(vue@3.4.18):
+    resolution: {integrity: sha512-jbOf7ByE3Zvtuk+429Jorl+eIeh2aB2Fx1GUo3xJd1aByJWE8KDlSEa6b11PB1ze8f0sRUBraRDinICCk0KY7g==}
     dependencies:
-      '@babel/parser': 7.23.9
+      '@babel/parser': 7.23.6
       '@babel/types': 7.23.5
-      '@vue/compiler-dom': 3.4.18
-      '@vue/compiler-sfc': 3.4.21
-      ast-types: 0.16.1
-      esm-resolve: 1.0.9
+      '@vue/compiler-dom': 3.4.15
+      '@vue/compiler-sfc': 3.4.18
+      ast-types: 0.14.2
       hash-sum: 2.0.0
       lru-cache: 8.0.4
       pug: 3.0.2
-      recast: 0.23.4
+      recast: 0.22.0
       ts-map: 1.0.3
-      vue: 3.4.21(typescript@5.3.3)
-      vue-inbrowser-compiler-independent-utils: 4.71.1(vue@3.4.21)
+      vue-inbrowser-compiler-independent-utils: 4.64.1(vue@3.4.18)
+    transitivePeerDependencies:
+      - vue
     dev: true
 
-  /vue-eslint-parser@9.4.2(eslint@8.57.0):
+  /vue-eslint-parser@9.4.2(eslint@8.56.0):
     resolution: {integrity: sha512-Ry9oiGmCAK91HrKMtCrKFWmSFWvYkpGglCeFAIqDdr9zdXmMMpJOmUJS7WWsW7fX81h6mwHmUZCQQ1E0PkSwYQ==}
     engines: {node: ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '>=6.0.0'
     dependencies:
       debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.57.0
+      eslint: 8.56.0
       eslint-scope: 7.2.2
       eslint-visitor-keys: 3.4.3
       espree: 9.6.1
@@ -20643,21 +20404,21 @@ packages:
       - supports-color
     dev: true
 
-  /vue-inbrowser-compiler-independent-utils@4.71.1(vue@3.4.21):
-    resolution: {integrity: sha512-K3wt3iVmNGaFEOUR4JIThQRWfqokxLfnPslD41FDZB2ajXp789+wCqJyGYlIFsvEQ2P61PInw6/ph5iiqg51gg==}
+  /vue-inbrowser-compiler-independent-utils@4.64.1(vue@3.4.18):
+    resolution: {integrity: sha512-Hn32n07XZ8j9W8+fmOXPQL+i+W2e/8i6mkH4Ju3H6nR0+cfvmWM95GhczYi5B27+Y8JlCKgAo04IUiYce4mKAw==}
     peerDependencies:
       vue: '>=2'
     dependencies:
-      vue: 3.4.21(typescript@5.3.3)
+      vue: 3.4.18(typescript@5.3.3)
     dev: true
 
-  /vue-prism-editor@2.0.0-alpha.2(vue@3.4.21):
+  /vue-prism-editor@2.0.0-alpha.2(vue@3.4.18):
     resolution: {integrity: sha512-Gu42ba9nosrE+gJpnAEuEkDMqG9zSUysIR8SdXUw8MQKDjBnnNR9lHC18uOr/ICz7yrA/5c7jHJr9lpElODC7w==}
     engines: {node: '>=10'}
     peerDependencies:
       vue: ^3.0.0
     dependencies:
-      vue: 3.4.21(typescript@5.3.3)
+      vue: 3.4.18(typescript@5.3.3)
     dev: false
 
   /vue-template-compiler@2.7.14:
@@ -20679,28 +20440,28 @@ packages:
       typescript: 5.3.3
     dev: true
 
-  /vue@3.4.21(typescript@5.3.3):
-    resolution: {integrity: sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==}
+  /vue@3.4.18(typescript@5.3.3):
+    resolution: {integrity: sha512-0zLRYamFRe0wF4q2L3O24KQzLyLpL64ye1RUToOgOxuWZsb/FhaNRdGmeozdtVYLz6tl94OXLaK7/WQIrVCw1A==}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@vue/compiler-dom': 3.4.21
-      '@vue/compiler-sfc': 3.4.21
-      '@vue/runtime-dom': 3.4.21
-      '@vue/server-renderer': 3.4.21(vue@3.4.21)
-      '@vue/shared': 3.4.21
+      '@vue/compiler-dom': 3.4.18
+      '@vue/compiler-sfc': 3.4.18
+      '@vue/runtime-dom': 3.4.18
+      '@vue/server-renderer': 3.4.18(vue@3.4.18)
+      '@vue/shared': 3.4.18
       typescript: 5.3.3
 
-  /vuedraggable@4.1.0(vue@3.4.21):
+  /vuedraggable@4.1.0(vue@3.4.18):
     resolution: {integrity: sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==}
     peerDependencies:
       vue: ^3.0.1
     dependencies:
       sortablejs: 1.14.0
-      vue: 3.4.21(typescript@5.3.3)
+      vue: 3.4.18(typescript@5.3.3)
     dev: false
 
   /w3c-xmlserializer@5.0.0:
@@ -20784,7 +20545,6 @@ packages:
     engines: {node: '>=12'}
     dependencies:
       iconv-lite: 0.6.3
-    dev: false
 
   /whatwg-encoding@3.1.1:
     resolution: {integrity: sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==}
@@ -21150,7 +20910,7 @@ packages:
       vscode-languageclient: 9.0.1
     dev: false
 
-  github.com/misskey-dev/storybook-addon-misskey-theme/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@8.0.0-beta.6)(@storybook/components@8.0.0-beta.6)(@storybook/core-events@8.0.0-beta.6)(@storybook/manager-api@8.0.0-beta.6)(@storybook/preview-api@8.0.0-beta.6)(@storybook/theming@8.0.0-beta.6)(@storybook/types@8.0.0-beta.6)(react-dom@18.2.0)(react@18.2.0):
+  github.com/misskey-dev/storybook-addon-misskey-theme/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@8.0.0-beta.2)(@storybook/components@8.0.0-beta.2)(@storybook/core-events@8.0.0-beta.2)(@storybook/manager-api@8.0.0-beta.2)(@storybook/preview-api@8.0.0-beta.2)(@storybook/theming@8.0.0-beta.2)(@storybook/types@8.0.0-beta.2)(react-dom@18.2.0)(react@18.2.0):
     resolution: {tarball: https://codeload.github.com/misskey-dev/storybook-addon-misskey-theme/tar.gz/cf583db098365b2ccc81a82f63ca9c93bc32b640}
     id: github.com/misskey-dev/storybook-addon-misskey-theme/cf583db098365b2ccc81a82f63ca9c93bc32b640
     name: storybook-addon-misskey-theme
@@ -21171,13 +20931,13 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/blocks': 8.0.0-beta.6(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/components': 8.0.0-beta.6(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/core-events': 8.0.0-beta.6
-      '@storybook/manager-api': 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/preview-api': 8.0.0-beta.6
-      '@storybook/theming': 8.0.0-beta.6(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/types': 8.0.0-beta.6
+      '@storybook/blocks': 8.0.0-beta.2(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/components': 8.0.0-beta.2(@types/react@18.0.28)(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-events': 8.0.0-beta.2
+      '@storybook/manager-api': 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 8.0.0-beta.2
+      '@storybook/theming': 8.0.0-beta.2(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 8.0.0-beta.2
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
diff --git a/scripts/changelog-checker/src/checker.ts b/scripts/changelog-checker/src/checker.ts
index 8fd6ff5629..bbd5b2270a 100644
--- a/scripts/changelog-checker/src/checker.ts
+++ b/scripts/changelog-checker/src/checker.ts
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 import { Release } from './parser.js';
 
 export class Result {
diff --git a/scripts/changelog-checker/src/index.ts b/scripts/changelog-checker/src/index.ts
index 0e2c5ce057..8cbeb297d9 100644
--- a/scripts/changelog-checker/src/index.ts
+++ b/scripts/changelog-checker/src/index.ts
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 import * as process from 'process';
 import * as fs from 'fs';
 import { parseChangeLog } from './parser.js';
diff --git a/scripts/changelog-checker/src/parser.ts b/scripts/changelog-checker/src/parser.ts
index 894d60d6af..d6a9ddeda8 100644
--- a/scripts/changelog-checker/src/parser.ts
+++ b/scripts/changelog-checker/src/parser.ts
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 import * as fs from 'node:fs';
 import { unified } from 'unified';
 import remarkParse from 'remark-parse';
diff --git a/scripts/changelog-checker/test/checker.test.ts b/scripts/changelog-checker/test/checker.test.ts
index 9ca8fa85f2..bc73e5622b 100644
--- a/scripts/changelog-checker/test/checker.test.ts
+++ b/scripts/changelog-checker/test/checker.test.ts
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 import {expect, suite, test} from "vitest";
 import {Release, ReleaseCategory} from "../src/parser";
 import {checkNewRelease, checkNewTopic} from "../src/checker";
@@ -416,4 +411,4 @@ suite('checkNewTopic', () => {
 		console.log(result.message)
 		expect(result.success).toBe(false)
 	})
-})
+})
\ No newline at end of file
diff --git a/scripts/tarball.mjs b/scripts/tarball.mjs
index 9b621ce9d0..63864c1fae 100644
--- a/scripts/tarball.mjs
+++ b/scripts/tarball.mjs
@@ -1,8 +1,3 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 import { createWriteStream } from 'node:fs';
 import { mkdir } from 'node:fs/promises';
 import { resolve } from 'node:path';

From f2bcc2cb3d45bb039105a5800159d7aadbf49f88 Mon Sep 17 00:00:00 2001
From: 1673beta <rekishinomori@gmail.com>
Date: Fri, 22 Mar 2024 14:02:00 +0900
Subject: [PATCH 5/6] Revert "Merge pull request #27 from 1673beta/engawa"

This reverts commit 43bc7422d5bcfd2a4491992f60e9b2170510293d, reversing
changes made to 9881ee15f34b5a153fa195ba1d3d276e716be835.
---
 .../api/endpoints/notes/media-timeline.ts     | 154 ++++++++++++++++++
 1 file changed, 154 insertions(+)
 create mode 100644 packages/backend/src/server/api/endpoints/notes/media-timeline.ts

diff --git a/packages/backend/src/server/api/endpoints/notes/media-timeline.ts b/packages/backend/src/server/api/endpoints/notes/media-timeline.ts
new file mode 100644
index 0000000000..7780861631
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/notes/media-timeline.ts
@@ -0,0 +1,154 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project, esurio
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Brackets } from 'typeorm';
+import { Inject, Injectable } from '@nestjs/common';
+import type { NotesRepository, ChannelFollowingsRepository, FollowingsRepository } from '@/models/_.js';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import ActiveUsersChart from '@/core/chart/charts/active-users.js';
+import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
+import { DI } from '@/di-symbols.js';
+import { RoleService } from '@/core/RoleService.js';
+import { IdService } from '@/core/IdService.js';
+import { CacheService } from '@/core/CacheService.js';
+import { FanoutTimelineName } from '@/core/FanoutTimelineService.js';
+import { QueryService } from '@/core/QueryService.js';
+import { UserFollowingService } from '@/core/UserFollowingService.js';
+import { MetaService } from '@/core/MetaService.js';
+import { MiLocalUser } from '@/models/User.js';
+import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
+import { ApiError } from '../../error.js';
+
+export const meta = {
+	tags: ['notes'],
+
+	requireCredential: true,
+	kind: 'read:account',
+
+	res: {
+		type: 'array',
+		optional: false, nullable: false,
+		items: {
+			type: 'object',
+			optional: false, nullable: false,
+			ref: 'Note',
+		},
+	},
+
+	errors: {
+		mtlDisabled: {
+			message: 'Media timeline has been disabled.',
+			code: 'MTL_DISABLED',
+			id: 'c1626132-e2ca-11ee-8f65-00155dc875d3',
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
+		sinceId: { type: 'string', format: 'misskey:id' },
+		untilId: { type: 'string', format: 'misskey:id' },
+		sinceDate: { type: 'integer' },
+		untilDate: { type: 'integer' },
+		withFiles: { type: 'boolean', default: false },
+		withRenotes: { type: 'boolean', default: true },
+		withReplies: { type: 'boolean', default: false },
+		withCats: { type: 'boolean', default: false },
+		fileType: { type: 'array', items: { type: 'string' } },
+		excludeNsfw: { type: 'boolean', default: false },
+		onlyNsfw: { type: 'boolean', default: false },
+		onlyFollowees: { type: 'boolean', default: false },
+	},
+	required: [],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> {
+	constructor(
+		@Inject(DI.notesRepository)
+		private notesRepository: NotesRepository,
+
+		@Inject(DI.channelFollowingsRepository)
+		private channelFollowingsRepository: ChannelFollowingsRepository,
+
+		private noteEntityService: NoteEntityService,
+		private roleService: RoleService,
+		private activeUserschart: ActiveUsersChart,
+		private idService: IdService,
+		private cacheService: CacheService,
+		private queryService: QueryService,
+		private metaService: MetaService,
+		private userFollowingService: UserFollowingService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			const policies = await this.roleService.getUserPolicies(me ? me.id : null);
+
+			if (!policies.gtlAvailable) {
+				throw new ApiError(meta.errors.mtlDisabled);
+			}
+
+			const followee = await this.userFollowingService.getFollowees(me.id);
+			const followingChannels = await this.channelFollowingsRepository.find({
+				where: {
+					followerId: me.id,
+				},
+			});
+
+			const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'),
+				ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
+				.andWhere('note.visibility = \'public\'')
+				.andWhere('note.fileIds != \'{}\'')
+				.innerJoinAndSelect('note.user', 'user')
+				.leftJoinAndSelect('note.reply', 'reply')
+				.leftJoinAndSelect('note.renote', 'renote')
+				.leftJoinAndSelect('reply.user', 'renoteUser');
+
+			if (followingChannels.length > 0) {
+				const followingChannelIds = followingChannels.map(x => x.followeeId);
+
+				query.andWhere(new Brackets(qb => {
+					qb.where('note.channelId IN (:...followingChannelIds)', { followingChannelIds });
+					qb.orWhere('note.channelId IS NULL');
+				}));
+			} else {
+				query.andWhere('note.channelId IS NULL');
+			}
+
+			if (!ps.withReplies) {
+				query.andWhere(new Brackets(qb => {
+					qb.where('note.replyId IS NULL')
+						.orWhere(new Brackets(qb => {
+							qb.where('note.replyId IS NOT NULL')
+								.andWhere('note.replyUserId = note.userId');
+						}));
+				}));
+			}
+
+			if (ps.onlyNsfw) {
+				query.andWhere('note.cw != \'{}\'');
+				query.andWhere('0 < (SELECT COUNT(*) FROM drive_file df WHERE df.id = ANY(note."fileIds") AND df."isSensitive" = TRUE)' );
+			}
+
+			if (ps.onlyFollowees) {
+				query.andWhere(new Brackets(qb => {
+					if (followee.length > 0) {
+						const meOrFolloweeIds = [me.id, ...followee.map(f => f.followeeId)];
+						qb.orWhere('note.userId IN (:...meOrFolloweeIds)', { meOrFolloweeIds: meOrFolloweeIds });
+						qb.orWhere('(note.visibility = \'public\') AND (note.userHost IS NULL) ');
+					} else {
+						qb.
+					}
+				}));
+			}
+
+			this.queryService.generateVisibilityQuery(query, me);
+			this.queryService.generateMutedUserQuery(query, me);
+			this.queryService.generateBlockedUserQuery(query, me);
+			this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
+		});
+	}
+}

From 928a18dcd29d46309b7a47b4759151eb58af65e1 Mon Sep 17 00:00:00 2001
From: 1673beta <rekishinomori@gmail.com>
Date: Fri, 22 Mar 2024 14:09:44 +0900
Subject: [PATCH 6/6] Revert "Revert "Merge pull request #27 from
 1673beta/engawa""

This reverts commit f2bcc2cb3d45bb039105a5800159d7aadbf49f88.
---
 .../api/endpoints/notes/media-timeline.ts     | 154 ------------------
 1 file changed, 154 deletions(-)
 delete mode 100644 packages/backend/src/server/api/endpoints/notes/media-timeline.ts

diff --git a/packages/backend/src/server/api/endpoints/notes/media-timeline.ts b/packages/backend/src/server/api/endpoints/notes/media-timeline.ts
deleted file mode 100644
index 7780861631..0000000000
--- a/packages/backend/src/server/api/endpoints/notes/media-timeline.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project, esurio
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Brackets } from 'typeorm';
-import { Inject, Injectable } from '@nestjs/common';
-import type { NotesRepository, ChannelFollowingsRepository, FollowingsRepository } from '@/models/_.js';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import ActiveUsersChart from '@/core/chart/charts/active-users.js';
-import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
-import { DI } from '@/di-symbols.js';
-import { RoleService } from '@/core/RoleService.js';
-import { IdService } from '@/core/IdService.js';
-import { CacheService } from '@/core/CacheService.js';
-import { FanoutTimelineName } from '@/core/FanoutTimelineService.js';
-import { QueryService } from '@/core/QueryService.js';
-import { UserFollowingService } from '@/core/UserFollowingService.js';
-import { MetaService } from '@/core/MetaService.js';
-import { MiLocalUser } from '@/models/User.js';
-import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
-import { ApiError } from '../../error.js';
-
-export const meta = {
-	tags: ['notes'],
-
-	requireCredential: true,
-	kind: 'read:account',
-
-	res: {
-		type: 'array',
-		optional: false, nullable: false,
-		items: {
-			type: 'object',
-			optional: false, nullable: false,
-			ref: 'Note',
-		},
-	},
-
-	errors: {
-		mtlDisabled: {
-			message: 'Media timeline has been disabled.',
-			code: 'MTL_DISABLED',
-			id: 'c1626132-e2ca-11ee-8f65-00155dc875d3',
-		},
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
-		sinceId: { type: 'string', format: 'misskey:id' },
-		untilId: { type: 'string', format: 'misskey:id' },
-		sinceDate: { type: 'integer' },
-		untilDate: { type: 'integer' },
-		withFiles: { type: 'boolean', default: false },
-		withRenotes: { type: 'boolean', default: true },
-		withReplies: { type: 'boolean', default: false },
-		withCats: { type: 'boolean', default: false },
-		fileType: { type: 'array', items: { type: 'string' } },
-		excludeNsfw: { type: 'boolean', default: false },
-		onlyNsfw: { type: 'boolean', default: false },
-		onlyFollowees: { type: 'boolean', default: false },
-	},
-	required: [],
-} as const;
-
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> {
-	constructor(
-		@Inject(DI.notesRepository)
-		private notesRepository: NotesRepository,
-
-		@Inject(DI.channelFollowingsRepository)
-		private channelFollowingsRepository: ChannelFollowingsRepository,
-
-		private noteEntityService: NoteEntityService,
-		private roleService: RoleService,
-		private activeUserschart: ActiveUsersChart,
-		private idService: IdService,
-		private cacheService: CacheService,
-		private queryService: QueryService,
-		private metaService: MetaService,
-		private userFollowingService: UserFollowingService,
-	) {
-		super(meta, paramDef, async (ps, me) => {
-			const policies = await this.roleService.getUserPolicies(me ? me.id : null);
-
-			if (!policies.gtlAvailable) {
-				throw new ApiError(meta.errors.mtlDisabled);
-			}
-
-			const followee = await this.userFollowingService.getFollowees(me.id);
-			const followingChannels = await this.channelFollowingsRepository.find({
-				where: {
-					followerId: me.id,
-				},
-			});
-
-			const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'),
-				ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
-				.andWhere('note.visibility = \'public\'')
-				.andWhere('note.fileIds != \'{}\'')
-				.innerJoinAndSelect('note.user', 'user')
-				.leftJoinAndSelect('note.reply', 'reply')
-				.leftJoinAndSelect('note.renote', 'renote')
-				.leftJoinAndSelect('reply.user', 'renoteUser');
-
-			if (followingChannels.length > 0) {
-				const followingChannelIds = followingChannels.map(x => x.followeeId);
-
-				query.andWhere(new Brackets(qb => {
-					qb.where('note.channelId IN (:...followingChannelIds)', { followingChannelIds });
-					qb.orWhere('note.channelId IS NULL');
-				}));
-			} else {
-				query.andWhere('note.channelId IS NULL');
-			}
-
-			if (!ps.withReplies) {
-				query.andWhere(new Brackets(qb => {
-					qb.where('note.replyId IS NULL')
-						.orWhere(new Brackets(qb => {
-							qb.where('note.replyId IS NOT NULL')
-								.andWhere('note.replyUserId = note.userId');
-						}));
-				}));
-			}
-
-			if (ps.onlyNsfw) {
-				query.andWhere('note.cw != \'{}\'');
-				query.andWhere('0 < (SELECT COUNT(*) FROM drive_file df WHERE df.id = ANY(note."fileIds") AND df."isSensitive" = TRUE)' );
-			}
-
-			if (ps.onlyFollowees) {
-				query.andWhere(new Brackets(qb => {
-					if (followee.length > 0) {
-						const meOrFolloweeIds = [me.id, ...followee.map(f => f.followeeId)];
-						qb.orWhere('note.userId IN (:...meOrFolloweeIds)', { meOrFolloweeIds: meOrFolloweeIds });
-						qb.orWhere('(note.visibility = \'public\') AND (note.userHost IS NULL) ');
-					} else {
-						qb.
-					}
-				}));
-			}
-
-			this.queryService.generateVisibilityQuery(query, me);
-			this.queryService.generateMutedUserQuery(query, me);
-			this.queryService.generateBlockedUserQuery(query, me);
-			this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
-		});
-	}
-}