From c971edd2dd92410cc807985e869e359133078d16 Mon Sep 17 00:00:00 2001
From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Wed, 17 Jan 2024 09:32:52 +0900
Subject: (style) sticky系フッターのデザイン調整 (#13005)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/channel.vue | 1 +
 packages/frontend/src/pages/tag.vue     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/channel.vue b/packages/frontend/src/pages/channel.vue
index e698098f35..971eca8cae 100644
--- a/packages/frontend/src/pages/channel.vue
+++ b/packages/frontend/src/pages/channel.vue
@@ -268,6 +268,7 @@ definePageMetadata(computed(() => channel.value ? {
 .footer {
 	-webkit-backdrop-filter: var(--blur, blur(15px));
 	backdrop-filter: var(--blur, blur(15px));
+	background: var(--acrylicBg);
 	border-top: solid 0.5px var(--divider);
 }
 
diff --git a/packages/frontend/src/pages/tag.vue b/packages/frontend/src/pages/tag.vue
index 797ab796d2..6037950f73 100644
--- a/packages/frontend/src/pages/tag.vue
+++ b/packages/frontend/src/pages/tag.vue
@@ -65,11 +65,12 @@ definePageMetadata(computed(() => ({
 .footer {
 	-webkit-backdrop-filter: var(--blur, blur(15px));
 	backdrop-filter: var(--blur, blur(15px));
+	background: var(--acrylicBg);
 	border-top: solid 0.5px var(--divider);
 	display: flex;
 }
 
 .button {
-		margin: 0 auto var(--margin) auto;
+	margin: 0 auto;
 }
 </style>
-- 
cgit v1.2.3-freya


From bc5aebe956c975ba1ef1d97bc9c892cf36b44389 Mon Sep 17 00:00:00 2001
From: ikasoba <57828948+ikasoba@users.noreply.github.com>
Date: Wed, 17 Jan 2024 13:26:36 +0900
Subject: enhance(frontend): ページ遷移時にPlayerを閉じるように (#13013)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* なんかできた

* update changelog.md

* onDeactivatedを使うように
---
 CHANGELOG.md                                      | 1 +
 packages/frontend/src/components/MkUrlPreview.vue | 6 +++++-
 packages/frontend/src/index.html                  | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 945b6ac1ad..72cd8fef4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 - Fix: v2023.12.0で追加された「モデレーターがユーザーのアイコンもしくはバナー画像を未設定状態にできる機能」が管理画面上で正しく表示されていない問題を修正
 - Fix: AiScriptの`readline`関数が不正な値を返すことがある問題のv2023.12.0時点での修正がPlay以外に適用されていないのを修正
 - Fix: v2023.12.1で追加された`$[clickable ...]`および`onClickEv`が正しく機能していないのを修正
+- Enhance: ページ遷移時にPlayerを閉じるように
 
 ### Server
 - Enhance: 連合先のレートリミットに引っかかった際にリトライするようになりました
diff --git a/packages/frontend/src/components/MkUrlPreview.vue b/packages/frontend/src/components/MkUrlPreview.vue
index 54f23780c2..2dcb5f226d 100644
--- a/packages/frontend/src/components/MkUrlPreview.vue
+++ b/packages/frontend/src/components/MkUrlPreview.vue
@@ -83,7 +83,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, onUnmounted, ref } from 'vue';
+import { defineAsyncComponent, onDeactivated, onUnmounted, ref } from 'vue';
 import type { summaly } from '@misskey-dev/summaly';
 import { url as local } from '@/config.js';
 import { i18n } from '@/i18n.js';
@@ -131,6 +131,10 @@ const embedId = `embed${Math.random().toString().replace(/\D/, '')}`;
 const tweetHeight = ref(150);
 const unknownUrl = ref(false);
 
+onDeactivated(() => {
+	playerEnabled.value = false;
+});
+
 const requestUrl = new URL(props.url);
 if (!['http:', 'https:'].includes(requestUrl.protocol)) throw new Error('invalid url');
 
diff --git a/packages/frontend/src/index.html b/packages/frontend/src/index.html
index 11555ea18a..f6f1f7c864 100644
--- a/packages/frontend/src/index.html
+++ b/packages/frontend/src/index.html
@@ -22,7 +22,8 @@
 			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;
-			connect-src 'self' localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000 https://newassets.hcaptcha.com;"
+			connect-src 'self' localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000 https://newassets.hcaptcha.com;
+			frame-src *;"
 	/>
 	<meta property="og:site_name" content="[DEV BUILD] Misskey" />
 	<meta name="viewport" content="width=device-width, initial-scale=1">
-- 
cgit v1.2.3-freya


From acab9ccb81842a9836df8d54b9a10cf0b83a2837 Mon Sep 17 00:00:00 2001
From: 1Step621 <86859447+1STEP621@users.noreply.github.com>
Date: Wed, 17 Jan 2024 14:29:24 +0900
Subject: Enhance(frontend): MkCustomEmojiDetailedDialogを調整 (#13015)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* MkEmojiDetailedDialogを調整

* 絵文字ライセンスでMFMを使えるように

* <a> -> <MkLink>

* 入力ボックスでmfmのオートコンプリートを効かせる
---
 .../frontend/src/components/MkCustomEmojiDetailedDialog.vue    | 10 ++++++----
 packages/frontend/src/pages/emoji-edit-dialog.vue              |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/frontend/src/components/MkCustomEmojiDetailedDialog.vue b/packages/frontend/src/components/MkCustomEmojiDetailedDialog.vue
index c53bbca37c..1952369b6d 100644
--- a/packages/frontend/src/components/MkCustomEmojiDetailedDialog.vue
+++ b/packages/frontend/src/components/MkCustomEmojiDetailedDialog.vue
@@ -10,9 +10,9 @@ SPDX-License-Identifier: AGPL-3.0-only
       <MkSpacer>
         <div style="display: flex; flex-direction: column; gap: 1em;">
           <div :class="$style.emojiImgWrapper">
-            <MkCustomEmoji :name="emoji.name" :normal="true" style="height: 100%;"></MkCustomEmoji>
+            <MkCustomEmoji :name="emoji.name" :normal="true" :useOriginalSize="true" style="height: 100%;"></MkCustomEmoji>
           </div>
-          <MkKeyValue>
+          <MkKeyValue :copy="`:${emoji.name}:`">
             <template #key>{{ i18n.ts.name }}</template>
             <template #value>{{ emoji.name }}</template>
           </MkKeyValue>
@@ -41,12 +41,12 @@ SPDX-License-Identifier: AGPL-3.0-only
           </MkKeyValue>
           <MkKeyValue>
             <template #key>{{ i18n.ts.license }}</template>
-            <template #value>{{ emoji.license ?? i18n.ts.none }}</template>
+            <template #value><Mfm :text="emoji.license ?? i18n.ts.none" /></template>
           </MkKeyValue>
           <MkKeyValue :copy="emoji.url">
             <template #key>{{ i18n.ts.emojiUrl }}</template>
             <template #value>
-              <a :href="emoji.url" target="_blank">{{ emoji.url }}</a>
+              <MkLink :url="emoji.url" target="_blank">{{ emoji.url }}</MkLink>
             </template>
           </MkKeyValue>
         </div>
@@ -61,6 +61,7 @@ import { defineProps, shallowRef } from 'vue';
 import { i18n } from '@/i18n.js';
 import MkModalWindow from '@/components/MkModalWindow.vue';
 import MkKeyValue from '@/components/MkKeyValue.vue';
+import MkLink from './MkLink.vue';
 const props = defineProps<{
   emoji: Misskey.entities.EmojiDetailed,
 }>();
@@ -94,6 +95,7 @@ const cancel = () => {
 
 .alias {
   display: inline-block;
+  word-break: break-all;
   padding: 3px 10px;
   background-color: var(--X5);
   border: solid 1px var(--divider);
diff --git a/packages/frontend/src/pages/emoji-edit-dialog.vue b/packages/frontend/src/pages/emoji-edit-dialog.vue
index e00953c1ff..1ef150bc2d 100644
--- a/packages/frontend/src/pages/emoji-edit-dialog.vue
+++ b/packages/frontend/src/pages/emoji-edit-dialog.vue
@@ -44,7 +44,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						{{ i18n.ts.setMultipleBySeparatingWithSpace }}
 					</template>
 				</MkInput>
-				<MkInput v-model="license">
+				<MkInput v-model="license" :mfmAutocomplete="true">
 					<template #label>{{ i18n.ts.license }}</template>
 				</MkInput>
 				<MkFolder>
-- 
cgit v1.2.3-freya


From 8db800ed98a4e8d4309e11d2d0910320e24f7d01 Mon Sep 17 00:00:00 2001
From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Wed, 17 Jan 2024 15:22:07 +0900
Subject: enhance(frontend): チャンネルノートの場合はその前後を見れるように
 (#13019)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* チャンネルノートの場合はその前後を見れるように

* Update Changelog
---
 CHANGELOG.md                         |  1 +
 packages/frontend/src/pages/note.vue | 58 ++++++++++++++++++++++++++----------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72cd8fef4b..36aa3bbae6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
   - 配列の範囲外・非整数のインデックスへの代入が完全禁止になるので注意
 - Enhance: 絵文字ピッカー・オートコンプリートで、完全一致した絵文字を優先的に表示するように
 - Enhance: Playの説明欄にMFMを使えるように
+- Enhance: チャンネルノートの場合は詳細ページからその前後のノートを見れるように
 - Fix: ネイティブモードの絵文字がモノクロにならないように
 - Fix: v2023.12.0で追加された「モデレーターがユーザーのアイコンもしくはバナー画像を未設定状態にできる機能」が管理画面上で正しく表示されていない問題を修正
 - Fix: AiScriptの`readline`関数が不正な値を返すことがある問題のv2023.12.0時点での修正がPlay以外に適用されていないのを修正
diff --git a/packages/frontend/src/pages/note.vue b/packages/frontend/src/pages/note.vue
index 7e353e629c..4c0e9bbb98 100644
--- a/packages/frontend/src/pages/note.vue
+++ b/packages/frontend/src/pages/note.vue
@@ -11,11 +11,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<Transition :name="defaultStore.state.animation ? 'fade' : ''" mode="out-in">
 				<div v-if="note">
 					<div v-if="showNext" class="_margin">
-						<MkNotes class="" :pagination="nextPagination" :noGap="true" :disableAutoLoad="true"/>
+						<MkNotes class="" :pagination="showNext === 'channel' ? nextChannelPagination : nextUserPagination" :noGap="true" :disableAutoLoad="true"/>
 					</div>
 
 					<div class="_margin">
-						<MkButton v-if="!showNext" :class="$style.loadNext" @click="showNext = true"><i class="ti ti-chevron-up"></i></MkButton>
+						<div v-if="!showNext" class="_buttons" :class="$style.loadNext">
+							<MkButton v-if="note.channelId" rounded :class="$style.loadButton" @click="showNext = 'channel'"><i class="ti ti-chevron-up"></i> <i class="ti ti-device-tv"></i></MkButton>
+							<MkButton rounded :class="$style.loadButton" @click="showNext = 'user'"><i class="ti ti-chevron-up"></i> <i class="ti ti-user"></i></MkButton>
+						</div>
 						<div class="_margin _gaps_s">
 							<MkRemoteCaution v-if="note.user.host != null" :href="note.url ?? note.uri"/>
 							<MkNoteDetailed :key="note.id" v-model:note="note" :class="$style.note"/>
@@ -28,11 +31,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 								</MkA>
 							</div>
 						</div>
-						<MkButton v-if="!showPrev" :class="$style.loadPrev" @click="showPrev = true"><i class="ti ti-chevron-down"></i></MkButton>
+						<div v-if="!showPrev" class="_buttons" :class="$style.loadPrev">
+							<MkButton v-if="note.channelId" rounded :class="$style.loadButton" @click="showPrev = 'channel'"><i class="ti ti-chevron-down"></i> <i class="ti ti-device-tv"></i></MkButton>
+							<MkButton rounded :class="$style.loadButton" @click="showPrev = 'user'"><i class="ti ti-chevron-down"></i> <i class="ti ti-user"></i></MkButton>
+						</div>
 					</div>
 
 					<div v-if="showPrev" class="_margin">
-						<MkNotes class="" :pagination="prevPagination" :noGap="true"/>
+						<MkNotes class="" :pagination="showPrev === 'channel' ? prevChannelPagination : prevUserPagination" :noGap="true"/>
 					</div>
 				</div>
 				<MkError v-else-if="error" @retry="fetchNote()"/>
@@ -46,6 +52,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { computed, watch, ref } from 'vue';
 import * as Misskey from 'misskey-js';
+import type { Paging } from '@/components/MkPagination.vue';
 import MkNoteDetailed from '@/components/MkNoteDetailed.vue';
 import MkNotes from '@/components/MkNotes.vue';
 import MkRemoteCaution from '@/components/MkRemoteCaution.vue';
@@ -63,27 +70,46 @@ const props = defineProps<{
 
 const note = ref<null | Misskey.entities.Note>();
 const clips = ref<Misskey.entities.Clip[]>();
-const showPrev = ref(false);
-const showNext = ref(false);
+const showPrev = ref<'user' | 'channel' | false>(false);
+const showNext = ref<'user' | 'channel' | false>(false);
 const error = ref();
 
-const prevPagination = {
-	endpoint: 'users/notes' as const,
+const prevUserPagination: Paging = {
+	endpoint: 'users/notes',
 	limit: 10,
 	params: computed(() => note.value ? ({
 		userId: note.value.userId,
 		untilId: note.value.id,
-	}) : null),
+	}) : undefined),
 };
 
-const nextPagination = {
+const nextUserPagination: Paging = {
 	reversed: true,
-	endpoint: 'users/notes' as const,
+	endpoint: 'users/notes',
 	limit: 10,
 	params: computed(() => note.value ? ({
 		userId: note.value.userId,
 		sinceId: note.value.id,
-	}) : null),
+	}) : undefined),
+};
+
+const prevChannelPagination: Paging = {
+	endpoint: 'channels/timeline',
+	limit: 10,
+	params: computed(() => note.value ? ({
+		channelId: note.value.channelId,
+		untilId: note.value.id,
+	}) : undefined),
+};
+
+const nextChannelPagination: Paging = {
+	reversed: true,
+	endpoint: 'channels/timeline',
+	limit: 10,
+	params: computed(() => note.value ? ({
+		channelId: note.value.channelId,
+		sinceId: note.value.id,
+	}) : undefined),
 };
 
 function fetchNote() {
@@ -139,9 +165,7 @@ definePageMetadata(computed(() => note.value ? {
 
 .loadNext,
 .loadPrev {
-	min-width: 0;
-	margin: 0 auto;
-	border-radius: 999px;
+	justify-content: center;
 }
 
 .loadNext {
@@ -152,6 +176,10 @@ definePageMetadata(computed(() => note.value ? {
 	margin-top: var(--margin);
 }
 
+.loadButton {
+	min-width: 0;
+}
+
 .note {
 	border-radius: var(--radius);
 	background: var(--panel);
-- 
cgit v1.2.3-freya


From bcb4560f0dab9918875d4f97d39046cf53eb1c76 Mon Sep 17 00:00:00 2001
From: FineArchs <133759614+FineArchs@users.noreply.github.com>
Date: Wed, 17 Jan 2024 17:42:19 +0900
Subject: $[border ...]にクリッピング機能を追加 (#13002)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update MkMisskeyFlavoredMarkdown.ts

* Update MkMisskeyFlavoredMarkdown.ts

* Update CHANGELOG.md

* Set clipping as default
---
 CHANGELOG.md                                                         | 1 +
 packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36aa3bbae6..c079b1efb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 - Feat: 音声・映像プレイヤーを追加
 - Feat: 絵文字の詳細ダイアログを追加
 - Feat: 枠線をつけるMFM`$[border.width=1,style=solid,color=fff,radius=0 ...]`を追加
+  - デフォルトで枠線からはみ出る部分が隠されるようにしました。初期と同じ挙動にするには`$[border.noclip`が必要です
 - Enhance: ハッシュタグ入力時に、本文の末尾の行に何も書かれていない場合は新たにスペースを追加しないように
 - Enhance: チャンネルノートのピン留めをノートのメニューからできるように
 - Enhance: 管理者の場合はAPI tokenの発行画面で管理機能に関する権限を付与できるように
diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index f55069200d..b7190f6335 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -266,7 +266,7 @@ export default function(props: MfmProps, context: SetupContext<MfmEvents>) {
 						) b_style = 'solid';
 						const width = parseFloat(token.props.args.width ?? '1');
 						const radius = parseFloat(token.props.args.radius ?? '0');
-						style = `border: ${width}px ${b_style} ${color}; border-radius: ${radius}px`;
+						style = `border: ${width}px ${b_style} ${color}; border-radius: ${radius}px;${token.props.args.noclip ? '' : ' overflow: clip;'}`;
 						break;
 					}
 					case 'ruby': {
-- 
cgit v1.2.3-freya


From 0283142d0e58c3e3d1d7e893dc8217453517bea1 Mon Sep 17 00:00:00 2001
From: a <a@trwnh.com>
Date: Wed, 17 Jan 2024 03:19:20 -0600
Subject: Fix: properly handle cc followers (#13009)

* Fix: properly handle cc followers

Fix #13001

* Update CHANGELOG.md

* Fix syntax error
---
 CHANGELOG.md                                               | 1 +
 packages/backend/src/core/activitypub/ApAudienceService.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c079b1efb3..897a909a04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@
 - Fix: `notes/create`で、`text`が空白文字のみで構成されているか`null`であって、かつ`text`だけであるリクエストに対するレスポンスが400になるように変更
 - Fix: `notes/create`で、`text`が空白文字のみで構成されていてかつリノート、ファイルまたは投票を含んでいるリクエストに対するレスポンスの`text`が`""`から`null`になるように変更
 - Fix: ipv4とipv6の両方が利用可能な環境でallowedPrivateNetworksが設定されていた場合プライベートipの検証ができていなかった問題を修正
+- Fix: properly handle cc followers
 
 ## 2023.12.2
 
diff --git a/packages/backend/src/core/activitypub/ApAudienceService.ts b/packages/backend/src/core/activitypub/ApAudienceService.ts
index 440852bdf3..11fc82e8bc 100644
--- a/packages/backend/src/core/activitypub/ApAudienceService.ts
+++ b/packages/backend/src/core/activitypub/ApAudienceService.ts
@@ -58,7 +58,7 @@ export class ApAudienceService {
 			};
 		}
 
-		if (toGroups.followers.length > 0) {
+		if (toGroups.followers.length > 0 || ccGroups.followers.length > 0) {
 			return {
 				visibility: 'followers',
 				mentionedUsers,
-- 
cgit v1.2.3-freya


From 945d6a2b094565b50bbe46739f7f9084ad703f59 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 17 Jan 2024 20:11:32 +0900
Subject: enhance(drop-and-fusion): ゲームバランスの調整など
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/api/endpoints/bubble-game/register.ts   |  4 +--
 .../frontend/src/pages/drop-and-fusion.game.vue    |  3 +-
 packages/frontend/src/pages/drop-and-fusion.vue    |  4 ++-
 .../frontend/src/scripts/drop-and-fusion-engine.ts | 41 ++++++++++++++--------
 4 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/bubble-game/register.ts b/packages/backend/src/server/api/endpoints/bubble-game/register.ts
index f092d16a70..8eb90fdbf9 100644
--- a/packages/backend/src/server/api/endpoints/bubble-game/register.ts
+++ b/packages/backend/src/server/api/endpoints/bubble-game/register.ts
@@ -63,8 +63,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw new ApiError(meta.errors.invalidSeed);
 			}
 
-			// シードが古すぎる(1時間以上前)のも弾く
-			if (seedDate.getTime() < now.getTime() - 1000 * 60 * 60) {
+			// シードが古すぎる(5時間以上前)のも弾く
+			if (seedDate.getTime() < now.getTime() - 1000 * 60 * 60 * 5) {
 				throw new ApiError(meta.errors.invalidSeed);
 			}
 
diff --git a/packages/frontend/src/pages/drop-and-fusion.game.vue b/packages/frontend/src/pages/drop-and-fusion.game.vue
index a8fa953c38..1fc0c7cd9c 100644
--- a/packages/frontend/src/pages/drop-and-fusion.game.vue
+++ b/packages/frontend/src/pages/drop-and-fusion.game.vue
@@ -496,7 +496,7 @@ const SWEETS_MONOS: FrontendMonoDefinition[] = [{
 }];
 
 const props = defineProps<{
-	gameMode: 'normal' | 'square' | 'yen' | 'sweets';
+	gameMode: 'normal' | 'square' | 'yen' | 'sweets' | 'space';
 	mute: boolean;
 }>();
 
@@ -509,6 +509,7 @@ const monoDefinitions = computed(() => {
 		props.gameMode === 'square' ? SQUARE_MONOS :
 		props.gameMode === 'yen' ? YEN_MONOS :
 		props.gameMode === 'sweets' ? SWEETS_MONOS :
+		props.gameMode === 'space' ? NORAML_MONOS :
 		[] as never;
 });
 
diff --git a/packages/frontend/src/pages/drop-and-fusion.vue b/packages/frontend/src/pages/drop-and-fusion.vue
index 18d3f56ca2..dd3b189c9d 100644
--- a/packages/frontend/src/pages/drop-and-fusion.vue
+++ b/packages/frontend/src/pages/drop-and-fusion.vue
@@ -28,6 +28,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 								<option value="square">SQUARE</option>
 								<option value="yen">YEN</option>
 								<option value="sweets">SWEETS</option>
+								<!--<option value="space">SPACE</option>-->
 							</MkSelect>
 							<MkButton primary gradate large rounded inline @click="start">{{ i18n.ts.start }}</MkButton>
 						</div>
@@ -94,7 +95,7 @@ import MkSelect from '@/components/MkSelect.vue';
 import MkSwitch from '@/components/MkSwitch.vue';
 import { misskeyApiGet } from '@/scripts/misskey-api.js';
 
-const gameMode = ref<'normal' | 'square' | 'yen' | 'sweets'>('normal');
+const gameMode = ref<'normal' | 'square' | 'yen' | 'sweets' | 'space'>('normal');
 const gameStarted = ref(false);
 const mute = ref(false);
 const ranking = ref(null);
@@ -108,6 +109,7 @@ function getScoreUnit(gameMode: string) {
 		gameMode === 'square' ? 'pt' :
 		gameMode === 'yen' ? '円' :
 		gameMode === 'sweets' ? 'kcal' :
+		gameMode === 'space' ? 'pt' :
 		'' as never;
 }
 
diff --git a/packages/frontend/src/scripts/drop-and-fusion-engine.ts b/packages/frontend/src/scripts/drop-and-fusion-engine.ts
index 7c75822a20..b45aa591d1 100644
--- a/packages/frontend/src/scripts/drop-and-fusion-engine.ts
+++ b/packages/frontend/src/scripts/drop-and-fusion-engine.ts
@@ -31,7 +31,7 @@ type Log = {
 	operation: 'surrender';
 };
 
-const NORMAL_BASE_SIZE = 30;
+const NORMAL_BASE_SIZE = 32;
 const NORAML_MONOS: Mono[] = [{
 	id: '9377076d-c980-4d83-bdaf-175bc58275b7',
 	level: 10,
@@ -114,7 +114,7 @@ const NORAML_MONOS: Mono[] = [{
 	dropCandidate: true,
 }];
 
-const YEN_BASE_SIZE = 30;
+const YEN_BASE_SIZE = 32;
 const YEN_SATSU_BASE_SIZE = 70;
 const YEN_MONOS: Mono[] = [{
 	id: '880f9bd9-802f-4135-a7e1-fd0e0331f726',
@@ -1003,7 +1003,7 @@ export class DropAndFusionGame extends EventEmitter<{
 	private tickCallbackQueue: { frame: number; callback: () => void; }[] = [];
 	private overflowCollider: Matter.Body;
 	private isGameOver = false;
-	private gameMode: 'normal' | 'yen' | 'square' | 'sweets';
+	private gameMode: 'normal' | 'yen' | 'square' | 'sweets' | 'space';
 	private rng: () => number;
 	private logs: Log[] = [];
 
@@ -1031,6 +1031,7 @@ export class DropAndFusionGame extends EventEmitter<{
 			case 'yen': return YEN_MONOS;
 			case 'square': return SQUARE_MONOS;
 			case 'sweets': return SWEETS_MONOS;
+			case 'space': return NORAML_MONOS;
 		}
 	}
 
@@ -1071,13 +1072,15 @@ export class DropAndFusionGame extends EventEmitter<{
 		this.getMonoRenderOptions = env.getMonoRenderOptions ?? null;
 		this.rng = seedrandom(env.seed);
 
+		// sweetsモードは重いため
+		const physicsQualityFactor = this.gameMode === 'sweets' ? 4 : this.PHYSICS_QUALITY_FACTOR;
 		this.engine = Matter.Engine.create({
-			constraintIterations: 2 * this.PHYSICS_QUALITY_FACTOR,
-			positionIterations: 6 * this.PHYSICS_QUALITY_FACTOR,
-			velocityIterations: 4 * this.PHYSICS_QUALITY_FACTOR,
+			constraintIterations: 2 * physicsQualityFactor,
+			positionIterations: 6 * physicsQualityFactor,
+			velocityIterations: 4 * physicsQualityFactor,
 			gravity: {
 				x: 0,
-				y: 1,
+				y: this.gameMode === 'space' ? 0.0125 : 1,
 			},
 			timing: {
 				timeScale: 2,
@@ -1092,7 +1095,7 @@ export class DropAndFusionGame extends EventEmitter<{
 			label: '_wall_',
 			isStatic: true,
 			friction: 0.7,
-			slop: 1.0,
+			slop: this.gameMode === 'space' ? 0.01 : 0.7,
 			render: {
 				strokeStyle: 'transparent',
 				fillStyle: 'transparent',
@@ -1130,13 +1133,12 @@ export class DropAndFusionGame extends EventEmitter<{
 	private createBody(mono: Mono, x: number, y: number) {
 		const options: Matter.IBodyDefinition = {
 			label: mono.id,
-			//density: 0.0005,
-			density: ((mono.sizeX + mono.sizeY) / 2) / 1000,
-			restitution: 0.2,
-			frictionAir: 0.01,
-			friction: 0.7,
-			frictionStatic: 5,
-			slop: 1.0,
+			density: this.gameMode === 'space' ? 0.01 : ((mono.sizeX * mono.sizeY) / 10000),
+			restitution: this.gameMode === 'space' ? 0.5 : 0.2,
+			frictionAir: this.gameMode === 'space' ? 0 : 0.01,
+			friction: this.gameMode === 'space' ? 0.5 : 0.7,
+			frictionStatic: this.gameMode === 'space' ? 0 : 5,
+			slop: this.gameMode === 'space' ? 0.01 : 0.7,
 			//mass: 0,
 			render: this.getMonoRenderOptions ? this.getMonoRenderOptions(mono) : undefined,
 		};
@@ -1327,6 +1329,15 @@ export class DropAndFusionGame extends EventEmitter<{
 			operation: 'drop',
 			x: inputX,
 		});
+
+		// add force
+		if (this.gameMode === 'space') {
+			Matter.Body.applyForce(body, body.position, {
+				x: 0,
+				y: (Math.PI * head.mono.sizeX * head.mono.sizeY) / 65536,
+			});
+		}
+
 		Matter.Composite.add(this.engine.world, body);
 
 		this.fusionReadyBodyIds.push(body.id);
-- 
cgit v1.2.3-freya


From 9a40b366a3a54c7a00d6322b4f61ef4aaa167b01 Mon Sep 17 00:00:00 2001
From: FineArchs <133759614+FineArchs@users.noreply.github.com>
Date: Thu, 18 Jan 2024 10:53:29 +0900
Subject: MkCodeにコピーボタンを追加 (#12999)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update MkCode.vue

* Update MkCode.vue

* Update MkCode.vue

* Update MkCode.vue

* Update MkCode.vue

* Update MkCode.vue

* Update MkCode.vue

* Update MkCode.vue

* Update MkCode.vue

* Update MkCode.vue

* Update MkCode.vue

* Update MkCode.vue

* Update MkCode.vue

* Update CHANGELOG.md

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---
 CHANGELOG.md                                |  1 +
 packages/frontend/src/components/MkCode.vue | 56 +++++++++++++++++++++--------
 2 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 897a909a04..9b43319614 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 - Feat: 絵文字の詳細ダイアログを追加
 - Feat: 枠線をつけるMFM`$[border.width=1,style=solid,color=fff,radius=0 ...]`を追加
   - デフォルトで枠線からはみ出る部分が隠されるようにしました。初期と同じ挙動にするには`$[border.noclip`が必要です
+- Enhance: MFM等のコードブロックに全文コピー用のボタンを追加
 - Enhance: ハッシュタグ入力時に、本文の末尾の行に何も書かれていない場合は新たにスペースを追加しないように
 - Enhance: チャンネルノートのピン留めをノートのメニューからできるように
 - Enhance: 管理者の場合はAPI tokenの発行画面で管理機能に関する権限を付与できるように
diff --git a/packages/frontend/src/components/MkCode.vue b/packages/frontend/src/components/MkCode.vue
index 2c016e4d7c..b81afe2920 100644
--- a/packages/frontend/src/components/MkCode.vue
+++ b/packages/frontend/src/components/MkCode.vue
@@ -4,29 +4,36 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<Suspense>
-	<template #fallback>
-		<MkLoading v-if="!inline ?? true"/>
-	</template>
-	<code v-if="inline" :class="$style.codeInlineRoot">{{ code }}</code>
-	<XCode v-else-if="show && lang" :code="code" :lang="lang"/>
-	<pre v-else-if="show" :class="$style.codeBlockFallbackRoot"><code :class="$style.codeBlockFallbackCode">{{ code }}</code></pre>
-	<button v-else :class="$style.codePlaceholderRoot" @click="show = true">
-		<div :class="$style.codePlaceholderContainer">
-			<div><i class="ti ti-code"></i> {{ i18n.ts.code }}</div>
-			<div>{{ i18n.ts.clickToShow }}</div>
-		</div>
+<code v-if="inline" :class="$style.codeInlineRoot">{{ code }}</code>
+<div v-else :class="$style.codeBlockRoot">
+	<button :class="$style.codeBlockCopyButton" class="_button" @click="copy">
+		<i class="ti ti-copy"></i>
 	</button>
-</Suspense>
+	<Suspense>
+		<template #fallback>
+			<MkLoading />
+		</template>
+		<XCode v-if="show && lang" :code="code" :lang="lang"/>
+		<pre v-else-if="show" :class="$style.codeBlockFallbackRoot"><code :class="$style.codeBlockFallbackCode">{{ code }}</code></pre>
+		<button v-else :class="$style.codePlaceholderRoot" @click="show = true">
+			<div :class="$style.codePlaceholderContainer">
+				<div><i class="ti ti-code"></i> {{ i18n.ts.code }}</div>
+				<div>{{ i18n.ts.clickToShow }}</div>
+			</div>
+		</button>
+	</Suspense>
+</div>
 </template>
 
 <script lang="ts" setup>
 import { defineAsyncComponent, ref } from 'vue';
+import * as os from '@/os.js';
 import MkLoading from '@/components/global/MkLoading.vue';
 import { defaultStore } from '@/store.js';
 import { i18n } from '@/i18n.js';
+import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 
-defineProps<{
+const props = defineProps<{
 	code: string;
 	lang?: string;
 	inline?: boolean;
@@ -35,9 +42,30 @@ defineProps<{
 const show = ref(!defaultStore.state.dataSaver.code);
 
 const XCode = defineAsyncComponent(() => import('@/components/MkCode.core.vue'));
+
+function copy() {
+	copyToClipboard(props.code);
+	os.success();
+}
 </script>
 
 <style module lang="scss">
+.codeBlockRoot {
+	position: relative;
+}
+
+.codeBlockCopyButton {
+	color: #D4D4D4;
+	position: absolute;
+	top: 8px;
+	right: 8px;
+	opacity: 0.5;
+
+	&:hover {
+		opacity: 0.8;
+	}
+}
+
 .codeInlineRoot {
 	display: inline-block;
 	font-family: Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace;
-- 
cgit v1.2.3-freya


From 1dcf25c24f4a6ffd6fd8f9c0cc1c6e373d5a967b Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 18 Jan 2024 11:19:43 +0900
Subject: chore(drop-and-fusion): bump version

---
 packages/frontend/src/scripts/drop-and-fusion-engine.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/scripts/drop-and-fusion-engine.ts b/packages/frontend/src/scripts/drop-and-fusion-engine.ts
index b45aa591d1..aef2613065 100644
--- a/packages/frontend/src/scripts/drop-and-fusion-engine.ts
+++ b/packages/frontend/src/scripts/drop-and-fusion-engine.ts
@@ -990,7 +990,7 @@ export class DropAndFusionGame extends EventEmitter<{
 }> {
 	private PHYSICS_QUALITY_FACTOR = 16; // 低いほどパフォーマンスが高いがガタガタして安定しなくなる、逆に高すぎても何故か不安定になる
 	private COMBO_INTERVAL = 60; // frame
-	public readonly GAME_VERSION = 2;
+	public readonly GAME_VERSION = 3;
 	public readonly GAME_WIDTH = 450;
 	public readonly GAME_HEIGHT = 600;
 	public readonly DROP_COOLTIME = 30; // frame
-- 
cgit v1.2.3-freya


From fc7cd636a39a1bc703bce83b71dba78455a76316 Mon Sep 17 00:00:00 2001
From: FineArchs <133759614+FineArchs@users.noreply.github.com>
Date: Thu, 18 Jan 2024 12:16:12 +0900
Subject: refactor: MkCodeをブロックとインラインで別コンポーネント化する
 (#13026)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Create MkCodeInline.vue

* Update MkCode.vue

* Update MkMisskeyFlavoredMarkdown.ts

* Update flash.vue

* Update MkCodeInline.vue
---
 packages/frontend/src/components/MkCode.vue        | 14 +-----------
 packages/frontend/src/components/MkCodeInline.vue  | 26 ++++++++++++++++++++++
 .../components/global/MkMisskeyFlavoredMarkdown.ts |  4 ++--
 packages/frontend/src/pages/flash/flash.vue        |  2 +-
 4 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 packages/frontend/src/components/MkCodeInline.vue

diff --git a/packages/frontend/src/components/MkCode.vue b/packages/frontend/src/components/MkCode.vue
index b81afe2920..251e6ade00 100644
--- a/packages/frontend/src/components/MkCode.vue
+++ b/packages/frontend/src/components/MkCode.vue
@@ -4,8 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<code v-if="inline" :class="$style.codeInlineRoot">{{ code }}</code>
-<div v-else :class="$style.codeBlockRoot">
+<div :class="$style.codeBlockRoot">
 	<button :class="$style.codeBlockCopyButton" class="_button" @click="copy">
 		<i class="ti ti-copy"></i>
 	</button>
@@ -36,7 +35,6 @@ import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 const props = defineProps<{
 	code: string;
 	lang?: string;
-	inline?: boolean;
 }>();
 
 const show = ref(!defaultStore.state.dataSaver.code);
@@ -66,16 +64,6 @@ function copy() {
 	}
 }
 
-.codeInlineRoot {
-	display: inline-block;
-	font-family: Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace;
-	overflow-wrap: anywhere;
-	color: #D4D4D4;
-	background: #1E1E1E;
-	padding: .1em;
-	border-radius: .3em;
-}
-
 .codeBlockFallbackRoot {
 	display: block;
 	overflow-wrap: anywhere;
diff --git a/packages/frontend/src/components/MkCodeInline.vue b/packages/frontend/src/components/MkCodeInline.vue
new file mode 100644
index 0000000000..5340c1fd5f
--- /dev/null
+++ b/packages/frontend/src/components/MkCodeInline.vue
@@ -0,0 +1,26 @@
+<!--
+SPDX-FileCopyrightText: syuilo and other misskey contributors
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<code :class="$style.root">{{ code }}</code>
+</template>
+
+<script lang="ts" setup>
+const props = defineProps<{
+	code: string;
+}>();
+</script>
+
+<style module lang="scss">
+.root {
+	display: inline-block;
+	font-family: Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace;
+	overflow-wrap: anywhere;
+	color: #D4D4D4;
+	background: #1E1E1E;
+	padding: .1em;
+	border-radius: .3em;
+}
+</style>
diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index b7190f6335..9eab855004 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -13,6 +13,7 @@ import MkMention from '@/components/MkMention.vue';
 import MkEmoji from '@/components/global/MkEmoji.vue';
 import MkCustomEmoji from '@/components/global/MkCustomEmoji.vue';
 import MkCode from '@/components/MkCode.vue';
+import MkCodeInline from '@/components/MkCodeInline.vue';
 import MkGoogle from '@/components/MkGoogle.vue';
 import MkSparkle from '@/components/MkSparkle.vue';
 import MkA from '@/components/global/MkA.vue';
@@ -373,10 +374,9 @@ export default function(props: MfmProps, context: SetupContext<MfmEvents>) {
 			}
 
 			case 'inlineCode': {
-				return [h(MkCode, {
+				return [h(MkCodeInline, {
 					key: Math.random(),
 					code: token.props.code,
-					inline: true,
 				})];
 			}
 
diff --git a/packages/frontend/src/pages/flash/flash.vue b/packages/frontend/src/pages/flash/flash.vue
index 4318694d4f..fabbc1c05d 100644
--- a/packages/frontend/src/pages/flash/flash.vue
+++ b/packages/frontend/src/pages/flash/flash.vue
@@ -37,7 +37,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<template #icon><i class="ti ti-code"></i></template>
 					<template #label>{{ i18n.ts._play.viewSource }}</template>
 
-					<MkCode :code="flash.script" lang="is" :inline="false" class="_monospace"/>
+					<MkCode :code="flash.script" lang="is" class="_monospace"/>
 				</MkFolder>
 				<div :class="$style.footer">
 					<Mfm :text="`By @${flash.user.username}`"/>
-- 
cgit v1.2.3-freya


From 67a41c09ae5924ec97237dc7869de579b5f74510 Mon Sep 17 00:00:00 2001
From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Thu, 18 Jan 2024 14:45:11 +0900
Subject: fix(frontend/MediaVideo): 再生シークバーの当たり判定を調整 (#13027)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend/MediaVideo): 再生シークバーの当たり判定を調整

* fix
---
 packages/frontend/src/components/MkMediaAudio.vue | 6 +++---
 packages/frontend/src/components/MkMediaRange.vue | 8 +++++---
 packages/frontend/src/components/MkMediaVideo.vue | 7 +++++--
 packages/frontend/src/filters/hms.ts              | 2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/packages/frontend/src/components/MkMediaAudio.vue b/packages/frontend/src/components/MkMediaAudio.vue
index 75b31b9a49..53fd3b2d55 100644
--- a/packages/frontend/src/components/MkMediaAudio.vue
+++ b/packages/frontend/src/components/MkMediaAudio.vue
@@ -138,7 +138,7 @@ const rangePercent = computed({
 		audioEl.value.currentTime = to * durationMs.value / 1000;
 	},
 });
-const volume = ref(.5);
+const volume = ref(.25);
 const bufferedEnd = ref(0);
 const bufferedDataRatio = computed(() => {
 	if (!audioEl.value) return 0;
@@ -161,7 +161,7 @@ function togglePlayPause() {
 
 function toggleMute() {
 	if (volume.value === 0) {
-		volume.value = .5;
+		volume.value = .25;
 	} else {
 		volume.value = 0;
 	}
@@ -207,7 +207,7 @@ function init() {
 				isActuallyPlaying.value = false;
 				isPlaying.value = false;
 			});
-			
+
 			durationMs.value = audioEl.value.duration * 1000;
 			audioEl.value.addEventListener('durationchange', () => {
 				if (audioEl.value) {
diff --git a/packages/frontend/src/components/MkMediaRange.vue b/packages/frontend/src/components/MkMediaRange.vue
index e6303a5c41..a150ae9843 100644
--- a/packages/frontend/src/components/MkMediaRange.vue
+++ b/packages/frontend/src/components/MkMediaRange.vue
@@ -5,9 +5,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <!-- Media系専用のinput range -->
 <template>
-<div :class="$style.controlsSeekbar" :style="sliderBgWhite ? '--sliderBg: rgba(255,255,255,.25);' : '--sliderBg: var(--scrollbarHandle);'">
-	<progress v-if="buffer !== undefined" :class="$style.buffer" :value="isNaN(buffer) ? 0 : buffer" min="0" max="1">{{ Math.round(buffer * 100) }}% buffered</progress>
-	<input v-model="model" :class="$style.seek" :style="`--value: ${modelValue * 100}%;`" type="range" min="0" max="1" step="any" @change="emit('dragEnded', modelValue)"/>
+<div :style="sliderBgWhite ? '--sliderBg: rgba(255,255,255,.25);' : '--sliderBg: var(--scrollbarHandle);'">
+	<div :class="$style.controlsSeekbar">
+		<progress v-if="buffer !== undefined" :class="$style.buffer" :value="isNaN(buffer) ? 0 : buffer" min="0" max="1">{{ Math.round(buffer * 100) }}% buffered</progress>
+		<input v-model="model" :class="$style.seek" :style="`--value: ${modelValue * 100}%;`" type="range" min="0" max="1" step="any" @change="emit('dragEnded', modelValue)"/>
+	</div>
 </div>
 </template>
 
diff --git a/packages/frontend/src/components/MkMediaVideo.vue b/packages/frontend/src/components/MkMediaVideo.vue
index 977c9020c7..0a113458a1 100644
--- a/packages/frontend/src/components/MkMediaVideo.vue
+++ b/packages/frontend/src/components/MkMediaVideo.vue
@@ -176,7 +176,7 @@ const rangePercent = computed({
 		videoEl.value.currentTime = to * durationMs.value / 1000;
 	},
 });
-const volume = ref(.5);
+const volume = ref(.25);
 const bufferedEnd = ref(0);
 const bufferedDataRatio = computed(() => {
 	if (!videoEl.value) return 0;
@@ -236,7 +236,7 @@ function toggleFullscreen() {
 
 function toggleMute() {
 	if (volume.value === 0) {
-		volume.value = .5;
+		volume.value = .25;
 	} else {
 		volume.value = 0;
 	}
@@ -535,6 +535,9 @@ onDeactivated(() => {
 
 .seekbarRoot {
 	grid-area: seekbar;
+	/* ▼シークバー操作をやりやすくするためにクリックイベントが伝播されないエリアを拡張する */
+	margin: -10px;
+	padding: 10px;
 }
 
 @container (min-width: 500px) {
diff --git a/packages/frontend/src/filters/hms.ts b/packages/frontend/src/filters/hms.ts
index 7b5da965ff..73db7becc2 100644
--- a/packages/frontend/src/filters/hms.ts
+++ b/packages/frontend/src/filters/hms.ts
@@ -5,7 +5,7 @@
 
 import { i18n } from '@/i18n.js';
 
-export function hms(ms: number, options: {
+export function hms(ms: number, options?: {
 	textFormat?: 'colon' | 'locale';
 	enableSeconds?: boolean;
 	enableMs?: boolean;
-- 
cgit v1.2.3-freya


From c1019a006bfa48ba7398daa02788c50be0bfb35a Mon Sep 17 00:00:00 2001
From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Thu, 18 Jan 2024 18:21:33 +0900
Subject: feat(frontend): 横スワイプでタブを切り替える機能 (#13011)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* (add) 横スワイプでタブを切り替える機能

* Change Changelog

* y方向の移動が一定量を超えたらスワイプを中断するように

* Update swipe distance thresholds

* Remove console.log

* adjust threshold

* rename, use v-model

* fix

* Update MkHorizontalSwipe.vue

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* use css module

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---
 CHANGELOG.md                                       |   1 +
 locales/index.d.ts                                 |   1 +
 locales/ja-JP.yml                                  |   1 +
 .../frontend/src/components/MkHorizontalSwipe.vue  | 209 +++++++++++++++++++++
 packages/frontend/src/pages/about.vue              | 171 ++++++++---------
 packages/frontend/src/pages/announcements.vue      |  57 +++---
 packages/frontend/src/pages/channel.vue            |  84 +++++----
 packages/frontend/src/pages/channels.vue           |  77 ++++----
 packages/frontend/src/pages/drive.file.vue         |  17 +-
 packages/frontend/src/pages/explore.vue            |  11 +-
 packages/frontend/src/pages/flash/flash-index.vue  |  41 ++--
 packages/frontend/src/pages/gallery/index.vue      |  11 +-
 packages/frontend/src/pages/instance-info.vue      | 200 ++++++++++----------
 packages/frontend/src/pages/my-clips/index.vue     |  28 +--
 packages/frontend/src/pages/notifications.vue      |  28 ++-
 packages/frontend/src/pages/pages.vue              |  47 ++---
 packages/frontend/src/pages/search.vue             |  27 +--
 packages/frontend/src/pages/settings/general.vue   |   2 +
 packages/frontend/src/pages/timeline.vue           |  46 ++---
 packages/frontend/src/pages/user/index.vue         |  30 +--
 packages/frontend/src/store.ts                     |   4 +
 21 files changed, 682 insertions(+), 411 deletions(-)
 create mode 100644 packages/frontend/src/components/MkHorizontalSwipe.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b43319614..605b8af92c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 - Feat: 絵文字の詳細ダイアログを追加
 - Feat: 枠線をつけるMFM`$[border.width=1,style=solid,color=fff,radius=0 ...]`を追加
   - デフォルトで枠線からはみ出る部分が隠されるようにしました。初期と同じ挙動にするには`$[border.noclip`が必要です
+- Feat: スワイプでタブを切り替えられるように
 - Enhance: MFM等のコードブロックに全文コピー用のボタンを追加
 - Enhance: ハッシュタグ入力時に、本文の末尾の行に何も書かれていない場合は新たにスペースを追加しないように
 - Enhance: チャンネルノートのピン留めをノートのメニューからできるように
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 71134544d9..a659e790cc 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -1204,6 +1204,7 @@ export interface Locale {
     "ranking": string;
     "lastNDays": string;
     "backToTitle": string;
+    "enableHorizontalSwipe": string;
     "_bubbleGame": {
         "howToPlay": string;
         "_howToPlay": {
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 743a3ca38e..8749a5f49f 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1201,6 +1201,7 @@ replaying: "リプレイ中"
 ranking: "ランキング"
 lastNDays: "直近{n}日"
 backToTitle: "タイトルへ"
+enableHorizontalSwipe: "スワイプしてタブを切り替える"
 
 _bubbleGame:
   howToPlay: "遊び方"
diff --git a/packages/frontend/src/components/MkHorizontalSwipe.vue b/packages/frontend/src/components/MkHorizontalSwipe.vue
new file mode 100644
index 0000000000..2c62aadbf4
--- /dev/null
+++ b/packages/frontend/src/components/MkHorizontalSwipe.vue
@@ -0,0 +1,209 @@
+<!--
+SPDX-FileCopyrightText: syuilo and other misskey contributors
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div
+	ref="rootEl"
+	:class="[$style.transitionRoot, (defaultStore.state.animation && $style.enableAnimation)]"
+	@touchstart="touchStart"
+	@touchmove="touchMove"
+	@touchend="touchEnd"
+>
+	<Transition
+		:class="[$style.transitionChildren, { [$style.swiping]: isSwipingForClass }]"
+		:enterActiveClass="$style.swipeAnimation_enterActive"
+		:leaveActiveClass="$style.swipeAnimation_leaveActive"
+		:enterFromClass="transitionName === 'swipeAnimationLeft' ? $style.swipeAnimationLeft_enterFrom : $style.swipeAnimationRight_enterFrom"
+		:leaveToClass="transitionName === 'swipeAnimationLeft' ? $style.swipeAnimationLeft_leaveTo : $style.swipeAnimationRight_leaveTo"
+		:style="`--swipe: ${pullDistance}px;`"
+	>
+		<!-- 【注意】slot内の最上位要素に動的にkeyを設定すること -->
+		<!-- 各最上位要素にユニークなkeyの指定がないとTransitionがうまく動きません -->
+		<slot></slot>
+	</Transition>
+</div>
+</template>
+<script lang="ts" setup>
+import { ref, shallowRef, computed, nextTick, watch } from 'vue';
+import type { Tab } from '@/components/global/MkPageHeader.tabs.vue';
+import { defaultStore } from '@/store.js';
+
+const rootEl = shallowRef<HTMLDivElement>();
+
+// eslint-disable-next-line no-undef
+const tabModel = defineModel<string>('tab');
+
+const props = defineProps<{
+	tabs: Tab[];
+}>();
+
+const emit = defineEmits<{
+	(ev: 'swiped', newKey: string, direction: 'left' | 'right'): void;
+}>();
+
+// ▼ しきい値 ▼ //
+
+// スワイプと判定される最小の距離
+const MIN_SWIPE_DISTANCE = 50;
+
+// スワイプ時の動作を発火する最小の距離
+const SWIPE_DISTANCE_THRESHOLD = 125;
+
+// スワイプを中断するY方向の移動距離
+const SWIPE_ABORT_Y_THRESHOLD = 75;
+
+// スワイプできる最大の距離
+const MAX_SWIPE_DISTANCE = 150;
+
+// ▲ しきい値 ▲ //
+
+let startScreenX: number | null = null;
+let startScreenY: number | null = null;
+
+const currentTabIndex = computed(() => props.tabs.findIndex(tab => tab.key === tabModel.value));
+
+const pullDistance = ref(0);
+const isSwiping = ref(false);
+const isSwipingForClass = ref(false);
+let swipeAborted = false;
+
+function touchStart(event: TouchEvent) {
+	if (!defaultStore.reactiveState.enableHorizontalSwipe.value) return;
+
+	if (event.touches.length !== 1) return;
+
+	startScreenX = event.touches[0].screenX;
+	startScreenY = event.touches[0].screenY;
+}
+
+function touchMove(event: TouchEvent) {
+	if (!defaultStore.reactiveState.enableHorizontalSwipe.value) return;
+
+	if (event.touches.length !== 1) return;
+
+	if (startScreenX == null || startScreenY == null) return;
+
+	if (swipeAborted) return;
+
+	let distanceX = event.touches[0].screenX - startScreenX;
+	let distanceY = event.touches[0].screenY - startScreenY;
+
+	if (Math.abs(distanceY) > SWIPE_ABORT_Y_THRESHOLD) {
+		swipeAborted = true;
+
+		pullDistance.value = 0;
+		isSwiping.value = false;
+		setTimeout(() => {
+			isSwipingForClass.value = false;
+		}, 400);
+
+		return;
+	}
+
+	if (Math.abs(distanceX) < MIN_SWIPE_DISTANCE) return;
+	if (Math.abs(distanceX) > MAX_SWIPE_DISTANCE) return;
+
+	if (currentTabIndex.value === 0 || props.tabs[currentTabIndex.value - 1].onClick) {
+		distanceX = Math.min(distanceX, 0);
+	}
+	if (currentTabIndex.value === props.tabs.length - 1 || props.tabs[currentTabIndex.value + 1].onClick) {
+		distanceX = Math.max(distanceX, 0);
+	}
+	if (distanceX === 0) return;
+
+	isSwiping.value = true;
+	isSwipingForClass.value = true;
+	nextTick(() => {
+		// グリッチを控えるため、1.5px以上の差がないと更新しない
+		if (Math.abs(distanceX - pullDistance.value) < 1.5) return;
+		pullDistance.value = distanceX;
+	});
+}
+
+function touchEnd(event: TouchEvent) {
+	if (swipeAborted) {
+		swipeAborted = false;
+		return;
+	}
+
+	if (!defaultStore.reactiveState.enableHorizontalSwipe.value) return;
+
+	if (event.touches.length !== 0) return;
+
+	if (startScreenX == null) return;
+
+	if (!isSwiping.value) return;
+
+	const distance = event.changedTouches[0].screenX - startScreenX;
+
+	if (Math.abs(distance) > SWIPE_DISTANCE_THRESHOLD) {
+		if (distance > 0) {
+			if (props.tabs[currentTabIndex.value - 1] && !props.tabs[currentTabIndex.value - 1].onClick) {
+				tabModel.value = props.tabs[currentTabIndex.value - 1].key;
+				emit('swiped', props.tabs[currentTabIndex.value - 1].key, 'right');
+			}
+		} else {
+			if (props.tabs[currentTabIndex.value + 1] && !props.tabs[currentTabIndex.value + 1].onClick) {
+				tabModel.value = props.tabs[currentTabIndex.value + 1].key;
+				emit('swiped', props.tabs[currentTabIndex.value + 1].key, 'left');
+			}
+		}
+	}
+
+	pullDistance.value = 0;
+	isSwiping.value = false;
+	setTimeout(() => {
+		isSwipingForClass.value = false;
+	}, 400);
+}
+
+const transitionName = ref<'swipeAnimationLeft' | 'swipeAnimationRight' | undefined>(undefined);
+
+watch(tabModel, (newTab, oldTab) => {
+	const newIndex = props.tabs.findIndex(tab => tab.key === newTab);
+	const oldIndex = props.tabs.findIndex(tab => tab.key === oldTab);
+
+	if (oldIndex >= 0 && newIndex && oldIndex < newIndex) {
+		transitionName.value = 'swipeAnimationLeft';
+	} else {
+		transitionName.value = 'swipeAnimationRight';
+	}
+
+	window.setTimeout(() => {
+		transitionName.value = undefined;
+	}, 400);
+});
+</script>
+
+<style lang="scss" module>
+.transitionRoot.enableAnimation {
+	display: grid;
+	overflow: clip;
+
+	.transitionChildren {
+		grid-area: 1 / 1 / 2 / 2;
+		transform: translateX(var(--swipe));
+
+		&.swipeAnimation_enterActive,
+		&.swipeAnimation_leaveActive {
+			transition: transform .3s cubic-bezier(0.65, 0.05, 0.36, 1);
+		}
+
+		&.swipeAnimationRight_leaveTo,
+		&.swipeAnimationLeft_enterFrom {
+			transform: translateX(calc(100% + 24px));
+		}
+
+		&.swipeAnimationRight_enterFrom,
+		&.swipeAnimationLeft_leaveTo {
+			transform: translateX(calc(-100% - 24px));
+		}
+	}
+}
+
+.swiping {
+	transition: transform .2s ease-out;
+}
+</style>
diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue
index f402b26ad8..4ba1b6da76 100644
--- a/packages/frontend/src/pages/about.vue
+++ b/packages/frontend/src/pages/about.vue
@@ -6,98 +6,100 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer v-if="tab === 'overview'" :contentMax="600" :marginMin="20">
-		<div class="_gaps_m">
-			<div :class="$style.banner" :style="{ backgroundImage: `url(${ instance.bannerUrl })` }">
-				<div style="overflow: clip;">
-					<img :src="instance.iconUrl ?? instance.faviconUrl ?? '/favicon.ico'" alt="" :class="$style.bannerIcon"/>
-					<div :class="$style.bannerName">
-						<b>{{ instance.name ?? host }}</b>
+	<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
+		<MkSpacer v-if="tab === 'overview'" :contentMax="600" :marginMin="20">
+			<div class="_gaps_m">
+				<div :class="$style.banner" :style="{ backgroundImage: `url(${ instance.bannerUrl })` }">
+					<div style="overflow: clip;">
+						<img :src="instance.iconUrl ?? instance.faviconUrl ?? '/favicon.ico'" alt="" :class="$style.bannerIcon"/>
+						<div :class="$style.bannerName">
+							<b>{{ instance.name ?? host }}</b>
+						</div>
 					</div>
 				</div>
-			</div>
 
-			<MkKeyValue>
-				<template #key>{{ i18n.ts.description }}</template>
-				<template #value><div v-html="instance.description"></div></template>
-			</MkKeyValue>
-
-			<FormSection>
-				<div class="_gaps_m">
-					<MkKeyValue :copy="version">
-						<template #key>Misskey</template>
-						<template #value>{{ version }}</template>
-					</MkKeyValue>
-					<div v-html="i18n.t('poweredByMisskeyDescription', { name: instance.name ?? host })">
-					</div>
-					<FormLink to="/about-misskey">{{ i18n.ts.aboutMisskey }}</FormLink>
-				</div>
-			</FormSection>
-
-			<FormSection>
-				<div class="_gaps_m">
-					<FormSplit>
-						<MkKeyValue>
-							<template #key>{{ i18n.ts.administrator }}</template>
-							<template #value>{{ instance.maintainerName }}</template>
-						</MkKeyValue>
-						<MkKeyValue>
-							<template #key>{{ i18n.ts.contact }}</template>
-							<template #value>{{ instance.maintainerEmail }}</template>
+				<MkKeyValue>
+					<template #key>{{ i18n.ts.description }}</template>
+					<template #value><div v-html="instance.description"></div></template>
+				</MkKeyValue>
+
+				<FormSection>
+					<div class="_gaps_m">
+						<MkKeyValue :copy="version">
+							<template #key>Misskey</template>
+							<template #value>{{ version }}</template>
 						</MkKeyValue>
-					</FormSplit>
-					<FormLink v-if="instance.impressumUrl" :to="instance.impressumUrl" external>{{ i18n.ts.impressum }}</FormLink>
-					<div class="_gaps_s">
-						<MkFolder v-if="instance.serverRules.length > 0">
-							<template #label>{{ i18n.ts.serverRules }}</template>
-
-							<ol class="_gaps_s" :class="$style.rules">
-								<li v-for="item, index in instance.serverRules" :key="index" :class="$style.rule"><div :class="$style.ruleText" v-html="item"></div></li>
-							</ol>
-						</MkFolder>
-						<FormLink v-if="instance.tosUrl" :to="instance.tosUrl" external>{{ i18n.ts.termsOfService }}</FormLink>
-						<FormLink v-if="instance.privacyPolicyUrl" :to="instance.privacyPolicyUrl" external>{{ i18n.ts.privacyPolicy }}</FormLink>
+						<div v-html="i18n.t('poweredByMisskeyDescription', { name: instance.name ?? host })">
+						</div>
+						<FormLink to="/about-misskey">{{ i18n.ts.aboutMisskey }}</FormLink>
 					</div>
-				</div>
-			</FormSection>
+				</FormSection>
 
-			<FormSuspense :p="initStats">
 				<FormSection>
-					<template #label>{{ i18n.ts.statistics }}</template>
-					<FormSplit>
-						<MkKeyValue>
-							<template #key>{{ i18n.ts.users }}</template>
-							<template #value>{{ number(stats.originalUsersCount) }}</template>
-						</MkKeyValue>
-						<MkKeyValue>
-							<template #key>{{ i18n.ts.notes }}</template>
-							<template #value>{{ number(stats.originalNotesCount) }}</template>
-						</MkKeyValue>
-					</FormSplit>
+					<div class="_gaps_m">
+						<FormSplit>
+							<MkKeyValue>
+								<template #key>{{ i18n.ts.administrator }}</template>
+								<template #value>{{ instance.maintainerName }}</template>
+							</MkKeyValue>
+							<MkKeyValue>
+								<template #key>{{ i18n.ts.contact }}</template>
+								<template #value>{{ instance.maintainerEmail }}</template>
+							</MkKeyValue>
+						</FormSplit>
+						<FormLink v-if="instance.impressumUrl" :to="instance.impressumUrl" external>{{ i18n.ts.impressum }}</FormLink>
+						<div class="_gaps_s">
+							<MkFolder v-if="instance.serverRules.length > 0">
+								<template #label>{{ i18n.ts.serverRules }}</template>
+
+								<ol class="_gaps_s" :class="$style.rules">
+									<li v-for="item, index in instance.serverRules" :key="index" :class="$style.rule"><div :class="$style.ruleText" v-html="item"></div></li>
+								</ol>
+							</MkFolder>
+							<FormLink v-if="instance.tosUrl" :to="instance.tosUrl" external>{{ i18n.ts.termsOfService }}</FormLink>
+							<FormLink v-if="instance.privacyPolicyUrl" :to="instance.privacyPolicyUrl" external>{{ i18n.ts.privacyPolicy }}</FormLink>
+						</div>
+					</div>
 				</FormSection>
-			</FormSuspense>
-
-			<FormSection>
-				<template #label>Well-known resources</template>
-				<div class="_gaps_s">
-					<FormLink :to="`/.well-known/host-meta`" external>host-meta</FormLink>
-					<FormLink :to="`/.well-known/host-meta.json`" external>host-meta.json</FormLink>
-					<FormLink :to="`/.well-known/nodeinfo`" external>nodeinfo</FormLink>
-					<FormLink :to="`/robots.txt`" external>robots.txt</FormLink>
-					<FormLink :to="`/manifest.json`" external>manifest.json</FormLink>
-				</div>
-			</FormSection>
-		</div>
-	</MkSpacer>
-	<MkSpacer v-else-if="tab === 'emojis'" :contentMax="1000" :marginMin="20">
-		<XEmojis/>
-	</MkSpacer>
-	<MkSpacer v-else-if="tab === 'federation'" :contentMax="1000" :marginMin="20">
-		<XFederation/>
-	</MkSpacer>
-	<MkSpacer v-else-if="tab === 'charts'" :contentMax="1000" :marginMin="20">
-		<MkInstanceStats/>
-	</MkSpacer>
+
+				<FormSuspense :p="initStats">
+					<FormSection>
+						<template #label>{{ i18n.ts.statistics }}</template>
+						<FormSplit>
+							<MkKeyValue>
+								<template #key>{{ i18n.ts.users }}</template>
+								<template #value>{{ number(stats.originalUsersCount) }}</template>
+							</MkKeyValue>
+							<MkKeyValue>
+								<template #key>{{ i18n.ts.notes }}</template>
+								<template #value>{{ number(stats.originalNotesCount) }}</template>
+							</MkKeyValue>
+						</FormSplit>
+					</FormSection>
+				</FormSuspense>
+
+				<FormSection>
+					<template #label>Well-known resources</template>
+					<div class="_gaps_s">
+						<FormLink :to="`/.well-known/host-meta`" external>host-meta</FormLink>
+						<FormLink :to="`/.well-known/host-meta.json`" external>host-meta.json</FormLink>
+						<FormLink :to="`/.well-known/nodeinfo`" external>nodeinfo</FormLink>
+						<FormLink :to="`/robots.txt`" external>robots.txt</FormLink>
+						<FormLink :to="`/manifest.json`" external>manifest.json</FormLink>
+					</div>
+				</FormSection>
+			</div>
+		</MkSpacer>
+		<MkSpacer v-else-if="tab === 'emojis'" :contentMax="1000" :marginMin="20">
+			<XEmojis/>
+		</MkSpacer>
+		<MkSpacer v-else-if="tab === 'federation'" :contentMax="1000" :marginMin="20">
+			<XFederation/>
+		</MkSpacer>
+		<MkSpacer v-else-if="tab === 'charts'" :contentMax="1000" :marginMin="20">
+			<MkInstanceStats/>
+		</MkSpacer>
+	</MkHorizontalSwipe>
 </MkStickyContainer>
 </template>
 
@@ -114,6 +116,7 @@ import FormSplit from '@/components/form/split.vue';
 import MkFolder from '@/components/MkFolder.vue';
 import MkKeyValue from '@/components/MkKeyValue.vue';
 import MkInstanceStats from '@/components/MkInstanceStats.vue';
+import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import number from '@/filters/number.js';
 import { i18n } from '@/i18n.js';
diff --git a/packages/frontend/src/pages/announcements.vue b/packages/frontend/src/pages/announcements.vue
index 5632bf7caf..c31c6d0903 100644
--- a/packages/frontend/src/pages/announcements.vue
+++ b/packages/frontend/src/pages/announcements.vue
@@ -7,34 +7,36 @@ SPDX-License-Identifier: AGPL-3.0-only
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="800">
-		<div class="_gaps">
-			<MkInfo v-if="$i && $i.hasUnreadAnnouncement && tab === 'current'" warn>{{ i18n.ts.youHaveUnreadAnnouncements }}</MkInfo>
-			<MkPagination ref="paginationEl" :key="tab" v-slot="{items}" :pagination="tab === 'current' ? paginationCurrent : paginationPast" class="_gaps">
-				<section v-for="announcement in items" :key="announcement.id" class="_panel" :class="$style.announcement">
-					<div v-if="announcement.forYou" :class="$style.forYou"><i class="ti ti-pin"></i> {{ i18n.ts.forYou }}</div>
-					<div :class="$style.header">
-						<span v-if="$i && !announcement.silence && !announcement.isRead" style="margin-right: 0.5em;">🆕</span>
-						<span style="margin-right: 0.5em;">
-							<i v-if="announcement.icon === 'info'" class="ti ti-info-circle"></i>
-							<i v-else-if="announcement.icon === 'warning'" class="ti ti-alert-triangle" style="color: var(--warn);"></i>
-							<i v-else-if="announcement.icon === 'error'" class="ti ti-circle-x" style="color: var(--error);"></i>
-							<i v-else-if="announcement.icon === 'success'" class="ti ti-check" style="color: var(--success);"></i>
-						</span>
-						<span>{{ announcement.title }}</span>
-					</div>
-					<div :class="$style.content">
-						<Mfm :text="announcement.text"/>
-						<img v-if="announcement.imageUrl" :src="announcement.imageUrl"/>
-						<div style="opacity: 0.7; font-size: 85%;">
-							<MkTime :time="announcement.updatedAt ?? announcement.createdAt" mode="detail"/>
+		<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
+			<div :key="tab" class="_gaps">
+				<MkInfo v-if="$i && $i.hasUnreadAnnouncement && tab === 'current'" warn>{{ i18n.ts.youHaveUnreadAnnouncements }}</MkInfo>
+				<MkPagination ref="paginationEl" :key="tab" v-slot="{items}" :pagination="tab === 'current' ? paginationCurrent : paginationPast" class="_gaps">
+					<section v-for="announcement in items" :key="announcement.id" class="_panel" :class="$style.announcement">
+						<div v-if="announcement.forYou" :class="$style.forYou"><i class="ti ti-pin"></i> {{ i18n.ts.forYou }}</div>
+						<div :class="$style.header">
+							<span v-if="$i && !announcement.silence && !announcement.isRead" style="margin-right: 0.5em;">🆕</span>
+							<span style="margin-right: 0.5em;">
+								<i v-if="announcement.icon === 'info'" class="ti ti-info-circle"></i>
+								<i v-else-if="announcement.icon === 'warning'" class="ti ti-alert-triangle" style="color: var(--warn);"></i>
+								<i v-else-if="announcement.icon === 'error'" class="ti ti-circle-x" style="color: var(--error);"></i>
+								<i v-else-if="announcement.icon === 'success'" class="ti ti-check" style="color: var(--success);"></i>
+							</span>
+							<span>{{ announcement.title }}</span>
 						</div>
-					</div>
-					<div v-if="tab !== 'past' && $i && !announcement.silence && !announcement.isRead" :class="$style.footer">
-						<MkButton primary @click="read(announcement)"><i class="ti ti-check"></i> {{ i18n.ts.gotIt }}</MkButton>
-					</div>
-				</section>
-			</MkPagination>
-		</div>
+						<div :class="$style.content">
+							<Mfm :text="announcement.text"/>
+							<img v-if="announcement.imageUrl" :src="announcement.imageUrl"/>
+							<div style="opacity: 0.7; font-size: 85%;">
+								<MkTime :time="announcement.updatedAt ?? announcement.createdAt" mode="detail"/>
+							</div>
+						</div>
+						<div v-if="tab !== 'past' && $i && !announcement.silence && !announcement.isRead" :class="$style.footer">
+							<MkButton primary @click="read(announcement)"><i class="ti ti-check"></i> {{ i18n.ts.gotIt }}</MkButton>
+						</div>
+					</section>
+				</MkPagination>
+			</div>
+		</MkHorizontalSwipe>
 	</MkSpacer>
 </MkStickyContainer>
 </template>
@@ -44,6 +46,7 @@ import { ref, computed } from 'vue';
 import MkPagination from '@/components/MkPagination.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkInfo from '@/components/MkInfo.vue';
+import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { i18n } from '@/i18n.js';
diff --git a/packages/frontend/src/pages/channel.vue b/packages/frontend/src/pages/channel.vue
index 971eca8cae..4cdf2eea7d 100644
--- a/packages/frontend/src/pages/channel.vue
+++ b/packages/frontend/src/pages/channel.vue
@@ -7,53 +7,55 @@ SPDX-License-Identifier: AGPL-3.0-only
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="700" :class="$style.main">
-		<div v-if="channel && tab === 'overview'" class="_gaps">
-			<div class="_panel" :class="$style.bannerContainer">
-				<XChannelFollowButton :channel="channel" :full="true" :class="$style.subscribe"/>
-				<MkButton v-if="favorited" v-tooltip="i18n.ts.unfavorite" asLike class="button" rounded primary :class="$style.favorite" @click="unfavorite()"><i class="ti ti-star"></i></MkButton>
-				<MkButton v-else v-tooltip="i18n.ts.favorite" asLike class="button" rounded :class="$style.favorite" @click="favorite()"><i class="ti ti-star"></i></MkButton>
-				<div :style="{ backgroundImage: channel.bannerUrl ? `url(${channel.bannerUrl})` : undefined }" :class="$style.banner">
-					<div :class="$style.bannerStatus">
-						<div><i class="ti ti-users ti-fw"></i><I18n :src="i18n.ts._channel.usersCount" tag="span" style="margin-left: 4px;"><template #n><b>{{ channel.usersCount }}</b></template></I18n></div>
-						<div><i class="ti ti-pencil ti-fw"></i><I18n :src="i18n.ts._channel.notesCount" tag="span" style="margin-left: 4px;"><template #n><b>{{ channel.notesCount }}</b></template></I18n></div>
+		<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
+			<div v-if="channel && tab === 'overview'" key="overview" class="_gaps">
+				<div class="_panel" :class="$style.bannerContainer">
+					<XChannelFollowButton :channel="channel" :full="true" :class="$style.subscribe"/>
+					<MkButton v-if="favorited" v-tooltip="i18n.ts.unfavorite" asLike class="button" rounded primary :class="$style.favorite" @click="unfavorite()"><i class="ti ti-star"></i></MkButton>
+					<MkButton v-else v-tooltip="i18n.ts.favorite" asLike class="button" rounded :class="$style.favorite" @click="favorite()"><i class="ti ti-star"></i></MkButton>
+					<div :style="{ backgroundImage: channel.bannerUrl ? `url(${channel.bannerUrl})` : undefined }" :class="$style.banner">
+						<div :class="$style.bannerStatus">
+							<div><i class="ti ti-users ti-fw"></i><I18n :src="i18n.ts._channel.usersCount" tag="span" style="margin-left: 4px;"><template #n><b>{{ channel.usersCount }}</b></template></I18n></div>
+							<div><i class="ti ti-pencil ti-fw"></i><I18n :src="i18n.ts._channel.notesCount" tag="span" style="margin-left: 4px;"><template #n><b>{{ channel.notesCount }}</b></template></I18n></div>
+						</div>
+						<div v-if="channel.isSensitive" :class="$style.sensitiveIndicator">{{ i18n.ts.sensitive }}</div>
+						<div :class="$style.bannerFade"></div>
+					</div>
+					<div v-if="channel.description" :class="$style.description">
+						<Mfm :text="channel.description" :isNote="false"/>
 					</div>
-					<div v-if="channel.isSensitive" :class="$style.sensitiveIndicator">{{ i18n.ts.sensitive }}</div>
-					<div :class="$style.bannerFade"></div>
-				</div>
-				<div v-if="channel.description" :class="$style.description">
-					<Mfm :text="channel.description" :isNote="false"/>
 				</div>
-			</div>
 
-			<MkFoldableSection>
-				<template #header><i class="ti ti-pin ti-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.pinnedNotes }}</template>
-				<div v-if="channel.pinnedNotes && channel.pinnedNotes.length > 0" class="_gaps">
-					<MkNote v-for="note in channel.pinnedNotes" :key="note.id" class="_panel" :note="note"/>
-				</div>
-			</MkFoldableSection>
-		</div>
-		<div v-if="channel && tab === 'timeline'" class="_gaps">
-			<MkInfo v-if="channel.isArchived" warn>{{ i18n.ts.thisChannelArchived }}</MkInfo>
+				<MkFoldableSection>
+					<template #header><i class="ti ti-pin ti-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.pinnedNotes }}</template>
+					<div v-if="channel.pinnedNotes && channel.pinnedNotes.length > 0" class="_gaps">
+						<MkNote v-for="note in channel.pinnedNotes" :key="note.id" class="_panel" :note="note"/>
+					</div>
+				</MkFoldableSection>
+			</div>
+			<div v-if="channel && tab === 'timeline'" key="timeline" class="_gaps">
+				<MkInfo v-if="channel.isArchived" warn>{{ i18n.ts.thisChannelArchived }}</MkInfo>
 
-			<!-- スマホ・タブレットの場合、キーボードが表示されると投稿が見づらくなるので、デスクトップ場合のみ自動でフォーカスを当てる -->
-			<MkPostForm v-if="$i && defaultStore.reactiveState.showFixedPostFormInChannel.value" :channel="channel" class="post-form _panel" fixed :autofocus="deviceKind === 'desktop'"/>
+				<!-- スマホ・タブレットの場合、キーボードが表示されると投稿が見づらくなるので、デスクトップ場合のみ自動でフォーカスを当てる -->
+				<MkPostForm v-if="$i && defaultStore.reactiveState.showFixedPostFormInChannel.value" :channel="channel" class="post-form _panel" fixed :autofocus="deviceKind === 'desktop'"/>
 
-			<MkTimeline :key="channelId" src="channel" :channel="channelId" @before="before" @after="after" @note="miLocalStorage.setItemAsJson(`channelLastReadedAt:${channel.id}`, Date.now())"/>
-		</div>
-		<div v-else-if="tab === 'featured'">
-			<MkNotes :pagination="featuredPagination"/>
-		</div>
-		<div v-else-if="tab === 'search'">
-			<div class="_gaps">
-				<div>
-					<MkInput v-model="searchQuery" @enter="search()">
-						<template #prefix><i class="ti ti-search"></i></template>
-					</MkInput>
-					<MkButton primary rounded style="margin-top: 8px;" @click="search()">{{ i18n.ts.search }}</MkButton>
+				<MkTimeline :key="channelId" src="channel" :channel="channelId" @before="before" @after="after" @note="miLocalStorage.setItemAsJson(`channelLastReadedAt:${channel.id}`, Date.now())"/>
+			</div>
+			<div v-else-if="tab === 'featured'" key="featured">
+				<MkNotes :pagination="featuredPagination"/>
+			</div>
+			<div v-else-if="tab === 'search'" key="search">
+				<div class="_gaps">
+					<div>
+						<MkInput v-model="searchQuery" @enter="search()">
+							<template #prefix><i class="ti ti-search"></i></template>
+						</MkInput>
+						<MkButton primary rounded style="margin-top: 8px;" @click="search()">{{ i18n.ts.search }}</MkButton>
+					</div>
+					<MkNotes v-if="searchPagination" :key="searchKey" :pagination="searchPagination"/>
 				</div>
-				<MkNotes v-if="searchPagination" :key="searchKey" :pagination="searchPagination"/>
 			</div>
-		</div>
+		</MkHorizontalSwipe>
 	</MkSpacer>
 	<template #footer>
 		<div :class="$style.footer">
@@ -87,6 +89,7 @@ import { defaultStore } from '@/store.js';
 import MkNote from '@/components/MkNote.vue';
 import MkInfo from '@/components/MkInfo.vue';
 import MkFoldableSection from '@/components/MkFoldableSection.vue';
+import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 import { PageHeaderItem } from '@/types/page-header.js';
 import { isSupportShare } from '@/scripts/navigator.js';
 import copyToClipboard from '@/scripts/copy-to-clipboard.js';
@@ -100,6 +103,7 @@ const props = defineProps<{
 }>();
 
 const tab = ref('overview');
+
 const channel = ref<Misskey.entities.Channel | null>(null);
 const favorited = ref(false);
 const searchQuery = ref('');
diff --git a/packages/frontend/src/pages/channels.vue b/packages/frontend/src/pages/channels.vue
index 80a401eee7..0b35ac0ece 100644
--- a/packages/frontend/src/pages/channels.vue
+++ b/packages/frontend/src/pages/channels.vue
@@ -7,44 +7,46 @@ SPDX-License-Identifier: AGPL-3.0-only
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="700">
-		<div v-if="tab === 'search'">
-			<div class="_gaps">
-				<MkInput v-model="searchQuery" :large="true" :autofocus="true" type="search" @enter="search">
-					<template #prefix><i class="ti ti-search"></i></template>
-				</MkInput>
-				<MkRadios v-model="searchType" @update:modelValue="search()">
-					<option value="nameAndDescription">{{ i18n.ts._channel.nameAndDescription }}</option>
-					<option value="nameOnly">{{ i18n.ts._channel.nameOnly }}</option>
-				</MkRadios>
-				<MkButton large primary gradate rounded @click="search">{{ i18n.ts.search }}</MkButton>
+		<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
+			<div v-if="tab === 'search'" key="search">
+				<div class="_gaps">
+					<MkInput v-model="searchQuery" :large="true" :autofocus="true" type="search" @enter="search">
+						<template #prefix><i class="ti ti-search"></i></template>
+					</MkInput>
+					<MkRadios v-model="searchType" @update:modelValue="search()">
+						<option value="nameAndDescription">{{ i18n.ts._channel.nameAndDescription }}</option>
+						<option value="nameOnly">{{ i18n.ts._channel.nameOnly }}</option>
+					</MkRadios>
+					<MkButton large primary gradate rounded @click="search">{{ i18n.ts.search }}</MkButton>
+				</div>
+
+				<MkFoldableSection v-if="channelPagination">
+					<template #header>{{ i18n.ts.searchResult }}</template>
+					<MkChannelList :key="key" :pagination="channelPagination"/>
+				</MkFoldableSection>
 			</div>
-
-			<MkFoldableSection v-if="channelPagination">
-				<template #header>{{ i18n.ts.searchResult }}</template>
-				<MkChannelList :key="key" :pagination="channelPagination"/>
-			</MkFoldableSection>
-		</div>
-		<div v-if="tab === 'featured'">
-			<MkPagination v-slot="{items}" :pagination="featuredPagination">
-				<MkChannelPreview v-for="channel in items" :key="channel.id" class="_margin" :channel="channel"/>
-			</MkPagination>
-		</div>
-		<div v-else-if="tab === 'favorites'">
-			<MkPagination v-slot="{items}" :pagination="favoritesPagination">
-				<MkChannelPreview v-for="channel in items" :key="channel.id" class="_margin" :channel="channel"/>
-			</MkPagination>
-		</div>
-		<div v-else-if="tab === 'following'">
-			<MkPagination v-slot="{items}" :pagination="followingPagination">
-				<MkChannelPreview v-for="channel in items" :key="channel.id" class="_margin" :channel="channel"/>
-			</MkPagination>
-		</div>
-		<div v-else-if="tab === 'owned'">
-			<MkButton class="new" @click="create()"><i class="ti ti-plus"></i></MkButton>
-			<MkPagination v-slot="{items}" :pagination="ownedPagination">
-				<MkChannelPreview v-for="channel in items" :key="channel.id" class="_margin" :channel="channel"/>
-			</MkPagination>
-		</div>
+			<div v-if="tab === 'featured'" key="featured">
+				<MkPagination v-slot="{items}" :pagination="featuredPagination">
+					<MkChannelPreview v-for="channel in items" :key="channel.id" class="_margin" :channel="channel"/>
+				</MkPagination>
+			</div>
+			<div v-else-if="tab === 'favorites'" key="favorites">
+				<MkPagination v-slot="{items}" :pagination="favoritesPagination">
+					<MkChannelPreview v-for="channel in items" :key="channel.id" class="_margin" :channel="channel"/>
+				</MkPagination>
+			</div>
+			<div v-else-if="tab === 'following'" key="following">
+				<MkPagination v-slot="{items}" :pagination="followingPagination">
+					<MkChannelPreview v-for="channel in items" :key="channel.id" class="_margin" :channel="channel"/>
+				</MkPagination>
+			</div>
+			<div v-else-if="tab === 'owned'" key="owned">
+				<MkButton class="new" @click="create()"><i class="ti ti-plus"></i></MkButton>
+				<MkPagination v-slot="{items}" :pagination="ownedPagination">
+					<MkChannelPreview v-for="channel in items" :key="channel.id" class="_margin" :channel="channel"/>
+				</MkPagination>
+			</div>
+		</MkHorizontalSwipe>
 	</MkSpacer>
 </MkStickyContainer>
 </template>
@@ -58,6 +60,7 @@ import MkInput from '@/components/MkInput.vue';
 import MkRadios from '@/components/MkRadios.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkFoldableSection from '@/components/MkFoldableSection.vue';
+import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { i18n } from '@/i18n.js';
 import { useRouter } from '@/global/router/supplier.js';
diff --git a/packages/frontend/src/pages/drive.file.vue b/packages/frontend/src/pages/drive.file.vue
index 2c1e5d20a7..6a9e907963 100644
--- a/packages/frontend/src/pages/drive.file.vue
+++ b/packages/frontend/src/pages/drive.file.vue
@@ -9,13 +9,15 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/>
 	</template>
 
-	<MkSpacer v-if="tab === 'info'" :contentMax="800">
-		<XFileInfo :fileId="fileId"/>
-	</MkSpacer>
-
-	<MkSpacer v-else-if="tab === 'notes'" :contentMax="800">
-		<XNotes :fileId="fileId"/>
-	</MkSpacer>
+	<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
+		<MkSpacer v-if="tab === 'info'" key="info" :contentMax="800">
+			<XFileInfo :fileId="fileId"/>
+		</MkSpacer>
+
+		<MkSpacer v-else-if="tab === 'notes'" key="notes" :contentMax="800">
+			<XNotes :fileId="fileId"/>
+		</MkSpacer>
+	</MkHorizontalSwipe>
 </MkStickyContainer>
 </template>
 
@@ -23,6 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { computed, ref, defineAsyncComponent } from 'vue';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
+import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 
 const props = defineProps<{
 	fileId: string;
diff --git a/packages/frontend/src/pages/explore.vue b/packages/frontend/src/pages/explore.vue
index f068de8880..1b80014366 100644
--- a/packages/frontend/src/pages/explore.vue
+++ b/packages/frontend/src/pages/explore.vue
@@ -6,17 +6,17 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
-	<div>
-		<div v-if="tab === 'featured'">
+	<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
+		<div v-if="tab === 'featured'" key="featured">
 			<XFeatured/>
 		</div>
-		<div v-else-if="tab === 'users'">
+		<div v-else-if="tab === 'users'" key="users">
 			<XUsers/>
 		</div>
-		<div v-else-if="tab === 'roles'">
+		<div v-else-if="tab === 'roles'" key="roles">
 			<XRoles/>
 		</div>
-	</div>
+	</MkHorizontalSwipe>
 </MkStickyContainer>
 </template>
 
@@ -26,6 +26,7 @@ import XFeatured from './explore.featured.vue';
 import XUsers from './explore.users.vue';
 import XRoles from './explore.roles.vue';
 import MkFoldableSection from '@/components/MkFoldableSection.vue';
+import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { i18n } from '@/i18n.js';
 
diff --git a/packages/frontend/src/pages/flash/flash-index.vue b/packages/frontend/src/pages/flash/flash-index.vue
index 7852018894..53510ea232 100644
--- a/packages/frontend/src/pages/flash/flash-index.vue
+++ b/packages/frontend/src/pages/flash/flash-index.vue
@@ -7,32 +7,34 @@ SPDX-License-Identifier: AGPL-3.0-only
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="700">
-		<div v-if="tab === 'featured'">
-			<MkPagination v-slot="{items}" :pagination="featuredFlashsPagination">
-				<div class="_gaps_s">
-					<MkFlashPreview v-for="flash in items" :key="flash.id" :flash="flash"/>
-				</div>
-			</MkPagination>
-		</div>
-
-		<div v-else-if="tab === 'my'">
-			<div class="_gaps">
-				<MkButton gradate rounded style="margin: 0 auto;" @click="create()"><i class="ti ti-plus"></i></MkButton>
-				<MkPagination v-slot="{items}" :pagination="myFlashsPagination">
+		<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
+			<div v-if="tab === 'featured'" key="featured">
+				<MkPagination v-slot="{items}" :pagination="featuredFlashsPagination">
 					<div class="_gaps_s">
 						<MkFlashPreview v-for="flash in items" :key="flash.id" :flash="flash"/>
 					</div>
 				</MkPagination>
 			</div>
-		</div>
 
-		<div v-else-if="tab === 'liked'">
-			<MkPagination v-slot="{items}" :pagination="likedFlashsPagination">
-				<div class="_gaps_s">
-					<MkFlashPreview v-for="like in items" :key="like.flash.id" :flash="like.flash"/>
+			<div v-else-if="tab === 'my'" key="my">
+				<div class="_gaps">
+					<MkButton gradate rounded style="margin: 0 auto;" @click="create()"><i class="ti ti-plus"></i></MkButton>
+					<MkPagination v-slot="{items}" :pagination="myFlashsPagination">
+						<div class="_gaps_s">
+							<MkFlashPreview v-for="flash in items" :key="flash.id" :flash="flash"/>
+						</div>
+					</MkPagination>
 				</div>
-			</MkPagination>
-		</div>
+			</div>
+
+			<div v-else-if="tab === 'liked'" key="liked">
+				<MkPagination v-slot="{items}" :pagination="likedFlashsPagination">
+					<div class="_gaps_s">
+						<MkFlashPreview v-for="like in items" :key="like.flash.id" :flash="like.flash"/>
+					</div>
+				</MkPagination>
+			</div>
+		</MkHorizontalSwipe>
 	</MkSpacer>
 </MkStickyContainer>
 </template>
@@ -42,6 +44,7 @@ import { computed, ref } from 'vue';
 import MkFlashPreview from '@/components/MkFlashPreview.vue';
 import MkPagination from '@/components/MkPagination.vue';
 import MkButton from '@/components/MkButton.vue';
+import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { useRouter } from '@/global/router/supplier.js';
diff --git a/packages/frontend/src/pages/gallery/index.vue b/packages/frontend/src/pages/gallery/index.vue
index 0198ab9700..9749888fe9 100644
--- a/packages/frontend/src/pages/gallery/index.vue
+++ b/packages/frontend/src/pages/gallery/index.vue
@@ -7,8 +7,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="1400">
-		<div class="_root">
-			<div v-if="tab === 'explore'">
+		<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
+			<div v-if="tab === 'explore'" key="explore">
 				<MkFoldableSection class="_margin">
 					<template #header><i class="ti ti-clock"></i>{{ i18n.ts.recentPosts }}</template>
 					<MkPagination v-slot="{items}" :pagination="recentPostsPagination" :disableAutoLoad="true">
@@ -26,14 +26,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</MkPagination>
 				</MkFoldableSection>
 			</div>
-			<div v-else-if="tab === 'liked'">
+			<div v-else-if="tab === 'liked'" key="liked">
 				<MkPagination v-slot="{items}" :pagination="likedPostsPagination">
 					<div :class="$style.items">
 						<MkGalleryPostPreview v-for="like in items" :key="like.id" :post="like.post" class="post"/>
 					</div>
 				</MkPagination>
 			</div>
-			<div v-else-if="tab === 'my'">
+			<div v-else-if="tab === 'my'" key="my">
 				<MkA to="/gallery/new" class="_link" style="margin: 16px;"><i class="ti ti-plus"></i> {{ i18n.ts.postToGallery }}</MkA>
 				<MkPagination v-slot="{items}" :pagination="myPostsPagination">
 					<div :class="$style.items">
@@ -41,7 +41,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</div>
 				</MkPagination>
 			</div>
-		</div>
+		</MkHorizontalSwipe>
 	</MkSpacer>
 </MkStickyContainer>
 </template>
@@ -51,6 +51,7 @@ import { watch, ref, computed } from 'vue';
 import MkFoldableSection from '@/components/MkFoldableSection.vue';
 import MkPagination from '@/components/MkPagination.vue';
 import MkGalleryPostPreview from '@/components/MkGalleryPostPreview.vue';
+import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { i18n } from '@/i18n.js';
 import { useRouter } from '@/global/router/supplier.js';
diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index c8a0eeeeaa..4211dc0d87 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -7,111 +7,113 @@ SPDX-License-Identifier: AGPL-3.0-only
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer v-if="instance" :contentMax="600" :marginMin="16" :marginMax="32">
-		<div v-if="tab === 'overview'" class="_gaps_m">
-			<div class="fnfelxur">
-				<img :src="faviconUrl" alt="" class="icon"/>
-				<span class="name">{{ instance.name || `(${i18n.ts.unknown})` }}</span>
-			</div>
-			<div style="display: flex; flex-direction: column; gap: 1em;">
-				<MkKeyValue :copy="host" oneline>
-					<template #key>Host</template>
-					<template #value><span class="_monospace"><MkLink :url="`https://${host}`">{{ host }}</MkLink></span></template>
-				</MkKeyValue>
-				<MkKeyValue oneline>
-					<template #key>{{ i18n.ts.software }}</template>
-					<template #value><span class="_monospace">{{ instance.softwareName || `(${i18n.ts.unknown})` }} / {{ instance.softwareVersion || `(${i18n.ts.unknown})` }}</span></template>
-				</MkKeyValue>
-				<MkKeyValue oneline>
-					<template #key>{{ i18n.ts.administrator }}</template>
-					<template #value>{{ instance.maintainerName || `(${i18n.ts.unknown})` }} ({{ instance.maintainerEmail || `(${i18n.ts.unknown})` }})</template>
+		<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
+			<div v-if="tab === 'overview'" key="overview" class="_gaps_m">
+				<div class="fnfelxur">
+					<img :src="faviconUrl" alt="" class="icon"/>
+					<span class="name">{{ instance.name || `(${i18n.ts.unknown})` }}</span>
+				</div>
+				<div style="display: flex; flex-direction: column; gap: 1em;">
+					<MkKeyValue :copy="host" oneline>
+						<template #key>Host</template>
+						<template #value><span class="_monospace"><MkLink :url="`https://${host}`">{{ host }}</MkLink></span></template>
+					</MkKeyValue>
+					<MkKeyValue oneline>
+						<template #key>{{ i18n.ts.software }}</template>
+						<template #value><span class="_monospace">{{ instance.softwareName || `(${i18n.ts.unknown})` }} / {{ instance.softwareVersion || `(${i18n.ts.unknown})` }}</span></template>
+					</MkKeyValue>
+					<MkKeyValue oneline>
+						<template #key>{{ i18n.ts.administrator }}</template>
+						<template #value>{{ instance.maintainerName || `(${i18n.ts.unknown})` }} ({{ instance.maintainerEmail || `(${i18n.ts.unknown})` }})</template>
+					</MkKeyValue>
+				</div>
+				<MkKeyValue>
+					<template #key>{{ i18n.ts.description }}</template>
+					<template #value>{{ instance.description }}</template>
 				</MkKeyValue>
-			</div>
-			<MkKeyValue>
-				<template #key>{{ i18n.ts.description }}</template>
-				<template #value>{{ instance.description }}</template>
-			</MkKeyValue>
 
-			<FormSection v-if="iAmModerator">
-				<template #label>Moderation</template>
-				<div class="_gaps_s">
-					<MkSwitch v-model="suspended" :disabled="!instance" @update:modelValue="toggleSuspend">{{ i18n.ts.stopActivityDelivery }}</MkSwitch>
-					<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>
-				</div>
-			</FormSection>
+				<FormSection v-if="iAmModerator">
+					<template #label>Moderation</template>
+					<div class="_gaps_s">
+						<MkSwitch v-model="suspended" :disabled="!instance" @update:modelValue="toggleSuspend">{{ i18n.ts.stopActivityDelivery }}</MkSwitch>
+						<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>
+					</div>
+				</FormSection>
 
-			<FormSection>
-				<MkKeyValue oneline style="margin: 1em 0;">
-					<template #key>{{ i18n.ts.registeredAt }}</template>
-					<template #value><MkTime mode="detail" :time="instance.firstRetrievedAt"/></template>
-				</MkKeyValue>
-				<MkKeyValue oneline style="margin: 1em 0;">
-					<template #key>{{ i18n.ts.updatedAt }}</template>
-					<template #value><MkTime mode="detail" :time="instance.infoUpdatedAt"/></template>
-				</MkKeyValue>
-				<MkKeyValue oneline style="margin: 1em 0;">
-					<template #key>{{ i18n.ts.latestRequestReceivedAt }}</template>
-					<template #value><MkTime v-if="instance.latestRequestReceivedAt" :time="instance.latestRequestReceivedAt"/><span v-else>N/A</span></template>
-				</MkKeyValue>
-			</FormSection>
+				<FormSection>
+					<MkKeyValue oneline style="margin: 1em 0;">
+						<template #key>{{ i18n.ts.registeredAt }}</template>
+						<template #value><MkTime mode="detail" :time="instance.firstRetrievedAt"/></template>
+					</MkKeyValue>
+					<MkKeyValue oneline style="margin: 1em 0;">
+						<template #key>{{ i18n.ts.updatedAt }}</template>
+						<template #value><MkTime mode="detail" :time="instance.infoUpdatedAt"/></template>
+					</MkKeyValue>
+					<MkKeyValue oneline style="margin: 1em 0;">
+						<template #key>{{ i18n.ts.latestRequestReceivedAt }}</template>
+						<template #value><MkTime v-if="instance.latestRequestReceivedAt" :time="instance.latestRequestReceivedAt"/><span v-else>N/A</span></template>
+					</MkKeyValue>
+				</FormSection>
 
-			<FormSection>
-				<MkKeyValue oneline style="margin: 1em 0;">
-					<template #key>Following (Pub)</template>
-					<template #value>{{ number(instance.followingCount) }}</template>
-				</MkKeyValue>
-				<MkKeyValue oneline style="margin: 1em 0;">
-					<template #key>Followers (Sub)</template>
-					<template #value>{{ number(instance.followersCount) }}</template>
-				</MkKeyValue>
-			</FormSection>
+				<FormSection>
+					<MkKeyValue oneline style="margin: 1em 0;">
+						<template #key>Following (Pub)</template>
+						<template #value>{{ number(instance.followingCount) }}</template>
+					</MkKeyValue>
+					<MkKeyValue oneline style="margin: 1em 0;">
+						<template #key>Followers (Sub)</template>
+						<template #value>{{ number(instance.followersCount) }}</template>
+					</MkKeyValue>
+				</FormSection>
 
-			<FormSection>
-				<template #label>Well-known resources</template>
-				<FormLink :to="`https://${host}/.well-known/host-meta`" external style="margin-bottom: 8px;">host-meta</FormLink>
-				<FormLink :to="`https://${host}/.well-known/host-meta.json`" external style="margin-bottom: 8px;">host-meta.json</FormLink>
-				<FormLink :to="`https://${host}/.well-known/nodeinfo`" external style="margin-bottom: 8px;">nodeinfo</FormLink>
-				<FormLink :to="`https://${host}/robots.txt`" external style="margin-bottom: 8px;">robots.txt</FormLink>
-				<FormLink :to="`https://${host}/manifest.json`" external style="margin-bottom: 8px;">manifest.json</FormLink>
-			</FormSection>
-		</div>
-		<div v-else-if="tab === 'chart'" class="_gaps_m">
-			<div class="cmhjzshl">
-				<div class="selects">
-					<MkSelect v-model="chartSrc" style="margin: 0 10px 0 0; flex: 1;">
-						<option value="instance-requests">{{ i18n.ts._instanceCharts.requests }}</option>
-						<option value="instance-users">{{ i18n.ts._instanceCharts.users }}</option>
-						<option value="instance-users-total">{{ i18n.ts._instanceCharts.usersTotal }}</option>
-						<option value="instance-notes">{{ i18n.ts._instanceCharts.notes }}</option>
-						<option value="instance-notes-total">{{ i18n.ts._instanceCharts.notesTotal }}</option>
-						<option value="instance-ff">{{ i18n.ts._instanceCharts.ff }}</option>
-						<option value="instance-ff-total">{{ i18n.ts._instanceCharts.ffTotal }}</option>
-						<option value="instance-drive-usage">{{ i18n.ts._instanceCharts.cacheSize }}</option>
-						<option value="instance-drive-usage-total">{{ i18n.ts._instanceCharts.cacheSizeTotal }}</option>
-						<option value="instance-drive-files">{{ i18n.ts._instanceCharts.files }}</option>
-						<option value="instance-drive-files-total">{{ i18n.ts._instanceCharts.filesTotal }}</option>
-					</MkSelect>
-				</div>
-				<div class="charts">
-					<div class="label">{{ i18n.t('recentNHours', { n: 90 }) }}</div>
-					<MkChart class="chart" :src="chartSrc" span="hour" :limit="90" :args="{ host: host }" :detailed="true"></MkChart>
-					<div class="label">{{ i18n.t('recentNDays', { n: 90 }) }}</div>
-					<MkChart class="chart" :src="chartSrc" span="day" :limit="90" :args="{ host: host }" :detailed="true"></MkChart>
+				<FormSection>
+					<template #label>Well-known resources</template>
+					<FormLink :to="`https://${host}/.well-known/host-meta`" external style="margin-bottom: 8px;">host-meta</FormLink>
+					<FormLink :to="`https://${host}/.well-known/host-meta.json`" external style="margin-bottom: 8px;">host-meta.json</FormLink>
+					<FormLink :to="`https://${host}/.well-known/nodeinfo`" external style="margin-bottom: 8px;">nodeinfo</FormLink>
+					<FormLink :to="`https://${host}/robots.txt`" external style="margin-bottom: 8px;">robots.txt</FormLink>
+					<FormLink :to="`https://${host}/manifest.json`" external style="margin-bottom: 8px;">manifest.json</FormLink>
+				</FormSection>
+			</div>
+			<div v-else-if="tab === 'chart'" key="chart" class="_gaps_m">
+				<div class="cmhjzshl">
+					<div class="selects">
+						<MkSelect v-model="chartSrc" style="margin: 0 10px 0 0; flex: 1;">
+							<option value="instance-requests">{{ i18n.ts._instanceCharts.requests }}</option>
+							<option value="instance-users">{{ i18n.ts._instanceCharts.users }}</option>
+							<option value="instance-users-total">{{ i18n.ts._instanceCharts.usersTotal }}</option>
+							<option value="instance-notes">{{ i18n.ts._instanceCharts.notes }}</option>
+							<option value="instance-notes-total">{{ i18n.ts._instanceCharts.notesTotal }}</option>
+							<option value="instance-ff">{{ i18n.ts._instanceCharts.ff }}</option>
+							<option value="instance-ff-total">{{ i18n.ts._instanceCharts.ffTotal }}</option>
+							<option value="instance-drive-usage">{{ i18n.ts._instanceCharts.cacheSize }}</option>
+							<option value="instance-drive-usage-total">{{ i18n.ts._instanceCharts.cacheSizeTotal }}</option>
+							<option value="instance-drive-files">{{ i18n.ts._instanceCharts.files }}</option>
+							<option value="instance-drive-files-total">{{ i18n.ts._instanceCharts.filesTotal }}</option>
+						</MkSelect>
+					</div>
+					<div class="charts">
+						<div class="label">{{ i18n.t('recentNHours', { n: 90 }) }}</div>
+						<MkChart class="chart" :src="chartSrc" span="hour" :limit="90" :args="{ host: host }" :detailed="true"></MkChart>
+						<div class="label">{{ i18n.t('recentNDays', { n: 90 }) }}</div>
+						<MkChart class="chart" :src="chartSrc" span="day" :limit="90" :args="{ host: host }" :detailed="true"></MkChart>
+					</div>
 				</div>
 			</div>
-		</div>
-		<div v-else-if="tab === 'users'" class="_gaps_m">
-			<MkPagination v-slot="{items}" :pagination="usersPagination" style="display: grid; grid-template-columns: repeat(auto-fill,minmax(270px,1fr)); grid-gap: 12px;">
-				<MkA v-for="user in items" :key="user.id" v-tooltip.mfm="`Last posted: ${dateString(user.updatedAt)}`" class="user" :to="`/admin/user/${user.id}`">
-					<MkUserCardMini :user="user"/>
-				</MkA>
-			</MkPagination>
-		</div>
-		<div v-else-if="tab === 'raw'" class="_gaps_m">
-			<MkObjectView tall :value="instance">
-			</MkObjectView>
-		</div>
+			<div v-else-if="tab === 'users'" key="users" class="_gaps_m">
+				<MkPagination v-slot="{items}" :pagination="usersPagination" style="display: grid; grid-template-columns: repeat(auto-fill,minmax(270px,1fr)); grid-gap: 12px;">
+					<MkA v-for="user in items" :key="user.id" v-tooltip.mfm="`Last posted: ${dateString(user.updatedAt)}`" class="user" :to="`/admin/user/${user.id}`">
+						<MkUserCardMini :user="user"/>
+					</MkA>
+				</MkPagination>
+			</div>
+			<div v-else-if="tab === 'raw'" key="raw" class="_gaps_m">
+				<MkObjectView tall :value="instance">
+				</MkObjectView>
+			</div>
+		</MkHorizontalSwipe>
 	</MkSpacer>
 </MkStickyContainer>
 </template>
@@ -136,6 +138,7 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { i18n } from '@/i18n.js';
 import MkUserCardMini from '@/components/MkUserCardMini.vue';
 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';
 
@@ -144,6 +147,7 @@ const props = defineProps<{
 }>();
 
 const tab = ref('overview');
+
 const chartSrc = ref('instance-requests');
 const meta = ref<Misskey.entities.AdminMetaResponse | null>(null);
 const instance = ref<Misskey.entities.FederationInstance | null>(null);
diff --git a/packages/frontend/src/pages/my-clips/index.vue b/packages/frontend/src/pages/my-clips/index.vue
index 850222708e..468e46838b 100644
--- a/packages/frontend/src/pages/my-clips/index.vue
+++ b/packages/frontend/src/pages/my-clips/index.vue
@@ -7,20 +7,22 @@ SPDX-License-Identifier: AGPL-3.0-only
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="700">
-		<div v-if="tab === 'my'" class="_gaps">
-			<MkButton primary rounded class="add" @click="create"><i class="ti ti-plus"></i> {{ i18n.ts.add }}</MkButton>
-
-			<MkPagination v-slot="{items}" ref="pagingComponent" :pagination="pagination" class="_gaps">
-				<MkA v-for="item in items" :key="item.id" :to="`/clips/${item.id}`">
+		<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
+			<div v-if="tab === 'my'" key="my" class="_gaps">
+				<MkButton primary rounded class="add" @click="create"><i class="ti ti-plus"></i> {{ i18n.ts.add }}</MkButton>
+
+				<MkPagination v-slot="{items}" ref="pagingComponent" :pagination="pagination" class="_gaps">
+					<MkA v-for="item in items" :key="item.id" :to="`/clips/${item.id}`">
+						<MkClipPreview :clip="item"/>
+					</MkA>
+				</MkPagination>
+			</div>
+			<div v-else-if="tab === 'favorites'" key="favorites" class="_gaps">
+				<MkA v-for="item in favorites" :key="item.id" :to="`/clips/${item.id}`">
 					<MkClipPreview :clip="item"/>
 				</MkA>
-			</MkPagination>
-		</div>
-		<div v-else-if="tab === 'favorites'" class="_gaps">
-			<MkA v-for="item in favorites" :key="item.id" :to="`/clips/${item.id}`">
-				<MkClipPreview :clip="item"/>
-			</MkA>
-		</div>
+			</div>
+		</MkHorizontalSwipe>
 	</MkSpacer>
 </MkStickyContainer>
 </template>
@@ -36,6 +38,7 @@ import { misskeyApi } from '@/scripts/misskey-api.js';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { clipsCache } from '@/cache.js';
+import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 
 const pagination = {
 	endpoint: 'clips/list' as const,
@@ -44,6 +47,7 @@ const pagination = {
 };
 
 const tab = ref('my');
+
 const favorites = ref<Misskey.entities.Clip[] | null>(null);
 
 const pagingComponent = shallowRef<InstanceType<typeof MkPagination>>();
diff --git a/packages/frontend/src/pages/notifications.vue b/packages/frontend/src/pages/notifications.vue
index d57bda41b5..8913a89adb 100644
--- a/packages/frontend/src/pages/notifications.vue
+++ b/packages/frontend/src/pages/notifications.vue
@@ -7,15 +7,17 @@ SPDX-License-Identifier: AGPL-3.0-only
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="800">
-		<div v-if="tab === 'all'">
-			<XNotifications class="notifications" :excludeTypes="excludeTypes"/>
-		</div>
-		<div v-else-if="tab === 'mentions'">
-			<MkNotes :pagination="mentionsPagination"/>
-		</div>
-		<div v-else-if="tab === 'directNotes'">
-			<MkNotes :pagination="directNotesPagination"/>
-		</div>
+		<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
+			<div v-if="tab === 'all'" key="all">
+				<XNotifications :class="$style.notifications" :excludeTypes="excludeTypes"/>
+			</div>
+			<div v-else-if="tab === 'mentions'" key="mention">
+				<MkNotes :pagination="mentionsPagination"/>
+			</div>
+			<div v-else-if="tab === 'directNotes'" key="directNotes">
+				<MkNotes :pagination="directNotesPagination"/>
+			</div>
+		</MkHorizontalSwipe>
 	</MkSpacer>
 </MkStickyContainer>
 </template>
@@ -24,6 +26,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { computed, ref } from 'vue';
 import XNotifications from '@/components/MkNotifications.vue';
 import MkNotes from '@/components/MkNotes.vue';
+import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
@@ -96,3 +99,10 @@ definePageMetadata(computed(() => ({
 	icon: 'ti ti-bell',
 })));
 </script>
+
+<style module lang="scss">
+.notifications {
+	border-radius: var(--radius);
+	overflow: clip;
+}
+</style>
diff --git a/packages/frontend/src/pages/pages.vue b/packages/frontend/src/pages/pages.vue
index 22ab9ced09..8b57b1af9f 100644
--- a/packages/frontend/src/pages/pages.vue
+++ b/packages/frontend/src/pages/pages.vue
@@ -7,30 +7,32 @@ SPDX-License-Identifier: AGPL-3.0-only
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="700">
-		<div v-if="tab === 'featured'">
-			<MkPagination v-slot="{items}" :pagination="featuredPagesPagination">
-				<div class="_gaps">
-					<MkPagePreview v-for="page in items" :key="page.id" :page="page"/>
-				</div>
-			</MkPagination>
-		</div>
+		<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
+			<div v-if="tab === 'featured'" key="featured">
+				<MkPagination v-slot="{items}" :pagination="featuredPagesPagination">
+					<div class="_gaps">
+						<MkPagePreview v-for="page in items" :key="page.id" :page="page"/>
+					</div>
+				</MkPagination>
+			</div>
 
-		<div v-else-if="tab === 'my'" class="_gaps">
-			<MkButton class="new" @click="create()"><i class="ti ti-plus"></i></MkButton>
-			<MkPagination v-slot="{items}" :pagination="myPagesPagination">
-				<div class="_gaps">
-					<MkPagePreview v-for="page in items" :key="page.id" :page="page"/>
-				</div>
-			</MkPagination>
-		</div>
+			<div v-else-if="tab === 'my'" key="my" class="_gaps">
+				<MkButton class="new" @click="create()"><i class="ti ti-plus"></i></MkButton>
+				<MkPagination v-slot="{items}" :pagination="myPagesPagination">
+					<div class="_gaps">
+						<MkPagePreview v-for="page in items" :key="page.id" :page="page"/>
+					</div>
+				</MkPagination>
+			</div>
 
-		<div v-else-if="tab === 'liked'">
-			<MkPagination v-slot="{items}" :pagination="likedPagesPagination">
-				<div class="_gaps">
-					<MkPagePreview v-for="like in items" :key="like.page.id" :page="like.page"/>
-				</div>
-			</MkPagination>
-		</div>
+			<div v-else-if="tab === 'liked'" key="liked">
+				<MkPagination v-slot="{items}" :pagination="likedPagesPagination">
+					<div class="_gaps">
+						<MkPagePreview v-for="like in items" :key="like.page.id" :page="like.page"/>
+					</div>
+				</MkPagination>
+			</div>
+		</MkHorizontalSwipe>
 	</MkSpacer>
 </MkStickyContainer>
 </template>
@@ -40,6 +42,7 @@ import { computed, ref } from 'vue';
 import MkPagePreview from '@/components/MkPagePreview.vue';
 import MkPagination from '@/components/MkPagination.vue';
 import MkButton from '@/components/MkButton.vue';
+import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { useRouter } from '@/global/router/supplier.js';
diff --git a/packages/frontend/src/pages/search.vue b/packages/frontend/src/pages/search.vue
index 9d5e5697ce..b68de805cf 100644
--- a/packages/frontend/src/pages/search.vue
+++ b/packages/frontend/src/pages/search.vue
@@ -7,18 +7,20 @@ SPDX-License-Identifier: AGPL-3.0-only
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 
-	<MkSpacer v-if="tab === 'note'" :contentMax="800">
-		<div v-if="notesSearchAvailable">
-			<XNote/>
-		</div>
-		<div v-else>
-			<MkInfo warn>{{ i18n.ts.notesSearchNotAvailable }}</MkInfo>
-		</div>
-	</MkSpacer>
-
-	<MkSpacer v-else-if="tab === 'user'" :contentMax="800">
-		<XUser/>
-	</MkSpacer>
+	<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
+		<MkSpacer v-if="tab === 'note'" key="note" :contentMax="800">
+			<div v-if="notesSearchAvailable">
+				<XNote/>
+			</div>
+			<div v-else>
+				<MkInfo warn>{{ i18n.ts.notesSearchNotAvailable }}</MkInfo>
+			</div>
+		</MkSpacer>
+
+		<MkSpacer v-else-if="tab === 'user'" key="user" :contentMax="800">
+			<XUser/>
+		</MkSpacer>
+	</MkHorizontalSwipe>
 </MkStickyContainer>
 </template>
 
@@ -29,6 +31,7 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { $i } from '@/account.js';
 import { instance } from '@/instance.js';
 import MkInfo from '@/components/MkInfo.vue';
+import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 
 const XNote = defineAsyncComponent(() => import('./search.note.vue'));
 const XUser = defineAsyncComponent(() => import('./search.user.vue'));
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 607aaec521..e52a5ee04f 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -155,6 +155,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkSwitch v-model="enableInfiniteScroll">{{ i18n.ts.enableInfiniteScroll }}</MkSwitch>
 				<MkSwitch v-model="keepScreenOn">{{ i18n.ts.keepScreenOn }}</MkSwitch>
 				<MkSwitch v-model="disableStreamingTimeline">{{ i18n.ts.disableStreamingTimeline }}</MkSwitch>
+				<MkSwitch v-model="enableHorizontalSwipe">{{ i18n.ts.enableHorizontalSwipe }}</MkSwitch>
 			</div>
 			<MkSelect v-model="serverDisconnectedBehavior">
 				<template #label>{{ i18n.ts.whenServerDisconnected }}</template>
@@ -296,6 +297,7 @@ const keepScreenOn = computed(defaultStore.makeGetterSetter('keepScreenOn'));
 const disableStreamingTimeline = computed(defaultStore.makeGetterSetter('disableStreamingTimeline'));
 const useGroupedNotifications = computed(defaultStore.makeGetterSetter('useGroupedNotifications'));
 const enableSeasonalScreenEffect = computed(defaultStore.makeGetterSetter('enableSeasonalScreenEffect'));
+const enableHorizontalSwipe = computed(defaultStore.makeGetterSetter('enableHorizontalSwipe'));
 
 watch(lang, () => {
 	miLocalStorage.setItem('lang', lang.value as string);
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index 6fe8963f51..666a9968b2 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -7,27 +7,28 @@ SPDX-License-Identifier: AGPL-3.0-only
 <MkStickyContainer>
 	<template #header><MkPageHeader v-model:tab="src" :actions="headerActions" :tabs="$i ? headerTabs : headerTabsWhenNotLogin" :displayMyAvatar="true"/></template>
 	<MkSpacer :contentMax="800">
-		<div ref="rootEl" v-hotkey.global="keymap">
-			<MkInfo v-if="['home', 'local', 'social', 'global'].includes(src) && !defaultStore.reactiveState.timelineTutorials.value[src]" style="margin-bottom: var(--margin);" closable @close="closeTutorial()">
-				{{ i18n.ts._timelineDescription[src] }}
-			</MkInfo>
-			<MkPostForm v-if="defaultStore.reactiveState.showFixedPostForm.value" :class="$style.postForm" class="post-form _panel" fixed style="margin-bottom: var(--margin);"/>
-
-			<div v-if="queue > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.newNoteRecived }}</button></div>
-			<div :class="$style.tl">
-				<MkTimeline
-					ref="tlComponent"
-					:key="src + withRenotes + withReplies + onlyFiles"
-					:src="src.split(':')[0]"
-					:list="src.split(':')[1]"
-					:withRenotes="withRenotes"
-					:withReplies="withReplies"
-					:onlyFiles="onlyFiles"
-					:sound="true"
-					@queue="queueUpdated"
-				/>
+		<MkHorizontalSwipe v-model:tab="src" :tabs="$i ? headerTabs : headerTabsWhenNotLogin">
+			<div :key="src + withRenotes + withReplies + onlyFiles" ref="rootEl" v-hotkey.global="keymap">
+				<MkInfo v-if="['home', 'local', 'social', 'global'].includes(src) && !defaultStore.reactiveState.timelineTutorials.value[src]" style="margin-bottom: var(--margin);" closable @close="closeTutorial()">
+					{{ i18n.ts._timelineDescription[src] }}
+				</MkInfo>
+				<MkPostForm v-if="defaultStore.reactiveState.showFixedPostForm.value" :class="$style.postForm" class="post-form _panel" fixed style="margin-bottom: var(--margin);"/>
+				<div v-if="queue > 0" :class="$style.new"><button class="_buttonPrimary" :class="$style.newButton" @click="top()">{{ i18n.ts.newNoteRecived }}</button></div>
+				<div :class="$style.tl">
+					<MkTimeline
+						ref="tlComponent"
+						:key="src + withRenotes + withReplies + onlyFiles"
+						:src="src.split(':')[0]"
+						:list="src.split(':')[1]"
+						:withRenotes="withRenotes"
+						:withReplies="withReplies"
+						:onlyFiles="onlyFiles"
+						:sound="true"
+						@queue="queueUpdated"
+					/>
+				</div>
 			</div>
-		</div>
+		</MkHorizontalSwipe>
 	</MkSpacer>
 </MkStickyContainer>
 </template>
@@ -38,6 +39,7 @@ import type { Tab } from '@/components/global/MkPageHeader.tabs.vue';
 import MkTimeline from '@/components/MkTimeline.vue';
 import MkInfo from '@/components/MkInfo.vue';
 import MkPostForm from '@/components/MkPostForm.vue';
+import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 import { scroll } from '@/scripts/scroll.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
@@ -69,7 +71,9 @@ const withRenotes = ref(true);
 const withReplies = ref($i ? defaultStore.state.tlWithReplies : false);
 const onlyFiles = ref(false);
 
-watch(src, () => queue.value = 0);
+watch(src, () => {
+	queue.value = 0;
+});
 
 watch(withReplies, (x) => {
 	if ($i) defaultStore.set('tlWithReplies', x);
diff --git a/packages/frontend/src/pages/user/index.vue b/packages/frontend/src/pages/user/index.vue
index 95869e7b8c..603f1bef33 100644
--- a/packages/frontend/src/pages/user/index.vue
+++ b/packages/frontend/src/pages/user/index.vue
@@ -8,19 +8,21 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<div>
 		<div v-if="user">
-			<XHome v-if="tab === 'home'" :user="user"/>
-			<MkSpacer v-else-if="tab === 'notes'" :contentMax="800" style="padding-top: 0">
-				<XTimeline :user="user"/>
-			</MkSpacer>
-			<XActivity v-else-if="tab === 'activity'" :user="user"/>
-			<XAchievements v-else-if="tab === 'achievements'" :user="user"/>
-			<XReactions v-else-if="tab === 'reactions'" :user="user"/>
-			<XClips v-else-if="tab === 'clips'" :user="user"/>
-			<XLists v-else-if="tab === 'lists'" :user="user"/>
-			<XPages v-else-if="tab === 'pages'" :user="user"/>
-			<XFlashs v-else-if="tab === 'flashs'" :user="user"/>
-			<XGallery v-else-if="tab === 'gallery'" :user="user"/>
-			<XRaw v-else-if="tab === 'raw'" :user="user"/>
+			<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
+				<XHome v-if="tab === 'home'" key="home" :user="user"/>
+				<MkSpacer v-else-if="tab === 'notes'" key="notes" :contentMax="800" style="padding-top: 0">
+					<XTimeline :user="user"/>
+				</MkSpacer>
+				<XActivity v-else-if="tab === 'activity'" key="activity" :user="user"/>
+				<XAchievements v-else-if="tab === 'achievements'" key="achievements" :user="user"/>
+				<XReactions v-else-if="tab === 'reactions'" key="reactions" :user="user"/>
+				<XClips v-else-if="tab === 'clips'" key="clips" :user="user"/>
+				<XLists v-else-if="tab === 'lists'" key="lists" :user="user"/>
+				<XPages v-else-if="tab === 'pages'" key="pages" :user="user"/>
+				<XFlashs v-else-if="tab === 'flashs'" key="flashs" :user="user"/>
+				<XGallery v-else-if="tab === 'gallery'" key="gallery" :user="user"/>
+				<XRaw v-else-if="tab === 'raw'" key="raw" :user="user"/>
+			</MkHorizontalSwipe>
 		</div>
 		<MkError v-else-if="error" @retry="fetchUser()"/>
 		<MkLoading v-else/>
@@ -36,6 +38,7 @@ import { misskeyApi } from '@/scripts/misskey-api.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { i18n } from '@/i18n.js';
 import { $i } from '@/account.js';
+import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 
 const XHome = defineAsyncComponent(() => import('./home.vue'));
 const XTimeline = defineAsyncComponent(() => import('./index.timeline.vue'));
@@ -57,6 +60,7 @@ const props = withDefaults(defineProps<{
 });
 
 const tab = ref(props.page);
+
 const user = ref<null | Misskey.entities.UserDetailed>(null);
 const error = ref<any>(null);
 
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index e3a85377d8..21b796caa1 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -427,6 +427,10 @@ export const defaultStore = markRaw(new Storage('base', {
 			sfxVolume: 1,
 		},
 	},
+	enableHorizontalSwipe: {
+		where: 'device',
+		default: true,
+	},
 
 	sound_masterVolume: {
 		where: 'device',
-- 
cgit v1.2.3-freya


From 43401210c3691ffd8f8ac78b67bd5898e7981335 Mon Sep 17 00:00:00 2001
From: "Acid Chicken (硫酸鶏)" <root@acid-chicken.com>
Date: Fri, 19 Jan 2024 07:58:07 +0900
Subject: refactor: fully typed locales (#13033)

* refactor: fully typed locales

* refactor: hide parameterized locale strings from type data in ts access

* refactor: missing assertions

* docs: annotation
---
 locales/generateDTS.js                | 195 ++++++++++++++++++++++++-----
 locales/index.d.ts                    | 229 ++++++++++++++++++----------------
 packages/frontend/src/i18n.ts         |   5 +-
 packages/frontend/src/scripts/i18n.ts | 113 ++++++++++++++---
 4 files changed, 380 insertions(+), 162 deletions(-)

diff --git a/locales/generateDTS.js b/locales/generateDTS.js
index d3afdd6e15..6eb5bd630d 100644
--- a/locales/generateDTS.js
+++ b/locales/generateDTS.js
@@ -6,54 +6,171 @@ import ts from 'typescript';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
+const parameterRegExp = /\{(\w+)\}/g;
+
+function createMemberType(item) {
+	if (typeof item !== 'string') {
+		return ts.factory.createTypeLiteralNode(createMembers(item));
+	}
+	const parameters = Array.from(
+		item.matchAll(parameterRegExp),
+		([, parameter]) => parameter,
+	);
+	if (!parameters.length) {
+		return ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
+	}
+	return ts.factory.createTypeReferenceNode(
+		ts.factory.createIdentifier('ParameterizedString'),
+		[
+			ts.factory.createUnionTypeNode(
+				parameters.map((parameter) =>
+					ts.factory.createLiteralTypeNode(
+						ts.factory.createStringLiteral(parameter),
+					),
+				),
+			),
+		],
+	);
+}
 
 function createMembers(record) {
-	return Object.entries(record)
-		.map(([k, v]) => ts.factory.createPropertySignature(
+	return Object.entries(record).map(([k, v]) =>
+		ts.factory.createPropertySignature(
 			undefined,
 			ts.factory.createStringLiteral(k),
 			undefined,
-			typeof v === 'string'
-				? ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
-				: ts.factory.createTypeLiteralNode(createMembers(v)),
-		));
+			createMemberType(v),
+		),
+	);
 }
 
 export default function generateDTS() {
 	const locale = yaml.load(fs.readFileSync(`${__dirname}/ja-JP.yml`, 'utf-8'));
 	const members = createMembers(locale);
 	const elements = [
-		ts.factory.createInterfaceDeclaration(
-			[ts.factory.createToken(ts.SyntaxKind.ExportKeyword)],
-			ts.factory.createIdentifier('Locale'),
-			undefined,
-			undefined,
-			members,
-		),
 		ts.factory.createVariableStatement(
 			[ts.factory.createToken(ts.SyntaxKind.DeclareKeyword)],
 			ts.factory.createVariableDeclarationList(
-				[ts.factory.createVariableDeclaration(
-					ts.factory.createIdentifier('locales'),
+				[
+					ts.factory.createVariableDeclaration(
+						ts.factory.createIdentifier('kParameters'),
+						undefined,
+						ts.factory.createTypeOperatorNode(
+							ts.SyntaxKind.UniqueKeyword,
+							ts.factory.createKeywordTypeNode(ts.SyntaxKind.SymbolKeyword),
+						),
+						undefined,
+					),
+				],
+				ts.NodeFlags.Const,
+			),
+		),
+		ts.factory.createInterfaceDeclaration(
+			[ts.factory.createToken(ts.SyntaxKind.ExportKeyword)],
+			ts.factory.createIdentifier('ParameterizedString'),
+			[
+				ts.factory.createTypeParameterDeclaration(
+					undefined,
+					ts.factory.createIdentifier('T'),
+					ts.factory.createTypeReferenceNode(
+						ts.factory.createIdentifier('string'),
+						undefined,
+					),
+				),
+			],
+			undefined,
+			[
+				ts.factory.createPropertySignature(
+					undefined,
+					ts.factory.createComputedPropertyName(
+						ts.factory.createIdentifier('kParameters'),
+					),
 					undefined,
-					ts.factory.createTypeLiteralNode([ts.factory.createIndexSignature(
+					ts.factory.createTypeReferenceNode(
+						ts.factory.createIdentifier('T'),
 						undefined,
-						[ts.factory.createParameterDeclaration(
+					),
+				),
+			],
+		),
+		ts.factory.createInterfaceDeclaration(
+			[ts.factory.createToken(ts.SyntaxKind.ExportKeyword)],
+			ts.factory.createIdentifier('ILocale'),
+			undefined,
+			undefined,
+			[
+				ts.factory.createIndexSignature(
+					undefined,
+					[
+						ts.factory.createParameterDeclaration(
 							undefined,
 							undefined,
-							ts.factory.createIdentifier('lang'),
+							ts.factory.createIdentifier('_'),
 							undefined,
 							ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
 							undefined,
-						)],
+						),
+					],
+					ts.factory.createUnionTypeNode([
+						ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
 						ts.factory.createTypeReferenceNode(
-							ts.factory.createIdentifier('Locale'),
+							ts.factory.createIdentifier('ParameterizedString'),
+							[ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)],
+						),
+						ts.factory.createTypeReferenceNode(
+							ts.factory.createIdentifier('ILocale'),
 							undefined,
 						),
-					)]),
-					undefined,
-				)],
-				ts.NodeFlags.Const | ts.NodeFlags.Ambient | ts.NodeFlags.ContextFlags,
+					]),
+				),
+			],
+		),
+		ts.factory.createInterfaceDeclaration(
+			[ts.factory.createToken(ts.SyntaxKind.ExportKeyword)],
+			ts.factory.createIdentifier('Locale'),
+			undefined,
+			[
+				ts.factory.createHeritageClause(ts.SyntaxKind.ExtendsKeyword, [
+					ts.factory.createExpressionWithTypeArguments(
+						ts.factory.createIdentifier('ILocale'),
+						undefined,
+					),
+				]),
+			],
+			members,
+		),
+		ts.factory.createVariableStatement(
+			[ts.factory.createToken(ts.SyntaxKind.DeclareKeyword)],
+			ts.factory.createVariableDeclarationList(
+				[
+					ts.factory.createVariableDeclaration(
+						ts.factory.createIdentifier('locales'),
+						undefined,
+						ts.factory.createTypeLiteralNode([
+							ts.factory.createIndexSignature(
+								undefined,
+								[
+									ts.factory.createParameterDeclaration(
+										undefined,
+										undefined,
+										ts.factory.createIdentifier('lang'),
+										undefined,
+										ts.factory.createKeywordTypeNode(
+											ts.SyntaxKind.StringKeyword,
+										),
+										undefined,
+									),
+								],
+								ts.factory.createTypeReferenceNode(
+									ts.factory.createIdentifier('Locale'),
+									undefined,
+								),
+							),
+						]),
+						undefined,
+					),
+				],
+				ts.NodeFlags.Const,
 			),
 		),
 		ts.factory.createFunctionDeclaration(
@@ -70,16 +187,28 @@ export default function generateDTS() {
 		),
 		ts.factory.createExportDefault(ts.factory.createIdentifier('locales')),
 	];
-	const printed = ts.createPrinter({
-		newLine: ts.NewLineKind.LineFeed,
-	}).printList(
-		ts.ListFormat.MultiLine,
-		ts.factory.createNodeArray(elements),
-		ts.createSourceFile('index.d.ts', '', ts.ScriptTarget.ESNext, true, ts.ScriptKind.TS),
-	);
+	const printed = ts
+		.createPrinter({
+			newLine: ts.NewLineKind.LineFeed,
+		})
+		.printList(
+			ts.ListFormat.MultiLine,
+			ts.factory.createNodeArray(elements),
+			ts.createSourceFile(
+				'index.d.ts',
+				'',
+				ts.ScriptTarget.ESNext,
+				true,
+				ts.ScriptKind.TS,
+			),
+		);
 
-	fs.writeFileSync(`${__dirname}/index.d.ts`, `/* eslint-disable */
+	fs.writeFileSync(
+		`${__dirname}/index.d.ts`,
+		`/* eslint-disable */
 // This file is generated by locales/generateDTS.js
 // Do not edit this file directly.
-${printed}`, 'utf-8');
+${printed}`,
+		'utf-8',
+	);
 }
diff --git a/locales/index.d.ts b/locales/index.d.ts
index a659e790cc..a22cb63507 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -1,12 +1,19 @@
 /* eslint-disable */
 // This file is generated by locales/generateDTS.js
 // Do not edit this file directly.
-export interface Locale {
+declare const kParameters: unique symbol;
+export interface ParameterizedString<T extends string> {
+    [kParameters]: T;
+}
+export interface ILocale {
+    [_: string]: string | ParameterizedString<string> | ILocale;
+}
+export interface Locale extends ILocale {
     "_lang_": string;
     "headlineMisskey": string;
     "introMisskey": string;
-    "poweredByMisskeyDescription": string;
-    "monthAndDay": string;
+    "poweredByMisskeyDescription": ParameterizedString<"name">;
+    "monthAndDay": ParameterizedString<"month" | "day">;
     "search": string;
     "notifications": string;
     "username": string;
@@ -18,7 +25,7 @@ export interface Locale {
     "cancel": string;
     "noThankYou": string;
     "enterUsername": string;
-    "renotedBy": string;
+    "renotedBy": ParameterizedString<"user">;
     "noNotes": string;
     "noNotifications": string;
     "instance": string;
@@ -78,8 +85,8 @@ export interface Locale {
     "export": string;
     "files": string;
     "download": string;
-    "driveFileDeleteConfirm": string;
-    "unfollowConfirm": string;
+    "driveFileDeleteConfirm": ParameterizedString<"name">;
+    "unfollowConfirm": ParameterizedString<"name">;
     "exportRequested": string;
     "importRequested": string;
     "lists": string;
@@ -183,9 +190,9 @@ export interface Locale {
     "wallpaper": string;
     "setWallpaper": string;
     "removeWallpaper": string;
-    "searchWith": string;
+    "searchWith": ParameterizedString<"q">;
     "youHaveNoLists": string;
-    "followConfirm": string;
+    "followConfirm": ParameterizedString<"name">;
     "proxyAccount": string;
     "proxyAccountDescription": string;
     "host": string;
@@ -208,7 +215,7 @@ export interface Locale {
     "software": string;
     "version": string;
     "metadata": string;
-    "withNFiles": string;
+    "withNFiles": ParameterizedString<"n">;
     "monitor": string;
     "jobQueue": string;
     "cpuAndMemory": string;
@@ -237,7 +244,7 @@ export interface Locale {
     "processing": string;
     "preview": string;
     "default": string;
-    "defaultValueIs": string;
+    "defaultValueIs": ParameterizedString<"value">;
     "noCustomEmojis": string;
     "noJobs": string;
     "federating": string;
@@ -266,8 +273,8 @@ export interface Locale {
     "imageUrl": string;
     "remove": string;
     "removed": string;
-    "removeAreYouSure": string;
-    "deleteAreYouSure": string;
+    "removeAreYouSure": ParameterizedString<"x">;
+    "deleteAreYouSure": ParameterizedString<"x">;
     "resetAreYouSure": string;
     "areYouSure": string;
     "saved": string;
@@ -285,8 +292,8 @@ export interface Locale {
     "messageRead": string;
     "noMoreHistory": string;
     "startMessaging": string;
-    "nUsersRead": string;
-    "agreeTo": string;
+    "nUsersRead": ParameterizedString<"n">;
+    "agreeTo": ParameterizedString<"0">;
     "agree": string;
     "agreeBelow": string;
     "basicNotesBeforeCreateAccount": string;
@@ -298,7 +305,7 @@ export interface Locale {
     "images": string;
     "image": string;
     "birthday": string;
-    "yearsOld": string;
+    "yearsOld": ParameterizedString<"age">;
     "registeredDate": string;
     "location": string;
     "theme": string;
@@ -353,9 +360,9 @@ export interface Locale {
     "thisYear": string;
     "thisMonth": string;
     "today": string;
-    "dayX": string;
-    "monthX": string;
-    "yearX": string;
+    "dayX": ParameterizedString<"day">;
+    "monthX": ParameterizedString<"month">;
+    "yearX": ParameterizedString<"year">;
     "pages": string;
     "integration": string;
     "connectService": string;
@@ -420,7 +427,7 @@ export interface Locale {
     "recentlyUpdatedUsers": string;
     "recentlyRegisteredUsers": string;
     "recentlyDiscoveredUsers": string;
-    "exploreUsersCount": string;
+    "exploreUsersCount": ParameterizedString<"count">;
     "exploreFediverse": string;
     "popularTags": string;
     "userList": string;
@@ -437,16 +444,16 @@ export interface Locale {
     "moderationNote": string;
     "addModerationNote": string;
     "moderationLogs": string;
-    "nUsersMentioned": string;
+    "nUsersMentioned": ParameterizedString<"n">;
     "securityKeyAndPasskey": string;
     "securityKey": string;
     "lastUsed": string;
-    "lastUsedAt": string;
+    "lastUsedAt": ParameterizedString<"t">;
     "unregister": string;
     "passwordLessLogin": string;
     "passwordLessLoginDescription": string;
     "resetPassword": string;
-    "newPasswordIs": string;
+    "newPasswordIs": ParameterizedString<"password">;
     "reduceUiAnimation": string;
     "share": string;
     "notFound": string;
@@ -466,7 +473,7 @@ export interface Locale {
     "enable": string;
     "next": string;
     "retype": string;
-    "noteOf": string;
+    "noteOf": ParameterizedString<"user">;
     "quoteAttached": string;
     "quoteQuestion": string;
     "noMessagesYet": string;
@@ -486,12 +493,12 @@ export interface Locale {
     "strongPassword": string;
     "passwordMatched": string;
     "passwordNotMatched": string;
-    "signinWith": string;
+    "signinWith": ParameterizedString<"x">;
     "signinFailed": string;
     "or": string;
     "language": string;
     "uiLanguage": string;
-    "aboutX": string;
+    "aboutX": ParameterizedString<"x">;
     "emojiStyle": string;
     "native": string;
     "disableDrawer": string;
@@ -509,7 +516,7 @@ export interface Locale {
     "regenerate": string;
     "fontSize": string;
     "mediaListWithOneImageAppearance": string;
-    "limitTo": string;
+    "limitTo": ParameterizedString<"x">;
     "noFollowRequests": string;
     "openImageInNewTab": string;
     "dashboard": string;
@@ -587,7 +594,7 @@ export interface Locale {
     "deleteAllFiles": string;
     "deleteAllFilesConfirm": string;
     "removeAllFollowing": string;
-    "removeAllFollowingDescription": string;
+    "removeAllFollowingDescription": ParameterizedString<"host">;
     "userSuspended": string;
     "userSilenced": string;
     "yourAccountSuspendedTitle": string;
@@ -658,9 +665,9 @@ export interface Locale {
     "wordMute": string;
     "hardWordMute": string;
     "regexpError": string;
-    "regexpErrorDescription": string;
+    "regexpErrorDescription": ParameterizedString<"tab" | "line">;
     "instanceMute": string;
-    "userSaysSomething": string;
+    "userSaysSomething": ParameterizedString<"name">;
     "makeActive": string;
     "display": string;
     "copy": string;
@@ -686,7 +693,7 @@ export interface Locale {
     "abuseReports": string;
     "reportAbuse": string;
     "reportAbuseRenote": string;
-    "reportAbuseOf": string;
+    "reportAbuseOf": ParameterizedString<"name">;
     "fillAbuseReportDescription": string;
     "abuseReported": string;
     "reporter": string;
@@ -701,7 +708,7 @@ export interface Locale {
     "defaultNavigationBehaviour": string;
     "editTheseSettingsMayBreakAccount": string;
     "instanceTicker": string;
-    "waitingFor": string;
+    "waitingFor": ParameterizedString<"x">;
     "random": string;
     "system": string;
     "switchUi": string;
@@ -711,10 +718,10 @@ export interface Locale {
     "optional": string;
     "createNewClip": string;
     "unclip": string;
-    "confirmToUnclipAlreadyClippedNote": string;
+    "confirmToUnclipAlreadyClippedNote": ParameterizedString<"name">;
     "public": string;
     "private": string;
-    "i18nInfo": string;
+    "i18nInfo": ParameterizedString<"link">;
     "manageAccessTokens": string;
     "accountInfo": string;
     "notesCount": string;
@@ -764,9 +771,9 @@ export interface Locale {
     "needReloadToApply": string;
     "showTitlebar": string;
     "clearCache": string;
-    "onlineUsersCount": string;
-    "nUsers": string;
-    "nNotes": string;
+    "onlineUsersCount": ParameterizedString<"n">;
+    "nUsers": ParameterizedString<"n">;
+    "nNotes": ParameterizedString<"n">;
     "sendErrorReports": string;
     "sendErrorReportsDescription": string;
     "myTheme": string;
@@ -798,7 +805,7 @@ export interface Locale {
     "publish": string;
     "inChannelSearch": string;
     "useReactionPickerForContextMenu": string;
-    "typingUsers": string;
+    "typingUsers": ParameterizedString<"users">;
     "jumpToSpecifiedDate": string;
     "showingPastTimeline": string;
     "clear": string;
@@ -865,7 +872,7 @@ export interface Locale {
     "misskeyUpdated": string;
     "whatIsNew": string;
     "translate": string;
-    "translatedFrom": string;
+    "translatedFrom": ParameterizedString<"x">;
     "accountDeletionInProgress": string;
     "usernameInfo": string;
     "aiChanMode": string;
@@ -896,11 +903,11 @@ export interface Locale {
     "continueThread": string;
     "deleteAccountConfirm": string;
     "incorrectPassword": string;
-    "voteConfirm": string;
+    "voteConfirm": ParameterizedString<"choice">;
     "hide": string;
     "useDrawerReactionPickerForMobile": string;
-    "welcomeBackWithName": string;
-    "clickToFinishEmailVerification": string;
+    "welcomeBackWithName": ParameterizedString<"name">;
+    "clickToFinishEmailVerification": ParameterizedString<"ok">;
     "overridedDeviceKind": string;
     "smartphone": string;
     "tablet": string;
@@ -928,8 +935,8 @@ export interface Locale {
     "cropYes": string;
     "cropNo": string;
     "file": string;
-    "recentNHours": string;
-    "recentNDays": string;
+    "recentNHours": ParameterizedString<"n">;
+    "recentNDays": ParameterizedString<"n">;
     "noEmailServerWarning": string;
     "thereIsUnresolvedAbuseReportWarning": string;
     "recommended": string;
@@ -938,7 +945,7 @@ export interface Locale {
     "driveCapOverrideCaption": string;
     "requireAdminForView": string;
     "isSystemAccount": string;
-    "typeToConfirm": string;
+    "typeToConfirm": ParameterizedString<"x">;
     "deleteAccount": string;
     "document": string;
     "numberOfPageCache": string;
@@ -992,7 +999,7 @@ export interface Locale {
     "neverShow": string;
     "remindMeLater": string;
     "didYouLikeMisskey": string;
-    "pleaseDonate": string;
+    "pleaseDonate": ParameterizedString<"host">;
     "roles": string;
     "role": string;
     "noRole": string;
@@ -1090,7 +1097,7 @@ export interface Locale {
     "preservedUsernamesDescription": string;
     "createNoteFromTheFile": string;
     "archive": string;
-    "channelArchiveConfirmTitle": string;
+    "channelArchiveConfirmTitle": ParameterizedString<"name">;
     "channelArchiveConfirmDescription": string;
     "thisChannelArchived": string;
     "displayOfNote": string;
@@ -1120,8 +1127,8 @@ export interface Locale {
     "createCount": string;
     "inviteCodeCreated": string;
     "inviteLimitExceeded": string;
-    "createLimitRemaining": string;
-    "inviteLimitResetCycle": string;
+    "createLimitRemaining": ParameterizedString<"limit">;
+    "inviteLimitResetCycle": ParameterizedString<"time" | "limit">;
     "expirationDate": string;
     "noExpirationDate": string;
     "inviteCodeUsedAt": string;
@@ -1134,7 +1141,7 @@ export interface Locale {
     "expired": string;
     "doYouAgree": string;
     "beSureToReadThisAsItIsImportant": string;
-    "iHaveReadXCarefullyAndAgree": string;
+    "iHaveReadXCarefullyAndAgree": ParameterizedString<"x">;
     "dialog": string;
     "icon": string;
     "forYou": string;
@@ -1189,7 +1196,7 @@ export interface Locale {
     "doReaction": string;
     "code": string;
     "reloadRequiredToApplySettings": string;
-    "remainingN": string;
+    "remainingN": ParameterizedString<"n">;
     "overwriteContentConfirm": string;
     "seasonalScreenEffect": string;
     "decorate": string;
@@ -1202,7 +1209,7 @@ export interface Locale {
     "replay": string;
     "replaying": string;
     "ranking": string;
-    "lastNDays": string;
+    "lastNDays": ParameterizedString<"n">;
     "backToTitle": string;
     "enableHorizontalSwipe": string;
     "_bubbleGame": {
@@ -1221,7 +1228,7 @@ export interface Locale {
         "end": string;
         "tooManyActiveAnnouncementDescription": string;
         "readConfirmTitle": string;
-        "readConfirmText": string;
+        "readConfirmText": ParameterizedString<"title">;
         "shouldNotBeUsedToPresentPermanentInfo": string;
         "dialogAnnouncementUxWarn": string;
         "silence": string;
@@ -1236,10 +1243,10 @@ export interface Locale {
         "theseSettingsCanEditLater": string;
         "youCanEditMoreSettingsInSettingsPageLater": string;
         "followUsers": string;
-        "pushNotificationDescription": string;
+        "pushNotificationDescription": ParameterizedString<"name">;
         "initialAccountSettingCompleted": string;
-        "haveFun": string;
-        "youCanContinueTutorial": string;
+        "haveFun": ParameterizedString<"name">;
+        "youCanContinueTutorial": ParameterizedString<"name">;
         "startTutorial": string;
         "skipAreYouSure": string;
         "laterAreYouSure": string;
@@ -1277,7 +1284,7 @@ export interface Locale {
             "social": string;
             "global": string;
             "description2": string;
-            "description3": string;
+            "description3": ParameterizedString<"link">;
         };
         "_postNote": {
             "title": string;
@@ -1315,7 +1322,7 @@ export interface Locale {
         };
         "_done": {
             "title": string;
-            "description": string;
+            "description": ParameterizedString<"link">;
         };
     };
     "_timelineDescription": {
@@ -1329,10 +1336,10 @@ export interface Locale {
     };
     "_serverSettings": {
         "iconUrl": string;
-        "appIconDescription": string;
+        "appIconDescription": ParameterizedString<"host">;
         "appIconUsageExample": string;
         "appIconStyleRecommendation": string;
-        "appIconResolutionMustBe": string;
+        "appIconResolutionMustBe": ParameterizedString<"resolution">;
         "manifestJsonOverride": string;
         "shortName": string;
         "shortNameDescription": string;
@@ -1343,7 +1350,7 @@ export interface Locale {
     "_accountMigration": {
         "moveFrom": string;
         "moveFromSub": string;
-        "moveFromLabel": string;
+        "moveFromLabel": ParameterizedString<"n">;
         "moveFromDescription": string;
         "moveTo": string;
         "moveToLabel": string;
@@ -1351,7 +1358,7 @@ export interface Locale {
         "moveAccountDescription": string;
         "moveAccountHowTo": string;
         "startMigration": string;
-        "migrationConfirm": string;
+        "migrationConfirm": ParameterizedString<"account">;
         "movedAndCannotBeUndone": string;
         "postMigrationNote": string;
         "movedTo": string;
@@ -1793,7 +1800,7 @@ export interface Locale {
     "_signup": {
         "almostThere": string;
         "emailAddressInfo": string;
-        "emailSent": string;
+        "emailSent": ParameterizedString<"email">;
     };
     "_accountDelete": {
         "accountDelete": string;
@@ -1846,14 +1853,14 @@ export interface Locale {
         "save": string;
         "inputName": string;
         "cannotSave": string;
-        "nameAlreadyExists": string;
-        "applyConfirm": string;
-        "saveConfirm": string;
-        "deleteConfirm": string;
-        "renameConfirm": string;
+        "nameAlreadyExists": ParameterizedString<"name">;
+        "applyConfirm": ParameterizedString<"name">;
+        "saveConfirm": ParameterizedString<"name">;
+        "deleteConfirm": ParameterizedString<"name">;
+        "renameConfirm": ParameterizedString<"old" | "new">;
         "noBackups": string;
-        "createdAt": string;
-        "updatedAt": string;
+        "createdAt": ParameterizedString<"date" | "time">;
+        "updatedAt": ParameterizedString<"date" | "time">;
         "cannotLoad": string;
         "invalidFile": string;
     };
@@ -1898,8 +1905,8 @@ export interface Locale {
         "featured": string;
         "owned": string;
         "following": string;
-        "usersCount": string;
-        "notesCount": string;
+        "usersCount": ParameterizedString<"n">;
+        "notesCount": ParameterizedString<"n">;
         "nameAndDescription": string;
         "nameOnly": string;
         "allowRenoteToExternal": string;
@@ -1927,7 +1934,7 @@ export interface Locale {
         "manage": string;
         "code": string;
         "description": string;
-        "installed": string;
+        "installed": ParameterizedString<"name">;
         "installedThemes": string;
         "builtinThemes": string;
         "alreadyInstalled": string;
@@ -1950,7 +1957,7 @@ export interface Locale {
         "lighten": string;
         "inputConstantName": string;
         "importInfo": string;
-        "deleteConstantConfirm": string;
+        "deleteConstantConfirm": ParameterizedString<"const">;
         "keys": {
             "accent": string;
             "bg": string;
@@ -2013,23 +2020,23 @@ export interface Locale {
     "_ago": {
         "future": string;
         "justNow": string;
-        "secondsAgo": string;
-        "minutesAgo": string;
-        "hoursAgo": string;
-        "daysAgo": string;
-        "weeksAgo": string;
-        "monthsAgo": string;
-        "yearsAgo": string;
+        "secondsAgo": ParameterizedString<"n">;
+        "minutesAgo": ParameterizedString<"n">;
+        "hoursAgo": ParameterizedString<"n">;
+        "daysAgo": ParameterizedString<"n">;
+        "weeksAgo": ParameterizedString<"n">;
+        "monthsAgo": ParameterizedString<"n">;
+        "yearsAgo": ParameterizedString<"n">;
         "invalid": string;
     };
     "_timeIn": {
-        "seconds": string;
-        "minutes": string;
-        "hours": string;
-        "days": string;
-        "weeks": string;
-        "months": string;
-        "years": string;
+        "seconds": ParameterizedString<"n">;
+        "minutes": ParameterizedString<"n">;
+        "hours": ParameterizedString<"n">;
+        "days": ParameterizedString<"n">;
+        "weeks": ParameterizedString<"n">;
+        "months": ParameterizedString<"n">;
+        "years": ParameterizedString<"n">;
     };
     "_time": {
         "second": string;
@@ -2040,7 +2047,7 @@ export interface Locale {
     "_2fa": {
         "alreadyRegistered": string;
         "registerTOTP": string;
-        "step1": string;
+        "step1": ParameterizedString<"a" | "b">;
         "step2": string;
         "step2Click": string;
         "step2Uri": string;
@@ -2055,7 +2062,7 @@ export interface Locale {
         "securityKeyName": string;
         "tapSecurityKey": string;
         "removeKey": string;
-        "removeKeyConfirm": string;
+        "removeKeyConfirm": ParameterizedString<"name">;
         "whyTOTPOnlyRenew": string;
         "renewTOTP": string;
         "renewTOTPConfirm": string;
@@ -2156,9 +2163,9 @@ export interface Locale {
     };
     "_auth": {
         "shareAccessTitle": string;
-        "shareAccess": string;
+        "shareAccess": ParameterizedString<"name">;
         "shareAccessAsk": string;
-        "permission": string;
+        "permission": ParameterizedString<"name">;
         "permissionAsk": string;
         "pleaseGoBack": string;
         "callback": string;
@@ -2217,12 +2224,12 @@ export interface Locale {
     "_cw": {
         "hide": string;
         "show": string;
-        "chars": string;
-        "files": string;
+        "chars": ParameterizedString<"count">;
+        "files": ParameterizedString<"count">;
     };
     "_poll": {
         "noOnlyOneChoice": string;
-        "choiceN": string;
+        "choiceN": ParameterizedString<"n">;
         "noMore": string;
         "canMultipleVote": string;
         "expiration": string;
@@ -2232,16 +2239,16 @@ export interface Locale {
         "deadlineDate": string;
         "deadlineTime": string;
         "duration": string;
-        "votesCount": string;
-        "totalVotes": string;
+        "votesCount": ParameterizedString<"n">;
+        "totalVotes": ParameterizedString<"n">;
         "vote": string;
         "showResult": string;
         "voted": string;
         "closed": string;
-        "remainingDays": string;
-        "remainingHours": string;
-        "remainingMinutes": string;
-        "remainingSeconds": string;
+        "remainingDays": ParameterizedString<"d" | "h">;
+        "remainingHours": ParameterizedString<"h" | "m">;
+        "remainingMinutes": ParameterizedString<"m" | "s">;
+        "remainingSeconds": ParameterizedString<"s">;
     };
     "_visibility": {
         "public": string;
@@ -2281,7 +2288,7 @@ export interface Locale {
         "changeAvatar": string;
         "changeBanner": string;
         "verifiedLinkDescription": string;
-        "avatarDecorationMax": string;
+        "avatarDecorationMax": ParameterizedString<"max">;
     };
     "_exportOrImport": {
         "allNotes": string;
@@ -2404,16 +2411,16 @@ export interface Locale {
     };
     "_notification": {
         "fileUploaded": string;
-        "youGotMention": string;
-        "youGotReply": string;
-        "youGotQuote": string;
-        "youRenoted": string;
+        "youGotMention": ParameterizedString<"name">;
+        "youGotReply": ParameterizedString<"name">;
+        "youGotQuote": ParameterizedString<"name">;
+        "youRenoted": ParameterizedString<"name">;
         "youWereFollowed": string;
         "youReceivedFollowRequest": string;
         "yourFollowRequestAccepted": string;
         "pollEnded": string;
         "newNote": string;
-        "unreadAntennaNote": string;
+        "unreadAntennaNote": ParameterizedString<"name">;
         "roleAssigned": string;
         "emptyPushNotificationMessage": string;
         "achievementEarned": string;
@@ -2421,9 +2428,9 @@ export interface Locale {
         "checkNotificationBehavior": string;
         "sendTestNotification": string;
         "notificationWillBeDisplayedLikeThis": string;
-        "reactedBySomeUsers": string;
-        "renotedBySomeUsers": string;
-        "followedBySomeUsers": string;
+        "reactedBySomeUsers": ParameterizedString<"n">;
+        "renotedBySomeUsers": ParameterizedString<"n">;
+        "followedBySomeUsers": ParameterizedString<"n">;
         "_types": {
             "all": string;
             "note": string;
@@ -2480,8 +2487,8 @@ export interface Locale {
         };
     };
     "_dialog": {
-        "charactersExceeded": string;
-        "charactersBelow": string;
+        "charactersExceeded": ParameterizedString<"current" | "max">;
+        "charactersBelow": ParameterizedString<"current" | "min">;
     };
     "_disabledTimeline": {
         "title": string;
diff --git a/packages/frontend/src/i18n.ts b/packages/frontend/src/i18n.ts
index 858db74dac..c5c4ccf820 100644
--- a/packages/frontend/src/i18n.ts
+++ b/packages/frontend/src/i18n.ts
@@ -10,6 +10,7 @@ import { I18n } from '@/scripts/i18n.js';
 
 export const i18n = markRaw(new I18n<Locale>(locale));
 
-export function updateI18n(newLocale) {
-	i18n.ts = newLocale;
+export function updateI18n(newLocale: Locale) {
+	// @ts-expect-error -- private field
+	i18n.locale = newLocale;
 }
diff --git a/packages/frontend/src/scripts/i18n.ts b/packages/frontend/src/scripts/i18n.ts
index 8e5f17f38a..55b5371950 100644
--- a/packages/frontend/src/scripts/i18n.ts
+++ b/packages/frontend/src/scripts/i18n.ts
@@ -2,33 +2,114 @@
  * SPDX-FileCopyrightText: syuilo and other misskey contributors
  * SPDX-License-Identifier: AGPL-3.0-only
  */
+import type { ILocale, ParameterizedString } from '../../../../locales/index.js';
 
-export class I18n<T extends Record<string, any>> {
-	public ts: T;
+type FlattenKeys<T extends ILocale, TPrediction> = keyof {
+	[K in keyof T as T[K] extends ILocale
+		? FlattenKeys<T[K], TPrediction> extends infer C extends string
+			? `${K & string}.${C}`
+			: never
+		: T[K] extends TPrediction
+			? K
+			: never]: T[K];
+};
 
-	constructor(locale: T) {
-		this.ts = locale;
+type ParametersOf<T extends ILocale, TKey extends FlattenKeys<T, ParameterizedString<string>>> = T extends ILocale
+	? TKey extends `${infer K}.${infer C}`
+		// @ts-expect-error -- C は明らかに FlattenKeys<T[K], ParameterizedString<string>> になるが、型システムはここでは TKey がドット区切りであることのコンテキストを持たないので、型システムに合法にて示すことはできない。
+		? ParametersOf<T[K], C>
+		: TKey extends keyof T
+			? T[TKey] extends ParameterizedString<infer P>
+				? P
+				: never
+			: never
+	: never;
 
+type Ts<T extends ILocale> = {
+	readonly [K in keyof T as T[K] extends ParameterizedString<string> ? never : K]: T[K] extends ILocale ? Ts<T[K]> : string;
+};
+
+export class I18n<T extends ILocale> {
+	constructor(private locale: T) {
 		//#region BIND
 		this.t = this.t.bind(this);
 		//#endregion
 	}
 
-	// string にしているのは、ドット区切りでのパス指定を許可するため
-	// なるべくこのメソッド使うよりもlocale直接参照の方がvueのキャッシュ効いてパフォーマンスが良いかも
-	public t(key: string, args?: Record<string, string | number>): string {
-		try {
-			let str = key.split('.').reduce((o, i) => o[i], this.ts) as unknown as string;
+	public get ts(): Ts<T> {
+		if (_DEV_) {
+			class Handler<TTarget extends object> implements ProxyHandler<TTarget> {
+				get(target: TTarget, p: string | symbol): unknown {
+					const value = target[p as keyof TTarget];
+
+					if (typeof value === 'object') {
+						// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- 実際には null がくることはないので。
+						return new Proxy(value!, new Handler<TTarget[keyof TTarget] & object>());
+					}
+
+					if (typeof value === 'string') {
+						const parameters = Array.from(value.matchAll(/\{(\w+)\}/g)).map(([, parameter]) => parameter);
+
+						if (parameters.length) {
+							console.error(`Missing locale parameters: ${parameters.join(', ')} at ${String(p)}`);
+						}
+
+						return value;
+					}
+
+					console.error(`Unexpected locale key: ${String(p)}`);
+
+					return p;
+				}
+			}
+
+			return new Proxy(this.locale, new Handler()) as Ts<T>;
+		}
+
+		return this.locale as Ts<T>;
+	}
+
+	/**
+	 * @deprecated なるべくこのメソッド使うよりも locale 直接参照の方が vue のキャッシュ効いてパフォーマンスが良いかも
+	 */
+	public t<TKey extends FlattenKeys<T, string>>(key: TKey): string;
+	public t<TKey extends FlattenKeys<T, ParameterizedString<string>>>(key: TKey, args: { readonly [_ in ParametersOf<T, TKey>]: string | number }): string;
+	public t(key: string, args?: { readonly [_: string]: string | number }) {
+		let str: string | ParameterizedString<string> | ILocale = this.locale;
+
+		for (const k of key.split('.')) {
+			str = str[k];
 
-			if (args) {
-				for (const [k, v] of Object.entries(args)) {
-					str = str.replace(`{${k}}`, v.toString());
+			if (_DEV_) {
+				if (typeof str === 'undefined') {
+					console.error(`Unexpected locale key: ${key}`);
+					return key;
 				}
 			}
-			return str;
-		} catch (err) {
-			console.warn(`missing localization '${key}'`);
-			return key;
 		}
+
+		if (args) {
+			if (_DEV_) {
+				const missing = Array.from((str as string).matchAll(/\{(\w+)\}/g), ([, parameter]) => parameter).filter(parameter => !Object.hasOwn(args, parameter));
+
+				if (missing.length) {
+					console.error(`Missing locale parameters: ${missing.join(', ')} at ${key}`);
+				}
+			}
+
+			for (const [k, v] of Object.entries(args)) {
+				const search = `{${k}}`;
+
+				if (_DEV_) {
+					if (!(str as string).includes(search)) {
+						console.error(`Unexpected locale parameter: ${k} at ${key}`);
+					}
+				}
+
+				str = (str as string).replace(search, v.toString());
+			}
+		}
+
+		return str;
 	}
 }
-- 
cgit v1.2.3-freya


From d85085d16fb6952e742eeca38b98f9442b7ec984 Mon Sep 17 00:00:00 2001
From: "Acid Chicken (硫酸鶏)" <root@acid-chicken.com>
Date: Fri, 19 Jan 2024 11:54:00 +0900
Subject: refactor: style

---
 packages/frontend/src/scripts/i18n.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/scripts/i18n.ts b/packages/frontend/src/scripts/i18n.ts
index 55b5371950..3366f3eac3 100644
--- a/packages/frontend/src/scripts/i18n.ts
+++ b/packages/frontend/src/scripts/i18n.ts
@@ -48,7 +48,7 @@ export class I18n<T extends ILocale> {
 					}
 
 					if (typeof value === 'string') {
-						const parameters = Array.from(value.matchAll(/\{(\w+)\}/g)).map(([, parameter]) => parameter);
+						const parameters = Array.from(value.matchAll(/\{(\w+)\}/g), ([, parameter]) => parameter);
 
 						if (parameters.length) {
 							console.error(`Missing locale parameters: ${parameters.join(', ')} at ${String(p)}`);
-- 
cgit v1.2.3-freya


From 3ad273237557eefd75a715fe3bcb86f3d2703396 Mon Sep 17 00:00:00 2001
From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 19 Jan 2024 17:19:06 +0900
Subject: fix(frontend/HorizontalSwipe): ページの要素がはみ出る問題を修正
 (#13036)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkHorizontalSwipe.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/components/MkHorizontalSwipe.vue b/packages/frontend/src/components/MkHorizontalSwipe.vue
index 2c62aadbf4..a7d0d5a3e4 100644
--- a/packages/frontend/src/components/MkHorizontalSwipe.vue
+++ b/packages/frontend/src/components/MkHorizontalSwipe.vue
@@ -180,6 +180,7 @@ watch(tabModel, (newTab, oldTab) => {
 <style lang="scss" module>
 .transitionRoot.enableAnimation {
 	display: grid;
+	grid-template-columns: 100%;
 	overflow: clip;
 
 	.transitionChildren {
-- 
cgit v1.2.3-freya


From 8be977b32bf6eda45a5621b714fe51085cc2282c Mon Sep 17 00:00:00 2001
From: Korange <hi@korange.work>
Date: Fri, 19 Jan 2024 18:46:53 +0900
Subject: 「外部サイトからインストール」のパスを /install-extensions に変更
 (#12991)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* /install-extensionsに変更

* CHANGELOG.mdに追記

* 旧パスも利用できるように
---
 CHANGELOG.md                                       |   3 +
 packages/frontend/src/global/router/definition.ts  |   7 +-
 packages/frontend/src/pages/install-extensions.vue | 361 +++++++++++++++++++++
 packages/frontend/src/pages/install-extentions.vue | 361 ---------------------
 4 files changed, 370 insertions(+), 362 deletions(-)
 create mode 100644 packages/frontend/src/pages/install-extensions.vue
 delete mode 100644 packages/frontend/src/pages/install-extentions.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 605b8af92c..948ee2b51f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,9 @@
 
 ## 202x.x.x (Unreleased)
 
+### Note
+- 外部サイトからプラグインをインストールする場合のパスが`/install-extentions`から`/install-extensions`に変わります。現時点では以前のパスも利用できますが、非推奨です。
+
 ### General
 - Feat: [mCaptcha](https://github.com/mCaptcha/mCaptcha)のサポートを追加
 - Fix: リストライムラインの「リノートを表示」が正しく機能しない問題を修正
diff --git a/packages/frontend/src/global/router/definition.ts b/packages/frontend/src/global/router/definition.ts
index c8448ce198..8e1c178ea2 100644
--- a/packages/frontend/src/global/router/definition.ts
+++ b/packages/frontend/src/global/router/definition.ts
@@ -332,7 +332,12 @@ const routes = [{
 	component: page(() => import('@/pages/registry.vue')),
 }, {
 	path: '/install-extentions',
-	component: page(() => import('@/pages/install-extentions.vue')),
+	// Note: This path is kept for compatibility. It may be deleted.
+	component: page(() => import('@/pages/install-extensions.vue')),
+	loginRequired: true,
+}, {
+	path: '/install-extensions',
+	component: page(() => import('@/pages/install-extensions.vue')),
 	loginRequired: true,
 }, {
 	path: '/admin/user/:userId',
diff --git a/packages/frontend/src/pages/install-extensions.vue b/packages/frontend/src/pages/install-extensions.vue
new file mode 100644
index 0000000000..3815658bd4
--- /dev/null
+++ b/packages/frontend/src/pages/install-extensions.vue
@@ -0,0 +1,361 @@
+<!--
+SPDX-FileCopyrightText: syuilo and other misskey contributors
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<MkStickyContainer>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<MkSpacer :contentMax="500">
+		<MkLoading v-if="uiPhase === 'fetching'"/>
+		<div v-else-if="uiPhase === 'confirm' && data" class="_gaps_m" :class="$style.extInstallerRoot">
+			<div :class="$style.extInstallerIconWrapper">
+				<i v-if="data.type === 'plugin'" class="ti ti-plug"></i>
+				<i v-else-if="data.type === 'theme'" class="ti ti-palette"></i>
+				<i v-else class="ti ti-download"></i>
+			</div>
+			<h2 :class="$style.extInstallerTitle">{{ i18n.ts._externalResourceInstaller[`_${data.type}`].title }}</h2>
+			<div :class="$style.extInstallerNormDesc">{{ i18n.ts._externalResourceInstaller.checkVendorBeforeInstall }}</div>
+			<MkInfo v-if="data.type === 'plugin'" :warn="true">{{ i18n.ts._plugin.installWarn }}</MkInfo>
+			<FormSection>
+				<template #label>{{ i18n.ts._externalResourceInstaller[`_${data.type}`].metaTitle }}</template>
+				<div class="_gaps_s">
+					<FormSplit>
+						<MkKeyValue>
+							<template #key>{{ i18n.ts.name }}</template>
+							<template #value>{{ data.meta?.name }}</template>
+						</MkKeyValue>
+						<MkKeyValue>
+							<template #key>{{ i18n.ts.author }}</template>
+							<template #value>{{ data.meta?.author }}</template>
+						</MkKeyValue>
+					</FormSplit>
+					<MkKeyValue v-if="data.type === 'plugin'">
+						<template #key>{{ i18n.ts.description }}</template>
+						<template #value>{{ data.meta?.description }}</template>
+					</MkKeyValue>
+					<MkKeyValue v-if="data.type === 'plugin'">
+						<template #key>{{ i18n.ts.version }}</template>
+						<template #value>{{ data.meta?.version }}</template>
+					</MkKeyValue>
+					<MkKeyValue v-if="data.type === 'plugin'">
+						<template #key>{{ i18n.ts.permission }}</template>
+						<template #value>
+							<ul :class="$style.extInstallerKVList">
+								<li v-for="permission in data.meta?.permissions" :key="permission">{{ i18n.ts._permissions[permission] }}</li>
+							</ul>
+						</template>
+					</MkKeyValue>
+					<MkKeyValue v-if="data.type === 'theme' && data.meta?.base">
+						<template #key>{{ i18n.ts._externalResourceInstaller._meta.base }}</template>
+						<template #value>{{ i18n.ts[data.meta.base] }}</template>
+					</MkKeyValue>
+					<MkFolder>
+						<template #icon><i class="ti ti-code"></i></template>
+						<template #label>{{ i18n.ts._plugin.viewSource }}</template>
+
+						<MkCode :code="data.raw ?? ''"/>
+					</MkFolder>
+				</div>
+			</FormSection>
+			<FormSection>
+				<template #label>{{ i18n.ts._externalResourceInstaller._vendorInfo.title }}</template>
+				<div class="_gaps_s">
+					<MkKeyValue>
+						<template #key>{{ i18n.ts._externalResourceInstaller._vendorInfo.endpoint }}</template>
+						<template #value><MkUrl :url="url ?? ''" :showUrlPreview="false"></MkUrl></template>
+					</MkKeyValue>
+					<MkKeyValue>
+						<template #key>{{ i18n.ts._externalResourceInstaller._vendorInfo.hashVerify }}</template>
+						<template #value>
+							<!--この画面が出ている時点でハッシュの検証には成功している-->
+							<i class="ti ti-check" style="color: var(--accent)"></i>
+						</template>
+					</MkKeyValue>
+				</div>
+			</FormSection>
+			<div class="_buttonsCenter">
+				<MkButton primary @click="install()"><i class="ti ti-check"></i> {{ i18n.ts.install }}</MkButton>
+			</div>
+		</div>
+		<div v-else-if="uiPhase === 'error'" class="_gaps_m" :class="[$style.extInstallerRoot, $style.error]">
+			<div :class="$style.extInstallerIconWrapper">
+				<i class="ti ti-circle-x"></i>
+			</div>
+			<h2 :class="$style.extInstallerTitle">{{ errorKV?.title }}</h2>
+			<div :class="$style.extInstallerNormDesc">{{ errorKV?.description }}</div>
+			<div class="_buttonsCenter">
+				<MkButton @click="goBack()">{{ i18n.ts.goBack }}</MkButton>
+				<MkButton @click="goToMisskey()">{{ i18n.ts.goToMisskey }}</MkButton>
+			</div>
+		</div>
+	</MkSpacer>
+</MkStickyContainer>
+</template>
+
+<script lang="ts" setup>
+import { ref, computed, onActivated, onDeactivated, nextTick } from 'vue';
+import MkLoading from '@/components/global/MkLoading.vue';
+import MkButton from '@/components/MkButton.vue';
+import FormSection from '@/components/form/section.vue';
+import FormSplit from '@/components/form/split.vue';
+import MkCode from '@/components/MkCode.vue';
+import MkUrl from '@/components/global/MkUrl.vue';
+import MkInfo from '@/components/MkInfo.vue';
+import MkFolder from '@/components/MkFolder.vue';
+import MkKeyValue from '@/components/MkKeyValue.vue';
+import * as os from '@/os.js';
+import { misskeyApi } from '@/scripts/misskey-api.js';
+import { AiScriptPluginMeta, parsePluginMeta, installPlugin } from '@/scripts/install-plugin.js';
+import { parseThemeCode, installTheme } from '@/scripts/install-theme.js';
+import { unisonReload } from '@/scripts/unison-reload.js';
+import { i18n } from '@/i18n.js';
+import { definePageMetadata } from '@/scripts/page-metadata.js';
+
+const uiPhase = ref<'fetching' | 'confirm' | 'error'>('fetching');
+const errorKV = ref<{
+	title?: string;
+	description?: string;
+}>({
+	title: '',
+	description: '',
+});
+
+const url = ref<string | null>(null);
+const hash = ref<string | null>(null);
+
+const data = ref<{
+	type: 'plugin' | 'theme';
+	raw: string;
+	meta?: {
+		// Plugin & Theme Common
+		name: string;
+		author: string;
+
+		// Plugin
+		description?: string;
+		version?: string;
+		permissions?: string[];
+		config?: Record<string, any>;
+
+		// Theme
+		base?: 'light' | 'dark';
+	};
+} | null>(null);
+
+function goBack(): void {
+	history.back();
+}
+
+function goToMisskey(): void {
+	location.href = '/';
+}
+
+async function fetch() {
+	if (!url.value || !hash.value) {
+		errorKV.value = {
+			title: i18n.ts._externalResourceInstaller._errors._invalidParams.title,
+			description: i18n.ts._externalResourceInstaller._errors._invalidParams.description,
+		};
+		uiPhase.value = 'error';
+		return;
+	}
+	const res = await misskeyApi('fetch-external-resources', {
+		url: url.value,
+		hash: hash.value,
+	}).catch((err) => {
+		switch (err.id) {
+			case 'bb774091-7a15-4a70-9dc5-6ac8cf125856':
+				errorKV.value = {
+					title: i18n.ts._externalResourceInstaller._errors._failedToFetch.title,
+					description: i18n.ts._externalResourceInstaller._errors._failedToFetch.parseErrorDescription,
+				};
+				uiPhase.value = 'error';
+				break;
+			case '693ba8ba-b486-40df-a174-72f8279b56a4':
+				errorKV.value = {
+					title: i18n.ts._externalResourceInstaller._errors._hashUnmatched.title,
+					description: i18n.ts._externalResourceInstaller._errors._hashUnmatched.description,
+				};
+				uiPhase.value = 'error';
+				break;
+			default:
+				errorKV.value = {
+					title: i18n.ts._externalResourceInstaller._errors._failedToFetch.title,
+					description: i18n.ts._externalResourceInstaller._errors._failedToFetch.fetchErrorDescription,
+				};
+				uiPhase.value = 'error';
+				break;
+		}
+		throw new Error(err.code);
+	});
+
+	if (!res) {
+		errorKV.value = {
+			title: i18n.ts._externalResourceInstaller._errors._failedToFetch.title,
+			description: i18n.ts._externalResourceInstaller._errors._failedToFetch.fetchErrorDescription,
+		};
+		uiPhase.value = 'error';
+		return;
+	}
+
+	switch (res.type) {
+		case 'plugin':
+			try {
+				const meta = await parsePluginMeta(res.data);
+				data.value = {
+					type: 'plugin',
+					meta,
+					raw: res.data,
+				};
+			} catch (err) {
+				errorKV.value = {
+					title: i18n.ts._externalResourceInstaller._errors._pluginParseFailed.title,
+					description: i18n.ts._externalResourceInstaller._errors._pluginParseFailed.description,
+				};
+				console.error(err);
+				uiPhase.value = 'error';
+				return;
+			}
+			break;
+
+		case 'theme':
+			try {
+				const metaRaw = parseThemeCode(res.data);
+				// eslint-disable-next-line @typescript-eslint/no-unused-vars
+				const { id, props, desc: description, ...meta } = metaRaw;
+				data.value = {
+					type: 'theme',
+					meta: {
+						description,
+						...meta,
+					},
+					raw: res.data,
+				};
+			} catch (err) {
+				switch (err.message.toLowerCase()) {
+					case 'this theme is already installed':
+						errorKV.value = {
+							title: i18n.ts._externalResourceInstaller._errors._themeParseFailed.title,
+							description: i18n.ts._theme.alreadyInstalled,
+						};
+						break;
+
+					default:
+						errorKV.value = {
+							title: i18n.ts._externalResourceInstaller._errors._themeParseFailed.title,
+							description: i18n.ts._externalResourceInstaller._errors._themeParseFailed.description,
+						};
+						break;
+				}
+				console.error(err);
+				uiPhase.value = 'error';
+				return;
+			}
+			break;
+
+		default:
+			errorKV.value = {
+				title: i18n.ts._externalResourceInstaller._errors._resourceTypeNotSupported.title,
+				description: i18n.ts._externalResourceInstaller._errors._resourceTypeNotSupported.description,
+			};
+			uiPhase.value = 'error';
+			return;
+	}
+
+	uiPhase.value = 'confirm';
+}
+
+async function install() {
+	if (!data.value) return;
+
+	switch (data.value.type) {
+		case 'plugin':
+			if (!data.value.meta) return;
+			try {
+				await installPlugin(data.value.raw, data.value.meta as AiScriptPluginMeta);
+				os.success();
+				nextTick(() => {
+					unisonReload('/');
+				});
+			} catch (err) {
+				errorKV.value = {
+					title: i18n.ts._externalResourceInstaller._errors._pluginInstallFailed.title,
+					description: i18n.ts._externalResourceInstaller._errors._pluginInstallFailed.description,
+				};
+				console.error(err);
+				uiPhase.value = 'error';
+			}
+			break;
+		case 'theme':
+			if (!data.value.meta) return;
+			await installTheme(data.value.raw);
+			os.success();
+			nextTick(() => {
+				location.href = '/settings/theme';
+			});
+	}
+}
+
+onActivated(() => {
+	const urlParams = new URLSearchParams(window.location.search);
+	url.value = urlParams.get('url');
+	hash.value = urlParams.get('hash');
+	fetch();
+});
+
+onDeactivated(() => {
+	uiPhase.value = 'fetching';
+});
+
+const headerActions = computed(() => []);
+
+const headerTabs = computed(() => []);
+
+definePageMetadata({
+	title: i18n.ts._externalResourceInstaller.title,
+	icon: 'ti ti-download',
+});
+</script>
+
+<style lang="scss" module>
+.extInstallerRoot {
+	border-radius: var(--radius);
+	background: var(--panel);
+	padding: 1.5rem;
+}
+
+.extInstallerIconWrapper {
+	width: 48px;
+	height: 48px;
+	font-size: 24px;
+	line-height: 48px;
+	text-align: center;
+	border-radius: 50%;
+	margin-left: auto;
+	margin-right: auto;
+
+	background-color: var(--accentedBg);
+	color: var(--accent);
+}
+
+.error .extInstallerIconWrapper {
+	background-color: rgba(255, 42, 42, .15);
+	color: #ff2a2a;
+}
+
+.extInstallerTitle {
+	font-size: 1.2rem;
+	text-align: center;
+	margin: 0;
+}
+
+.extInstallerNormDesc {
+	text-align: center;
+}
+
+.extInstallerKVList {
+	margin-top: 0;
+	margin-bottom: 0;
+}
+</style>
diff --git a/packages/frontend/src/pages/install-extentions.vue b/packages/frontend/src/pages/install-extentions.vue
deleted file mode 100644
index 3815658bd4..0000000000
--- a/packages/frontend/src/pages/install-extentions.vue
+++ /dev/null
@@ -1,361 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and other misskey contributors
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<MkStickyContainer>
-	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
-	<MkSpacer :contentMax="500">
-		<MkLoading v-if="uiPhase === 'fetching'"/>
-		<div v-else-if="uiPhase === 'confirm' && data" class="_gaps_m" :class="$style.extInstallerRoot">
-			<div :class="$style.extInstallerIconWrapper">
-				<i v-if="data.type === 'plugin'" class="ti ti-plug"></i>
-				<i v-else-if="data.type === 'theme'" class="ti ti-palette"></i>
-				<i v-else class="ti ti-download"></i>
-			</div>
-			<h2 :class="$style.extInstallerTitle">{{ i18n.ts._externalResourceInstaller[`_${data.type}`].title }}</h2>
-			<div :class="$style.extInstallerNormDesc">{{ i18n.ts._externalResourceInstaller.checkVendorBeforeInstall }}</div>
-			<MkInfo v-if="data.type === 'plugin'" :warn="true">{{ i18n.ts._plugin.installWarn }}</MkInfo>
-			<FormSection>
-				<template #label>{{ i18n.ts._externalResourceInstaller[`_${data.type}`].metaTitle }}</template>
-				<div class="_gaps_s">
-					<FormSplit>
-						<MkKeyValue>
-							<template #key>{{ i18n.ts.name }}</template>
-							<template #value>{{ data.meta?.name }}</template>
-						</MkKeyValue>
-						<MkKeyValue>
-							<template #key>{{ i18n.ts.author }}</template>
-							<template #value>{{ data.meta?.author }}</template>
-						</MkKeyValue>
-					</FormSplit>
-					<MkKeyValue v-if="data.type === 'plugin'">
-						<template #key>{{ i18n.ts.description }}</template>
-						<template #value>{{ data.meta?.description }}</template>
-					</MkKeyValue>
-					<MkKeyValue v-if="data.type === 'plugin'">
-						<template #key>{{ i18n.ts.version }}</template>
-						<template #value>{{ data.meta?.version }}</template>
-					</MkKeyValue>
-					<MkKeyValue v-if="data.type === 'plugin'">
-						<template #key>{{ i18n.ts.permission }}</template>
-						<template #value>
-							<ul :class="$style.extInstallerKVList">
-								<li v-for="permission in data.meta?.permissions" :key="permission">{{ i18n.ts._permissions[permission] }}</li>
-							</ul>
-						</template>
-					</MkKeyValue>
-					<MkKeyValue v-if="data.type === 'theme' && data.meta?.base">
-						<template #key>{{ i18n.ts._externalResourceInstaller._meta.base }}</template>
-						<template #value>{{ i18n.ts[data.meta.base] }}</template>
-					</MkKeyValue>
-					<MkFolder>
-						<template #icon><i class="ti ti-code"></i></template>
-						<template #label>{{ i18n.ts._plugin.viewSource }}</template>
-
-						<MkCode :code="data.raw ?? ''"/>
-					</MkFolder>
-				</div>
-			</FormSection>
-			<FormSection>
-				<template #label>{{ i18n.ts._externalResourceInstaller._vendorInfo.title }}</template>
-				<div class="_gaps_s">
-					<MkKeyValue>
-						<template #key>{{ i18n.ts._externalResourceInstaller._vendorInfo.endpoint }}</template>
-						<template #value><MkUrl :url="url ?? ''" :showUrlPreview="false"></MkUrl></template>
-					</MkKeyValue>
-					<MkKeyValue>
-						<template #key>{{ i18n.ts._externalResourceInstaller._vendorInfo.hashVerify }}</template>
-						<template #value>
-							<!--この画面が出ている時点でハッシュの検証には成功している-->
-							<i class="ti ti-check" style="color: var(--accent)"></i>
-						</template>
-					</MkKeyValue>
-				</div>
-			</FormSection>
-			<div class="_buttonsCenter">
-				<MkButton primary @click="install()"><i class="ti ti-check"></i> {{ i18n.ts.install }}</MkButton>
-			</div>
-		</div>
-		<div v-else-if="uiPhase === 'error'" class="_gaps_m" :class="[$style.extInstallerRoot, $style.error]">
-			<div :class="$style.extInstallerIconWrapper">
-				<i class="ti ti-circle-x"></i>
-			</div>
-			<h2 :class="$style.extInstallerTitle">{{ errorKV?.title }}</h2>
-			<div :class="$style.extInstallerNormDesc">{{ errorKV?.description }}</div>
-			<div class="_buttonsCenter">
-				<MkButton @click="goBack()">{{ i18n.ts.goBack }}</MkButton>
-				<MkButton @click="goToMisskey()">{{ i18n.ts.goToMisskey }}</MkButton>
-			</div>
-		</div>
-	</MkSpacer>
-</MkStickyContainer>
-</template>
-
-<script lang="ts" setup>
-import { ref, computed, onActivated, onDeactivated, nextTick } from 'vue';
-import MkLoading from '@/components/global/MkLoading.vue';
-import MkButton from '@/components/MkButton.vue';
-import FormSection from '@/components/form/section.vue';
-import FormSplit from '@/components/form/split.vue';
-import MkCode from '@/components/MkCode.vue';
-import MkUrl from '@/components/global/MkUrl.vue';
-import MkInfo from '@/components/MkInfo.vue';
-import MkFolder from '@/components/MkFolder.vue';
-import MkKeyValue from '@/components/MkKeyValue.vue';
-import * as os from '@/os.js';
-import { misskeyApi } from '@/scripts/misskey-api.js';
-import { AiScriptPluginMeta, parsePluginMeta, installPlugin } from '@/scripts/install-plugin.js';
-import { parseThemeCode, installTheme } from '@/scripts/install-theme.js';
-import { unisonReload } from '@/scripts/unison-reload.js';
-import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/scripts/page-metadata.js';
-
-const uiPhase = ref<'fetching' | 'confirm' | 'error'>('fetching');
-const errorKV = ref<{
-	title?: string;
-	description?: string;
-}>({
-	title: '',
-	description: '',
-});
-
-const url = ref<string | null>(null);
-const hash = ref<string | null>(null);
-
-const data = ref<{
-	type: 'plugin' | 'theme';
-	raw: string;
-	meta?: {
-		// Plugin & Theme Common
-		name: string;
-		author: string;
-
-		// Plugin
-		description?: string;
-		version?: string;
-		permissions?: string[];
-		config?: Record<string, any>;
-
-		// Theme
-		base?: 'light' | 'dark';
-	};
-} | null>(null);
-
-function goBack(): void {
-	history.back();
-}
-
-function goToMisskey(): void {
-	location.href = '/';
-}
-
-async function fetch() {
-	if (!url.value || !hash.value) {
-		errorKV.value = {
-			title: i18n.ts._externalResourceInstaller._errors._invalidParams.title,
-			description: i18n.ts._externalResourceInstaller._errors._invalidParams.description,
-		};
-		uiPhase.value = 'error';
-		return;
-	}
-	const res = await misskeyApi('fetch-external-resources', {
-		url: url.value,
-		hash: hash.value,
-	}).catch((err) => {
-		switch (err.id) {
-			case 'bb774091-7a15-4a70-9dc5-6ac8cf125856':
-				errorKV.value = {
-					title: i18n.ts._externalResourceInstaller._errors._failedToFetch.title,
-					description: i18n.ts._externalResourceInstaller._errors._failedToFetch.parseErrorDescription,
-				};
-				uiPhase.value = 'error';
-				break;
-			case '693ba8ba-b486-40df-a174-72f8279b56a4':
-				errorKV.value = {
-					title: i18n.ts._externalResourceInstaller._errors._hashUnmatched.title,
-					description: i18n.ts._externalResourceInstaller._errors._hashUnmatched.description,
-				};
-				uiPhase.value = 'error';
-				break;
-			default:
-				errorKV.value = {
-					title: i18n.ts._externalResourceInstaller._errors._failedToFetch.title,
-					description: i18n.ts._externalResourceInstaller._errors._failedToFetch.fetchErrorDescription,
-				};
-				uiPhase.value = 'error';
-				break;
-		}
-		throw new Error(err.code);
-	});
-
-	if (!res) {
-		errorKV.value = {
-			title: i18n.ts._externalResourceInstaller._errors._failedToFetch.title,
-			description: i18n.ts._externalResourceInstaller._errors._failedToFetch.fetchErrorDescription,
-		};
-		uiPhase.value = 'error';
-		return;
-	}
-
-	switch (res.type) {
-		case 'plugin':
-			try {
-				const meta = await parsePluginMeta(res.data);
-				data.value = {
-					type: 'plugin',
-					meta,
-					raw: res.data,
-				};
-			} catch (err) {
-				errorKV.value = {
-					title: i18n.ts._externalResourceInstaller._errors._pluginParseFailed.title,
-					description: i18n.ts._externalResourceInstaller._errors._pluginParseFailed.description,
-				};
-				console.error(err);
-				uiPhase.value = 'error';
-				return;
-			}
-			break;
-
-		case 'theme':
-			try {
-				const metaRaw = parseThemeCode(res.data);
-				// eslint-disable-next-line @typescript-eslint/no-unused-vars
-				const { id, props, desc: description, ...meta } = metaRaw;
-				data.value = {
-					type: 'theme',
-					meta: {
-						description,
-						...meta,
-					},
-					raw: res.data,
-				};
-			} catch (err) {
-				switch (err.message.toLowerCase()) {
-					case 'this theme is already installed':
-						errorKV.value = {
-							title: i18n.ts._externalResourceInstaller._errors._themeParseFailed.title,
-							description: i18n.ts._theme.alreadyInstalled,
-						};
-						break;
-
-					default:
-						errorKV.value = {
-							title: i18n.ts._externalResourceInstaller._errors._themeParseFailed.title,
-							description: i18n.ts._externalResourceInstaller._errors._themeParseFailed.description,
-						};
-						break;
-				}
-				console.error(err);
-				uiPhase.value = 'error';
-				return;
-			}
-			break;
-
-		default:
-			errorKV.value = {
-				title: i18n.ts._externalResourceInstaller._errors._resourceTypeNotSupported.title,
-				description: i18n.ts._externalResourceInstaller._errors._resourceTypeNotSupported.description,
-			};
-			uiPhase.value = 'error';
-			return;
-	}
-
-	uiPhase.value = 'confirm';
-}
-
-async function install() {
-	if (!data.value) return;
-
-	switch (data.value.type) {
-		case 'plugin':
-			if (!data.value.meta) return;
-			try {
-				await installPlugin(data.value.raw, data.value.meta as AiScriptPluginMeta);
-				os.success();
-				nextTick(() => {
-					unisonReload('/');
-				});
-			} catch (err) {
-				errorKV.value = {
-					title: i18n.ts._externalResourceInstaller._errors._pluginInstallFailed.title,
-					description: i18n.ts._externalResourceInstaller._errors._pluginInstallFailed.description,
-				};
-				console.error(err);
-				uiPhase.value = 'error';
-			}
-			break;
-		case 'theme':
-			if (!data.value.meta) return;
-			await installTheme(data.value.raw);
-			os.success();
-			nextTick(() => {
-				location.href = '/settings/theme';
-			});
-	}
-}
-
-onActivated(() => {
-	const urlParams = new URLSearchParams(window.location.search);
-	url.value = urlParams.get('url');
-	hash.value = urlParams.get('hash');
-	fetch();
-});
-
-onDeactivated(() => {
-	uiPhase.value = 'fetching';
-});
-
-const headerActions = computed(() => []);
-
-const headerTabs = computed(() => []);
-
-definePageMetadata({
-	title: i18n.ts._externalResourceInstaller.title,
-	icon: 'ti ti-download',
-});
-</script>
-
-<style lang="scss" module>
-.extInstallerRoot {
-	border-radius: var(--radius);
-	background: var(--panel);
-	padding: 1.5rem;
-}
-
-.extInstallerIconWrapper {
-	width: 48px;
-	height: 48px;
-	font-size: 24px;
-	line-height: 48px;
-	text-align: center;
-	border-radius: 50%;
-	margin-left: auto;
-	margin-right: auto;
-
-	background-color: var(--accentedBg);
-	color: var(--accent);
-}
-
-.error .extInstallerIconWrapper {
-	background-color: rgba(255, 42, 42, .15);
-	color: #ff2a2a;
-}
-
-.extInstallerTitle {
-	font-size: 1.2rem;
-	text-align: center;
-	margin: 0;
-}
-
-.extInstallerNormDesc {
-	text-align: center;
-}
-
-.extInstallerKVList {
-	margin-top: 0;
-	margin-bottom: 0;
-}
-</style>
-- 
cgit v1.2.3-freya


From b17eb8e537b37f74ec2ad4ec1873386d2d57141b Mon Sep 17 00:00:00 2001
From: AsukaMari <2037177696@qq.com>
Date: Fri, 19 Jan 2024 17:48:30 +0800
Subject: fix: Some fixes for #12850 (#12862)

- refinement the error message when trueMail validation fails
- the settings of trueMail are not displayed after saving
- changing how `Active Email Validation` is saved
---
 CHANGELOG.md                                   |  1 +
 packages/backend/src/core/EmailService.ts      | 76 +++++++++++++++++---------
 packages/frontend/src/pages/admin/security.vue | 18 +++---
 3 files changed, 63 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 948ee2b51f..4bb761bd96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 ### General
 - Feat: [mCaptcha](https://github.com/mCaptcha/mCaptcha)のサポートを追加
 - Fix: リストライムラインの「リノートを表示」が正しく機能しない問題を修正
+- Feat: Add support for TrueMail
 
 ### Client
 - Feat: 新しいゲームを追加
diff --git a/packages/backend/src/core/EmailService.ts b/packages/backend/src/core/EmailService.ts
index 7e812b4df2..8daee148eb 100644
--- a/packages/backend/src/core/EmailService.ts
+++ b/packages/backend/src/core/EmailService.ts
@@ -165,10 +165,17 @@ export class EmailService {
 			email: emailAddress,
 		});
 
+		if (exist !== 0) {
+			return {
+				available: false,
+				reason: 'used',
+			};
+		}
+
 		let validated: {
 			valid: boolean,
 			reason?: string | null,
-		};
+		} = { valid: true, reason: null };
 
 		if (meta.enableActiveEmailValidation) {
 			if (meta.enableVerifymailApi && meta.verifymailAuthKey != null) {
@@ -185,27 +192,37 @@ export class EmailService {
 					validateSMTP: false, // 日本だと25ポートが殆どのプロバイダーで塞がれていてタイムアウトになるので
 				});
 			}
-		} else {
-			validated = { valid: true, reason: null };
+		}
+
+		if (!validated.valid) {
+			const formatReason: Record<string, 'format' | 'disposable' | 'mx' | 'smtp' | 'network' | 'blacklist' | undefined> = {
+				regex: 'format',
+				disposable: 'disposable',
+				mx: 'mx',
+				smtp: 'smtp',
+				network: 'network',
+				blacklist: 'blacklist',
+			};
+
+			return {
+				available: false,
+				reason: validated.reason ? formatReason[validated.reason] ?? null : null,
+			};
 		}
 
 		const emailDomain: string = emailAddress.split('@')[1];
 		const isBanned = this.utilityService.isBlockedHost(meta.bannedEmailDomains, emailDomain);
 
-		const available = exist === 0 && validated.valid && !isBanned;
+		if (isBanned) {
+			return {
+				available: false,
+				reason: 'banned',
+			};
+		}
 
 		return {
-			available,
-			reason: available ? null :
-			exist !== 0 ? 'used' :
-			isBanned ? 'banned' :
-			validated.reason === 'regex' ? 'format' :
-			validated.reason === 'disposable' ? 'disposable' :
-			validated.reason === 'mx' ? 'mx' :
-			validated.reason === 'smtp' ? 'smtp' :
-			validated.reason === 'network' ? 'network' :
-			validated.reason === 'blacklist' ? 'blacklist' :
-			null,
+			available: true,
+			reason: null,
 		};
 	}
 
@@ -222,7 +239,8 @@ export class EmailService {
 			},
 		});
 
-		const json = (await res.json()) as {
+		const json = (await res.json()) as Partial<{
+			message: string;
 			block: boolean;
 			catch_all: boolean;
 			deliverable_email: boolean;
@@ -237,8 +255,15 @@ export class EmailService {
 			mx_priority: { [key: string]: number };
 			privacy: boolean;
 			related_domains: string[];
-		};
+		}>;
 
+		/* api error: when there is only one `message` attribute in the returned result */
+		if (Object.keys(json).length === 1 && Reflect.has(json, 'message')) {
+			return {
+				valid: false,
+				reason: null,
+			};
+		}
 		if (json.email_address === undefined) {
 			return {
 				valid: false,
@@ -281,25 +306,26 @@ export class EmailService {
 				headers: {
 					'Content-Type': 'application/json',
 					Accept: 'application/json',
-					Authorization: truemailAuthKey
+					Authorization: truemailAuthKey,
 				},
 			});
-			
+
 			const json = (await res.json()) as {
 				email: string;
 				success: boolean;
-				errors?: { 
+				error?: string;
+				errors?: {
 					list_match?: string;
 					regex?: string;
 					mx?: string;
 					smtp?: string;
 				} | null;
 			};
-			
-			if (json.email === undefined || (json.email !== undefined && json.errors?.regex)) {
+
+			if (json.email === undefined || json.errors?.regex) {
 				return {
-						valid: false,
-						reason: 'format',
+					valid: false,
+					reason: 'format',
 				};
 			}
 			if (json.errors?.smtp) {
@@ -320,7 +346,7 @@ export class EmailService {
 					reason: json.errors?.list_match as T || 'blacklist',
 				};
 			}
-			
+
 			return {
 				valid: true,
 				reason: null,
diff --git a/packages/frontend/src/pages/admin/security.vue b/packages/frontend/src/pages/admin/security.vue
index a691d8ea1e..d5d1258733 100644
--- a/packages/frontend/src/pages/admin/security.vue
+++ b/packages/frontend/src/pages/admin/security.vue
@@ -71,27 +71,28 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 					<div class="_gaps_m">
 						<span>{{ i18n.ts.activeEmailValidationDescription }}</span>
-						<MkSwitch v-model="enableActiveEmailValidation" @update:modelValue="save">
+						<MkSwitch v-model="enableActiveEmailValidation">
 							<template #label>Enable</template>
 						</MkSwitch>
-						<MkSwitch v-model="enableVerifymailApi" @update:modelValue="save">
+						<MkSwitch v-model="enableVerifymailApi">
 							<template #label>Use Verifymail.io API</template>
 						</MkSwitch>
-						<MkInput v-model="verifymailAuthKey" @update:modelValue="save">
+						<MkInput v-model="verifymailAuthKey">
 							<template #prefix><i class="ti ti-key"></i></template>
 							<template #label>Verifymail.io API Auth Key</template>
 						</MkInput>
-						<MkSwitch v-model="enableTruemailApi" @update:modelValue="save">
+						<MkSwitch v-model="enableTruemailApi">
 							<template #label>Use TrueMail API</template>
 						</MkSwitch>
-						<MkInput v-model="truemailInstance" @update:modelValue="save">
+						<MkInput v-model="truemailInstance">
 							<template #prefix><i class="ti ti-key"></i></template>
 							<template #label>TrueMail API Instance</template>
 						</MkInput>
-						<MkInput v-model="truemailAuthKey" @update:modelValue="save">
+						<MkInput v-model="truemailAuthKey">
 							<template #prefix><i class="ti ti-key"></i></template>
 							<template #label>TrueMail API Auth Key</template>
 						</MkInput>
+						<MkButton primary @click="save"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton>
 					</div>
 				</MkFolder>
 
@@ -192,7 +193,10 @@ async function init() {
 	enableActiveEmailValidation.value = meta.enableActiveEmailValidation;
 	enableVerifymailApi.value = meta.enableVerifymailApi;
 	verifymailAuthKey.value = meta.verifymailAuthKey;
-	bannedEmailDomains.value = meta.bannedEmailDomains.join('\n');
+	enableTruemailApi.value = meta.enableTruemailApi;
+	truemailInstance.value = meta.truemailInstance;
+	truemailAuthKey.value = meta.truemailAuthKey;
+	bannedEmailDomains.value = meta.bannedEmailDomains?.join('\n') || "";
 }
 
 function save() {
-- 
cgit v1.2.3-freya


From 678dba92451ef9b94bc40ea7de5ddd0e24249829 Mon Sep 17 00:00:00 2001
From: 1Step621 <86859447+1STEP621@users.noreply.github.com>
Date: Fri, 19 Jan 2024 18:50:26 +0900
Subject: Enhance(frontend): MFMの属性にオートコンプリートが利用できるように
 (#12803)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* MFMのパラメータでオートコンプリートできるように

* tweak conditions & refactor

* ファイル末尾の改行忘れ

* remove console.log & refactor

* 型付けに敗北

* fix

* update CHANGELOG.md

* tweak conditions

* CHANGELOGの様式ミス

* CHANGELOGを書く場所を間違えていたので修正

* move changelog

* move changelog

* typeof MFM_TAGS[number]

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* $[border.noclip ]対応

* Update const.ts

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---
 CHANGELOG.md                                       |  3 +-
 .../frontend/src/components/MkAutocomplete.vue     | 17 ++++++++--
 packages/frontend/src/const.ts                     | 24 +++++++++++++
 packages/frontend/src/scripts/autocomplete.ts      | 39 +++++++++++++++++++---
 4 files changed, 75 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4bb761bd96..e6dd704c5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 <!--
-## 2023.x.x (unreleased)
+## 202x.x.x (unreleased)
 
 ### General
 -
@@ -38,6 +38,7 @@
 - Enhance: 絵文字ピッカー・オートコンプリートで、完全一致した絵文字を優先的に表示するように
 - Enhance: Playの説明欄にMFMを使えるように
 - Enhance: チャンネルノートの場合は詳細ページからその前後のノートを見れるように
+- Enhance: MFMの属性でオートコンプリートが使用できるように #12735
 - Fix: ネイティブモードの絵文字がモノクロにならないように
 - Fix: v2023.12.0で追加された「モデレーターがユーザーのアイコンもしくはバナー画像を未設定状態にできる機能」が管理画面上で正しく表示されていない問題を修正
 - Fix: AiScriptの`readline`関数が不正な値を返すことがある問題のv2023.12.0時点での修正がPlay以外に適用されていないのを修正
diff --git a/packages/frontend/src/components/MkAutocomplete.vue b/packages/frontend/src/components/MkAutocomplete.vue
index 15eda4499f..9d03eab2cb 100644
--- a/packages/frontend/src/components/MkAutocomplete.vue
+++ b/packages/frontend/src/components/MkAutocomplete.vue
@@ -35,6 +35,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<span>{{ tag }}</span>
 		</li>
 	</ol>
+	<ol v-else-if="mfmParams.length > 0" ref="suggests" :class="$style.list">
+		<li v-for="param in mfmParams" tabindex="-1" :class="$style.item" @click="complete(type, q.params.toSpliced(-1, 1, param).join(','))" @keydown="onKeydown">
+			<span>{{ param }}</span>
+		</li>
+	</ol>
 </div>
 </template>
 
@@ -51,7 +56,7 @@ import { emojilist, getEmojiName } from '@/scripts/emojilist.js';
 import { i18n } from '@/i18n.js';
 import { miLocalStorage } from '@/local-storage.js';
 import { customEmojis } from '@/custom-emojis.js';
-import { MFM_TAGS } from '@/const.js';
+import { MFM_TAGS, MFM_PARAMS } from '@/const.js';
 
 type EmojiDef = {
 	emoji: string;
@@ -130,7 +135,7 @@ export default {
 <script lang="ts" setup>
 const props = defineProps<{
 	type: string;
-	q: string | null;
+	q: any;
 	textarea: HTMLTextAreaElement;
 	close: () => void;
 	x: number;
@@ -151,6 +156,7 @@ const hashtags = ref<any[]>([]);
 const emojis = ref<(EmojiDef)[]>([]);
 const items = ref<Element[] | HTMLCollection>([]);
 const mfmTags = ref<string[]>([]);
+const mfmParams = ref<string[]>([]);
 const select = ref(-1);
 const zIndex = os.claimZIndex('high');
 
@@ -251,6 +257,13 @@ function exec() {
 		}
 
 		mfmTags.value = MFM_TAGS.filter(tag => tag.startsWith(props.q ?? ''));
+	} else if (props.type === 'mfmParam') {
+		if (props.q.params.at(-1) === '') {
+			mfmParams.value = MFM_PARAMS[props.q.tag] ?? [];
+			return;
+		}
+
+		mfmParams.value = MFM_PARAMS[props.q.tag].filter(param => param.startsWith(props.q.params.at(-1) ?? ''));
 	}
 }
 
diff --git a/packages/frontend/src/const.ts b/packages/frontend/src/const.ts
index ea07204456..38d0d85eef 100644
--- a/packages/frontend/src/const.ts
+++ b/packages/frontend/src/const.ts
@@ -109,3 +109,27 @@ export const DEFAULT_NOT_FOUND_IMAGE_URL = 'https://xn--931a.moe/assets/not-foun
 export const DEFAULT_INFO_IMAGE_URL = 'https://xn--931a.moe/assets/info.jpg';
 
 export const MFM_TAGS = ['tada', 'jelly', 'twitch', 'shake', 'spin', 'jump', 'bounce', 'flip', 'x2', 'x3', 'x4', 'scale', 'position', 'fg', 'bg', 'border', 'font', 'blur', 'rainbow', 'sparkle', 'rotate', 'ruby', 'unixtime'];
+export const MFM_PARAMS: Record<typeof MFM_TAGS[number], string[]> = {
+	tada: ['speed=', 'delay='],
+	jelly: ['speed=', 'delay='],
+	twitch: ['speed=', 'delay='],
+	shake: ['speed=', 'delay='],
+	spin: ['speed=', 'delay=', 'left', 'alternate', 'x', 'y'],
+	jump: ['speed=', 'delay='],
+	bounce: ['speed=', 'delay='],
+	flip: ['h', 'v'],
+	x2: [],
+	x3: [],
+	x4: [],
+	scale: ['x=', 'y='],
+	position: ['x=', 'y='],
+	fg: ['color='],
+	bg: ['color='],
+  border: ['width=', 'style=', 'color=', 'radius=', 'noclip'],
+	font: ['serif', 'monospace', 'cursive', 'fantasy', 'emoji', 'math'],
+	blur: [],
+	rainbow: ['speed=', 'delay='],
+	rotate: ['deg='],
+	ruby: [],
+	unixtime: [],
+};
diff --git a/packages/frontend/src/scripts/autocomplete.ts b/packages/frontend/src/scripts/autocomplete.ts
index 2a9a42ace5..b0c36cb927 100644
--- a/packages/frontend/src/scripts/autocomplete.ts
+++ b/packages/frontend/src/scripts/autocomplete.ts
@@ -8,13 +8,13 @@ import getCaretCoordinates from 'textarea-caret';
 import { toASCII } from 'punycode/';
 import { popup } from '@/os.js';
 
-export type SuggestionType = 'user' | 'hashtag' | 'emoji' | 'mfmTag';
+export type SuggestionType = 'user' | 'hashtag' | 'emoji' | 'mfmTag' | 'mfmParam';
 
 export class Autocomplete {
 	private suggestion: {
 		x: Ref<number>;
 		y: Ref<number>;
-		q: Ref<string | null>;
+		q: Ref<any>;
 		close: () => void;
 	} | null;
 	private textarea: HTMLInputElement | HTMLTextAreaElement;
@@ -49,7 +49,7 @@ export class Autocomplete {
 		this.textarea = textarea;
 		this.textRef = textRef;
 		this.opening = false;
-		this.onlyType = onlyType ?? ['user', 'hashtag', 'emoji', 'mfmTag'];
+		this.onlyType = onlyType ?? ['user', 'hashtag', 'emoji', 'mfmTag', 'mfmParam'];
 
 		this.attach();
 	}
@@ -80,6 +80,7 @@ export class Autocomplete {
 		const hashtagIndex = text.lastIndexOf('#');
 		const emojiIndex = text.lastIndexOf(':');
 		const mfmTagIndex = text.lastIndexOf('$');
+		const mfmParamIndex = text.lastIndexOf('.');
 
 		const max = Math.max(
 			mentionIndex,
@@ -94,7 +95,8 @@ export class Autocomplete {
 
 		const isMention = mentionIndex !== -1;
 		const isHashtag = hashtagIndex !== -1;
-		const isMfmTag = mfmTagIndex !== -1;
+		const isMfmParam = mfmParamIndex !== -1 && text.split(/\$\[[a-zA-Z]+/).pop()?.includes('.');
+		const isMfmTag = mfmTagIndex !== -1 && !isMfmParam;
 		const isEmoji = emojiIndex !== -1 && text.split(/:[a-z0-9_+\-]+:/).pop()!.includes(':');
 
 		let opened = false;
@@ -134,6 +136,17 @@ export class Autocomplete {
 			}
 		}
 
+		if (isMfmParam && !opened && this.onlyType.includes('mfmParam')) {
+			const mfmParam = text.substring(mfmParamIndex + 1);
+			if (!mfmParam.includes(' ')) {
+				this.open('mfmParam', {
+					tag: text.substring(mfmTagIndex + 2, mfmParamIndex),
+					params: mfmParam.split(','),
+				});
+				opened = true;
+			}
+		}
+
 		if (!opened) {
 			this.close();
 		}
@@ -142,7 +155,7 @@ export class Autocomplete {
 	/**
 	 * サジェストを提示します。
 	 */
-	private async open(type: string, q: string | null) {
+	private async open(type: string, q: any) {
 		if (type !== this.currentType) {
 			this.close();
 		}
@@ -280,6 +293,22 @@ export class Autocomplete {
 				const pos = trimmedBefore.length + (value.length + 3);
 				this.textarea.setSelectionRange(pos, pos);
 			});
+		} else if (type === 'mfmParam') {
+			const source = this.text;
+
+			const before = source.substring(0, caret);
+			const trimmedBefore = before.substring(0, before.lastIndexOf('.'));
+			const after = source.substring(caret);
+
+			// 挿入
+			this.text = `${trimmedBefore}.${value}${after}`;
+
+			// キャレットを戻す
+			nextTick(() => {
+				this.textarea.focus();
+				const pos = trimmedBefore.length + (value.length + 1);
+				this.textarea.setSelectionRange(pos, pos);
+			});
 		}
 	}
 }
-- 
cgit v1.2.3-freya


From a637b4e28259e89285fc1c67589c731a053f5562 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 19 Jan 2024 20:51:49 +0900
Subject: feat: reversi

Resolve #12962
---
 locales/index.d.ts                                 |  35 +
 locales/ja-JP.yml                                  |  35 +
 .../backend/migration/1705475608437-reversi.js     |  22 +
 .../backend/migration/1705654039457-reversi-2.js   |  18 +
 packages/backend/package.json                      |   2 +
 packages/backend/src/core/CoreModule.ts            |  27 +
 packages/backend/src/core/GlobalEventService.ts    |  57 +-
 packages/backend/src/core/ReversiService.ts        | 411 ++++++++++++
 .../src/core/entities/ReversiGameEntityService.ts  | 115 ++++
 packages/backend/src/di-symbols.ts                 |   1 +
 packages/backend/src/misc/json-schema.ts           |   3 +
 packages/backend/src/models/RepositoryModule.ts    |  12 +-
 packages/backend/src/models/ReversiGame.ts         | 127 ++++
 packages/backend/src/models/_.ts                   |   4 +
 .../backend/src/models/json-schema/reversi-game.ts | 234 +++++++
 packages/backend/src/postgres.ts                   |   2 +
 packages/backend/src/server/ServerModule.ts        |  11 +-
 packages/backend/src/server/api/EndpointsModule.ts |  24 +
 packages/backend/src/server/api/endpoints.ts       |  12 +
 .../src/server/api/endpoints/renote-mute/create.ts |   2 +-
 .../server/api/endpoints/reversi/cancel-match.ts   |  44 ++
 .../src/server/api/endpoints/reversi/games.ts      |  61 ++
 .../server/api/endpoints/reversi/invitations.ts    |  39 ++
 .../src/server/api/endpoints/reversi/match.ts      |  66 ++
 .../src/server/api/endpoints/reversi/show-game.ts  |  54 ++
 .../src/server/api/endpoints/reversi/surrender.ts  |  68 ++
 .../src/server/api/stream/ChannelsService.ts       |   6 +
 .../src/server/api/stream/channels/reversi-game.ts | 130 ++++
 .../src/server/api/stream/channels/reversi.ts      |  52 ++
 packages/frontend/assets/reversi/logo.png          | Bin 0 -> 96293 bytes
 packages/frontend/package.json                     |   2 +
 packages/frontend/src/components/MkRadios.vue      |   3 +
 packages/frontend/src/components/MkSelect.vue      |   4 +-
 .../frontend/src/components/MkUserSelectDialog.vue |  12 +-
 packages/frontend/src/global/router/definition.ts  |  17 +-
 packages/frontend/src/os.ts                        |   2 +-
 packages/frontend/src/pages/drop-and-fusion.vue    |   2 +-
 packages/frontend/src/pages/games.vue              |  15 +-
 packages/frontend/src/pages/reversi/game.board.vue | 428 ++++++++++++
 .../frontend/src/pages/reversi/game.setting.vue    | 236 +++++++
 packages/frontend/src/pages/reversi/game.vue       |  68 ++
 packages/frontend/src/pages/reversi/index.vue      | 271 ++++++++
 packages/frontend/vite.config.ts                   |   4 +-
 packages/misskey-js/etc/misskey-js.api.md          |  50 +-
 packages/misskey-js/src/autogen/apiClientJSDoc.ts  |  68 +-
 packages/misskey-js/src/autogen/endpoint.ts        |  18 +-
 packages/misskey-js/src/autogen/entities.ts        |  12 +-
 packages/misskey-js/src/autogen/models.ts          |   4 +-
 packages/misskey-js/src/autogen/types.ts           | 442 ++++++++++++-
 packages/misskey-reversi/package.json              |  26 +
 packages/misskey-reversi/src/game.ts               | 216 +++++++
 packages/misskey-reversi/src/index.ts              |   7 +
 packages/misskey-reversi/src/maps.ts               | 715 +++++++++++++++++++++
 packages/misskey-reversi/tsconfig.json             |  33 +
 pnpm-lock.yaml                                     | 479 +++++++++++---
 pnpm-workspace.yaml                                |   1 +
 56 files changed, 4701 insertions(+), 108 deletions(-)
 create mode 100644 packages/backend/migration/1705475608437-reversi.js
 create mode 100644 packages/backend/migration/1705654039457-reversi-2.js
 create mode 100644 packages/backend/src/core/ReversiService.ts
 create mode 100644 packages/backend/src/core/entities/ReversiGameEntityService.ts
 create mode 100644 packages/backend/src/models/ReversiGame.ts
 create mode 100644 packages/backend/src/models/json-schema/reversi-game.ts
 create mode 100644 packages/backend/src/server/api/endpoints/reversi/cancel-match.ts
 create mode 100644 packages/backend/src/server/api/endpoints/reversi/games.ts
 create mode 100644 packages/backend/src/server/api/endpoints/reversi/invitations.ts
 create mode 100644 packages/backend/src/server/api/endpoints/reversi/match.ts
 create mode 100644 packages/backend/src/server/api/endpoints/reversi/show-game.ts
 create mode 100644 packages/backend/src/server/api/endpoints/reversi/surrender.ts
 create mode 100644 packages/backend/src/server/api/stream/channels/reversi-game.ts
 create mode 100644 packages/backend/src/server/api/stream/channels/reversi.ts
 create mode 100644 packages/frontend/assets/reversi/logo.png
 create mode 100644 packages/frontend/src/pages/reversi/game.board.vue
 create mode 100644 packages/frontend/src/pages/reversi/game.setting.vue
 create mode 100644 packages/frontend/src/pages/reversi/game.vue
 create mode 100644 packages/frontend/src/pages/reversi/index.vue
 create mode 100644 packages/misskey-reversi/package.json
 create mode 100644 packages/misskey-reversi/src/game.ts
 create mode 100644 packages/misskey-reversi/src/index.ts
 create mode 100644 packages/misskey-reversi/src/maps.ts
 create mode 100644 packages/misskey-reversi/tsconfig.json

diff --git a/locales/index.d.ts b/locales/index.d.ts
index a22cb63507..85e0c6b244 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -2633,6 +2633,41 @@ export interface Locale extends ILocale {
             "description": string;
         };
     };
+    "_reversi": {
+        "reversi": string;
+        "gameSettings": string;
+        "chooseBoard": string;
+        "blackOrWhite": string;
+        "blackIs": ParameterizedString<"name">;
+        "rules": string;
+        "thisGameIsStartedSoon": string;
+        "waitingForOther": string;
+        "waitingForMe": string;
+        "waitingBoth": string;
+        "ready": string;
+        "cancelReady": string;
+        "opponentTurn": string;
+        "myTurn": string;
+        "turnOf": ParameterizedString<"name">;
+        "pastTurnOf": ParameterizedString<"name">;
+        "surrender": string;
+        "surrendered": string;
+        "drawn": string;
+        "won": ParameterizedString<"name">;
+        "black": string;
+        "white": string;
+        "total": string;
+        "turnCount": ParameterizedString<"count">;
+        "myGames": string;
+        "allGames": string;
+        "ended": string;
+        "playing": string;
+        "isLlotheo": string;
+        "loopedMap": string;
+        "canPutEverywhere": string;
+        "freeMatch": string;
+        "lookingForPlayer": string;
+    };
 }
 declare const locales: {
     [lang: string]: Locale;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 8749a5f49f..6c8a453023 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2506,3 +2506,38 @@ _dataSaver:
   _code:
     title: "コードハイライト"
     description: "MFMなどでコードハイライト記法が使われている場合、タップするまで読み込まれなくなります。コードハイライトではハイライトする言語ごとにその定義ファイルを読み込む必要がありますが、それらが自動で読み込まれなくなるため、通信量の削減が見込めます。"
+
+_reversi:
+  reversi: "リバーシ"
+  gameSettings: "対局の設定"
+  chooseBoard: "ボードを選択"
+  blackOrWhite: "先行/後攻"
+  blackIs: "{name}が黒(先行)"
+  rules: "ルール"
+  thisGameIsStartedSoon: "対局はまもなく開始されます"
+  waitingForOther: "相手の準備が完了するのを待っています"
+  waitingForMe: "あなたの準備が完了するのを待っています"
+  waitingBoth: "準備してください"
+  ready: "準備完了"
+  cancelReady: "準備を再開"
+  opponentTurn: "相手のターンです"
+  myTurn: "あなたのターンです"
+  turnOf: "{name}のターンです"
+  pastTurnOf: "{name}のターン"
+  surrender: "投了"
+  surrendered: "投了により"
+  drawn: "引き分け"
+  won: "{name}の勝ち"
+  black: "黒"
+  white: "白"
+  total: "合計"
+  turnCount: "{count}ターン目"
+  myGames: "自分の対局"
+  allGames: "みんなの対局"
+  ended: "終了"
+  playing: "対局中"
+  isLlotheo: "石の少ない方が勝ち(ロセオ)"
+  loopedMap: "ループマップ"
+  canPutEverywhere: "どこでも置けるモード"
+  freeMatch: "フリーマッチ"
+  lookingForPlayer: "対戦相手を探しています"
diff --git a/packages/backend/migration/1705475608437-reversi.js b/packages/backend/migration/1705475608437-reversi.js
new file mode 100644
index 0000000000..c9d69e2c7c
--- /dev/null
+++ b/packages/backend/migration/1705475608437-reversi.js
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class Reversi1705475608437 {
+    name = 'Reversi1705475608437'
+
+    async up(queryRunner) {
+        await queryRunner.query(`DROP INDEX "public"."IDX_b46ec40746efceac604142be1c"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_b604d92d6c7aec38627f6eaf16"`);
+        await queryRunner.query(`ALTER TABLE "reversi_game" DROP COLUMN "createdAt"`);
+        await queryRunner.query(`ALTER TABLE "reversi_matching" DROP COLUMN "createdAt"`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "reversi_matching" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "reversi_game" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+        await queryRunner.query(`CREATE INDEX "IDX_b604d92d6c7aec38627f6eaf16" ON "reversi_matching" ("createdAt") `);
+        await queryRunner.query(`CREATE INDEX "IDX_b46ec40746efceac604142be1c" ON "reversi_game" ("createdAt") `);
+    }
+}
diff --git a/packages/backend/migration/1705654039457-reversi-2.js b/packages/backend/migration/1705654039457-reversi-2.js
new file mode 100644
index 0000000000..33747ba9f7
--- /dev/null
+++ b/packages/backend/migration/1705654039457-reversi-2.js
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class Reversi21705654039457 {
+    name = 'Reversi21705654039457'
+
+    async up(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "reversi_game" RENAME COLUMN "user1Accepted" TO "user1Ready"`);
+			await queryRunner.query(`ALTER TABLE "reversi_game" RENAME COLUMN "user2Accepted" TO "user2Ready"`);
+    }
+
+    async down(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "reversi_game" RENAME COLUMN "user1Ready" TO "user1Accepted"`);
+			await queryRunner.query(`ALTER TABLE "reversi_game" RENAME COLUMN "user2Ready" TO "user2Accepted"`);
+    }
+}
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 5ab476295c..f8e82c5a1c 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -107,6 +107,7 @@
 		"cli-highlight": "2.1.11",
 		"color-convert": "2.0.1",
 		"content-disposition": "0.5.4",
+		"crc-32": "^1.2.2",
 		"date-fns": "2.30.0",
 		"deep-email-validator": "0.1.21",
 		"fastify": "4.24.3",
@@ -133,6 +134,7 @@
 		"microformats-parser": "2.0.2",
 		"mime-types": "2.1.35",
 		"misskey-js": "workspace:*",
+		"misskey-reversi": "workspace:*",
 		"ms": "3.0.0-canary.1",
 		"nanoid": "5.0.4",
 		"nested-property": "4.0.0",
diff --git a/packages/backend/src/core/CoreModule.ts b/packages/backend/src/core/CoreModule.ts
index bc6d24b951..c9e285346e 100644
--- a/packages/backend/src/core/CoreModule.ts
+++ b/packages/backend/src/core/CoreModule.ts
@@ -66,6 +66,8 @@ import { FeaturedService } from './FeaturedService.js';
 import { FanoutTimelineService } from './FanoutTimelineService.js';
 import { ChannelFollowingService } from './ChannelFollowingService.js';
 import { RegistryApiService } from './RegistryApiService.js';
+import { ReversiService } from './ReversiService.js';
+
 import { ChartLoggerService } from './chart/ChartLoggerService.js';
 import FederationChart from './chart/charts/federation.js';
 import NotesChart from './chart/charts/notes.js';
@@ -80,6 +82,7 @@ import PerUserFollowingChart from './chart/charts/per-user-following.js';
 import PerUserDriveChart from './chart/charts/per-user-drive.js';
 import ApRequestChart from './chart/charts/ap-request.js';
 import { ChartManagementService } from './chart/ChartManagementService.js';
+
 import { AbuseUserReportEntityService } from './entities/AbuseUserReportEntityService.js';
 import { AntennaEntityService } from './entities/AntennaEntityService.js';
 import { AppEntityService } from './entities/AppEntityService.js';
@@ -112,6 +115,8 @@ import { UserListEntityService } from './entities/UserListEntityService.js';
 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 { ApAudienceService } from './activitypub/ApAudienceService.js';
 import { ApDbResolverService } from './activitypub/ApDbResolverService.js';
 import { ApDeliverManagerService } from './activitypub/ApDeliverManagerService.js';
@@ -199,6 +204,7 @@ const $FanoutTimelineService: Provider = { provide: 'FanoutTimelineService', use
 const $FanoutTimelineEndpointService: Provider = { provide: 'FanoutTimelineEndpointService', useExisting: FanoutTimelineEndpointService };
 const $ChannelFollowingService: Provider = { provide: 'ChannelFollowingService', useExisting: ChannelFollowingService };
 const $RegistryApiService: Provider = { provide: 'RegistryApiService', useExisting: RegistryApiService };
+const $ReversiService: Provider = { provide: 'ReversiService', useExisting: ReversiService };
 
 const $ChartLoggerService: Provider = { provide: 'ChartLoggerService', useExisting: ChartLoggerService };
 const $FederationChart: Provider = { provide: 'FederationChart', useExisting: FederationChart };
@@ -247,6 +253,7 @@ const $UserListEntityService: Provider = { provide: 'UserListEntityService', use
 const $FlashEntityService: Provider = { provide: 'FlashEntityService', useExisting: FlashEntityService };
 const $FlashLikeEntityService: Provider = { provide: 'FlashLikeEntityService', useExisting: FlashLikeEntityService };
 const $RoleEntityService: Provider = { provide: 'RoleEntityService', useExisting: RoleEntityService };
+const $ReversiGameEntityService: Provider = { provide: 'ReversiGameEntityService', useExisting: ReversiGameEntityService };
 
 const $ApAudienceService: Provider = { provide: 'ApAudienceService', useExisting: ApAudienceService };
 const $ApDbResolverService: Provider = { provide: 'ApDbResolverService', useExisting: ApDbResolverService };
@@ -336,6 +343,8 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		FanoutTimelineEndpointService,
 		ChannelFollowingService,
 		RegistryApiService,
+		ReversiService,
+
 		ChartLoggerService,
 		FederationChart,
 		NotesChart,
@@ -350,6 +359,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		PerUserDriveChart,
 		ApRequestChart,
 		ChartManagementService,
+
 		AbuseUserReportEntityService,
 		AntennaEntityService,
 		AppEntityService,
@@ -382,6 +392,8 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		FlashEntityService,
 		FlashLikeEntityService,
 		RoleEntityService,
+		ReversiGameEntityService,
+
 		ApAudienceService,
 		ApDbResolverService,
 		ApDeliverManagerService,
@@ -466,6 +478,8 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$FanoutTimelineEndpointService,
 		$ChannelFollowingService,
 		$RegistryApiService,
+		$ReversiService,
+
 		$ChartLoggerService,
 		$FederationChart,
 		$NotesChart,
@@ -480,6 +494,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$PerUserDriveChart,
 		$ApRequestChart,
 		$ChartManagementService,
+
 		$AbuseUserReportEntityService,
 		$AntennaEntityService,
 		$AppEntityService,
@@ -512,6 +527,8 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$FlashEntityService,
 		$FlashLikeEntityService,
 		$RoleEntityService,
+		$ReversiGameEntityService,
+
 		$ApAudienceService,
 		$ApDbResolverService,
 		$ApDeliverManagerService,
@@ -597,6 +614,8 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		FanoutTimelineEndpointService,
 		ChannelFollowingService,
 		RegistryApiService,
+		ReversiService,
+
 		FederationChart,
 		NotesChart,
 		UsersChart,
@@ -610,6 +629,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		PerUserDriveChart,
 		ApRequestChart,
 		ChartManagementService,
+
 		AbuseUserReportEntityService,
 		AntennaEntityService,
 		AppEntityService,
@@ -642,6 +662,8 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		FlashEntityService,
 		FlashLikeEntityService,
 		RoleEntityService,
+		ReversiGameEntityService,
+
 		ApAudienceService,
 		ApDbResolverService,
 		ApDeliverManagerService,
@@ -726,6 +748,8 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$FanoutTimelineEndpointService,
 		$ChannelFollowingService,
 		$RegistryApiService,
+		$ReversiService,
+
 		$FederationChart,
 		$NotesChart,
 		$UsersChart,
@@ -739,6 +763,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$PerUserDriveChart,
 		$ApRequestChart,
 		$ChartManagementService,
+
 		$AbuseUserReportEntityService,
 		$AntennaEntityService,
 		$AppEntityService,
@@ -771,6 +796,8 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$FlashEntityService,
 		$FlashLikeEntityService,
 		$RoleEntityService,
+		$ReversiGameEntityService,
+
 		$ApAudienceService,
 		$ApDbResolverService,
 		$ApDeliverManagerService,
diff --git a/packages/backend/src/core/GlobalEventService.ts b/packages/backend/src/core/GlobalEventService.ts
index d175f21f2f..11a8935be2 100644
--- a/packages/backend/src/core/GlobalEventService.ts
+++ b/packages/backend/src/core/GlobalEventService.ts
@@ -18,7 +18,7 @@ import type { MiSignin } from '@/models/Signin.js';
 import type { MiPage } from '@/models/Page.js';
 import type { MiWebhook } from '@/models/Webhook.js';
 import type { MiMeta } from '@/models/Meta.js';
-import { MiAvatarDecoration, MiRole, MiRoleAssignment } from '@/models/_.js';
+import { MiAvatarDecoration, MiReversiGame, MiRole, MiRoleAssignment } from '@/models/_.js';
 import type { Packed } from '@/misc/json-schema.js';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
@@ -159,6 +159,43 @@ export interface AdminEventTypes {
 		comment: string;
 	};
 }
+
+export interface ReversiEventTypes {
+	matched: {
+		game: Packed<'ReversiGameDetailed'>;
+	};
+	invited: {
+		user: Packed<'User'>;
+	};
+}
+
+export interface ReversiGameEventTypes {
+	changeReadyStates: {
+		user1: boolean;
+		user2: boolean;
+	};
+	updateSettings: {
+		userId: MiUser['id'];
+		key: string;
+		value: any;
+	};
+	putStone: {
+		at: number;
+		color: boolean;
+		pos: number;
+		next: boolean;
+	};
+	syncState: {
+		crc32: string;
+	};
+	started: {
+		game: Packed<'ReversiGameDetailed'>;
+	};
+	ended: {
+		winnerId: MiUser['id'] | null;
+		game: Packed<'ReversiGameDetailed'>;
+	};
+}
 //#endregion
 
 // 辞書(interface or type)から{ type, body }ユニオンを定義
@@ -249,6 +286,14 @@ export type GlobalEvents = {
 		name: 'notesStream';
 		payload: Serialized<Packed<'Note'>>;
 	};
+	reversi: {
+		name: `reversiStream:${MiUser['id']}`;
+		payload: EventUnionFromDictionary<SerializedAll<ReversiEventTypes>>;
+	};
+	reversiGame: {
+		name: `reversiGameStream:${MiReversiGame['id']}`;
+		payload: EventUnionFromDictionary<SerializedAll<ReversiGameEventTypes>>;
+	};
 };
 
 // API event definitions
@@ -338,4 +383,14 @@ export class GlobalEventService {
 	public publishAdminStream<K extends keyof AdminEventTypes>(userId: MiUser['id'], type: K, value?: AdminEventTypes[K]): void {
 		this.publish(`adminStream:${userId}`, type, typeof value === 'undefined' ? null : value);
 	}
+
+	@bindThis
+	public publishReversiStream<K extends keyof ReversiEventTypes>(userId: MiUser['id'], type: K, value?: ReversiEventTypes[K]): void {
+		this.publish(`reversiStream:${userId}`, type, typeof value === 'undefined' ? null : value);
+	}
+
+	@bindThis
+	public publishReversiGameStream<K extends keyof ReversiGameEventTypes>(gameId: MiReversiGame['id'], type: K, value?: ReversiGameEventTypes[K]): void {
+		this.publish(`reversiGameStream:${gameId}`, type, typeof value === 'undefined' ? null : value);
+	}
 }
diff --git a/packages/backend/src/core/ReversiService.ts b/packages/backend/src/core/ReversiService.ts
new file mode 100644
index 0000000000..cd990ba775
--- /dev/null
+++ b/packages/backend/src/core/ReversiService.ts
@@ -0,0 +1,411 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import * as Redis from 'ioredis';
+import CRC32 from 'crc-32';
+import { ModuleRef } from '@nestjs/core';
+import * as Reversi from 'misskey-reversi';
+import { IsNull } from 'typeorm';
+import type {
+	MiReversiGame,
+	ReversiGamesRepository,
+	UsersRepository,
+} from '@/models/_.js';
+import type { MiUser } from '@/models/User.js';
+import { DI } from '@/di-symbols.js';
+import { bindThis } from '@/decorators.js';
+import { MetaService } from '@/core/MetaService.js';
+import { CacheService } from '@/core/CacheService.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import type { GlobalEvents } from '@/core/GlobalEventService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
+import { IdService } from '@/core/IdService.js';
+import type { Packed } from '@/misc/json-schema.js';
+import { NotificationService } from '@/core/NotificationService.js';
+import { ReversiGameEntityService } from './entities/ReversiGameEntityService.js';
+import type { OnApplicationShutdown, OnModuleInit } from '@nestjs/common';
+
+const MATCHING_TIMEOUT_MS = 1000 * 15; // 15sec
+
+@Injectable()
+export class ReversiService implements OnApplicationShutdown, OnModuleInit {
+	private notificationService: NotificationService;
+
+	constructor(
+		private moduleRef: ModuleRef,
+
+		@Inject(DI.redis)
+		private redisClient: Redis.Redis,
+
+		@Inject(DI.reversiGamesRepository)
+		private reversiGamesRepository: ReversiGamesRepository,
+
+		private cacheService: CacheService,
+		private userEntityService: UserEntityService,
+		private globalEventService: GlobalEventService,
+		private reversiGameEntityService: ReversiGameEntityService,
+		private idService: IdService,
+	) {
+	}
+
+	async onModuleInit() {
+		this.notificationService = this.moduleRef.get(NotificationService.name);
+	}
+
+	@bindThis
+	public async matchSpecificUser(me: MiUser, targetUser: MiUser): Promise<MiReversiGame | null> {
+		if (targetUser.id === me.id) {
+			throw new Error('You cannot match yourself.');
+		}
+
+		const invitations = await this.redisClient.zrange(
+			`reversi:matchSpecific:${me.id}`,
+			Date.now() - MATCHING_TIMEOUT_MS,
+			'+inf',
+			'BYSCORE');
+
+		if (invitations.includes(targetUser.id)) {
+			await this.redisClient.zrem(`reversi:matchSpecific:${me.id}`, targetUser.id);
+
+			const game = await this.reversiGamesRepository.insert({
+				id: this.idService.gen(),
+				user1Id: targetUser.id,
+				user2Id: me.id,
+				user1Ready: false,
+				user2Ready: false,
+				isStarted: false,
+				isEnded: false,
+				logs: [],
+				map: Reversi.maps.eighteight.data,
+				bw: 'random',
+				isLlotheo: false,
+			}).then(x => this.reversiGamesRepository.findOneByOrFail(x.identifiers[0]));
+
+			const packed = await this.reversiGameEntityService.packDetail(game, { id: targetUser.id });
+			this.globalEventService.publishReversiStream(targetUser.id, 'matched', { game: packed });
+
+			return game;
+		} else {
+			this.redisClient.zadd(`reversi:matchSpecific:${targetUser.id}`, Date.now(), me.id);
+
+			this.globalEventService.publishReversiStream(targetUser.id, 'invited', {
+				user: await this.userEntityService.pack(me, targetUser),
+			});
+
+			return null;
+		}
+	}
+
+	@bindThis
+	public async matchAnyUser(me: MiUser): Promise<MiReversiGame | null> {
+		//#region まず自分宛ての招待を探す
+		const invitations = await this.redisClient.zrange(
+			`reversi:matchSpecific:${me.id}`,
+			Date.now() - MATCHING_TIMEOUT_MS,
+			'+inf',
+			'BYSCORE');
+
+		if (invitations.length > 0) {
+			const invitorId = invitations[Math.floor(Math.random() * invitations.length)];
+			await this.redisClient.zrem(`reversi:matchSpecific:${me.id}`, invitorId);
+
+			const game = await this.reversiGamesRepository.insert({
+				id: this.idService.gen(),
+				user1Id: invitorId,
+				user2Id: me.id,
+				user1Ready: false,
+				user2Ready: false,
+				isStarted: false,
+				isEnded: false,
+				logs: [],
+				map: Reversi.maps.eighteight.data,
+				bw: 'random',
+				isLlotheo: false,
+			}).then(x => this.reversiGamesRepository.findOneByOrFail(x.identifiers[0]));
+
+			const packed = await this.reversiGameEntityService.packDetail(game, { id: invitorId });
+			this.globalEventService.publishReversiStream(invitorId, 'matched', { game: packed });
+
+			return game;
+		}
+		//#endregion
+
+		const matchings = await this.redisClient.zrange(
+			'reversi:matchAny',
+			Date.now() - MATCHING_TIMEOUT_MS,
+			'+inf',
+			'BYSCORE');
+
+		const userIds = matchings.filter(id => id !== me.id);
+
+		if (userIds.length > 0) {
+			// pick random
+			const matchedUserId = userIds[Math.floor(Math.random() * userIds.length)];
+
+			await this.redisClient.zrem('reversi:matchAny', me.id, matchedUserId);
+
+			const game = await this.reversiGamesRepository.insert({
+				id: this.idService.gen(),
+				user1Id: matchedUserId,
+				user2Id: me.id,
+				user1Ready: false,
+				user2Ready: false,
+				isStarted: false,
+				isEnded: false,
+				logs: [],
+				map: Reversi.maps.eighteight.data,
+				bw: 'random',
+				isLlotheo: false,
+			}).then(x => this.reversiGamesRepository.findOneByOrFail(x.identifiers[0]));
+
+			const packed = await this.reversiGameEntityService.packDetail(game, { id: matchedUserId });
+			this.globalEventService.publishReversiStream(matchedUserId, 'matched', { game: packed });
+
+			return game;
+		} else {
+			await this.redisClient.zadd('reversi:matchAny', Date.now(), me.id);
+			return null;
+		}
+	}
+
+	@bindThis
+	public async matchSpecificUserCancel(user: MiUser, targetUserId: MiUser['id']) {
+		await this.redisClient.zrem(`reversi:matchSpecific:${targetUserId}`, user.id);
+	}
+
+	@bindThis
+	public async matchAnyUserCancel(user: MiUser) {
+		await this.redisClient.zrem('reversi:matchAny', user.id);
+	}
+
+	@bindThis
+	public async gameReady(game: MiReversiGame, user: MiUser, ready: boolean) {
+		if (game.isStarted) return;
+
+		let isBothReady = false;
+
+		if (game.user1Id === user.id) {
+			await this.reversiGamesRepository.update(game.id, {
+				user1Ready: ready,
+			});
+
+			this.globalEventService.publishReversiGameStream(game.id, 'changeReadyStates', {
+				user1: ready,
+				user2: game.user2Ready,
+			});
+
+			if (ready && game.user2Ready) isBothReady = true;
+		} else if (game.user2Id === user.id) {
+			await this.reversiGamesRepository.update(game.id, {
+				user2Ready: ready,
+			});
+
+			this.globalEventService.publishReversiGameStream(game.id, 'changeReadyStates', {
+				user1: game.user1Ready,
+				user2: ready,
+			});
+
+			if (ready && game.user1Ready) isBothReady = true;
+		} else {
+			return;
+		}
+
+		if (isBothReady) {
+			// 3秒後、両者readyならゲーム開始
+			setTimeout(async () => {
+				const freshGame = await this.reversiGamesRepository.findOneBy({ id: game.id });
+				if (freshGame == null || freshGame.isStarted || freshGame.isEnded) return;
+				if (!freshGame.user1Ready || !freshGame.user2Ready) return;
+
+				let bw: number;
+				if (freshGame.bw === 'random') {
+					bw = Math.random() > 0.5 ? 1 : 2;
+				} else {
+					bw = parseInt(freshGame.bw, 10);
+				}
+
+				function getRandomMap() {
+					const mapCount = Object.entries(Reversi.maps).length;
+					const rnd = Math.floor(Math.random() * mapCount);
+					return Object.values(Reversi.maps)[rnd].data;
+				}
+
+				const map = freshGame.map != null ? freshGame.map : getRandomMap();
+
+				await this.reversiGamesRepository.update(game.id, {
+					startedAt: new Date(),
+					isStarted: true,
+					black: bw,
+					map: map,
+				});
+
+				//#region 盤面に最初から石がないなどして始まった瞬間に勝敗が決定する場合があるのでその処理
+				const o = new Reversi.Game(map, {
+					isLlotheo: freshGame.isLlotheo,
+					canPutEverywhere: freshGame.canPutEverywhere,
+					loopedBoard: freshGame.loopedBoard,
+				});
+
+				if (o.isEnded) {
+					let winner;
+					if (o.winner === true) {
+						winner = freshGame.black === 1 ? freshGame.user1Id : freshGame.user2Id;
+					} else if (o.winner === false) {
+						winner = freshGame.black === 1 ? freshGame.user2Id : freshGame.user1Id;
+					} else {
+						winner = null;
+					}
+
+					await this.reversiGamesRepository.update(game.id, {
+						isEnded: true,
+						winnerId: winner,
+					});
+
+					this.globalEventService.publishReversiGameStream(game.id, 'ended', {
+						winnerId: winner,
+						game: await this.reversiGameEntityService.packDetail(game.id, user),
+					});
+				}
+				//#endregion
+
+				this.globalEventService.publishReversiGameStream(game.id, 'started', {
+					game: await this.reversiGameEntityService.packDetail(game.id, user),
+				});
+			}, 3000);
+		}
+	}
+
+	@bindThis
+	public async getInvitations(user: MiUser): Promise<MiUser['id'][]> {
+		const invitations = await this.redisClient.zrange(
+			`reversi:matchSpecific:${user.id}`,
+			Date.now() - MATCHING_TIMEOUT_MS,
+			'+inf',
+			'BYSCORE');
+		return invitations;
+	}
+
+	@bindThis
+	public async updateSettings(game: MiReversiGame, user: MiUser, key: string, value: any) {
+		if (game.isStarted) return;
+		if ((game.user1Id !== user.id) && (game.user2Id !== user.id)) return;
+		if ((game.user1Id === user.id) && game.user1Ready) return;
+		if ((game.user2Id === user.id) && game.user2Ready) return;
+
+		if (!['map', 'bw', 'isLlotheo', 'canPutEverywhere', 'loopedBoard'].includes(key)) return;
+
+		await this.reversiGamesRepository.update(game.id, {
+			[key]: value,
+		});
+
+		this.globalEventService.publishReversiGameStream(game.id, 'updateSettings', {
+			userId: user.id,
+			key: key,
+			value: value,
+		});
+	}
+
+	@bindThis
+	public async putStoneToGame(game: MiReversiGame, user: MiUser, pos: number) {
+		if (!game.isStarted) return;
+		if (game.isEnded) return;
+		if ((game.user1Id !== user.id) && (game.user2Id !== user.id)) return;
+
+		const myColor =
+			((game.user1Id === user.id) && game.black === 1) || ((game.user2Id === user.id) && game.black === 2)
+				? true
+				: false;
+
+		const o = new Reversi.Game(game.map, {
+			isLlotheo: game.isLlotheo,
+			canPutEverywhere: game.canPutEverywhere,
+			loopedBoard: game.loopedBoard,
+		});
+
+		// 盤面の状態を再生
+		for (const log of game.logs) {
+			o.put(log.color, log.pos);
+		}
+
+		if (o.turn !== myColor) return;
+
+		if (!o.canPut(myColor, pos)) return;
+		o.put(myColor, pos);
+
+		let winner;
+		if (o.isEnded) {
+			if (o.winner === true) {
+				winner = game.black === 1 ? game.user1Id : game.user2Id;
+			} else if (o.winner === false) {
+				winner = game.black === 1 ? game.user2Id : game.user1Id;
+			} else {
+				winner = null;
+			}
+		}
+
+		const log = {
+			at: Date.now(),
+			color: myColor,
+			pos,
+		};
+
+		const crc32 = CRC32.str(game.logs.map(x => x.pos.toString()).join('') + pos.toString()).toString();
+
+		game.logs.push(log);
+
+		await this.reversiGamesRepository.update(game.id, {
+			crc32,
+			isEnded: o.isEnded,
+			winnerId: winner,
+			logs: game.logs,
+		});
+
+		this.globalEventService.publishReversiGameStream(game.id, 'putStone', {
+			...log,
+			next: o.turn,
+		});
+
+		if (o.isEnded) {
+			this.globalEventService.publishReversiGameStream(game.id, 'ended', {
+				winnerId: winner,
+				game: await this.reversiGameEntityService.packDetail(game.id, user),
+			});
+		}
+	}
+
+	@bindThis
+	public async surrender(game: MiReversiGame, user: MiUser) {
+		if (game.isEnded) return;
+		if ((game.user1Id !== user.id) && (game.user2Id !== user.id)) return;
+
+		const winnerId = game.user1Id === user.id ? game.user2Id : game.user1Id;
+
+		await this.reversiGamesRepository.update(game.id, {
+			surrendered: user.id,
+			isEnded: true,
+			winnerId: winnerId,
+		});
+
+		this.globalEventService.publishReversiGameStream(game.id, 'ended', {
+			winnerId: winnerId,
+			game: await this.reversiGameEntityService.packDetail(game.id, user),
+		});
+	}
+
+	@bindThis
+	public async get(id: MiReversiGame['id']) {
+		return this.reversiGamesRepository.findOneBy({ id });
+	}
+
+	@bindThis
+	public dispose(): void {
+	}
+
+	@bindThis
+	public onApplicationShutdown(signal?: string | undefined): void {
+		this.dispose();
+	}
+}
diff --git a/packages/backend/src/core/entities/ReversiGameEntityService.ts b/packages/backend/src/core/entities/ReversiGameEntityService.ts
new file mode 100644
index 0000000000..8d95204928
--- /dev/null
+++ b/packages/backend/src/core/entities/ReversiGameEntityService.ts
@@ -0,0 +1,115 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { DI } from '@/di-symbols.js';
+import type { ReversiGamesRepository } from '@/models/_.js';
+import { awaitAll } from '@/misc/prelude/await-all.js';
+import type { Packed } from '@/misc/json-schema.js';
+import type { } from '@/models/Blocking.js';
+import type { MiUser } from '@/models/User.js';
+import type { MiReversiGame } from '@/models/ReversiGame.js';
+import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
+import { UserEntityService } from './UserEntityService.js';
+
+@Injectable()
+export class ReversiGameEntityService {
+	constructor(
+		@Inject(DI.reversiGamesRepository)
+		private reversiGamesRepository: ReversiGamesRepository,
+
+		private userEntityService: UserEntityService,
+		private idService: IdService,
+	) {
+	}
+
+	@bindThis
+	public async packDetail(
+		src: MiReversiGame['id'] | MiReversiGame,
+		me?: { id: MiUser['id'] } | null | undefined,
+	): Promise<Packed<'ReversiGameDetailed'>> {
+		const game = typeof src === 'object' ? src : await this.reversiGamesRepository.findOneByOrFail({ id: src });
+
+		return await awaitAll({
+			id: game.id,
+			createdAt: this.idService.parse(game.id).date.toISOString(),
+			startedAt: game.startedAt && game.startedAt.toISOString(),
+			isStarted: game.isStarted,
+			isEnded: game.isEnded,
+			form1: game.form1,
+			form2: game.form2,
+			user1Ready: game.user1Ready,
+			user2Ready: game.user2Ready,
+			user1Id: game.user1Id,
+			user2Id: game.user2Id,
+			user1: this.userEntityService.pack(game.user1Id, me),
+			user2: this.userEntityService.pack(game.user2Id, me),
+			winnerId: game.winnerId,
+			winner: game.winnerId ? this.userEntityService.pack(game.winnerId, me) : null,
+			surrendered: game.surrendered,
+			black: game.black,
+			bw: game.bw,
+			isLlotheo: game.isLlotheo,
+			canPutEverywhere: game.canPutEverywhere,
+			loopedBoard: game.loopedBoard,
+			logs: game.logs.map(log => ({
+				at: log.at,
+				color: log.color,
+				pos: log.pos,
+			})),
+			map: game.map,
+		});
+	}
+
+	@bindThis
+	public packDetailMany(
+		xs: MiReversiGame[],
+		me?: { id: MiUser['id'] } | null | undefined,
+	) {
+		return Promise.all(xs.map(x => this.packDetail(x, me)));
+	}
+
+	@bindThis
+	public async packLite(
+		src: MiReversiGame['id'] | MiReversiGame,
+		me?: { id: MiUser['id'] } | null | undefined,
+	): Promise<Packed<'ReversiGameLite'>> {
+		const game = typeof src === 'object' ? src : await this.reversiGamesRepository.findOneByOrFail({ id: src });
+
+		return await awaitAll({
+			id: game.id,
+			createdAt: this.idService.parse(game.id).date.toISOString(),
+			startedAt: game.startedAt && game.startedAt.toISOString(),
+			isStarted: game.isStarted,
+			isEnded: game.isEnded,
+			form1: game.form1,
+			form2: game.form2,
+			user1Ready: game.user1Ready,
+			user2Ready: game.user2Ready,
+			user1Id: game.user1Id,
+			user2Id: game.user2Id,
+			user1: this.userEntityService.pack(game.user1Id, me),
+			user2: this.userEntityService.pack(game.user2Id, me),
+			winnerId: game.winnerId,
+			winner: game.winnerId ? this.userEntityService.pack(game.winnerId, me) : null,
+			surrendered: game.surrendered,
+			black: game.black,
+			bw: game.bw,
+			isLlotheo: game.isLlotheo,
+			canPutEverywhere: game.canPutEverywhere,
+			loopedBoard: game.loopedBoard,
+		});
+	}
+
+	@bindThis
+	public packLiteMany(
+		xs: MiReversiGame[],
+		me?: { id: MiUser['id'] } | null | undefined,
+	) {
+		return Promise.all(xs.map(x => this.packLite(x, me)));
+	}
+}
+
diff --git a/packages/backend/src/di-symbols.ts b/packages/backend/src/di-symbols.ts
index e29fee3f96..73de01f33a 100644
--- a/packages/backend/src/di-symbols.ts
+++ b/packages/backend/src/di-symbols.ts
@@ -79,5 +79,6 @@ export const DI = {
 	flashLikesRepository: Symbol('flashLikesRepository'),
 	userMemosRepository: Symbol('userMemosRepository'),
 	bubbleGameRecordsRepository: Symbol('bubbleGameRecordsRepository'),
+	reversiGamesRepository: Symbol('reversiGamesRepository'),
 	//#endregion
 };
diff --git a/packages/backend/src/misc/json-schema.ts b/packages/backend/src/misc/json-schema.ts
index 176978d35f..b4f0541712 100644
--- a/packages/backend/src/misc/json-schema.ts
+++ b/packages/backend/src/misc/json-schema.ts
@@ -39,6 +39,7 @@ import { packedAnnouncementSchema } from '@/models/json-schema/announcement.js';
 import { packedSigninSchema } from '@/models/json-schema/signin.js';
 import { packedRoleLiteSchema, packedRoleSchema } from '@/models/json-schema/role.js';
 import { packedAdSchema } from '@/models/json-schema/ad.js';
+import { packedReversiGameLiteSchema, packedReversiGameDetailedSchema } from '@/models/json-schema/reversi-game.js';
 
 export const refs = {
 	UserLite: packedUserLiteSchema,
@@ -78,6 +79,8 @@ export const refs = {
 	Signin: packedSigninSchema,
 	RoleLite: packedRoleLiteSchema,
 	Role: packedRoleSchema,
+	ReversiGameLite: packedReversiGameLiteSchema,
+	ReversiGameDetailed: packedReversiGameDetailedSchema,
 };
 
 export type Packed<x extends keyof typeof refs> = SchemaType<typeof refs[x]>;
diff --git a/packages/backend/src/models/RepositoryModule.ts b/packages/backend/src/models/RepositoryModule.ts
index 0399536c3e..2b2aaeb91c 100644
--- a/packages/backend/src/models/RepositoryModule.ts
+++ b/packages/backend/src/models/RepositoryModule.ts
@@ -5,7 +5,7 @@
 
 import { Module } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
-import { MiAbuseUserReport, MiAccessToken, MiAd, MiAnnouncement, MiAnnouncementRead, MiAntenna, MiApp, MiAuthSession, MiAvatarDecoration, MiBlocking, MiChannel, MiChannelFavorite, MiChannelFollowing, MiClip, MiClipFavorite, MiClipNote, MiDriveFile, MiDriveFolder, MiEmoji, MiFlash, MiFlashLike, MiFollowRequest, MiFollowing, MiGalleryLike, MiGalleryPost, MiHashtag, MiInstance, MiMeta, MiModerationLog, MiMuting, MiNote, MiNoteFavorite, MiNoteReaction, MiNoteThreadMuting, MiNoteUnread, MiPage, MiPageLike, MiPasswordResetRequest, MiPoll, MiPollVote, MiPromoNote, MiPromoRead, MiRegistrationTicket, MiRegistryItem, MiRelay, MiRenoteMuting, MiRetentionAggregation, MiRole, MiRoleAssignment, MiSignin, MiSwSubscription, MiUsedUsername, MiUser, MiUserIp, MiUserKeypair, MiUserList, MiUserListFavorite, MiUserListMembership, MiUserMemo, MiUserNotePining, MiUserPending, MiUserProfile, MiUserPublickey, MiUserSecurityKey, MiWebhook, MiBubbleGameRecord } from './_.js';
+import { MiAbuseUserReport, MiAccessToken, MiAd, MiAnnouncement, MiAnnouncementRead, MiAntenna, MiApp, MiAuthSession, MiAvatarDecoration, MiBlocking, MiChannel, MiChannelFavorite, MiChannelFollowing, MiClip, MiClipFavorite, MiClipNote, MiDriveFile, MiDriveFolder, MiEmoji, MiFlash, MiFlashLike, MiFollowRequest, MiFollowing, MiGalleryLike, MiGalleryPost, MiHashtag, MiInstance, MiMeta, MiModerationLog, MiMuting, MiNote, MiNoteFavorite, MiNoteReaction, MiNoteThreadMuting, MiNoteUnread, MiPage, MiPageLike, MiPasswordResetRequest, MiPoll, MiPollVote, MiPromoNote, MiPromoRead, MiRegistrationTicket, MiRegistryItem, MiRelay, MiRenoteMuting, MiRetentionAggregation, MiRole, MiRoleAssignment, MiSignin, MiSwSubscription, MiUsedUsername, MiUser, MiUserIp, MiUserKeypair, MiUserList, MiUserListFavorite, MiUserListMembership, MiUserMemo, MiUserNotePining, MiUserPending, MiUserProfile, MiUserPublickey, MiUserSecurityKey, MiWebhook, MiBubbleGameRecord, MiReversiGame } from './_.js';
 import type { DataSource } from 'typeorm';
 import type { Provider } from '@nestjs/common';
 
@@ -399,12 +399,18 @@ const $userMemosRepository: Provider = {
 	inject: [DI.db],
 };
 
-export const $bubbleGameRecordsRepository: Provider = {
+const $bubbleGameRecordsRepository: Provider = {
 	provide: DI.bubbleGameRecordsRepository,
 	useFactory: (db: DataSource) => db.getRepository(MiBubbleGameRecord),
 	inject: [DI.db],
 };
 
+const $reversiGamesRepository: Provider = {
+	provide: DI.reversiGamesRepository,
+	useFactory: (db: DataSource) => db.getRepository(MiReversiGame),
+	inject: [DI.db],
+};
+
 @Module({
 	imports: [
 	],
@@ -475,6 +481,7 @@ export const $bubbleGameRecordsRepository: Provider = {
 		$flashLikesRepository,
 		$userMemosRepository,
 		$bubbleGameRecordsRepository,
+		$reversiGamesRepository,
 	],
 	exports: [
 		$usersRepository,
@@ -543,6 +550,7 @@ export const $bubbleGameRecordsRepository: Provider = {
 		$flashLikesRepository,
 		$userMemosRepository,
 		$bubbleGameRecordsRepository,
+		$reversiGamesRepository,
 	],
 })
 export class RepositoryModule {}
diff --git a/packages/backend/src/models/ReversiGame.ts b/packages/backend/src/models/ReversiGame.ts
new file mode 100644
index 0000000000..d297d1f01d
--- /dev/null
+++ b/packages/backend/src/models/ReversiGame.ts
@@ -0,0 +1,127 @@
+import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from './util/id.js';
+import { MiUser } from './User.js';
+
+@Entity('reversi_game')
+export class MiReversiGame {
+	@PrimaryColumn(id())
+	public id: string;
+
+	@Column('timestamp with time zone', {
+		nullable: true,
+		comment: 'The started date of the ReversiGame.',
+	})
+	public startedAt: Date | null;
+
+	@Column(id())
+	public user1Id: MiUser['id'];
+
+	@ManyToOne(type => MiUser, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public user1: MiUser | null;
+
+	@Column(id())
+	public user2Id: MiUser['id'];
+
+	@ManyToOne(type => MiUser, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public user2: MiUser | null;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public user1Ready: boolean;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public user2Ready: boolean;
+
+	/**
+	 * どちらのプレイヤーが先行(黒)か
+	 * 1 ... user1
+	 * 2 ... user2
+	 */
+	@Column('integer', {
+		nullable: true,
+	})
+	public black: number | null;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public isStarted: boolean;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public isEnded: boolean;
+
+	@Column({
+		...id(),
+		nullable: true,
+	})
+	public winnerId: MiUser['id'] | null;
+
+	@Column({
+		...id(),
+		nullable: true,
+	})
+	public surrendered: MiUser['id'] | null;
+
+	@Column('jsonb', {
+		default: [],
+	})
+	public logs: {
+		at: number;
+		color: boolean;
+		pos: number;
+	}[];
+
+	@Column('varchar', {
+		array: true, length: 64,
+	})
+	public map: string[];
+
+	@Column('varchar', {
+		length: 32,
+	})
+	public bw: string;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public isLlotheo: boolean;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public canPutEverywhere: boolean;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public loopedBoard: boolean;
+
+	@Column('jsonb', {
+		nullable: true, default: null,
+	})
+	public form1: any | null;
+
+	@Column('jsonb', {
+		nullable: true, default: null,
+	})
+	public form2: any | null;
+
+	/**
+	 * ログのposを文字列としてすべて連結したもののCRC32値
+	 */
+	@Column('varchar', {
+		length: 32, nullable: true,
+	})
+	public crc32: string | null;
+}
diff --git a/packages/backend/src/models/_.ts b/packages/backend/src/models/_.ts
index a1c4b0743e..a1a0d8823d 100644
--- a/packages/backend/src/models/_.ts
+++ b/packages/backend/src/models/_.ts
@@ -69,6 +69,8 @@ import { MiFlash } from '@/models/Flash.js';
 import { MiFlashLike } from '@/models/FlashLike.js';
 import { MiUserListFavorite } from '@/models/UserListFavorite.js';
 import { MiBubbleGameRecord } from '@/models/BubbleGameRecord.js';
+import { MiReversiGame } from '@/models/ReversiGame.js';
+
 import type { Repository } from 'typeorm';
 
 export {
@@ -138,6 +140,7 @@ export {
 	MiFlashLike,
 	MiUserMemo,
 	MiBubbleGameRecord,
+	MiReversiGame,
 };
 
 export type AbuseUserReportsRepository = Repository<MiAbuseUserReport>;
@@ -206,3 +209,4 @@ export type FlashsRepository = Repository<MiFlash>;
 export type FlashLikesRepository = Repository<MiFlashLike>;
 export type UserMemoRepository = Repository<MiUserMemo>;
 export type BubbleGameRecordsRepository = Repository<MiBubbleGameRecord>;
+export type ReversiGamesRepository = Repository<MiReversiGame>;
diff --git a/packages/backend/src/models/json-schema/reversi-game.ts b/packages/backend/src/models/json-schema/reversi-game.ts
new file mode 100644
index 0000000000..0d23b9dc79
--- /dev/null
+++ b/packages/backend/src/models/json-schema/reversi-game.ts
@@ -0,0 +1,234 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export const packedReversiGameLiteSchema = {
+	type: 'object',
+	properties: {
+		id: {
+			type: 'string',
+			optional: false, nullable: false,
+			format: 'id',
+		},
+		createdAt: {
+			type: 'string',
+			optional: false, nullable: false,
+			format: 'date-time',
+		},
+		startedAt: {
+			type: 'string',
+			optional: false, nullable: true,
+			format: 'date-time',
+		},
+		isStarted: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		isEnded: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		form1: {
+			type: 'any',
+			optional: false, nullable: true,
+		},
+		form2: {
+			type: 'any',
+			optional: false, nullable: true,
+		},
+		user1Ready: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		user2Ready: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		user1Id: {
+			type: 'string',
+			optional: false, nullable: false,
+			format: 'id',
+		},
+		user2Id: {
+			type: 'string',
+			optional: false, nullable: false,
+			format: 'id',
+		},
+		user1: {
+			type: 'object',
+			optional: false, nullable: false,
+			ref: 'User',
+		},
+		user2: {
+			type: 'object',
+			optional: false, nullable: false,
+			ref: 'User',
+		},
+		winnerId: {
+			type: 'string',
+			optional: false, nullable: true,
+			format: 'id',
+		},
+		winner: {
+			type: 'object',
+			optional: false, nullable: true,
+			ref: 'User',
+		},
+		surrendered: {
+			type: 'string',
+			optional: false, nullable: true,
+			format: 'id',
+		},
+		black: {
+			type: 'number',
+			optional: false, nullable: true,
+		},
+		bw: {
+			type: 'string',
+			optional: false, nullable: false,
+		},
+		isLlotheo: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		canPutEverywhere: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		loopedBoard: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+	},
+} as const;
+
+export const packedReversiGameDetailedSchema = {
+	type: 'object',
+	properties: {
+		id: {
+			type: 'string',
+			optional: false, nullable: false,
+			format: 'id',
+		},
+		createdAt: {
+			type: 'string',
+			optional: false, nullable: false,
+			format: 'date-time',
+		},
+		startedAt: {
+			type: 'string',
+			optional: false, nullable: true,
+			format: 'date-time',
+		},
+		isStarted: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		isEnded: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		form1: {
+			type: 'any',
+			optional: false, nullable: true,
+		},
+		form2: {
+			type: 'any',
+			optional: false, nullable: true,
+		},
+		user1Ready: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		user2Ready: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		user1Id: {
+			type: 'string',
+			optional: false, nullable: false,
+			format: 'id',
+		},
+		user2Id: {
+			type: 'string',
+			optional: false, nullable: false,
+			format: 'id',
+		},
+		user1: {
+			type: 'object',
+			optional: false, nullable: false,
+			ref: 'User',
+		},
+		user2: {
+			type: 'object',
+			optional: false, nullable: false,
+			ref: 'User',
+		},
+		winnerId: {
+			type: 'string',
+			optional: false, nullable: true,
+			format: 'id',
+		},
+		winner: {
+			type: 'object',
+			optional: false, nullable: true,
+			ref: 'User',
+		},
+		surrendered: {
+			type: 'string',
+			optional: false, nullable: true,
+			format: 'id',
+		},
+		black: {
+			type: 'number',
+			optional: false, nullable: true,
+		},
+		bw: {
+			type: 'string',
+			optional: false, nullable: false,
+		},
+		isLlotheo: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		canPutEverywhere: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		loopedBoard: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
+		logs: {
+			type: 'array',
+			optional: false, nullable: false,
+			items: {
+				type: 'object',
+				optional: false, nullable: false,
+				properties: {
+					at: {
+						type: 'number',
+						optional: false, nullable: false,
+					},
+					color: {
+						type: 'boolean',
+						optional: false, nullable: false,
+					},
+					pos: {
+						type: 'number',
+						optional: false, nullable: false,
+					},
+				},
+			},
+		},
+		map: {
+			type: 'array',
+			optional: false, nullable: false,
+			items: {
+				type: 'string',
+				optional: false, nullable: false,
+			},
+		},
+	},
+} as const;
diff --git a/packages/backend/src/postgres.ts b/packages/backend/src/postgres.ts
index 0430e9ca19..1e063c8673 100644
--- a/packages/backend/src/postgres.ts
+++ b/packages/backend/src/postgres.ts
@@ -77,6 +77,7 @@ import { MiFlash } from '@/models/Flash.js';
 import { MiFlashLike } from '@/models/FlashLike.js';
 import { MiUserMemo } from '@/models/UserMemo.js';
 import { MiBubbleGameRecord } from '@/models/BubbleGameRecord.js';
+import { MiReversiGame } from '@/models/ReversiGame.js';
 
 import { Config } from '@/config.js';
 import MisskeyLogger from '@/logger.js';
@@ -192,6 +193,7 @@ export const entities = [
 	MiFlashLike,
 	MiUserMemo,
 	MiBubbleGameRecord,
+	MiReversiGame,
 	...charts,
 ];
 
diff --git a/packages/backend/src/server/ServerModule.ts b/packages/backend/src/server/ServerModule.ts
index fa81380f01..aed352d15e 100644
--- a/packages/backend/src/server/ServerModule.ts
+++ b/packages/backend/src/server/ServerModule.ts
@@ -22,9 +22,13 @@ import { SigninApiService } from './api/SigninApiService.js';
 import { SigninService } from './api/SigninService.js';
 import { SignupApiService } from './api/SignupApiService.js';
 import { StreamingApiServerService } from './api/StreamingApiServerService.js';
+import { OpenApiServerService } from './api/openapi/OpenApiServerService.js';
 import { ClientServerService } from './web/ClientServerService.js';
 import { FeedService } from './web/FeedService.js';
 import { UrlPreviewService } from './web/UrlPreviewService.js';
+import { ClientLoggerService } from './web/ClientLoggerService.js';
+import { OAuth2ProviderService } from './oauth/OAuth2ProviderService.js';
+
 import { MainChannelService } from './api/stream/channels/main.js';
 import { AdminChannelService } from './api/stream/channels/admin.js';
 import { AntennaChannelService } from './api/stream/channels/antenna.js';
@@ -38,10 +42,9 @@ import { LocalTimelineChannelService } from './api/stream/channels/local-timelin
 import { QueueStatsChannelService } from './api/stream/channels/queue-stats.js';
 import { ServerStatsChannelService } from './api/stream/channels/server-stats.js';
 import { UserListChannelService } from './api/stream/channels/user-list.js';
-import { OpenApiServerService } from './api/openapi/OpenApiServerService.js';
-import { ClientLoggerService } from './web/ClientLoggerService.js';
 import { RoleTimelineChannelService } from './api/stream/channels/role-timeline.js';
-import { OAuth2ProviderService } from './oauth/OAuth2ProviderService.js';
+import { ReversiChannelService } from './api/stream/channels/reversi.js';
+import { ReversiGameChannelService } from './api/stream/channels/reversi-game.js';
 
 @Module({
 	imports: [
@@ -77,6 +80,8 @@ import { OAuth2ProviderService } from './oauth/OAuth2ProviderService.js';
 		GlobalTimelineChannelService,
 		HashtagChannelService,
 		RoleTimelineChannelService,
+		ReversiChannelService,
+		ReversiGameChannelService,
 		HomeTimelineChannelService,
 		HybridTimelineChannelService,
 		LocalTimelineChannelService,
diff --git a/packages/backend/src/server/api/EndpointsModule.ts b/packages/backend/src/server/api/EndpointsModule.ts
index 781332d349..df69ce2385 100644
--- a/packages/backend/src/server/api/EndpointsModule.ts
+++ b/packages/backend/src/server/api/EndpointsModule.ts
@@ -366,6 +366,12 @@ import * as ep___fetchExternalResources from './endpoints/fetch-external-resourc
 import * as ep___retention from './endpoints/retention.js';
 import * as ep___bubbleGame_register from './endpoints/bubble-game/register.js';
 import * as ep___bubbleGame_ranking from './endpoints/bubble-game/ranking.js';
+import * as ep___reversi_cancelMatch from './endpoints/reversi/cancel-match.js';
+import * as ep___reversi_games from './endpoints/reversi/games.js';
+import * as ep___reversi_match from './endpoints/reversi/match.js';
+import * as ep___reversi_invitations from './endpoints/reversi/invitations.js';
+import * as ep___reversi_showGame from './endpoints/reversi/show-game.js';
+import * as ep___reversi_surrender from './endpoints/reversi/surrender.js';
 import { GetterService } from './GetterService.js';
 import { ApiLoggerService } from './ApiLoggerService.js';
 import type { Provider } from '@nestjs/common';
@@ -730,6 +736,12 @@ const $fetchExternalResources: Provider = { provide: 'ep:fetch-external-resource
 const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention.default };
 const $bubbleGame_register: Provider = { provide: 'ep:bubble-game/register', useClass: ep___bubbleGame_register.default };
 const $bubbleGame_ranking: Provider = { provide: 'ep:bubble-game/ranking', useClass: ep___bubbleGame_ranking.default };
+const $reversi_cancelMatch: Provider = { provide: 'ep:reversi/cancel-match', useClass: ep___reversi_cancelMatch.default };
+const $reversi_games: Provider = { provide: 'ep:reversi/games', useClass: ep___reversi_games.default };
+const $reversi_match: Provider = { provide: 'ep:reversi/match', useClass: ep___reversi_match.default };
+const $reversi_invitations: Provider = { provide: 'ep:reversi/invitations', useClass: ep___reversi_invitations.default };
+const $reversi_showGame: Provider = { provide: 'ep:reversi/show-game', useClass: ep___reversi_showGame.default };
+const $reversi_surrender: Provider = { provide: 'ep:reversi/surrender', useClass: ep___reversi_surrender.default };
 
 @Module({
 	imports: [
@@ -1098,6 +1110,12 @@ const $bubbleGame_ranking: Provider = { provide: 'ep:bubble-game/ranking', useCl
 		$retention,
 		$bubbleGame_register,
 		$bubbleGame_ranking,
+		$reversi_cancelMatch,
+		$reversi_games,
+		$reversi_match,
+		$reversi_invitations,
+		$reversi_showGame,
+		$reversi_surrender,
 	],
 	exports: [
 		$admin_meta,
@@ -1457,6 +1475,12 @@ const $bubbleGame_ranking: Provider = { provide: 'ep:bubble-game/ranking', useCl
 		$retention,
 		$bubbleGame_register,
 		$bubbleGame_ranking,
+		$reversi_cancelMatch,
+		$reversi_games,
+		$reversi_match,
+		$reversi_invitations,
+		$reversi_showGame,
+		$reversi_surrender,
 	],
 })
 export class EndpointsModule {}
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index f17db41a5d..0f2c8cb754 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -367,6 +367,12 @@ import * as ep___fetchExternalResources from './endpoints/fetch-external-resourc
 import * as ep___retention from './endpoints/retention.js';
 import * as ep___bubbleGame_register from './endpoints/bubble-game/register.js';
 import * as ep___bubbleGame_ranking from './endpoints/bubble-game/ranking.js';
+import * as ep___reversi_cancelMatch from './endpoints/reversi/cancel-match.js';
+import * as ep___reversi_games from './endpoints/reversi/games.js';
+import * as ep___reversi_match from './endpoints/reversi/match.js';
+import * as ep___reversi_invitations from './endpoints/reversi/invitations.js';
+import * as ep___reversi_showGame from './endpoints/reversi/show-game.js';
+import * as ep___reversi_surrender from './endpoints/reversi/surrender.js';
 
 const eps = [
 	['admin/meta', ep___admin_meta],
@@ -729,6 +735,12 @@ const eps = [
 	['retention', ep___retention],
 	['bubble-game/register', ep___bubbleGame_register],
 	['bubble-game/ranking', ep___bubbleGame_ranking],
+	['reversi/cancel-match', ep___reversi_cancelMatch],
+	['reversi/games', ep___reversi_games],
+	['reversi/match', ep___reversi_match],
+	['reversi/invitations', ep___reversi_invitations],
+	['reversi/show-game', ep___reversi_showGame],
+	['reversi/surrender', ep___reversi_surrender],
 ];
 
 interface IEndpointMetaBase {
diff --git a/packages/backend/src/server/api/endpoints/renote-mute/create.ts b/packages/backend/src/server/api/endpoints/renote-mute/create.ts
index 7ff7b5de3a..2d853b94f3 100644
--- a/packages/backend/src/server/api/endpoints/renote-mute/create.ts
+++ b/packages/backend/src/server/api/endpoints/renote-mute/create.ts
@@ -73,7 +73,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}
 
 			// Get mutee
-			const mutee = await getterService.getUser(ps.userId).catch(err => {
+			const mutee = await this.getterService.getUser(ps.userId).catch(err => {
 				if (err.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
 				throw err;
 			});
diff --git a/packages/backend/src/server/api/endpoints/reversi/cancel-match.ts b/packages/backend/src/server/api/endpoints/reversi/cancel-match.ts
new file mode 100644
index 0000000000..8edc049500
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/reversi/cancel-match.ts
@@ -0,0 +1,44 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ReversiService } from '@/core/ReversiService.js';
+
+export const meta = {
+	requireCredential: true,
+
+	kind: 'write:account',
+
+	errors: {
+	},
+
+	res: {
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		userId: { type: 'string', format: 'misskey:id', nullable: true },
+	},
+	required: [],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private reversiService: ReversiService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			if (ps.userId) {
+				await this.reversiService.matchSpecificUserCancel(me, ps.userId);
+				return;
+			} else {
+				await this.reversiService.matchAnyUserCancel(me);
+			}
+		});
+	}
+}
diff --git a/packages/backend/src/server/api/endpoints/reversi/games.ts b/packages/backend/src/server/api/endpoints/reversi/games.ts
new file mode 100644
index 0000000000..5322cd0987
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/reversi/games.ts
@@ -0,0 +1,61 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { Brackets } from 'typeorm';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ReversiGameEntityService } from '@/core/entities/ReversiGameEntityService.js';
+import { DI } from '@/di-symbols.js';
+import type { ReversiGamesRepository } from '@/models/_.js';
+import { QueryService } from '@/core/QueryService.js';
+
+export const meta = {
+	requireCredential: false,
+
+	res: {
+		type: 'array',
+		optional: false, nullable: false,
+		items: { ref: 'ReversiGameLite' },
+	},
+} 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' },
+		my: { type: 'boolean', default: false },
+	},
+	required: [],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		@Inject(DI.reversiGamesRepository)
+		private reversiGamesRepository: ReversiGamesRepository,
+
+		private reversiGameEntityService: ReversiGameEntityService,
+		private queryService: QueryService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			const query = this.queryService.makePaginationQuery(this.reversiGamesRepository.createQueryBuilder('game'), ps.sinceId, ps.untilId)
+				.andWhere('game.isStarted = TRUE');
+
+			if (ps.my && me) {
+				query.andWhere(new Brackets(qb => {
+					qb
+						.where('game.user1Id = :userId', { userId: me.id })
+						.orWhere('game.user2Id = :userId', { userId: me.id });
+				}));
+			}
+
+			const games = await query.take(ps.limit).getMany();
+
+			return await this.reversiGameEntityService.packLiteMany(games, me);
+		});
+	}
+}
diff --git a/packages/backend/src/server/api/endpoints/reversi/invitations.ts b/packages/backend/src/server/api/endpoints/reversi/invitations.ts
new file mode 100644
index 0000000000..0b7107bb0d
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/reversi/invitations.ts
@@ -0,0 +1,39 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { DI } from '@/di-symbols.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { ReversiService } from '@/core/ReversiService.js';
+
+export const meta = {
+	requireCredential: true,
+
+	kind: 'read:account',
+
+	res: {
+		type: 'array',
+		optional: false, nullable: false,
+		items: { ref: 'UserLite' },
+	},
+} as const;
+
+export const paramDef = {
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private userEntityService: UserEntityService,
+		private reversiService: ReversiService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			const invitations = await this.reversiService.getInvitations(me);
+
+			return await this.userEntityService.packMany(invitations, me);
+		});
+	}
+}
diff --git a/packages/backend/src/server/api/endpoints/reversi/match.ts b/packages/backend/src/server/api/endpoints/reversi/match.ts
new file mode 100644
index 0000000000..da5a3409ef
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/reversi/match.ts
@@ -0,0 +1,66 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ReversiService } from '@/core/ReversiService.js';
+import { ReversiGameEntityService } from '@/core/entities/ReversiGameEntityService.js';
+import { ApiError } from '../../error.js';
+import { GetterService } from '../../GetterService.js';
+
+export const meta = {
+	requireCredential: true,
+
+	kind: 'write:account',
+
+	errors: {
+		noSuchUser: {
+			message: 'No such user.',
+			code: 'NO_SUCH_USER',
+			id: '0b4f0559-b484-4e31-9581-3f73cee89b28',
+		},
+
+		isYourself: {
+			message: 'Target user is yourself.',
+			code: 'TARGET_IS_YOURSELF',
+			id: '96fd7bd6-d2bc-426c-a865-d055dcd2828e',
+		},
+	},
+
+	res: {
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		userId: { type: 'string', format: 'misskey:id', nullable: true },
+	},
+	required: [],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private getterService: GetterService,
+		private reversiService: ReversiService,
+		private reversiGameEntityService: ReversiGameEntityService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			if (ps.userId === me.id) throw new ApiError(meta.errors.isYourself);
+
+			const target = ps.userId ? await this.getterService.getUser(ps.userId).catch(err => {
+				if (err.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+				throw err;
+			}) : null;
+
+			const game = target ? await this.reversiService.matchSpecificUser(me, target) : await this.reversiService.matchAnyUser(me);
+
+			if (game == null) return;
+
+			return await this.reversiGameEntityService.packDetail(game, me);
+		});
+	}
+}
diff --git a/packages/backend/src/server/api/endpoints/reversi/show-game.ts b/packages/backend/src/server/api/endpoints/reversi/show-game.ts
new file mode 100644
index 0000000000..de571053e1
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/reversi/show-game.ts
@@ -0,0 +1,54 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ReversiService } from '@/core/ReversiService.js';
+import { ReversiGameEntityService } from '@/core/entities/ReversiGameEntityService.js';
+import { ApiError } from '../../error.js';
+
+export const meta = {
+	requireCredential: false,
+
+	errors: {
+		noSuchGame: {
+			message: 'No such game.',
+			code: 'NO_SUCH_GAME',
+			id: 'f13a03db-fae1-46c9-87f3-43c8165419e1',
+		},
+	},
+
+	res: {
+		type: 'object',
+		optional: false, nullable: false,
+		ref: 'ReversiGameDetailed',
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		gameId: { type: 'string', format: 'misskey:id' },
+	},
+	required: ['gameId'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private reversiService: ReversiService,
+		private reversiGameEntityService: ReversiGameEntityService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			const game = await this.reversiService.get(ps.gameId);
+
+			if (game == null) {
+				throw new ApiError(meta.errors.noSuchGame);
+			}
+
+			return await this.reversiGameEntityService.packDetail(game, me);
+		});
+	}
+}
diff --git a/packages/backend/src/server/api/endpoints/reversi/surrender.ts b/packages/backend/src/server/api/endpoints/reversi/surrender.ts
new file mode 100644
index 0000000000..c47d36be33
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/reversi/surrender.ts
@@ -0,0 +1,68 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ReversiService } from '@/core/ReversiService.js';
+import { ApiError } from '../../error.js';
+
+export const meta = {
+	requireCredential: true,
+
+	kind: 'write:account',
+
+	errors: {
+		noSuchGame: {
+			message: 'No such game.',
+			code: 'NO_SUCH_GAME',
+			id: 'ace0b11f-e0a6-4076-a30d-e8284c81b2df',
+		},
+
+		alreadyEnded: {
+			message: 'That game has already ended.',
+			code: 'ALREADY_ENDED',
+			id: '6c2ad4a6-cbf1-4a5b-b187-b772826cfc6d',
+		},
+
+		accessDenied: {
+			message: 'Access denied.',
+			code: 'ACCESS_DENIED',
+			id: '6e04164b-a992-4c93-8489-2123069973e1',
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		gameId: { type: 'string', format: 'misskey:id' },
+	},
+	required: ['gameId'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private reversiService: ReversiService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			const game = await this.reversiService.get(ps.gameId);
+
+			if (game == null) {
+				throw new ApiError(meta.errors.noSuchGame);
+			}
+
+			if (game.isEnded) {
+				throw new ApiError(meta.errors.alreadyEnded);
+			}
+
+			if ((game.user1Id !== me.id) && (game.user2Id !== me.id)) {
+				throw new ApiError(meta.errors.accessDenied);
+			}
+
+			await this.reversiService.surrender(game, me);
+		});
+	}
+}
diff --git a/packages/backend/src/server/api/stream/ChannelsService.ts b/packages/backend/src/server/api/stream/ChannelsService.ts
index 3bc5380132..998429dd0a 100644
--- a/packages/backend/src/server/api/stream/ChannelsService.ts
+++ b/packages/backend/src/server/api/stream/ChannelsService.ts
@@ -19,6 +19,8 @@ import { AntennaChannelService } from './channels/antenna.js';
 import { DriveChannelService } from './channels/drive.js';
 import { HashtagChannelService } from './channels/hashtag.js';
 import { RoleTimelineChannelService } from './channels/role-timeline.js';
+import { ReversiChannelService } from './channels/reversi.js';
+import { ReversiGameChannelService } from './channels/reversi-game.js';
 import { type MiChannelService } from './channel.js';
 
 @Injectable()
@@ -38,6 +40,8 @@ export class ChannelsService {
 		private serverStatsChannelService: ServerStatsChannelService,
 		private queueStatsChannelService: QueueStatsChannelService,
 		private adminChannelService: AdminChannelService,
+		private reversiChannelService: ReversiChannelService,
+		private reversiGameChannelService: ReversiGameChannelService,
 	) {
 	}
 
@@ -58,6 +62,8 @@ export class ChannelsService {
 			case 'serverStats': return this.serverStatsChannelService;
 			case 'queueStats': return this.queueStatsChannelService;
 			case 'admin': return this.adminChannelService;
+			case 'reversi': return this.reversiChannelService;
+			case 'reversiGame': return this.reversiGameChannelService;
 
 			default:
 				throw new Error(`no such channel: ${name}`);
diff --git a/packages/backend/src/server/api/stream/channels/reversi-game.ts b/packages/backend/src/server/api/stream/channels/reversi-game.ts
new file mode 100644
index 0000000000..c67c05fb09
--- /dev/null
+++ b/packages/backend/src/server/api/stream/channels/reversi-game.ts
@@ -0,0 +1,130 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import type { MiReversiGame, ReversiGamesRepository } from '@/models/_.js';
+import { DI } from '@/di-symbols.js';
+import { bindThis } from '@/decorators.js';
+import { ReversiService } from '@/core/ReversiService.js';
+import { ReversiGameEntityService } from '@/core/entities/ReversiGameEntityService.js';
+import Channel, { type MiChannelService } from '../channel.js';
+
+class ReversiGameChannel extends Channel {
+	public readonly chName = 'reversiGame';
+	public static shouldShare = false;
+	public static requireCredential = false as const;
+	private gameId: MiReversiGame['id'] | null = null;
+
+	constructor(
+		private reversiService: ReversiService,
+		private reversiGamesRepository: ReversiGamesRepository,
+		private reversiGameEntityService: ReversiGameEntityService,
+
+		id: string,
+		connection: Channel['connection'],
+	) {
+		super(id, connection);
+	}
+
+	@bindThis
+	public async init(params: any) {
+		this.gameId = params.gameId as string;
+
+		const game = await this.reversiGamesRepository.findOneBy({
+			id: this.gameId,
+		});
+		if (game == null) return;
+
+		this.subscriber.on(`reversiGameStream:${this.gameId}`, this.send);
+	}
+
+	@bindThis
+	public onMessage(type: string, body: any) {
+		switch (type) {
+			case 'ready': this.ready(body); break;
+			case 'updateSettings': this.updateSettings(body.key, body.value); break;
+			case 'putStone': this.putStone(body.pos); break;
+			case 'syncState': this.syncState(body.crc32); break;
+		}
+	}
+
+	@bindThis
+	private async updateSettings(key: string, value: any) {
+		if (this.user == null) return;
+
+		// TODO: キャッシュしたい
+		const game = await this.reversiGamesRepository.findOneBy({ id: this.gameId! });
+		if (game == null) throw new Error('game not found');
+
+		this.reversiService.updateSettings(game, this.user, key, value);
+	}
+
+	@bindThis
+	private async ready(ready: boolean) {
+		if (this.user == null) return;
+
+		const game = await this.reversiGamesRepository.findOneBy({ id: this.gameId! });
+		if (game == null) throw new Error('game not found');
+
+		this.reversiService.gameReady(game, this.user, ready);
+	}
+
+	@bindThis
+	private async putStone(pos: number) {
+		if (this.user == null) return;
+
+		// TODO: キャッシュしたい
+		const game = await this.reversiGamesRepository.findOneBy({ id: this.gameId! });
+		if (game == null) throw new Error('game not found');
+
+		this.reversiService.putStoneToGame(game, this.user, pos);
+	}
+
+	@bindThis
+	private async syncState(crc32: string | number) {
+		// TODO: キャッシュしたい
+		const game = await this.reversiGamesRepository.findOneBy({ id: this.gameId! });
+		if (game == null) throw new Error('game not found');
+
+		if (!game.isStarted) return;
+
+		if (crc32.toString() !== game.crc32) {
+			this.send('rescue', await this.reversiGameEntityService.packDetail(game, this.user));
+		}
+	}
+
+	@bindThis
+	public dispose() {
+		// Unsubscribe events
+		this.subscriber.off(`reversiGameStream:${this.gameId}`, this.send);
+	}
+}
+
+@Injectable()
+export class ReversiGameChannelService implements MiChannelService<false> {
+	public readonly shouldShare = ReversiGameChannel.shouldShare;
+	public readonly requireCredential = ReversiGameChannel.requireCredential;
+	public readonly kind = ReversiGameChannel.kind;
+
+	constructor(
+		@Inject(DI.reversiGamesRepository)
+		private reversiGamesRepository: ReversiGamesRepository,
+
+		private reversiService: ReversiService,
+		private reversiGameEntityService: ReversiGameEntityService,
+	) {
+	}
+
+	@bindThis
+	public create(id: string, connection: Channel['connection']): ReversiGameChannel {
+		return new ReversiGameChannel(
+			this.reversiService,
+			this.reversiGamesRepository,
+			this.reversiGameEntityService,
+			id,
+			connection,
+		);
+	}
+}
diff --git a/packages/backend/src/server/api/stream/channels/reversi.ts b/packages/backend/src/server/api/stream/channels/reversi.ts
new file mode 100644
index 0000000000..cb4b1b8d5a
--- /dev/null
+++ b/packages/backend/src/server/api/stream/channels/reversi.ts
@@ -0,0 +1,52 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { bindThis } from '@/decorators.js';
+import Channel, { type MiChannelService } from '../channel.js';
+
+class ReversiChannel extends Channel {
+	public readonly chName = 'reversi';
+	public static shouldShare = true;
+	public static requireCredential = true as const;
+	public static kind = 'read:account';
+
+	constructor(
+		id: string,
+		connection: Channel['connection'],
+	) {
+		super(id, connection);
+	}
+
+	@bindThis
+	public async init(params: any) {
+		this.subscriber.on(`reversiStream:${this.user!.id}`, this.send);
+	}
+
+	@bindThis
+	public dispose() {
+		// Unsubscribe events
+		this.subscriber.off(`reversiStream:${this.user!.id}`, this.send);
+	}
+}
+
+@Injectable()
+export class ReversiChannelService implements MiChannelService<true> {
+	public readonly shouldShare = ReversiChannel.shouldShare;
+	public readonly requireCredential = ReversiChannel.requireCredential;
+	public readonly kind = ReversiChannel.kind;
+
+	constructor(
+	) {
+	}
+
+	@bindThis
+	public create(id: string, connection: Channel['connection']): ReversiChannel {
+		return new ReversiChannel(
+			id,
+			connection,
+		);
+	}
+}
diff --git a/packages/frontend/assets/reversi/logo.png b/packages/frontend/assets/reversi/logo.png
new file mode 100644
index 0000000000..7d807ef1dc
Binary files /dev/null and b/packages/frontend/assets/reversi/logo.png differ
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 8c3ce30668..a9a68601fc 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -41,6 +41,7 @@
 		"chartjs-plugin-zoom": "2.0.1",
 		"chromatic": "10.1.0",
 		"compare-versions": "6.1.0",
+		"crc-32": "^1.2.2",
 		"cropperjs": "2.0.0-beta.4",
 		"date-fns": "2.30.0",
 		"escape-regexp": "0.0.1",
@@ -53,6 +54,7 @@
 		"matter-js": "0.19.0",
 		"mfm-js": "0.24.0",
 		"misskey-js": "workspace:*",
+		"misskey-reversi": "workspace:*",
 		"photoswipe": "5.4.3",
 		"punycode": "2.3.1",
 		"rollup": "4.9.1",
diff --git a/packages/frontend/src/components/MkRadios.vue b/packages/frontend/src/components/MkRadios.vue
index d9178f3362..22e7ed1ef7 100644
--- a/packages/frontend/src/components/MkRadios.vue
+++ b/packages/frontend/src/components/MkRadios.vue
@@ -18,6 +18,9 @@ export default defineComponent({
 		watch(value, () => {
 			context.emit('update:modelValue', value.value);
 		});
+		watch(() => props.modelValue, v => {
+			value.value = v;
+		});
 		if (!context.slots.default) return null;
 		let options = context.slots.default();
 		const label = context.slots.label && context.slots.label();
diff --git a/packages/frontend/src/components/MkSelect.vue b/packages/frontend/src/components/MkSelect.vue
index 33b8a9a86d..16416fd2e4 100644
--- a/packages/frontend/src/components/MkSelect.vue
+++ b/packages/frontend/src/components/MkSelect.vue
@@ -52,7 +52,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	(ev: 'change', _ev: KeyboardEvent): void;
+	(ev: 'changeByUser'): void;
 	(ev: 'update:modelValue', value: string | null): void;
 }>();
 
@@ -77,7 +77,6 @@ const height =
 const focus = () => inputEl.value.focus();
 const onInput = (ev) => {
 	changed.value = true;
-	emit('change', ev);
 };
 
 const updated = () => {
@@ -136,6 +135,7 @@ function show(ev: MouseEvent) {
 			active: computed(() => v.value === option.props.value),
 			action: () => {
 				v.value = option.props.value;
+				emit('changeByUser', v.value);
 			},
 		});
 	};
diff --git a/packages/frontend/src/components/MkUserSelectDialog.vue b/packages/frontend/src/components/MkUserSelectDialog.vue
index f4aa06950d..ad11ba1940 100644
--- a/packages/frontend/src/components/MkUserSelectDialog.vue
+++ b/packages/frontend/src/components/MkUserSelectDialog.vue
@@ -85,7 +85,7 @@ const recentUsers = ref<Misskey.entities.UserDetailed[]>([]);
 const selected = ref<Misskey.entities.UserDetailed | null>(null);
 const dialogEl = ref();
 
-const search = () => {
+function search() {
 	if (username.value === '' && host.value === '') {
 		users.value = [];
 		return;
@@ -98,9 +98,9 @@ const search = () => {
 	}).then(_users => {
 		users.value = _users;
 	});
-};
+}
 
-const ok = () => {
+function ok() {
 	if (selected.value == null) return;
 	emit('ok', selected.value);
 	dialogEl.value.close();
@@ -110,12 +110,12 @@ const ok = () => {
 	recents = recents.filter(x => x !== selected.value.id);
 	recents.unshift(selected.value.id);
 	defaultStore.set('recentlyUsedUsers', recents.splice(0, 16));
-};
+}
 
-const cancel = () => {
+function cancel() {
 	emit('cancel');
 	dialogEl.value.close();
-};
+}
 
 onMounted(() => {
 	misskeyApi('users/show', {
diff --git a/packages/frontend/src/global/router/definition.ts b/packages/frontend/src/global/router/definition.ts
index 8e1c178ea2..0333770a64 100644
--- a/packages/frontend/src/global/router/definition.ts
+++ b/packages/frontend/src/global/router/definition.ts
@@ -15,6 +15,7 @@ const page = (loader: AsyncComponentLoader<any>) => defineAsyncComponent({
 	loadingComponent: MkLoading,
 	errorComponent: MkError,
 });
+
 const routes = [{
 	path: '/@:initUser/pages/:initPageName/view-source',
 	component: page(() => import('@/pages/page-editor/page-editor.vue')),
@@ -528,18 +529,26 @@ const routes = [{
 	path: '/timeline/antenna/:antennaId',
 	component: page(() => import('@/pages/antenna-timeline.vue')),
 	loginRequired: true,
-}, {
-	path: '/games',
-	component: page(() => import('@/pages/games.vue')),
-	loginRequired: true,
 }, {
 	path: '/clicker',
 	component: page(() => import('@/pages/clicker.vue')),
 	loginRequired: true,
+}, {
+	path: '/games',
+	component: page(() => import('@/pages/games.vue')),
+	loginRequired: false,
 }, {
 	path: '/bubble-game',
 	component: page(() => import('@/pages/drop-and-fusion.vue')),
 	loginRequired: true,
+}, {
+	path: '/reversi',
+	component: page(() => import('@/pages/reversi/index.vue')),
+	loginRequired: false,
+}, {
+	path: '/reversi/g/:gameId',
+	component: page(() => import('@/pages/reversi/game.vue')),
+	loginRequired: false,
 }, {
 	path: '/timeline',
 	component: page(() => import('@/pages/timeline.vue')),
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index a63d61bb8f..9fc3603af0 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -419,7 +419,7 @@ export function form(title, form) {
 	});
 }
 
-export async function selectUser(opts: { includeSelf?: boolean } = {}) {
+export async function selectUser(opts: { includeSelf?: boolean } = {}): Promise<Misskey.entities.UserLite> {
 	return new Promise((resolve, reject) => {
 		popup(defineAsyncComponent(() => import('@/components/MkUserSelectDialog.vue')), {
 			includeSelf: opts.includeSelf,
diff --git a/packages/frontend/src/pages/drop-and-fusion.vue b/packages/frontend/src/pages/drop-and-fusion.vue
index dd3b189c9d..beb2e714e0 100644
--- a/packages/frontend/src/pages/drop-and-fusion.vue
+++ b/packages/frontend/src/pages/drop-and-fusion.vue
@@ -123,7 +123,7 @@ function onGameEnd() {
 
 definePageMetadata({
 	title: i18n.ts.bubbleGame,
-	icon: 'ti ti-apple',
+	icon: 'ti ti-device-gamepad',
 });
 </script>
 
diff --git a/packages/frontend/src/pages/games.vue b/packages/frontend/src/pages/games.vue
index 5d2482ded1..45a135a459 100644
--- a/packages/frontend/src/pages/games.vue
+++ b/packages/frontend/src/pages/games.vue
@@ -7,10 +7,17 @@ SPDX-License-Identifier: AGPL-3.0-only
 <MkStickyContainer>
 	<template #header><MkPageHeader/></template>
 	<MkSpacer :contentMax="800">
-		<div class="_panel">
-			<MkA to="/bubble-game">
-				<img src="/client-assets/drop-and-fusion/logo.png" style="display: block; max-width: 100%; max-height: 200px; margin: auto;"/>
-			</MkA>
+		<div class="_gaps">
+			<div class="_panel">
+				<MkA to="/bubble-game">
+					<img src="/client-assets/drop-and-fusion/logo.png" style="display: block; max-width: 100%; max-height: 200px; margin: auto;"/>
+				</MkA>
+			</div>
+			<div class="_panel">
+				<MkA to="/reversi">
+					<img src="/client-assets/reversi/logo.png" style="display: block; max-width: 100%; max-height: 200px; margin: auto;"/>
+				</MkA>
+			</div>
 		</div>
 	</MkSpacer>
 </MkStickyContainer>
diff --git a/packages/frontend/src/pages/reversi/game.board.vue b/packages/frontend/src/pages/reversi/game.board.vue
new file mode 100644
index 0000000000..18fd74427c
--- /dev/null
+++ b/packages/frontend/src/pages/reversi/game.board.vue
@@ -0,0 +1,428 @@
+<!--
+SPDX-FileCopyrightText: syuilo and other misskey contributors
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<MkSpacer :contentMax="600">
+	<div :class="$style.root" class="_gaps">
+		<header><b><MkA :to="userPage(blackUser)"><MkUserName :user="blackUser"/></MkA></b>({{ i18n.ts._reversi.black }}) vs <b><MkA :to="userPage(whiteUser)"><MkUserName :user="whiteUser"/></MkA></b>({{ i18n.ts._reversi.white }})</header>
+
+		<div style="overflow: clip; line-height: 28px;">
+			<div v-if="!iAmPlayer && !game.isEnded && turnUser" class="turn">
+				<Mfm :key="'turn:' + turnUser.id" :text="i18n.t('_reversi.turnOf', { name: turnUser.name ?? turnUser.username })" :plain="true" :customEmojis="turnUser.emojis"/>
+				<MkEllipsis/>
+			</div>
+			<div v-if="(logPos !== logs.length) && turnUser" class="turn">
+				<Mfm :key="'past-turn-of:' + turnUser.id" :text="i18n.t('_reversi.pastTurnOf', { name: turnUser.name ?? turnUser.username })" :plain="true" :customEmojis="turnUser.emojis"/>
+			</div>
+			<div v-if="iAmPlayer && !game.isEnded && !isMyTurn" class="turn1">{{ i18n.ts._reversi.opponentTurn }}<MkEllipsis/></div>
+			<div v-if="iAmPlayer && !game.isEnded && isMyTurn" class="turn2" style="animation: tada 1s linear infinite both;">{{ i18n.ts._reversi.myTurn }}</div>
+			<div v-if="game.isEnded && logPos == logs.length" class="result">
+				<template v-if="game.winner">
+					<Mfm :key="'won'" :text="i18n.t('_reversi.won', { name: game.winner.name ?? game.winner.username })" :plain="true" :customEmojis="game.winner.emojis"/>
+					<span v-if="game.surrendered != null"> ({{ i18n.ts._reversi.surrendered }})</span>
+				</template>
+				<template v-else>{{ i18n.ts._reversi.drawn }}</template>
+			</div>
+		</div>
+
+		<div :class="$style.board">
+			<div v-if="showBoardLabels" :class="$style.labelsX">
+				<span v-for="i in game.map[0].length" :class="$style.labelsXLabel">{{ String.fromCharCode(64 + i) }}</span>
+			</div>
+			<div style="display: flex;">
+				<div v-if="showBoardLabels" :class="$style.labelsY">
+					<div v-for="i in game.map.length" :class="$style.labelsYLabel">{{ i }}</div>
+				</div>
+				<div :class="$style.boardCells" :style="cellsStyle">
+					<div
+						v-for="(stone, i) in engine.board"
+						v-tooltip="`${String.fromCharCode(65 + engine.posToXy(i)[0])}${engine.posToXy(i)[1] + 1}`"
+						:class="[$style.boardCell, {
+							[$style.boardCell_empty]: stone == null,
+							[$style.boardCell_none]: engine.map[i] === 'null',
+							[$style.boardCell_isEnded]: game.isEnded,
+							[$style.boardCell_myTurn]: !game.isEnded && isMyTurn,
+							[$style.boardCell_can]: turnUser ? engine.canPut(turnUser.id === blackUser.id, i) : null,
+							[$style.boardCell_prev]: engine.prevPos === i
+						}]"
+						@click="putStone(i)"
+					>
+						<img v-if="stone === true" style="pointer-events: none; user-select: none; display: block; width: 100%; height: 100%;" :src="blackUser.avatarUrl">
+						<img v-if="stone === false" style="pointer-events: none; user-select: none; display: block; width: 100%; height: 100%;" :src="whiteUser.avatarUrl">
+					</div>
+				</div>
+				<div v-if="showBoardLabels" :class="$style.labelsY">
+					<div v-for="i in game.map.length" :class="$style.labelsYLabel">{{ i }}</div>
+				</div>
+			</div>
+			<div v-if="showBoardLabels" :class="$style.labelsX">
+				<span v-for="i in game.map[0].length" :class="$style.labelsXLabel">{{ String.fromCharCode(64 + i) }}</span>
+			</div>
+		</div>
+
+		<div class="status"><b>{{ i18n.t('_reversi.turnCount', { count: logPos }) }}</b> {{ i18n.ts._reversi.black }}:{{ engine.blackCount }} {{ i18n.ts._reversi.white }}:{{ engine.whiteCount }} {{ i18n.ts._reversi.total }}:{{ engine.blackCount + engine.whiteCount }}</div>
+
+		<div v-if="!game.isEnded && iAmPlayer" class="_buttonsCenter">
+			<MkButton danger @click="surrender">{{ i18n.ts._reversi.surrender }}</MkButton>
+		</div>
+
+		<div v-if="game.isEnded" class="_panel _gaps_s" style="padding: 16px;">
+			<div>{{ logPos }} / {{ logs.length }}</div>
+			<div v-if="!autoplaying" class="_buttonsCenter">
+				<MkButton :disabled="logPos === 0" @click="logPos = 0"><i class="ti ti-chevrons-left"></i></MkButton>
+				<MkButton :disabled="logPos === 0" @click="logPos--"><i class="ti ti-chevron-left"></i></MkButton>
+				<MkButton :disabled="logPos === logs.length" @click="logPos++"><i class="ti ti-chevron-right"></i></MkButton>
+				<MkButton :disabled="logPos === logs.length" @click="logPos = logs.length"><i class="ti ti-chevrons-right"></i></MkButton>
+			</div>
+			<MkButton style="margin: auto;" :disabled="autoplaying" @click="autoplay()"><i class="ti ti-player-play"></i></MkButton>
+		</div>
+
+		<div>
+			<p v-if="game.isLlotheo">{{ i18n.ts._reversi.isLlotheo }}</p>
+			<p v-if="game.loopedBoard">{{ i18n.ts._reversi.loopedMap }}</p>
+			<p v-if="game.canPutEverywhere">{{ i18n.ts._reversi.canPutEverywhere }}</p>
+		</div>
+
+		<MkA v-if="game.isEnded" :to="`/reversi`">
+			<img src="/client-assets/reversi/logo.png" style="display: block; max-width: 100%; width: 200px; margin: auto;"/>
+		</MkA>
+	</div>
+</MkSpacer>
+</template>
+
+<script lang="ts" setup>
+import { computed, onMounted, onUnmounted, ref, shallowRef, triggerRef, watch } from 'vue';
+import * as CRC32 from 'crc-32';
+import * as Misskey from 'misskey-js';
+import * as Reversi from 'misskey-reversi';
+import MkButton from '@/components/MkButton.vue';
+import { deepClone } from '@/scripts/clone.js';
+import { useInterval } from '@/scripts/use-interval.js';
+import { signinRequired } from '@/account.js';
+import { i18n } from '@/i18n.js';
+import { misskeyApi } from '@/scripts/misskey-api.js';
+import { userPage } from '@/filters/user.js';
+
+const $i = signinRequired();
+
+const props = defineProps<{
+	game: Misskey.entities.ReversiGameDetailed;
+	connection: Misskey.ChannelConnection;
+}>();
+
+const showBoardLabels = true;
+const autoplaying = ref<boolean>(false);
+const game = ref<Misskey.entities.ReversiGameDetailed>(deepClone(props.game));
+const logs = ref<Misskey.entities.ReversiLog[]>(game.value.logs);
+const logPos = ref<number>(logs.value.length);
+const engine = shallowRef<Reversi.Game>(new Reversi.Game(game.value.map, {
+	isLlotheo: game.value.isLlotheo,
+	canPutEverywhere: game.value.canPutEverywhere,
+	loopedBoard: game.value.loopedBoard,
+}));
+
+for (const log of game.value.logs) {
+	engine.value.put(log.color, log.pos);
+}
+
+const iAmPlayer = computed(() => {
+	return game.value.user1Id === $i.id || game.value.user2Id === $i.id;
+});
+
+const myColor = computed(() => {
+	if (!iAmPlayer.value) return null;
+	if (game.value.user1Id === $i.id && game.value.black === 1) return true;
+	if (game.value.user2Id === $i.id && game.value.black === 2) return true;
+	return false;
+});
+
+const opColor = computed(() => {
+	if (!iAmPlayer.value) return null;
+	return !myColor.value;
+});
+
+const blackUser = computed(() => {
+	return game.value.black === 1 ? game.value.user1 : game.value.user2;
+});
+
+const whiteUser = computed(() => {
+	return game.value.black === 1 ? game.value.user2 : game.value.user1;
+});
+
+const turnUser = computed(() => {
+	if (engine.value.turn === true) {
+		return game.value.black === 1 ? game.value.user1 : game.value.user2;
+	} else if (engine.value.turn === false) {
+		return game.value.black === 1 ? game.value.user2 : game.value.user1;
+	} else {
+		return null;
+	}
+});
+
+const isMyTurn = computed(() => {
+	if (!iAmPlayer.value) return false;
+	const u = turnUser.value;
+	if (u == null) return false;
+	return u.id === $i.id;
+});
+
+const cellsStyle = computed(() => {
+	return {
+		'grid-template-rows': `repeat(${game.value.map.length}, 1fr)`,
+		'grid-template-columns': `repeat(${game.value.map[0].length}, 1fr)`,
+	};
+});
+
+watch(logPos, (v) => {
+	if (!game.value.isEnded) return;
+	const _o = new Reversi.Game(game.value.map, {
+		isLlotheo: game.value.isLlotheo,
+		canPutEverywhere: game.value.canPutEverywhere,
+		loopedBoard: game.value.loopedBoard,
+	});
+	for (const log of logs.value.slice(0, v)) {
+		_o.put(log.color, log.pos);
+	}
+	engine.value = _o;
+});
+
+if (game.value.isStarted && !game.value.isEnded) {
+	useInterval(() => {
+		if (game.value.isEnded) return;
+		const crc32 = CRC32.str(logs.value.map(x => x.pos.toString()).join(''));
+		props.connection.send('syncState', {
+			crc32: crc32,
+		});
+	}, 5000, { immediate: false, afterMounted: true });
+}
+
+function putStone(pos) {
+	if (game.value.isEnded) return;
+	if (!iAmPlayer.value) return;
+	if (!isMyTurn.value) return;
+	if (!engine.value.canPut(myColor.value!, pos)) return;
+
+	engine.value.put(myColor.value!, pos);
+	triggerRef(engine);
+
+	// サウンドを再生する
+	//sound.play(myColor.value ? 'reversiPutBlack' : 'reversiPutWhite');
+
+	props.connection.send('putStone', {
+		pos: pos,
+	});
+
+	checkEnd();
+}
+
+function onPutStone(x) {
+	logs.value.push(x);
+	logPos.value++;
+	engine.value.put(x.color, x.pos);
+	triggerRef(engine);
+	checkEnd();
+
+	// サウンドを再生する
+	if (x.color !== myColor.value) {
+		//sound.play(x.color ? 'reversiPutBlack' : 'reversiPutWhite');
+	}
+}
+
+function onEnded(x) {
+	game.value = deepClone(x.game);
+}
+
+function checkEnd() {
+	game.value.isEnded = engine.value.isEnded;
+	if (game.value.isEnded) {
+		if (engine.value.winner === true) {
+			game.value.winnerId = game.value.black === 1 ? game.value.user1Id : game.value.user2Id;
+			game.value.winner = game.value.black === 1 ? game.value.user1 : game.value.user2;
+		} else if (engine.value.winner === false) {
+			game.value.winnerId = game.value.black === 1 ? game.value.user2Id : game.value.user1Id;
+			game.value.winner = game.value.black === 1 ? game.value.user2 : game.value.user1;
+		} else {
+			game.value.winnerId = null;
+			game.value.winner = null;
+		}
+	}
+}
+
+function onRescue(_game) {
+	game.value = deepClone(_game);
+
+	engine.value = new Reversi.Game(game.value.map, {
+		isLlotheo: game.value.isLlotheo,
+		canPutEverywhere: game.value.canPutEverywhere,
+		loopedBoard: game.value.loopedBoard,
+	});
+
+	for (const log of game.value.logs) {
+		engine.value.put(log.color, log.pos);
+	}
+
+	triggerRef(engine);
+
+	logs.value = game.value.logs;
+	logPos.value = logs.value.length;
+
+	checkEnd();
+}
+
+function surrender() {
+	misskeyApi('reversi/surrender', {
+		gameId: game.value.id,
+	});
+}
+
+function autoplay() {
+	autoplaying.value = true;
+	logPos.value = 0;
+
+	window.setTimeout(() => {
+		logPos.value = 1;
+
+		let i = 1;
+		let previousLog = game.value.logs[0];
+		const tick = () => {
+			const log = game.value.logs[i];
+			const time = new Date(log.at).getTime() - new Date(previousLog.at).getTime();
+			setTimeout(() => {
+				i++;
+				logPos.value++;
+				previousLog = log;
+
+				if (i < game.value.logs.length) {
+					tick();
+				} else {
+					autoplaying.value = false;
+				}
+			}, time);
+		};
+
+		tick();
+	}, 1000);
+}
+
+onMounted(() => {
+	props.connection.on('putStone', onPutStone);
+	props.connection.on('rescue', onRescue);
+	props.connection.on('ended', onEnded);
+});
+
+onUnmounted(() => {
+	props.connection.off('putStone', onPutStone);
+	props.connection.off('rescue', onRescue);
+	props.connection.off('ended', onEnded);
+});
+</script>
+
+<style lang="scss" module>
+@use "sass:math";
+
+$label-size: 16px;
+$gap: 4px;
+
+.root {
+	text-align: center;
+}
+
+.board {
+	width: calc(100% - 16px);
+	max-width: 500px;
+	margin: 0 auto;
+}
+
+.labelsX {
+	height: $label-size;
+	padding: 0 $label-size;
+	display: flex;
+}
+
+.labelsXLabel {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 0.8em;
+
+	&:first-child {
+		margin-left: -(math.div($gap, 2));
+	}
+
+	&:last-child {
+		margin-right: -(math.div($gap, 2));
+	}
+}
+
+.labelsY {
+	width: $label-size;
+	display: flex;
+	flex-direction: column;
+}
+
+.labelsYLabel {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 12px;
+
+	&:first-child {
+		margin-top: -(math.div($gap, 2));
+	}
+
+	&:last-child {
+		margin-bottom: -(math.div($gap, 2));
+	}
+}
+
+.boardCells {
+	flex: 1;
+	display: grid;
+	grid-gap: $gap;
+}
+
+.boardCell {
+	background: transparent;
+	border-radius: 6px;
+	overflow: clip;
+
+	&.boardCell_empty {
+		border: solid 2px var(--divider);
+	}
+
+	&.boardCell_empty.boardCell_can {
+		border-color: var(--accent);
+		opacity: 0.5;
+	}
+
+	&.boardCell_empty.boardCell_myTurn {
+		border-color: var(--divider);
+		opacity: 1;
+
+		&.boardCell_can {
+			border-color: var(--accent);
+			cursor: pointer;
+
+			&:hover {
+				background: var(--accent);
+			}
+		}
+	}
+
+	&.boardCell_prev {
+		box-shadow: 0 0 0 4px var(--accent);
+	}
+
+	&.boardCell_isEnded {
+		border-color: var(--divider);
+	}
+
+	&.boardCell_none {
+		border-color: transparent !important;
+	}
+}
+</style>
diff --git a/packages/frontend/src/pages/reversi/game.setting.vue b/packages/frontend/src/pages/reversi/game.setting.vue
new file mode 100644
index 0000000000..301a177de1
--- /dev/null
+++ b/packages/frontend/src/pages/reversi/game.setting.vue
@@ -0,0 +1,236 @@
+<!--
+SPDX-FileCopyrightText: syuilo and other misskey contributors
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<MkStickyContainer>
+	<MkSpacer :contentMax="600">
+		<div style="text-align: center;"><b><MkUserName :user="game.user1"/></b> vs <b><MkUserName :user="game.user2"/></b></div>
+
+		<div class="_gaps">
+			<div style="font-size: 1.5em; text-align: center;">{{ i18n.ts._reversi.gameSettings }}</div>
+
+			<div class="_panel">
+				<div style="display: flex; align-items: center; padding: 16px; border-bottom: solid 1px var(--divider);">
+					<div>{{ mapName }}</div>
+					<MkButton style="margin-left: auto;" @click="chooseMap">{{ i18n.ts._reversi.chooseBoard }}</MkButton>
+				</div>
+
+				<div style="padding: 16px;">
+					<div v-if="game.map == null"><i class="ti ti-dice"></i></div>
+					<div v-else :class="$style.board" :style="{ 'grid-template-rows': `repeat(${ game.map.length }, 1fr)`, 'grid-template-columns': `repeat(${ game.map[0].length }, 1fr)` }">
+						<div v-for="(x, i) in game.map.join('')" :class="[$style.boardCell, { [$style.boardCellNone]: x == ' ' }]" @click="onMapCellClick(i, x)">
+							<i v-if="x === 'b' || x === 'w'" style="pointer-events: none; user-select: none;" :class="x === 'b' ? 'ti ti-circle-filled' : 'ti ti-circle'"></i>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			<MkFolder :defaultOpen="true">
+				<template #label>{{ i18n.ts._reversi.blackOrWhite }}</template>
+
+				<MkRadios v-model="game.bw">
+					<option value="random">{{ i18n.ts.random }}</option>
+					<option :value="'1'">
+						<I18n :src="i18n.ts._reversi.blackIs" tag="span">
+							<template #name>
+								<b><MkUserName :user="game.user1"/></b>
+							</template>
+						</I18n>
+					</option>
+					<option :value="'2'">
+						<I18n :src="i18n.ts._reversi.blackIs" tag="span">
+							<template #name>
+								<b><MkUserName :user="game.user2"/></b>
+							</template>
+						</I18n>
+					</option>
+				</MkRadios>
+			</MkFolder>
+
+			<MkFolder :defaultOpen="true">
+				<template #label>{{ i18n.ts._reversi.rules }}</template>
+
+				<div class="_gaps_s">
+					<MkSwitch v-model="game.isLlotheo" @update:modelValue="updateSettings('isLlotheo')">{{ i18n.ts._reversi.isLlotheo }}</MkSwitch>
+					<MkSwitch v-model="game.loopedBoard" @update:modelValue="updateSettings('loopedBoard')">{{ i18n.ts._reversi.loopedMap }}</MkSwitch>
+					<MkSwitch v-model="game.canPutEverywhere" @update:modelValue="updateSettings('canPutEverywhere')">{{ i18n.ts._reversi.canPutEverywhere }}</MkSwitch>
+				</div>
+			</MkFolder>
+		</div>
+	</MkSpacer>
+	<template #footer>
+		<div :class="$style.footer">
+			<MkSpacer :contentMax="700" :marginMin="16" :marginMax="16">
+				<div style="text-align: center; margin-bottom: 10px;">
+					<template v-if="isReady && isOpReady">{{ i18n.ts._reversi.thisGameIsStartedSoon }}<MkEllipsis/></template>
+					<template v-if="isReady && !isOpReady">{{ i18n.ts._reversi.waitingForOther }}<MkEllipsis/></template>
+					<template v-if="!isReady && isOpReady">{{ i18n.ts._reversi.waitingForMe }}</template>
+					<template v-if="!isReady && !isOpReady">{{ i18n.ts._reversi.waitingBoth }}<MkEllipsis/></template>
+				</div>
+				<div class="_buttonsCenter">
+					<MkButton rounded danger @click="exit">{{ i18n.ts.cancel }}</MkButton>
+					<MkButton v-if="!isReady" rounded primary @click="ready">{{ i18n.ts._reversi.ready }}</MkButton>
+					<MkButton v-if="isReady" rounded @click="unready">{{ i18n.ts._reversi.cancelReady }}</MkButton>
+				</div>
+			</MkSpacer>
+		</div>
+	</template>
+</MkStickyContainer>
+</template>
+
+<script lang="ts" setup>
+import { computed, watch, ref, onMounted, shallowRef, onUnmounted } from 'vue';
+import * as Misskey from 'misskey-js';
+import * as Reversi from 'misskey-reversi';
+import { i18n } from '@/i18n.js';
+import { signinRequired } from '@/account.js';
+import { deepClone } from '@/scripts/clone.js';
+import MkButton from '@/components/MkButton.vue';
+import MkRadios from '@/components/MkRadios.vue';
+import MkSwitch from '@/components/MkSwitch.vue';
+import MkFolder from '@/components/MkFolder.vue';
+import * as os from '@/os.js';
+import { MenuItem } from '@/types/menu.js';
+
+const $i = signinRequired();
+
+const mapCategories = Array.from(new Set(Object.values(Reversi.maps).map(x => x.category)));
+
+const props = defineProps<{
+	game: Misskey.entities.ReversiGameDetailed;
+	connection: Misskey.ChannelConnection;
+}>();
+
+const game = ref<Misskey.entities.ReversiGameDetailed>(deepClone(props.game));
+const isLlotheo = ref<boolean>(false);
+const mapName = computed(() => {
+	if (game.value.map == null) return 'Random';
+	const found = Object.values(Reversi.maps).find(x => x.data.join('') === game.value.map.join(''));
+	return found ? found.name! : '-Custom-';
+});
+const isReady = computed(() => {
+	if (game.value.user1Id === $i.id && game.value.user1Ready) return true;
+	if (game.value.user2Id === $i.id && game.value.user2Ready) return true;
+	return false;
+});
+const isOpReady = computed(() => {
+	if (game.value.user1Id !== $i.id && game.value.user1Ready) return true;
+	if (game.value.user2Id !== $i.id && game.value.user2Ready) return true;
+	return false;
+});
+
+watch(() => game.value.bw, () => {
+	updateSettings('bw');
+});
+
+function chooseMap(ev: MouseEvent) {
+	const menu: MenuItem[] = [];
+
+	for (const c of mapCategories) {
+		const maps = Object.values(Reversi.maps).filter(x => x.category === c);
+		if (maps.length === 0) continue;
+		if (c != null) {
+			menu.push({
+				type: 'label',
+				text: c,
+			});
+		}
+		for (const m of maps) {
+			menu.push({
+				text: m.name!,
+				action: () => {
+					game.value.map = m.data;
+					updateSettings('map');
+				},
+			});
+		}
+	}
+
+	os.popupMenu(menu, ev.currentTarget ?? ev.target);
+}
+
+function exit() {
+	props.connection.send('exit', {});
+}
+
+function ready() {
+	props.connection.send('ready', true);
+}
+
+function unready() {
+	props.connection.send('ready', false);
+}
+
+function onChangeReadyStates(states) {
+	game.value.user1Ready = states.user1;
+	game.value.user2Ready = states.user2;
+}
+
+function updateSettings(key: keyof Misskey.entities.ReversiGameDetailed) {
+	props.connection.send('updateSettings', {
+		key: key,
+		value: game.value[key],
+	});
+}
+
+function onUpdateSettings({ userId, key, value }: { userId: string; key: keyof Misskey.entities.ReversiGameDetailed; value: any; }) {
+	if (userId === $i.id) return;
+	if (game.value[key] === value) return;
+	game.value[key] = value;
+}
+
+function onMapCellClick(pos: number, pixel: string) {
+	const x = pos % game.value.map[0].length;
+	const y = Math.floor(pos / game.value.map[0].length);
+	const newPixel =
+		pixel === ' ' ? '-' :
+		pixel === '-' ? 'b' :
+		pixel === 'b' ? 'w' :
+		' ';
+	const line = game.value.map[y].split('');
+	line[x] = newPixel;
+	game.value.map[y] = line.join('');
+	updateSettings('map');
+}
+
+props.connection.on('changeReadyStates', onChangeReadyStates);
+props.connection.on('updateSettings', onUpdateSettings);
+
+onUnmounted(() => {
+	props.connection.off('changeReadyStates', onChangeReadyStates);
+	props.connection.off('updateSettings', onUpdateSettings);
+});
+</script>
+
+<style lang="scss" module>
+.board {
+	display: grid;
+	grid-gap: 4px;
+	width: 300px;
+	height: 300px;
+	margin: 0 auto;
+	color: var(--fg);
+}
+
+.boardCell {
+	display: grid;
+	place-items: center;
+	background: transparent;
+	border: solid 2px var(--divider);
+	border-radius: 6px;
+	overflow: clip;
+	cursor: pointer;
+}
+.boardCellNone {
+	border-color: transparent;
+}
+
+.footer {
+	-webkit-backdrop-filter: var(--blur, blur(15px));
+	backdrop-filter: var(--blur, blur(15px));
+	background: var(--acrylicBg);
+	border-top: solid 0.5px var(--divider);
+}
+</style>
diff --git a/packages/frontend/src/pages/reversi/game.vue b/packages/frontend/src/pages/reversi/game.vue
new file mode 100644
index 0000000000..dbbeb20f42
--- /dev/null
+++ b/packages/frontend/src/pages/reversi/game.vue
@@ -0,0 +1,68 @@
+<!--
+SPDX-FileCopyrightText: syuilo and other misskey contributors
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div v-if="game == null || connection == null"><MkLoading/></div>
+<GameSetting v-else-if="!game.isStarted" :game="game" :connection="connection"/>
+<GameBoard v-else :game="game" :connection="connection"/>
+</template>
+
+<script lang="ts" setup>
+import { computed, watch, ref, onMounted, shallowRef, onUnmounted } from 'vue';
+import * as Misskey from 'misskey-js';
+import GameSetting from './game.setting.vue';
+import GameBoard from './game.board.vue';
+import { misskeyApi } from '@/scripts/misskey-api.js';
+import { definePageMetadata } from '@/scripts/page-metadata.js';
+import { useStream } from '@/stream.js';
+
+const props = defineProps<{
+	gameId: string;
+}>();
+
+const game = shallowRef<Misskey.entities.ReversiGameDetailed | null>(null);
+const connection = shallowRef<Misskey.ChannelConnection | null>(null);
+
+watch(() => props.gameId, () => {
+	fetchGame();
+});
+
+async function fetchGame() {
+	const _game = await misskeyApi('reversi/show-game', {
+		gameId: props.gameId,
+	});
+
+	game.value = _game;
+
+	if (connection.value) {
+		connection.value.dispose();
+	}
+	connection.value = useStream().useChannel('reversiGame', {
+		gameId: game.value.id,
+	});
+	connection.value.on('started', x => {
+		game.value = x.game;
+	});
+}
+
+onMounted(() => {
+	fetchGame();
+});
+
+onUnmounted(() => {
+	if (connection.value) {
+		connection.value.dispose();
+	}
+});
+
+const headerActions = computed(() => []);
+
+const headerTabs = computed(() => []);
+
+definePageMetadata(computed(() => ({
+	title: 'Reversi',
+	icon: 'ti ti-device-gamepad',
+})));
+</script>
diff --git a/packages/frontend/src/pages/reversi/index.vue b/packages/frontend/src/pages/reversi/index.vue
new file mode 100644
index 0000000000..c483e36c24
--- /dev/null
+++ b/packages/frontend/src/pages/reversi/index.vue
@@ -0,0 +1,271 @@
+<!--
+SPDX-FileCopyrightText: syuilo and other misskey contributors
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<MkSpacer v-if="!matchingAny && !matchingUser" :contentMax="600">
+	<div class="_gaps">
+		<div>
+			<img src="/client-assets/reversi/logo.png" style="display: block; max-width: 100%; max-height: 200px; margin: auto;"/>
+		</div>
+
+		<div class="_buttonsCenter">
+			<MkButton primary gradate rounded @click="matchAny">{{ i18n.ts._reversi.freeMatch }}</MkButton>
+			<MkButton primary gradate rounded @click="matchUser">{{ i18n.ts.invite }}</MkButton>
+		</div>
+
+		<MkFolder v-if="invitations.length > 0" :defaultOpen="true">
+			<template #label>{{ i18n.ts.invitations }}</template>
+			<div class="_gaps_s">
+				<button v-for="user in invitations" :key="user.id" v-panel :class="$style.invitation" class="_button" tabindex="-1" @click="accept(user)">
+					<MkAvatar style="width: 32px; height: 32px; margin-right: 8px;" :user="user" :showIndicator="true"/>
+					<span style="margin-right: 8px;"><b><MkUserName :user="user"/></b></span>
+					<span>@{{ user.username }}</span>
+				</button>
+			</div>
+		</MkFolder>
+
+		<MkFolder v-if="$i" :defaultOpen="true">
+			<template #label>{{ i18n.ts._reversi.myGames }}</template>
+			<MkPagination :pagination="myGamesPagination">
+				<template #default="{ items }">
+					<div :class="$style.gamePreviews">
+						<MkA v-for="g in items" :key="g.id" v-panel :class="$style.gamePreview" tabindex="-1" :to="`/reversi/g/${g.id}`">
+							<div :class="$style.gamePreviewPlayers">
+								<MkAvatar :class="$style.gamePreviewPlayersAvatar" :user="g.user1"/><b><MkUserName :user="g.user1"/></b> vs <b><MkUserName :user="g.user2"/></b><MkAvatar :class="$style.gamePreviewPlayersAvatar" :user="g.user2"/>
+							</div>
+							<div :class="$style.gamePreviewFooter">
+								<span :style="!g.isEnded ? 'color: var(--accent);' : ''">{{ g.isEnded ? i18n.ts._reversi.ended : i18n.ts._reversi.playing }}</span>
+								<MkTime style="margin-left: auto; opacity: 0.7;" :time="g.createdAt"/>
+							</div>
+						</MkA>
+					</div>
+				</template>
+			</MkPagination>
+		</MkFolder>
+
+		<MkFolder :defaultOpen="true">
+			<template #label>{{ i18n.ts._reversi.allGames }}</template>
+			<MkPagination :pagination="gamesPagination">
+				<template #default="{ items }">
+					<div :class="$style.gamePreviews">
+						<MkA v-for="g in items" :key="g.id" v-panel :class="$style.gamePreview" tabindex="-1" :to="`/reversi/g/${g.id}`">
+							<div :class="$style.gamePreviewPlayers">
+								<MkAvatar :class="$style.gamePreviewPlayersAvatar" :user="g.user1"/><b><MkUserName :user="g.user1"/></b> vs <b><MkUserName :user="g.user2"/></b><MkAvatar :class="$style.gamePreviewPlayersAvatar" :user="g.user2"/>
+							</div>
+							<div :class="$style.gamePreviewFooter">
+								<span :style="!g.isEnded ? 'color: var(--accent);' : ''">{{ g.isEnded ? i18n.ts._reversi.ended : i18n.ts._reversi.playing }}</span>
+								<MkTime style="margin-left: auto; opacity: 0.7;" :time="g.createdAt"/>
+							</div>
+						</MkA>
+					</div>
+				</template>
+			</MkPagination>
+		</MkFolder>
+	</div>
+</MkSpacer>
+<MkSpacer v-else :contentMax="600">
+	<div :class="$style.waitingScreen">
+		<div v-if="matchingUser" :class="$style.waitingScreenTitle">
+			<I18n :src="i18n.ts.waitingFor" tag="span">
+				<template #x>
+					<b><MkUserName :user="matchingUser"/></b>
+				</template>
+			</I18n>
+			<MkEllipsis/>
+		</div>
+		<div v-else :class="$style.waitingScreenTitle">
+			{{ i18n.ts._reversi.lookingForPlayer }}<MkEllipsis/>
+		</div>
+		<div class="cancel">
+			<MkButton inline rounded @click="cancelMatching">{{ i18n.ts.cancel }}</MkButton>
+		</div>
+	</div>
+</MkSpacer>
+</template>
+
+<script lang="ts" setup>
+import { computed, onMounted, onUnmounted, ref } from 'vue';
+import * as Misskey from 'misskey-js';
+import { misskeyApi } from '@/scripts/misskey-api.js';
+import { definePageMetadata } from '@/scripts/page-metadata.js';
+import { useStream } from '@/stream.js';
+import MkButton from '@/components/MkButton.vue';
+import MkFolder from '@/components/MkFolder.vue';
+import { i18n } from '@/i18n.js';
+import { $i } from '@/account.js';
+import MkPagination from '@/components/MkPagination.vue';
+import { useRouter } from '@/global/router/supplier.js';
+import * as os from '@/os.js';
+import { useInterval } from '@/scripts/use-interval.js';
+
+const myGamesPagination = {
+	endpoint: 'reversi/games' as const,
+	limit: 10,
+	params: {
+		my: true,
+	},
+};
+
+const gamesPagination = {
+	endpoint: 'reversi/games' as const,
+	limit: 10,
+};
+
+const router = useRouter();
+
+if ($i) {
+	const connection = useStream().useChannel('reversi');
+
+	connection.on('matched', x => {
+		startGame(x.game);
+	});
+
+	connection.on('invited', invitation => {
+		if (invitations.value.some(x => x.id === invitation.user.id)) return;
+		invitations.value.unshift(invitation.user);
+	});
+
+	onUnmounted(() => {
+		connection.dispose();
+	});
+}
+
+const invitations = ref<Misskey.entities.UserLite[]>([]);
+const matchingUser = ref<Misskey.entities.UserLite | null>(null);
+const matchingAny = ref<boolean>(false);
+
+function startGame(game: Misskey.entities.ReversiGameDetailed) {
+	matchingUser.value = null;
+	matchingAny.value = false;
+	router.push(`/reversi/g/${game.id}`);
+}
+
+async function matchHeatbeat() {
+	if (matchingUser.value) {
+		const res = await misskeyApi('reversi/match', {
+			userId: matchingUser.value.id,
+		});
+
+		if (res != null) {
+			startGame(res);
+		}
+	} else if (matchingAny.value) {
+		const res = await misskeyApi('reversi/match', {
+			userId: null,
+		});
+
+		if (res != null) {
+			startGame(res);
+		}
+	}
+}
+
+async function matchUser() {
+	const user = await os.selectUser({ local: true });
+	if (user == null) return;
+
+	matchingUser.value = user;
+
+	matchHeatbeat();
+}
+
+async function matchAny() {
+	matchingAny.value = true;
+
+	matchHeatbeat();
+}
+
+function cancelMatching() {
+	if (matchingUser.value) {
+		misskeyApi('reversi/cancel-match', { userId: matchingUser.value.id });
+		matchingUser.value = null;
+	} else if (matchingAny.value) {
+		misskeyApi('reversi/cancel-match', { userId: null });
+		matchingAny.value = false;
+	}
+}
+
+async function accept(user) {
+	const game = await misskeyApi('reversi/match', {
+		userId: user.id,
+	});
+	if (game) {
+		startGame(game);
+	}
+}
+
+useInterval(matchHeatbeat, 1000 * 10, { immediate: false, afterMounted: true });
+
+onMounted(() => {
+	misskeyApi('reversi/invitations').then(_invitations => {
+		invitations.value = _invitations;
+	});
+});
+
+definePageMetadata(computed(() => ({
+	title: 'Reversi',
+	icon: 'ti ti-device-gamepad',
+})));
+</script>
+
+<style lang="scss" module>
+.invitation {
+	display: flex;
+	box-sizing: border-box;
+	width: 100%;
+	padding: 16px;
+	line-height: 32px;
+	text-align: left;
+}
+
+.gamePreviews {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(260px, 1fr));
+	grid-gap: var(--margin);
+}
+
+.gamePreview {
+	font-size: 90%;
+	border-radius: 8px;
+	overflow: clip;
+}
+
+.gamePreviewPlayers {
+	text-align: center;
+	padding: 16px;
+	line-height: 32px;
+}
+
+.gamePreviewPlayersAvatar {
+	width: 32px;
+	height: 32px;
+
+	&:first-child {
+		margin-right: 8px;
+	}
+
+	&:last-child {
+		margin-left: 8px;
+	}
+}
+
+.gamePreviewFooter {
+	display: flex;
+	align-items: baseline;
+	border-top: solid 0.5px var(--divider);
+	padding: 6px 10px;
+	font-size: 0.9em;
+}
+
+.waitingScreen {
+	text-align: center;
+}
+
+.waitingScreenTitle {
+	font-size: 1.5em;
+	margin-bottom: 16px;
+	margin-top: 32px;
+}
+</style>
diff --git a/packages/frontend/vite.config.ts b/packages/frontend/vite.config.ts
index 98fe0043c1..8cdc7b59c6 100644
--- a/packages/frontend/vite.config.ts
+++ b/packages/frontend/vite.config.ts
@@ -103,7 +103,7 @@ export function getConfig(): UserConfig {
 
 		// https://vitejs.dev/guide/dep-pre-bundling.html#monorepos-and-linked-dependencies
 		optimizeDeps: {
-			include: ['misskey-js'],
+			include: ['misskey-js', 'misskey-reversi'],
 		},
 
 		build: {
@@ -135,7 +135,7 @@ export function getConfig(): UserConfig {
 
 			// https://vitejs.dev/guide/dep-pre-bundling.html#monorepos-and-linked-dependencies
 			commonjsOptions: {
-				include: [/misskey-js/, /node_modules/],
+				include: [/misskey-js/, /misskey-reversi/, /node_modules/],
 			},
 		},
 
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index f955cc5cc1..2b95e01533 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -1623,6 +1623,16 @@ declare namespace entities {
         BubbleGameRegisterResponse,
         BubbleGameRankingRequest,
         BubbleGameRankingResponse,
+        ReversiCancelMatchRequest,
+        ReversiCancelMatchResponse,
+        ReversiGamesRequest,
+        ReversiGamesResponse,
+        ReversiMatchRequest,
+        ReversiMatchResponse,
+        ReversiInvitationsResponse,
+        ReversiShowGameRequest,
+        ReversiShowGameResponse,
+        ReversiSurrenderRequest,
         Error_2 as Error,
         UserLite,
         UserDetailedNotMeOnly,
@@ -1659,7 +1669,9 @@ declare namespace entities {
         Flash,
         Signin,
         RoleLite,
-        Role
+        Role,
+        ReversiGameLite,
+        ReversiGameDetailed
     }
 }
 export { entities }
@@ -2596,6 +2608,42 @@ type ResetPasswordRequest = operations['reset-password']['requestBody']['content
 // @public (undocumented)
 type RetentionResponse = operations['retention']['responses']['200']['content']['application/json'];
 
+// @public (undocumented)
+type ReversiCancelMatchRequest = operations['reversi/cancel-match']['requestBody']['content']['application/json'];
+
+// @public (undocumented)
+type ReversiCancelMatchResponse = operations['reversi/cancel-match']['responses']['200']['content']['application/json'];
+
+// @public (undocumented)
+type ReversiGameDetailed = components['schemas']['ReversiGameDetailed'];
+
+// @public (undocumented)
+type ReversiGameLite = components['schemas']['ReversiGameLite'];
+
+// @public (undocumented)
+type ReversiGamesRequest = operations['reversi/games']['requestBody']['content']['application/json'];
+
+// @public (undocumented)
+type ReversiGamesResponse = operations['reversi/games']['responses']['200']['content']['application/json'];
+
+// @public (undocumented)
+type ReversiInvitationsResponse = operations['reversi/invitations']['responses']['200']['content']['application/json'];
+
+// @public (undocumented)
+type ReversiMatchRequest = operations['reversi/match']['requestBody']['content']['application/json'];
+
+// @public (undocumented)
+type ReversiMatchResponse = operations['reversi/match']['responses']['200']['content']['application/json'];
+
+// @public (undocumented)
+type ReversiShowGameRequest = operations['reversi/show-game']['requestBody']['content']['application/json'];
+
+// @public (undocumented)
+type ReversiShowGameResponse = operations['reversi/show-game']['responses']['200']['content']['application/json'];
+
+// @public (undocumented)
+type ReversiSurrenderRequest = operations['reversi/surrender']['requestBody']['content']['application/json'];
+
 // @public (undocumented)
 type Role = components['schemas']['Role'];
 
diff --git a/packages/misskey-js/src/autogen/apiClientJSDoc.ts b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
index b60f449a71..e4e7d13668 100644
--- a/packages/misskey-js/src/autogen/apiClientJSDoc.ts
+++ b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
@@ -1,6 +1,6 @@
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-13T04:31:38.782Z
+ * generatedAt: 2024-01-19T11:00:07.160Z
  */
 
 import type { SwitchCaseResponseType } from '../api.js';
@@ -4007,5 +4007,71 @@ declare module '../api.js' {
       params: P,
       credential?: string | null,
     ): Promise<SwitchCaseResponseType<E, P>>;
+
+    /**
+     * No description provided.
+     * 
+     * **Credential required**: *Yes* / **Permission**: *write:account*
+     */
+    request<E extends 'reversi/cancel-match', P extends Endpoints[E]['req']>(
+      endpoint: E,
+      params: P,
+      credential?: string | null,
+    ): Promise<SwitchCaseResponseType<E, P>>;
+
+    /**
+     * No description provided.
+     * 
+     * **Credential required**: *No*
+     */
+    request<E extends 'reversi/games', P extends Endpoints[E]['req']>(
+      endpoint: E,
+      params: P,
+      credential?: string | null,
+    ): Promise<SwitchCaseResponseType<E, P>>;
+
+    /**
+     * No description provided.
+     * 
+     * **Credential required**: *Yes* / **Permission**: *write:account*
+     */
+    request<E extends 'reversi/match', P extends Endpoints[E]['req']>(
+      endpoint: E,
+      params: P,
+      credential?: string | null,
+    ): Promise<SwitchCaseResponseType<E, P>>;
+
+    /**
+     * No description provided.
+     * 
+     * **Credential required**: *Yes* / **Permission**: *read:account*
+     */
+    request<E extends 'reversi/invitations', P extends Endpoints[E]['req']>(
+      endpoint: E,
+      params: P,
+      credential?: string | null,
+    ): Promise<SwitchCaseResponseType<E, P>>;
+
+    /**
+     * No description provided.
+     * 
+     * **Credential required**: *No*
+     */
+    request<E extends 'reversi/show-game', P extends Endpoints[E]['req']>(
+      endpoint: E,
+      params: P,
+      credential?: string | null,
+    ): Promise<SwitchCaseResponseType<E, P>>;
+
+    /**
+     * No description provided.
+     * 
+     * **Credential required**: *Yes* / **Permission**: *write:account*
+     */
+    request<E extends 'reversi/surrender', P extends Endpoints[E]['req']>(
+      endpoint: E,
+      params: P,
+      credential?: string | null,
+    ): Promise<SwitchCaseResponseType<E, P>>;
   }
 }
diff --git a/packages/misskey-js/src/autogen/endpoint.ts b/packages/misskey-js/src/autogen/endpoint.ts
index dc591a7046..671abd78ce 100644
--- a/packages/misskey-js/src/autogen/endpoint.ts
+++ b/packages/misskey-js/src/autogen/endpoint.ts
@@ -1,6 +1,6 @@
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-13T04:31:38.778Z
+ * generatedAt: 2024-01-19T11:00:07.158Z
  */
 
 import type {
@@ -544,6 +544,16 @@ import type {
 	BubbleGameRegisterResponse,
 	BubbleGameRankingRequest,
 	BubbleGameRankingResponse,
+	ReversiCancelMatchRequest,
+	ReversiCancelMatchResponse,
+	ReversiGamesRequest,
+	ReversiGamesResponse,
+	ReversiMatchRequest,
+	ReversiMatchResponse,
+	ReversiInvitationsResponse,
+	ReversiShowGameRequest,
+	ReversiShowGameResponse,
+	ReversiSurrenderRequest,
 } from './entities.js';
 
 export type Endpoints = {
@@ -907,4 +917,10 @@ export type Endpoints = {
 	'retention': { req: EmptyRequest; res: RetentionResponse };
 	'bubble-game/register': { req: BubbleGameRegisterRequest; res: BubbleGameRegisterResponse };
 	'bubble-game/ranking': { req: BubbleGameRankingRequest; res: BubbleGameRankingResponse };
+	'reversi/cancel-match': { req: ReversiCancelMatchRequest; res: ReversiCancelMatchResponse };
+	'reversi/games': { req: ReversiGamesRequest; res: ReversiGamesResponse };
+	'reversi/match': { req: ReversiMatchRequest; res: ReversiMatchResponse };
+	'reversi/invitations': { req: EmptyRequest; res: ReversiInvitationsResponse };
+	'reversi/show-game': { req: ReversiShowGameRequest; res: ReversiShowGameResponse };
+	'reversi/surrender': { req: ReversiSurrenderRequest; res: EmptyResponse };
 }
diff --git a/packages/misskey-js/src/autogen/entities.ts b/packages/misskey-js/src/autogen/entities.ts
index dfe24ce0d8..c14876c0e3 100644
--- a/packages/misskey-js/src/autogen/entities.ts
+++ b/packages/misskey-js/src/autogen/entities.ts
@@ -1,6 +1,6 @@
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-13T04:31:38.775Z
+ * generatedAt: 2024-01-19T11:00:07.156Z
  */
 
 import { operations } from './types.js';
@@ -546,3 +546,13 @@ export type BubbleGameRegisterRequest = operations['bubble-game/register']['requ
 export type BubbleGameRegisterResponse = operations['bubble-game/register']['responses']['200']['content']['application/json'];
 export type BubbleGameRankingRequest = operations['bubble-game/ranking']['requestBody']['content']['application/json'];
 export type BubbleGameRankingResponse = operations['bubble-game/ranking']['responses']['200']['content']['application/json'];
+export type ReversiCancelMatchRequest = operations['reversi/cancel-match']['requestBody']['content']['application/json'];
+export type ReversiCancelMatchResponse = operations['reversi/cancel-match']['responses']['200']['content']['application/json'];
+export type ReversiGamesRequest = operations['reversi/games']['requestBody']['content']['application/json'];
+export type ReversiGamesResponse = operations['reversi/games']['responses']['200']['content']['application/json'];
+export type ReversiMatchRequest = operations['reversi/match']['requestBody']['content']['application/json'];
+export type ReversiMatchResponse = operations['reversi/match']['responses']['200']['content']['application/json'];
+export type ReversiInvitationsResponse = operations['reversi/invitations']['responses']['200']['content']['application/json'];
+export type ReversiShowGameRequest = operations['reversi/show-game']['requestBody']['content']['application/json'];
+export type ReversiShowGameResponse = operations['reversi/show-game']['responses']['200']['content']['application/json'];
+export type ReversiSurrenderRequest = operations['reversi/surrender']['requestBody']['content']['application/json'];
diff --git a/packages/misskey-js/src/autogen/models.ts b/packages/misskey-js/src/autogen/models.ts
index 5c6bebf2fd..78f14d2250 100644
--- a/packages/misskey-js/src/autogen/models.ts
+++ b/packages/misskey-js/src/autogen/models.ts
@@ -1,6 +1,6 @@
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-13T04:31:38.773Z
+ * generatedAt: 2024-01-19T11:00:07.155Z
  */
 
 import { components } from './types.js';
@@ -41,3 +41,5 @@ export type Flash = components['schemas']['Flash'];
 export type Signin = components['schemas']['Signin'];
 export type RoleLite = components['schemas']['RoleLite'];
 export type Role = components['schemas']['Role'];
+export type ReversiGameLite = components['schemas']['ReversiGameLite'];
+export type ReversiGameDetailed = components['schemas']['ReversiGameDetailed'];
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 76e2b5309c..36facf6e28 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -3,7 +3,7 @@
 
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-13T04:31:38.633Z
+ * generatedAt: 2024-01-19T11:00:07.077Z
  */
 
 /**
@@ -3472,6 +3472,60 @@ export type paths = {
      */
     post: operations['bubble-game/ranking'];
   };
+  '/reversi/cancel-match': {
+    /**
+     * reversi/cancel-match
+     * @description No description provided.
+     *
+     * **Credential required**: *Yes* / **Permission**: *write:account*
+     */
+    post: operations['reversi/cancel-match'];
+  };
+  '/reversi/games': {
+    /**
+     * reversi/games
+     * @description No description provided.
+     *
+     * **Credential required**: *No*
+     */
+    post: operations['reversi/games'];
+  };
+  '/reversi/match': {
+    /**
+     * reversi/match
+     * @description No description provided.
+     *
+     * **Credential required**: *Yes* / **Permission**: *write:account*
+     */
+    post: operations['reversi/match'];
+  };
+  '/reversi/invitations': {
+    /**
+     * reversi/invitations
+     * @description No description provided.
+     *
+     * **Credential required**: *Yes* / **Permission**: *read:account*
+     */
+    post: operations['reversi/invitations'];
+  };
+  '/reversi/show-game': {
+    /**
+     * reversi/show-game
+     * @description No description provided.
+     *
+     * **Credential required**: *No*
+     */
+    post: operations['reversi/show-game'];
+  };
+  '/reversi/surrender': {
+    /**
+     * reversi/surrender
+     * @description No description provided.
+     *
+     * **Credential required**: *Yes* / **Permission**: *write:account*
+     */
+    post: operations['reversi/surrender'];
+  };
 };
 
 export type webhooks = Record<string, never>;
@@ -4404,6 +4458,72 @@ export type components = {
       };
       usersCount: number;
     });
+    ReversiGameLite: {
+      /** Format: id */
+      id: string;
+      /** Format: date-time */
+      createdAt: string;
+      /** Format: date-time */
+      startedAt: string | null;
+      isStarted: boolean;
+      isEnded: boolean;
+      form1: Record<string, never> | null;
+      form2: Record<string, never> | null;
+      user1Ready: boolean;
+      user2Ready: boolean;
+      /** Format: id */
+      user1Id: string;
+      /** Format: id */
+      user2Id: string;
+      user1: components['schemas']['User'];
+      user2: components['schemas']['User'];
+      /** Format: id */
+      winnerId: string | null;
+      winner: components['schemas']['User'] | null;
+      /** Format: id */
+      surrendered: string | null;
+      black: number | null;
+      bw: string;
+      isLlotheo: boolean;
+      canPutEverywhere: boolean;
+      loopedBoard: boolean;
+    };
+    ReversiGameDetailed: {
+      /** Format: id */
+      id: string;
+      /** Format: date-time */
+      createdAt: string;
+      /** Format: date-time */
+      startedAt: string | null;
+      isStarted: boolean;
+      isEnded: boolean;
+      form1: Record<string, never> | null;
+      form2: Record<string, never> | null;
+      user1Ready: boolean;
+      user2Ready: boolean;
+      /** Format: id */
+      user1Id: string;
+      /** Format: id */
+      user2Id: string;
+      user1: components['schemas']['User'];
+      user2: components['schemas']['User'];
+      /** Format: id */
+      winnerId: string | null;
+      winner: components['schemas']['User'] | null;
+      /** Format: id */
+      surrendered: string | null;
+      black: number | null;
+      bw: string;
+      isLlotheo: boolean;
+      canPutEverywhere: boolean;
+      loopedBoard: boolean;
+      logs: {
+          at: number;
+          color: boolean;
+          pos: number;
+        }[];
+      map: string[];
+    };
   };
   responses: never;
   parameters: never;
@@ -25542,5 +25662,325 @@ export type operations = {
       };
     };
   };
+  /**
+   * reversi/cancel-match
+   * @description No description provided.
+   *
+   * **Credential required**: *Yes* / **Permission**: *write:account*
+   */
+  'reversi/cancel-match': {
+    requestBody: {
+      content: {
+        'application/json': {
+          /** Format: misskey:id */
+          userId?: string | null;
+        };
+      };
+    };
+    responses: {
+      /** @description OK (with results) */
+      200: {
+        content: {
+          'application/json': unknown;
+        };
+      };
+      /** @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'];
+        };
+      };
+    };
+  };
+  /**
+   * reversi/games
+   * @description No description provided.
+   *
+   * **Credential required**: *No*
+   */
+  'reversi/games': {
+    requestBody: {
+      content: {
+        'application/json': {
+          /** @default 10 */
+          limit?: number;
+          /** Format: misskey:id */
+          sinceId?: string;
+          /** Format: misskey:id */
+          untilId?: string;
+          /** @default false */
+          my?: boolean;
+        };
+      };
+    };
+    responses: {
+      /** @description OK (with results) */
+      200: {
+        content: {
+          'application/json': components['schemas']['ReversiGameLite'][];
+        };
+      };
+      /** @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'];
+        };
+      };
+    };
+  };
+  /**
+   * reversi/match
+   * @description No description provided.
+   *
+   * **Credential required**: *Yes* / **Permission**: *write:account*
+   */
+  'reversi/match': {
+    requestBody: {
+      content: {
+        'application/json': {
+          /** Format: misskey:id */
+          userId?: string | null;
+        };
+      };
+    };
+    responses: {
+      /** @description OK (with results) */
+      200: {
+        content: {
+          'application/json': unknown;
+        };
+      };
+      /** @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'];
+        };
+      };
+    };
+  };
+  /**
+   * reversi/invitations
+   * @description No description provided.
+   *
+   * **Credential required**: *Yes* / **Permission**: *read:account*
+   */
+  'reversi/invitations': {
+    responses: {
+      /** @description OK (with results) */
+      200: {
+        content: {
+          'application/json': components['schemas']['UserLite'][];
+        };
+      };
+      /** @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'];
+        };
+      };
+    };
+  };
+  /**
+   * reversi/show-game
+   * @description No description provided.
+   *
+   * **Credential required**: *No*
+   */
+  'reversi/show-game': {
+    requestBody: {
+      content: {
+        'application/json': {
+          /** Format: misskey:id */
+          gameId: string;
+        };
+      };
+    };
+    responses: {
+      /** @description OK (with results) */
+      200: {
+        content: {
+          'application/json': components['schemas']['ReversiGameDetailed'];
+        };
+      };
+      /** @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'];
+        };
+      };
+    };
+  };
+  /**
+   * reversi/surrender
+   * @description No description provided.
+   *
+   * **Credential required**: *Yes* / **Permission**: *write:account*
+   */
+  'reversi/surrender': {
+    requestBody: {
+      content: {
+        'application/json': {
+          /** Format: misskey:id */
+          gameId: string;
+        };
+      };
+    };
+    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'];
+        };
+      };
+    };
+  };
 };
 
diff --git a/packages/misskey-reversi/package.json b/packages/misskey-reversi/package.json
new file mode 100644
index 0000000000..8d3ca30166
--- /dev/null
+++ b/packages/misskey-reversi/package.json
@@ -0,0 +1,26 @@
+{
+	"name": "misskey-reversi",
+	"version": "0.0.1",
+	"main": "./built/index.js",
+	"types": "./built/index.d.ts",
+	"scripts": {
+		"build": "tsc",
+		"watch": "nodemon -w src -e ts,js,cjs,mjs,json --exec \"pnpm run build\"",
+		"eslint": "eslint . --ext .js,.jsx,.ts,.tsx",
+		"typecheck": "tsc --noEmit",
+		"lint": "pnpm typecheck && pnpm eslint"
+	},
+	"devDependencies": {
+		"@misskey-dev/eslint-plugin": "1.0.0",
+		"@types/node": "20.11.5",
+		"@typescript-eslint/eslint-plugin": "6.19.0",
+		"@typescript-eslint/parser": "6.19.0",
+		"eslint": "8.56.0",
+		"typescript": "5.3.3"
+	},
+	"files": [
+		"built"
+	],
+	"dependencies": {
+	}
+}
diff --git a/packages/misskey-reversi/src/game.ts b/packages/misskey-reversi/src/game.ts
new file mode 100644
index 0000000000..55d0b84da7
--- /dev/null
+++ b/packages/misskey-reversi/src/game.ts
@@ -0,0 +1,216 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+/**
+ * true ... 黒
+ * false ... 白
+ */
+export type Color = boolean;
+const BLACK = true;
+const WHITE = false;
+
+export type MapCell = 'null' | 'empty';
+
+export type Options = {
+	isLlotheo: boolean;
+	canPutEverywhere: boolean;
+	loopedBoard: boolean;
+};
+
+export type Undo = {
+	color: Color;
+	pos: number;
+
+	/**
+	 * 反転した石の位置の配列
+	 */
+	effects: number[];
+
+	turn: Color | null;
+};
+
+export class Game {
+	public map: MapCell[];
+	public mapWidth: number;
+	public mapHeight: number;
+	public board: (Color | null | undefined)[];
+	public turn: Color | null = BLACK;
+	public opts: Options;
+
+	public prevPos = -1;
+	public prevColor: Color | null = null;
+
+	private logs: Undo[] = [];
+
+	constructor(map: string[], opts: Options) {
+		//#region binds
+		this.put = this.put.bind(this);
+		//#endregion
+
+		//#region Options
+		this.opts = opts;
+		if (this.opts.isLlotheo == null) this.opts.isLlotheo = false;
+		if (this.opts.canPutEverywhere == null) this.opts.canPutEverywhere = false;
+		if (this.opts.loopedBoard == null) this.opts.loopedBoard = false;
+		//#endregion
+
+		//#region Parse map data
+		this.mapWidth = map[0].length;
+		this.mapHeight = map.length;
+		const mapData = map.join('');
+
+		this.board = mapData.split('').map(d => d === '-' ? null : d === 'b' ? BLACK : d === 'w' ? WHITE : undefined);
+
+		this.map = mapData.split('').map(d => d === '-' || d === 'b' || d === 'w' ? 'empty' : 'null');
+		//#endregion
+
+		// ゲームが始まった時点で片方の色の石しかないか、始まった時点で勝敗が決定するようなマップの場合がある
+		if (!this.canPutSomewhere(BLACK))
+			this.turn = this.canPutSomewhere(WHITE) ? WHITE : null;
+	}
+
+	public get blackCount() {
+		return this.board.filter(x => x === BLACK).length;
+	}
+
+	public get whiteCount() {
+		return this.board.filter(x => x === WHITE).length;
+	}
+
+	public posToXy(pos: number): number[] {
+		const x = pos % this.mapWidth;
+		const y = Math.floor(pos / this.mapWidth);
+		return [x, y];
+	}
+
+	public xyToPos(x: number, y: number): number {
+		return x + (y * this.mapWidth);
+	}
+
+	public put(color: Color, pos: number) {
+		this.prevPos = pos;
+		this.prevColor = color;
+
+		this.board[pos] = color;
+
+		// 反転させられる石を取得
+		const effects = this.effects(color, pos);
+
+		// 反転させる
+		for (const pos of effects) {
+			this.board[pos] = color;
+		}
+
+		const turn = this.turn;
+
+		this.logs.push({
+			color,
+			pos,
+			effects,
+			turn
+		});
+
+		this.calcTurn();
+	}
+
+	private calcTurn() {
+		// ターン計算
+		this.turn =
+			this.canPutSomewhere(!this.prevColor) ? !this.prevColor :
+			this.canPutSomewhere(this.prevColor!) ? this.prevColor :
+			null;
+	}
+
+	public undo() {
+		const undo = this.logs.pop()!;
+		this.prevColor = undo.color;
+		this.prevPos = undo.pos;
+		this.board[undo.pos] = null;
+		for (const pos of undo.effects) {
+			const color = this.board[pos];
+			this.board[pos] = !color;
+		}
+		this.turn = undo.turn;
+	}
+
+	public mapDataGet(pos: number): MapCell {
+		const [x, y] = this.posToXy(pos);
+		return x < 0 || y < 0 || x >= this.mapWidth || y >= this.mapHeight ? 'null' : this.map[pos];
+	}
+
+	public getPuttablePlaces(color: Color): number[] {
+		return Array.from(this.board.keys()).filter(i => this.canPut(color, i));
+	}
+
+	public canPutSomewhere(color: Color): boolean {
+		return this.getPuttablePlaces(color).length > 0;
+	}
+
+	public canPut(color: Color, pos: number): boolean {
+		return (
+			this.board[pos] !== null ? false : // 既に石が置いてある場所には打てない
+			this.opts.canPutEverywhere ? this.mapDataGet(pos) == 'empty' : // 挟んでなくても置けるモード
+			this.effects(color, pos).length !== 0); // 相手の石を1つでも反転させられるか
+	}
+
+	/**
+	 * 指定のマスに石を置いた時の、反転させられる石を取得します
+	 * @param color 自分の色
+	 * @param initPos 位置
+	 */
+	public effects(color: Color, initPos: number): number[] {
+		const enemyColor = !color;
+
+		const diffVectors: [number, number][] = [
+			[ 0, -1], // 上
+			[+1, -1], // 右上
+			[+1,  0], // 右
+			[+1, +1], // 右下
+			[ 0, +1], // 下
+			[-1, +1], // 左下
+			[-1,  0], // 左
+			[-1, -1]  // 左上
+		];
+
+		const effectsInLine = ([dx, dy]: [number, number]): number[] => {
+			const nextPos = (x: number, y: number): [number, number] => [x + dx, y + dy];
+
+			const found: number[] = []; // 挟めるかもしれない相手の石を入れておく配列
+			let [x, y] = this.posToXy(initPos);
+			while (true) {
+				[x, y] = nextPos(x, y);
+
+				// 座標が指し示す位置がボード外に出たとき
+				if (this.opts.loopedBoard && this.xyToPos(
+					(x = ((x % this.mapWidth) + this.mapWidth) % this.mapWidth),
+					(y = ((y % this.mapHeight) + this.mapHeight) % this.mapHeight)) === initPos)
+						// 盤面の境界でループし、自分が石を置く位置に戻ってきたとき、挟めるようにしている (ref: Test4のマップ)
+					return found;
+				else if (x === -1 || y === -1 || x === this.mapWidth || y === this.mapHeight)
+					return []; // 挟めないことが確定 (盤面外に到達)
+
+				const pos = this.xyToPos(x, y);
+				if (this.mapDataGet(pos) === 'null') return []; // 挟めないことが確定 (配置不可能なマスに到達)
+				const stone = this.board[pos];
+				if (stone === null) return []; // 挟めないことが確定 (石が置かれていないマスに到達)
+				if (stone === enemyColor) found.push(pos); // 挟めるかもしれない (相手の石を発見)
+				if (stone === color) return found; // 挟めることが確定 (対となる自分の石を発見)
+			}
+		};
+
+		return ([] as number[]).concat(...diffVectors.map(effectsInLine));
+	}
+
+	public get isEnded(): boolean {
+		return this.turn === null;
+	}
+
+	public get winner(): Color | null {
+		return this.isEnded ?
+			this.blackCount == this.whiteCount ? null :
+			this.opts.isLlotheo === this.blackCount > this.whiteCount ? WHITE : BLACK :
+			undefined as never;
+	}
+}
diff --git a/packages/misskey-reversi/src/index.ts b/packages/misskey-reversi/src/index.ts
new file mode 100644
index 0000000000..20ed36f208
--- /dev/null
+++ b/packages/misskey-reversi/src/index.ts
@@ -0,0 +1,7 @@
+import { Game } from './game.js';
+
+export {
+	Game,
+};
+
+export * as maps from './maps.js';
diff --git a/packages/misskey-reversi/src/maps.ts b/packages/misskey-reversi/src/maps.ts
new file mode 100644
index 0000000000..85cf1a0485
--- /dev/null
+++ b/packages/misskey-reversi/src/maps.ts
@@ -0,0 +1,715 @@
+/**
+ * 組み込みマップ定義
+ *
+ * データ値:
+ * (スペース) ... マス無し
+ * - ... マス
+ * b ... 初期配置される黒石
+ * w ... 初期配置される白石
+ */
+
+export type Map = {
+	name?: string;
+	category?: string;
+	author?: string;
+	data: string[];
+};
+
+export const fourfour: Map = {
+	name: '4x4',
+	category: '4x4',
+	data: [
+		'----',
+		'-wb-',
+		'-bw-',
+		'----'
+	]
+};
+
+export const sixsix: Map = {
+	name: '6x6',
+	category: '6x6',
+	data: [
+		'------',
+		'------',
+		'--wb--',
+		'--bw--',
+		'------',
+		'------'
+	]
+};
+
+export const roundedSixsix: Map = {
+	name: '6x6 rounded',
+	category: '6x6',
+	author: 'syuilo',
+	data: [
+		' ---- ',
+		'------',
+		'--wb--',
+		'--bw--',
+		'------',
+		' ---- '
+	]
+};
+
+export const roundedSixsix2: Map = {
+	name: '6x6 rounded 2',
+	category: '6x6',
+	author: 'syuilo',
+	data: [
+		'  --  ',
+		' ---- ',
+		'--wb--',
+		'--bw--',
+		' ---- ',
+		'  --  '
+	]
+};
+
+export const eighteight: Map = {
+	name: '8x8',
+	category: '8x8',
+	data: [
+		'--------',
+		'--------',
+		'--------',
+		'---wb---',
+		'---bw---',
+		'--------',
+		'--------',
+		'--------'
+	]
+};
+
+export const eighteightH28: Map = {
+	name: '8x8 handicap 28',
+	category: '8x8',
+	data: [
+		'bbbbbbbb',
+		'b------b',
+		'b------b',
+		'b--wb--b',
+		'b--bw--b',
+		'b------b',
+		'b------b',
+		'bbbbbbbb'
+	]
+};
+
+export const roundedEighteight: Map = {
+	name: '8x8 rounded',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		' ------ ',
+		'--------',
+		'--------',
+		'---wb---',
+		'---bw---',
+		'--------',
+		'--------',
+		' ------ '
+	]
+};
+
+export const roundedEighteight2: Map = {
+	name: '8x8 rounded 2',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		'  ----  ',
+		' ------ ',
+		'--------',
+		'---wb---',
+		'---bw---',
+		'--------',
+		' ------ ',
+		'  ----  '
+	]
+};
+
+export const roundedEighteight3: Map = {
+	name: '8x8 rounded 3',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		'   --   ',
+		'  ----  ',
+		' ------ ',
+		'---wb---',
+		'---bw---',
+		' ------ ',
+		'  ----  ',
+		'   --   '
+	]
+};
+
+export const eighteightWithNotch: Map = {
+	name: '8x8 with notch',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		'---  ---',
+		'--------',
+		'--------',
+		' --wb-- ',
+		' --bw-- ',
+		'--------',
+		'--------',
+		'---  ---'
+	]
+};
+
+export const eighteightWithSomeHoles: Map = {
+	name: '8x8 with some holes',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		'--- ----',
+		'----- --',
+		'-- -----',
+		'---wb---',
+		'---bw- -',
+		' -------',
+		'--- ----',
+		'--------'
+	]
+};
+
+export const circle: Map = {
+	name: 'Circle',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		'   --   ',
+		' ------ ',
+		' ------ ',
+		'---wb---',
+		'---bw---',
+		' ------ ',
+		' ------ ',
+		'   --   '
+	]
+};
+
+export const smile: Map = {
+	name: 'Smile',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		' ------ ',
+		'--------',
+		'-- -- --',
+		'---wb---',
+		'-- bw --',
+		'---  ---',
+		'--------',
+		' ------ '
+	]
+};
+
+export const window: Map = {
+	name: 'Window',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		'--------',
+		'-  --  -',
+		'-  --  -',
+		'---wb---',
+		'---bw---',
+		'-  --  -',
+		'-  --  -',
+		'--------'
+	]
+};
+
+export const reserved: Map = {
+	name: 'Reserved',
+	category: '8x8',
+	author: 'Aya',
+	data: [
+		'w------b',
+		'--------',
+		'--------',
+		'---wb---',
+		'---bw---',
+		'--------',
+		'--------',
+		'b------w'
+	]
+};
+
+export const x: Map = {
+	name: 'X',
+	category: '8x8',
+	author: 'Aya',
+	data: [
+		'w------b',
+		'-w----b-',
+		'--w--b--',
+		'---wb---',
+		'---bw---',
+		'--b--w--',
+		'-b----w-',
+		'b------w'
+	]
+};
+
+export const parallel: Map = {
+	name: 'Parallel',
+	category: '8x8',
+	author: 'Aya',
+	data: [
+		'--------',
+		'--------',
+		'--------',
+		'---bb---',
+		'---ww---',
+		'--------',
+		'--------',
+		'--------'
+	]
+};
+
+export const lackOfBlack: Map = {
+	name: 'Lack of Black',
+	category: '8x8',
+	data: [
+		'--------',
+		'--------',
+		'--------',
+		'---w----',
+		'---bw---',
+		'--------',
+		'--------',
+		'--------'
+	]
+};
+
+export const squareParty: Map = {
+	name: 'Square Party',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		'--------',
+		'-wwwbbb-',
+		'-w-wb-b-',
+		'-wwwbbb-',
+		'-bbbwww-',
+		'-b-bw-w-',
+		'-bbbwww-',
+		'--------'
+	]
+};
+
+export const minesweeper: Map = {
+	name: 'Minesweeper',
+	category: '8x8',
+	author: 'syuilo',
+	data: [
+		'b-b--w-w',
+		'-w-wb-b-',
+		'w-b--w-b',
+		'-b-wb-w-',
+		'-w-bw-b-',
+		'b-w--b-w',
+		'-b-bw-w-',
+		'w-w--b-b'
+	]
+};
+
+export const tenthtenth: Map = {
+	name: '10x10',
+	category: '10x10',
+	data: [
+		'----------',
+		'----------',
+		'----------',
+		'----------',
+		'----wb----',
+		'----bw----',
+		'----------',
+		'----------',
+		'----------',
+		'----------'
+	]
+};
+
+export const hole: Map = {
+	name: 'The Hole',
+	category: '10x10',
+	author: 'syuilo',
+	data: [
+		'----------',
+		'----------',
+		'--wb--wb--',
+		'--bw--bw--',
+		'----  ----',
+		'----  ----',
+		'--wb--wb--',
+		'--bw--bw--',
+		'----------',
+		'----------'
+	]
+};
+
+export const grid: Map = {
+	name: 'Grid',
+	category: '10x10',
+	author: 'syuilo',
+	data: [
+		'----------',
+		'- - -- - -',
+		'----------',
+		'- - -- - -',
+		'----wb----',
+		'----bw----',
+		'- - -- - -',
+		'----------',
+		'- - -- - -',
+		'----------'
+	]
+};
+
+export const cross: Map = {
+	name: 'Cross',
+	category: '10x10',
+	author: 'Aya',
+	data: [
+		'   ----   ',
+		'   ----   ',
+		'   ----   ',
+		'----------',
+		'----wb----',
+		'----bw----',
+		'----------',
+		'   ----   ',
+		'   ----   ',
+		'   ----   '
+	]
+};
+
+export const charX: Map = {
+	name: 'Char X',
+	category: '10x10',
+	author: 'syuilo',
+	data: [
+		'---    ---',
+		'----  ----',
+		'----------',
+		' -------- ',
+		'  --wb--  ',
+		'  --bw--  ',
+		' -------- ',
+		'----------',
+		'----  ----',
+		'---    ---'
+	]
+};
+
+export const charY: Map = {
+	name: 'Char Y',
+	category: '10x10',
+	author: 'syuilo',
+	data: [
+		'---    ---',
+		'----  ----',
+		'----------',
+		' -------- ',
+		'  --wb--  ',
+		'  --bw--  ',
+		'  ------  ',
+		'  ------  ',
+		'  ------  ',
+		'  ------  '
+	]
+};
+
+export const walls: Map = {
+	name: 'Walls',
+	category: '10x10',
+	author: 'Aya',
+	data: [
+		' bbbbbbbb ',
+		'w--------w',
+		'w--------w',
+		'w--------w',
+		'w---wb---w',
+		'w---bw---w',
+		'w--------w',
+		'w--------w',
+		'w--------w',
+		' bbbbbbbb '
+	]
+};
+
+export const cpu: Map = {
+	name: 'CPU',
+	category: '10x10',
+	author: 'syuilo',
+	data: [
+		' b b  b b ',
+		'w--------w',
+		' -------- ',
+		'w--------w',
+		' ---wb--- ',
+		' ---bw--- ',
+		'w--------w',
+		' -------- ',
+		'w--------w',
+		' b b  b b '
+	]
+};
+
+export const checker: Map = {
+	name: 'Checker',
+	category: '10x10',
+	author: 'Aya',
+	data: [
+		'----------',
+		'----------',
+		'----------',
+		'---wbwb---',
+		'---bwbw---',
+		'---wbwb---',
+		'---bwbw---',
+		'----------',
+		'----------',
+		'----------'
+	]
+};
+
+export const japaneseCurry: Map = {
+	name: 'Japanese curry',
+	category: '10x10',
+	author: 'syuilo',
+	data: [
+		'w-b-b-b-b-',
+		'-w-b-b-b-b',
+		'w-w-b-b-b-',
+		'-w-w-b-b-b',
+		'w-w-wwb-b-',
+		'-w-wbb-b-b',
+		'w-w-w-b-b-',
+		'-w-w-w-b-b',
+		'w-w-w-w-b-',
+		'-w-w-w-w-b'
+	]
+};
+
+export const mosaic: Map = {
+	name: 'Mosaic',
+	category: '10x10',
+	author: 'syuilo',
+	data: [
+		'- - - - - ',
+		' - - - - -',
+		'- - - - - ',
+		' - w w - -',
+		'- - b b - ',
+		' - w w - -',
+		'- - b b - ',
+		' - - - - -',
+		'- - - - - ',
+		' - - - - -',
+	]
+};
+
+export const arena: Map = {
+	name: 'Arena',
+	category: '10x10',
+	author: 'syuilo',
+	data: [
+		'- - -- - -',
+		' - -  - - ',
+		'- ------ -',
+		' -------- ',
+		'- --wb-- -',
+		'- --bw-- -',
+		' -------- ',
+		'- ------ -',
+		' - -  - - ',
+		'- - -- - -'
+	]
+};
+
+export const reactor: Map = {
+	name: 'Reactor',
+	category: '10x10',
+	author: 'syuilo',
+	data: [
+		'-w------b-',
+		'b- -  - -w',
+		'- --wb-- -',
+		'---b  w---',
+		'- b wb w -',
+		'- w bw b -',
+		'---w  b---',
+		'- --bw-- -',
+		'w- -  - -b',
+		'-b------w-'
+	]
+};
+
+export const sixeight: Map = {
+	name: '6x8',
+	category: 'Special',
+	data: [
+		'------',
+		'------',
+		'------',
+		'--wb--',
+		'--bw--',
+		'------',
+		'------',
+		'------'
+	]
+};
+
+export const spark: Map = {
+	name: 'Spark',
+	category: 'Special',
+	author: 'syuilo',
+	data: [
+		' -      - ',
+		'----------',
+		' -------- ',
+		' -------- ',
+		' ---wb--- ',
+		' ---bw--- ',
+		' -------- ',
+		' -------- ',
+		'----------',
+		' -      - '
+	]
+};
+
+export const islands: Map = {
+	name: 'Islands',
+	category: 'Special',
+	author: 'syuilo',
+	data: [
+		'--------  ',
+		'---wb---  ',
+		'---bw---  ',
+		'--------  ',
+		'  -    -  ',
+		'  -    -  ',
+		'  --------',
+		'  --------',
+		'  --------',
+		'  --------'
+	]
+};
+
+export const galaxy: Map = {
+	name: 'Galaxy',
+	category: 'Special',
+	author: 'syuilo',
+	data: [
+		'   ------   ',
+		'  --www---  ',
+		' ------w--- ',
+		'---bbb--w---',
+		'--b---b-w-b-',
+		'-b--wwb-w-b-',
+		'-b-w-bww--b-',
+		'-b-w-b---b--',
+		'---w--bbb---',
+		' ---w------ ',
+		'  ---www--  ',
+		'   ------   '
+	]
+};
+
+export const triangle: Map = {
+	name: 'Triangle',
+	category: 'Special',
+	author: 'syuilo',
+	data: [
+		'    --    ',
+		'    --    ',
+		'   ----   ',
+		'   ----   ',
+		'  --wb--  ',
+		'  --bw--  ',
+		' -------- ',
+		' -------- ',
+		'----------',
+		'----------'
+	]
+};
+
+export const iphonex: Map = {
+	name: 'iPhone X',
+	category: 'Special',
+	author: 'syuilo',
+	data: [
+		' --  -- ',
+		'--------',
+		'--------',
+		'--------',
+		'--------',
+		'---wb---',
+		'---bw---',
+		'--------',
+		'--------',
+		'--------',
+		'--------',
+		' ------ '
+	]
+};
+
+export const dealWithIt: Map = {
+	name: 'Deal with it!',
+	category: 'Special',
+	author: 'syuilo',
+	data: [
+		'------------',
+		'--w-b-------',
+		' --b-w------',
+		'  --w-b---- ',
+		'   -------  '
+	]
+};
+
+export const bigBoard: Map = {
+	name: 'Big board',
+	category: 'Special',
+	data: [
+		'----------------',
+		'----------------',
+		'----------------',
+		'----------------',
+		'----------------',
+		'----------------',
+		'----------------',
+		'-------wb-------',
+		'-------bw-------',
+		'----------------',
+		'----------------',
+		'----------------',
+		'----------------',
+		'----------------',
+		'----------------',
+		'----------------'
+	]
+};
+
+export const twoBoard: Map = {
+	name: 'Two board',
+	category: 'Special',
+	author: 'Aya',
+	data: [
+		'-------- --------',
+		'-------- --------',
+		'-------- --------',
+		'---wb--- ---wb---',
+		'---bw--- ---bw---',
+		'-------- --------',
+		'-------- --------',
+		'-------- --------'
+	]
+};
diff --git a/packages/misskey-reversi/tsconfig.json b/packages/misskey-reversi/tsconfig.json
new file mode 100644
index 0000000000..f56b65e868
--- /dev/null
+++ b/packages/misskey-reversi/tsconfig.json
@@ -0,0 +1,33 @@
+{
+	"$schema": "https://json.schemastore.org/tsconfig",
+	"compilerOptions": {
+		"target": "ES2022",
+		"module": "nodenext",
+		"moduleResolution": "nodenext",
+		"declaration": true,
+		"declarationMap": true,
+		"sourceMap": true,
+		"outDir": "./built/",
+		"removeComments": true,
+		"strict": true,
+		"strictFunctionTypes": true,
+		"strictNullChecks": true,
+		"experimentalDecorators": true,
+		"noImplicitReturns": true,
+		"esModuleInterop": true,
+		"typeRoots": [
+			"./node_modules/@types"
+		],
+		"lib": [
+			"esnext",
+			"dom"
+		]
+	},
+	"include": [
+		"src/**/*"
+	],
+	"exclude": [
+		"node_modules",
+		"test/**/*"
+	]
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 825a7ab860..31394eb081 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -185,6 +185,9 @@ importers:
       content-disposition:
         specifier: 0.5.4
         version: 0.5.4
+      crc-32:
+        specifier: ^1.2.2
+        version: 1.2.2
       date-fns:
         specifier: 2.30.0
         version: 2.30.0
@@ -263,6 +266,9 @@ importers:
       misskey-js:
         specifier: workspace:*
         version: link:../misskey-js
+      misskey-reversi:
+        specifier: workspace:*
+        version: link:../misskey-reversi
       ms:
         specifier: 3.0.0-canary.1
         version: 3.0.0-canary.1
@@ -736,6 +742,9 @@ importers:
       compare-versions:
         specifier: 6.1.0
         version: 6.1.0
+      crc-32:
+        specifier: ^1.2.2
+        version: 1.2.2
       cropperjs:
         specifier: 2.0.0-beta.4
         version: 2.0.0-beta.4
@@ -772,6 +781,9 @@ importers:
       misskey-js:
         specifier: workspace:*
         version: link:../misskey-js
+      misskey-reversi:
+        specifier: workspace:*
+        version: link:../misskey-reversi
       photoswipe:
         specifier: 5.4.3
         version: 5.4.3
@@ -1114,6 +1126,27 @@ importers:
         specifier: 5.3.3
         version: 5.3.3
 
+  packages/misskey-reversi:
+    devDependencies:
+      '@misskey-dev/eslint-plugin':
+        specifier: 1.0.0
+        version: 1.0.0(@typescript-eslint/eslint-plugin@6.19.0)(@typescript-eslint/parser@6.19.0)(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: 6.19.0
+        version: 6.19.0(@typescript-eslint/parser@6.19.0)(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/parser':
+        specifier: 6.19.0
+        version: 6.19.0(eslint@8.56.0)(typescript@5.3.3)
+      eslint:
+        specifier: 8.56.0
+        version: 8.56.0
+      typescript:
+        specifier: 5.3.3
+        version: 5.3.3
+
   packages/sw:
     dependencies:
       esbuild:
@@ -1128,7 +1161,7 @@ importers:
     devDependencies:
       '@misskey-dev/eslint-plugin':
         specifier: ^1.0.0
-        version: 1.0.0(@typescript-eslint/eslint-plugin@6.14.0)(@typescript-eslint/parser@6.14.0)(eslint-plugin-import@2.29.1)(eslint@8.56.0)
+        version: 1.0.0(@typescript-eslint/eslint-plugin@6.19.0)(@typescript-eslint/parser@6.14.0)(eslint-plugin-import@2.29.1)(eslint@8.56.0)
       '@typescript-eslint/parser':
         specifier: 6.14.0
         version: 6.14.0(eslint@8.56.0)(typescript@5.3.3)
@@ -1812,7 +1845,7 @@ packages:
       '@babel/traverse': 7.22.11
       '@babel/types': 7.22.17
       convert-source-map: 1.9.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -1835,7 +1868,7 @@ packages:
       '@babel/traverse': 7.23.5
       '@babel/types': 7.23.5
       convert-source-map: 2.0.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -1937,7 +1970,7 @@ packages:
       '@babel/core': 7.23.5
       '@babel/helper-compilation-targets': 7.22.15
       '@babel/helper-plugin-utils': 7.22.5
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       lodash.debounce: 4.0.8
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -3336,7 +3369,7 @@ packages:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/parser': 7.23.5
       '@babel/types': 7.22.17
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -3354,7 +3387,7 @@ packages:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/parser': 7.23.5
       '@babel/types': 7.23.5
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -4233,7 +4266,7 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       espree: 9.6.1
       globals: 13.19.0
       ignore: 5.2.4
@@ -4250,7 +4283,7 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       espree: 9.6.1
       globals: 13.19.0
       ignore: 5.2.4
@@ -4515,7 +4548,7 @@ packages:
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 2.0.1
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -4571,7 +4604,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       chalk: 4.1.2
       jest-message-util: 29.7.0
       jest-util: 29.7.0
@@ -4592,14 +4625,14 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       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.10.5)
+      jest-config: 29.7.0(@types/node@20.11.5)
       jest-haste-map: 29.7.0
       jest-message-util: 29.7.0
       jest-regex-util: 29.6.3
@@ -4634,7 +4667,7 @@ packages:
     dependencies:
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       jest-mock: 29.7.0
     dev: true
 
@@ -4661,7 +4694,7 @@ packages:
     dependencies:
       '@jest/types': 29.6.3
       '@sinonjs/fake-timers': 10.3.0
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       jest-message-util: 29.7.0
       jest-mock: 29.7.0
       jest-util: 29.7.0
@@ -4694,7 +4727,7 @@ packages:
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
       '@jridgewell/trace-mapping': 0.3.18
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       chalk: 4.1.2
       collect-v8-coverage: 1.0.1
       exit: 0.1.2
@@ -4788,7 +4821,7 @@ packages:
     dependencies:
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       '@types/yargs': 16.0.5
       chalk: 4.1.2
     dev: true
@@ -4800,7 +4833,7 @@ packages:
       '@jest/schemas': 29.6.3
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       '@types/yargs': 17.0.19
       chalk: 4.1.2
     dev: true
@@ -4992,6 +5025,34 @@ packages:
       eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.14.0)(eslint@8.56.0)
     dev: true
 
+  /@misskey-dev/eslint-plugin@1.0.0(@typescript-eslint/eslint-plugin@6.19.0)(@typescript-eslint/parser@6.14.0)(eslint-plugin-import@2.29.1)(eslint@8.56.0):
+    resolution: {integrity: sha512-dh6UbcrNDVg5DD8k8Qh4ab30OPpuEYIlJCqaBV/lkIV8wNN/AfCJ2V7iTP8V8KjryM4t+sf5IqzQLQnT0mWI4A==}
+    peerDependencies:
+      '@typescript-eslint/eslint-plugin': '>= 6'
+      '@typescript-eslint/parser': '>= 6'
+      eslint: '>= 3'
+      eslint-plugin-import: '>= 2'
+    dependencies:
+      '@typescript-eslint/eslint-plugin': 6.19.0(@typescript-eslint/parser@6.14.0)(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/parser': 6.14.0(eslint@8.56.0)(typescript@5.3.3)
+      eslint: 8.56.0
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.14.0)(eslint@8.56.0)
+    dev: true
+
+  /@misskey-dev/eslint-plugin@1.0.0(@typescript-eslint/eslint-plugin@6.19.0)(@typescript-eslint/parser@6.19.0)(eslint-plugin-import@2.29.1)(eslint@8.56.0):
+    resolution: {integrity: sha512-dh6UbcrNDVg5DD8k8Qh4ab30OPpuEYIlJCqaBV/lkIV8wNN/AfCJ2V7iTP8V8KjryM4t+sf5IqzQLQnT0mWI4A==}
+    peerDependencies:
+      '@typescript-eslint/eslint-plugin': '>= 6'
+      '@typescript-eslint/parser': '>= 6'
+      eslint: '>= 3'
+      eslint-plugin-import: '>= 2'
+    dependencies:
+      '@typescript-eslint/eslint-plugin': 6.19.0(@typescript-eslint/parser@6.19.0)(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/parser': 6.19.0(eslint@8.56.0)(typescript@5.3.3)
+      eslint: 8.56.0
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.19.0)(eslint@8.56.0)
+    dev: true
+
   /@misskey-dev/sharp-read-bmp@1.1.1:
     resolution: {integrity: sha512-X52BQYL/I9mafypQ+wBhst+BUlYiPWnHhKGcF6ybcYSLl+zhcV0q5mezIXHozhM0Sv0A7xCdrWmR7TCNxHLrtQ==}
     dependencies:
@@ -5089,7 +5150,7 @@ packages:
       '@open-draft/until': 1.0.3
       '@types/debug': 4.1.7
       '@xmldom/xmldom': 0.8.6
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       headers-polyfill: 3.2.5
       outvariant: 1.4.0
       strict-event-emitter: 0.2.8
@@ -7992,7 +8053,7 @@ packages:
     dependencies:
       '@types/http-cache-semantics': 4.0.1
       '@types/keyv': 3.1.4
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       '@types/responselike': 1.0.0
     dev: false
 
@@ -8025,7 +8086,7 @@ packages:
   /@types/connect@3.4.35:
     resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /@types/content-disposition@0.5.8:
@@ -8039,7 +8100,7 @@ packages:
   /@types/cross-spawn@6.0.2:
     resolution: {integrity: sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /@types/debug@4.1.7:
@@ -8097,7 +8158,7 @@ packages:
   /@types/express-serve-static-core@4.17.33:
     resolution: {integrity: sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       '@types/qs': 6.9.7
       '@types/range-parser': 1.2.4
     dev: true
@@ -8125,13 +8186,13 @@ packages:
     resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==}
     dependencies:
       '@types/minimatch': 5.1.2
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /@types/graceful-fs@4.1.6:
     resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /@types/http-cache-semantics@4.0.1:
@@ -8212,7 +8273,7 @@ packages:
   /@types/keyv@3.1.4:
     resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: false
 
   /@types/lodash@4.14.191:
@@ -8261,7 +8322,7 @@ packages:
   /@types/node-fetch@2.6.4:
     resolution: {integrity: sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       form-data: 3.0.1
 
   /@types/node-fetch@3.0.3:
@@ -8279,6 +8340,11 @@ packages:
     dependencies:
       undici-types: 5.26.5
 
+  /@types/node@20.11.5:
+    resolution: {integrity: sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==}
+    dependencies:
+      undici-types: 5.26.5
+
   /@types/node@20.9.1:
     resolution: {integrity: sha512-HhmzZh5LSJNS5O8jQKpJ/3ZcrrlG6L70hpGqMIAoM9YVD0YBRNWYsfwcXq8VnSjlNpCpgLzMXdiPo+dxcvSmiA==}
     dependencies:
@@ -8381,7 +8447,7 @@ packages:
   /@types/readdir-glob@1.1.1:
     resolution: {integrity: sha512-ImM6TmoF8bgOwvehGviEj3tRdRBbQujr1N+0ypaln/GWjaerOB26jb93vsRHmdMtvVQZQebOlqt2HROark87mQ==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /@types/rename@1.0.7:
@@ -8395,7 +8461,7 @@ packages:
   /@types/responselike@1.0.0:
     resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: false
 
   /@types/sanitize-html@2.9.5:
@@ -8421,7 +8487,7 @@ packages:
     resolution: {integrity: sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==}
     dependencies:
       '@types/mime': 3.0.1
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /@types/serviceworker@0.0.67:
@@ -8431,7 +8497,7 @@ packages:
   /@types/set-cookie-parser@2.4.3:
     resolution: {integrity: sha512-7QhnH7bi+6KAhBB+Auejz1uV9DHiopZqu7LfR/5gZZTkejJV5nYeZZpgfFoE0N8aDsXuiYpfKyfyMatCwQhyTQ==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /@types/sharp@0.32.0:
@@ -8534,7 +8600,7 @@ packages:
     resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==}
     requiresBuild: true
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
     optional: true
 
@@ -8555,7 +8621,7 @@ packages:
       '@typescript-eslint/type-utils': 6.11.0(eslint@8.53.0)(typescript@5.3.3)
       '@typescript-eslint/utils': 6.11.0(eslint@8.53.0)(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 6.11.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.53.0
       graphemer: 1.4.0
       ignore: 5.2.4
@@ -8584,7 +8650,65 @@ packages:
       '@typescript-eslint/type-utils': 6.14.0(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/utils': 6.14.0(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 6.14.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
+      eslint: 8.56.0
+      graphemer: 1.4.0
+      ignore: 5.2.4
+      natural-compare: 1.4.0
+      semver: 7.5.4
+      ts-api-utils: 1.0.1(typescript@5.3.3)
+      typescript: 5.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/eslint-plugin@6.19.0(@typescript-eslint/parser@6.14.0)(eslint@8.56.0)(typescript@5.3.3):
+    resolution: {integrity: sha512-DUCUkQNklCQYnrBSSikjVChdc84/vMPDQSgJTHBZ64G9bA9w0Crc0rd2diujKbTdp6w2J47qkeHQLoi0rpLCdg==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      '@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': 6.14.0(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/scope-manager': 6.19.0
+      '@typescript-eslint/type-utils': 6.19.0(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/utils': 6.19.0(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/visitor-keys': 6.19.0
+      debug: 4.3.4(supports-color@5.5.0)
+      eslint: 8.56.0
+      graphemer: 1.4.0
+      ignore: 5.2.4
+      natural-compare: 1.4.0
+      semver: 7.5.4
+      ts-api-utils: 1.0.1(typescript@5.3.3)
+      typescript: 5.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/eslint-plugin@6.19.0(@typescript-eslint/parser@6.19.0)(eslint@8.56.0)(typescript@5.3.3):
+    resolution: {integrity: sha512-DUCUkQNklCQYnrBSSikjVChdc84/vMPDQSgJTHBZ64G9bA9w0Crc0rd2diujKbTdp6w2J47qkeHQLoi0rpLCdg==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      '@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': 6.19.0(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/scope-manager': 6.19.0
+      '@typescript-eslint/type-utils': 6.19.0(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/utils': 6.19.0(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/visitor-keys': 6.19.0
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.56.0
       graphemer: 1.4.0
       ignore: 5.2.4
@@ -8610,7 +8734,7 @@ packages:
       '@typescript-eslint/types': 6.11.0
       '@typescript-eslint/typescript-estree': 6.11.0(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 6.11.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.53.0
       typescript: 5.3.3
     transitivePeerDependencies:
@@ -8631,7 +8755,28 @@ packages:
       '@typescript-eslint/types': 6.14.0
       '@typescript-eslint/typescript-estree': 6.14.0(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 6.14.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
+      eslint: 8.56.0
+      typescript: 5.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/parser@6.19.0(eslint@8.56.0)(typescript@5.3.3):
+    resolution: {integrity: sha512-1DyBLG5SH7PYCd00QlroiW60YJ4rWMuUGa/JBV0iZuqi4l4IK3twKPq5ZkEebmGqRjXWVgsUzfd3+nZveewgow==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      eslint: ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/scope-manager': 6.19.0
+      '@typescript-eslint/types': 6.19.0
+      '@typescript-eslint/typescript-estree': 6.19.0(typescript@5.3.3)
+      '@typescript-eslint/visitor-keys': 6.19.0
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.56.0
       typescript: 5.3.3
     transitivePeerDependencies:
@@ -8654,6 +8799,14 @@ packages:
       '@typescript-eslint/visitor-keys': 6.14.0
     dev: true
 
+  /@typescript-eslint/scope-manager@6.19.0:
+    resolution: {integrity: sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    dependencies:
+      '@typescript-eslint/types': 6.19.0
+      '@typescript-eslint/visitor-keys': 6.19.0
+    dev: true
+
   /@typescript-eslint/type-utils@6.11.0(eslint@8.53.0)(typescript@5.3.3):
     resolution: {integrity: sha512-nA4IOXwZtqBjIoYrJcYxLRO+F9ri+leVGoJcMW1uqr4r1Hq7vW5cyWrA43lFbpRvQ9XgNrnfLpIkO3i1emDBIA==}
     engines: {node: ^16.0.0 || >=18.0.0}
@@ -8666,7 +8819,7 @@ packages:
     dependencies:
       '@typescript-eslint/typescript-estree': 6.11.0(typescript@5.3.3)
       '@typescript-eslint/utils': 6.11.0(eslint@8.53.0)(typescript@5.3.3)
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.53.0
       ts-api-utils: 1.0.1(typescript@5.3.3)
       typescript: 5.3.3
@@ -8686,7 +8839,27 @@ packages:
     dependencies:
       '@typescript-eslint/typescript-estree': 6.14.0(typescript@5.3.3)
       '@typescript-eslint/utils': 6.14.0(eslint@8.56.0)(typescript@5.3.3)
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
+      eslint: 8.56.0
+      ts-api-utils: 1.0.1(typescript@5.3.3)
+      typescript: 5.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/type-utils@6.19.0(eslint@8.56.0)(typescript@5.3.3):
+    resolution: {integrity: sha512-mcvS6WSWbjiSxKCwBcXtOM5pRkPQ6kcDds/juxcy/727IQr3xMEcwr/YLHW2A2+Fp5ql6khjbKBzOyjuPqGi/w==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      eslint: ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/typescript-estree': 6.19.0(typescript@5.3.3)
+      '@typescript-eslint/utils': 6.19.0(eslint@8.56.0)(typescript@5.3.3)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.56.0
       ts-api-utils: 1.0.1(typescript@5.3.3)
       typescript: 5.3.3
@@ -8704,6 +8877,11 @@ packages:
     engines: {node: ^16.0.0 || >=18.0.0}
     dev: true
 
+  /@typescript-eslint/types@6.19.0:
+    resolution: {integrity: sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    dev: true
+
   /@typescript-eslint/typescript-estree@6.11.0(typescript@5.3.3):
     resolution: {integrity: sha512-Aezzv1o2tWJwvZhedzvD5Yv7+Lpu1by/U1LZ5gLc4tCx8jUmuSCMioPFRjliN/6SJIvY6HpTtJIWubKuYYYesQ==}
     engines: {node: ^16.0.0 || >=18.0.0}
@@ -8715,7 +8893,7 @@ packages:
     dependencies:
       '@typescript-eslint/types': 6.11.0
       '@typescript-eslint/visitor-keys': 6.11.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.5.4
@@ -8736,7 +8914,7 @@ packages:
     dependencies:
       '@typescript-eslint/types': 6.14.0
       '@typescript-eslint/visitor-keys': 6.14.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.5.4
@@ -8746,6 +8924,28 @@ packages:
       - supports-color
     dev: true
 
+  /@typescript-eslint/typescript-estree@6.19.0(typescript@5.3.3):
+    resolution: {integrity: sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/types': 6.19.0
+      '@typescript-eslint/visitor-keys': 6.19.0
+      debug: 4.3.4(supports-color@5.5.0)
+      globby: 11.1.0
+      is-glob: 4.0.3
+      minimatch: 9.0.3
+      semver: 7.5.4
+      ts-api-utils: 1.0.1(typescript@5.3.3)
+      typescript: 5.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@typescript-eslint/utils@6.11.0(eslint@8.53.0)(typescript@5.3.3):
     resolution: {integrity: sha512-p23ibf68fxoZy605dc0dQAEoUsoiNoP3MD9WQGiHLDuTSOuqoTsa4oAy+h3KDkTcxbbfOtUjb9h3Ta0gT4ug2g==}
     engines: {node: ^16.0.0 || >=18.0.0}
@@ -8784,6 +8984,25 @@ packages:
       - typescript
     dev: true
 
+  /@typescript-eslint/utils@6.19.0(eslint@8.56.0)(typescript@5.3.3):
+    resolution: {integrity: sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      eslint: ^7.0.0 || ^8.0.0
+    dependencies:
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
+      '@types/json-schema': 7.0.12
+      '@types/semver': 7.5.6
+      '@typescript-eslint/scope-manager': 6.19.0
+      '@typescript-eslint/types': 6.19.0
+      '@typescript-eslint/typescript-estree': 6.19.0(typescript@5.3.3)
+      eslint: 8.56.0
+      semver: 7.5.4
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
   /@typescript-eslint/visitor-keys@6.11.0:
     resolution: {integrity: sha512-+SUN/W7WjBr05uRxPggJPSzyB8zUpaYo2hByKasWbqr3PM8AXfZt8UHdNpBS1v9SA62qnSSMF3380SwDqqprgQ==}
     engines: {node: ^16.0.0 || >=18.0.0}
@@ -8800,6 +9019,14 @@ packages:
       eslint-visitor-keys: 3.4.3
     dev: true
 
+  /@typescript-eslint/visitor-keys@6.19.0:
+    resolution: {integrity: sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    dependencies:
+      '@typescript-eslint/types': 6.19.0
+      eslint-visitor-keys: 3.4.3
+    dev: true
+
   /@ungap/structured-clone@1.2.0:
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
     dev: true
@@ -9193,7 +9420,7 @@ packages:
     engines: {node: '>= 6.0.0'}
     requiresBuild: true
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -9201,7 +9428,7 @@ packages:
     resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==}
     engines: {node: '>= 14'}
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -9587,7 +9814,7 @@ packages:
     resolution: {integrity: sha512-TAlMYvOuwGyLK3PfBb5WKBXZmXz2fVCgv23d6zZFdle/q3gPjmxBaeuC0pY0Dzs5PWMSgfqqEZkrye19GlDTgw==}
     dependencies:
       archy: 1.0.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       fastq: 1.15.0
     transitivePeerDependencies:
       - supports-color
@@ -11036,7 +11263,6 @@ packages:
     dependencies:
       ms: 2.1.2
       supports-color: 5.5.0
-    dev: true
 
   /debug@4.3.4(supports-color@8.1.1):
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
@@ -11049,6 +11275,7 @@ packages:
     dependencies:
       ms: 2.1.2
       supports-color: 8.1.1
+    dev: true
 
   /decamelize-keys@1.1.1:
     resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
@@ -11265,7 +11492,7 @@ packages:
     hasBin: true
     dependencies:
       address: 1.2.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -11589,7 +11816,7 @@ packages:
     peerDependencies:
       esbuild: '>=0.12 <1'
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       esbuild: 0.18.20
     transitivePeerDependencies:
       - supports-color
@@ -11806,6 +12033,35 @@ packages:
       - supports-color
     dev: true
 
+  /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.19.0)(eslint-import-resolver-node@0.3.9)(eslint@8.56.0):
+    resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint:
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+    dependencies:
+      '@typescript-eslint/parser': 6.19.0(eslint@8.56.0)(typescript@5.3.3)
+      debug: 3.2.7(supports-color@8.1.1)
+      eslint: 8.56.0
+      eslint-import-resolver-node: 0.3.9
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.11.0)(eslint@8.53.0):
     resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==}
     engines: {node: '>=4'}
@@ -11876,6 +12132,41 @@ packages:
       - supports-color
     dev: true
 
+  /eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.19.0)(eslint@8.56.0):
+    resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+    dependencies:
+      '@typescript-eslint/parser': 6.19.0(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.56.0
+      eslint-import-resolver-node: 0.3.9
+      eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.19.0)(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
+      minimatch: 3.1.2
+      object.fromentries: 2.0.7
+      object.groupby: 1.0.1
+      object.values: 1.1.7
+      semver: 6.3.1
+      tsconfig-paths: 3.15.0
+    transitivePeerDependencies:
+      - eslint-import-resolver-typescript
+      - eslint-import-resolver-webpack
+      - supports-color
+    dev: true
+
   /eslint-plugin-vue@9.19.2(eslint@8.56.0):
     resolution: {integrity: sha512-CPDqTOG2K4Ni2o4J5wixkLVNwgctKXFu6oBpVJlpNq7f38lh9I80pRTouZSJ2MAebPJlINU/KTFSXyQfBUlymA==}
     engines: {node: ^14.17.0 || >=16.0.0}
@@ -11927,7 +12218,7 @@ packages:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -11974,7 +12265,7 @@ packages:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -12604,7 +12895,7 @@ packages:
       debug:
         optional: true
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
 
   /for-each@0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
@@ -13160,7 +13451,6 @@ packages:
   /has-flag@3.0.0:
     resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
     engines: {node: '>=4'}
-    dev: true
 
   /has-flag@4.0.0:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
@@ -13298,7 +13588,7 @@ packages:
     engines: {node: '>= 14'}
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -13360,7 +13650,7 @@ packages:
     engines: {node: '>= 6.0.0'}
     dependencies:
       agent-base: 5.1.1
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -13370,7 +13660,7 @@ packages:
     engines: {node: '>= 6'}
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -13379,7 +13669,7 @@ packages:
     engines: {node: '>= 14'}
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -13389,7 +13679,7 @@ packages:
     engines: {node: '>= 14'}
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -13549,7 +13839,7 @@ packages:
     dependencies:
       '@ioredis/commands': 1.2.0
       cluster-key-slot: 1.1.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       denque: 2.1.0
       lodash.defaults: 4.2.0
       lodash.isarguments: 3.1.0
@@ -13990,7 +14280,7 @@ packages:
     resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
     engines: {node: '>=10'}
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       istanbul-lib-coverage: 3.2.0
       source-map: 0.6.1
     transitivePeerDependencies:
@@ -14044,7 +14334,7 @@ packages:
       '@jest/expect': 29.7.0
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       chalk: 4.1.2
       co: 4.6.0
       dedent: 1.3.0
@@ -14133,6 +14423,46 @@ packages:
       - supports-color
     dev: true
 
+  /jest-config@29.7.0(@types/node@20.11.5):
+    resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      '@types/node': '*'
+      ts-node: '>=9.0.0'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      ts-node:
+        optional: true
+    dependencies:
+      '@babel/core': 7.22.11
+      '@jest/test-sequencer': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.11.5
+      babel-jest: 29.7.0(@babel/core@7.22.11)
+      chalk: 4.1.2
+      ci-info: 3.7.1
+      deepmerge: 4.2.2
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      jest-circus: 29.7.0
+      jest-environment-node: 29.7.0
+      jest-get-type: 29.6.3
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-runner: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      micromatch: 4.0.5
+      parse-json: 5.2.0
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+    dev: true
+
   /jest-diff@28.1.3:
     resolution: {integrity: sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==}
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
@@ -14188,7 +14518,7 @@ packages:
       '@jest/environment': 29.7.0
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       jest-mock: 29.7.0
       jest-util: 29.7.0
     dev: true
@@ -14218,7 +14548,7 @@ packages:
     dependencies:
       '@jest/types': 29.6.3
       '@types/graceful-fs': 4.1.6
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.11
@@ -14279,7 +14609,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.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /jest-mock@29.7.0:
@@ -14342,7 +14672,7 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       chalk: 4.1.2
       emittery: 0.13.1
       graceful-fs: 4.2.11
@@ -14373,7 +14703,7 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       chalk: 4.1.2
       cjs-module-lexer: 1.2.2
       collect-v8-coverage: 1.0.1
@@ -14425,7 +14755,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       chalk: 4.1.2
       ci-info: 3.7.1
       graceful-fs: 4.2.11
@@ -14450,7 +14780,7 @@ packages:
     dependencies:
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.13.1
@@ -14469,7 +14799,7 @@ packages:
     resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       jest-util: 29.7.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
@@ -14667,7 +14997,7 @@ packages:
     resolution: {integrity: sha512-pJ4XLQP4Q9HTxl6RVDLJ8Cyh1uitSs0CzDBAz1uoJ4sRD/Bk7cFSXL1FUXDW3zJ7YnfliJx6eu8Jn283bpZ4Yg==}
     engines: {node: '>=10'}
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       rfdc: 1.3.0
       uri-js: 4.4.1
     transitivePeerDependencies:
@@ -17278,7 +17608,7 @@ packages:
     engines: {node: '>=8.16.0'}
     dependencies:
       '@types/mime-types': 2.1.4
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       extract-zip: 1.7.0
       https-proxy-agent: 4.0.0
       mime: 2.6.0
@@ -18275,7 +18605,7 @@ packages:
     dependencies:
       '@hapi/hoek': 10.0.1
       '@hapi/wreck': 18.0.1
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       joi: 17.7.0
     transitivePeerDependencies:
       - supports-color
@@ -18475,7 +18805,7 @@ packages:
     engines: {node: '>= 14'}
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       socks: 2.7.1
     transitivePeerDependencies:
       - supports-color
@@ -18628,7 +18958,7 @@ packages:
       arg: 5.0.2
       bluebird: 3.7.2
       check-more-types: 2.24.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       execa: 5.1.1
       lazy-ass: 1.6.0
       ps-tree: 1.2.0
@@ -18892,7 +19222,6 @@ packages:
     engines: {node: '>=4'}
     dependencies:
       has-flag: 3.0.0
-    dev: true
 
   /supports-color@7.2.0:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
@@ -19515,7 +19844,7 @@ packages:
       chalk: 4.1.2
       cli-highlight: 2.1.11
       date-fns: 2.30.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       dotenv: 16.0.3
       glob: 8.1.0
       ioredis: 5.3.2
@@ -19880,7 +20209,7 @@ packages:
     hasBin: true
     dependencies:
       cac: 6.7.14
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       mlly: 1.4.0
       pathe: 1.1.1
       picocolors: 1.0.0
@@ -19992,7 +20321,7 @@ packages:
       acorn-walk: 8.2.0
       cac: 6.7.14
       chai: 4.3.10
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       happy-dom: 10.0.3
       local-pkg: 0.4.3
       magic-string: 0.30.3
@@ -20074,7 +20403,7 @@ packages:
     peerDependencies:
       eslint: '>=6.0.0'
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.56.0
       eslint-scope: 7.2.2
       eslint-visitor-keys: 3.4.3
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 3b2ecec7fd..3a03a58253 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -4,3 +4,4 @@ packages:
  - 'packages/sw'
  - 'packages/misskey-js'
  - 'packages/misskey-js/generator'
+ - 'packages/misskey-reversi'
-- 
cgit v1.2.3-freya


From 7881f06be060dd955499a6beff3ad1967ed628f6 Mon Sep 17 00:00:00 2001
From: "Acid Chicken (硫酸鶏)" <root@acid-chicken.com>
Date: Sat, 20 Jan 2024 08:11:59 +0900
Subject: refactor: deprecate i18n.t (#13039)

* refactor: deprecate i18n.t

* revert: deprecate i18n.t

This reverts commit 7dbf873a2f745040ee723df5db659acacff84e12.

* chore: reimpl
---
 locales/generateDTS.js                             |   78 +-
 locales/index.d.ts                                 | 6878 +++++++++++++++++++-
 packages/frontend/src/boot/main-boot.ts            |    2 +-
 .../src/components/MkAnnouncementDialog.vue        |    2 +-
 packages/frontend/src/components/MkCwButton.vue    |    4 +-
 .../src/components/MkDateSeparatedList.vue         |    2 +-
 packages/frontend/src/components/MkDialog.vue      |    4 +-
 packages/frontend/src/components/MkDrive.vue       |    4 +-
 .../frontend/src/components/MkFollowButton.vue     |    2 +-
 packages/frontend/src/components/MkNote.vue        |    2 +-
 .../frontend/src/components/MkNoteDetailed.vue     |    2 +-
 .../frontend/src/components/MkNotification.vue     |    4 +-
 .../src/components/MkNotificationSelectWindow.vue  |    2 +-
 packages/frontend/src/components/MkPoll.vue        |   15 +-
 packages/frontend/src/components/MkPollEditor.vue  |    2 +-
 .../src/components/MkSignupDialog.form.vue         |    2 +-
 .../src/components/MkSignupDialog.rules.vue        |    6 +-
 .../frontend/src/components/MkSubNoteContent.vue   |    2 +-
 .../src/components/MkTokenGenerateWindow.vue       |    4 +-
 .../frontend/src/components/MkTutorialDialog.vue   |    2 +-
 .../components/MkUserAnnouncementEditDialog.vue    |    2 +-
 .../src/components/MkUserSetupDialog.Profile.vue   |    2 +-
 .../frontend/src/components/MkUserSetupDialog.vue  |    4 +-
 packages/frontend/src/components/MkWidgets.vue     |    4 +-
 packages/frontend/src/components/global/I18n.vue   |   46 +
 .../src/components/global/MkTime.stories.impl.ts   |   10 +-
 packages/frontend/src/components/global/MkTime.vue |   28 +-
 packages/frontend/src/components/global/i18n.ts    |   29 -
 packages/frontend/src/components/index.ts          |    2 +-
 packages/frontend/src/pages/about.vue              |    2 +-
 packages/frontend/src/pages/admin-file.vue         |    2 +-
 packages/frontend/src/pages/admin-user.vue         |    8 +-
 packages/frontend/src/pages/admin/ads.vue          |    2 +-
 .../frontend/src/pages/admin/announcements.vue     |    4 +-
 packages/frontend/src/pages/admin/branding.vue     |    8 +-
 packages/frontend/src/pages/admin/relays.vue       |    2 +-
 packages/frontend/src/pages/admin/roles.role.vue   |    2 +-
 packages/frontend/src/pages/announcements.vue      |    2 +-
 packages/frontend/src/pages/auth.form.vue          |    6 +-
 packages/frontend/src/pages/auth.vue               |    2 +-
 packages/frontend/src/pages/avatar-decorations.vue |    2 +-
 packages/frontend/src/pages/channel-editor.vue     |    2 +-
 packages/frontend/src/pages/clip.vue               |    2 +-
 packages/frontend/src/pages/drive.file.info.vue    |    2 +-
 packages/frontend/src/pages/drop-and-fusion.vue    |    2 +-
 packages/frontend/src/pages/emoji-edit-dialog.vue  |    2 +-
 packages/frontend/src/pages/flash/flash-edit.vue   |    2 +-
 packages/frontend/src/pages/follow.vue             |    2 +-
 packages/frontend/src/pages/instance-info.vue      |    4 +-
 packages/frontend/src/pages/invite.vue             |    4 +-
 packages/frontend/src/pages/miauth.vue             |    6 +-
 packages/frontend/src/pages/my-antennas/editor.vue |    2 +-
 packages/frontend/src/pages/my-lists/index.vue     |    2 +-
 packages/frontend/src/pages/my-lists/list.vue      |    4 +-
 packages/frontend/src/pages/note.vue               |    2 +-
 packages/frontend/src/pages/notifications.vue      |    2 +-
 packages/frontend/src/pages/oauth.vue              |    6 +-
 .../frontend/src/pages/page-editor/page-editor.vue |    2 +-
 packages/frontend/src/pages/reversi/game.board.vue |    8 +-
 packages/frontend/src/pages/settings/2fa.vue       |    2 +-
 packages/frontend/src/pages/settings/apps.vue      |    2 +-
 .../src/pages/settings/avatar-decoration.vue       |    2 +-
 packages/frontend/src/pages/settings/general.vue   |    6 +-
 packages/frontend/src/pages/settings/migration.vue |    4 +-
 .../src/pages/settings/mute-block.word-mute.vue    |    2 +-
 .../frontend/src/pages/settings/notifications.vue  |    2 +-
 packages/frontend/src/pages/settings/profile.vue   |    4 +-
 packages/frontend/src/pages/settings/sounds.vue    |    4 +-
 .../frontend/src/pages/settings/theme.install.vue  |    2 +-
 .../frontend/src/pages/settings/webhook.edit.vue   |    2 +-
 packages/frontend/src/pages/signup-complete.vue    |    2 +-
 packages/frontend/src/pages/theme-editor.vue       |    2 +-
 packages/frontend/src/pages/user/home.vue          |    2 +-
 .../frontend/src/scripts/get-drive-file-menu.ts    |    2 +-
 packages/frontend/src/scripts/get-note-menu.ts     |    4 +-
 packages/frontend/src/scripts/get-note-summary.ts  |    2 +-
 packages/frontend/src/scripts/i18n.ts              |  221 +-
 packages/frontend/src/ui/deck.vue                  |    6 +-
 packages/frontend/src/widgets/WidgetCalendar.vue   |    8 +-
 packages/frontend/src/widgets/WidgetSlideshow.vue  |    2 +-
 packages/frontend/src/widgets/WidgetTimeline.vue   |    2 +-
 packages/frontend/src/widgets/WidgetTrends.vue     |    2 +-
 packages/frontend/tsconfig.json                    |    1 +
 packages/frontend/vite.config.ts                   |    1 +
 84 files changed, 7311 insertions(+), 222 deletions(-)
 create mode 100644 packages/frontend/src/components/global/I18n.vue
 delete mode 100644 packages/frontend/src/components/global/i18n.ts

diff --git a/locales/generateDTS.js b/locales/generateDTS.js
index 6eb5bd630d..49807144ec 100644
--- a/locales/generateDTS.js
+++ b/locales/generateDTS.js
@@ -16,32 +16,40 @@ function createMemberType(item) {
 		item.matchAll(parameterRegExp),
 		([, parameter]) => parameter,
 	);
-	if (!parameters.length) {
-		return ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
-	}
-	return ts.factory.createTypeReferenceNode(
-		ts.factory.createIdentifier('ParameterizedString'),
-		[
-			ts.factory.createUnionTypeNode(
-				parameters.map((parameter) =>
-					ts.factory.createLiteralTypeNode(
-						ts.factory.createStringLiteral(parameter),
+	return parameters.length
+		? ts.factory.createTypeReferenceNode(
+				ts.factory.createIdentifier('ParameterizedString'),
+				[
+					ts.factory.createUnionTypeNode(
+						parameters.map((parameter) =>
+							ts.factory.createStringLiteral(parameter),
+						),
 					),
-				),
-			),
-		],
-	);
+				],
+			)
+		: ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
 }
 
 function createMembers(record) {
-	return Object.entries(record).map(([k, v]) =>
-		ts.factory.createPropertySignature(
+	return Object.entries(record).map(([k, v]) => {
+		const node = ts.factory.createPropertySignature(
 			undefined,
 			ts.factory.createStringLiteral(k),
 			undefined,
 			createMemberType(v),
-		),
-	);
+		);
+		if (typeof v === 'string') {
+			ts.addSyntheticLeadingComment(
+				node,
+				ts.SyntaxKind.MultiLineCommentTrivia,
+				`*
+ * ${v.replace(/\n/g, '\n * ')}
+ `,
+				true,
+			);
+		}
+		return node;
+	});
 }
 
 export default function generateDTS() {
@@ -72,10 +80,8 @@ export default function generateDTS() {
 				ts.factory.createTypeParameterDeclaration(
 					undefined,
 					ts.factory.createIdentifier('T'),
-					ts.factory.createTypeReferenceNode(
-						ts.factory.createIdentifier('string'),
-						undefined,
-					),
+					ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+					ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
 				),
 			],
 			undefined,
@@ -115,7 +121,6 @@ export default function generateDTS() {
 						ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
 						ts.factory.createTypeReferenceNode(
 							ts.factory.createIdentifier('ParameterizedString'),
-							[ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)],
 						),
 						ts.factory.createTypeReferenceNode(
 							ts.factory.createIdentifier('ILocale'),
@@ -187,6 +192,24 @@ export default function generateDTS() {
 		),
 		ts.factory.createExportDefault(ts.factory.createIdentifier('locales')),
 	];
+	ts.addSyntheticLeadingComment(
+		elements[0],
+		ts.SyntaxKind.MultiLineCommentTrivia,
+		' eslint-disable ',
+		true,
+	);
+	ts.addSyntheticLeadingComment(
+		elements[0],
+		ts.SyntaxKind.SingleLineCommentTrivia,
+		' This file is generated by locales/generateDTS.js',
+		true,
+	);
+	ts.addSyntheticLeadingComment(
+		elements[0],
+		ts.SyntaxKind.SingleLineCommentTrivia,
+		' Do not edit this file directly.',
+		true,
+	);
 	const printed = ts
 		.createPrinter({
 			newLine: ts.NewLineKind.LineFeed,
@@ -203,12 +226,5 @@ export default function generateDTS() {
 			),
 		);
 
-	fs.writeFileSync(
-		`${__dirname}/index.d.ts`,
-		`/* eslint-disable */
-// This file is generated by locales/generateDTS.js
-// Do not edit this file directly.
-${printed}`,
-		'utf-8',
-	);
+	fs.writeFileSync(`${__dirname}/index.d.ts`, printed, 'utf-8');
 }
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 85e0c6b244..f7f952175f 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -2,2670 +2,9544 @@
 // This file is generated by locales/generateDTS.js
 // Do not edit this file directly.
 declare const kParameters: unique symbol;
-export interface ParameterizedString<T extends string> {
+export interface ParameterizedString<T extends string = string> {
     [kParameters]: T;
 }
 export interface ILocale {
-    [_: string]: string | ParameterizedString<string> | ILocale;
+    [_: string]: string | ParameterizedString | ILocale;
 }
 export interface Locale extends ILocale {
+    /**
+     * 日本語
+     */
     "_lang_": string;
+    /**
+     * ノートでつながるネットワーク
+     */
     "headlineMisskey": string;
+    /**
+     * ようこそ！Misskeyは、オープンソースの分散型マイクロブログサービスです。
+     * 「ノート」を作成して、いま起こっていることを共有したり、あなたについて皆に発信しよう📡
+     * 「リアクション」機能で、皆のノートに素早く反応を追加することもできます👍
+     * 新しい世界を探検しよう🚀
+     */
     "introMisskey": string;
+    /**
+     * {name}は、オープンソースのプラットフォーム<b>Misskey</b>のサーバーのひとつです。
+     */
     "poweredByMisskeyDescription": ParameterizedString<"name">;
+    /**
+     * {month}月 {day}日
+     */
     "monthAndDay": ParameterizedString<"month" | "day">;
+    /**
+     * 検索
+     */
     "search": string;
+    /**
+     * 通知
+     */
     "notifications": string;
+    /**
+     * ユーザー名
+     */
     "username": string;
+    /**
+     * パスワード
+     */
     "password": string;
+    /**
+     * パスワードを忘れた
+     */
     "forgotPassword": string;
+    /**
+     * 連合に照会中
+     */
     "fetchingAsApObject": string;
+    /**
+     * OK
+     */
     "ok": string;
+    /**
+     * わかった
+     */
     "gotIt": string;
+    /**
+     * キャンセル
+     */
     "cancel": string;
+    /**
+     * やめておく
+     */
     "noThankYou": string;
+    /**
+     * ユーザー名を入力
+     */
     "enterUsername": string;
+    /**
+     * {user}がリノート
+     */
     "renotedBy": ParameterizedString<"user">;
+    /**
+     * ノートはありません
+     */
     "noNotes": string;
+    /**
+     * 通知はありません
+     */
     "noNotifications": string;
+    /**
+     * サーバー
+     */
     "instance": string;
+    /**
+     * 設定
+     */
     "settings": string;
+    /**
+     * 通知の設定
+     */
     "notificationSettings": string;
+    /**
+     * 基本設定
+     */
     "basicSettings": string;
+    /**
+     * その他の設定
+     */
     "otherSettings": string;
+    /**
+     * ウィンドウで開く
+     */
     "openInWindow": string;
+    /**
+     * プロフィール
+     */
     "profile": string;
+    /**
+     * タイムライン
+     */
     "timeline": string;
+    /**
+     * 自己紹介はありません
+     */
     "noAccountDescription": string;
+    /**
+     * ログイン
+     */
     "login": string;
+    /**
+     * ログイン中
+     */
     "loggingIn": string;
+    /**
+     * ログアウト
+     */
     "logout": string;
+    /**
+     * 新規登録
+     */
     "signup": string;
+    /**
+     * アップロード中
+     */
     "uploading": string;
+    /**
+     * 保存
+     */
     "save": string;
+    /**
+     * ユーザー
+     */
     "users": string;
+    /**
+     * ユーザーを追加
+     */
     "addUser": string;
+    /**
+     * お気に入り
+     */
     "favorite": string;
+    /**
+     * お気に入り
+     */
     "favorites": string;
+    /**
+     * お気に入り解除
+     */
     "unfavorite": string;
+    /**
+     * お気に入りに登録しました。
+     */
     "favorited": string;
+    /**
+     * 既にお気に入りに登録されています。
+     */
     "alreadyFavorited": string;
+    /**
+     * お気に入りに登録できませんでした。
+     */
     "cantFavorite": string;
+    /**
+     * ピン留め
+     */
     "pin": string;
+    /**
+     * ピン留め解除
+     */
     "unpin": string;
+    /**
+     * 内容をコピー
+     */
     "copyContent": string;
+    /**
+     * リンクをコピー
+     */
     "copyLink": string;
+    /**
+     * リノートのリンクをコピー
+     */
     "copyLinkRenote": string;
+    /**
+     * 削除
+     */
     "delete": string;
+    /**
+     * 削除して編集
+     */
     "deleteAndEdit": string;
+    /**
+     * このノートを削除してもう一度編集しますか？このノートへのリアクション、リノート、返信も全て削除されます。
+     */
     "deleteAndEditConfirm": string;
+    /**
+     * リストに追加
+     */
     "addToList": string;
+    /**
+     * アンテナに追加
+     */
     "addToAntenna": string;
+    /**
+     * メッセージを送信
+     */
     "sendMessage": string;
+    /**
+     * RSSをコピー
+     */
     "copyRSS": string;
+    /**
+     * ユーザー名をコピー
+     */
     "copyUsername": string;
+    /**
+     * ユーザーIDをコピー
+     */
     "copyUserId": string;
+    /**
+     * ノートIDをコピー
+     */
     "copyNoteId": string;
+    /**
+     * ファイルIDをコピー
+     */
     "copyFileId": string;
+    /**
+     * フォルダーIDをコピー
+     */
     "copyFolderId": string;
+    /**
+     * プロフィールURLをコピー
+     */
     "copyProfileUrl": string;
+    /**
+     * ユーザーを検索
+     */
     "searchUser": string;
+    /**
+     * 返信
+     */
     "reply": string;
+    /**
+     * もっと見る
+     */
     "loadMore": string;
+    /**
+     * もっと見る
+     */
     "showMore": string;
+    /**
+     * 閉じる
+     */
     "showLess": string;
+    /**
+     * フォローされました
+     */
     "youGotNewFollower": string;
+    /**
+     * フォローリクエストされました
+     */
     "receiveFollowRequest": string;
+    /**
+     * フォローが承認されました
+     */
     "followRequestAccepted": string;
+    /**
+     * メンション
+     */
     "mention": string;
+    /**
+     * あなた宛て
+     */
     "mentions": string;
+    /**
+     * ダイレクト投稿
+     */
     "directNotes": string;
+    /**
+     * インポートとエクスポート
+     */
     "importAndExport": string;
+    /**
+     * インポート
+     */
     "import": string;
+    /**
+     * エクスポート
+     */
     "export": string;
+    /**
+     * ファイル
+     */
     "files": string;
+    /**
+     * ダウンロード
+     */
     "download": string;
+    /**
+     * ファイル「{name}」を削除しますか？このファイルを使用した一部のコンテンツも削除されます。
+     */
     "driveFileDeleteConfirm": ParameterizedString<"name">;
+    /**
+     * {name}のフォローを解除しますか？
+     */
     "unfollowConfirm": ParameterizedString<"name">;
+    /**
+     * エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、「ドライブ」に追加されます。
+     */
     "exportRequested": string;
+    /**
+     * インポートをリクエストしました。これには時間がかかる場合があります。
+     */
     "importRequested": string;
+    /**
+     * リスト
+     */
     "lists": string;
+    /**
+     * リストはありません
+     */
     "noLists": string;
+    /**
+     * ノート
+     */
     "note": string;
+    /**
+     * ノート
+     */
     "notes": string;
+    /**
+     * フォロー
+     */
     "following": string;
+    /**
+     * フォロワー
+     */
     "followers": string;
+    /**
+     * フォローされています
+     */
     "followsYou": string;
+    /**
+     * リスト作成
+     */
     "createList": string;
+    /**
+     * リストの管理
+     */
     "manageLists": string;
+    /**
+     * エラー
+     */
     "error": string;
+    /**
+     * 問題が発生しました
+     */
     "somethingHappened": string;
+    /**
+     * 再試行
+     */
     "retry": string;
+    /**
+     * ページの読み込みに失敗しました。
+     */
     "pageLoadError": string;
+    /**
+     * これは通常、ネットワークまたはブラウザキャッシュが原因です。キャッシュをクリアするか、しばらく待ってから再度試してください。
+     */
     "pageLoadErrorDescription": string;
+    /**
+     * サーバーの応答がありません。しばらく待ってから再度試してください。
+     */
     "serverIsDead": string;
+    /**
+     * このページを表示するためには、リロードして新しいバージョンのクライアントをご利用ください。
+     */
     "youShouldUpgradeClient": string;
+    /**
+     * リスト名を入力
+     */
     "enterListName": string;
+    /**
+     * プライバシー
+     */
     "privacy": string;
+    /**
+     * フォローを承認制にする
+     */
     "makeFollowManuallyApprove": string;
+    /**
+     * デフォルトの公開範囲
+     */
     "defaultNoteVisibility": string;
+    /**
+     * フォロー
+     */
     "follow": string;
+    /**
+     * フォロー申請
+     */
     "followRequest": string;
+    /**
+     * フォロー申請
+     */
     "followRequests": string;
+    /**
+     * フォロー解除
+     */
     "unfollow": string;
+    /**
+     * フォロー許可待ち
+     */
     "followRequestPending": string;
+    /**
+     * 絵文字を入力
+     */
     "enterEmoji": string;
+    /**
+     * リノート
+     */
     "renote": string;
+    /**
+     * リノート解除
+     */
     "unrenote": string;
+    /**
+     * リノートしました。
+     */
     "renoted": string;
+    /**
+     * この投稿はリノートできません。
+     */
     "cantRenote": string;
+    /**
+     * リノートをリノートすることはできません。
+     */
     "cantReRenote": string;
+    /**
+     * 引用
+     */
     "quote": string;
+    /**
+     * チャンネル内リノート
+     */
     "inChannelRenote": string;
+    /**
+     * チャンネル内引用
+     */
     "inChannelQuote": string;
+    /**
+     * ピン留めされたノート
+     */
     "pinnedNote": string;
+    /**
+     * ピン留め
+     */
     "pinned": string;
+    /**
+     * あなた
+     */
     "you": string;
+    /**
+     * クリックして表示
+     */
     "clickToShow": string;
+    /**
+     * センシティブ
+     */
     "sensitive": string;
+    /**
+     * 追加
+     */
     "add": string;
+    /**
+     * リアクション
+     */
     "reaction": string;
+    /**
+     * リアクション
+     */
     "reactions": string;
+    /**
+     * 絵文字ピッカー
+     */
     "emojiPicker": string;
+    /**
+     * リアクション時にピン留め表示する絵文字を設定できます
+     */
     "pinnedEmojisForReactionSettingDescription": string;
+    /**
+     * 絵文字入力時にピン留め表示する絵文字を設定できます
+     */
     "pinnedEmojisSettingDescription": string;
+    /**
+     * ピッカーの表示
+     */
     "emojiPickerDisplay": string;
+    /**
+     * リアクション設定から上書きする
+     */
     "overwriteFromPinnedEmojisForReaction": string;
+    /**
+     * 全般設定から上書きする
+     */
     "overwriteFromPinnedEmojis": string;
+    /**
+     * ドラッグして並び替え、クリックして削除、＋を押して追加します。
+     */
     "reactionSettingDescription2": string;
+    /**
+     * 公開範囲を記憶する
+     */
     "rememberNoteVisibility": string;
+    /**
+     * 添付取り消し
+     */
     "attachCancel": string;
+    /**
+     * センシティブとして設定
+     */
     "markAsSensitive": string;
+    /**
+     * センシティブを解除する
+     */
     "unmarkAsSensitive": string;
+    /**
+     * ファイル名を入力
+     */
     "enterFileName": string;
+    /**
+     * ミュート
+     */
     "mute": string;
+    /**
+     * ミュート解除
+     */
     "unmute": string;
+    /**
+     * リノートをミュート
+     */
     "renoteMute": string;
+    /**
+     * リノートのミュートを解除
+     */
     "renoteUnmute": string;
+    /**
+     * ブロック
+     */
     "block": string;
+    /**
+     * ブロック解除
+     */
     "unblock": string;
+    /**
+     * 凍結
+     */
     "suspend": string;
+    /**
+     * 解凍
+     */
     "unsuspend": string;
+    /**
+     * ブロックしますか？
+     */
     "blockConfirm": string;
+    /**
+     * ブロック解除しますか？
+     */
     "unblockConfirm": string;
+    /**
+     * 凍結しますか？
+     */
     "suspendConfirm": string;
+    /**
+     * 解凍しますか？
+     */
     "unsuspendConfirm": string;
+    /**
+     * リストを選択
+     */
     "selectList": string;
+    /**
+     * リストを編集
+     */
     "editList": string;
+    /**
+     * チャンネルを選択
+     */
     "selectChannel": string;
+    /**
+     * アンテナを選択
+     */
     "selectAntenna": string;
+    /**
+     * アンテナを編集
+     */
     "editAntenna": string;
+    /**
+     * ウィジェットを選択
+     */
     "selectWidget": string;
+    /**
+     * ウィジェットを編集
+     */
     "editWidgets": string;
+    /**
+     * 編集を終了
+     */
     "editWidgetsExit": string;
+    /**
+     * カスタム絵文字
+     */
     "customEmojis": string;
+    /**
+     * 絵文字
+     */
     "emoji": string;
+    /**
+     * 絵文字
+     */
     "emojis": string;
+    /**
+     * 絵文字名
+     */
     "emojiName": string;
+    /**
+     * 絵文字画像URL
+     */
     "emojiUrl": string;
+    /**
+     * 絵文字を追加
+     */
     "addEmoji": string;
+    /**
+     * おすすめ設定
+     */
     "settingGuide": string;
+    /**
+     * リモートのファイルをキャッシュする
+     */
     "cacheRemoteFiles": string;
+    /**
+     * この設定を有効にすると、リモートファイルをこのサーバーのストレージにキャッシュするようになります。画像の表示が高速になりますが、サーバーのストレージを多く消費します。リモートユーザーがどれほどキャッシュを保持するかは、ロールによるドライブ容量制限によって決定されます。この制限を超えた場合、古いファイルからキャッシュが削除されリンクになります。この設定が無効の場合、リモートのファイルを最初からリンクとして保持しますが、画像のサムネイル生成やユーザーのプライバシー保護のために、default.ymlでproxyRemoteFilesをtrueにすることをお勧めします。
+     */
     "cacheRemoteFilesDescription": string;
+    /**
+     * ファイル管理の🗑️ボタンで全てのキャッシュを削除できます。
+     */
     "youCanCleanRemoteFilesCache": string;
+    /**
+     * リモートのセンシティブなファイルをキャッシュする
+     */
     "cacheRemoteSensitiveFiles": string;
+    /**
+     * この設定を無効にすると、リモートのセンシティブなファイルはキャッシュせず直リンクするようになります。
+     */
     "cacheRemoteSensitiveFilesDescription": string;
+    /**
+     * Botとして設定
+     */
     "flagAsBot": string;
+    /**
+     * このアカウントがプログラムによって運用される場合は、このフラグをオンにします。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Misskeyのシステム上での扱いがBotに合ったものになります。
+     */
     "flagAsBotDescription": string;
+    /**
+     * にゃああああああああああああああ！！！！！！！！！！！！
+     */
     "flagAsCat": string;
+    /**
+     * にゃにゃにゃ？？
+     */
     "flagAsCatDescription": string;
+    /**
+     * タイムラインにノートへの返信を表示する
+     */
     "flagShowTimelineReplies": string;
+    /**
+     * オンにすると、タイムラインにユーザーのノート以外にもそのユーザーの他のノートへの返信を表示します。
+     */
     "flagShowTimelineRepliesDescription": string;
+    /**
+     * フォロー中ユーザーからのフォロリクを自動承認
+     */
     "autoAcceptFollowed": string;
+    /**
+     * アカウントを追加
+     */
     "addAccount": string;
+    /**
+     * アカウントリストの情報を更新
+     */
     "reloadAccountsList": string;
+    /**
+     * ログインに失敗しました
+     */
     "loginFailed": string;
+    /**
+     * リモートで表示
+     */
     "showOnRemote": string;
+    /**
+     * 全般
+     */
     "general": string;
+    /**
+     * 壁紙
+     */
     "wallpaper": string;
+    /**
+     * 壁紙を設定
+     */
     "setWallpaper": string;
+    /**
+     * 壁紙を削除
+     */
     "removeWallpaper": string;
+    /**
+     * 検索: {q}
+     */
     "searchWith": ParameterizedString<"q">;
+    /**
+     * リストがありません
+     */
     "youHaveNoLists": string;
+    /**
+     * {name}をフォローしますか？
+     */
     "followConfirm": ParameterizedString<"name">;
+    /**
+     * プロキシアカウント
+     */
     "proxyAccount": string;
+    /**
+     * プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。
+     */
     "proxyAccountDescription": string;
+    /**
+     * ホスト
+     */
     "host": string;
+    /**
+     * ユーザーを選択
+     */
     "selectUser": string;
+    /**
+     * 宛先
+     */
     "recipient": string;
+    /**
+     * 注釈
+     */
     "annotation": string;
+    /**
+     * 連合
+     */
     "federation": string;
+    /**
+     * サーバー
+     */
     "instances": string;
+    /**
+     * 初観測
+     */
     "registeredAt": string;
+    /**
+     * 直近のリクエスト受信
+     */
     "latestRequestReceivedAt": string;
+    /**
+     * 直近のステータス
+     */
     "latestStatus": string;
+    /**
+     * ストレージ使用量
+     */
     "storageUsage": string;
+    /**
+     * チャート
+     */
     "charts": string;
+    /**
+     * 1時間ごと
+     */
     "perHour": string;
+    /**
+     * 1日ごと
+     */
     "perDay": string;
+    /**
+     * アクティビティの配送を停止
+     */
     "stopActivityDelivery": string;
+    /**
+     * このサーバーをブロック
+     */
     "blockThisInstance": string;
+    /**
+     * サーバーをサイレンス
+     */
     "silenceThisInstance": string;
+    /**
+     * 操作
+     */
     "operations": string;
+    /**
+     * ソフトウェア
+     */
     "software": string;
+    /**
+     * バージョン
+     */
     "version": string;
+    /**
+     * メタデータ
+     */
     "metadata": string;
+    /**
+     * {n}つのファイル
+     */
     "withNFiles": ParameterizedString<"n">;
+    /**
+     * モニター
+     */
     "monitor": string;
+    /**
+     * ジョブキュー
+     */
     "jobQueue": string;
+    /**
+     * CPUとメモリ
+     */
     "cpuAndMemory": string;
+    /**
+     * ネットワーク
+     */
     "network": string;
+    /**
+     * ディスク
+     */
     "disk": string;
+    /**
+     * サーバー情報
+     */
     "instanceInfo": string;
+    /**
+     * 統計
+     */
     "statistics": string;
+    /**
+     * キューをクリア
+     */
     "clearQueue": string;
+    /**
+     * キューをクリアしますか？
+     */
     "clearQueueConfirmTitle": string;
+    /**
+     * 未配達の投稿は配送されなくなります。通常この操作を行う必要はありません。
+     */
     "clearQueueConfirmText": string;
+    /**
+     * キャッシュをクリア
+     */
     "clearCachedFiles": string;
+    /**
+     * キャッシュされたリモートファイルをすべて削除しますか？
+     */
     "clearCachedFilesConfirm": string;
+    /**
+     * ブロックしたサーバー
+     */
     "blockedInstances": string;
+    /**
+     * ブロックしたいサーバーのホストを改行で区切って設定します。ブロックされたサーバーは、このインスタンスとやり取りできなくなります。
+     */
     "blockedInstancesDescription": string;
+    /**
+     * サイレンスしたサーバー
+     */
     "silencedInstances": string;
+    /**
+     * サイレンスしたいサーバーのホストを改行で区切って設定します。サイレンスされたサーバーに所属するアカウントはすべて「サイレンス」として扱われ、フォローがすべてリクエストになり、フォロワーでないローカルアカウントにはメンションできなくなります。ブロックしたインスタンスには影響しません。
+     */
     "silencedInstancesDescription": string;
+    /**
+     * ミュートとブロック
+     */
     "muteAndBlock": string;
+    /**
+     * ミュートしたユーザー
+     */
     "mutedUsers": string;
+    /**
+     * ブロックしたユーザー
+     */
     "blockedUsers": string;
+    /**
+     * ユーザーはいません
+     */
     "noUsers": string;
+    /**
+     * プロフィールを編集
+     */
     "editProfile": string;
+    /**
+     * このノートを削除しますか？
+     */
     "noteDeleteConfirm": string;
+    /**
+     * これ以上ピン留めできません
+     */
     "pinLimitExceeded": string;
+    /**
+     * Misskeyのインストールが完了しました！管理者アカウントを作成しましょう。
+     */
     "intro": string;
+    /**
+     * 完了
+     */
     "done": string;
+    /**
+     * 処理中
+     */
     "processing": string;
+    /**
+     * プレビュー
+     */
     "preview": string;
+    /**
+     * デフォルト
+     */
     "default": string;
+    /**
+     * デフォルト: {value}
+     */
     "defaultValueIs": ParameterizedString<"value">;
+    /**
+     * 絵文字はありません
+     */
     "noCustomEmojis": string;
+    /**
+     * ジョブはありません
+     */
     "noJobs": string;
+    /**
+     * 連合中
+     */
     "federating": string;
+    /**
+     * ブロック中
+     */
     "blocked": string;
+    /**
+     * 配信停止
+     */
     "suspended": string;
+    /**
+     * 全て
+     */
     "all": string;
+    /**
+     * 購読中
+     */
     "subscribing": string;
+    /**
+     * 配信中
+     */
     "publishing": string;
+    /**
+     * 応答なし
+     */
     "notResponding": string;
+    /**
+     * サーバーのフォロー
+     */
     "instanceFollowing": string;
+    /**
+     * サーバーのフォロワー
+     */
     "instanceFollowers": string;
+    /**
+     * サーバーのユーザー
+     */
     "instanceUsers": string;
+    /**
+     * パスワードを変更
+     */
     "changePassword": string;
+    /**
+     * セキュリティ
+     */
     "security": string;
+    /**
+     * 入力が一致しません。
+     */
     "retypedNotMatch": string;
+    /**
+     * 現在のパスワード
+     */
     "currentPassword": string;
+    /**
+     * 新しいパスワード
+     */
     "newPassword": string;
+    /**
+     * 新しいパスワード(再入力)
+     */
     "newPasswordRetype": string;
+    /**
+     * ファイルを添付
+     */
     "attachFile": string;
+    /**
+     * もっと！
+     */
     "more": string;
+    /**
+     * ハイライト
+     */
     "featured": string;
+    /**
+     * ユーザー名かユーザーID
+     */
     "usernameOrUserId": string;
+    /**
+     * ユーザーが見つかりません
+     */
     "noSuchUser": string;
+    /**
+     * 照会
+     */
     "lookup": string;
+    /**
+     * お知らせ
+     */
     "announcements": string;
+    /**
+     * 画像URL
+     */
     "imageUrl": string;
+    /**
+     * 削除
+     */
     "remove": string;
+    /**
+     * 削除しました
+     */
     "removed": string;
+    /**
+     * 「{x}」を削除しますか？
+     */
     "removeAreYouSure": ParameterizedString<"x">;
+    /**
+     * 「{x}」を削除しますか？
+     */
     "deleteAreYouSure": ParameterizedString<"x">;
+    /**
+     * リセットしますか？
+     */
     "resetAreYouSure": string;
+    /**
+     * よろしいですか？
+     */
     "areYouSure": string;
+    /**
+     * 保存しました
+     */
     "saved": string;
+    /**
+     * チャット
+     */
     "messaging": string;
+    /**
+     * アップロード
+     */
     "upload": string;
+    /**
+     * オリジナル画像を保持
+     */
     "keepOriginalUploading": string;
+    /**
+     * 画像をアップロードする時にオリジナル版を保持します。オフにするとアップロード時にブラウザでWeb公開用画像を生成します。
+     */
     "keepOriginalUploadingDescription": string;
+    /**
+     * ドライブから
+     */
     "fromDrive": string;
+    /**
+     * URLから
+     */
     "fromUrl": string;
+    /**
+     * URLアップロード
+     */
     "uploadFromUrl": string;
+    /**
+     * アップロードしたいファイルのURL
+     */
     "uploadFromUrlDescription": string;
+    /**
+     * アップロードをリクエストしました
+     */
     "uploadFromUrlRequested": string;
+    /**
+     * アップロードが完了するまで時間がかかる場合があります。
+     */
     "uploadFromUrlMayTakeTime": string;
+    /**
+     * みつける
+     */
     "explore": string;
+    /**
+     * 既読
+     */
     "messageRead": string;
+    /**
+     * これより過去の履歴はありません
+     */
     "noMoreHistory": string;
+    /**
+     * チャットを開始
+     */
     "startMessaging": string;
+    /**
+     * {n}人が読みました
+     */
     "nUsersRead": ParameterizedString<"n">;
+    /**
+     * {0}に同意
+     */
     "agreeTo": ParameterizedString<"0">;
+    /**
+     * 同意する
+     */
     "agree": string;
+    /**
+     * 下記に同意する
+     */
     "agreeBelow": string;
+    /**
+     * 基本的な注意事項
+     */
     "basicNotesBeforeCreateAccount": string;
+    /**
+     * 利用規約
+     */
     "termsOfService": string;
+    /**
+     * 始める
+     */
     "start": string;
+    /**
+     * ホーム
+     */
     "home": string;
+    /**
+     * リモートユーザーのため、情報が不完全です。
+     */
     "remoteUserCaution": string;
+    /**
+     * アクティビティ
+     */
     "activity": string;
+    /**
+     * 画像
+     */
     "images": string;
+    /**
+     * 画像
+     */
     "image": string;
+    /**
+     * 誕生日
+     */
     "birthday": string;
+    /**
+     * {age}歳
+     */
     "yearsOld": ParameterizedString<"age">;
+    /**
+     * 登録日
+     */
     "registeredDate": string;
+    /**
+     * 場所
+     */
     "location": string;
+    /**
+     * テーマ
+     */
     "theme": string;
+    /**
+     * ライトモードで使うテーマ
+     */
     "themeForLightMode": string;
+    /**
+     * ダークモードで使うテーマ
+     */
     "themeForDarkMode": string;
+    /**
+     * ライト
+     */
     "light": string;
+    /**
+     * ダーク
+     */
     "dark": string;
+    /**
+     * 明るいテーマ
+     */
     "lightThemes": string;
+    /**
+     * 暗いテーマ
+     */
     "darkThemes": string;
+    /**
+     * デバイスのダークモードと同期する
+     */
     "syncDeviceDarkMode": string;
+    /**
+     * ドライブ
+     */
     "drive": string;
+    /**
+     * ファイル名
+     */
     "fileName": string;
+    /**
+     * ファイルを選択
+     */
     "selectFile": string;
+    /**
+     * ファイルを選択
+     */
     "selectFiles": string;
+    /**
+     * フォルダーを選択
+     */
     "selectFolder": string;
+    /**
+     * フォルダーを選択
+     */
     "selectFolders": string;
+    /**
+     * ファイル名を変更
+     */
     "renameFile": string;
+    /**
+     * フォルダー名
+     */
     "folderName": string;
+    /**
+     * フォルダーを作成
+     */
     "createFolder": string;
+    /**
+     * フォルダー名を変更
+     */
     "renameFolder": string;
+    /**
+     * フォルダーを削除
+     */
     "deleteFolder": string;
+    /**
+     * フォルダー
+     */
     "folder": string;
+    /**
+     * ファイルを追加
+     */
     "addFile": string;
+    /**
+     * ドライブは空です
+     */
     "emptyDrive": string;
+    /**
+     * フォルダーは空です
+     */
     "emptyFolder": string;
+    /**
+     * 削除できません
+     */
     "unableToDelete": string;
+    /**
+     * 新しいファイル名を入力してください
+     */
     "inputNewFileName": string;
+    /**
+     * 新しいキャプションを入力してください
+     */
     "inputNewDescription": string;
+    /**
+     * 新しいフォルダ名を入力してください
+     */
     "inputNewFolderName": string;
+    /**
+     * 移動先のフォルダーは、移動するフォルダーのサブフォルダーです。
+     */
     "circularReferenceFolder": string;
+    /**
+     * このフォルダは空でないため、削除できません。
+     */
     "hasChildFilesOrFolders": string;
+    /**
+     * URLをコピー
+     */
     "copyUrl": string;
+    /**
+     * 名前を変更
+     */
     "rename": string;
+    /**
+     * アイコン
+     */
     "avatar": string;
+    /**
+     * バナー
+     */
     "banner": string;
+    /**
+     * センシティブなメディアの表示
+     */
     "displayOfSensitiveMedia": string;
+    /**
+     * サーバーとの接続が失われたとき
+     */
     "whenServerDisconnected": string;
+    /**
+     * サーバーから切断されました
+     */
     "disconnectedFromServer": string;
+    /**
+     * リロード
+     */
     "reload": string;
+    /**
+     * なにもしない
+     */
     "doNothing": string;
+    /**
+     * リロードしますか？
+     */
     "reloadConfirm": string;
+    /**
+     * ウォッチ
+     */
     "watch": string;
+    /**
+     * ウォッチ解除
+     */
     "unwatch": string;
+    /**
+     * 許可
+     */
     "accept": string;
+    /**
+     * 拒否
+     */
     "reject": string;
+    /**
+     * 通常
+     */
     "normal": string;
+    /**
+     * サーバー名
+     */
     "instanceName": string;
+    /**
+     * サーバーの紹介
+     */
     "instanceDescription": string;
+    /**
+     * 管理者の名前
+     */
     "maintainerName": string;
+    /**
+     * 管理者のメールアドレス
+     */
     "maintainerEmail": string;
+    /**
+     * 利用規約URL
+     */
     "tosUrl": string;
+    /**
+     * 今年
+     */
     "thisYear": string;
+    /**
+     * 今月
+     */
     "thisMonth": string;
+    /**
+     * 今日
+     */
     "today": string;
+    /**
+     * {day}日
+     */
     "dayX": ParameterizedString<"day">;
+    /**
+     * {month}月
+     */
     "monthX": ParameterizedString<"month">;
+    /**
+     * {year}年
+     */
     "yearX": ParameterizedString<"year">;
+    /**
+     * ページ
+     */
     "pages": string;
+    /**
+     * 連携
+     */
     "integration": string;
+    /**
+     * 接続する
+     */
     "connectService": string;
+    /**
+     * 切断する
+     */
     "disconnectService": string;
+    /**
+     * ローカルタイムラインを有効にする
+     */
     "enableLocalTimeline": string;
+    /**
+     * グローバルタイムラインを有効にする
+     */
     "enableGlobalTimeline": string;
+    /**
+     * これらのタイムラインを無効化しても、利便性のため管理者およびモデレーターは引き続き利用することができます。
+     */
     "disablingTimelinesInfo": string;
+    /**
+     * 登録
+     */
     "registration": string;
+    /**
+     * 誰でも新規登録できるようにする
+     */
     "enableRegistration": string;
+    /**
+     * 招待
+     */
     "invite": string;
+    /**
+     * ローカルユーザーひとりあたりのドライブ容量
+     */
     "driveCapacityPerLocalAccount": string;
+    /**
+     * リモートユーザーひとりあたりのドライブ容量
+     */
     "driveCapacityPerRemoteAccount": string;
+    /**
+     * メガバイト単位
+     */
     "inMb": string;
+    /**
+     * バナー画像のURL
+     */
     "bannerUrl": string;
+    /**
+     * 背景画像のURL
+     */
     "backgroundImageUrl": string;
+    /**
+     * 基本情報
+     */
     "basicInfo": string;
+    /**
+     * ピン留めユーザー
+     */
     "pinnedUsers": string;
+    /**
+     * 「みつける」ページなどにピン留めしたいユーザーを改行で区切って記述します。
+     */
     "pinnedUsersDescription": string;
+    /**
+     * ピン留めページ
+     */
     "pinnedPages": string;
+    /**
+     * サーバーのトップページにピン留めしたいページのパスを改行で区切って記述します。
+     */
     "pinnedPagesDescription": string;
+    /**
+     * ピン留めするクリップのID
+     */
     "pinnedClipId": string;
+    /**
+     * ピン留めされたノート
+     */
     "pinnedNotes": string;
+    /**
+     * hCaptcha
+     */
     "hcaptcha": string;
+    /**
+     * hCaptchaを有効にする
+     */
     "enableHcaptcha": string;
+    /**
+     * サイトキー
+     */
     "hcaptchaSiteKey": string;
+    /**
+     * シークレットキー
+     */
     "hcaptchaSecretKey": string;
+    /**
+     * mCaptcha
+     */
     "mcaptcha": string;
+    /**
+     * mCaptchaを有効にする
+     */
     "enableMcaptcha": string;
+    /**
+     * サイトキー
+     */
     "mcaptchaSiteKey": string;
+    /**
+     * シークレットキー
+     */
     "mcaptchaSecretKey": string;
+    /**
+     * mCaptchaのインスタンスのURL
+     */
     "mcaptchaInstanceUrl": string;
+    /**
+     * reCAPTCHA
+     */
     "recaptcha": string;
+    /**
+     * reCAPTCHAを有効にする
+     */
     "enableRecaptcha": string;
+    /**
+     * サイトキー
+     */
     "recaptchaSiteKey": string;
+    /**
+     * シークレットキー
+     */
     "recaptchaSecretKey": string;
+    /**
+     * Turnstile
+     */
     "turnstile": string;
+    /**
+     * Turnstileを有効にする
+     */
     "enableTurnstile": string;
+    /**
+     * サイトキー
+     */
     "turnstileSiteKey": string;
+    /**
+     * シークレットキー
+     */
     "turnstileSecretKey": string;
+    /**
+     * 複数のCaptchaを使用すると干渉を起こす可能性があります。他のCaptchaを無効にしますか？キャンセルして複数のCaptchaを有効化したままにすることも可能です。
+     */
     "avoidMultiCaptchaConfirm": string;
+    /**
+     * アンテナ
+     */
     "antennas": string;
+    /**
+     * アンテナの管理
+     */
     "manageAntennas": string;
+    /**
+     * 名前
+     */
     "name": string;
+    /**
+     * 受信ソース
+     */
     "antennaSource": string;
+    /**
+     * 受信キーワード
+     */
     "antennaKeywords": string;
+    /**
+     * 除外キーワード
+     */
     "antennaExcludeKeywords": string;
+    /**
+     * スペースで区切るとAND指定になり、改行で区切るとOR指定になります
+     */
     "antennaKeywordsDescription": string;
+    /**
+     * 新しいノートを通知する
+     */
     "notifyAntenna": string;
+    /**
+     * ファイルが添付されたノートのみ
+     */
     "withFileAntenna": string;
+    /**
+     * ブラウザへのプッシュ通知を有効にする
+     */
     "enableServiceworker": string;
+    /**
+     * ユーザー名を改行で区切って指定します
+     */
     "antennaUsersDescription": string;
+    /**
+     * 大文字小文字を区別する
+     */
     "caseSensitive": string;
+    /**
+     * 返信を含む
+     */
     "withReplies": string;
+    /**
+     * 次のアカウントに接続されています
+     */
     "connectedTo": string;
+    /**
+     * 投稿と返信
+     */
     "notesAndReplies": string;
+    /**
+     * ファイル付き
+     */
     "withFiles": string;
+    /**
+     * サイレンス
+     */
     "silence": string;
+    /**
+     * サイレンスしますか？
+     */
     "silenceConfirm": string;
+    /**
+     * サイレンス解除
+     */
     "unsilence": string;
+    /**
+     * サイレンス解除しますか？
+     */
     "unsilenceConfirm": string;
+    /**
+     * 人気のユーザー
+     */
     "popularUsers": string;
+    /**
+     * 最近投稿したユーザー
+     */
     "recentlyUpdatedUsers": string;
+    /**
+     * 最近登録したユーザー
+     */
     "recentlyRegisteredUsers": string;
+    /**
+     * 最近発見されたユーザー
+     */
     "recentlyDiscoveredUsers": string;
+    /**
+     * {count}のユーザーがいます
+     */
     "exploreUsersCount": ParameterizedString<"count">;
+    /**
+     * Fediverseを探索
+     */
     "exploreFediverse": string;
+    /**
+     * 人気のタグ
+     */
     "popularTags": string;
+    /**
+     * リスト
+     */
     "userList": string;
+    /**
+     * 情報
+     */
     "about": string;
+    /**
+     * Misskeyについて
+     */
     "aboutMisskey": string;
+    /**
+     * 管理者
+     */
     "administrator": string;
+    /**
+     * 確認コード
+     */
     "token": string;
+    /**
+     * 二要素認証
+     */
     "2fa": string;
+    /**
+     * 二要素認証のセットアップ
+     */
     "setupOf2fa": string;
+    /**
+     * 認証アプリ
+     */
     "totp": string;
+    /**
+     * 認証アプリを使ってワンタイムパスワードを入力
+     */
     "totpDescription": string;
+    /**
+     * モデレーター
+     */
     "moderator": string;
+    /**
+     * モデレーション
+     */
     "moderation": string;
+    /**
+     * モデレーションノート
+     */
     "moderationNote": string;
+    /**
+     * モデレーションノートを追加する
+     */
     "addModerationNote": string;
+    /**
+     * モデログ
+     */
     "moderationLogs": string;
+    /**
+     * {n}人が投稿
+     */
     "nUsersMentioned": ParameterizedString<"n">;
+    /**
+     * セキュリティキー・パスキー
+     */
     "securityKeyAndPasskey": string;
+    /**
+     * セキュリティキー
+     */
     "securityKey": string;
+    /**
+     * 最後の使用
+     */
     "lastUsed": string;
+    /**
+     * 最後の使用: {t}
+     */
     "lastUsedAt": ParameterizedString<"t">;
+    /**
+     * 登録を解除
+     */
     "unregister": string;
+    /**
+     * パスワードレスログイン
+     */
     "passwordLessLogin": string;
+    /**
+     * パスワードを使用せず、セキュリティキーやパスキーなどのみでログインします
+     */
     "passwordLessLoginDescription": string;
+    /**
+     * パスワードをリセット
+     */
     "resetPassword": string;
+    /**
+     * 新しいパスワードは「{password}」です
+     */
     "newPasswordIs": ParameterizedString<"password">;
+    /**
+     * UIのアニメーションを減らす
+     */
     "reduceUiAnimation": string;
+    /**
+     * 共有
+     */
     "share": string;
+    /**
+     * 見つかりません
+     */
     "notFound": string;
+    /**
+     * 指定されたURLに該当するページはありませんでした。
+     */
     "notFoundDescription": string;
+    /**
+     * 既定アップロード先
+     */
     "uploadFolder": string;
+    /**
+     * すべての通知を既読にする
+     */
     "markAsReadAllNotifications": string;
+    /**
+     * すべての投稿を既読にする
+     */
     "markAsReadAllUnreadNotes": string;
+    /**
+     * すべてのチャットを既読にする
+     */
     "markAsReadAllTalkMessages": string;
+    /**
+     * ヘルプ
+     */
     "help": string;
+    /**
+     * ここにメッセージを入力
+     */
     "inputMessageHere": string;
+    /**
+     * 閉じる
+     */
     "close": string;
+    /**
+     * 招待
+     */
     "invites": string;
+    /**
+     * メンバー
+     */
     "members": string;
+    /**
+     * 譲渡
+     */
     "transfer": string;
+    /**
+     * タイトル
+     */
     "title": string;
+    /**
+     * テキスト
+     */
     "text": string;
+    /**
+     * 有効にする
+     */
     "enable": string;
+    /**
+     * 次
+     */
     "next": string;
+    /**
+     * 再入力
+     */
     "retype": string;
+    /**
+     * {user}のノート
+     */
     "noteOf": ParameterizedString<"user">;
+    /**
+     * 引用付き
+     */
     "quoteAttached": string;
+    /**
+     * 引用として添付しますか？
+     */
     "quoteQuestion": string;
+    /**
+     * まだチャットはありません
+     */
     "noMessagesYet": string;
+    /**
+     * 新しいメッセージがあります
+     */
     "newMessageExists": string;
+    /**
+     * メッセージに添付できるファイルはひとつです
+     */
     "onlyOneFileCanBeAttached": string;
+    /**
+     * 続行する前に、サインアップまたはサインインが必要です
+     */
     "signinRequired": string;
+    /**
+     * 招待
+     */
     "invitations": string;
+    /**
+     * 招待コード
+     */
     "invitationCode": string;
+    /**
+     * 確認しています
+     */
     "checking": string;
+    /**
+     * 利用できます
+     */
     "available": string;
+    /**
+     * 利用できません
+     */
     "unavailable": string;
+    /**
+     * a~z、A~Z、0~9、_が使えます
+     */
     "usernameInvalidFormat": string;
+    /**
+     * 短すぎます
+     */
     "tooShort": string;
+    /**
+     * 長すぎます
+     */
     "tooLong": string;
+    /**
+     * 弱いパスワード
+     */
     "weakPassword": string;
+    /**
+     * 普通のパスワード
+     */
     "normalPassword": string;
+    /**
+     * 強いパスワード
+     */
     "strongPassword": string;
+    /**
+     * 一致しました
+     */
     "passwordMatched": string;
+    /**
+     * 一致していません
+     */
     "passwordNotMatched": string;
+    /**
+     * {x}でログイン
+     */
     "signinWith": ParameterizedString<"x">;
+    /**
+     * ログインできませんでした。ユーザー名とパスワードを確認してください。
+     */
     "signinFailed": string;
+    /**
+     * もしくは
+     */
     "or": string;
+    /**
+     * 言語
+     */
     "language": string;
+    /**
+     * UIの表示言語
+     */
     "uiLanguage": string;
+    /**
+     * {x}について
+     */
     "aboutX": ParameterizedString<"x">;
+    /**
+     * 絵文字のスタイル
+     */
     "emojiStyle": string;
+    /**
+     * ネイティブ
+     */
     "native": string;
+    /**
+     * メニューをドロワーで表示しない
+     */
     "disableDrawer": string;
+    /**
+     * ノートのアクションをホバー時のみ表示する
+     */
     "showNoteActionsOnlyHover": string;
+    /**
+     * 履歴はありません
+     */
     "noHistory": string;
+    /**
+     * ログイン履歴
+     */
     "signinHistory": string;
+    /**
+     * 高度なMFMを有効にする
+     */
     "enableAdvancedMfm": string;
+    /**
+     * 動きのあるMFMを有効にする
+     */
     "enableAnimatedMfm": string;
+    /**
+     * やっています
+     */
     "doing": string;
+    /**
+     * カテゴリ
+     */
     "category": string;
+    /**
+     * タグ
+     */
     "tags": string;
+    /**
+     * このドキュメントのソース
+     */
     "docSource": string;
+    /**
+     * アカウントを作成
+     */
     "createAccount": string;
+    /**
+     * 既存のアカウント
+     */
     "existingAccount": string;
+    /**
+     * 再生成
+     */
     "regenerate": string;
+    /**
+     * フォントサイズ
+     */
     "fontSize": string;
+    /**
+     * 画像が1枚のみのメディアリストの高さ
+     */
     "mediaListWithOneImageAppearance": string;
+    /**
+     * {x}を上限に
+     */
     "limitTo": ParameterizedString<"x">;
+    /**
+     * フォロー申請はありません
+     */
     "noFollowRequests": string;
+    /**
+     * 画像を新しいタブで開く
+     */
     "openImageInNewTab": string;
+    /**
+     * ダッシュボード
+     */
     "dashboard": string;
+    /**
+     * ローカル
+     */
     "local": string;
+    /**
+     * リモート
+     */
     "remote": string;
+    /**
+     * 合計
+     */
     "total": string;
+    /**
+     * 前週比
+     */
     "weekOverWeekChanges": string;
+    /**
+     * 前日比
+     */
     "dayOverDayChanges": string;
+    /**
+     * アピアランス
+     */
     "appearance": string;
+    /**
+     * クライアント設定
+     */
     "clientSettings": string;
+    /**
+     * アカウント設定
+     */
     "accountSettings": string;
+    /**
+     * プロモーション
+     */
     "promotion": string;
+    /**
+     * プロモート
+     */
     "promote": string;
+    /**
+     * 日数
+     */
     "numberOfDays": string;
+    /**
+     * このノートを非表示
+     */
     "hideThisNote": string;
+    /**
+     * タイムラインにおすすめのノートを表示する
+     */
     "showFeaturedNotesInTimeline": string;
+    /**
+     * オブジェクトストレージ
+     */
     "objectStorage": string;
+    /**
+     * オブジェクトストレージを使用
+     */
     "useObjectStorage": string;
+    /**
+     * Base URL
+     */
     "objectStorageBaseUrl": string;
+    /**
+     * 参照に使用するURL。CDNやProxyを使用している場合はそのURL、S3: 'https://<bucket>.s3.amazonaws.com'、GCS等: 'https://storage.googleapis.com/<bucket>'。
+     */
     "objectStorageBaseUrlDesc": string;
+    /**
+     * Bucket
+     */
     "objectStorageBucket": string;
+    /**
+     * 使用サービスのbucket名を指定してください。
+     */
     "objectStorageBucketDesc": string;
+    /**
+     * Prefix
+     */
     "objectStoragePrefix": string;
+    /**
+     * このprefixのディレクトリ下に格納されます。
+     */
     "objectStoragePrefixDesc": string;
+    /**
+     * Endpoint
+     */
     "objectStorageEndpoint": string;
+    /**
+     * S3の場合は空、それ以外の場合は各サービスのendpointを指定してください。'<host>'または'<host>:<port>'のように指定します。
+     */
     "objectStorageEndpointDesc": string;
+    /**
+     * Region
+     */
     "objectStorageRegion": string;
+    /**
+     * 'xx-east-1'のようなregionを指定してください。使用サービスにregionの概念がない場合は'us-east-1'にしてください。AWS設定ファイルまたは環境変数を参照する場合は空にしてください。
+     */
     "objectStorageRegionDesc": string;
+    /**
+     * SSLを使用する
+     */
     "objectStorageUseSSL": string;
+    /**
+     * API接続にhttpsを使用しない場合はオフにしてください
+     */
     "objectStorageUseSSLDesc": string;
+    /**
+     * Proxyを利用する
+     */
     "objectStorageUseProxy": string;
+    /**
+     * API接続にproxyを利用しない場合はオフにしてください
+     */
     "objectStorageUseProxyDesc": string;
+    /**
+     * アップロード時に'public-read'を設定する
+     */
     "objectStorageSetPublicRead": string;
+    /**
+     * s3ForcePathStyleを有効にすると、バケット名をURLのホスト名ではなくパスの一部として指定することを強制します。セルフホストされたMinioなどの使用時に有効にする必要がある場合があります。
+     */
     "s3ForcePathStyleDesc": string;
+    /**
+     * サーバーログ
+     */
     "serverLogs": string;
+    /**
+     * 全て削除
+     */
     "deleteAll": string;
+    /**
+     * タイムライン上部に投稿フォームを表示する
+     */
     "showFixedPostForm": string;
+    /**
+     * タイムライン上部に投稿フォームを表示する(チャンネル)
+     */
     "showFixedPostFormInChannel": string;
+    /**
+     * フォローする際、デフォルトで返信をTLに含むようにする
+     */
     "withRepliesByDefaultForNewlyFollowed": string;
+    /**
+     * 新しいノートがあります
+     */
     "newNoteRecived": string;
+    /**
+     * サウンド
+     */
     "sounds": string;
+    /**
+     * サウンド
+     */
     "sound": string;
+    /**
+     * 聴く
+     */
     "listen": string;
+    /**
+     * なし
+     */
     "none": string;
+    /**
+     * ページで表示
+     */
     "showInPage": string;
+    /**
+     * ポップアウト
+     */
     "popout": string;
+    /**
+     * 音量
+     */
     "volume": string;
+    /**
+     * マスター音量
+     */
     "masterVolume": string;
+    /**
+     * サウンドを出力しない
+     */
     "notUseSound": string;
+    /**
+     * Misskeyがアクティブな時のみサウンドを出力する
+     */
     "useSoundOnlyWhenActive": string;
+    /**
+     * 詳細
+     */
     "details": string;
+    /**
+     * 絵文字を選択
+     */
     "chooseEmoji": string;
+    /**
+     * 操作を完了できません
+     */
     "unableToProcess": string;
+    /**
+     * 最近使用
+     */
     "recentUsed": string;
+    /**
+     * インストール
+     */
     "install": string;
+    /**
+     * アンインストール
+     */
     "uninstall": string;
+    /**
+     * インストールされたアプリ
+     */
     "installedApps": string;
+    /**
+     * ありません
+     */
     "nothing": string;
+    /**
+     * インストール日時
+     */
     "installedDate": string;
+    /**
+     * 最終使用日時
+     */
     "lastUsedDate": string;
+    /**
+     * 状態
+     */
     "state": string;
+    /**
+     * ソート
+     */
     "sort": string;
+    /**
+     * 昇順
+     */
     "ascendingOrder": string;
+    /**
+     * 降順
+     */
     "descendingOrder": string;
+    /**
+     * スクラッチパッド
+     */
     "scratchpad": string;
+    /**
+     * スクラッチパッドは、AiScriptの実験環境を提供します。Misskeyと対話するコードの記述、実行、結果の確認ができます。
+     */
     "scratchpadDescription": string;
+    /**
+     * 出力
+     */
     "output": string;
+    /**
+     * スクリプト
+     */
     "script": string;
+    /**
+     * Pagesのスクリプトを無効にする
+     */
     "disablePagesScript": string;
+    /**
+     * リモートユーザー情報の更新
+     */
     "updateRemoteUser": string;
+    /**
+     * アイコンを解除
+     */
     "unsetUserAvatar": string;
+    /**
+     * アイコンを解除しますか？
+     */
     "unsetUserAvatarConfirm": string;
+    /**
+     * バナーを解除
+     */
     "unsetUserBanner": string;
+    /**
+     * バナーを解除しますか？
+     */
     "unsetUserBannerConfirm": string;
+    /**
+     * すべてのファイルを削除
+     */
     "deleteAllFiles": string;
+    /**
+     * すべてのファイルを削除しますか？
+     */
     "deleteAllFilesConfirm": string;
+    /**
+     * フォローを全解除
+     */
     "removeAllFollowing": string;
+    /**
+     * {host}からのフォローをすべて解除します。そのサーバーがもう存在しなくなった場合などに実行してください。
+     */
     "removeAllFollowingDescription": ParameterizedString<"host">;
+    /**
+     * このユーザーは凍結されています。
+     */
     "userSuspended": string;
+    /**
+     * このユーザーはサイレンスされています。
+     */
     "userSilenced": string;
+    /**
+     * アカウントが凍結されています
+     */
     "yourAccountSuspendedTitle": string;
+    /**
+     * このアカウントは、サーバーの利用規約に違反したなどの理由により、凍結されています。詳細については管理者までお問い合わせください。新しいアカウントを作らないでください。
+     */
     "yourAccountSuspendedDescription": string;
+    /**
+     * トークンが無効です
+     */
     "tokenRevoked": string;
+    /**
+     * ログイントークンが失効しています。ログインし直してください。
+     */
     "tokenRevokedDescription": string;
+    /**
+     * アカウントは削除されています
+     */
     "accountDeleted": string;
+    /**
+     * このアカウントは削除されています。
+     */
     "accountDeletedDescription": string;
+    /**
+     * メニュー
+     */
     "menu": string;
+    /**
+     * 分割線
+     */
     "divider": string;
+    /**
+     * 項目を追加
+     */
     "addItem": string;
+    /**
+     * 並び替え
+     */
     "rearrange": string;
+    /**
+     * リレー
+     */
     "relays": string;
+    /**
+     * リレーの追加
+     */
     "addRelay": string;
+    /**
+     * inboxのURL
+     */
     "inboxUrl": string;
+    /**
+     * 追加済みのリレー
+     */
     "addedRelays": string;
+    /**
+     * プッシュ通知を行うには有効にする必要があります。
+     */
     "serviceworkerInfo": string;
+    /**
+     * 削除された投稿
+     */
     "deletedNote": string;
+    /**
+     * 非公開の投稿
+     */
     "invisibleNote": string;
+    /**
+     * 自動でもっと見る
+     */
     "enableInfiniteScroll": string;
+    /**
+     * 公開範囲
+     */
     "visibility": string;
+    /**
+     * アンケート
+     */
     "poll": string;
+    /**
+     * 内容を隠す
+     */
     "useCw": string;
+    /**
+     * プレイヤーを開く
+     */
     "enablePlayer": string;
+    /**
+     * プレイヤーを閉じる
+     */
     "disablePlayer": string;
+    /**
+     * ポストを展開する
+     */
     "expandTweet": string;
+    /**
+     * テーマエディター
+     */
     "themeEditor": string;
+    /**
+     * 説明
+     */
     "description": string;
+    /**
+     * キャプションを付ける
+     */
     "describeFile": string;
+    /**
+     * キャプションを入力
+     */
     "enterFileDescription": string;
+    /**
+     * 作者
+     */
     "author": string;
+    /**
+     * 未保存の変更があります。破棄しますか？
+     */
     "leaveConfirm": string;
+    /**
+     * 管理
+     */
     "manage": string;
+    /**
+     * プラグイン
+     */
     "plugins": string;
+    /**
+     * 設定のバックアップ
+     */
     "preferencesBackups": string;
+    /**
+     * デッキ
+     */
     "deck": string;
+    /**
+     * デッキ解除
+     */
     "undeck": string;
+    /**
+     * モーダルにぼかし効果を使用
+     */
     "useBlurEffectForModal": string;
+    /**
+     * フル機能リアクションピッカーを使用
+     */
     "useFullReactionPicker": string;
+    /**
+     * 幅
+     */
     "width": string;
+    /**
+     * 高さ
+     */
     "height": string;
+    /**
+     * 大
+     */
     "large": string;
+    /**
+     * 中
+     */
     "medium": string;
+    /**
+     * 小
+     */
     "small": string;
+    /**
+     * アクセストークンの発行
+     */
     "generateAccessToken": string;
+    /**
+     * 権限
+     */
     "permission": string;
+    /**
+     * 管理者権限
+     */
     "adminPermission": string;
+    /**
+     * 全て有効にする
+     */
     "enableAll": string;
+    /**
+     * 全て無効にする
+     */
     "disableAll": string;
+    /**
+     * アカウントへのアクセス許可
+     */
     "tokenRequested": string;
+    /**
+     * このプラグインはここで設定した権限を行使できるようになります。
+     */
     "pluginTokenRequestedDescription": string;
+    /**
+     * 通知の種類
+     */
     "notificationType": string;
+    /**
+     * 編集
+     */
     "edit": string;
+    /**
+     * メールサーバー
+     */
     "emailServer": string;
+    /**
+     * メール配信機能を有効化する
+     */
     "enableEmail": string;
+    /**
+     * メールアドレスの確認やパスワードリセットの際に使います
+     */
     "emailConfigInfo": string;
+    /**
+     * メール
+     */
     "email": string;
+    /**
+     * メールアドレス
+     */
     "emailAddress": string;
+    /**
+     * SMTP サーバーの設定
+     */
     "smtpConfig": string;
+    /**
+     * ホスト
+     */
     "smtpHost": string;
+    /**
+     * ポート
+     */
     "smtpPort": string;
+    /**
+     * ユーザー名
+     */
     "smtpUser": string;
+    /**
+     * パスワード
+     */
     "smtpPass": string;
+    /**
+     * ユーザー名とパスワードを空欄にすることで、SMTP認証を無効化出来ます
+     */
     "emptyToDisableSmtpAuth": string;
+    /**
+     * SMTP 接続に暗黙的なSSL/TLSを使用する
+     */
     "smtpSecure": string;
+    /**
+     * STARTTLS使用時はオフにします。
+     */
     "smtpSecureInfo": string;
+    /**
+     * 配信テスト
+     */
     "testEmail": string;
+    /**
+     * ワードミュート
+     */
     "wordMute": string;
+    /**
+     * ハードワードミュート
+     */
     "hardWordMute": string;
+    /**
+     * 正規表現エラー
+     */
     "regexpError": string;
+    /**
+     * {tab}ワードミュートの{line}行目の正規表現にエラーが発生しました:
+     */
     "regexpErrorDescription": ParameterizedString<"tab" | "line">;
+    /**
+     * サーバーミュート
+     */
     "instanceMute": string;
+    /**
+     * {name}が何かを言いました
+     */
     "userSaysSomething": ParameterizedString<"name">;
+    /**
+     * アクティブにする
+     */
     "makeActive": string;
+    /**
+     * 表示
+     */
     "display": string;
+    /**
+     * コピー
+     */
     "copy": string;
+    /**
+     * メトリクス
+     */
     "metrics": string;
+    /**
+     * 概要
+     */
     "overview": string;
+    /**
+     * ログ
+     */
     "logs": string;
+    /**
+     * 遅延
+     */
     "delayed": string;
+    /**
+     * データベース
+     */
     "database": string;
+    /**
+     * チャンネル
+     */
     "channel": string;
+    /**
+     * 作成
+     */
     "create": string;
+    /**
+     * 通知設定
+     */
     "notificationSetting": string;
+    /**
+     * 表示する通知の種別を選択してください。
+     */
     "notificationSettingDesc": string;
+    /**
+     * グローバル設定を使う
+     */
     "useGlobalSetting": string;
+    /**
+     * オンにすると、アカウントの通知設定が使用されます。オフにすると、個別に設定できるようになります。
+     */
     "useGlobalSettingDesc": string;
+    /**
+     * その他
+     */
     "other": string;
+    /**
+     * ログイントークンを再生成
+     */
     "regenerateLoginToken": string;
+    /**
+     * ログインに使用される内部トークンを再生成します。通常この操作を行う必要はありません。再生成すると、全てのデバイスでログアウトされます。
+     */
     "regenerateLoginTokenDescription": string;
+    /**
+     * カスタム絵文字を検索する時のキーワードになります。
+     */
     "theKeywordWhenSearchingForCustomEmoji": string;
+    /**
+     * スペースで区切って複数設定できます。
+     */
     "setMultipleBySeparatingWithSpace": string;
+    /**
+     * ファイルIDまたはURL
+     */
     "fileIdOrUrl": string;
+    /**
+     * 動作
+     */
     "behavior": string;
+    /**
+     * サンプル
+     */
     "sample": string;
+    /**
+     * 通報
+     */
     "abuseReports": string;
+    /**
+     * 通報
+     */
     "reportAbuse": string;
+    /**
+     * リノートを通報
+     */
     "reportAbuseRenote": string;
+    /**
+     * {name}を通報する
+     */
     "reportAbuseOf": ParameterizedString<"name">;
+    /**
+     * 通報理由の詳細を記入してください。対象のノートがある場合はそのURLも記入してください。
+     */
     "fillAbuseReportDescription": string;
+    /**
+     * 内容が送信されました。ご報告ありがとうございました。
+     */
     "abuseReported": string;
+    /**
+     * 通報者
+     */
     "reporter": string;
+    /**
+     * 通報先
+     */
     "reporteeOrigin": string;
+    /**
+     * 通報元
+     */
     "reporterOrigin": string;
+    /**
+     * リモートサーバーに通報を転送する
+     */
     "forwardReport": string;
+    /**
+     * リモートサーバーからはあなたの情報は見れず、匿名のシステムアカウントとして表示されます。
+     */
     "forwardReportIsAnonymous": string;
+    /**
+     * 送信
+     */
     "send": string;
+    /**
+     * 対応済みにする
+     */
     "abuseMarkAsResolved": string;
+    /**
+     * 新しいタブで開く
+     */
     "openInNewTab": string;
+    /**
+     * サイドビューで開く
+     */
     "openInSideView": string;
+    /**
+     * デフォルトのナビゲーション
+     */
     "defaultNavigationBehaviour": string;
+    /**
+     * これらの設定を編集するとアカウントが破損する可能性があります。
+     */
     "editTheseSettingsMayBreakAccount": string;
+    /**
+     * ノートのサーバー情報
+     */
     "instanceTicker": string;
+    /**
+     * {x}を待っています
+     */
     "waitingFor": ParameterizedString<"x">;
+    /**
+     * ランダム
+     */
     "random": string;
+    /**
+     * システム
+     */
     "system": string;
+    /**
+     * UI切り替え
+     */
     "switchUi": string;
+    /**
+     * デスクトップ
+     */
     "desktop": string;
+    /**
+     * クリップ
+     */
     "clip": string;
+    /**
+     * 新規作成
+     */
     "createNew": string;
+    /**
+     * 任意
+     */
     "optional": string;
+    /**
+     * 新しいクリップを作成
+     */
     "createNewClip": string;
+    /**
+     * クリップ解除
+     */
     "unclip": string;
+    /**
+     * このノートはすでにクリップ「{name}」に含まれています。ノートをこのクリップから除外しますか？
+     */
     "confirmToUnclipAlreadyClippedNote": ParameterizedString<"name">;
+    /**
+     * パブリック
+     */
     "public": string;
+    /**
+     * 非公開
+     */
     "private": string;
+    /**
+     * Misskeyは有志によって様々な言語に翻訳されています。{link}で翻訳に協力できます。
+     */
     "i18nInfo": ParameterizedString<"link">;
+    /**
+     * アクセストークンの管理
+     */
     "manageAccessTokens": string;
+    /**
+     * アカウント情報
+     */
     "accountInfo": string;
+    /**
+     * ノートの数
+     */
     "notesCount": string;
+    /**
+     * 返信した数
+     */
     "repliesCount": string;
+    /**
+     * リノートした数
+     */
     "renotesCount": string;
+    /**
+     * 返信された数
+     */
     "repliedCount": string;
+    /**
+     * リノートされた数
+     */
     "renotedCount": string;
+    /**
+     * フォロー数
+     */
     "followingCount": string;
+    /**
+     * フォロワー数
+     */
     "followersCount": string;
+    /**
+     * リアクションした数
+     */
     "sentReactionsCount": string;
+    /**
+     * リアクションされた数
+     */
     "receivedReactionsCount": string;
+    /**
+     * アンケートに投票した数
+     */
     "pollVotesCount": string;
+    /**
+     * アンケートに投票された数
+     */
     "pollVotedCount": string;
+    /**
+     * はい
+     */
     "yes": string;
+    /**
+     * いいえ
+     */
     "no": string;
+    /**
+     * ドライブのファイル数
+     */
     "driveFilesCount": string;
+    /**
+     * ドライブ使用量
+     */
     "driveUsage": string;
+    /**
+     * クローラーによるインデックスを拒否
+     */
     "noCrawle": string;
+    /**
+     * 外部の検索エンジンにあなたのユーザーページ、ノート、Pagesなどのコンテンツを登録(インデックス)しないよう要求します。
+     */
     "noCrawleDescription": string;
+    /**
+     * フォローを承認制にしても、ノートの公開範囲を「フォロワー」にしない限り、誰でもあなたのノートを見ることができます。
+     */
     "lockedAccountInfo": string;
+    /**
+     * デフォルトでメディアをセンシティブ設定にする
+     */
     "alwaysMarkSensitive": string;
+    /**
+     * 添付画像のサムネイルをオリジナル画質にする
+     */
     "loadRawImages": string;
+    /**
+     * アニメーション画像を再生しない
+     */
     "disableShowingAnimatedImages": string;
+    /**
+     * メディアがセンシティブであることを分かりやすく表示
+     */
     "highlightSensitiveMedia": string;
+    /**
+     * 確認のメールを送信しました。メールに記載されたリンクにアクセスして、設定を完了してください。
+     */
     "verificationEmailSent": string;
+    /**
+     * 未設定
+     */
     "notSet": string;
+    /**
+     * メールアドレスが確認されました
+     */
     "emailVerified": string;
+    /**
+     * お気に入りノートの数
+     */
     "noteFavoritesCount": string;
+    /**
+     * Pageにいいねした数
+     */
     "pageLikesCount": string;
+    /**
+     * Pageにいいねされた数
+     */
     "pageLikedCount": string;
+    /**
+     * 連絡先
+     */
     "contact": string;
+    /**
+     * システムのデフォルトのフォントを使う
+     */
     "useSystemFont": string;
+    /**
+     * クリップ
+     */
     "clips": string;
+    /**
+     * 実験的機能
+     */
     "experimentalFeatures": string;
+    /**
+     * 実験的
+     */
     "experimental": string;
+    /**
+     * これは実験的な機能です。仕様が変更されたり、正常に動作しなかったりする可能性があります。
+     */
     "thisIsExperimentalFeature": string;
+    /**
+     * 開発者
+     */
     "developer": string;
+    /**
+     * アカウントを見つけやすくする
+     */
     "makeExplorable": string;
+    /**
+     * オフにすると、「みつける」にアカウントが載らなくなります。
+     */
     "makeExplorableDescription": string;
+    /**
+     * タイムラインのノートを離して表示
+     */
     "showGapBetweenNotesInTimeline": string;
+    /**
+     * 複製
+     */
     "duplicate": string;
+    /**
+     * 左
+     */
     "left": string;
+    /**
+     * 中央
+     */
     "center": string;
+    /**
+     * 広い
+     */
     "wide": string;
+    /**
+     * 狭い
+     */
     "narrow": string;
+    /**
+     * 設定はページリロード後に反映されます。今すぐリロードしますか？
+     */
     "reloadToApplySetting": string;
+    /**
+     * 反映には再起動が必要です。
+     */
     "needReloadToApply": string;
+    /**
+     * タイトルバーを表示する
+     */
     "showTitlebar": string;
+    /**
+     * キャッシュをクリア
+     */
     "clearCache": string;
+    /**
+     * {n}人がオンライン
+     */
     "onlineUsersCount": ParameterizedString<"n">;
+    /**
+     * {n}ユーザー
+     */
     "nUsers": ParameterizedString<"n">;
+    /**
+     * {n}ノート
+     */
     "nNotes": ParameterizedString<"n">;
+    /**
+     * エラーリポートを送信
+     */
     "sendErrorReports": string;
+    /**
+     * オンにすると、問題が発生したときにエラーの詳細情報がMisskeyに共有され、ソフトウェアの品質向上に役立てることができます。エラー情報には、OSのバージョン、ブラウザの種類、行動履歴などが含まれます。
+     */
     "sendErrorReportsDescription": string;
+    /**
+     * マイテーマ
+     */
     "myTheme": string;
+    /**
+     * 背景
+     */
     "backgroundColor": string;
+    /**
+     * アクセント
+     */
     "accentColor": string;
+    /**
+     * 文字
+     */
     "textColor": string;
+    /**
+     * 名前を付けて保存
+     */
     "saveAs": string;
+    /**
+     * 高度
+     */
     "advanced": string;
+    /**
+     * 高度な設定
+     */
     "advancedSettings": string;
+    /**
+     * 値
+     */
     "value": string;
+    /**
+     * 作成日時
+     */
     "createdAt": string;
+    /**
+     * 更新日時
+     */
     "updatedAt": string;
+    /**
+     * 保存しますか？
+     */
     "saveConfirm": string;
+    /**
+     * 削除しますか？
+     */
     "deleteConfirm": string;
+    /**
+     * 有効な値ではありません。
+     */
     "invalidValue": string;
+    /**
+     * レジストリ
+     */
     "registry": string;
+    /**
+     * アカウントを閉鎖する
+     */
     "closeAccount": string;
+    /**
+     * 現在のバージョン
+     */
     "currentVersion": string;
+    /**
+     * 最新のバージョン
+     */
     "latestVersion": string;
+    /**
+     * お使いのクライアントは最新です。
+     */
     "youAreRunningUpToDateClient": string;
+    /**
+     * 新しいバージョンのクライアントが利用可能です。
+     */
     "newVersionOfClientAvailable": string;
+    /**
+     * 使用量
+     */
     "usageAmount": string;
+    /**
+     * 容量
+     */
     "capacity": string;
+    /**
+     * 使用中
+     */
     "inUse": string;
+    /**
+     * コードを編集
+     */
     "editCode": string;
+    /**
+     * 適用
+     */
     "apply": string;
+    /**
+     * サーバーからのお知らせを受け取る
+     */
     "receiveAnnouncementFromInstance": string;
+    /**
+     * メール通知
+     */
     "emailNotification": string;
+    /**
+     * 公開
+     */
     "publish": string;
+    /**
+     * チャンネル内検索
+     */
     "inChannelSearch": string;
+    /**
+     * 右クリックでリアクションピッカーを開く
+     */
     "useReactionPickerForContextMenu": string;
+    /**
+     * {users}が入力中
+     */
     "typingUsers": ParameterizedString<"users">;
+    /**
+     * 特定の日付にジャンプ
+     */
     "jumpToSpecifiedDate": string;
+    /**
+     * 過去のタイムラインを表示しています
+     */
     "showingPastTimeline": string;
+    /**
+     * クリア
+     */
     "clear": string;
+    /**
+     * 全て既読にする
+     */
     "markAllAsRead": string;
+    /**
+     * 戻る
+     */
     "goBack": string;
+    /**
+     * いいね解除しますか？
+     */
     "unlikeConfirm": string;
+    /**
+     * フルビュー
+     */
     "fullView": string;
+    /**
+     * フルビュー解除
+     */
     "quitFullView": string;
+    /**
+     * 説明を追加
+     */
     "addDescription": string;
+    /**
+     * 個々のノートのメニューから「ピン留め」を選択することで、ここにノートを表示しておくことができます。
+     */
     "userPagePinTip": string;
+    /**
+     * 宛先に含まれていないメンションがあります
+     */
     "notSpecifiedMentionWarning": string;
+    /**
+     * 情報
+     */
     "info": string;
+    /**
+     * ユーザー情報
+     */
     "userInfo": string;
+    /**
+     * 不明
+     */
     "unknown": string;
+    /**
+     * オンライン状態
+     */
     "onlineStatus": string;
+    /**
+     * オンライン状態を隠す
+     */
     "hideOnlineStatus": string;
+    /**
+     * オンライン状態を隠すと、検索などの一部機能において利便性が低下することがあります。
+     */
     "hideOnlineStatusDescription": string;
+    /**
+     * オンライン
+     */
     "online": string;
+    /**
+     * アクティブ
+     */
     "active": string;
+    /**
+     * オフライン
+     */
     "offline": string;
+    /**
+     * 非推奨
+     */
     "notRecommended": string;
+    /**
+     * Botプロテクション
+     */
     "botProtection": string;
+    /**
+     * サーバーブロック・サイレンス
+     */
     "instanceBlocking": string;
+    /**
+     * アカウントを選択
+     */
     "selectAccount": string;
+    /**
+     * アカウントを切り替え
+     */
     "switchAccount": string;
+    /**
+     * 有効
+     */
     "enabled": string;
+    /**
+     * 無効
+     */
     "disabled": string;
+    /**
+     * クイックアクション
+     */
     "quickAction": string;
+    /**
+     * ユーザー
+     */
     "user": string;
+    /**
+     * 管理
+     */
     "administration": string;
+    /**
+     * アカウント
+     */
     "accounts": string;
+    /**
+     * 切り替え
+     */
     "switch": string;
+    /**
+     * 管理者情報が設定されていません。
+     */
     "noMaintainerInformationWarning": string;
+    /**
+     * Botプロテクションが設定されていません。
+     */
     "noBotProtectionWarning": string;
+    /**
+     * 設定する
+     */
     "configure": string;
+    /**
+     * ギャラリーへ投稿
+     */
     "postToGallery": string;
+    /**
+     * このハッシュタグで投稿
+     */
     "postToHashtag": string;
+    /**
+     * ギャラリー
+     */
     "gallery": string;
+    /**
+     * 最近の投稿
+     */
     "recentPosts": string;
+    /**
+     * 人気の投稿
+     */
     "popularPosts": string;
+    /**
+     * ノートで共有
+     */
     "shareWithNote": string;
+    /**
+     * 広告
+     */
     "ads": string;
+    /**
+     * 期限
+     */
     "expiration": string;
+    /**
+     * 開始期間
+     */
     "startingperiod": string;
+    /**
+     * メモ
+     */
     "memo": string;
+    /**
+     * 優先度
+     */
     "priority": string;
+    /**
+     * 高
+     */
     "high": string;
+    /**
+     * 中
+     */
     "middle": string;
+    /**
+     * 低
+     */
     "low": string;
+    /**
+     * メールアドレスの設定がされていません。
+     */
     "emailNotConfiguredWarning": string;
+    /**
+     * 比率
+     */
     "ratio": string;
+    /**
+     * 本文をプレビュー
+     */
     "previewNoteText": string;
+    /**
+     * カスタムCSS
+     */
     "customCss": string;
+    /**
+     * この設定は必ず知識のある方が行ってください。不適切な設定を行うとクライアントが正常に使用できなくなる恐れがあります。
+     */
     "customCssWarn": string;
+    /**
+     * グローバル
+     */
     "global": string;
+    /**
+     * アイコンを四角形で表示
+     */
     "squareAvatars": string;
+    /**
+     * 送信
+     */
     "sent": string;
+    /**
+     * 受信
+     */
     "received": string;
+    /**
+     * 検索結果
+     */
     "searchResult": string;
+    /**
+     * ハッシュタグ
+     */
     "hashtags": string;
+    /**
+     * トラブルシューティング
+     */
     "troubleshooting": string;
+    /**
+     * UIにぼかし効果を使用
+     */
     "useBlurEffect": string;
+    /**
+     * 詳しく
+     */
     "learnMore": string;
+    /**
+     * Misskeyが更新されました！
+     */
     "misskeyUpdated": string;
+    /**
+     * 更新情報を見る
+     */
     "whatIsNew": string;
+    /**
+     * 翻訳
+     */
     "translate": string;
+    /**
+     * {x}から翻訳
+     */
     "translatedFrom": ParameterizedString<"x">;
+    /**
+     * アカウントの削除が進行中です
+     */
     "accountDeletionInProgress": string;
+    /**
+     * サーバー上であなたのアカウントを一意に識別するための名前。アルファベット(a~z, A~Z)、数字(0~9)、およびアンダーバー(_)が使用できます。ユーザー名は後から変更することは出来ません。
+     */
     "usernameInfo": string;
+    /**
+     * 藍モード
+     */
     "aiChanMode": string;
+    /**
+     * 開発者モード
+     */
     "devMode": string;
+    /**
+     * CWを維持する
+     */
     "keepCw": string;
+    /**
+     * Pub/Subのアカウント
+     */
     "pubSub": string;
+    /**
+     * 直近の通信
+     */
     "lastCommunication": string;
+    /**
+     * 解決済み
+     */
     "resolved": string;
+    /**
+     * 未解決
+     */
     "unresolved": string;
+    /**
+     * フォロワーを解除
+     */
     "breakFollow": string;
+    /**
+     * フォロワー解除しますか？
+     */
     "breakFollowConfirm": string;
+    /**
+     * オンになっています
+     */
     "itsOn": string;
+    /**
+     * オフになっています
+     */
     "itsOff": string;
+    /**
+     * オン
+     */
     "on": string;
+    /**
+     * オフ
+     */
     "off": string;
+    /**
+     * アカウント登録にメールアドレスを必須にする
+     */
     "emailRequiredForSignup": string;
+    /**
+     * 未読
+     */
     "unread": string;
+    /**
+     * フィルタ
+     */
     "filter": string;
+    /**
+     * コントロールパネル
+     */
     "controlPanel": string;
+    /**
+     * アカウントを管理
+     */
     "manageAccounts": string;
+    /**
+     * リアクション一覧を公開する
+     */
     "makeReactionsPublic": string;
+    /**
+     * あなたがしたリアクション一覧を誰でも見れるようにします。
+     */
     "makeReactionsPublicDescription": string;
+    /**
+     * クラシック
+     */
     "classic": string;
+    /**
+     * スレッドをミュート
+     */
     "muteThread": string;
+    /**
+     * スレッドのミュートを解除
+     */
     "unmuteThread": string;
+    /**
+     * フォローの公開範囲
+     */
     "followingVisibility": string;
+    /**
+     * フォロワーの公開範囲
+     */
     "followersVisibility": string;
+    /**
+     * さらにスレッドを見る
+     */
     "continueThread": string;
+    /**
+     * アカウントが削除されます。よろしいですか？
+     */
     "deleteAccountConfirm": string;
+    /**
+     * パスワードが間違っています。
+     */
     "incorrectPassword": string;
+    /**
+     * 「{choice}」に投票しますか？
+     */
     "voteConfirm": ParameterizedString<"choice">;
+    /**
+     * 隠す
+     */
     "hide": string;
+    /**
+     * モバイルデバイスのときドロワーで表示
+     */
     "useDrawerReactionPickerForMobile": string;
+    /**
+     * おかえりなさい、{name}さん
+     */
     "welcomeBackWithName": ParameterizedString<"name">;
+    /**
+     * [{ok}]を押して、メールアドレスの確認を完了してください。
+     */
     "clickToFinishEmailVerification": ParameterizedString<"ok">;
+    /**
+     * デバイスタイプ
+     */
     "overridedDeviceKind": string;
+    /**
+     * スマートフォン
+     */
     "smartphone": string;
+    /**
+     * タブレット
+     */
     "tablet": string;
+    /**
+     * 自動
+     */
     "auto": string;
+    /**
+     * テーマカラー
+     */
     "themeColor": string;
+    /**
+     * サイズ
+     */
     "size": string;
+    /**
+     * 列の数
+     */
     "numberOfColumn": string;
+    /**
+     * 検索
+     */
     "searchByGoogle": string;
+    /**
+     * サーバーデフォルトのライトテーマ
+     */
     "instanceDefaultLightTheme": string;
+    /**
+     * サーバーデフォルトのダークテーマ
+     */
     "instanceDefaultDarkTheme": string;
+    /**
+     * オブジェクト形式のテーマコードを記入します。
+     */
     "instanceDefaultThemeDescription": string;
+    /**
+     * ミュートする期限
+     */
     "mutePeriod": string;
+    /**
+     * 期限
+     */
     "period": string;
+    /**
+     * 無期限
+     */
     "indefinitely": string;
+    /**
+     * 10分
+     */
     "tenMinutes": string;
+    /**
+     * 1時間
+     */
     "oneHour": string;
+    /**
+     * 1日
+     */
     "oneDay": string;
+    /**
+     * 1週間
+     */
     "oneWeek": string;
+    /**
+     * 1ヶ月
+     */
     "oneMonth": string;
+    /**
+     * 反映されるまで時間がかかる場合があります。
+     */
     "reflectMayTakeTime": string;
+    /**
+     * アカウント情報の取得に失敗しました
+     */
     "failedToFetchAccountInformation": string;
+    /**
+     * レート制限を超えました
+     */
     "rateLimitExceeded": string;
+    /**
+     * 画像のクロップ
+     */
     "cropImage": string;
+    /**
+     * 画像をクロップしますか？
+     */
     "cropImageAsk": string;
+    /**
+     * クロップする
+     */
     "cropYes": string;
+    /**
+     * そのまま使う
+     */
     "cropNo": string;
+    /**
+     * ファイル
+     */
     "file": string;
+    /**
+     * 直近{n}時間
+     */
     "recentNHours": ParameterizedString<"n">;
+    /**
+     * 直近{n}日
+     */
     "recentNDays": ParameterizedString<"n">;
+    /**
+     * メールサーバーの設定がされていません。
+     */
     "noEmailServerWarning": string;
+    /**
+     * 未対応の通報があります。
+     */
     "thereIsUnresolvedAbuseReportWarning": string;
+    /**
+     * 推奨
+     */
     "recommended": string;
+    /**
+     * チェック
+     */
     "check": string;
+    /**
+     * このユーザーのドライブ容量上限を変更
+     */
     "driveCapOverrideLabel": string;
+    /**
+     * 0以下を指定すると解除されます。
+     */
     "driveCapOverrideCaption": string;
+    /**
+     * 閲覧するには管理者アカウントでログインしている必要があります。
+     */
     "requireAdminForView": string;
+    /**
+     * システムにより自動で作成・管理されているアカウントです。
+     */
     "isSystemAccount": string;
+    /**
+     * この操作を行うには {x} と入力してください
+     */
     "typeToConfirm": ParameterizedString<"x">;
+    /**
+     * アカウント削除
+     */
     "deleteAccount": string;
+    /**
+     * ドキュメント
+     */
     "document": string;
+    /**
+     * ページキャッシュ数
+     */
     "numberOfPageCache": string;
+    /**
+     * 多くすると利便性が向上しますが、負荷とメモリ使用量が増えます。
+     */
     "numberOfPageCacheDescription": string;
+    /**
+     * ログアウトしますか？
+     */
     "logoutConfirm": string;
+    /**
+     * 最終利用日時
+     */
     "lastActiveDate": string;
+    /**
+     * ステータスバー
+     */
     "statusbar": string;
+    /**
+     * 選択してください
+     */
     "pleaseSelect": string;
+    /**
+     * 反転
+     */
     "reverse": string;
+    /**
+     * 色付き
+     */
     "colored": string;
+    /**
+     * 更新間隔
+     */
     "refreshInterval": string;
+    /**
+     * ラベル
+     */
     "label": string;
+    /**
+     * タイプ
+     */
     "type": string;
+    /**
+     * 速度
+     */
     "speed": string;
+    /**
+     * 遅い
+     */
     "slow": string;
+    /**
+     * 速い
+     */
     "fast": string;
+    /**
+     * センシティブなメディアの検出
+     */
     "sensitiveMediaDetection": string;
+    /**
+     * ローカルのみ
+     */
     "localOnly": string;
+    /**
+     * リモートのみ
+     */
     "remoteOnly": string;
+    /**
+     * アップロード失敗
+     */
     "failedToUpload": string;
+    /**
+     * 不適切な内容を含む可能性があると判定されたためアップロードできません。
+     */
     "cannotUploadBecauseInappropriate": string;
+    /**
+     * ドライブの空き容量が無いためアップロードできません。
+     */
     "cannotUploadBecauseNoFreeSpace": string;
+    /**
+     * ファイルサイズの制限を超えているためアップロードできません。
+     */
     "cannotUploadBecauseExceedsFileSizeLimit": string;
+    /**
+     * ベータ
+     */
     "beta": string;
+    /**
+     * 自動センシティブ判定
+     */
     "enableAutoSensitive": string;
+    /**
+     * 利用可能な場合は、機械学習を利用して自動でメディアにセンシティブフラグを設定します。この機能をオフにしても、サーバーによっては自動で設定されることがあります。
+     */
     "enableAutoSensitiveDescription": string;
+    /**
+     * ユーザーのメールアドレスのバリデーションを、捨てアドかどうかや実際に通信可能かどうかなどを判定しより積極的に行います。オフにすると単に文字列として正しいかどうかのみチェックされます。
+     */
     "activeEmailValidationDescription": string;
+    /**
+     * ナビゲーションバー
+     */
     "navbar": string;
+    /**
+     * シャッフル
+     */
     "shuffle": string;
+    /**
+     * アカウント
+     */
     "account": string;
+    /**
+     * 移動
+     */
     "move": string;
+    /**
+     * プッシュ通知
+     */
     "pushNotification": string;
+    /**
+     * プッシュ通知を有効化
+     */
     "subscribePushNotification": string;
+    /**
+     * プッシュ通知を停止する
+     */
     "unsubscribePushNotification": string;
+    /**
+     * プッシュ通知は有効です
+     */
     "pushNotificationAlreadySubscribed": string;
+    /**
+     * ブラウザかサーバーがプッシュ通知に非対応
+     */
     "pushNotificationNotSupported": string;
+    /**
+     * 通知が既読になったらプッシュ通知を削除する
+     */
     "sendPushNotificationReadMessage": string;
+    /**
+     * 端末の電池消費量が増加する可能性があります。
+     */
     "sendPushNotificationReadMessageCaption": string;
+    /**
+     * 最大化
+     */
     "windowMaximize": string;
+    /**
+     * 最小化
+     */
     "windowMinimize": string;
+    /**
+     * 元に戻す
+     */
     "windowRestore": string;
+    /**
+     * キャプション
+     */
     "caption": string;
+    /**
+     * Botアカウントでログイン中
+     */
     "loggedInAsBot": string;
+    /**
+     * ツール
+     */
     "tools": string;
+    /**
+     * 読み込めません
+     */
     "cannotLoad": string;
+    /**
+     * プロフィール表示回数
+     */
     "numberOfProfileView": string;
+    /**
+     * いいね！
+     */
     "like": string;
+    /**
+     * いいねを解除
+     */
     "unlike": string;
+    /**
+     * いいね数
+     */
     "numberOfLikes": string;
+    /**
+     * 表示
+     */
     "show": string;
+    /**
+     * 今後表示しない
+     */
     "neverShow": string;
+    /**
+     * また後で
+     */
     "remindMeLater": string;
+    /**
+     * Misskeyを気に入っていただけましたか？
+     */
     "didYouLikeMisskey": string;
+    /**
+     * Misskeyは{host}が使用している無料のソフトウェアです。これからも開発を続けられるように、ぜひ寄付をお願いします！
+     */
     "pleaseDonate": ParameterizedString<"host">;
+    /**
+     * ロール
+     */
     "roles": string;
+    /**
+     * ロール
+     */
     "role": string;
+    /**
+     * ロールはありません
+     */
     "noRole": string;
+    /**
+     * 一般ユーザー
+     */
     "normalUser": string;
+    /**
+     * 未定義
+     */
     "undefined": string;
+    /**
+     * アサイン
+     */
     "assign": string;
+    /**
+     * アサインを解除
+     */
     "unassign": string;
+    /**
+     * 色
+     */
     "color": string;
+    /**
+     * カスタム絵文字の管理
+     */
     "manageCustomEmojis": string;
+    /**
+     * アバターデコレーションの管理
+     */
     "manageAvatarDecorations": string;
+    /**
+     * これ以上作成することはできません。
+     */
     "youCannotCreateAnymore": string;
+    /**
+     * 一時的に利用できません
+     */
     "cannotPerformTemporary": string;
+    /**
+     * 操作回数が制限を超過するため一時的に利用できません。しばらく時間を置いてから再度お試しください。
+     */
     "cannotPerformTemporaryDescription": string;
+    /**
+     * パラメータエラー
+     */
     "invalidParamError": string;
+    /**
+     * リクエストパラメータに問題があります。通常これはバグですが、入力した文字数が多すぎる等の可能性もあります。
+     */
     "invalidParamErrorDescription": string;
+    /**
+     * 操作が拒否されました
+     */
     "permissionDeniedError": string;
+    /**
+     * このアカウントにはこの操作を行うための権限がありません。
+     */
     "permissionDeniedErrorDescription": string;
+    /**
+     * プリセット
+     */
     "preset": string;
+    /**
+     * プリセットから選択
+     */
     "selectFromPresets": string;
+    /**
+     * 実績
+     */
     "achievements": string;
+    /**
+     * サーバーの応答が無効です
+     */
     "gotInvalidResponseError": string;
+    /**
+     * サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから再度お試しください。
+     */
     "gotInvalidResponseErrorDescription": string;
+    /**
+     * この投稿は迷惑になる可能性があります。
+     */
     "thisPostMayBeAnnoying": string;
+    /**
+     * ホームに投稿
+     */
     "thisPostMayBeAnnoyingHome": string;
+    /**
+     * やめる
+     */
     "thisPostMayBeAnnoyingCancel": string;
+    /**
+     * このまま投稿
+     */
     "thisPostMayBeAnnoyingIgnore": string;
+    /**
+     * 見たことのあるリノートを省略して表示
+     */
     "collapseRenotes": string;
+    /**
+     * サーバー内部エラー
+     */
     "internalServerError": string;
+    /**
+     * サーバー内部で予期しないエラーが発生しました。
+     */
     "internalServerErrorDescription": string;
+    /**
+     * エラー情報をコピー
+     */
     "copyErrorInfo": string;
+    /**
+     * このサーバーに登録する
+     */
     "joinThisServer": string;
+    /**
+     * 他のサーバーを探す
+     */
     "exploreOtherServers": string;
+    /**
+     * タイムラインを見てみる
+     */
     "letsLookAtTimeline": string;
+    /**
+     * 連合なしにしますか？
+     */
     "disableFederationConfirm": string;
+    /**
+     * 連合なしにしても投稿は非公開になりません。ほとんどの場合、連合なしにする必要はありません。
+     */
     "disableFederationConfirmWarn": string;
+    /**
+     * 連合なしにする
+     */
     "disableFederationOk": string;
+    /**
+     * 現在このサーバーは招待制です。招待コードをお持ちの方のみ登録できます。
+     */
     "invitationRequiredToRegister": string;
+    /**
+     * このサーバーではメール配信はサポートされていません
+     */
     "emailNotSupported": string;
+    /**
+     * チャンネルに投稿
+     */
     "postToTheChannel": string;
+    /**
+     * 後から変更できません。
+     */
     "cannotBeChangedLater": string;
+    /**
+     * リアクションの受け入れ
+     */
     "reactionAcceptance": string;
+    /**
+     * いいねのみ
+     */
     "likeOnly": string;
+    /**
+     * 全て (リモートはいいねのみ)
+     */
     "likeOnlyForRemote": string;
+    /**
+     * 非センシティブのみ
+     */
     "nonSensitiveOnly": string;
+    /**
+     * 非センシティブのみ (リモートはいいねのみ)
+     */
     "nonSensitiveOnlyForLocalLikeOnlyForRemote": string;
+    /**
+     * 自分に割り当てられたロール
+     */
     "rolesAssignedToMe": string;
+    /**
+     * パスワードリセットしますか？
+     */
     "resetPasswordConfirm": string;
+    /**
+     * センシティブワード
+     */
     "sensitiveWords": string;
+    /**
+     * 設定したワードが含まれるノートの公開範囲をホームにします。改行で区切って複数設定できます。
+     */
     "sensitiveWordsDescription": string;
+    /**
+     * スペースで区切るとAND指定になり、キーワードをスラッシュで囲むと正規表現になります。
+     */
     "sensitiveWordsDescription2": string;
+    /**
+     * 非表示ハッシュタグ
+     */
     "hiddenTags": string;
+    /**
+     * 設定したタグをトレンドに表示させないようにします。改行で区切って複数設定できます。
+     */
     "hiddenTagsDescription": string;
+    /**
+     * ノート検索は利用できません。
+     */
     "notesSearchNotAvailable": string;
+    /**
+     * ライセンス
+     */
     "license": string;
+    /**
+     * お気に入り解除しますか？
+     */
     "unfavoriteConfirm": string;
+    /**
+     * 自分のクリップ
+     */
     "myClips": string;
+    /**
+     * ドライブクリーナー
+     */
     "drivecleaner": string;
+    /**
+     * すべてのキューを今すぐ再試行
+     */
     "retryAllQueuesNow": string;
+    /**
+     * 今すぐ再試行しますか？
+     */
     "retryAllQueuesConfirmTitle": string;
+    /**
+     * 一時的にサーバーの負荷が増大することがあります。
+     */
     "retryAllQueuesConfirmText": string;
+    /**
+     * リモートユーザーのチャートを生成
+     */
     "enableChartsForRemoteUser": string;
+    /**
+     * リモートサーバーのチャートを生成
+     */
     "enableChartsForFederatedInstances": string;
+    /**
+     * ノートのアクションにクリップを追加
+     */
     "showClipButtonInNoteFooter": string;
+    /**
+     * リアクションの表示サイズ
+     */
     "reactionsDisplaySize": string;
+    /**
+     * リアクションの最大横幅を制限し、縮小して表示する
+     */
     "limitWidthOfReaction": string;
+    /**
+     * ノートIDまたはURL
+     */
     "noteIdOrUrl": string;
+    /**
+     * 動画
+     */
     "video": string;
+    /**
+     * 動画
+     */
     "videos": string;
+    /**
+     * 音声
+     */
     "audio": string;
+    /**
+     * 音声
+     */
     "audioFiles": string;
+    /**
+     * データセーバー
+     */
     "dataSaver": string;
+    /**
+     * アカウントの移行
+     */
     "accountMigration": string;
+    /**
+     * このユーザーは新しいアカウントに移行しました：
+     */
     "accountMoved": string;
+    /**
+     * このアカウントは移行されています
+     */
     "accountMovedShort": string;
+    /**
+     * この操作はできません
+     */
     "operationForbidden": string;
+    /**
+     * 常に広告を表示する
+     */
     "forceShowAds": string;
+    /**
+     * メモを追加
+     */
     "addMemo": string;
+    /**
+     * メモを編集
+     */
     "editMemo": string;
+    /**
+     * リアクション一覧
+     */
     "reactionsList": string;
+    /**
+     * リノート一覧
+     */
     "renotesList": string;
+    /**
+     * 通知の表示
+     */
     "notificationDisplay": string;
+    /**
+     * 左上
+     */
     "leftTop": string;
+    /**
+     * 右上
+     */
     "rightTop": string;
+    /**
+     * 左下
+     */
     "leftBottom": string;
+    /**
+     * 右下
+     */
     "rightBottom": string;
+    /**
+     * スタック方向
+     */
     "stackAxis": string;
+    /**
+     * 縦
+     */
     "vertical": string;
+    /**
+     * 横
+     */
     "horizontal": string;
+    /**
+     * 位置
+     */
     "position": string;
+    /**
+     * サーバールール
+     */
     "serverRules": string;
+    /**
+     * このサーバーに登録するには、以下の内容を確認し同意する必要があります。
+     */
     "pleaseConfirmBelowBeforeSignup": string;
+    /**
+     * 続けるには、全ての「同意する」にチェックが入っている必要があります。
+     */
     "pleaseAgreeAllToContinue": string;
+    /**
+     * 続ける
+     */
     "continue": string;
+    /**
+     * 予約ユーザー名
+     */
     "preservedUsernames": string;
+    /**
+     * 予約するユーザー名を改行で列挙します。ここで指定されたユーザー名はアカウント作成時に使えなくなりますが、管理者によるアカウント作成時はこの制限を受けません。また、既に存在するアカウントも影響を受けません。
+     */
     "preservedUsernamesDescription": string;
+    /**
+     * このファイルからノートを作成
+     */
     "createNoteFromTheFile": string;
+    /**
+     * アーカイブ
+     */
     "archive": string;
+    /**
+     * {name}をアーカイブしますか？
+     */
     "channelArchiveConfirmTitle": ParameterizedString<"name">;
+    /**
+     * アーカイブすると、チャンネル一覧や検索結果に表示されなくなり、新たな書き込みもできなくなります。
+     */
     "channelArchiveConfirmDescription": string;
+    /**
+     * このチャンネルはアーカイブされています。
+     */
     "thisChannelArchived": string;
+    /**
+     * ノートの表示
+     */
     "displayOfNote": string;
+    /**
+     * 初期設定
+     */
     "initialAccountSetting": string;
+    /**
+     * フォロー中
+     */
     "youFollowing": string;
+    /**
+     * 生成AIによる学習を拒否
+     */
     "preventAiLearning": string;
+    /**
+     * 外部の文章生成AIや画像生成AIに対して、投稿したノートや画像などのコンテンツを学習の対象にしないように要求します。これはnoaiフラグをHTMLレスポンスに含めることによって実現されますが、この要求に従うかはそのAI次第であるため、学習を完全に防止するものではありません。
+     */
     "preventAiLearningDescription": string;
+    /**
+     * オプション
+     */
     "options": string;
+    /**
+     * ユーザー指定
+     */
     "specifyUser": string;
+    /**
+     * プレビューできません
+     */
     "failedToPreviewUrl": string;
+    /**
+     * 更新
+     */
     "update": string;
+    /**
+     * リアクションとして使えるロール
+     */
     "rolesThatCanBeUsedThisEmojiAsReaction": string;
+    /**
+     * ロールの指定が一つもない場合、誰でもリアクションとして使えます。
+     */
     "rolesThatCanBeUsedThisEmojiAsReactionEmptyDescription": string;
+    /**
+     * ロールは公開ロールである必要があります。
+     */
     "rolesThatCanBeUsedThisEmojiAsReactionPublicRoleWarn": string;
+    /**
+     * リアクションを取り消しますか？
+     */
     "cancelReactionConfirm": string;
+    /**
+     * リアクションを変更しますか？
+     */
     "changeReactionConfirm": string;
+    /**
+     * あとで
+     */
     "later": string;
+    /**
+     * Misskeyへ
+     */
     "goToMisskey": string;
+    /**
+     * 絵文字の追加辞書
+     */
     "additionalEmojiDictionary": string;
+    /**
+     * インストール済み
+     */
     "installed": string;
+    /**
+     * ブランディング
+     */
     "branding": string;
+    /**
+     * サーバーのマシン情報を公開する
+     */
     "enableServerMachineStats": string;
+    /**
+     * ユーザーごとのIdenticon生成を有効にする
+     */
     "enableIdenticonGeneration": string;
+    /**
+     * オフにするとパフォーマンスが向上します。
+     */
     "turnOffToImprovePerformance": string;
+    /**
+     * 招待コードを作成
+     */
     "createInviteCode": string;
+    /**
+     * オプションを指定して作成
+     */
     "createWithOptions": string;
+    /**
+     * 作成数
+     */
     "createCount": string;
+    /**
+     * 招待コードを作成しました
+     */
     "inviteCodeCreated": string;
+    /**
+     * 作成できる招待コードの数が上限に達しています。
+     */
     "inviteLimitExceeded": string;
+    /**
+     * 作成できる招待コード: 残り {limit} 個
+     */
     "createLimitRemaining": ParameterizedString<"limit">;
+    /**
+     * {time}で最大 {limit} 個の招待コードを作成できます。
+     */
     "inviteLimitResetCycle": ParameterizedString<"time" | "limit">;
+    /**
+     * 有効期限
+     */
     "expirationDate": string;
+    /**
+     * 有効期限を設けない
+     */
     "noExpirationDate": string;
+    /**
+     * 招待コードが使用された日時
+     */
     "inviteCodeUsedAt": string;
+    /**
+     * 招待コードを使用したユーザー
+     */
     "registeredUserUsingInviteCode": string;
+    /**
+     * メール認証待ち
+     */
     "waitingForMailAuth": string;
+    /**
+     * 招待コードを作成したユーザー
+     */
     "inviteCodeCreator": string;
+    /**
+     * 使用日時
+     */
     "usedAt": string;
+    /**
+     * 未使用
+     */
     "unused": string;
+    /**
+     * 使用済み
+     */
     "used": string;
+    /**
+     * 期限切れ
+     */
     "expired": string;
+    /**
+     * 同意しますか？
+     */
     "doYouAgree": string;
+    /**
+     * 重要ですので必ずお読みください。
+     */
     "beSureToReadThisAsItIsImportant": string;
+    /**
+     * 「{x}」の内容をよく読み、同意します。
+     */
     "iHaveReadXCarefullyAndAgree": ParameterizedString<"x">;
+    /**
+     * ダイアログ
+     */
     "dialog": string;
+    /**
+     * アイコン
+     */
     "icon": string;
+    /**
+     * あなたへ
+     */
     "forYou": string;
+    /**
+     * 現在のお知らせ
+     */
     "currentAnnouncements": string;
+    /**
+     * 過去のお知らせ
+     */
     "pastAnnouncements": string;
+    /**
+     * 未読のお知らせがあります。
+     */
     "youHaveUnreadAnnouncements": string;
+    /**
+     * ブラウザまたはデバイスの指示に従って、セキュリティキーまたはパスキーを使用してください。
+     */
     "useSecurityKey": string;
+    /**
+     * 返信
+     */
     "replies": string;
+    /**
+     * リノート
+     */
     "renotes": string;
+    /**
+     * 返信を見る
+     */
     "loadReplies": string;
+    /**
+     * 会話を見る
+     */
     "loadConversation": string;
+    /**
+     * ピン留めされたリスト
+     */
     "pinnedList": string;
+    /**
+     * デバイスの画面を常にオンにする
+     */
     "keepScreenOn": string;
+    /**
+     * このリンク先の所有者であることが確認されました
+     */
     "verifiedLink": string;
+    /**
+     * 投稿を通知
+     */
     "notifyNotes": string;
+    /**
+     * 投稿の通知を解除
+     */
     "unnotifyNotes": string;
+    /**
+     * 認証
+     */
     "authentication": string;
+    /**
+     * 続けるには認証を行ってください
+     */
     "authenticationRequiredToContinue": string;
+    /**
+     * 日時
+     */
     "dateAndTime": string;
+    /**
+     * リノートを表示
+     */
     "showRenotes": string;
+    /**
+     * 編集済み
+     */
     "edited": string;
+    /**
+     * 通知の受信設定
+     */
     "notificationRecieveConfig": string;
+    /**
+     * 相互フォロー
+     */
     "mutualFollow": string;
+    /**
+     * ファイル付きのみ
+     */
     "fileAttachedOnly": string;
+    /**
+     * TLに他の人への返信を含める
+     */
     "showRepliesToOthersInTimeline": string;
+    /**
+     * TLに他の人への返信を含めない
+     */
     "hideRepliesToOthersInTimeline": string;
+    /**
+     * TLに現在フォロー中の人全員の返信を含めるようにする
+     */
     "showRepliesToOthersInTimelineAll": string;
+    /**
+     * TLに現在フォロー中の人全員の返信を含めないようにする
+     */
     "hideRepliesToOthersInTimelineAll": string;
+    /**
+     * この操作は元に戻せません。本当にTLに現在フォロー中の人全員の返信を含めるようにしますか？
+     */
     "confirmShowRepliesAll": string;
+    /**
+     * この操作は元に戻せません。本当にTLに現在フォロー中の人全員の返信を含めないようにしますか？
+     */
     "confirmHideRepliesAll": string;
+    /**
+     * 外部サービス
+     */
     "externalServices": string;
+    /**
+     * 運営者情報
+     */
     "impressum": string;
+    /**
+     * 運営者情報URL
+     */
     "impressumUrl": string;
+    /**
+     * ドイツなどの一部の国と地域では表示が義務付けられています(Impressum)。
+     */
     "impressumDescription": string;
+    /**
+     * プライバシーポリシー
+     */
     "privacyPolicy": string;
+    /**
+     * プライバシーポリシーURL
+     */
     "privacyPolicyUrl": string;
+    /**
+     * 利用規約・プライバシーポリシー
+     */
     "tosAndPrivacyPolicy": string;
+    /**
+     * アイコンデコレーション
+     */
     "avatarDecorations": string;
+    /**
+     * 付ける
+     */
     "attach": string;
+    /**
+     * 外す
+     */
     "detach": string;
+    /**
+     * 全て外す
+     */
     "detachAll": string;
+    /**
+     * 角度
+     */
     "angle": string;
+    /**
+     * 反転
+     */
     "flip": string;
+    /**
+     * アイコンのデコレーションを表示
+     */
     "showAvatarDecorations": string;
+    /**
+     * 離してリロード
+     */
     "releaseToRefresh": string;
+    /**
+     * リロード中
+     */
     "refreshing": string;
+    /**
+     * 引っ張ってリロード
+     */
     "pullDownToRefresh": string;
+    /**
+     * タイムラインのリアルタイム更新を無効にする
+     */
     "disableStreamingTimeline": string;
+    /**
+     * 通知をグルーピングして表示する
+     */
     "useGroupedNotifications": string;
+    /**
+     * メールアドレスの確認中に問題が発生しました。リンクの有効期限が切れている可能性があります。
+     */
     "signupPendingError": string;
+    /**
+     * 「内容を隠す」がオンの場合は注釈の記述が必要です。
+     */
     "cwNotationRequired": string;
+    /**
+     * リアクションする
+     */
     "doReaction": string;
+    /**
+     * コード
+     */
     "code": string;
+    /**
+     * 設定の反映にはリロードが必要です。
+     */
     "reloadRequiredToApplySettings": string;
+    /**
+     * 残り: {n}
+     */
     "remainingN": ParameterizedString<"n">;
+    /**
+     * 現在の内容に上書きされますがよろしいですか？
+     */
     "overwriteContentConfirm": string;
+    /**
+     * 季節に応じた画面の演出
+     */
     "seasonalScreenEffect": string;
+    /**
+     * デコる
+     */
     "decorate": string;
+    /**
+     * 装飾を追加
+     */
     "addMfmFunction": string;
+    /**
+     * 高度なMFMのピッカーを表示する
+     */
     "enableQuickAddMfmFunction": string;
+    /**
+     * バブルゲーム
+     */
     "bubbleGame": string;
+    /**
+     * 効果音
+     */
     "sfx": string;
+    /**
+     * サウンドが再生されます
+     */
     "soundWillBePlayed": string;
+    /**
+     * リプレイを見る
+     */
     "showReplay": string;
+    /**
+     * リプレイ
+     */
     "replay": string;
+    /**
+     * リプレイ中
+     */
     "replaying": string;
+    /**
+     * ランキング
+     */
     "ranking": string;
+    /**
+     * 直近{n}日
+     */
     "lastNDays": ParameterizedString<"n">;
+    /**
+     * タイトルへ
+     */
     "backToTitle": string;
+    /**
+     * スワイプしてタブを切り替える
+     */
     "enableHorizontalSwipe": string;
     "_bubbleGame": {
+        /**
+         * 遊び方
+         */
         "howToPlay": string;
         "_howToPlay": {
+            /**
+             * 位置を調整してハコにモノを落とします。
+             */
             "section1": string;
+            /**
+             * 同じ種類のモノがくっつくと別のモノに変化して、スコアが得られます。
+             */
             "section2": string;
+            /**
+             * モノがハコからあふれるとゲームオーバーです。ハコからあふれないようにしつつモノを融合させてハイスコアを目指そう！
+             */
             "section3": string;
         };
     };
     "_announcement": {
+        /**
+         * 既存ユーザーのみ
+         */
         "forExistingUsers": string;
+        /**
+         * 有効にすると、このお知らせ作成時点で存在するユーザーにのみお知らせが表示されます。無効にすると、このお知らせ作成後にアカウントを作成したユーザーにもお知らせが表示されます。
+         */
         "forExistingUsersDescription": string;
+        /**
+         * 既読にするのに確認が必要
+         */
         "needConfirmationToRead": string;
+        /**
+         * 有効にすると、このお知らせを既読にする際に確認ダイアログが表示されます。また、一括既読操作の対象になりません。
+         */
         "needConfirmationToReadDescription": string;
+        /**
+         * お知らせを終了
+         */
         "end": string;
+        /**
+         * アクティブなお知らせが多いため、UXが低下する可能性があります。終了したお知らせはアーカイブすることを検討してください。
+         */
         "tooManyActiveAnnouncementDescription": string;
+        /**
+         * 既読にしますか？
+         */
         "readConfirmTitle": string;
+        /**
+         * 「{title}」の内容を読み、既読にします。
+         */
         "readConfirmText": ParameterizedString<"title">;
+        /**
+         * 特に新規ユーザーのUXを損ねる可能性が高いため、ストック情報ではなくフロー情報の掲示にお知らせを使用することを推奨します。
+         */
         "shouldNotBeUsedToPresentPermanentInfo": string;
+        /**
+         * ダイアログ形式のお知らせが同時に2つ以上ある場合、UXに悪影響を及ぼす可能性が非常に高いため、使用は慎重に行うことを推奨します。
+         */
         "dialogAnnouncementUxWarn": string;
+        /**
+         * 非通知
+         */
         "silence": string;
+        /**
+         * オンにすると、このお知らせは通知されず、既読にする必要もなくなります。
+         */
         "silenceDescription": string;
     };
     "_initialAccountSetting": {
+        /**
+         * アカウントの作成が完了しました！
+         */
         "accountCreated": string;
+        /**
+         * さっそくアカウントの初期設定を行いましょう。
+         */
         "letsStartAccountSetup": string;
+        /**
+         * まずはあなたのプロフィールを設定しましょう。
+         */
         "letsFillYourProfile": string;
+        /**
+         * プロフィール設定
+         */
         "profileSetting": string;
+        /**
+         * プライバシー設定
+         */
         "privacySetting": string;
+        /**
+         * これらの設定は後から変更できます。
+         */
         "theseSettingsCanEditLater": string;
+        /**
+         * この他にも様々な設定を「設定」ページから行えます。ぜひ後で確認してみてください。
+         */
         "youCanEditMoreSettingsInSettingsPageLater": string;
+        /**
+         * タイムラインを構築するため、気になるユーザーをフォローしてみましょう。
+         */
         "followUsers": string;
+        /**
+         * プッシュ通知を有効にすると{name}の通知をお使いのデバイスで受け取ることができます。
+         */
         "pushNotificationDescription": ParameterizedString<"name">;
+        /**
+         * 初期設定が完了しました！
+         */
         "initialAccountSettingCompleted": string;
+        /**
+         * {name}をお楽しみください！
+         */
         "haveFun": ParameterizedString<"name">;
+        /**
+         * このまま{name}(Misskey)の使い方についてのチュートリアルに進むこともできますが、ここで中断してすぐに使い始めることもできます。
+         */
         "youCanContinueTutorial": ParameterizedString<"name">;
+        /**
+         * チュートリアルを開始
+         */
         "startTutorial": string;
+        /**
+         * 初期設定をスキップしますか？
+         */
         "skipAreYouSure": string;
+        /**
+         * 初期設定をあとでやり直しますか？
+         */
         "laterAreYouSure": string;
     };
     "_initialTutorial": {
+        /**
+         * チュートリアルを見る
+         */
         "launchTutorial": string;
+        /**
+         * チュートリアル
+         */
         "title": string;
+        /**
+         * よくできました
+         */
         "wellDone": string;
+        /**
+         * チュートリアルを終了しますか？
+         */
         "skipAreYouSure": string;
         "_landing": {
+            /**
+             * チュートリアルへようこそ
+             */
             "title": string;
+            /**
+             * ここでは、Misskeyの基本的な使い方や機能を確認できます。
+             */
             "description": string;
         };
         "_note": {
+            /**
+             * ノートって何？
+             */
             "title": string;
+            /**
+             * Misskeyでの投稿は「ノート」と呼びます。ノートはタイムラインに時系列で並んでいて、リアルタイムで更新されていきます。
+             */
             "description": string;
+            /**
+             * 返信することができます。返信に対しての返信も可能で、スレッドのように会話を続けることもできます。
+             */
             "reply": string;
+            /**
+             * そのノートを自分のタイムラインに流して共有することができます。テキストを追加して引用することも可能です。
+             */
             "renote": string;
+            /**
+             * リアクションをつけることができます。詳しくは次のページで解説します。
+             */
             "reaction": string;
+            /**
+             * ノートの詳細を表示したり、リンクをコピーしたりなどの様々な操作が行えます。
+             */
             "menu": string;
         };
         "_reaction": {
+            /**
+             * リアクションって何？
+             */
             "title": string;
+            /**
+             * ノートには「リアクション」をつけることができます。「いいね」では伝わらないニュアンスも、リアクションで簡単・気軽に表現できます。
+             */
             "description": string;
+            /**
+             * リアクションは、ノートの「＋」ボタンをクリックするとつけられます。試しにこのサンプルのノートにリアクションをつけてみてください！
+             */
             "letsTryReacting": string;
+            /**
+             * リアクションをつけると先に進めるようになります。
+             */
             "reactToContinue": string;
+            /**
+             * あなたのノートが誰かにリアクションされると、リアルタイムで通知を受け取ります。
+             */
             "reactNotification": string;
+            /**
+             * 「ー」ボタンを押すとリアクションを取り消すことができます。
+             */
             "reactDone": string;
         };
         "_timeline": {
+            /**
+             * タイムラインのしくみ
+             */
             "title": string;
+            /**
+             * Misskeyには、使い方に応じて複数のタイムラインが用意されています（サーバーによってはいずれかが無効になっていることがあります）。
+             */
             "description1": string;
+            /**
+             * あなたがフォローしているアカウントの投稿を見られます。
+             */
             "home": string;
+            /**
+             * このサーバーにいるユーザー全員の投稿を見られます。
+             */
             "local": string;
+            /**
+             * ホームタイムラインとローカルタイムラインの投稿が両方表示されます。
+             */
             "social": string;
+            /**
+             * 接続している他のすべてのサーバーからの投稿を見られます。
+             */
             "global": string;
+            /**
+             * それぞれのタイムラインは、画面上部でいつでも切り替えられます。
+             */
             "description2": string;
+            /**
+             * その他にも、リストタイムラインやチャンネルタイムラインなどがあります。詳しくは{link}をご覧ください。
+             */
             "description3": ParameterizedString<"link">;
         };
         "_postNote": {
+            /**
+             * ノートの投稿設定
+             */
             "title": string;
+            /**
+             * Misskeyにノートを投稿する際には、様々なオプションの設定が可能です。投稿フォームはこのようになっています。
+             */
             "description1": string;
             "_visibility": {
+                /**
+                 * ノートを表示できる相手を制限できます。
+                 */
                 "description": string;
+                /**
+                 * すべてのユーザーに公開。
+                 */
                 "public": string;
+                /**
+                 * ホームタイムラインのみに公開。フォロワー・プロフィールを見に来た人・リノートから、他のユーザーも見ることができます。
+                 */
                 "home": string;
+                /**
+                 * フォロワーにのみ公開。本人以外がリノートすることはできず、またフォロワー以外は閲覧できません。
+                 */
                 "followers": string;
+                /**
+                 * 指定したユーザーにのみ公開され、また相手に通知が入ります。ダイレクトメッセージのかわりにお使いいただけます。
+                 */
                 "direct": string;
+                /**
+                 * 機密情報は送信する際は注意してください。
+                 */
                 "doNotSendConfidencialOnDirect1": string;
+                /**
+                 * 送信先のサーバーの管理者は投稿内容を見ることが可能なので、信頼できないサーバーのユーザーにダイレクト投稿を送信する場合は、機密情報の扱いに注意が必要です。
+                 */
                 "doNotSendConfidencialOnDirect2": string;
+                /**
+                 * 他のサーバーに投稿を連合しません。上記の公開範囲に関わらず、他のサーバーのユーザーは、この設定がついたノートを直接閲覧することができなくなります。
+                 */
                 "localOnly": string;
             };
             "_cw": {
+                /**
+                 * 内容を隠す（CW）
+                 */
                 "title": string;
+                /**
+                 * 本文のかわりに「注釈」に書いた内容が表示されます。「もっと見る」を押すと本文が表示されます。
+                 */
                 "description": string;
                 "_exampleNote": {
+                    /**
+                     * 飯テロ注意
+                     */
                     "cw": string;
+                    /**
+                     * チョコのかかったドーナツを食べました🍩😋
+                     */
                     "note": string;
                 };
+                /**
+                 * サーバーのガイドラインにより必要とされるノートに指定したり、ネタバレ投稿やセンシティブな文章を自主規制したりするときに使います。
+                 */
                 "useCases": string;
             };
         };
         "_howToMakeAttachmentsSensitive": {
+            /**
+             * 添付ファイルをセンシティブにするには？
+             */
             "title": string;
+            /**
+             * サーバーのガイドラインにより必要とされる際や、そのまま見れる状態にしておくべきではない添付ファイルには、「センシティブ」設定を付けます。
+             */
             "description": string;
+            /**
+             * 試しに、このフォームに添付された画像をセンシティブにしてみてください！
+             */
             "tryThisFile": string;
             "_exampleNote": {
+                /**
+                 * 納豆のフタ開けるのミスったわね…
+                 */
                 "note": string;
             };
+            /**
+             * 添付ファイルをセンシティブにする際は、そのファイルをクリックしてメニューを開き、「センシティブとして設定」をクリックします。
+             */
             "method": string;
+            /**
+             * ファイルを添付する際は、サーバーのガイドラインに従ってセンシティブを適切に設定してください。
+             */
             "sensitiveSucceeded": string;
+            /**
+             * 画像をセンシティブに設定すると先に進めるようになります。
+             */
             "doItToContinue": string;
         };
         "_done": {
+            /**
+             * チュートリアルは終了です🎉
+             */
             "title": string;
+            /**
+             * ここで紹介した機能はほんの一部にすぎません。Misskeyの使い方をより詳しく知るには、{link}をご覧ください。
+             */
             "description": ParameterizedString<"link">;
         };
     };
     "_timelineDescription": {
+        /**
+         * ホームタイムラインでは、あなたがフォローしているアカウントの投稿を見られます。
+         */
         "home": string;
+        /**
+         * ローカルタイムラインでは、このサーバーにいるユーザー全員の投稿を見られます。
+         */
         "local": string;
+        /**
+         * ソーシャルタイムラインには、ホームタイムラインとローカルタイムラインの投稿が両方表示されます。
+         */
         "social": string;
+        /**
+         * グローバルタイムラインでは、接続している他のすべてのサーバーからの投稿を見られます。
+         */
         "global": string;
     };
     "_serverRules": {
+        /**
+         * 新規登録前に表示する、サーバーの簡潔なルールを設定します。内容は利用規約の要約とすることを推奨します。
+         */
         "description": string;
     };
     "_serverSettings": {
+        /**
+         * アイコン画像のURL
+         */
         "iconUrl": string;
+        /**
+         * {host}がアプリとして表示される際のアイコンを指定します。
+         */
         "appIconDescription": ParameterizedString<"host">;
+        /**
+         * 例: PWAや、スマートフォンのホーム画面にブックマークとして追加された時など
+         */
         "appIconUsageExample": string;
+        /**
+         * 円形もしくは角丸にクロップされる場合があるため、塗り潰された余白のある背景を持つことが推奨されます。
+         */
         "appIconStyleRecommendation": string;
+        /**
+         * 解像度は必ず{resolution}である必要があります。
+         */
         "appIconResolutionMustBe": ParameterizedString<"resolution">;
+        /**
+         * manifest.jsonのオーバーライド
+         */
         "manifestJsonOverride": string;
+        /**
+         * 略称
+         */
         "shortName": string;
+        /**
+         * サーバーの正式名称が長い場合に、代わりに表示することのできる略称や通称。
+         */
         "shortNameDescription": string;
+        /**
+         * 有効にすると、各種タイムラインを取得する際のパフォーマンスが大幅に向上し、データベースへの負荷を軽減することが可能です。ただし、Redisのメモリ使用量は増加します。サーバーのメモリ容量が少ない場合、または動作が不安定な場合は無効にすることができます。
+         */
         "fanoutTimelineDescription": string;
+        /**
+         * データベースへのフォールバック
+         */
         "fanoutTimelineDbFallback": string;
+        /**
+         * 有効にすると、タイムラインがキャッシュされていない場合にDBへ追加で問い合わせを行うフォールバック処理を行います。無効にすると、フォールバック処理を行わないことでさらにサーバーの負荷を軽減することができますが、タイムラインが取得できる範囲に制限が生じます。
+         */
         "fanoutTimelineDbFallbackDescription": string;
     };
     "_accountMigration": {
+        /**
+         * 別のアカウントからこのアカウントに移行
+         */
         "moveFrom": string;
+        /**
+         * 別のアカウントへエイリアスを作成
+         */
         "moveFromSub": string;
+        /**
+         * 移行元のアカウント #{n}
+         */
         "moveFromLabel": ParameterizedString<"n">;
+        /**
+         * 別のアカウントからこのアカウントに移行したい場合、ここでエイリアスを作成しておく必要があります。
+         * 移行元のアカウントをこのように入力してください: @username@server.example.com
+         * 削除するには、入力欄を空にして保存します（非推奨）。
+         */
         "moveFromDescription": string;
+        /**
+         * このアカウントを新しいアカウントへ移行
+         */
         "moveTo": string;
+        /**
+         * 移行先のアカウント:
+         */
         "moveToLabel": string;
+        /**
+         * アカウントを移行すると、取り消すことはできません。
+         */
         "moveCannotBeUndone": string;
+        /**
+         * 新しいアカウントへ移行します。
+         * 　・フォロワーが新しいアカウントを自動でフォローします
+         * 　・このアカウントからのフォローは全て解除されます
+         * 　・このアカウントではノートの作成などができなくなります
+         *
+         * フォロワーの移行は自動ですが、フォローの移行は手動で行う必要があります。移行前にこのアカウントでフォローエクスポートし、移行後すぐに移行先アカウントでインポートを行なってください。
+         * リスト・ミュート・ブロックについても同様ですので、手動で移行する必要があります。
+         *
+         * （この説明はこのサーバー（Misskey v13.12.0以降）の仕様です。Mastodonなどの他のActivityPubソフトウェアでは挙動が異なる場合があります。）
+         */
         "moveAccountDescription": string;
+        /**
+         * アカウントの移行には、まずは移行先のアカウントでこのアカウントに対しエイリアスを作成します。
+         * エイリアス作成後、移行先のアカウントを次のように入力してください: @username@server.example.com
+         */
         "moveAccountHowTo": string;
+        /**
+         * 移行する
+         */
         "startMigration": string;
+        /**
+         * 本当にこのアカウントを {account} に移行しますか？一度移行すると取り消せず、二度とこのアカウントを元の状態で使用できなくなります。
+         */
         "migrationConfirm": ParameterizedString<"account">;
+        /**
+         *
+         * アカウントは移行されています。
+         * 移行を取り消すことはできません。
+         */
         "movedAndCannotBeUndone": string;
+        /**
+         * このアカウントからのフォロー解除は移行操作から24時間後に実行されます。
+         * このアカウントのフォロー・フォロワー数は0になっています。フォロワーの解除はされないため、あなたのフォロワーはこのアカウントのフォロワー向け投稿を引き続き閲覧できます。
+         */
         "postMigrationNote": string;
+        /**
+         * 移行先のアカウント:
+         */
         "movedTo": string;
     };
     "_achievements": {
+        /**
+         * 獲得日時
+         */
         "earnedAt": string;
         "_types": {
             "_notes1": {
+                /**
+                 * just setting up my msky
+                 */
                 "title": string;
+                /**
+                 * 初めてノートを投稿した
+                 */
                 "description": string;
+                /**
+                 * 良いMisskeyライフを！
+                 */
                 "flavor": string;
             };
             "_notes10": {
+                /**
+                 * いくつかのノート
+                 */
                 "title": string;
+                /**
+                 * ノートを10回投稿した
+                 */
                 "description": string;
             };
             "_notes100": {
+                /**
+                 * たくさんのノート
+                 */
                 "title": string;
+                /**
+                 * ノートを100回投稿した
+                 */
                 "description": string;
             };
             "_notes500": {
+                /**
+                 * ノートまみれ
+                 */
                 "title": string;
+                /**
+                 * ノートを500回投稿した
+                 */
                 "description": string;
             };
             "_notes1000": {
+                /**
+                 * ノートの山
+                 */
                 "title": string;
+                /**
+                 * ノートを1,000回投稿した
+                 */
                 "description": string;
             };
             "_notes5000": {
+                /**
+                 * 湧き出るノート
+                 */
                 "title": string;
+                /**
+                 * ノートを5,000回投稿した
+                 */
                 "description": string;
             };
             "_notes10000": {
+                /**
+                 * スーパーノート
+                 */
                 "title": string;
+                /**
+                 * ノートを10,000回投稿した
+                 */
                 "description": string;
             };
             "_notes20000": {
+                /**
+                 * ニードモアノート
+                 */
                 "title": string;
+                /**
+                 * ノートを20,000回投稿した
+                 */
                 "description": string;
             };
             "_notes30000": {
+                /**
+                 * ノートノートノート
+                 */
                 "title": string;
+                /**
+                 * ノートを30,000回投稿した
+                 */
                 "description": string;
             };
             "_notes40000": {
+                /**
+                 * ノート工場
+                 */
                 "title": string;
+                /**
+                 * ノートを40,000回投稿した
+                 */
                 "description": string;
             };
             "_notes50000": {
+                /**
+                 * ノートの惑星
+                 */
                 "title": string;
+                /**
+                 * ノートを50,000回投稿した
+                 */
                 "description": string;
             };
             "_notes60000": {
+                /**
+                 * ノートクエーサー
+                 */
                 "title": string;
+                /**
+                 * ノートを60,000回投稿した
+                 */
                 "description": string;
             };
             "_notes70000": {
+                /**
+                 * ブラックノートホール
+                 */
                 "title": string;
+                /**
+                 * ノートを70,000回投稿した
+                 */
                 "description": string;
             };
             "_notes80000": {
+                /**
+                 * ノートギャラクシー
+                 */
                 "title": string;
+                /**
+                 * ノートを80,000回投稿した
+                 */
                 "description": string;
             };
             "_notes90000": {
+                /**
+                 * ノートバース
+                 */
                 "title": string;
+                /**
+                 * ノートを90,000回投稿した
+                 */
                 "description": string;
             };
             "_notes100000": {
+                /**
+                 * ALL YOUR NOTE ARE BELONG TO US
+                 */
                 "title": string;
+                /**
+                 * ノートを100,000回投稿した
+                 */
                 "description": string;
+                /**
+                 * そんなに書くことある？
+                 */
                 "flavor": string;
             };
             "_login3": {
+                /**
+                 * ビギナーⅠ
+                 */
                 "title": string;
+                /**
+                 * 通算ログイン日数が3日
+                 */
                 "description": string;
+                /**
+                 * 今日からね僕は ミスキストってことで
+                 */
                 "flavor": string;
             };
             "_login7": {
+                /**
+                 * ビギナーⅡ
+                 */
                 "title": string;
+                /**
+                 * 通算ログイン日数が7日
+                 */
                 "description": string;
+                /**
+                 * 慣れてきましたか？
+                 */
                 "flavor": string;
             };
             "_login15": {
+                /**
+                 * ビギナーⅢ
+                 */
                 "title": string;
+                /**
+                 * 通算ログイン日数が15日
+                 */
                 "description": string;
             };
             "_login30": {
+                /**
+                 * ミスキストⅠ
+                 */
                 "title": string;
+                /**
+                 * 通算ログイン日数が30日
+                 */
                 "description": string;
             };
             "_login60": {
+                /**
+                 * ミスキストⅡ
+                 */
                 "title": string;
+                /**
+                 * 通算ログイン日数が60日
+                 */
                 "description": string;
             };
             "_login100": {
+                /**
+                 * ミスキストⅢ
+                 */
                 "title": string;
+                /**
+                 * 通算ログイン日数が100日
+                 */
                 "description": string;
+                /**
+                 * そのユーザー、ミスキストにつき
+                 */
                 "flavor": string;
             };
             "_login200": {
+                /**
+                 * 常連Ⅰ
+                 */
                 "title": string;
+                /**
+                 * 通算ログイン日数が200日
+                 */
                 "description": string;
             };
             "_login300": {
+                /**
+                 * 常連Ⅱ
+                 */
                 "title": string;
+                /**
+                 * 通算ログイン日数が300日
+                 */
                 "description": string;
             };
             "_login400": {
+                /**
+                 * 常連Ⅲ
+                 */
                 "title": string;
+                /**
+                 * 通算ログイン日数が400日
+                 */
                 "description": string;
             };
             "_login500": {
+                /**
+                 * ベテランⅠ
+                 */
                 "title": string;
+                /**
+                 * 通算ログイン日数が500日
+                 */
                 "description": string;
+                /**
+                 * 諸君、私はノートが好きだ
+                 */
                 "flavor": string;
             };
             "_login600": {
+                /**
+                 * ベテランⅡ
+                 */
                 "title": string;
+                /**
+                 * 通算ログイン日数が600日
+                 */
                 "description": string;
             };
             "_login700": {
+                /**
+                 * ベテランⅢ
+                 */
                 "title": string;
+                /**
+                 * 通算ログイン日数が700日
+                 */
                 "description": string;
             };
             "_login800": {
+                /**
+                 * ノートマスターⅠ
+                 */
                 "title": string;
+                /**
+                 * 通算ログイン日数が800日
+                 */
                 "description": string;
             };
             "_login900": {
+                /**
+                 * ノートマスターⅡ
+                 */
                 "title": string;
+                /**
+                 * 通算ログイン日数が900日
+                 */
                 "description": string;
             };
             "_login1000": {
+                /**
+                 * ノートマスターⅢ
+                 */
                 "title": string;
+                /**
+                 * 通算ログイン日数が1,000日
+                 */
                 "description": string;
+                /**
+                 * Misskeyを使ってくれてありがとう！
+                 */
                 "flavor": string;
             };
             "_noteClipped1": {
+                /**
+                 * クリップせずにはいられないな
+                 */
                 "title": string;
+                /**
+                 * 初めてノートをクリップした
+                 */
                 "description": string;
             };
             "_noteFavorited1": {
+                /**
+                 * 星をみるひと
+                 */
                 "title": string;
+                /**
+                 * 初めてノートをお気に入りに登録した
+                 */
                 "description": string;
             };
             "_myNoteFavorited1": {
+                /**
+                 * 星が欲しい
+                 */
                 "title": string;
+                /**
+                 * 自分のノートが他の人からお気に入りに登録された
+                 */
                 "description": string;
             };
             "_profileFilled": {
+                /**
+                 * 準備万端
+                 */
                 "title": string;
+                /**
+                 * プロフィール設定を行った
+                 */
                 "description": string;
             };
             "_markedAsCat": {
+                /**
+                 * 吾輩は猫である
+                 */
                 "title": string;
+                /**
+                 * アカウントをCatとして設定した
+                 */
                 "description": string;
+                /**
+                 * 名前はまだない。
+                 */
                 "flavor": string;
             };
             "_following1": {
+                /**
+                 * はじめてのフォロー
+                 */
                 "title": string;
+                /**
+                 * 初めてフォローした
+                 */
                 "description": string;
             };
             "_following10": {
+                /**
+                 * ついてく、ついてく
+                 */
                 "title": string;
+                /**
+                 * フォローが10人を超した
+                 */
                 "description": string;
             };
             "_following50": {
+                /**
+                 * 友達たくさん
+                 */
                 "title": string;
+                /**
+                 * フォローが50人を超した
+                 */
                 "description": string;
             };
             "_following100": {
+                /**
+                 * 友達100人
+                 */
                 "title": string;
+                /**
+                 * フォローが100人を超した
+                 */
                 "description": string;
             };
             "_following300": {
+                /**
+                 * 友達過多
+                 */
                 "title": string;
+                /**
+                 * フォローが300人を超した
+                 */
                 "description": string;
             };
             "_followers1": {
+                /**
+                 * はじめてのフォロワー
+                 */
                 "title": string;
+                /**
+                 * 初めてフォローされた
+                 */
                 "description": string;
             };
             "_followers10": {
+                /**
+                 * フォローミー！
+                 */
                 "title": string;
+                /**
+                 * フォロワーが10人を超した
+                 */
                 "description": string;
             };
             "_followers50": {
+                /**
+                 * ぞろぞろ
+                 */
                 "title": string;
+                /**
+                 * フォロワーが50人を超した
+                 */
                 "description": string;
             };
             "_followers100": {
+                /**
+                 * 人気者
+                 */
                 "title": string;
+                /**
+                 * フォロワーが100人を超した
+                 */
                 "description": string;
             };
             "_followers300": {
+                /**
+                 * 一列でお並びください
+                 */
                 "title": string;
+                /**
+                 * フォロワーが300人を超した
+                 */
                 "description": string;
             };
             "_followers500": {
+                /**
+                 * 基地局
+                 */
                 "title": string;
+                /**
+                 * フォロワーが500人を超した
+                 */
                 "description": string;
             };
             "_followers1000": {
+                /**
+                 * インフルエンサー
+                 */
                 "title": string;
+                /**
+                 * フォロワーが1,000人を超した
+                 */
                 "description": string;
             };
             "_collectAchievements30": {
+                /**
+                 * 実績コレクター
+                 */
                 "title": string;
+                /**
+                 * 実績を30個以上獲得した
+                 */
                 "description": string;
             };
             "_viewAchievements3min": {
+                /**
+                 * 実績好き
+                 */
                 "title": string;
+                /**
+                 * 実績一覧を3分以上眺め続けた
+                 */
                 "description": string;
             };
             "_iLoveMisskey": {
+                /**
+                 * I Love Misskey
+                 */
                 "title": string;
+                /**
+                 * "I ❤ #Misskey"を投稿した
+                 */
                 "description": string;
+                /**
+                 * Misskeyを使ってくださりありがとうございます！ by 開発チーム
+                 */
                 "flavor": string;
             };
             "_foundTreasure": {
+                /**
+                 * 宝探し
+                 */
                 "title": string;
+                /**
+                 * 隠されたお宝を発見した
+                 */
                 "description": string;
             };
             "_client30min": {
+                /**
+                 * ひとやすみ
+                 */
                 "title": string;
+                /**
+                 * クライアントを起動してから30分以上経過した
+                 */
                 "description": string;
             };
             "_client60min": {
+                /**
+                 * Misskeyの見すぎ
+                 */
                 "title": string;
+                /**
+                 * クライアントを起動してから60分以上経過した
+                 */
                 "description": string;
             };
             "_noteDeletedWithin1min": {
+                /**
+                 * いまのなし
+                 */
                 "title": string;
+                /**
+                 * 投稿してから1分以内にその投稿を削除した
+                 */
                 "description": string;
             };
             "_postedAtLateNight": {
+                /**
+                 * 夜行性
+                 */
                 "title": string;
+                /**
+                 * 深夜にノートを投稿した
+                 */
                 "description": string;
+                /**
+                 * そろそろ寝よう。
+                 */
                 "flavor": string;
             };
             "_postedAt0min0sec": {
+                /**
+                 * 時報
+                 */
                 "title": string;
+                /**
+                 * 0分0秒にノートを投稿した
+                 */
                 "description": string;
+                /**
+                 * ポッ ポッ ポッ ピーン
+                 */
                 "flavor": string;
             };
             "_selfQuote": {
+                /**
+                 * 自己言及
+                 */
                 "title": string;
+                /**
+                 * 自分のノートを引用した
+                 */
                 "description": string;
             };
             "_htl20npm": {
+                /**
+                 * 流れるTL
+                 */
                 "title": string;
+                /**
+                 * ホームタイムラインの流速が20npmを越す
+                 */
                 "description": string;
             };
             "_viewInstanceChart": {
+                /**
+                 * アナリスト
+                 */
                 "title": string;
+                /**
+                 * サーバーのチャートを表示した
+                 */
                 "description": string;
             };
             "_outputHelloWorldOnScratchpad": {
+                /**
+                 * Hello, world!
+                 */
                 "title": string;
+                /**
+                 * スクラッチパッドで hello world を出力した
+                 */
                 "description": string;
             };
             "_open3windows": {
+                /**
+                 * マルチウィンドウ
+                 */
                 "title": string;
+                /**
+                 * ウィンドウを3つ以上開いた状態にした
+                 */
                 "description": string;
             };
             "_driveFolderCircularReference": {
+                /**
+                 * 循環参照
+                 */
                 "title": string;
+                /**
+                 * ドライブのフォルダを再帰的な入れ子にしようとした
+                 */
                 "description": string;
             };
             "_reactWithoutRead": {
+                /**
+                 * ちゃんと読んだ？
+                 */
                 "title": string;
+                /**
+                 * 100文字以上のテキストを含むノートに投稿されてから3秒以内にリアクションした
+                 */
                 "description": string;
             };
             "_clickedClickHere": {
+                /**
+                 * ここをクリック
+                 */
                 "title": string;
+                /**
+                 * ここをクリックした
+                 */
                 "description": string;
             };
             "_justPlainLucky": {
+                /**
+                 * 単なるラッキー
+                 */
                 "title": string;
+                /**
+                 * 10秒ごとに0.005%の確率で獲得
+                 */
                 "description": string;
             };
             "_setNameToSyuilo": {
+                /**
+                 * 神様コンプレックス
+                 */
                 "title": string;
+                /**
+                 * 名前を syuilo に設定した
+                 */
                 "description": string;
             };
             "_passedSinceAccountCreated1": {
+                /**
+                 * 一周年
+                 */
                 "title": string;
+                /**
+                 * アカウント作成から1年経過した
+                 */
                 "description": string;
             };
             "_passedSinceAccountCreated2": {
+                /**
+                 * 二周年
+                 */
                 "title": string;
+                /**
+                 * アカウント作成から2年経過した
+                 */
                 "description": string;
             };
             "_passedSinceAccountCreated3": {
+                /**
+                 * 三周年
+                 */
                 "title": string;
+                /**
+                 * アカウント作成から3年経過した
+                 */
                 "description": string;
             };
             "_loggedInOnBirthday": {
+                /**
+                 * ハッピーバースデー
+                 */
                 "title": string;
+                /**
+                 * 誕生日にログインした
+                 */
                 "description": string;
             };
             "_loggedInOnNewYearsDay": {
+                /**
+                 * あけましておめでとうございます
+                 */
                 "title": string;
+                /**
+                 * 元日にログインした
+                 */
                 "description": string;
+                /**
+                 * 今年も弊サーバーをよろしくお願いします
+                 */
                 "flavor": string;
             };
             "_cookieClicked": {
+                /**
+                 * クッキーをクリックするゲーム
+                 */
                 "title": string;
+                /**
+                 * クッキーをクリックした
+                 */
                 "description": string;
+                /**
+                 * ソフト間違ってない？
+                 */
                 "flavor": string;
             };
             "_brainDiver": {
+                /**
+                 * Brain Diver
+                 */
                 "title": string;
+                /**
+                 * Brain Diverへのリンクを投稿した
+                 */
                 "description": string;
+                /**
+                 * Misskey-Misskey La-Tu-Ma
+                 */
                 "flavor": string;
             };
             "_smashTestNotificationButton": {
+                /**
+                 * テスト過剰
+                 */
                 "title": string;
+                /**
+                 * 通知のテストをごく短時間のうちに連続して行った
+                 */
                 "description": string;
             };
             "_tutorialCompleted": {
+                /**
+                 * Misskey初心者講座 修了証
+                 */
                 "title": string;
+                /**
+                 * チュートリアルを完了した
+                 */
                 "description": string;
             };
             "_bubbleGameExplodingHead": {
+                /**
+                 * 🤯
+                 */
                 "title": string;
+                /**
+                 * バブルゲームで最も大きいモノを出した
+                 */
                 "description": string;
             };
             "_bubbleGameDoubleExplodingHead": {
+                /**
+                 * ダブル🤯
+                 */
                 "title": string;
+                /**
+                 * バブルゲームで最も大きいモノを2つ同時に出した
+                 */
                 "description": string;
+                /**
+                 * これくらいの　おべんとばこに　🤯　🤯　ちょっとつめて
+                 */
                 "flavor": string;
             };
         };
     };
     "_role": {
+        /**
+         * ロールの作成
+         */
         "new": string;
+        /**
+         * ロールの編集
+         */
         "edit": string;
+        /**
+         * ロール名
+         */
         "name": string;
+        /**
+         * ロールの説明
+         */
         "description": string;
+        /**
+         * ロールの権限
+         */
         "permission": string;
+        /**
+         * <b>モデレーター</b>は基本的なモデレーションに関する操作を行えます。
+         * <b>管理者</b>はサーバーの全ての設定を変更できます。
+         */
         "descriptionOfPermission": string;
+        /**
+         * アサイン
+         */
         "assignTarget": string;
+        /**
+         * <b>マニュアル</b>は誰がこのロールに含まれるかを手動で管理します。
+         * <b>コンディショナル</b>は条件を設定し、それに合致するユーザーが自動で含まれるようになります。
+         */
         "descriptionOfAssignTarget": string;
+        /**
+         * マニュアル
+         */
         "manual": string;
+        /**
+         * マニュアルロール
+         */
         "manualRoles": string;
+        /**
+         * コンディショナル
+         */
         "conditional": string;
+        /**
+         * コンディショナルロール
+         */
         "conditionalRoles": string;
+        /**
+         * 条件
+         */
         "condition": string;
+        /**
+         * これはコンディショナルロールです。
+         */
         "isConditionalRole": string;
+        /**
+         * 公開ロール
+         */
         "isPublic": string;
+        /**
+         * ユーザーのプロフィールでこのロールが表示されます。
+         */
         "descriptionOfIsPublic": string;
+        /**
+         * オプション
+         */
         "options": string;
+        /**
+         * ポリシー
+         */
         "policies": string;
+        /**
+         * ベースロール
+         */
         "baseRole": string;
+        /**
+         * ベースロールの値を使用
+         */
         "useBaseValue": string;
+        /**
+         * アサインするロールを選択
+         */
         "chooseRoleToAssign": string;
+        /**
+         * アイコン画像のURL
+         */
         "iconUrl": string;
+        /**
+         * バッジとして表示
+         */
         "asBadge": string;
+        /**
+         * オンにすると、ユーザー名の横にロールのアイコンが表示されます。
+         */
         "descriptionOfAsBadge": string;
+        /**
+         * ユーザーを見つけやすくする
+         */
         "isExplorable": string;
+        /**
+         * オンにすると、「みつける」でメンバー一覧が公開されるほか、ロールのタイムラインが利用可能になります。
+         */
         "descriptionOfIsExplorable": string;
+        /**
+         * 表示順
+         */
         "displayOrder": string;
+        /**
+         * 数値が大きいほどUI上で先頭に表示されます。
+         */
         "descriptionOfDisplayOrder": string;
+        /**
+         * モデレーターのメンバー編集を許可
+         */
         "canEditMembersByModerator": string;
+        /**
+         * オンにすると、管理者に加えてモデレーターもこのロールへユーザーをアサイン/アサイン解除できるようになります。オフにすると管理者のみが行えます。
+         */
         "descriptionOfCanEditMembersByModerator": string;
+        /**
+         * 優先度
+         */
         "priority": string;
         "_priority": {
+            /**
+             * 低
+             */
             "low": string;
+            /**
+             * 中
+             */
             "middle": string;
+            /**
+             * 高
+             */
             "high": string;
         };
         "_options": {
+            /**
+             * グローバルタイムラインの閲覧
+             */
             "gtlAvailable": string;
+            /**
+             * ローカルタイムラインの閲覧
+             */
             "ltlAvailable": string;
+            /**
+             * パブリック投稿の許可
+             */
             "canPublicNote": string;
+            /**
+             * サーバー招待コードの発行
+             */
             "canInvite": string;
+            /**
+             * 招待コードの作成可能数
+             */
             "inviteLimit": string;
+            /**
+             * 招待コードの発行間隔
+             */
             "inviteLimitCycle": string;
+            /**
+             * 招待コードの有効期限
+             */
             "inviteExpirationTime": string;
+            /**
+             * カスタム絵文字の管理
+             */
             "canManageCustomEmojis": string;
+            /**
+             * アバターデコレーションの管理
+             */
             "canManageAvatarDecorations": string;
+            /**
+             * ドライブ容量
+             */
             "driveCapacity": string;
+            /**
+             * ファイルにNSFWを常に付与
+             */
             "alwaysMarkNsfw": string;
+            /**
+             * ノートのピン留めの最大数
+             */
             "pinMax": string;
+            /**
+             * アンテナの作成可能数
+             */
             "antennaMax": string;
+            /**
+             * ワードミュートの最大文字数
+             */
             "wordMuteMax": string;
+            /**
+             * Webhookの作成可能数
+             */
             "webhookMax": string;
+            /**
+             * クリップの作成可能数
+             */
             "clipMax": string;
+            /**
+             * クリップ内のノートの最大数
+             */
             "noteEachClipsMax": string;
+            /**
+             * ユーザーリストの作成可能数
+             */
             "userListMax": string;
+            /**
+             * ユーザーリスト内のユーザーの最大数
+             */
             "userEachUserListsMax": string;
+            /**
+             * レートリミット
+             */
             "rateLimitFactor": string;
+            /**
+             * 小さいほど制限が緩和され、大きいほど制限が強化されます。
+             */
             "descriptionOfRateLimitFactor": string;
+            /**
+             * 広告の非表示
+             */
             "canHideAds": string;
+            /**
+             * ノート検索の利用
+             */
             "canSearchNotes": string;
+            /**
+             * 翻訳機能の利用
+             */
             "canUseTranslator": string;
+            /**
+             * アイコンデコレーションの最大取付個数
+             */
             "avatarDecorationLimit": string;
         };
         "_condition": {
+            /**
+             * ローカルユーザー
+             */
             "isLocal": string;
+            /**
+             * リモートユーザー
+             */
             "isRemote": string;
+            /**
+             * アカウント作成から～以内
+             */
             "createdLessThan": string;
+            /**
+             * アカウント作成から～経過
+             */
             "createdMoreThan": string;
+            /**
+             * フォロワー数が～以下
+             */
             "followersLessThanOrEq": string;
+            /**
+             * フォロワー数が～以上
+             */
             "followersMoreThanOrEq": string;
+            /**
+             * フォロー数が～以下
+             */
             "followingLessThanOrEq": string;
+            /**
+             * フォロー数が～以上
+             */
             "followingMoreThanOrEq": string;
+            /**
+             * 投稿数が～以下
+             */
             "notesLessThanOrEq": string;
+            /**
+             * 投稿数が～以上
+             */
             "notesMoreThanOrEq": string;
+            /**
+             * ～かつ～
+             */
             "and": string;
+            /**
+             * ～または～
+             */
             "or": string;
+            /**
+             * ～ではない
+             */
             "not": string;
         };
     };
     "_sensitiveMediaDetection": {
+        /**
+         * 機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。
+         */
         "description": string;
+        /**
+         * 検出感度
+         */
         "sensitivity": string;
+        /**
+         * 感度を低くすると、誤検知(偽陽性)が減ります。感度を高くすると、検知漏れ(偽陰性)が減ります。
+         */
         "sensitivityDescription": string;
+        /**
+         * センシティブフラグを設定する
+         */
         "setSensitiveFlagAutomatically": string;
+        /**
+         * この設定をオフにしても内部的に判定結果は保持されます。
+         */
         "setSensitiveFlagAutomaticallyDescription": string;
+        /**
+         * 動画の解析を有効化
+         */
         "analyzeVideos": string;
+        /**
+         * 静止画に加えて動画も解析するようにします。サーバーの負荷が少し増えます。
+         */
         "analyzeVideosDescription": string;
     };
     "_emailUnavailable": {
+        /**
+         * 既に使用されています
+         */
         "used": string;
+        /**
+         * 形式が正しくありません
+         */
         "format": string;
+        /**
+         * 恒久的に使用可能なアドレスではありません
+         */
         "disposable": string;
+        /**
+         * 正しいメールサーバーではありません
+         */
         "mx": string;
+        /**
+         * メールサーバーが応答しません
+         */
         "smtp": string;
+        /**
+         * このメールアドレスでは登録できません
+         */
         "banned": string;
     };
     "_ffVisibility": {
+        /**
+         * 公開
+         */
         "public": string;
+        /**
+         * フォロワーだけに公開
+         */
         "followers": string;
+        /**
+         * 非公開
+         */
         "private": string;
     };
     "_signup": {
+        /**
+         * ほとんど完了です
+         */
         "almostThere": string;
+        /**
+         * あなたが使っているメールアドレスを入力してください。メールアドレスが公開されることはありません。
+         */
         "emailAddressInfo": string;
+        /**
+         * 入力されたメールアドレス({email})宛に確認のメールが送信されました。メールに記載されたリンクにアクセスすると、アカウントの作成が完了します。メールに記載されているリンクの有効期限は30分です。
+         */
         "emailSent": ParameterizedString<"email">;
     };
     "_accountDelete": {
+        /**
+         * アカウントの削除
+         */
         "accountDelete": string;
+        /**
+         * アカウントの削除は負荷のかかる処理であるため、作成したコンテンツの数やアップロードしたファイルの数が多いと完了までに時間がかかることがあります。
+         */
         "mayTakeTime": string;
+        /**
+         * アカウントの削除が完了する際は、登録してあったメールアドレス宛に通知を送信します。
+         */
         "sendEmail": string;
+        /**
+         * アカウント削除をリクエスト
+         */
         "requestAccountDelete": string;
+        /**
+         * 削除処理が開始されました。
+         */
         "started": string;
+        /**
+         * 削除が進行中
+         */
         "inProgress": string;
     };
     "_ad": {
+        /**
+         * 戻る
+         */
         "back": string;
+        /**
+         * この広告の表示頻度を下げる
+         */
         "reduceFrequencyOfThisAd": string;
+        /**
+         * 表示しない
+         */
         "hide": string;
+        /**
+         * 曜日はサーバーのタイムゾーンを元に指定されます。
+         */
         "timezoneinfo": string;
+        /**
+         * 広告配信設定
+         */
         "adsSettings": string;
+        /**
+         * リアルタイム更新中に広告を配信する間隔（ノートの個数）
+         */
         "notesPerOneAd": string;
+        /**
+         * 0でリアルタイム更新時の広告配信を無効
+         */
         "setZeroToDisable": string;
+        /**
+         * 広告の配信間隔が極めて短いため、ユーザー体験が著しく損われる可能性があります。
+         */
         "adsTooClose": string;
     };
     "_forgotPassword": {
+        /**
+         * アカウントに登録したメールアドレスを入力してください。そのアドレス宛てに、パスワードリセット用のリンクが送信されます。
+         */
         "enterEmail": string;
+        /**
+         * メールアドレスを登録していない場合は、管理者までお問い合わせください。
+         */
         "ifNoEmail": string;
+        /**
+         * このサーバーではメールがサポートされていないため、パスワードリセットを行う場合は管理者までお問い合わせください。
+         */
         "contactAdmin": string;
     };
     "_gallery": {
+        /**
+         * 自分の投稿
+         */
         "my": string;
+        /**
+         * いいねした投稿
+         */
         "liked": string;
+        /**
+         * いいね！
+         */
         "like": string;
+        /**
+         * いいね解除
+         */
         "unlike": string;
     };
     "_email": {
         "_follow": {
+            /**
+             * フォローされました
+             */
             "title": string;
         };
         "_receiveFollowRequest": {
+            /**
+             * フォローリクエストを受け取りました
+             */
             "title": string;
         };
     };
     "_plugin": {
+        /**
+         * プラグインのインストール
+         */
         "install": string;
+        /**
+         * 信頼できないプラグインはインストールしないでください。
+         */
         "installWarn": string;
+        /**
+         * プラグインの管理
+         */
         "manage": string;
+        /**
+         * ソースを表示
+         */
         "viewSource": string;
     };
     "_preferencesBackups": {
+        /**
+         * 作成したバックアップ
+         */
         "list": string;
+        /**
+         * 新規保存
+         */
         "saveNew": string;
+        /**
+         * ファイルを読み込み
+         */
         "loadFile": string;
+        /**
+         * このデバイスに適用
+         */
         "apply": string;
+        /**
+         * 上書き保存
+         */
         "save": string;
+        /**
+         * バックアップ名を入力
+         */
         "inputName": string;
+        /**
+         * 保存できません
+         */
         "cannotSave": string;
+        /**
+         * バックアップ名「{name}」は既に存在します。違う名前を指定してください。
+         */
         "nameAlreadyExists": ParameterizedString<"name">;
+        /**
+         * バックアップ「{name}」を現在のデバイスに適用しますか？現在のデバイス設定は失われます。
+         */
         "applyConfirm": ParameterizedString<"name">;
+        /**
+         * {name}に上書き保存しますか？
+         */
         "saveConfirm": ParameterizedString<"name">;
+        /**
+         * {name}を削除しますか？
+         */
         "deleteConfirm": ParameterizedString<"name">;
+        /**
+         * 「{old}」を「{new}」に変更しますか？
+         */
         "renameConfirm": ParameterizedString<"old" | "new">;
+        /**
+         * バックアップはありません。「新規保存」で現在のクライアント設定をサーバーに保存できます。
+         */
         "noBackups": string;
+        /**
+         * 作成日時: {date} {time}
+         */
         "createdAt": ParameterizedString<"date" | "time">;
+        /**
+         * 更新日時: {date} {time}
+         */
         "updatedAt": ParameterizedString<"date" | "time">;
+        /**
+         * 読み込みできません
+         */
         "cannotLoad": string;
+        /**
+         * ファイル形式が違います。
+         */
         "invalidFile": string;
     };
     "_registry": {
+        /**
+         * スコープ
+         */
         "scope": string;
+        /**
+         * キー
+         */
         "key": string;
+        /**
+         * キー
+         */
         "keys": string;
+        /**
+         * ドメイン
+         */
         "domain": string;
+        /**
+         * キーを作成
+         */
         "createKey": string;
     };
     "_aboutMisskey": {
+        /**
+         * Misskeyはsyuiloによって2014年から開発されている、オープンソースのソフトウェアです。
+         */
         "about": string;
+        /**
+         * コントリビューター
+         */
         "contributors": string;
+        /**
+         * 全てのコントリビューター
+         */
         "allContributors": string;
+        /**
+         * ソースコード
+         */
         "source": string;
+        /**
+         * Misskeyを翻訳
+         */
         "translation": string;
+        /**
+         * Misskeyに寄付
+         */
         "donate": string;
+        /**
+         * 他にも多くの方が支援してくれています。ありがとうございます🥰
+         */
         "morePatrons": string;
+        /**
+         * 支援者
+         */
         "patrons": string;
+        /**
+         * プロジェクトメンバー
+         */
         "projectMembers": string;
     };
     "_displayOfSensitiveMedia": {
+        /**
+         * センシティブ設定されたメディアを隠す
+         */
         "respect": string;
+        /**
+         * センシティブ設定されたメディアを隠さない
+         */
         "ignore": string;
+        /**
+         * 常にメディアを隠す
+         */
         "force": string;
     };
     "_instanceTicker": {
+        /**
+         * 表示しない
+         */
         "none": string;
+        /**
+         * リモートユーザーに表示
+         */
         "remote": string;
+        /**
+         * 常に表示
+         */
         "always": string;
     };
     "_serverDisconnectedBehavior": {
+        /**
+         * 自動でリロード
+         */
         "reload": string;
+        /**
+         * ダイアログで警告
+         */
         "dialog": string;
+        /**
+         * 控えめに警告
+         */
         "quiet": string;
     };
     "_channel": {
+        /**
+         * チャンネルを作成
+         */
         "create": string;
+        /**
+         * チャンネルを編集
+         */
         "edit": string;
+        /**
+         * バナーを設定
+         */
         "setBanner": string;
+        /**
+         * バナーを削除
+         */
         "removeBanner": string;
+        /**
+         * トレンド
+         */
         "featured": string;
+        /**
+         * 管理中
+         */
         "owned": string;
+        /**
+         * フォロー中
+         */
         "following": string;
+        /**
+         * {n}人が参加中
+         */
         "usersCount": ParameterizedString<"n">;
+        /**
+         * {n}投稿があります
+         */
         "notesCount": ParameterizedString<"n">;
+        /**
+         * 名前と説明
+         */
         "nameAndDescription": string;
+        /**
+         * 名前のみ
+         */
         "nameOnly": string;
+        /**
+         * チャンネル外へのリノートと引用リノートを許可する
+         */
         "allowRenoteToExternal": string;
     };
     "_menuDisplay": {
+        /**
+         * 横
+         */
         "sideFull": string;
+        /**
+         * 横(アイコン)
+         */
         "sideIcon": string;
+        /**
+         * 上部
+         */
         "top": string;
+        /**
+         * 隠す
+         */
         "hide": string;
     };
     "_wordMute": {
+        /**
+         * ミュートするワード
+         */
         "muteWords": string;
+        /**
+         * スペースで区切るとAND指定になり、改行で区切るとOR指定になります。
+         */
         "muteWordsDescription": string;
+        /**
+         * キーワードをスラッシュで囲むと正規表現になります。
+         */
         "muteWordsDescription2": string;
     };
     "_instanceMute": {
+        /**
+         * ミュートしたサーバーのユーザーへの返信を含めて、設定したサーバーの全てのノートとRenoteをミュートします。
+         */
         "instanceMuteDescription": string;
+        /**
+         * 改行で区切って設定します
+         */
         "instanceMuteDescription2": string;
+        /**
+         * 設定したサーバーのノートを隠します。
+         */
         "title": string;
+        /**
+         * ミュートするサーバー
+         */
         "heading": string;
     };
     "_theme": {
+        /**
+         * テーマを探す
+         */
         "explore": string;
+        /**
+         * テーマのインストール
+         */
         "install": string;
+        /**
+         * テーマの管理
+         */
         "manage": string;
+        /**
+         * テーマコード
+         */
         "code": string;
+        /**
+         * 説明
+         */
         "description": string;
+        /**
+         * {name}をインストールしました
+         */
         "installed": ParameterizedString<"name">;
+        /**
+         * インストールされたテーマ
+         */
         "installedThemes": string;
+        /**
+         * 標準のテーマ
+         */
         "builtinThemes": string;
+        /**
+         * そのテーマは既にインストールされています
+         */
         "alreadyInstalled": string;
+        /**
+         * テーマの形式が間違っています
+         */
         "invalid": string;
+        /**
+         * テーマを作る
+         */
         "make": string;
+        /**
+         * ベース
+         */
         "base": string;
+        /**
+         * 定数を追加
+         */
         "addConstant": string;
+        /**
+         * 定数
+         */
         "constant": string;
+        /**
+         * デフォルト値
+         */
         "defaultValue": string;
+        /**
+         * 色
+         */
         "color": string;
+        /**
+         * プロパティを参照
+         */
         "refProp": string;
+        /**
+         * 定数を参照
+         */
         "refConst": string;
+        /**
+         * キー
+         */
         "key": string;
+        /**
+         * 関数
+         */
         "func": string;
+        /**
+         * 関数の種類
+         */
         "funcKind": string;
+        /**
+         * 引数
+         */
         "argument": string;
+        /**
+         * 元にするプロパティの名前
+         */
         "basedProp": string;
+        /**
+         * 不透明度
+         */
         "alpha": string;
+        /**
+         * 暗さ
+         */
         "darken": string;
+        /**
+         * 明るさ
+         */
         "lighten": string;
+        /**
+         * 定数名を入力してください
+         */
         "inputConstantName": string;
+        /**
+         * ここにテーマコードを貼り付けて、エディターにインポートできます
+         */
         "importInfo": string;
+        /**
+         * 定数 {const} を削除しても良いですか？
+         */
         "deleteConstantConfirm": ParameterizedString<"const">;
         "keys": {
+            /**
+             * アクセント
+             */
             "accent": string;
+            /**
+             * 背景
+             */
             "bg": string;
+            /**
+             * 文字
+             */
             "fg": string;
+            /**
+             * フォーカス
+             */
             "focus": string;
+            /**
+             * インジケーター
+             */
             "indicator": string;
+            /**
+             * パネル
+             */
             "panel": string;
+            /**
+             * 影
+             */
             "shadow": string;
+            /**
+             * ヘッダー
+             */
             "header": string;
+            /**
+             * サイドバーの背景
+             */
             "navBg": string;
+            /**
+             * サイドバーの文字
+             */
             "navFg": string;
+            /**
+             * サイドバー文字(ホバー)
+             */
             "navHoverFg": string;
+            /**
+             * サイドバー文字(アクティブ)
+             */
             "navActive": string;
+            /**
+             * サイドバーのインジケーター
+             */
             "navIndicator": string;
+            /**
+             * リンク
+             */
             "link": string;
+            /**
+             * ハッシュタグ
+             */
             "hashtag": string;
+            /**
+             * メンション
+             */
             "mention": string;
+            /**
+             * あなた宛てメンション
+             */
             "mentionMe": string;
+            /**
+             * Renote
+             */
             "renote": string;
+            /**
+             * モーダルの背景
+             */
             "modalBg": string;
+            /**
+             * 分割線
+             */
             "divider": string;
+            /**
+             * スクロールバーの取っ手
+             */
             "scrollbarHandle": string;
+            /**
+             * スクロールバーの取っ手（ホバー)
+             */
             "scrollbarHandleHover": string;
+            /**
+             * 日付ラベルの文字
+             */
             "dateLabelFg": string;
+            /**
+             * 情報の背景
+             */
             "infoBg": string;
+            /**
+             * 情報の文字
+             */
             "infoFg": string;
+            /**
+             * 警告の背景
+             */
             "infoWarnBg": string;
+            /**
+             * 警告の文字
+             */
             "infoWarnFg": string;
+            /**
+             * 通知トーストの背景
+             */
             "toastBg": string;
+            /**
+             * 通知トーストの文字
+             */
             "toastFg": string;
+            /**
+             * ボタンの背景
+             */
             "buttonBg": string;
+            /**
+             * ボタンの背景 (ホバー)
+             */
             "buttonHoverBg": string;
+            /**
+             * 入力ボックスの縁取り
+             */
             "inputBorder": string;
+            /**
+             * リスト項目の背景 (ホバー)
+             */
             "listItemHoverBg": string;
+            /**
+             * ドライブフォルダーの背景
+             */
             "driveFolderBg": string;
+            /**
+             * 壁紙のオーバーレイ
+             */
             "wallpaperOverlay": string;
+            /**
+             * バッジ
+             */
             "badge": string;
+            /**
+             * チャットの背景
+             */
             "messageBg": string;
+            /**
+             * アクセント (暗め)
+             */
             "accentDarken": string;
+            /**
+             * アクセント (明るめ)
+             */
             "accentLighten": string;
+            /**
+             * 強調された文字
+             */
             "fgHighlighted": string;
         };
     };
     "_sfx": {
+        /**
+         * ノート
+         */
         "note": string;
+        /**
+         * ノート(自分)
+         */
         "noteMy": string;
+        /**
+         * 通知
+         */
         "notification": string;
+        /**
+         * アンテナ受信
+         */
         "antenna": string;
+        /**
+         * チャンネル通知
+         */
         "channel": string;
+        /**
+         * リアクション選択時
+         */
         "reaction": string;
     };
     "_soundSettings": {
+        /**
+         * ドライブの音声を使用
+         */
         "driveFile": string;
+        /**
+         * ドライブのファイルを選択してください
+         */
         "driveFileWarn": string;
+        /**
+         * このファイルは対応していません
+         */
         "driveFileTypeWarn": string;
+        /**
+         * 音声ファイルを選択してください
+         */
         "driveFileTypeWarnDescription": string;
+        /**
+         * 音声が長すぎます
+         */
         "driveFileDurationWarn": string;
+        /**
+         * 長い音声を使用するとMisskeyの使用に支障をきたす可能性があります。それでも続行しますか？
+         */
         "driveFileDurationWarnDescription": string;
     };
     "_ago": {
+        /**
+         * 未来
+         */
         "future": string;
+        /**
+         * たった今
+         */
         "justNow": string;
+        /**
+         * {n}秒前
+         */
         "secondsAgo": ParameterizedString<"n">;
+        /**
+         * {n}分前
+         */
         "minutesAgo": ParameterizedString<"n">;
+        /**
+         * {n}時間前
+         */
         "hoursAgo": ParameterizedString<"n">;
+        /**
+         * {n}日前
+         */
         "daysAgo": ParameterizedString<"n">;
+        /**
+         * {n}週間前
+         */
         "weeksAgo": ParameterizedString<"n">;
+        /**
+         * {n}ヶ月前
+         */
         "monthsAgo": ParameterizedString<"n">;
+        /**
+         * {n}年前
+         */
         "yearsAgo": ParameterizedString<"n">;
+        /**
+         * 日時の解析に失敗
+         */
         "invalid": string;
     };
     "_timeIn": {
+        /**
+         * {n}秒後
+         */
         "seconds": ParameterizedString<"n">;
+        /**
+         * {n}分後
+         */
         "minutes": ParameterizedString<"n">;
+        /**
+         * {n}時間後
+         */
         "hours": ParameterizedString<"n">;
+        /**
+         * {n}日後
+         */
         "days": ParameterizedString<"n">;
+        /**
+         * {n}週間後
+         */
         "weeks": ParameterizedString<"n">;
+        /**
+         * {n}ヶ月後
+         */
         "months": ParameterizedString<"n">;
+        /**
+         * {n}年後
+         */
         "years": ParameterizedString<"n">;
     };
     "_time": {
+        /**
+         * 秒
+         */
         "second": string;
+        /**
+         * 分
+         */
         "minute": string;
+        /**
+         * 時間
+         */
         "hour": string;
+        /**
+         * 日
+         */
         "day": string;
     };
     "_2fa": {
+        /**
+         * 既に設定は完了しています。
+         */
         "alreadyRegistered": string;
+        /**
+         * 認証アプリの設定を開始
+         */
         "registerTOTP": string;
+        /**
+         * まず、{a}や{b}などの認証アプリをお使いのデバイスにインストールします。
+         */
         "step1": ParameterizedString<"a" | "b">;
+        /**
+         * 次に、表示されているQRコードをアプリでスキャンします。
+         */
         "step2": string;
+        /**
+         * QRコードをクリックすると、お使いの端末にインストールされている認証アプリやキーリングに登録できます。
+         */
         "step2Click": string;
+        /**
+         * デスクトップアプリを使用する場合は次のURIを入力します
+         */
         "step2Uri": string;
+        /**
+         * 確認コードを入力
+         */
         "step3Title": string;
+        /**
+         * アプリに表示されている確認コード（トークン）を入力します。
+         */
         "step3": string;
+        /**
+         * 設定が完了しました
+         */
         "setupCompleted": string;
+        /**
+         * これからログインするときも、同じようにコードを入力します。
+         */
         "step4": string;
+        /**
+         * お使いのブラウザはセキュリティキーに対応していません。
+         */
         "securityKeyNotSupported": string;
+        /**
+         * セキュリティキー・パスキーを登録するには、まず認証アプリの設定を行なってください。
+         */
         "registerTOTPBeforeKey": string;
+        /**
+         * FIDO2をサポートするハードウェアセキュリティキー、端末の生体認証やPINロック、パスキーといった、WebAuthn由来の鍵を登録します。
+         */
         "securityKeyInfo": string;
+        /**
+         * セキュリティキー・パスキーを登録する
+         */
         "registerSecurityKey": string;
+        /**
+         * キーの名前を入力
+         */
         "securityKeyName": string;
+        /**
+         * ブラウザの指示に従い、セキュリティキーやパスキーを登録してください
+         */
         "tapSecurityKey": string;
+        /**
+         * セキュリティキーを削除
+         */
         "removeKey": string;
+        /**
+         * {name}を削除しますか？
+         */
         "removeKeyConfirm": ParameterizedString<"name">;
+        /**
+         * セキュリティキーが登録されている場合、認証アプリの設定は解除できません。
+         */
         "whyTOTPOnlyRenew": string;
+        /**
+         * 認証アプリを再設定
+         */
         "renewTOTP": string;
+        /**
+         * 今までの認証アプリの確認コードおよびバックアップコードは使用できなくなります
+         */
         "renewTOTPConfirm": string;
+        /**
+         * 再設定する
+         */
         "renewTOTPOk": string;
+        /**
+         * やめておく
+         */
         "renewTOTPCancel": string;
+        /**
+         * このウィザードを閉じる前に、以下のバックアップコードを確認してください。
+         */
         "checkBackupCodesBeforeCloseThisWizard": string;
+        /**
+         * バックアップコード
+         */
         "backupCodes": string;
+        /**
+         * 認証アプリが使用できなくなった場合、以下のバックアップコードを使ってアカウントにアクセスできます。これらのコードは必ず安全な場所に保管してください。各コードは一回だけ使用できます。
+         */
         "backupCodesDescription": string;
+        /**
+         * バックアップコードが使用されました。認証アプリが使えなくなっている場合、なるべく早く認証アプリを再設定してください。
+         */
         "backupCodeUsedWarning": string;
+        /**
+         * バックアップコードが全て使用されました。認証アプリを利用できない場合、これ以上アカウントにアクセスできなくなります。認証アプリを再登録してください。
+         */
         "backupCodesExhaustedWarning": string;
     };
     "_permissions": {
+        /**
+         * アカウントの情報を見る
+         */
         "read:account": string;
+        /**
+         * アカウントの情報を変更する
+         */
         "write:account": string;
+        /**
+         * ブロックを見る
+         */
         "read:blocks": string;
+        /**
+         * ブロックを操作する
+         */
         "write:blocks": string;
+        /**
+         * ドライブを見る
+         */
         "read:drive": string;
+        /**
+         * ドライブを操作する
+         */
         "write:drive": string;
+        /**
+         * お気に入りを見る
+         */
         "read:favorites": string;
+        /**
+         * お気に入りを操作する
+         */
         "write:favorites": string;
+        /**
+         * フォローの情報を見る
+         */
         "read:following": string;
+        /**
+         * フォロー・フォロー解除する
+         */
         "write:following": string;
+        /**
+         * チャットを見る
+         */
         "read:messaging": string;
+        /**
+         * チャットを操作する
+         */
         "write:messaging": string;
+        /**
+         * ミュートを見る
+         */
         "read:mutes": string;
+        /**
+         * ミュートを操作する
+         */
         "write:mutes": string;
+        /**
+         * ノートを作成・削除する
+         */
         "write:notes": string;
+        /**
+         * 通知を見る
+         */
         "read:notifications": string;
+        /**
+         * 通知を操作する
+         */
         "write:notifications": string;
+        /**
+         * リアクションを見る
+         */
         "read:reactions": string;
+        /**
+         * リアクションを操作する
+         */
         "write:reactions": string;
+        /**
+         * 投票する
+         */
         "write:votes": string;
+        /**
+         * ページを見る
+         */
         "read:pages": string;
+        /**
+         * ページを操作する
+         */
         "write:pages": string;
+        /**
+         * ページのいいねを見る
+         */
         "read:page-likes": string;
+        /**
+         * ページのいいねを操作する
+         */
         "write:page-likes": string;
+        /**
+         * ユーザーグループを見る
+         */
         "read:user-groups": string;
+        /**
+         * ユーザーグループを操作する
+         */
         "write:user-groups": string;
+        /**
+         * チャンネルを見る
+         */
         "read:channels": string;
+        /**
+         * チャンネルを操作する
+         */
         "write:channels": string;
+        /**
+         * ギャラリーを見る
+         */
         "read:gallery": string;
+        /**
+         * ギャラリーを操作する
+         */
         "write:gallery": string;
+        /**
+         * ギャラリーのいいねを見る
+         */
         "read:gallery-likes": string;
+        /**
+         * ギャラリーのいいねを操作する
+         */
         "write:gallery-likes": string;
+        /**
+         * Playを見る
+         */
         "read:flash": string;
+        /**
+         * Playを操作する
+         */
         "write:flash": string;
+        /**
+         * Playのいいねを見る
+         */
         "read:flash-likes": string;
+        /**
+         * Playのいいねを操作する
+         */
         "write:flash-likes": string;
+        /**
+         * ユーザーからの通報を見る
+         */
         "read:admin:abuse-user-reports": string;
+        /**
+         * ユーザーアカウントを削除する
+         */
         "write:admin:delete-account": string;
+        /**
+         * ユーザーのすべてのファイルを削除する
+         */
         "write:admin:delete-all-files-of-a-user": string;
+        /**
+         * データベースインデックスに関する情報を見る
+         */
         "read:admin:index-stats": string;
+        /**
+         * データベーステーブルに関する情報を見る
+         */
         "read:admin:table-stats": string;
+        /**
+         * ユーザーのIPアドレスを見る
+         */
         "read:admin:user-ips": string;
+        /**
+         * インスタンスのメタデータを見る
+         */
         "read:admin:meta": string;
+        /**
+         * ユーザーのパスワードをリセットする
+         */
         "write:admin:reset-password": string;
+        /**
+         * ユーザーからの通報を解決する
+         */
         "write:admin:resolve-abuse-user-report": string;
+        /**
+         * メールを送る
+         */
         "write:admin:send-email": string;
+        /**
+         * サーバーの情報を見る
+         */
         "read:admin:server-info": string;
+        /**
+         * モデレーションログを見る
+         */
         "read:admin:show-moderation-log": string;
+        /**
+         * ユーザーのプライベートな情報を見る
+         */
         "read:admin:show-user": string;
+        /**
+         * ユーザーのプライベートな情報を見る
+         */
         "read:admin:show-users": string;
+        /**
+         * ユーザーを凍結する
+         */
         "write:admin:suspend-user": string;
+        /**
+         * ユーザーのアバターを削除する
+         */
         "write:admin:unset-user-avatar": string;
+        /**
+         * ユーザーのバーナーを削除する
+         */
         "write:admin:unset-user-banner": string;
+        /**
+         * ユーザーの凍結を解除する
+         */
         "write:admin:unsuspend-user": string;
+        /**
+         * インスタンスのメタデータを操作する
+         */
         "write:admin:meta": string;
+        /**
+         * モデレーションノートを操作する
+         */
         "write:admin:user-note": string;
+        /**
+         * ロールを操作する
+         */
         "write:admin:roles": string;
+        /**
+         * ロールを見る
+         */
         "read:admin:roles": string;
+        /**
+         * リレーを操作する
+         */
         "write:admin:relays": string;
+        /**
+         * リレーを見る
+         */
         "read:admin:relays": string;
+        /**
+         * 招待コードを操作する
+         */
         "write:admin:invite-codes": string;
+        /**
+         * 招待コードを見る
+         */
         "read:admin:invite-codes": string;
+        /**
+         * お知らせを操作する
+         */
         "write:admin:announcements": string;
+        /**
+         * お知らせを見る
+         */
         "read:admin:announcements": string;
+        /**
+         * アバターデコレーションを操作する
+         */
         "write:admin:avatar-decorations": string;
+        /**
+         * アバターデコレーションを見る
+         */
         "read:admin:avatar-decorations": string;
+        /**
+         * 連合に関する情報を操作する
+         */
         "write:admin:federation": string;
+        /**
+         * ユーザーアカウントを操作する
+         */
         "write:admin:account": string;
+        /**
+         * ユーザーに関する情報を見る
+         */
         "read:admin:account": string;
+        /**
+         * 絵文字を操作する
+         */
         "write:admin:emoji": string;
+        /**
+         * 絵文字を見る
+         */
         "read:admin:emoji": string;
+        /**
+         * ジョブキューを操作する
+         */
         "write:admin:queue": string;
+        /**
+         * ジョブキューに関する情報を見る
+         */
         "read:admin:queue": string;
+        /**
+         * プロモーションノートを操作する
+         */
         "write:admin:promo": string;
+        /**
+         * ユーザーのドライブを操作する
+         */
         "write:admin:drive": string;
+        /**
+         * ユーザーのドライブの関する情報を見る
+         */
         "read:admin:drive": string;
+        /**
+         * 管理者用のWebsocket APIを使う
+         */
         "read:admin:stream": string;
+        /**
+         * 広告を操作する
+         */
         "write:admin:ad": string;
+        /**
+         * 広告を見る
+         */
         "read:admin:ad": string;
+        /**
+         * 招待コードを作成する
+         */
         "write:invite-codes": string;
+        /**
+         * 招待コードを取得する
+         */
         "read:invite-codes": string;
+        /**
+         * クリップのいいねを操作する
+         */
         "write:clip-favorite": string;
+        /**
+         * クリップのいいねを見る
+         */
         "read:clip-favorite": string;
+        /**
+         * 連合に関する情報を取得する
+         */
         "read:federation": string;
+        /**
+         * 違反を報告する
+         */
         "write:report-abuse": string;
     };
     "_auth": {
+        /**
+         * アプリへのアクセス許可
+         */
         "shareAccessTitle": string;
+        /**
+         * 「{name}」がアカウントにアクセスすることを許可しますか？
+         */
         "shareAccess": ParameterizedString<"name">;
+        /**
+         * アカウントへのアクセスを許可しますか？
+         */
         "shareAccessAsk": string;
+        /**
+         * {name}は次の権限を要求しています
+         */
         "permission": ParameterizedString<"name">;
+        /**
+         * このアプリは次の権限を要求しています
+         */
         "permissionAsk": string;
+        /**
+         * アプリケーションに戻ってやっていってください
+         */
         "pleaseGoBack": string;
+        /**
+         * アプリケーションに戻っています
+         */
         "callback": string;
+        /**
+         * アクセスを拒否しました
+         */
         "denied": string;
+        /**
+         * アプリケーションにアクセス許可を与えるには、ログインが必要です。
+         */
         "pleaseLogin": string;
     };
     "_antennaSources": {
+        /**
+         * 全てのノート
+         */
         "all": string;
+        /**
+         * フォローしているユーザーのノート
+         */
         "homeTimeline": string;
+        /**
+         * 指定した一人または複数のユーザーのノート
+         */
         "users": string;
+        /**
+         * 指定したリストのユーザーのノート
+         */
         "userList": string;
+        /**
+         * 指定した一人または複数のユーザーを除いた全てのノート
+         */
         "userBlacklist": string;
     };
     "_weekday": {
+        /**
+         * 日曜日
+         */
         "sunday": string;
+        /**
+         * 月曜日
+         */
         "monday": string;
+        /**
+         * 火曜日
+         */
         "tuesday": string;
+        /**
+         * 水曜日
+         */
         "wednesday": string;
+        /**
+         * 木曜日
+         */
         "thursday": string;
+        /**
+         * 金曜日
+         */
         "friday": string;
+        /**
+         * 土曜日
+         */
         "saturday": string;
     };
     "_widgets": {
+        /**
+         * プロフィール
+         */
         "profile": string;
+        /**
+         * サーバー情報
+         */
         "instanceInfo": string;
+        /**
+         * 付箋
+         */
         "memo": string;
+        /**
+         * 通知
+         */
         "notifications": string;
+        /**
+         * タイムライン
+         */
         "timeline": string;
+        /**
+         * カレンダー
+         */
         "calendar": string;
+        /**
+         * トレンド
+         */
         "trends": string;
+        /**
+         * 時計
+         */
         "clock": string;
+        /**
+         * RSSリーダー
+         */
         "rss": string;
+        /**
+         * RSSティッカー
+         */
         "rssTicker": string;
+        /**
+         * アクティビティ
+         */
         "activity": string;
+        /**
+         * フォト
+         */
         "photos": string;
+        /**
+         * デジタル時計
+         */
         "digitalClock": string;
+        /**
+         * UNIX時計
+         */
         "unixClock": string;
+        /**
+         * 連合
+         */
         "federation": string;
+        /**
+         * サーバークラウド
+         */
         "instanceCloud": string;
+        /**
+         * 投稿フォーム
+         */
         "postForm": string;
+        /**
+         * スライドショー
+         */
         "slideshow": string;
+        /**
+         * ボタン
+         */
         "button": string;
+        /**
+         * オンラインユーザー
+         */
         "onlineUsers": string;
+        /**
+         * ジョブキュー
+         */
         "jobQueue": string;
+        /**
+         * サーバーメトリクス
+         */
         "serverMetric": string;
+        /**
+         * AiScriptコンソール
+         */
         "aiscript": string;
+        /**
+         * AiScript App
+         */
         "aiscriptApp": string;
+        /**
+         * 藍
+         */
         "aichan": string;
+        /**
+         * ユーザーリスト
+         */
         "userList": string;
         "_userList": {
+            /**
+             * リストを選択
+             */
             "chooseList": string;
         };
+        /**
+         * クリッカー
+         */
         "clicker": string;
+        /**
+         * 今日誕生日のユーザー
+         */
         "birthdayFollowings": string;
     };
     "_cw": {
+        /**
+         * 隠す
+         */
         "hide": string;
+        /**
+         * もっと見る
+         */
         "show": string;
+        /**
+         * {count}文字
+         */
         "chars": ParameterizedString<"count">;
+        /**
+         * {count}ファイル
+         */
         "files": ParameterizedString<"count">;
     };
     "_poll": {
+        /**
+         * 選択肢は最低2つ必要です
+         */
         "noOnlyOneChoice": string;
+        /**
+         * 選択肢{n}
+         */
         "choiceN": ParameterizedString<"n">;
+        /**
+         * これ以上追加できません
+         */
         "noMore": string;
+        /**
+         * 複数回答可
+         */
         "canMultipleVote": string;
+        /**
+         * 期限
+         */
         "expiration": string;
+        /**
+         * 無期限
+         */
         "infinite": string;
+        /**
+         * 日時指定
+         */
         "at": string;
+        /**
+         * 経過指定
+         */
         "after": string;
+        /**
+         * 期日
+         */
         "deadlineDate": string;
+        /**
+         * 時間
+         */
         "deadlineTime": string;
+        /**
+         * 期間
+         */
         "duration": string;
+        /**
+         * {n}票
+         */
         "votesCount": ParameterizedString<"n">;
+        /**
+         * 計{n}票
+         */
         "totalVotes": ParameterizedString<"n">;
+        /**
+         * 投票する
+         */
         "vote": string;
+        /**
+         * 結果を見る
+         */
         "showResult": string;
+        /**
+         * 投票済み
+         */
         "voted": string;
+        /**
+         * 終了済み
+         */
         "closed": string;
+        /**
+         * 終了まであと{d}日{h}時間
+         */
         "remainingDays": ParameterizedString<"d" | "h">;
+        /**
+         * 終了まであと{h}時間{m}分
+         */
         "remainingHours": ParameterizedString<"h" | "m">;
+        /**
+         * 終了まであと{m}分{s}秒
+         */
         "remainingMinutes": ParameterizedString<"m" | "s">;
+        /**
+         * 終了まであと{s}秒
+         */
         "remainingSeconds": ParameterizedString<"s">;
     };
     "_visibility": {
+        /**
+         * パブリック
+         */
         "public": string;
+        /**
+         * 全てのユーザーに公開
+         */
         "publicDescription": string;
+        /**
+         * ホーム
+         */
         "home": string;
+        /**
+         * ホームタイムラインのみに公開
+         */
         "homeDescription": string;
+        /**
+         * フォロワー
+         */
         "followers": string;
+        /**
+         * 自分のフォロワーのみに公開
+         */
         "followersDescription": string;
+        /**
+         * ダイレクト
+         */
         "specified": string;
+        /**
+         * 指定したユーザーのみに公開
+         */
         "specifiedDescription": string;
+        /**
+         * 連合なし
+         */
         "disableFederation": string;
+        /**
+         * 他サーバーへの配信を行いません
+         */
         "disableFederationDescription": string;
     };
     "_postForm": {
+        /**
+         * このノートに返信...
+         */
         "replyPlaceholder": string;
+        /**
+         * このノートを引用...
+         */
         "quotePlaceholder": string;
+        /**
+         * チャンネルに投稿...
+         */
         "channelPlaceholder": string;
         "_placeholders": {
+            /**
+             * いまどうしてる？
+             */
             "a": string;
+            /**
+             * 何かありましたか？
+             */
             "b": string;
+            /**
+             * 何をお考えですか？
+             */
             "c": string;
+            /**
+             * 言いたいことは？
+             */
             "d": string;
+            /**
+             * ここに書いてください
+             */
             "e": string;
+            /**
+             * あなたが書くのを待っています...
+             */
             "f": string;
         };
     };
     "_profile": {
+        /**
+         * 名前
+         */
         "name": string;
+        /**
+         * ユーザー名
+         */
         "username": string;
+        /**
+         * 自己紹介
+         */
         "description": string;
+        /**
+         * ハッシュタグを含めることができます。
+         */
         "youCanIncludeHashtags": string;
+        /**
+         * 追加情報
+         */
         "metadata": string;
+        /**
+         * 追加情報を編集
+         */
         "metadataEdit": string;
+        /**
+         * プロフィールに表として追加情報を表示することができます。
+         */
         "metadataDescription": string;
+        /**
+         * ラベル
+         */
         "metadataLabel": string;
+        /**
+         * 内容
+         */
         "metadataContent": string;
+        /**
+         * アイコン画像を変更
+         */
         "changeAvatar": string;
+        /**
+         * バナー画像を変更
+         */
         "changeBanner": string;
+        /**
+         * 内容にURLを設定すると、リンク先のWebサイトに自分のプロフィールへのリンクが含まれている場合に所有者確認済みアイコンを表示させることができます。
+         */
         "verifiedLinkDescription": string;
+        /**
+         * 最大{max}つまでデコレーションを付けられます。
+         */
         "avatarDecorationMax": ParameterizedString<"max">;
     };
     "_exportOrImport": {
+        /**
+         * 全てのノート
+         */
         "allNotes": string;
+        /**
+         * お気に入りにしたノート
+         */
         "favoritedNotes": string;
+        /**
+         * クリップ
+         */
         "clips": string;
+        /**
+         * フォロー
+         */
         "followingList": string;
+        /**
+         * ミュート
+         */
         "muteList": string;
+        /**
+         * ブロック
+         */
         "blockingList": string;
+        /**
+         * リスト
+         */
         "userLists": string;
+        /**
+         * ミュートしているユーザーを除外
+         */
         "excludeMutingUsers": string;
+        /**
+         * 使われていないアカウントを除外
+         */
         "excludeInactiveUsers": string;
+        /**
+         * インポートした人による返信をTLに含むようにする
+         */
         "withReplies": string;
     };
     "_charts": {
+        /**
+         * 連合
+         */
         "federation": string;
+        /**
+         * リクエスト
+         */
         "apRequest": string;
+        /**
+         * ユーザーの増減
+         */
         "usersIncDec": string;
+        /**
+         * ユーザーの合計
+         */
         "usersTotal": string;
+        /**
+         * アクティブユーザー数
+         */
         "activeUsers": string;
+        /**
+         * ノートの増減
+         */
         "notesIncDec": string;
+        /**
+         * ローカルのノートの増減
+         */
         "localNotesIncDec": string;
+        /**
+         * リモートのノートの増減
+         */
         "remoteNotesIncDec": string;
+        /**
+         * ノートの合計
+         */
         "notesTotal": string;
+        /**
+         * ファイルの増減
+         */
         "filesIncDec": string;
+        /**
+         * ファイルの合計
+         */
         "filesTotal": string;
+        /**
+         * ストレージ使用量の増減
+         */
         "storageUsageIncDec": string;
+        /**
+         * ストレージ使用量の合計
+         */
         "storageUsageTotal": string;
     };
     "_instanceCharts": {
+        /**
+         * リクエスト
+         */
         "requests": string;
+        /**
+         * ユーザーの増減
+         */
         "users": string;
+        /**
+         * ユーザーの累積
+         */
         "usersTotal": string;
+        /**
+         * ノートの増減
+         */
         "notes": string;
+        /**
+         * ノートの累積
+         */
         "notesTotal": string;
+        /**
+         * フォロー/フォロワーの増減
+         */
         "ff": string;
+        /**
+         * フォロー/フォロワーの累積
+         */
         "ffTotal": string;
+        /**
+         * キャッシュサイズの増減
+         */
         "cacheSize": string;
+        /**
+         * キャッシュサイズの累積
+         */
         "cacheSizeTotal": string;
+        /**
+         * ファイル数の増減
+         */
         "files": string;
+        /**
+         * ファイル数の累積
+         */
         "filesTotal": string;
     };
     "_timelines": {
+        /**
+         * ホーム
+         */
         "home": string;
+        /**
+         * ローカル
+         */
         "local": string;
+        /**
+         * ソーシャル
+         */
         "social": string;
+        /**
+         * グローバル
+         */
         "global": string;
     };
     "_play": {
+        /**
+         * Playの作成
+         */
         "new": string;
+        /**
+         * Playの編集
+         */
         "edit": string;
+        /**
+         * Playを作成しました
+         */
         "created": string;
+        /**
+         * Playを更新しました
+         */
         "updated": string;
+        /**
+         * Playを削除しました
+         */
         "deleted": string;
+        /**
+         * Play設定
+         */
         "pageSetting": string;
+        /**
+         * このPlayを編集
+         */
         "editThisPage": string;
+        /**
+         * ソースを表示
+         */
         "viewSource": string;
+        /**
+         * 自分のPlay
+         */
         "my": string;
+        /**
+         * いいねしたPlay
+         */
         "liked": string;
+        /**
+         * 人気
+         */
         "featured": string;
+        /**
+         * タイトル
+         */
         "title": string;
+        /**
+         * スクリプト
+         */
         "script": string;
+        /**
+         * 説明
+         */
         "summary": string;
     };
     "_pages": {
+        /**
+         * ページの作成
+         */
         "newPage": string;
+        /**
+         * ページの編集
+         */
         "editPage": string;
+        /**
+         * ソースを表示中
+         */
         "readPage": string;
+        /**
+         * ページを作成しました
+         */
         "created": string;
+        /**
+         * ページを更新しました
+         */
         "updated": string;
+        /**
+         * ページを削除しました
+         */
         "deleted": string;
+        /**
+         * ページ設定
+         */
         "pageSetting": string;
+        /**
+         * 指定されたページURLは既に存在しています
+         */
         "nameAlreadyExists": string;
+        /**
+         * 不正なページURLです
+         */
         "invalidNameTitle": string;
+        /**
+         * 空白でないか確認してください
+         */
         "invalidNameText": string;
+        /**
+         * このページを編集
+         */
         "editThisPage": string;
+        /**
+         * ソースを表示
+         */
         "viewSource": string;
+        /**
+         * ページを見る
+         */
         "viewPage": string;
+        /**
+         * いいね
+         */
         "like": string;
+        /**
+         * いいね解除
+         */
         "unlike": string;
+        /**
+         * 自分のページ
+         */
         "my": string;
+        /**
+         * いいねしたページ
+         */
         "liked": string;
+        /**
+         * 人気
+         */
         "featured": string;
+        /**
+         * インスペクター
+         */
         "inspector": string;
+        /**
+         * コンテンツ
+         */
         "contents": string;
+        /**
+         * ページブロック
+         */
         "content": string;
+        /**
+         * 変数
+         */
         "variables": string;
+        /**
+         * タイトル
+         */
         "title": string;
+        /**
+         * ページURL
+         */
         "url": string;
+        /**
+         * ページの要約
+         */
         "summary": string;
+        /**
+         * 中央寄せ
+         */
         "alignCenter": string;
+        /**
+         * ピン留めされているときにタイトルを非表示
+         */
         "hideTitleWhenPinned": string;
+        /**
+         * フォント
+         */
         "font": string;
+        /**
+         * セリフ
+         */
         "fontSerif": string;
+        /**
+         * サンセリフ
+         */
         "fontSansSerif": string;
+        /**
+         * アイキャッチ画像を設定
+         */
         "eyeCatchingImageSet": string;
+        /**
+         * アイキャッチ画像を削除
+         */
         "eyeCatchingImageRemove": string;
+        /**
+         * ブロックを追加
+         */
         "chooseBlock": string;
+        /**
+         * 種類を選択
+         */
         "selectType": string;
+        /**
+         * コンテンツ
+         */
         "contentBlocks": string;
+        /**
+         * 入力
+         */
         "inputBlocks": string;
+        /**
+         * 特殊
+         */
         "specialBlocks": string;
         "blocks": {
+            /**
+             * テキスト
+             */
             "text": string;
+            /**
+             * テキストエリア
+             */
             "textarea": string;
+            /**
+             * セクション
+             */
             "section": string;
+            /**
+             * 画像
+             */
             "image": string;
+            /**
+             * ボタン
+             */
             "button": string;
+            /**
+             * ノート埋め込み
+             */
             "note": string;
             "_note": {
+                /**
+                 * ノートID
+                 */
                 "id": string;
+                /**
+                 * ノートURLをペーストして設定することもできます。
+                 */
                 "idDescription": string;
+                /**
+                 * 詳細な表示
+                 */
                 "detailed": string;
             };
         };
     };
     "_relayStatus": {
+        /**
+         * 承認待ち
+         */
         "requesting": string;
+        /**
+         * 承認済み
+         */
         "accepted": string;
+        /**
+         * 拒否済み
+         */
         "rejected": string;
     };
     "_notification": {
+        /**
+         * ファイルがアップロードされました
+         */
         "fileUploaded": string;
+        /**
+         * {name}からのメンション
+         */
         "youGotMention": ParameterizedString<"name">;
+        /**
+         * {name}からのリプライ
+         */
         "youGotReply": ParameterizedString<"name">;
+        /**
+         * {name}による引用
+         */
         "youGotQuote": ParameterizedString<"name">;
+        /**
+         * {name}がRenoteしました
+         */
         "youRenoted": ParameterizedString<"name">;
+        /**
+         * フォローされました
+         */
         "youWereFollowed": string;
+        /**
+         * フォローリクエストが来ました
+         */
         "youReceivedFollowRequest": string;
+        /**
+         * フォローリクエストが承認されました
+         */
         "yourFollowRequestAccepted": string;
+        /**
+         * アンケートの結果が出ました
+         */
         "pollEnded": string;
+        /**
+         * 新しい投稿
+         */
         "newNote": string;
+        /**
+         * アンテナ {name}
+         */
         "unreadAntennaNote": ParameterizedString<"name">;
+        /**
+         * ロールが付与されました
+         */
         "roleAssigned": string;
+        /**
+         * プッシュ通知の更新をしました
+         */
         "emptyPushNotificationMessage": string;
+        /**
+         * 実績を獲得
+         */
         "achievementEarned": string;
+        /**
+         * 通知テスト
+         */
         "testNotification": string;
+        /**
+         * 通知の表示を確かめる
+         */
         "checkNotificationBehavior": string;
+        /**
+         * テスト通知を送信する
+         */
         "sendTestNotification": string;
+        /**
+         * 通知はこのように表示されます
+         */
         "notificationWillBeDisplayedLikeThis": string;
+        /**
+         * {n}人がリアクションしました
+         */
         "reactedBySomeUsers": ParameterizedString<"n">;
+        /**
+         * {n}人がリノートしました
+         */
         "renotedBySomeUsers": ParameterizedString<"n">;
+        /**
+         * {n}人にフォローされました
+         */
         "followedBySomeUsers": ParameterizedString<"n">;
         "_types": {
+            /**
+             * すべて
+             */
             "all": string;
+            /**
+             * ユーザーの新規投稿
+             */
             "note": string;
+            /**
+             * フォロー
+             */
             "follow": string;
+            /**
+             * メンション
+             */
             "mention": string;
+            /**
+             * リプライ
+             */
             "reply": string;
+            /**
+             * Renote
+             */
             "renote": string;
+            /**
+             * 引用
+             */
             "quote": string;
+            /**
+             * リアクション
+             */
             "reaction": string;
+            /**
+             * アンケートが終了
+             */
             "pollEnded": string;
+            /**
+             * フォロー申請を受け取った
+             */
             "receiveFollowRequest": string;
+            /**
+             * フォローが受理された
+             */
             "followRequestAccepted": string;
+            /**
+             * ロールが付与された
+             */
             "roleAssigned": string;
+            /**
+             * 実績の獲得
+             */
             "achievementEarned": string;
+            /**
+             * 連携アプリからの通知
+             */
             "app": string;
         };
         "_actions": {
+            /**
+             * フォローバック
+             */
             "followBack": string;
+            /**
+             * 返信
+             */
             "reply": string;
+            /**
+             * Renote
+             */
             "renote": string;
         };
     };
     "_deck": {
+        /**
+         * 常にメインカラムを表示
+         */
         "alwaysShowMainColumn": string;
+        /**
+         * カラムの寄せ
+         */
         "columnAlign": string;
+        /**
+         * カラムを追加
+         */
         "addColumn": string;
+        /**
+         * カラムの設定
+         */
         "configureColumn": string;
+        /**
+         * 左に移動
+         */
         "swapLeft": string;
+        /**
+         * 右に移動
+         */
         "swapRight": string;
+        /**
+         * 上に移動
+         */
         "swapUp": string;
+        /**
+         * 下に移動
+         */
         "swapDown": string;
+        /**
+         * 左にスタック
+         */
         "stackLeft": string;
+        /**
+         * 右に出す
+         */
         "popRight": string;
+        /**
+         * プロファイル
+         */
         "profile": string;
+        /**
+         * 新規プロファイル
+         */
         "newProfile": string;
+        /**
+         * プロファイルを削除
+         */
         "deleteProfile": string;
+        /**
+         * カラムを組み合わせて自分だけのインターフェイスを作りましょう！
+         */
         "introduction": string;
+        /**
+         * 画面の右にある + を押して、いつでもカラムを追加できます。
+         */
         "introduction2": string;
+        /**
+         * カラムのメニューから、「ウィジェットの編集」を選択してウィジェットを追加してください
+         */
         "widgetsIntroduction": string;
+        /**
+         * 非ルートページは簡易UIで表示
+         */
         "useSimpleUiForNonRootPages": string;
+        /**
+         * 「幅を自動調整」が有効の場合、これが幅の最小値となります
+         */
         "usedAsMinWidthWhenFlexible": string;
+        /**
+         * 幅を自動調整
+         */
         "flexible": string;
         "_columns": {
+            /**
+             * メイン
+             */
             "main": string;
+            /**
+             * ウィジェット
+             */
             "widgets": string;
+            /**
+             * 通知
+             */
             "notifications": string;
+            /**
+             * タイムライン
+             */
             "tl": string;
+            /**
+             * アンテナ
+             */
             "antenna": string;
+            /**
+             * リスト
+             */
             "list": string;
+            /**
+             * チャンネル
+             */
             "channel": string;
+            /**
+             * あなた宛て
+             */
             "mentions": string;
+            /**
+             * ダイレクト
+             */
             "direct": string;
+            /**
+             * ロールタイムライン
+             */
             "roleTimeline": string;
         };
     };
     "_dialog": {
+        /**
+         * 最大文字数を超えています！ 現在 {current} / 制限 {max}
+         */
         "charactersExceeded": ParameterizedString<"current" | "max">;
+        /**
+         * 最小文字数を下回っています！ 現在 {current} / 制限 {min}
+         */
         "charactersBelow": ParameterizedString<"current" | "min">;
     };
     "_disabledTimeline": {
+        /**
+         * 無効化されたタイムライン
+         */
         "title": string;
+        /**
+         * 現在のロールでは、このタイムラインを使用することはできません。
+         */
         "description": string;
     };
     "_drivecleaner": {
+        /**
+         * サイズが大きい順
+         */
         "orderBySizeDesc": string;
+        /**
+         * 追加日が古い順
+         */
         "orderByCreatedAtAsc": string;
     };
     "_webhookSettings": {
+        /**
+         * Webhookを作成
+         */
         "createWebhook": string;
+        /**
+         * 名前
+         */
         "name": string;
+        /**
+         * シークレット
+         */
         "secret": string;
+        /**
+         * Webhookを実行するタイミング
+         */
         "events": string;
+        /**
+         * 有効
+         */
         "active": string;
         "_events": {
+            /**
+             * フォローしたとき
+             */
             "follow": string;
+            /**
+             * フォローされたとき
+             */
             "followed": string;
+            /**
+             * ノートを投稿したとき
+             */
             "note": string;
+            /**
+             * 返信されたとき
+             */
             "reply": string;
+            /**
+             * Renoteされたとき
+             */
             "renote": string;
+            /**
+             * リアクションがあったとき
+             */
             "reaction": string;
+            /**
+             * メンションされたとき
+             */
             "mention": string;
         };
     };
     "_moderationLogTypes": {
+        /**
+         * ロールを作成
+         */
         "createRole": string;
+        /**
+         * ロールを削除
+         */
         "deleteRole": string;
+        /**
+         * ロールを更新
+         */
         "updateRole": string;
+        /**
+         * ロールへアサイン
+         */
         "assignRole": string;
+        /**
+         * ロールのアサイン解除
+         */
         "unassignRole": string;
+        /**
+         * 凍結
+         */
         "suspend": string;
+        /**
+         * 凍結解除
+         */
         "unsuspend": string;
+        /**
+         * カスタム絵文字追加
+         */
         "addCustomEmoji": string;
+        /**
+         * カスタム絵文字更新
+         */
         "updateCustomEmoji": string;
+        /**
+         * カスタム絵文字削除
+         */
         "deleteCustomEmoji": string;
+        /**
+         * サーバー設定更新
+         */
         "updateServerSettings": string;
+        /**
+         * モデレーションノート更新
+         */
         "updateUserNote": string;
+        /**
+         * ファイルを削除
+         */
         "deleteDriveFile": string;
+        /**
+         * ノートを削除
+         */
         "deleteNote": string;
+        /**
+         * 全体のお知らせを作成
+         */
         "createGlobalAnnouncement": string;
+        /**
+         * ユーザーへお知らせを作成
+         */
         "createUserAnnouncement": string;
+        /**
+         * 全体のお知らせを更新
+         */
         "updateGlobalAnnouncement": string;
+        /**
+         * ユーザーのお知らせを更新
+         */
         "updateUserAnnouncement": string;
+        /**
+         * 全体のお知らせを削除
+         */
         "deleteGlobalAnnouncement": string;
+        /**
+         * ユーザーのお知らせを削除
+         */
         "deleteUserAnnouncement": string;
+        /**
+         * パスワードをリセット
+         */
         "resetPassword": string;
+        /**
+         * リモートサーバーを停止
+         */
         "suspendRemoteInstance": string;
+        /**
+         * リモートサーバーを再開
+         */
         "unsuspendRemoteInstance": string;
+        /**
+         * ファイルをセンシティブ付与
+         */
         "markSensitiveDriveFile": string;
+        /**
+         * ファイルをセンシティブ解除
+         */
         "unmarkSensitiveDriveFile": string;
+        /**
+         * 通報を解決
+         */
         "resolveAbuseReport": string;
+        /**
+         * 招待コードを作成
+         */
         "createInvitation": string;
+        /**
+         * 広告を作成
+         */
         "createAd": string;
+        /**
+         * 広告を削除
+         */
         "deleteAd": string;
+        /**
+         * 広告を更新
+         */
         "updateAd": string;
+        /**
+         * アイコンデコレーションを作成
+         */
         "createAvatarDecoration": string;
+        /**
+         * アイコンデコレーションを更新
+         */
         "updateAvatarDecoration": string;
+        /**
+         * アイコンデコレーションを削除
+         */
         "deleteAvatarDecoration": string;
+        /**
+         * ユーザーのアイコンを解除
+         */
         "unsetUserAvatar": string;
+        /**
+         * ユーザーのバナーを解除
+         */
         "unsetUserBanner": string;
     };
     "_fileViewer": {
+        /**
+         * ファイルの詳細
+         */
         "title": string;
+        /**
+         * ファイルタイプ
+         */
         "type": string;
+        /**
+         * ファイルサイズ
+         */
         "size": string;
+        /**
+         * URL
+         */
         "url": string;
+        /**
+         * 追加日
+         */
         "uploadedAt": string;
+        /**
+         * 添付されているノート
+         */
         "attachedNotes": string;
+        /**
+         * このページは、このファイルをアップロードしたユーザーしか閲覧できません。
+         */
         "thisPageCanBeSeenFromTheAuthor": string;
     };
     "_externalResourceInstaller": {
+        /**
+         * 外部サイトからインストール
+         */
         "title": string;
+        /**
+         * 配布元が信頼できるかを確認した上でインストールしてください。
+         */
         "checkVendorBeforeInstall": string;
         "_plugin": {
+            /**
+             * このプラグインをインストールしますか？
+             */
             "title": string;
+            /**
+             * プラグイン情報
+             */
             "metaTitle": string;
         };
         "_theme": {
+            /**
+             * このテーマをインストールしますか？
+             */
             "title": string;
+            /**
+             * テーマ情報
+             */
             "metaTitle": string;
         };
         "_meta": {
+            /**
+             * 基本のカラースキーム
+             */
             "base": string;
         };
         "_vendorInfo": {
+            /**
+             * 配布元情報
+             */
             "title": string;
+            /**
+             * 参照したエンドポイント
+             */
             "endpoint": string;
+            /**
+             * ファイル整合性の確認
+             */
             "hashVerify": string;
         };
         "_errors": {
             "_invalidParams": {
+                /**
+                 * パラメータが不足しています
+                 */
                 "title": string;
+                /**
+                 * 外部サイトからデータを取得するために必要な情報が不足しています。URLをお確かめください。
+                 */
                 "description": string;
             };
             "_resourceTypeNotSupported": {
+                /**
+                 * この外部リソースには対応していません
+                 */
                 "title": string;
+                /**
+                 * この外部サイトから取得したリソースの種別には対応していません。サイト管理者にお問い合わせください。
+                 */
                 "description": string;
             };
             "_failedToFetch": {
+                /**
+                 * データの取得に失敗しました
+                 */
                 "title": string;
+                /**
+                 * 外部サイトとの通信に失敗しました。もう一度試しても改善しない場合、サイト管理者にお問い合わせください。
+                 */
                 "fetchErrorDescription": string;
+                /**
+                 * 外部サイトから取得したデータが読み取れませんでした。サイト管理者にお問い合わせください。
+                 */
                 "parseErrorDescription": string;
             };
             "_hashUnmatched": {
+                /**
+                 * 正しいデータが取得できませんでした
+                 */
                 "title": string;
+                /**
+                 * 提供されたデータの整合性の確認に失敗しました。セキュリティ上、インストールは続行できません。サイト管理者にお問い合わせください。
+                 */
                 "description": string;
             };
             "_pluginParseFailed": {
+                /**
+                 * AiScript エラー
+                 */
                 "title": string;
+                /**
+                 * データは取得できたものの、AiScriptの解析時にエラーがあったため読み込めませんでした。プラグインの作者にお問い合わせください。エラーの詳細はJavascriptコンソールをご確認ください。
+                 */
                 "description": string;
             };
             "_pluginInstallFailed": {
+                /**
+                 * プラグインのインストールに失敗しました
+                 */
                 "title": string;
+                /**
+                 * プラグインのインストール中に問題が発生しました。もう一度お試しください。エラーの詳細はJavascriptコンソールをご覧ください。
+                 */
                 "description": string;
             };
             "_themeParseFailed": {
+                /**
+                 * テーマ解析エラー
+                 */
                 "title": string;
+                /**
+                 * データは取得できたものの、テーマファイルの解析時にエラーがあったため読み込めませんでした。テーマの作者にお問い合わせください。エラーの詳細はJavascriptコンソールをご確認ください。
+                 */
                 "description": string;
             };
             "_themeInstallFailed": {
+                /**
+                 * テーマのインストールに失敗しました
+                 */
                 "title": string;
+                /**
+                 * テーマのインストール中に問題が発生しました。もう一度お試しください。エラーの詳細はJavascriptコンソールをご覧ください。
+                 */
                 "description": string;
             };
         };
     };
     "_dataSaver": {
         "_media": {
+            /**
+             * メディアの読み込み
+             */
             "title": string;
+            /**
+             * 画像・動画が自動で読み込まれるのを防止します。隠れている画像・動画はタップすると読み込まれます。
+             */
             "description": string;
         };
         "_avatar": {
+            /**
+             * アイコン画像
+             */
             "title": string;
+            /**
+             * アイコン画像のアニメーションが停止します。アニメーション画像は通常の画像よりファイルサイズが大きいことがあるので、データ通信量をさらに削減できます。
+             */
             "description": string;
         };
         "_urlPreview": {
+            /**
+             * URLプレビューのサムネイル
+             */
             "title": string;
+            /**
+             * URLプレビューのサムネイル画像が読み込まれなくなります。
+             */
             "description": string;
         };
         "_code": {
+            /**
+             * コードハイライト
+             */
             "title": string;
+            /**
+             * MFMなどでコードハイライト記法が使われている場合、タップするまで読み込まれなくなります。コードハイライトではハイライトする言語ごとにその定義ファイルを読み込む必要がありますが、それらが自動で読み込まれなくなるため、通信量の削減が見込めます。
+             */
             "description": string;
         };
     };
     "_reversi": {
+        /**
+         * リバーシ
+         */
         "reversi": string;
+        /**
+         * 対局の設定
+         */
         "gameSettings": string;
+        /**
+         * ボードを選択
+         */
         "chooseBoard": string;
+        /**
+         * 先行/後攻
+         */
         "blackOrWhite": string;
+        /**
+         * {name}が黒(先行)
+         */
         "blackIs": ParameterizedString<"name">;
+        /**
+         * ルール
+         */
         "rules": string;
+        /**
+         * 対局はまもなく開始されます
+         */
         "thisGameIsStartedSoon": string;
+        /**
+         * 相手の準備が完了するのを待っています
+         */
         "waitingForOther": string;
+        /**
+         * あなたの準備が完了するのを待っています
+         */
         "waitingForMe": string;
+        /**
+         * 準備してください
+         */
         "waitingBoth": string;
+        /**
+         * 準備完了
+         */
         "ready": string;
+        /**
+         * 準備を再開
+         */
         "cancelReady": string;
+        /**
+         * 相手のターンです
+         */
         "opponentTurn": string;
+        /**
+         * あなたのターンです
+         */
         "myTurn": string;
+        /**
+         * {name}のターンです
+         */
         "turnOf": ParameterizedString<"name">;
+        /**
+         * {name}のターン
+         */
         "pastTurnOf": ParameterizedString<"name">;
+        /**
+         * 投了
+         */
         "surrender": string;
+        /**
+         * 投了により
+         */
         "surrendered": string;
+        /**
+         * 引き分け
+         */
         "drawn": string;
+        /**
+         * {name}の勝ち
+         */
         "won": ParameterizedString<"name">;
+        /**
+         * 黒
+         */
         "black": string;
+        /**
+         * 白
+         */
         "white": string;
+        /**
+         * 合計
+         */
         "total": string;
+        /**
+         * {count}ターン目
+         */
         "turnCount": ParameterizedString<"count">;
+        /**
+         * 自分の対局
+         */
         "myGames": string;
+        /**
+         * みんなの対局
+         */
         "allGames": string;
+        /**
+         * 終了
+         */
         "ended": string;
+        /**
+         * 対局中
+         */
         "playing": string;
+        /**
+         * 石の少ない方が勝ち(ロセオ)
+         */
         "isLlotheo": string;
+        /**
+         * ループマップ
+         */
         "loopedMap": string;
+        /**
+         * どこでも置けるモード
+         */
         "canPutEverywhere": string;
+        /**
+         * フリーマッチ
+         */
         "freeMatch": string;
+        /**
+         * 対戦相手を探しています
+         */
         "lookingForPlayer": string;
     };
 }
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index bdb145b39a..c99118f9b2 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -205,7 +205,7 @@ export async function mainBoot() {
 			const lastUsedDate = parseInt(lastUsed, 10);
 			// 二時間以上前なら
 			if (Date.now() - lastUsedDate > 1000 * 60 * 60 * 2) {
-				toast(i18n.t('welcomeBackWithName', {
+				toast(i18n.tsx.welcomeBackWithName({
 					name: $i.name || $i.username,
 				}));
 			}
diff --git a/packages/frontend/src/components/MkAnnouncementDialog.vue b/packages/frontend/src/components/MkAnnouncementDialog.vue
index c649e69cd0..54cbbe18c2 100644
--- a/packages/frontend/src/components/MkAnnouncementDialog.vue
+++ b/packages/frontend/src/components/MkAnnouncementDialog.vue
@@ -44,7 +44,7 @@ async function ok() {
 		const confirm = await os.confirm({
 			type: 'question',
 			title: i18n.ts._announcement.readConfirmTitle,
-			text: i18n.t('_announcement.readConfirmText', { title: props.announcement.title }),
+			text: i18n.tsx._announcement.readConfirmText({ title: props.announcement.title }),
 		});
 		if (confirm.canceled) return;
 	}
diff --git a/packages/frontend/src/components/MkCwButton.vue b/packages/frontend/src/components/MkCwButton.vue
index 4a6d2dfba2..ca19a2122d 100644
--- a/packages/frontend/src/components/MkCwButton.vue
+++ b/packages/frontend/src/components/MkCwButton.vue
@@ -41,9 +41,9 @@ const emit = defineEmits<{
 
 const label = computed(() => {
 	return concat([
-		props.text ? [i18n.t('_cw.chars', { count: props.text.length })] : [],
+		props.text ? [i18n.tsx._cw.chars({ count: props.text.length })] : [],
 		props.renote ? [i18n.ts.quote] : [],
-		props.files.length !== 0 ? [i18n.t('_cw.files', { count: props.files.length })] : [],
+		props.files.length !== 0 ? [i18n.tsx._cw.files({ count: props.files.length })] : [],
 		props.poll != null ? [i18n.ts.poll] : [],
 	] as string[][]).join(' / ');
 });
diff --git a/packages/frontend/src/components/MkDateSeparatedList.vue b/packages/frontend/src/components/MkDateSeparatedList.vue
index 0a71b689fe..7b9a052868 100644
--- a/packages/frontend/src/components/MkDateSeparatedList.vue
+++ b/packages/frontend/src/components/MkDateSeparatedList.vue
@@ -46,7 +46,7 @@ export default defineComponent({
 		function getDateText(time: string) {
 			const date = new Date(time).getDate();
 			const month = new Date(time).getMonth() + 1;
-			return i18n.t('monthAndDay', {
+			return i18n.tsx.monthAndDay({
 				month: month.toString(),
 				day: date.toString(),
 			});
diff --git a/packages/frontend/src/components/MkDialog.vue b/packages/frontend/src/components/MkDialog.vue
index 3c1f83d335..3fc9f0e357 100644
--- a/packages/frontend/src/components/MkDialog.vue
+++ b/packages/frontend/src/components/MkDialog.vue
@@ -30,8 +30,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkInput v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder || undefined" :autocomplete="input.autocomplete" @keydown="onInputKeydown">
 			<template v-if="input.type === 'password'" #prefix><i class="ti ti-lock"></i></template>
 			<template #caption>
-				<span v-if="okButtonDisabledReason === 'charactersExceeded'" v-text="i18n.t('_dialog.charactersExceeded', { current: (inputValue as string).length, max: input.maxLength ?? 'NaN' })"/>
-				<span v-else-if="okButtonDisabledReason === 'charactersBelow'" v-text="i18n.t('_dialog.charactersBelow', { current: (inputValue as string).length, min: input.minLength ?? 'NaN' })"/>
+				<span v-if="okButtonDisabledReason === 'charactersExceeded'" v-text="i18n.tsx._dialog.charactersExceeded({ current: (inputValue as string).length, max: input.maxLength ?? 'NaN' })"/>
+				<span v-else-if="okButtonDisabledReason === 'charactersBelow'" v-text="i18n.tsx._dialog.charactersBelow({ current: (inputValue as string).length, min: input.minLength ?? 'NaN' })"/>
 			</template>
 		</MkInput>
 		<MkSelect v-if="select" v-model="selectedValue" autofocus>
diff --git a/packages/frontend/src/components/MkDrive.vue b/packages/frontend/src/components/MkDrive.vue
index dbf98cd622..560d5502d4 100644
--- a/packages/frontend/src/components/MkDrive.vue
+++ b/packages/frontend/src/components/MkDrive.vue
@@ -82,8 +82,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkButton v-show="moreFiles" ref="loadMoreFiles" @click="fetchMoreFiles">{{ i18n.ts.loadMore }}</MkButton>
 			</div>
 			<div v-if="files.length == 0 && folders.length == 0 && !fetching" :class="$style.empty">
-				<div v-if="draghover">{{ i18n.t('empty-draghover') }}</div>
-				<div v-if="!draghover && folder == null"><strong>{{ i18n.ts.emptyDrive }}</strong><br/>{{ i18n.t('empty-drive-description') }}</div>
+				<div v-if="draghover">{{ i18n.ts['empty-draghover'] }}</div>
+				<div v-if="!draghover && folder == null"><strong>{{ i18n.ts.emptyDrive }}</strong><br/>{{ i18n.ts['empty-drive-description'] }}</div>
 				<div v-if="!draghover && folder != null">{{ i18n.ts.emptyFolder }}</div>
 			</div>
 		</div>
diff --git a/packages/frontend/src/components/MkFollowButton.vue b/packages/frontend/src/components/MkFollowButton.vue
index 78c4fb3cd2..6bc96be1b9 100644
--- a/packages/frontend/src/components/MkFollowButton.vue
+++ b/packages/frontend/src/components/MkFollowButton.vue
@@ -84,7 +84,7 @@ async function onClick() {
 		if (isFollowing.value) {
 			const { canceled } = await os.confirm({
 				type: 'warning',
-				text: i18n.t('unfollowConfirm', { name: props.user.name || props.user.username }),
+				text: i18n.tsx.unfollowConfirm({ name: props.user.name || props.user.username }),
 			});
 
 			if (canceled) return;
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 9c4354ef5f..d7bb64661b 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -73,7 +73,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<div v-if="translating || translation" :class="$style.translation">
 							<MkLoading v-if="translating" mini/>
 							<div v-else>
-								<b>{{ i18n.t('translatedFrom', { x: translation.sourceLang }) }}: </b>
+								<b>{{ i18n.tsx.translatedFrom({ x: translation.sourceLang }) }}: </b>
 								<Mfm :text="translation.text" :author="appearNote.user" :nyaize="'respect'" :emojiUrls="appearNote.emojis"/>
 							</div>
 						</div>
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index e941827d74..1f5b283cfe 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -87,7 +87,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<div v-if="translating || translation" :class="$style.translation">
 					<MkLoading v-if="translating" mini/>
 					<div v-else>
-						<b>{{ i18n.t('translatedFrom', { x: translation.sourceLang }) }}: </b>
+						<b>{{ i18n.tsx.translatedFrom({ x: translation.sourceLang }) }}: </b>
 						<Mfm :text="translation.text" :author="appearNote.user" :nyaize="'respect'" :emojiUrls="appearNote.emojis"/>
 					</div>
 				</div>
diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue
index ce8b054b39..92be20c6f6 100644
--- a/packages/frontend/src/components/MkNotification.vue
+++ b/packages/frontend/src/components/MkNotification.vue
@@ -56,8 +56,8 @@ 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.user" 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'">{{ i18n.t('_notification.reactedBySomeUsers', { n: notification.reactions.length }) }}</span>
-			<span v-else-if="notification.type === 'renote:grouped'">{{ i18n.t('_notification.renotedBySomeUsers', { n: notification.users.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>{{ notification.header }}</span>
 			<MkTime v-if="withTime" :time="notification.createdAt" :class="$style.headerTime"/>
 		</header>
diff --git a/packages/frontend/src/components/MkNotificationSelectWindow.vue b/packages/frontend/src/components/MkNotificationSelectWindow.vue
index 6725776f43..0e77d2a6aa 100644
--- a/packages/frontend/src/components/MkNotificationSelectWindow.vue
+++ b/packages/frontend/src/components/MkNotificationSelectWindow.vue
@@ -23,7 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkButton inline @click="disableAll">{{ i18n.ts.disableAll }}</MkButton>
 				<MkButton inline @click="enableAll">{{ i18n.ts.enableAll }}</MkButton>
 			</div>
-			<MkSwitch v-for="ntype in notificationTypes" :key="ntype" v-model="typesMap[ntype].value">{{ i18n.t(`_notification._types.${ntype}`) }}</MkSwitch>
+			<MkSwitch v-for="ntype in notificationTypes" :key="ntype" v-model="typesMap[ntype].value">{{ i18n.ts._notification._types[ntype] }}</MkSwitch>
 		</div>
 	</MkSpacer>
 </MkModalWindow>
diff --git a/packages/frontend/src/components/MkPoll.vue b/packages/frontend/src/components/MkPoll.vue
index 4cac1fe9c3..7c58b58697 100644
--- a/packages/frontend/src/components/MkPoll.vue
+++ b/packages/frontend/src/components/MkPoll.vue
@@ -11,12 +11,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<span :class="$style.fg">
 				<template v-if="choice.isVoted"><i class="ti ti-check" style="margin-right: 4px; color: var(--accent);"></i></template>
 				<Mfm :text="choice.text" :plain="true"/>
-				<span v-if="showResult" style="margin-left: 4px; opacity: 0.7;">({{ i18n.t('_poll.votesCount', { n: choice.votes }) }})</span>
+				<span v-if="showResult" style="margin-left: 4px; opacity: 0.7;">({{ i18n.tsx._poll.votesCount({ n: choice.votes }) }})</span>
 			</span>
 		</li>
 	</ul>
 	<p v-if="!readOnly" :class="$style.info">
-		<span>{{ i18n.t('_poll.totalVotes', { n: total }) }}</span>
+		<span>{{ i18n.tsx._poll.totalVotes({ n: total }) }}</span>
 		<span> · </span>
 		<a v-if="!closed && !isVoted" style="color: inherit;" @click="showResult = !showResult">{{ showResult ? i18n.ts._poll.vote : i18n.ts._poll.showResult }}</a>
 		<span v-if="isVoted">{{ i18n.ts._poll.voted }}</span>
@@ -47,10 +47,11 @@ const remaining = ref(-1);
 const total = computed(() => sum(props.note.poll.choices.map(x => x.votes)));
 const closed = computed(() => remaining.value === 0);
 const isVoted = computed(() => !props.note.poll.multiple && props.note.poll.choices.some(c => c.isVoted));
-const timer = computed(() => i18n.t(
-	remaining.value >= 86400 ? '_poll.remainingDays' :
-	remaining.value >= 3600 ? '_poll.remainingHours' :
-	remaining.value >= 60 ? '_poll.remainingMinutes' : '_poll.remainingSeconds', {
+const timer = computed(() => i18n.tsx._poll[
+		remaining.value >= 86400 ? 'remainingDays' :
+		remaining.value >= 3600 ? 'remainingHours' :
+		remaining.value >= 60 ? 'remainingMinutes' : 'remainingSeconds'
+	]({
 		s: Math.floor(remaining.value % 60),
 		m: Math.floor(remaining.value / 60) % 60,
 		h: Math.floor(remaining.value / 3600) % 24,
@@ -81,7 +82,7 @@ const vote = async (id) => {
 
 	const { canceled } = await os.confirm({
 		type: 'question',
-		text: i18n.t('voteConfirm', { choice: props.note.poll.choices[id].text }),
+		text: i18n.tsx.voteConfirm({ choice: props.note.poll.choices[id].text }),
 	});
 	if (canceled) return;
 
diff --git a/packages/frontend/src/components/MkPollEditor.vue b/packages/frontend/src/components/MkPollEditor.vue
index 43e576d1ab..34f6c72b6e 100644
--- a/packages/frontend/src/components/MkPollEditor.vue
+++ b/packages/frontend/src/components/MkPollEditor.vue
@@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</p>
 	<ul>
 		<li v-for="(choice, i) in choices" :key="i">
-			<MkInput class="input" small :modelValue="choice" :placeholder="i18n.t('_poll.choiceN', { n: i + 1 })" @update:modelValue="onInput(i, $event)">
+			<MkInput class="input" small :modelValue="choice" :placeholder="i18n.tsx._poll.choiceN({ n: i + 1 })" @update:modelValue="onInput(i, $event)">
 			</MkInput>
 			<button class="_button" @click="remove(i)">
 				<i class="ti ti-x"></i>
diff --git a/packages/frontend/src/components/MkSignupDialog.form.vue b/packages/frontend/src/components/MkSignupDialog.form.vue
index 79e17c9aef..e27510fb34 100644
--- a/packages/frontend/src/components/MkSignupDialog.form.vue
+++ b/packages/frontend/src/components/MkSignupDialog.form.vue
@@ -263,7 +263,7 @@ async function onSubmit(): Promise<void> {
 			os.alert({
 				type: 'success',
 				title: i18n.ts._signup.almostThere,
-				text: i18n.t('_signup.emailSent', { email: email.value }),
+				text: i18n.tsx._signup.emailSent({ email: email.value }),
 			});
 			emit('signupEmailPending');
 		} else {
diff --git a/packages/frontend/src/components/MkSignupDialog.rules.vue b/packages/frontend/src/components/MkSignupDialog.rules.vue
index 8cf7ce92ad..d42b496a34 100644
--- a/packages/frontend/src/components/MkSignupDialog.rules.vue
+++ b/packages/frontend/src/components/MkSignupDialog.rules.vue
@@ -105,7 +105,7 @@ async function updateAgreeServerRules(v: boolean) {
 		const confirm = await os.confirm({
 			type: 'question',
 			title: i18n.ts.doYouAgree,
-			text: i18n.t('iHaveReadXCarefullyAndAgree', { x: i18n.ts.serverRules }),
+			text: i18n.tsx.iHaveReadXCarefullyAndAgree({ x: i18n.ts.serverRules }),
 		});
 		if (confirm.canceled) return;
 		agreeServerRules.value = true;
@@ -119,7 +119,7 @@ async function updateAgreeTosAndPrivacyPolicy(v: boolean) {
 		const confirm = await os.confirm({
 			type: 'question',
 			title: i18n.ts.doYouAgree,
-			text: i18n.t('iHaveReadXCarefullyAndAgree', {
+			text: i18n.tsx.iHaveReadXCarefullyAndAgree({
 				x: tosPrivacyPolicyLabel.value,
 			}),
 		});
@@ -135,7 +135,7 @@ async function updateAgreeNote(v: boolean) {
 		const confirm = await os.confirm({
 			type: 'question',
 			title: i18n.ts.doYouAgree,
-			text: i18n.t('iHaveReadXCarefullyAndAgree', { x: i18n.ts.basicNotesBeforeCreateAccount }),
+			text: i18n.tsx.iHaveReadXCarefullyAndAgree({ x: i18n.ts.basicNotesBeforeCreateAccount }),
 		});
 		if (confirm.canceled) return;
 		agreeNote.value = true;
diff --git a/packages/frontend/src/components/MkSubNoteContent.vue b/packages/frontend/src/components/MkSubNoteContent.vue
index 438140649e..13d0e6c2ca 100644
--- a/packages/frontend/src/components/MkSubNoteContent.vue
+++ b/packages/frontend/src/components/MkSubNoteContent.vue
@@ -13,7 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkA v-if="note.renoteId" :class="$style.rp" :to="`/notes/${note.renoteId}`">RN: ...</MkA>
 	</div>
 	<details v-if="note.files.length > 0">
-		<summary>({{ i18n.t('withNFiles', { n: note.files.length }) }})</summary>
+		<summary>({{ i18n.tsx.withNFiles({ n: note.files.length }) }})</summary>
 		<MkMediaList :mediaList="note.files"/>
 	</details>
 	<details v-if="note.poll">
diff --git a/packages/frontend/src/components/MkTokenGenerateWindow.vue b/packages/frontend/src/components/MkTokenGenerateWindow.vue
index a42767e1b6..28f2f29b7d 100644
--- a/packages/frontend/src/components/MkTokenGenerateWindow.vue
+++ b/packages/frontend/src/components/MkTokenGenerateWindow.vue
@@ -33,12 +33,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkButton inline @click="enableAll">{{ i18n.ts.enableAll }}</MkButton>
 			</div>
 			<div class="_gaps_s">
-				<MkSwitch v-for="kind in Object.keys(permissionSwitches)" :key="kind" v-model="permissionSwitches[kind]">{{ i18n.t(`_permissions.${kind}`) }}</MkSwitch>
+				<MkSwitch v-for="kind in Object.keys(permissionSwitches)" :key="kind" v-model="permissionSwitches[kind]">{{ i18n.ts._permissions[kind] }}</MkSwitch>
 			</div>
 			<div v-if="iAmAdmin" :class="$style.adminPermissions">
 				<div :class="$style.adminPermissionsHeader"><b>{{ i18n.ts.adminPermission }}</b></div>
 				<div class="_gaps_s">
-					<MkSwitch v-for="kind in Object.keys(permissionSwitchesForAdmin)" :key="kind" v-model="permissionSwitchesForAdmin[kind]">{{ i18n.t(`_permissions.${kind}`) }}</MkSwitch>
+					<MkSwitch v-for="kind in Object.keys(permissionSwitchesForAdmin)" :key="kind" v-model="permissionSwitchesForAdmin[kind]">{{ i18n.ts._permissions[kind] }}</MkSwitch>
 				</div>
 			</div>
 		</div>
diff --git a/packages/frontend/src/components/MkTutorialDialog.vue b/packages/frontend/src/components/MkTutorialDialog.vue
index 963e78a1ff..9c3b46e133 100644
--- a/packages/frontend/src/components/MkTutorialDialog.vue
+++ b/packages/frontend/src/components/MkTutorialDialog.vue
@@ -133,7 +133,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 									<a href="https://misskey-hub.net/docs/for-users/" target="_blank" class="_link">{{ i18n.ts.help }}</a>
 								</template>
 							</I18n>
-							<div>{{ i18n.t('_initialAccountSetting.haveFun', { name: instance.name ?? host }) }}</div>
+							<div>{{ i18n.tsx._initialAccountSetting.haveFun({ name: instance.name ?? host }) }}</div>
 							<div class="_buttonsCenter" style="margin-top: 16px;">
 								<MkButton v-if="initialPage !== 4" rounded @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
 								<MkButton rounded primary gradate @click="close(false)">{{ i18n.ts.close }}</MkButton>
diff --git a/packages/frontend/src/components/MkUserAnnouncementEditDialog.vue b/packages/frontend/src/components/MkUserAnnouncementEditDialog.vue
index af094a8e8c..9e3a78fe22 100644
--- a/packages/frontend/src/components/MkUserAnnouncementEditDialog.vue
+++ b/packages/frontend/src/components/MkUserAnnouncementEditDialog.vue
@@ -118,7 +118,7 @@ async function done() {
 async function del() {
 	const { canceled } = await os.confirm({
 		type: 'warning',
-		text: i18n.t('removeAreYouSure', { x: title.value }),
+		text: i18n.tsx.removeAreYouSure({ x: title.value }),
 	});
 	if (canceled) return;
 
diff --git a/packages/frontend/src/components/MkUserSetupDialog.Profile.vue b/packages/frontend/src/components/MkUserSetupDialog.Profile.vue
index 37aa677b44..f082833838 100644
--- a/packages/frontend/src/components/MkUserSetupDialog.Profile.vue
+++ b/packages/frontend/src/components/MkUserSetupDialog.Profile.vue
@@ -68,7 +68,7 @@ function setAvatar(ev) {
 
 		const { canceled } = await os.confirm({
 			type: 'question',
-			text: i18n.t('cropImageAsk'),
+			text: i18n.ts.cropImageAsk,
 			okText: i18n.ts.cropYes,
 			cancelText: i18n.ts.cropNo,
 		});
diff --git a/packages/frontend/src/components/MkUserSetupDialog.vue b/packages/frontend/src/components/MkUserSetupDialog.vue
index 05b55f77a7..4b0c540829 100644
--- a/packages/frontend/src/components/MkUserSetupDialog.vue
+++ b/packages/frontend/src/components/MkUserSetupDialog.vue
@@ -93,7 +93,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<div class="_gaps" style="text-align: center;">
 							<i class="ti ti-bell-ringing-2" style="display: block; margin: auto; font-size: 3em; color: var(--accent);"></i>
 							<div style="font-size: 120%;">{{ i18n.ts.pushNotification }}</div>
-							<div style="padding: 0 16px;">{{ i18n.t('_initialAccountSetting.pushNotificationDescription', { name: instance.name ?? host }) }}</div>
+							<div style="padding: 0 16px;">{{ i18n.tsx._initialAccountSetting.pushNotificationDescription({ name: instance.name ?? host }) }}</div>
 							<MkPushNotificationAllowButton primary showOnlyToRegister style="margin: 0 auto;"/>
 							<div class="_buttonsCenter" style="margin-top: 16px;">
 								<MkButton rounded data-cy-user-setup-back @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
@@ -110,7 +110,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<div class="_gaps" style="text-align: center;">
 							<i class="ti ti-check" style="display: block; margin: auto; font-size: 3em; color: var(--accent);"></i>
 							<div style="font-size: 120%;">{{ i18n.ts._initialAccountSetting.initialAccountSettingCompleted }}</div>
-							<div>{{ i18n.t('_initialAccountSetting.youCanContinueTutorial', { name: instance.name ?? host }) }}</div>
+							<div>{{ i18n.tsx._initialAccountSetting.youCanContinueTutorial({ name: instance.name ?? host }) }}</div>
 							<div class="_buttonsCenter" style="margin-top: 16px;">
 								<MkButton rounded primary gradate data-cy-user-setup-continue @click="launchTutorial()">{{ i18n.ts._initialAccountSetting.startTutorial }} <i class="ti ti-arrow-right"></i></MkButton>
 							</div>
diff --git a/packages/frontend/src/components/MkWidgets.vue b/packages/frontend/src/components/MkWidgets.vue
index ee4e29dd8f..b8b253de06 100644
--- a/packages/frontend/src/components/MkWidgets.vue
+++ b/packages/frontend/src/components/MkWidgets.vue
@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<header :class="$style.editHeader">
 			<MkSelect v-model="widgetAdderSelected" style="margin-bottom: var(--margin)" data-cy-widget-select>
 				<template #label>{{ i18n.ts.selectWidget }}</template>
-				<option v-for="widget in widgetDefs" :key="widget" :value="widget">{{ i18n.t(`_widgets.${widget}`) }}</option>
+				<option v-for="widget in widgetDefs" :key="widget" :value="widget">{{ i18n.ts._widgets[widget] }}</option>
 			</MkSelect>
 			<MkButton inline primary data-cy-widget-add @click="addWidget"><i class="ti ti-plus"></i> {{ i18n.ts.add }}</MkButton>
 			<MkButton inline @click="$emit('exit')">{{ i18n.ts.close }}</MkButton>
@@ -109,7 +109,7 @@ function onContextmenu(widget: Widget, ev: MouseEvent) {
 
 	os.contextMenu([{
 		type: 'label',
-		text: i18n.t(`_widgets.${widget.name}`),
+		text: i18n.ts._widgets[widget.name],
 	}, {
 		icon: 'ti ti-settings',
 		text: i18n.ts.settings,
diff --git a/packages/frontend/src/components/global/I18n.vue b/packages/frontend/src/components/global/I18n.vue
new file mode 100644
index 0000000000..162aa2bcf8
--- /dev/null
+++ b/packages/frontend/src/components/global/I18n.vue
@@ -0,0 +1,46 @@
+<template>
+<render/>
+</template>
+
+<script setup lang="ts" generic="T extends string | ParameterizedString">
+import { computed, h } from 'vue';
+import type { ParameterizedString } from '../../../../../locales/index.js';
+
+const props = withDefaults(defineProps<{
+	src: T;
+	tag?: string;
+	// eslint-disable-next-line vue/require-default-prop
+	textTag?: string;
+}>(), {
+	tag: 'span',
+});
+
+const slots = defineSlots<T extends ParameterizedString<infer R> ? { [K in R]: () => unknown } : NonNullable<unknown>>();
+
+const parsed = computed(() => {
+	let str = props.src as string;
+	const value: (string | { arg: string; })[] = [];
+	for (;;) {
+		const nextBracketOpen = str.indexOf('{');
+		const nextBracketClose = str.indexOf('}');
+
+		if (nextBracketOpen === -1) {
+			value.push(str);
+			break;
+		} else {
+			if (nextBracketOpen > 0) value.push(str.substring(0, nextBracketOpen));
+			value.push({
+				arg: str.substring(nextBracketOpen + 1, nextBracketClose),
+			});
+		}
+
+		str = str.substring(nextBracketClose + 1);
+	}
+
+	return value;
+});
+
+const render = () => {
+	return h(props.tag, parsed.value.map(x => typeof x === 'string' ? (props.textTag ? h(props.textTag, x) : x) : slots[x.arg]()));
+};
+</script>
diff --git a/packages/frontend/src/components/global/MkTime.stories.impl.ts b/packages/frontend/src/components/global/MkTime.stories.impl.ts
index 0eeefa4859..0e7f6a9bdf 100644
--- a/packages/frontend/src/components/global/MkTime.stories.impl.ts
+++ b/packages/frontend/src/components/global/MkTime.stories.impl.ts
@@ -123,7 +123,7 @@ export const DetailNow = {
 export const RelativeOneHourAgo = {
 	...Empty,
 	async play({ canvasElement }) {
-		await expect(canvasElement).toHaveTextContent(i18n.t('_ago.hoursAgo', { n: 1 }));
+		await expect(canvasElement).toHaveTextContent(i18n.tsx._ago.hoursAgo({ n: 1 }));
 	},
 	args: {
 		...Empty.args,
@@ -162,7 +162,7 @@ export const DetailOneHourAgo = {
 export const RelativeOneDayAgo = {
 	...Empty,
 	async play({ canvasElement }) {
-		await expect(canvasElement).toHaveTextContent(i18n.t('_ago.daysAgo', { n: 1 }));
+		await expect(canvasElement).toHaveTextContent(i18n.tsx._ago.daysAgo({ n: 1 }));
 	},
 	args: {
 		...Empty.args,
@@ -201,7 +201,7 @@ export const DetailOneDayAgo = {
 export const RelativeOneWeekAgo = {
 	...Empty,
 	async play({ canvasElement }) {
-		await expect(canvasElement).toHaveTextContent(i18n.t('_ago.weeksAgo', { n: 1 }));
+		await expect(canvasElement).toHaveTextContent(i18n.tsx._ago.weeksAgo({ n: 1 }));
 	},
 	args: {
 		...Empty.args,
@@ -240,7 +240,7 @@ export const DetailOneWeekAgo = {
 export const RelativeOneMonthAgo = {
 	...Empty,
 	async play({ canvasElement }) {
-		await expect(canvasElement).toHaveTextContent(i18n.t('_ago.monthsAgo', { n: 1 }));
+		await expect(canvasElement).toHaveTextContent(i18n.tsx._ago.monthsAgo({ n: 1 }));
 	},
 	args: {
 		...Empty.args,
@@ -279,7 +279,7 @@ export const DetailOneMonthAgo = {
 export const RelativeOneYearAgo = {
 	...Empty,
 	async play({ canvasElement }) {
-		await expect(canvasElement).toHaveTextContent(i18n.t('_ago.yearsAgo', { n: 1 }));
+		await expect(canvasElement).toHaveTextContent(i18n.tsx._ago.yearsAgo({ n: 1 }));
 	},
 	args: {
 		...Empty.args,
diff --git a/packages/frontend/src/components/global/MkTime.vue b/packages/frontend/src/components/global/MkTime.vue
index e11db9dc31..2b0bf246ad 100644
--- a/packages/frontend/src/components/global/MkTime.vue
+++ b/packages/frontend/src/components/global/MkTime.vue
@@ -55,21 +55,21 @@ const relative = computed<string>(() => {
 	if (invalid) return i18n.ts._ago.invalid;
 
 	return (
-		ago.value >= 31536000 ? i18n.t('_ago.yearsAgo', { n: Math.round(ago.value / 31536000).toString() }) :
-		ago.value >= 2592000 ? i18n.t('_ago.monthsAgo', { n: Math.round(ago.value / 2592000).toString() }) :
-		ago.value >= 604800 ? i18n.t('_ago.weeksAgo', { n: Math.round(ago.value / 604800).toString() }) :
-		ago.value >= 86400 ? i18n.t('_ago.daysAgo', { n: Math.round(ago.value / 86400).toString() }) :
-		ago.value >= 3600 ? i18n.t('_ago.hoursAgo', { n: Math.round(ago.value / 3600).toString() }) :
-		ago.value >= 60 ? i18n.t('_ago.minutesAgo', { n: (~~(ago.value / 60)).toString() }) :
-		ago.value >= 10 ? i18n.t('_ago.secondsAgo', { n: (~~(ago.value % 60)).toString() }) :
+		ago.value >= 31536000 ? i18n.tsx._ago.yearsAgo({ n: Math.round(ago.value / 31536000).toString() }) :
+		ago.value >= 2592000 ? i18n.tsx._ago.monthsAgo({ n: Math.round(ago.value / 2592000).toString() }) :
+		ago.value >= 604800 ? i18n.tsx._ago.weeksAgo({ n: Math.round(ago.value / 604800).toString() }) :
+		ago.value >= 86400 ? i18n.tsx._ago.daysAgo({ n: Math.round(ago.value / 86400).toString() }) :
+		ago.value >= 3600 ? i18n.tsx._ago.hoursAgo({ n: Math.round(ago.value / 3600).toString() }) :
+		ago.value >= 60 ? i18n.tsx._ago.minutesAgo({ n: (~~(ago.value / 60)).toString() }) :
+		ago.value >= 10 ? i18n.tsx._ago.secondsAgo({ n: (~~(ago.value % 60)).toString() }) :
 		ago.value >= -3 ? i18n.ts._ago.justNow :
-		ago.value < -31536000 ? i18n.t('_timeIn.years', { n: Math.round(-ago.value / 31536000).toString() }) :
-		ago.value < -2592000 ? i18n.t('_timeIn.months', { n: Math.round(-ago.value / 2592000).toString() }) :
-		ago.value < -604800 ? i18n.t('_timeIn.weeks', { n: Math.round(-ago.value / 604800).toString() }) :
-		ago.value < -86400 ? i18n.t('_timeIn.days', { n: Math.round(-ago.value / 86400).toString() }) :
-		ago.value < -3600 ? i18n.t('_timeIn.hours', { n: Math.round(-ago.value / 3600).toString() }) :
-		ago.value < -60 ? i18n.t('_timeIn.minutes', { n: (~~(-ago.value / 60)).toString() }) :
-		i18n.t('_timeIn.seconds', { n: (~~(-ago.value % 60)).toString() })
+		ago.value < -31536000 ? i18n.tsx._timeIn.years({ n: Math.round(-ago.value / 31536000).toString() }) :
+		ago.value < -2592000 ? i18n.tsx._timeIn.months({ n: Math.round(-ago.value / 2592000).toString() }) :
+		ago.value < -604800 ? i18n.tsx._timeIn.weeks({ n: Math.round(-ago.value / 604800).toString() }) :
+		ago.value < -86400 ? i18n.tsx._timeIn.days({ n: Math.round(-ago.value / 86400).toString() }) :
+		ago.value < -3600 ? i18n.tsx._timeIn.hours({ n: Math.round(-ago.value / 3600).toString() }) :
+		ago.value < -60 ? i18n.tsx._timeIn.minutes({ n: (~~(-ago.value / 60)).toString() }) :
+		i18n.tsx._timeIn.seconds({ n: (~~(-ago.value % 60)).toString() })
 	);
 });
 
diff --git a/packages/frontend/src/components/global/i18n.ts b/packages/frontend/src/components/global/i18n.ts
deleted file mode 100644
index 2f4d7edabd..0000000000
--- a/packages/frontend/src/components/global/i18n.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { h } from 'vue';
-
-export default function(props: { src: string; tag?: string; textTag?: string; }, { slots }) {
-	let str = props.src;
-	const parsed = [] as (string | { arg: string; })[];
-	while (true) {
-		const nextBracketOpen = str.indexOf('{');
-		const nextBracketClose = str.indexOf('}');
-
-		if (nextBracketOpen === -1) {
-			parsed.push(str);
-			break;
-		} else {
-			if (nextBracketOpen > 0) parsed.push(str.substring(0, nextBracketOpen));
-			parsed.push({
-				arg: str.substring(nextBracketOpen + 1, nextBracketClose),
-			});
-		}
-
-		str = str.substring(nextBracketClose + 1);
-	}
-
-	return h(props.tag ?? 'span', parsed.map(x => typeof x === 'string' ? (props.textTag ? h(props.textTag, x) : x) : slots[x.arg]()));
-}
diff --git a/packages/frontend/src/components/index.ts b/packages/frontend/src/components/index.ts
index a3e13c3a50..f3b476b15c 100644
--- a/packages/frontend/src/components/index.ts
+++ b/packages/frontend/src/components/index.ts
@@ -16,7 +16,7 @@ import MkUserName from './global/MkUserName.vue';
 import MkEllipsis from './global/MkEllipsis.vue';
 import MkTime from './global/MkTime.vue';
 import MkUrl from './global/MkUrl.vue';
-import I18n from './global/i18n.js';
+import I18n from './global/I18n.vue';
 import RouterView from './global/RouterView.vue';
 import MkLoading from './global/MkLoading.vue';
 import MkError from './global/MkError.vue';
diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue
index 4ba1b6da76..69cb6ef647 100644
--- a/packages/frontend/src/pages/about.vue
+++ b/packages/frontend/src/pages/about.vue
@@ -29,7 +29,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 							<template #key>Misskey</template>
 							<template #value>{{ version }}</template>
 						</MkKeyValue>
-						<div v-html="i18n.t('poweredByMisskeyDescription', { name: instance.name ?? host })">
+						<div v-html="i18n.tsx.poweredByMisskeyDescription({ name: instance.name ?? host })">
 						</div>
 						<FormLink to="/about-misskey">{{ i18n.ts.aboutMisskey }}</FormLink>
 					</div>
diff --git a/packages/frontend/src/pages/admin-file.vue b/packages/frontend/src/pages/admin-file.vue
index 4a9c659a97..84f3d1f3f1 100644
--- a/packages/frontend/src/pages/admin-file.vue
+++ b/packages/frontend/src/pages/admin-file.vue
@@ -104,7 +104,7 @@ fetch();
 async function del() {
 	const { canceled } = await os.confirm({
 		type: 'warning',
-		text: i18n.t('removeAreYouSure', { x: file.value.name }),
+		text: i18n.tsx.removeAreYouSure({ x: file.value.name }),
 	});
 	if (canceled) return;
 
diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue
index 85417f0ecb..530bcca04a 100644
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@@ -182,9 +182,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 						</MkSelect>
 					</div>
 					<div class="charts">
-						<div class="label">{{ i18n.t('recentNHours', { n: 90 }) }}</div>
+						<div class="label">{{ i18n.tsx.recentNHours({ n: 90 }) }}</div>
 						<MkChart class="chart" :src="chartSrc" span="hour" :limit="90" :args="{ user, withoutAll: true }" :detailed="true"></MkChart>
-						<div class="label">{{ i18n.t('recentNDays', { n: 90 }) }}</div>
+						<div class="label">{{ i18n.tsx.recentNDays({ n: 90 }) }}</div>
 						<MkChart class="chart" :src="chartSrc" span="day" :limit="90" :args="{ user, withoutAll: true }" :detailed="true"></MkChart>
 					</div>
 				</div>
@@ -307,7 +307,7 @@ async function resetPassword() {
 		});
 		os.alert({
 			type: 'success',
-			text: i18n.t('newPasswordIs', { password }),
+			text: i18n.tsx.newPasswordIs({ password }),
 		});
 	}
 }
@@ -390,7 +390,7 @@ async function deleteAccount() {
 	if (confirm.canceled) return;
 
 	const typed = await os.inputText({
-		text: i18n.t('typeToConfirm', { x: user.value?.username }),
+		text: i18n.tsx.typeToConfirm({ x: user.value?.username }),
 	});
 	if (typed.canceled) return;
 
diff --git a/packages/frontend/src/pages/admin/ads.vue b/packages/frontend/src/pages/admin/ads.vue
index eb9aef0e48..fe55fe3a02 100644
--- a/packages/frontend/src/pages/admin/ads.vue
+++ b/packages/frontend/src/pages/admin/ads.vue
@@ -160,7 +160,7 @@ function add() {
 function remove(ad) {
 	os.confirm({
 		type: 'warning',
-		text: i18n.t('removeAreYouSure', { x: ad.url }),
+		text: i18n.tsx.removeAreYouSure({ x: ad.url }),
 	}).then(({ canceled }) => {
 		if (canceled) return;
 		ads.value = ads.value.filter(x => x !== ad);
diff --git a/packages/frontend/src/pages/admin/announcements.vue b/packages/frontend/src/pages/admin/announcements.vue
index f941d512b3..44552fb88c 100644
--- a/packages/frontend/src/pages/admin/announcements.vue
+++ b/packages/frontend/src/pages/admin/announcements.vue
@@ -54,7 +54,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkSwitch v-model="announcement.needConfirmationToRead" :helpText="i18n.ts._announcement.needConfirmationToReadDescription">
 						{{ i18n.ts._announcement.needConfirmationToRead }}
 					</MkSwitch>
-					<p v-if="announcement.reads">{{ i18n.t('nUsersRead', { n: announcement.reads }) }}</p>
+					<p v-if="announcement.reads">{{ i18n.tsx.nUsersRead({ n: announcement.reads }) }}</p>
 					<div class="buttons _buttons">
 						<MkButton class="button" inline primary @click="save(announcement)"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton>
 						<MkButton v-if="announcement.id != null" class="button" inline @click="archive(announcement)"><i class="ti ti-check"></i> {{ i18n.ts._announcement.end }} ({{ i18n.ts.archive }})</MkButton>
@@ -109,7 +109,7 @@ function add() {
 function del(announcement) {
 	os.confirm({
 		type: 'warning',
-		text: i18n.t('deleteAreYouSure', { x: announcement.title }),
+		text: i18n.tsx.deleteAreYouSure({ x: announcement.title }),
 	}).then(({ canceled }) => {
 		if (canceled) return;
 		announcements.value = announcements.value.filter(x => x !== announcement);
diff --git a/packages/frontend/src/pages/admin/branding.vue b/packages/frontend/src/pages/admin/branding.vue
index 72b47949e7..dbbb3941d8 100644
--- a/packages/frontend/src/pages/admin/branding.vue
+++ b/packages/frontend/src/pages/admin/branding.vue
@@ -19,10 +19,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<template #prefix><i class="ti ti-link"></i></template>
 						<template #label>{{ i18n.ts._serverSettings.iconUrl }} (App/192px)</template>
 						<template #caption>
-							<div>{{ i18n.t('_serverSettings.appIconDescription', { host: instance.name ?? host }) }}</div>
+							<div>{{ i18n.tsx._serverSettings.appIconDescription({ host: instance.name ?? host }) }}</div>
 							<div>({{ i18n.ts._serverSettings.appIconUsageExample }})</div>
 							<div>{{ i18n.ts._serverSettings.appIconStyleRecommendation }}</div>
-							<div><strong>{{ i18n.t('_serverSettings.appIconResolutionMustBe', { resolution: '192x192px' }) }}</strong></div>
+							<div><strong>{{ i18n.tsx._serverSettings.appIconResolutionMustBe({ resolution: '192x192px' }) }}</strong></div>
 						</template>
 					</MkInput>
 
@@ -30,10 +30,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<template #prefix><i class="ti ti-link"></i></template>
 						<template #label>{{ i18n.ts._serverSettings.iconUrl }} (App/512px)</template>
 						<template #caption>
-							<div>{{ i18n.t('_serverSettings.appIconDescription', { host: instance.name ?? host }) }}</div>
+							<div>{{ i18n.tsx._serverSettings.appIconDescription({ host: instance.name ?? host }) }}</div>
 							<div>({{ i18n.ts._serverSettings.appIconUsageExample }})</div>
 							<div>{{ i18n.ts._serverSettings.appIconStyleRecommendation }}</div>
-							<div><strong>{{ i18n.t('_serverSettings.appIconResolutionMustBe', { resolution: '512x512px' }) }}</strong></div>
+							<div><strong>{{ i18n.tsx._serverSettings.appIconResolutionMustBe({ resolution: '512x512px' }) }}</strong></div>
 						</template>
 					</MkInput>
 
diff --git a/packages/frontend/src/pages/admin/relays.vue b/packages/frontend/src/pages/admin/relays.vue
index 6811a8eba5..847c8bc1d4 100644
--- a/packages/frontend/src/pages/admin/relays.vue
+++ b/packages/frontend/src/pages/admin/relays.vue
@@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<i v-if="relay.status === 'accepted'" class="ti ti-check" :class="$style.icon" style="color: var(--success);"></i>
 					<i v-else-if="relay.status === 'rejected'" class="ti ti-ban" :class="$style.icon" style="color: var(--error);"></i>
 					<i v-else class="ti ti-clock" :class="$style.icon"></i>
-					<span>{{ i18n.t(`_relayStatus.${relay.status}`) }}</span>
+					<span>{{ i18n.ts._relayStatus[relay.status] }}</span>
 				</div>
 				<MkButton class="button" inline danger @click="remove(relay.inbox)"><i class="ti ti-trash"></i> {{ i18n.ts.remove }}</MkButton>
 			</div>
diff --git a/packages/frontend/src/pages/admin/roles.role.vue b/packages/frontend/src/pages/admin/roles.role.vue
index ff29f4ec1f..ad58255576 100644
--- a/packages/frontend/src/pages/admin/roles.role.vue
+++ b/packages/frontend/src/pages/admin/roles.role.vue
@@ -104,7 +104,7 @@ function edit() {
 async function del() {
 	const { canceled } = await os.confirm({
 		type: 'warning',
-		text: i18n.t('deleteAreYouSure', { x: role.name }),
+		text: i18n.tsx.deleteAreYouSure({ x: role.name }),
 	});
 	if (canceled) return;
 
diff --git a/packages/frontend/src/pages/announcements.vue b/packages/frontend/src/pages/announcements.vue
index c31c6d0903..e3c0ea574a 100644
--- a/packages/frontend/src/pages/announcements.vue
+++ b/packages/frontend/src/pages/announcements.vue
@@ -78,7 +78,7 @@ async function read(announcement) {
 		const confirm = await os.confirm({
 			type: 'question',
 			title: i18n.ts._announcement.readConfirmTitle,
-			text: i18n.t('_announcement.readConfirmText', { title: announcement.title }),
+			text: i18n.tsx._announcement.readConfirmText({ title: announcement.title }),
 		});
 		if (confirm.canceled) return;
 	}
diff --git a/packages/frontend/src/pages/auth.form.vue b/packages/frontend/src/pages/auth.form.vue
index 39a7924f94..50fd696af3 100644
--- a/packages/frontend/src/pages/auth.form.vue
+++ b/packages/frontend/src/pages/auth.form.vue
@@ -6,12 +6,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <section>
 	<div v-if="app.permission.length > 0">
-		<p>{{ i18n.t('_auth.permission', { name }) }}</p>
+		<p>{{ i18n.tsx._auth.permission({ name }) }}</p>
 		<ul>
-			<li v-for="p in app.permission" :key="p">{{ i18n.t(`_permissions.${p}`) }}</li>
+			<li v-for="p in app.permission" :key="p">{{ i18n.ts._permissions[p] }}</li>
 		</ul>
 	</div>
-	<div>{{ i18n.t('_auth.shareAccess', { name: `${name} (${app.id})` }) }}</div>
+	<div>{{ i18n.tsx._auth.shareAccess({ name: `${name} (${app.id})` }) }}</div>
 	<div :class="$style.buttons">
 		<MkButton inline @click="cancel">{{ i18n.ts.cancel }}</MkButton>
 		<MkButton inline primary @click="accept">{{ i18n.ts.accept }}</MkButton>
diff --git a/packages/frontend/src/pages/auth.vue b/packages/frontend/src/pages/auth.vue
index fd38e22ce8..9b409aa4f8 100644
--- a/packages/frontend/src/pages/auth.vue
+++ b/packages/frontend/src/pages/auth.vue
@@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<h1>{{ i18n.ts._auth.denied }}</h1>
 			</div>
 			<div v-if="state == 'accepted' && session">
-				<h1>{{ session.app.isAuthorized ? i18n.t('already-authorized') : i18n.ts.allowed }}</h1>
+				<h1>{{ session.app.isAuthorized ? i18n.ts['already-authorized'] : i18n.ts.allowed }}</h1>
 				<p v-if="session.app.callbackUrl">
 					{{ i18n.ts._auth.callback }}
 					<MkEllipsis/>
diff --git a/packages/frontend/src/pages/avatar-decorations.vue b/packages/frontend/src/pages/avatar-decorations.vue
index 376679fd17..f71a7685bd 100644
--- a/packages/frontend/src/pages/avatar-decorations.vue
+++ b/packages/frontend/src/pages/avatar-decorations.vue
@@ -60,7 +60,7 @@ function add() {
 function del(avatarDecoration) {
 	os.confirm({
 		type: 'warning',
-		text: i18n.t('deleteAreYouSure', { x: avatarDecoration.name }),
+		text: i18n.tsx.deleteAreYouSure({ x: avatarDecoration.name }),
 	}).then(({ canceled }) => {
 		if (canceled) return;
 		avatarDecorations.value = avatarDecorations.value.filter(x => x !== avatarDecoration);
diff --git a/packages/frontend/src/pages/channel-editor.vue b/packages/frontend/src/pages/channel-editor.vue
index 99b93444db..bbe5dc0a4e 100644
--- a/packages/frontend/src/pages/channel-editor.vue
+++ b/packages/frontend/src/pages/channel-editor.vue
@@ -174,7 +174,7 @@ function save() {
 async function archive() {
 	const { canceled } = await os.confirm({
 		type: 'warning',
-		title: i18n.t('channelArchiveConfirmTitle', { name: name.value }),
+		title: i18n.tsx.channelArchiveConfirmTitle({ name: name.value }),
 		text: i18n.ts.channelArchiveConfirmDescription,
 	});
 
diff --git a/packages/frontend/src/pages/clip.vue b/packages/frontend/src/pages/clip.vue
index e55e99a6fa..8640561583 100644
--- a/packages/frontend/src/pages/clip.vue
+++ b/packages/frontend/src/pages/clip.vue
@@ -145,7 +145,7 @@ const headerActions = computed(() => clip.value && isOwned.value ? [{
 	handler: async (): Promise<void> => {
 		const { canceled } = await os.confirm({
 			type: 'warning',
-			text: i18n.t('deleteAreYouSure', { x: clip.value.name }),
+			text: i18n.tsx.deleteAreYouSure({ x: clip.value.name }),
 		});
 		if (canceled) return;
 
diff --git a/packages/frontend/src/pages/drive.file.info.vue b/packages/frontend/src/pages/drive.file.info.vue
index 64c3ad70ba..3e45f5e88c 100644
--- a/packages/frontend/src/pages/drive.file.info.vue
+++ b/packages/frontend/src/pages/drive.file.info.vue
@@ -180,7 +180,7 @@ async function deleteFile() {
 
 	const { canceled } = await os.confirm({
 		type: 'warning',
-		text: i18n.t('driveFileDeleteConfirm', { name: file.value.name }),
+		text: i18n.tsx.driveFileDeleteConfirm({ name: file.value.name }),
 	});
 
 	if (canceled) return;
diff --git a/packages/frontend/src/pages/drop-and-fusion.vue b/packages/frontend/src/pages/drop-and-fusion.vue
index beb2e714e0..b995521dfb 100644
--- a/packages/frontend/src/pages/drop-and-fusion.vue
+++ b/packages/frontend/src/pages/drop-and-fusion.vue
@@ -45,7 +45,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<div :class="$style.frame">
 					<div :class="$style.frameInner">
 						<div class="_gaps_s" style="padding: 16px;">
-							<div><b>{{ i18n.t('lastNDays', { n: 7 }) }} {{ i18n.ts.ranking }}</b> ({{ gameMode }})</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"/>
diff --git a/packages/frontend/src/pages/emoji-edit-dialog.vue b/packages/frontend/src/pages/emoji-edit-dialog.vue
index 1ef150bc2d..9dcc7bc035 100644
--- a/packages/frontend/src/pages/emoji-edit-dialog.vue
+++ b/packages/frontend/src/pages/emoji-edit-dialog.vue
@@ -185,7 +185,7 @@ async function done() {
 async function del() {
 	const { canceled } = await os.confirm({
 		type: 'warning',
-		text: i18n.t('removeAreYouSure', { x: name.value }),
+		text: i18n.tsx.removeAreYouSure({ x: name.value }),
 	});
 	if (canceled) return;
 
diff --git a/packages/frontend/src/pages/flash/flash-edit.vue b/packages/frontend/src/pages/flash/flash-edit.vue
index ba350f1c0a..8f60b83a6c 100644
--- a/packages/frontend/src/pages/flash/flash-edit.vue
+++ b/packages/frontend/src/pages/flash/flash-edit.vue
@@ -438,7 +438,7 @@ function show() {
 async function del() {
 	const { canceled } = await os.confirm({
 		type: 'warning',
-		text: i18n.t('deleteAreYouSure', { x: flash.value.title }),
+		text: i18n.tsx.deleteAreYouSure({ x: flash.value.title }),
 	});
 	if (canceled) return;
 
diff --git a/packages/frontend/src/pages/follow.vue b/packages/frontend/src/pages/follow.vue
index eefef828bd..44364bb0f2 100644
--- a/packages/frontend/src/pages/follow.vue
+++ b/packages/frontend/src/pages/follow.vue
@@ -20,7 +20,7 @@ import { mainRouter } from '@/global/router/main.js';
 async function follow(user): Promise<void> {
 	const { canceled } = await os.confirm({
 		type: 'question',
-		text: i18n.t('followConfirm', { name: user.name || user.username }),
+		text: i18n.tsx.followConfirm({ name: user.name || user.username }),
 	});
 
 	if (canceled) {
diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 4211dc0d87..9519a8a3f4 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -95,9 +95,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 						</MkSelect>
 					</div>
 					<div class="charts">
-						<div class="label">{{ i18n.t('recentNHours', { n: 90 }) }}</div>
+						<div class="label">{{ i18n.tsx.recentNHours({ n: 90 }) }}</div>
 						<MkChart class="chart" :src="chartSrc" span="hour" :limit="90" :args="{ host: host }" :detailed="true"></MkChart>
-						<div class="label">{{ i18n.t('recentNDays', { n: 90 }) }}</div>
+						<div class="label">{{ i18n.tsx.recentNDays({ n: 90 }) }}</div>
 						<MkChart class="chart" :src="chartSrc" span="day" :limit="90" :args="{ host: host }" :detailed="true"></MkChart>
 					</div>
 				</div>
diff --git a/packages/frontend/src/pages/invite.vue b/packages/frontend/src/pages/invite.vue
index 61030741fa..d8613a67d3 100644
--- a/packages/frontend/src/pages/invite.vue
+++ b/packages/frontend/src/pages/invite.vue
@@ -19,9 +19,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</MKSpacer>
 	<MkSpacer v-else :contentMax="800">
 		<div class="_gaps_m" style="text-align: center;">
-			<div v-if="resetCycle && inviteLimit">{{ i18n.t('inviteLimitResetCycle', { time: resetCycle, limit: inviteLimit }) }}</div>
+			<div v-if="resetCycle && inviteLimit">{{ i18n.tsx.inviteLimitResetCycle({ time: resetCycle, limit: inviteLimit }) }}</div>
 			<MkButton inline primary rounded :disabled="currentInviteLimit !== null && currentInviteLimit <= 0" @click="create"><i class="ti ti-user-plus"></i> {{ i18n.ts.createInviteCode }}</MkButton>
-			<div v-if="currentInviteLimit !== null">{{ i18n.t('createLimitRemaining', { limit: currentInviteLimit }) }}</div>
+			<div v-if="currentInviteLimit !== null">{{ i18n.tsx.createLimitRemaining({ limit: currentInviteLimit }) }}</div>
 
 			<MkPagination ref="pagingComponent" :pagination="pagination">
 				<template #default="{ items }">
diff --git a/packages/frontend/src/pages/miauth.vue b/packages/frontend/src/pages/miauth.vue
index 539cb462ad..27ae1bdbc8 100644
--- a/packages/frontend/src/pages/miauth.vue
+++ b/packages/frontend/src/pages/miauth.vue
@@ -20,13 +20,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 			<div v-else>
 				<div v-if="_permissions.length > 0">
-					<p v-if="name">{{ i18n.t('_auth.permission', { name }) }}</p>
+					<p v-if="name">{{ i18n.tsx._auth.permission({ name }) }}</p>
 					<p v-else>{{ i18n.ts._auth.permissionAsk }}</p>
 					<ul>
-						<li v-for="p in _permissions" :key="p">{{ i18n.t(`_permissions.${p}`) }}</li>
+						<li v-for="p in _permissions" :key="p">{{ i18n.ts._permissions[p] }}</li>
 					</ul>
 				</div>
-				<div v-if="name">{{ i18n.t('_auth.shareAccess', { name }) }}</div>
+				<div v-if="name">{{ i18n.tsx._auth.shareAccess({ name }) }}</div>
 				<div v-else>{{ i18n.ts._auth.shareAccessAsk }}</div>
 				<div :class="$style.buttons">
 					<MkButton inline @click="deny">{{ i18n.ts.cancel }}</MkButton>
diff --git a/packages/frontend/src/pages/my-antennas/editor.vue b/packages/frontend/src/pages/my-antennas/editor.vue
index 45acbb2158..a4c6ca6f52 100644
--- a/packages/frontend/src/pages/my-antennas/editor.vue
+++ b/packages/frontend/src/pages/my-antennas/editor.vue
@@ -116,7 +116,7 @@ async function saveAntenna() {
 async function deleteAntenna() {
 	const { canceled } = await os.confirm({
 		type: 'warning',
-		text: i18n.t('removeAreYouSure', { x: props.antenna.name }),
+		text: i18n.tsx.removeAreYouSure({ x: props.antenna.name }),
 	});
 	if (canceled) return;
 
diff --git a/packages/frontend/src/pages/my-lists/index.vue b/packages/frontend/src/pages/my-lists/index.vue
index 14e2315843..295112b0ba 100644
--- a/packages/frontend/src/pages/my-lists/index.vue
+++ b/packages/frontend/src/pages/my-lists/index.vue
@@ -19,7 +19,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 			<div v-if="items.length > 0" class="_gaps">
 				<MkA v-for="list in items" :key="list.id" class="_panel" :class="$style.list" :to="`/my/lists/${ list.id }`">
-					<div style="margin-bottom: 4px;">{{ list.name }} <span :class="$style.nUsers">({{ i18n.t('nUsers', { n: `${list.userIds.length}/${$i.policies['userEachUserListsLimit']}` }) }})</span></div>
+					<div style="margin-bottom: 4px;">{{ list.name }} <span :class="$style.nUsers">({{ i18n.tsx.nUsers({ n: `${list.userIds.length}/${$i.policies['userEachUserListsLimit']}` }) }})</span></div>
 					<MkAvatars :userIds="list.userIds" :limit="10"/>
 				</MkA>
 			</div>
diff --git a/packages/frontend/src/pages/my-lists/list.vue b/packages/frontend/src/pages/my-lists/list.vue
index 85775a2fdd..7207e956db 100644
--- a/packages/frontend/src/pages/my-lists/list.vue
+++ b/packages/frontend/src/pages/my-lists/list.vue
@@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 			<MkFolder defaultOpen>
 				<template #label>{{ i18n.ts.members }}</template>
-				<template #caption>{{ i18n.t('nUsers', { n: `${list.userIds.length}/${$i.policies['userEachUserListsLimit']}` }) }}</template>
+				<template #caption>{{ i18n.tsx.nUsers({ n: `${list.userIds.length}/${$i.policies['userEachUserListsLimit']}` }) }}</template>
 
 				<div class="_gaps_s">
 					<MkButton rounded primary style="margin: 0 auto;" @click="addUser()">{{ i18n.ts.addUser }}</MkButton>
@@ -155,7 +155,7 @@ async function deleteList() {
 	if (!list.value) return;
 	const { canceled } = await os.confirm({
 		type: 'warning',
-		text: i18n.t('removeAreYouSure', { x: list.value.name }),
+		text: i18n.tsx.removeAreYouSure({ x: list.value.name }),
 	});
 	if (canceled) return;
 
diff --git a/packages/frontend/src/pages/note.vue b/packages/frontend/src/pages/note.vue
index 4c0e9bbb98..9b72f9b2ac 100644
--- a/packages/frontend/src/pages/note.vue
+++ b/packages/frontend/src/pages/note.vue
@@ -147,7 +147,7 @@ definePageMetadata(computed(() => note.value ? {
 	avatar: note.value.user,
 	path: `/notes/${note.value.id}`,
 	share: {
-		title: i18n.t('noteOf', { user: note.value.user.name }),
+		title: i18n.tsx.noteOf({ user: note.value.user.name }),
 		text: note.value.text,
 	},
 } : null));
diff --git a/packages/frontend/src/pages/notifications.vue b/packages/frontend/src/pages/notifications.vue
index 8913a89adb..e6098c90b3 100644
--- a/packages/frontend/src/pages/notifications.vue
+++ b/packages/frontend/src/pages/notifications.vue
@@ -51,7 +51,7 @@ const directNotesPagination = {
 
 function setFilter(ev) {
 	const typeItems = notificationTypes.map(t => ({
-		text: i18n.t(`_notification._types.${t}`),
+		text: i18n.ts._notification._types[t],
 		active: includeTypes.value && includeTypes.value.includes(t),
 		action: () => {
 			includeTypes.value = [t];
diff --git a/packages/frontend/src/pages/oauth.vue b/packages/frontend/src/pages/oauth.vue
index 878fa6be4e..38b9dd60c4 100644
--- a/packages/frontend/src/pages/oauth.vue
+++ b/packages/frontend/src/pages/oauth.vue
@@ -9,13 +9,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<MkSpacer :contentMax="800">
 		<div v-if="$i">
 			<div v-if="permissions.length > 0">
-				<p v-if="name">{{ i18n.t('_auth.permission', { name }) }}</p>
+				<p v-if="name">{{ i18n.tsx._auth.permission({ name }) }}</p>
 				<p v-else>{{ i18n.ts._auth.permissionAsk }}</p>
 				<ul>
-					<li v-for="p in permissions" :key="p">{{ i18n.t(`_permissions.${p}`) }}</li>
+					<li v-for="p in permissions" :key="p">{{ i18n.ts._permissions[p] }}</li>
 				</ul>
 			</div>
-			<div v-if="name">{{ i18n.t('_auth.shareAccess', { name }) }}</div>
+			<div v-if="name">{{ i18n.tsx._auth.shareAccess({ name }) }}</div>
 			<div v-else>{{ i18n.ts._auth.shareAccessAsk }}</div>
 			<form :class="$style.buttons" action="/oauth/decision" accept-charset="utf-8" method="post">
 				<input name="login_token" type="hidden" :value="$i.token"/>
diff --git a/packages/frontend/src/pages/page-editor/page-editor.vue b/packages/frontend/src/pages/page-editor/page-editor.vue
index 6db72dccba..bd85b97d59 100644
--- a/packages/frontend/src/pages/page-editor/page-editor.vue
+++ b/packages/frontend/src/pages/page-editor/page-editor.vue
@@ -175,7 +175,7 @@ function save() {
 function del() {
 	os.confirm({
 		type: 'warning',
-		text: i18n.t('removeAreYouSure', { x: title.value.trim() }),
+		text: i18n.tsx.removeAreYouSure({ x: title.value.trim() }),
 	}).then(({ canceled }) => {
 		if (canceled) return;
 		misskeyApi('pages/delete', {
diff --git a/packages/frontend/src/pages/reversi/game.board.vue b/packages/frontend/src/pages/reversi/game.board.vue
index 18fd74427c..582967ad2b 100644
--- a/packages/frontend/src/pages/reversi/game.board.vue
+++ b/packages/frontend/src/pages/reversi/game.board.vue
@@ -10,17 +10,17 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 		<div style="overflow: clip; line-height: 28px;">
 			<div v-if="!iAmPlayer && !game.isEnded && turnUser" class="turn">
-				<Mfm :key="'turn:' + turnUser.id" :text="i18n.t('_reversi.turnOf', { name: turnUser.name ?? turnUser.username })" :plain="true" :customEmojis="turnUser.emojis"/>
+				<Mfm :key="'turn:' + turnUser.id" :text="i18n.tsx._reversi.turnOf({ name: turnUser.name ?? turnUser.username })" :plain="true" :customEmojis="turnUser.emojis"/>
 				<MkEllipsis/>
 			</div>
 			<div v-if="(logPos !== logs.length) && turnUser" class="turn">
-				<Mfm :key="'past-turn-of:' + turnUser.id" :text="i18n.t('_reversi.pastTurnOf', { name: turnUser.name ?? turnUser.username })" :plain="true" :customEmojis="turnUser.emojis"/>
+				<Mfm :key="'past-turn-of:' + turnUser.id" :text="i18n.tsx._reversi.pastTurnOf({ name: turnUser.name ?? turnUser.username })" :plain="true" :customEmojis="turnUser.emojis"/>
 			</div>
 			<div v-if="iAmPlayer && !game.isEnded && !isMyTurn" class="turn1">{{ i18n.ts._reversi.opponentTurn }}<MkEllipsis/></div>
 			<div v-if="iAmPlayer && !game.isEnded && isMyTurn" class="turn2" style="animation: tada 1s linear infinite both;">{{ i18n.ts._reversi.myTurn }}</div>
 			<div v-if="game.isEnded && logPos == logs.length" class="result">
 				<template v-if="game.winner">
-					<Mfm :key="'won'" :text="i18n.t('_reversi.won', { name: game.winner.name ?? game.winner.username })" :plain="true" :customEmojis="game.winner.emojis"/>
+					<Mfm :key="'won'" :text="i18n.tsx._reversi.won({ name: game.winner.name ?? game.winner.username })" :plain="true" :customEmojis="game.winner.emojis"/>
 					<span v-if="game.surrendered != null"> ({{ i18n.ts._reversi.surrendered }})</span>
 				</template>
 				<template v-else>{{ i18n.ts._reversi.drawn }}</template>
@@ -62,7 +62,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 		</div>
 
-		<div class="status"><b>{{ i18n.t('_reversi.turnCount', { count: logPos }) }}</b> {{ i18n.ts._reversi.black }}:{{ engine.blackCount }} {{ i18n.ts._reversi.white }}:{{ engine.whiteCount }} {{ i18n.ts._reversi.total }}:{{ engine.blackCount + engine.whiteCount }}</div>
+		<div class="status"><b>{{ i18n.tsx._reversi.turnCount({ count: logPos }) }}</b> {{ i18n.ts._reversi.black }}:{{ engine.blackCount }} {{ i18n.ts._reversi.white }}:{{ engine.whiteCount }} {{ i18n.ts._reversi.total }}:{{ engine.blackCount + engine.whiteCount }}</div>
 
 		<div v-if="!game.isEnded && iAmPlayer" class="_buttonsCenter">
 			<MkButton danger @click="surrender">{{ i18n.ts._reversi.surrender }}</MkButton>
diff --git a/packages/frontend/src/pages/settings/2fa.vue b/packages/frontend/src/pages/settings/2fa.vue
index 35331738fd..dae1f03ccb 100644
--- a/packages/frontend/src/pages/settings/2fa.vue
+++ b/packages/frontend/src/pages/settings/2fa.vue
@@ -141,7 +141,7 @@ async function unregisterKey(key) {
 	const confirm = await os.confirm({
 		type: 'question',
 		title: i18n.ts._2fa.removeKey,
-		text: i18n.t('_2fa.removeKeyConfirm', { name: key.name }),
+		text: i18n.tsx._2fa.removeKeyConfirm({ name: key.name }),
 	});
 	if (confirm.canceled) return;
 
diff --git a/packages/frontend/src/pages/settings/apps.vue b/packages/frontend/src/pages/settings/apps.vue
index 4a778d4b38..525b4e7519 100644
--- a/packages/frontend/src/pages/settings/apps.vue
+++ b/packages/frontend/src/pages/settings/apps.vue
@@ -30,7 +30,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<details>
 							<summary>{{ i18n.ts.details }}</summary>
 							<ul>
-								<li v-for="p in token.permission" :key="p">{{ i18n.t(`_permissions.${p}`) }}</li>
+								<li v-for="p in token.permission" :key="p">{{ i18n.ts._permissions[p] }}</li>
 							</ul>
 						</details>
 						<div>
diff --git a/packages/frontend/src/pages/settings/avatar-decoration.vue b/packages/frontend/src/pages/settings/avatar-decoration.vue
index 70565cc990..ecfa1ca257 100644
--- a/packages/frontend/src/pages/settings/avatar-decoration.vue
+++ b/packages/frontend/src/pages/settings/avatar-decoration.vue
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <div>
 	<div v-if="!loading" class="_gaps">
-		<MkInfo>{{ i18n.t('_profile.avatarDecorationMax', { max: $i.policies.avatarDecorationLimit }) }} ({{ i18n.t('remainingN', { n: $i.policies.avatarDecorationLimit - $i.avatarDecorations.length }) }})</MkInfo>
+		<MkInfo>{{ i18n.tsx._profile.avatarDecorationMax({ max: $i.policies.avatarDecorationLimit }) }} ({{ i18n.tsx.remainingN({ n: $i.policies.avatarDecorationLimit - $i.avatarDecorations.length }) }})</MkInfo>
 
 		<MkAvatar :class="$style.avatar" :user="$i" forceShowDecoration/>
 
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index e52a5ee04f..bbc910a32a 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -77,9 +77,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkRadios v-model="mediaListWithOneImageAppearance">
 				<template #label>{{ i18n.ts.mediaListWithOneImageAppearance }}</template>
 				<option value="expand">{{ i18n.ts.default }}</option>
-				<option value="16_9">{{ i18n.t('limitTo', { x: '16:9' }) }}</option>
-				<option value="1_1">{{ i18n.t('limitTo', { x: '1:1' }) }}</option>
-				<option value="2_3">{{ i18n.t('limitTo', { x: '2:3' }) }}</option>
+				<option value="16_9">{{ i18n.tsx.limitTo({ x: '16:9' }) }}</option>
+				<option value="1_1">{{ i18n.tsx.limitTo({ x: '1:1' }) }}</option>
+				<option value="2_3">{{ i18n.tsx.limitTo({ x: '2:3' }) }}</option>
 			</MkRadios>
 		</div>
 	</FormSection>
diff --git a/packages/frontend/src/pages/settings/migration.vue b/packages/frontend/src/pages/settings/migration.vue
index 2699f0ad63..6e5de0a333 100644
--- a/packages/frontend/src/pages/settings/migration.vue
+++ b/packages/frontend/src/pages/settings/migration.vue
@@ -21,7 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<div class="_gaps">
 				<MkInput v-for="(_, i) in accountAliases" v-model="accountAliases[i]">
 					<template #prefix><i class="ti ti-plane-arrival"></i></template>
-					<template #label>{{ i18n.t('_accountMigration.moveFromLabel', { n: i + 1 }) }}</template>
+					<template #label>{{ i18n.tsx._accountMigration.moveFromLabel({ n: i + 1 }) }}</template>
 				</MkInput>
 			</div>
 		</div>
@@ -97,7 +97,7 @@ async function move(): Promise<void> {
 	const account = moveToAccount.value;
 	const confirm = await os.confirm({
 		type: 'warning',
-		text: i18n.t('_accountMigration.migrationConfirm', { account }),
+		text: i18n.tsx._accountMigration.migrationConfirm({ account }),
 	});
 	if (confirm.canceled) return;
 	await os.apiWithDialog('i/move', {
diff --git a/packages/frontend/src/pages/settings/mute-block.word-mute.vue b/packages/frontend/src/pages/settings/mute-block.word-mute.vue
index 7328967c51..a70adaf359 100644
--- a/packages/frontend/src/pages/settings/mute-block.word-mute.vue
+++ b/packages/frontend/src/pages/settings/mute-block.word-mute.vue
@@ -64,7 +64,7 @@ async function save() {
 					os.alert({
 						type: 'error',
 						title: i18n.ts.regexpError,
-						text: i18n.t('regexpErrorDescription', { tab: 'word mute', line: i + 1 }) + '\n' + err.toString(),
+						text: i18n.tsx.regexpErrorDescription({ tab: 'word mute', line: i + 1 }) + '\n' + err.toString(),
 					});
 					// re-throw error so these invalid settings are not saved
 					throw err;
diff --git a/packages/frontend/src/pages/settings/notifications.vue b/packages/frontend/src/pages/settings/notifications.vue
index 766f33ff65..b1b1e4fb03 100644
--- a/packages/frontend/src/pages/settings/notifications.vue
+++ b/packages/frontend/src/pages/settings/notifications.vue
@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<template #label>{{ i18n.ts.notificationRecieveConfig }}</template>
 		<div class="_gaps_s">
 			<MkFolder v-for="type in notificationTypes.filter(x => !nonConfigurableNotificationTypes.includes(x))" :key="type">
-				<template #label>{{ i18n.t('_notification._types.' + type) }}</template>
+				<template #label>{{ i18n.ts._notification._types[type] }}</template>
 				<template #suffix>
 					{{
 						$i.notificationRecieveConfig[type]?.type === 'never' ? i18n.ts.none :
diff --git a/packages/frontend/src/pages/settings/profile.vue b/packages/frontend/src/pages/settings/profile.vue
index e2d98cbf29..3e707041eb 100644
--- a/packages/frontend/src/pages/settings/profile.vue
+++ b/packages/frontend/src/pages/settings/profile.vue
@@ -206,7 +206,7 @@ function changeAvatar(ev) {
 
 		const { canceled } = await os.confirm({
 			type: 'question',
-			text: i18n.t('cropImageAsk'),
+			text: i18n.ts.cropImageAsk,
 			okText: i18n.ts.cropYes,
 			cancelText: i18n.ts.cropNo,
 		});
@@ -232,7 +232,7 @@ function changeBanner(ev) {
 
 		const { canceled } = await os.confirm({
 			type: 'question',
-			text: i18n.t('cropImageAsk'),
+			text: i18n.ts.cropImageAsk,
 			okText: i18n.ts.cropYes,
 			cancelText: i18n.ts.cropNo,
 		});
diff --git a/packages/frontend/src/pages/settings/sounds.vue b/packages/frontend/src/pages/settings/sounds.vue
index 9fbcce2286..a116a0407f 100644
--- a/packages/frontend/src/pages/settings/sounds.vue
+++ b/packages/frontend/src/pages/settings/sounds.vue
@@ -19,7 +19,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<template #label>{{ i18n.ts.sounds }}</template>
 		<div class="_gaps_s">
 			<MkFolder v-for="type in operationTypes" :key="type">
-				<template #label>{{ i18n.t('_sfx.' + type) }}</template>
+				<template #label>{{ i18n.ts._sfx[type] }}</template>
 				<template #suffix>{{ getSoundTypeName(sounds[type].type) }}</template>
 
 				<XSound :type="sounds[type].type" :volume="sounds[type].volume" :fileId="sounds[type].fileId" :fileUrl="sounds[type].fileUrl" @update="(res) => updated(type, res)"/>
@@ -33,9 +33,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { Ref, computed, ref } from 'vue';
+import XSound from './sounds.sound.vue';
 import type { SoundType, OperationType } from '@/scripts/sound.js';
 import type { SoundStore } from '@/store.js';
-import XSound from './sounds.sound.vue';
 import MkRange from '@/components/MkRange.vue';
 import MkButton from '@/components/MkButton.vue';
 import FormSection from '@/components/form/section.vue';
diff --git a/packages/frontend/src/pages/settings/theme.install.vue b/packages/frontend/src/pages/settings/theme.install.vue
index 45970c88e6..2946a43398 100644
--- a/packages/frontend/src/pages/settings/theme.install.vue
+++ b/packages/frontend/src/pages/settings/theme.install.vue
@@ -33,7 +33,7 @@ async function install(code: string): Promise<void> {
 		await installTheme(code);
 		os.alert({
 			type: 'success',
-			text: i18n.t('_theme.installed', { name: theme.name }),
+			text: i18n.tsx._theme.installed({ name: theme.name }),
 		});
 	} catch (err) {
 		switch (err.message.toLowerCase()) {
diff --git a/packages/frontend/src/pages/settings/webhook.edit.vue b/packages/frontend/src/pages/settings/webhook.edit.vue
index a122c4c819..d079d0f92b 100644
--- a/packages/frontend/src/pages/settings/webhook.edit.vue
+++ b/packages/frontend/src/pages/settings/webhook.edit.vue
@@ -99,7 +99,7 @@ async function save(): Promise<void> {
 async function del(): Promise<void> {
 	const { canceled } = await os.confirm({
 		type: 'warning',
-		text: i18n.t('deleteAreYouSure', { x: webhook.name }),
+		text: i18n.tsx.deleteAreYouSure({ x: webhook.name }),
 	});
 	if (canceled) return;
 
diff --git a/packages/frontend/src/pages/signup-complete.vue b/packages/frontend/src/pages/signup-complete.vue
index 3f007b7afc..4e99ef5ae7 100644
--- a/packages/frontend/src/pages/signup-complete.vue
+++ b/packages/frontend/src/pages/signup-complete.vue
@@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<i class="ti ti-user-check"></i>
 			</div>
 			<div class="_gaps_m" style="padding: 32px;">
-				<div>{{ i18n.t('clickToFinishEmailVerification', { ok: i18n.ts.gotIt }) }}</div>
+				<div>{{ i18n.tsx.clickToFinishEmailVerification({ ok: i18n.ts.gotIt }) }}</div>
 				<div>
 					<MkButton gradate large rounded type="submit" :disabled="submitting" data-cy-admin-ok style="margin: 0 auto;">
 						{{ submitting ? i18n.ts.processing : i18n.ts.gotIt }}<MkEllipsis v-if="submitting"/>
diff --git a/packages/frontend/src/pages/theme-editor.vue b/packages/frontend/src/pages/theme-editor.vue
index e14bd6d89b..738b015a99 100644
--- a/packages/frontend/src/pages/theme-editor.vue
+++ b/packages/frontend/src/pages/theme-editor.vue
@@ -208,7 +208,7 @@ async function saveAs() {
 	changed.value = false;
 	os.alert({
 		type: 'success',
-		text: i18n.t('_theme.installed', { name: theme.value.name }),
+		text: i18n.tsx._theme.installed({ name: theme.value.name }),
 	});
 }
 
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index ed9722b7ed..e8687b148b 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -87,7 +87,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						</dl>
 						<dl v-if="user.birthday" class="field">
 							<dt class="name"><i class="ti ti-cake ti-fw"></i> {{ i18n.ts.birthday }}</dt>
-							<dd class="value">{{ user.birthday.replace('-', '/').replace('-', '/') }} ({{ i18n.t('yearsOld', { age }) }})</dd>
+							<dd class="value">{{ user.birthday.replace('-', '/').replace('-', '/') }} ({{ i18n.tsx.yearsOld({ age }) }})</dd>
 						</dl>
 						<dl class="field">
 							<dt class="name"><i class="ti ti-calendar ti-fw"></i> {{ i18n.ts.registeredDate }}</dt>
diff --git a/packages/frontend/src/scripts/get-drive-file-menu.ts b/packages/frontend/src/scripts/get-drive-file-menu.ts
index 59c46c2cbc..91b1218527 100644
--- a/packages/frontend/src/scripts/get-drive-file-menu.ts
+++ b/packages/frontend/src/scripts/get-drive-file-menu.ts
@@ -66,7 +66,7 @@ function addApp() {
 async function deleteFile(file: Misskey.entities.DriveFile) {
 	const { canceled } = await os.confirm({
 		type: 'warning',
-		text: i18n.t('driveFileDeleteConfirm', { name: file.name }),
+		text: i18n.tsx.driveFileDeleteConfirm({ name: file.name }),
 	});
 
 	if (canceled) return;
diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
index 110be244cb..bfc3c4a8f1 100644
--- a/packages/frontend/src/scripts/get-note-menu.ts
+++ b/packages/frontend/src/scripts/get-note-menu.ts
@@ -47,7 +47,7 @@ export async function getNoteClipMenu(props: {
 					if (err.id === '734806c4-542c-463a-9311-15c512803965') {
 						const confirm = await os.confirm({
 							type: 'warning',
-							text: i18n.t('confirmToUnclipAlreadyClippedNote', { name: clip.name }),
+							text: i18n.tsx.confirmToUnclipAlreadyClippedNote({ name: clip.name }),
 						});
 						if (!confirm.canceled) {
 							os.apiWithDialog('clips/remove-note', { clipId: clip.id, noteId: appearNote.id });
@@ -231,7 +231,7 @@ export function getNoteMenu(props: {
 
 	function share(): void {
 		navigator.share({
-			title: i18n.t('noteOf', { user: appearNote.user.name }),
+			title: i18n.tsx.noteOf({ user: appearNote.user.name }),
 			text: appearNote.text,
 			url: `${url}/notes/${appearNote.id}`,
 		});
diff --git a/packages/frontend/src/scripts/get-note-summary.ts b/packages/frontend/src/scripts/get-note-summary.ts
index 1fd9f04d46..2007e0ea97 100644
--- a/packages/frontend/src/scripts/get-note-summary.ts
+++ b/packages/frontend/src/scripts/get-note-summary.ts
@@ -30,7 +30,7 @@ export const getNoteSummary = (note: Misskey.entities.Note): string => {
 
 	// ファイルが添付されているとき
 	if ((note.files || []).length !== 0) {
-		summary += ` (${i18n.t('withNFiles', { n: note.files.length })})`;
+		summary += ` (${i18n.tsx.withNFiles({ n: note.files.length })})`;
 	}
 
 	// 投票が添付されているとき
diff --git a/packages/frontend/src/scripts/i18n.ts b/packages/frontend/src/scripts/i18n.ts
index 3366f3eac3..6aa1468e87 100644
--- a/packages/frontend/src/scripts/i18n.ts
+++ b/packages/frontend/src/scripts/i18n.ts
@@ -14,37 +14,39 @@ type FlattenKeys<T extends ILocale, TPrediction> = keyof {
 			: never]: T[K];
 };
 
-type ParametersOf<T extends ILocale, TKey extends FlattenKeys<T, ParameterizedString<string>>> = T extends ILocale
-	? TKey extends `${infer K}.${infer C}`
-		// @ts-expect-error -- C は明らかに FlattenKeys<T[K], ParameterizedString<string>> になるが、型システムはここでは TKey がドット区切りであることのコンテキストを持たないので、型システムに合法にて示すことはできない。
-		? ParametersOf<T[K], C>
-		: TKey extends keyof T
-			? T[TKey] extends ParameterizedString<infer P>
-				? P
-				: never
+type ParametersOf<T extends ILocale, TKey extends FlattenKeys<T, ParameterizedString>> = TKey extends `${infer K}.${infer C}`
+	// @ts-expect-error -- C は明らかに FlattenKeys<T[K], ParameterizedString> になるが、型システムはここでは TKey がドット区切りであることのコンテキストを持たないので、型システムに合法にて示すことはできない。
+	? ParametersOf<T[K], C>
+	: TKey extends keyof T
+		? T[TKey] extends ParameterizedString<infer P>
+			? P
 			: never
-	: never;
+		: never;
 
-type Ts<T extends ILocale> = {
-	readonly [K in keyof T as T[K] extends ParameterizedString<string> ? never : K]: T[K] extends ILocale ? Ts<T[K]> : string;
+type Tsx<T extends ILocale> = {
+	readonly [K in keyof T as T[K] extends string ? never : K]: T[K] extends ParameterizedString<infer P>
+		? (arg: { readonly [_ in P]: string | number }) => string
+		// @ts-expect-error -- 証明省略
+		: Tsx<T[K]>;
 };
 
 export class I18n<T extends ILocale> {
-	constructor(private locale: T) {
+	private tsxCache?: Tsx<T>;
+
+	constructor(public locale: T) {
 		//#region BIND
 		this.t = this.t.bind(this);
 		//#endregion
 	}
 
-	public get ts(): Ts<T> {
+	public get ts(): T {
 		if (_DEV_) {
-			class Handler<TTarget extends object> implements ProxyHandler<TTarget> {
+			class Handler<TTarget extends ILocale> implements ProxyHandler<TTarget> {
 				get(target: TTarget, p: string | symbol): unknown {
 					const value = target[p as keyof TTarget];
 
 					if (typeof value === 'object') {
-						// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- 実際には null がくることはないので。
-						return new Proxy(value!, new Handler<TTarget[keyof TTarget] & object>());
+						return new Proxy(value, new Handler<TTarget[keyof TTarget] & ILocale>());
 					}
 
 					if (typeof value === 'string') {
@@ -63,19 +65,148 @@ export class I18n<T extends ILocale> {
 				}
 			}
 
-			return new Proxy(this.locale, new Handler()) as Ts<T>;
+			return new Proxy(this.locale, new Handler());
 		}
 
-		return this.locale as Ts<T>;
+		return this.locale;
+	}
+
+	public get tsx(): Tsx<T> {
+		if (_DEV_) {
+			if (this.tsxCache) {
+				return this.tsxCache;
+			}
+
+			class Handler<TTarget extends ILocale> implements ProxyHandler<TTarget> {
+				get(target: TTarget, p: string | symbol): unknown {
+					const value = target[p as keyof TTarget];
+
+					if (typeof value === 'object') {
+						return new Proxy(value, new Handler<TTarget[keyof TTarget] & ILocale>());
+					}
+
+					if (typeof value === 'string') {
+						const quasis: string[] = [];
+						const expressions: string[] = [];
+						let cursor = 0;
+
+						while (~cursor) {
+							const start = value.indexOf('{', cursor);
+
+							if (!~start) {
+								quasis.push(value.slice(cursor));
+								break;
+							}
+
+							quasis.push(value.slice(cursor, start));
+
+							const end = value.indexOf('}', start);
+
+							expressions.push(value.slice(start + 1, end));
+
+							cursor = end + 1;
+						}
+
+						if (!expressions.length) {
+							console.error(`Unexpected locale key: ${String(p)}`);
+
+							return () => value;
+						}
+
+						return (arg) => {
+							let str = quasis[0];
+
+							for (let i = 0; i < expressions.length; i++) {
+								if (!Object.hasOwn(arg, expressions[i])) {
+									console.error(`Missing locale parameters: ${expressions[i]} at ${String(p)}`);
+								}
+
+								str += arg[expressions[i]] + quasis[i + 1];
+							}
+
+							return str;
+						};
+					}
+
+					console.error(`Unexpected locale key: ${String(p)}`);
+
+					return p;
+				}
+			}
+
+			return this.tsxCache = new Proxy(this.locale, new Handler()) as unknown as Tsx<T>;
+		}
+
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		if (this.tsxCache) {
+			return this.tsxCache;
+		}
+
+		function build(target: ILocale): Tsx<T> {
+			const result = {} as Tsx<T>;
+
+			for (const k in target) {
+				if (!Object.hasOwn(target, k)) {
+					continue;
+				}
+
+				const value = target[k as keyof typeof target];
+
+				if (typeof value === 'object') {
+					result[k] = build(value as ILocale);
+				} else if (typeof value === 'string') {
+					const quasis: string[] = [];
+					const expressions: string[] = [];
+					let cursor = 0;
+
+					while (~cursor) {
+						const start = value.indexOf('{', cursor);
+
+						if (!~start) {
+							quasis.push(value.slice(cursor));
+							break;
+						}
+
+						quasis.push(value.slice(cursor, start));
+
+						const end = value.indexOf('}', start);
+
+						expressions.push(value.slice(start + 1, end));
+
+						cursor = end + 1;
+					}
+
+					if (!expressions.length) {
+						continue;
+					}
+
+					result[k] = (arg) => {
+						let str = quasis[0];
+
+						for (let i = 0; i < expressions.length; i++) {
+							str += arg[expressions[i]] + quasis[i + 1];
+						}
+
+						return str;
+					};
+				}
+			}
+			return result;
+		}
+
+		return this.tsxCache = build(this.locale);
 	}
 
 	/**
-	 * @deprecated なるべくこのメソッド使うよりも locale 直接参照の方が vue のキャッシュ効いてパフォーマンスが良いかも
+	 * @deprecated なるべくこのメソッド使うよりも ts 直接参照の方が vue のキャッシュ効いてパフォーマンスが良いかも
 	 */
 	public t<TKey extends FlattenKeys<T, string>>(key: TKey): string;
-	public t<TKey extends FlattenKeys<T, ParameterizedString<string>>>(key: TKey, args: { readonly [_ in ParametersOf<T, TKey>]: string | number }): string;
+	/**
+	 * @deprecated なるべくこのメソッド使うよりも tsx 直接参照の方が vue のキャッシュ効いてパフォーマンスが良いかも
+	 */
+	public t<TKey extends FlattenKeys<T, ParameterizedString>>(key: TKey, args: { readonly [_ in ParametersOf<T, TKey>]: string | number }): string;
 	public t(key: string, args?: { readonly [_: string]: string | number }) {
-		let str: string | ParameterizedString<string> | ILocale = this.locale;
+		let str: string | ParameterizedString | ILocale = this.locale;
 
 		for (const k of key.split('.')) {
 			str = str[k];
@@ -113,3 +244,51 @@ export class I18n<T extends ILocale> {
 		return str;
 	}
 }
+
+if (import.meta.vitest) {
+	const { describe, expect, it } = import.meta.vitest;
+
+	describe('i18n', () => {
+		it('t', () => {
+			const i18n = new I18n({
+				foo: 'foo',
+				bar: {
+					baz: 'baz',
+					qux: 'qux {0}' as unknown as ParameterizedString<'0'>,
+					quux: 'quux {0} {1}' as unknown as ParameterizedString<'0' | '1'>,
+				},
+			});
+
+			expect(i18n.t('foo')).toBe('foo');
+			expect(i18n.t('bar.baz')).toBe('baz');
+			expect(i18n.tsx.bar.qux({ 0: 'hoge' })).toBe('qux hoge');
+			expect(i18n.tsx.bar.quux({ 0: 'hoge', 1: 'fuga' })).toBe('quux hoge fuga');
+		});
+		it('ts', () => {
+			const i18n = new I18n({
+				foo: 'foo',
+				bar: {
+					baz: 'baz',
+					qux: 'qux {0}' as unknown as ParameterizedString<'0'>,
+					quux: 'quux {0} {1}' as unknown as ParameterizedString<'0' | '1'>,
+				},
+			});
+
+			expect(i18n.ts.foo).toBe('foo');
+			expect(i18n.ts.bar.baz).toBe('baz');
+		});
+		it('tsx', () => {
+			const i18n = new I18n({
+				foo: 'foo',
+				bar: {
+					baz: 'baz',
+					qux: 'qux {0}' as unknown as ParameterizedString<'0'>,
+					quux: 'quux {0} {1}' as unknown as ParameterizedString<'0' | '1'>,
+				},
+			});
+
+			expect(i18n.tsx.bar.qux({ 0: 'hoge' })).toBe('qux hoge');
+			expect(i18n.tsx.bar.quux({ 0: 'hoge', 1: 'fuga' })).toBe('quux hoge fuga');
+		});
+	});
+}
diff --git a/packages/frontend/src/ui/deck.vue b/packages/frontend/src/ui/deck.vue
index 304ebbf0b2..f58756b284 100644
--- a/packages/frontend/src/ui/deck.vue
+++ b/packages/frontend/src/ui/deck.vue
@@ -189,7 +189,7 @@ const addColumn = async (ev) => {
 	const { canceled, result: column } = await os.select({
 		title: i18n.ts._deck.addColumn,
 		items: columns.map(column => ({
-			value: column, text: i18n.t('_deck._columns.' + column),
+			value: column, text: i18n.ts._deck._columns[column],
 		})),
 	});
 	if (canceled) return;
@@ -197,7 +197,7 @@ const addColumn = async (ev) => {
 	addColumnToStore({
 		type: column,
 		id: uuid(),
-		name: i18n.t('_deck._columns.' + column),
+		name: i18n.ts._deck._columns[column],
 		width: 330,
 	});
 };
@@ -256,7 +256,7 @@ function changeProfile(ev: MouseEvent) {
 async function deleteProfile() {
 	const { canceled } = await os.confirm({
 		type: 'warning',
-		text: i18n.t('deleteAreYouSure', { x: deckStore.state.profile }),
+		text: i18n.tsx.deleteAreYouSure({ x: deckStore.state.profile }),
 	});
 	if (canceled) return;
 
diff --git a/packages/frontend/src/widgets/WidgetCalendar.vue b/packages/frontend/src/widgets/WidgetCalendar.vue
index c78e291a2e..5bd16584d2 100644
--- a/packages/frontend/src/widgets/WidgetCalendar.vue
+++ b/packages/frontend/src/widgets/WidgetCalendar.vue
@@ -7,11 +7,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 <div :class="[$style.root, { _panel: !widgetProps.transparent }]" data-cy-mkw-calendar>
 	<div :class="[$style.calendar, { [$style.isHoliday]: isHoliday }]">
 		<p :class="$style.monthAndYear">
-			<span :class="$style.year">{{ i18n.t('yearX', { year }) }}</span>
-			<span :class="$style.month">{{ i18n.t('monthX', { month }) }}</span>
+			<span :class="$style.year">{{ i18n.tsx.yearX({ year }) }}</span>
+			<span :class="$style.month">{{ i18n.tsx.monthX({ month }) }}</span>
 		</p>
-		<p v-if="month === 1 && day === 1" class="day">🎉{{ i18n.t('dayX', { day }) }}<span style="display: inline-block; transform: scaleX(-1);">🎉</span></p>
-		<p v-else :class="$style.day">{{ i18n.t('dayX', { day }) }}</p>
+		<p v-if="month === 1 && day === 1" class="day">🎉{{ i18n.tsx.dayX({ day }) }}<span style="display: inline-block; transform: scaleX(-1);">🎉</span></p>
+		<p v-else :class="$style.day">{{ i18n.tsx.dayX({ day }) }}</p>
 		<p :class="$style.weekDay">{{ weekDay }}</p>
 	</div>
 	<div :class="$style.info">
diff --git a/packages/frontend/src/widgets/WidgetSlideshow.vue b/packages/frontend/src/widgets/WidgetSlideshow.vue
index 94bf6d7eec..f2fc24ddf7 100644
--- a/packages/frontend/src/widgets/WidgetSlideshow.vue
+++ b/packages/frontend/src/widgets/WidgetSlideshow.vue
@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<p v-if="widgetProps.folderId == null">
 			{{ i18n.ts.folder }}
 		</p>
-		<p v-if="widgetProps.folderId != null && images.length === 0 && !fetching">{{ i18n.t('no-image') }}</p>
+		<p v-if="widgetProps.folderId != null && images.length === 0 && !fetching">{{ i18n.ts['no-image'] }}</p>
 		<div ref="slideA" class="slide a"></div>
 		<div ref="slideB" class="slide b"></div>
 	</div>
diff --git a/packages/frontend/src/widgets/WidgetTimeline.vue b/packages/frontend/src/widgets/WidgetTimeline.vue
index 8f46bc0206..f1e4897634 100644
--- a/packages/frontend/src/widgets/WidgetTimeline.vue
+++ b/packages/frontend/src/widgets/WidgetTimeline.vue
@@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</template>
 	<template #header>
 		<button class="_button" @click="choose">
-			<span>{{ widgetProps.src === 'list' ? widgetProps.list.name : widgetProps.src === 'antenna' ? widgetProps.antenna.name : i18n.t('_timelines.' + widgetProps.src) }}</span>
+			<span>{{ widgetProps.src === 'list' ? widgetProps.list.name : widgetProps.src === 'antenna' ? widgetProps.antenna.name : i18n.ts._timelines[widgetProps.src] }}</span>
 			<i :class="menuOpened ? 'ti ti-chevron-up' : 'ti ti-chevron-down'" style="margin-left: 8px;"></i>
 		</button>
 	</template>
diff --git a/packages/frontend/src/widgets/WidgetTrends.vue b/packages/frontend/src/widgets/WidgetTrends.vue
index 35925a9088..65d9235565 100644
--- a/packages/frontend/src/widgets/WidgetTrends.vue
+++ b/packages/frontend/src/widgets/WidgetTrends.vue
@@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<div v-for="stat in stats" :key="stat.tag">
 				<div class="tag">
 					<MkA class="a" :to="`/tags/${ encodeURIComponent(stat.tag) }`" :title="stat.tag">#{{ stat.tag }}</MkA>
-					<p>{{ i18n.t('nUsersMentioned', { n: stat.usersCount }) }}</p>
+					<p>{{ i18n.tsx.nUsersMentioned({ n: stat.usersCount }) }}</p>
 				</div>
 				<MkMiniChart class="chart" :src="stat.chart"/>
 			</div>
diff --git a/packages/frontend/tsconfig.json b/packages/frontend/tsconfig.json
index 5d451c878c..819629a9cf 100644
--- a/packages/frontend/tsconfig.json
+++ b/packages/frontend/tsconfig.json
@@ -33,6 +33,7 @@
 		],
 		"types": [
 			"vite/client",
+			"vitest/importMeta",
 		],
 		"lib": [
 			"esnext",
diff --git a/packages/frontend/vite.config.ts b/packages/frontend/vite.config.ts
index 8cdc7b59c6..11b6bac555 100644
--- a/packages/frontend/vite.config.ts
+++ b/packages/frontend/vite.config.ts
@@ -155,6 +155,7 @@ export function getConfig(): UserConfig {
 					},
 				},
 			},
+			includeSource: ['src/**/*.ts'],
 		},
 	};
 }
-- 
cgit v1.2.3-freya


From 952386ba8f76a4a3d19f1cc0a29fdf69a552c25e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 20 Jan 2024 09:53:26 +0900
Subject: refactor: extract bubble-game engine as independent package

---
 packages/frontend/package.json                     |    2 +-
 .../frontend/src/pages/drop-and-fusion.game.vue    |    2 +-
 .../frontend/src/scripts/drop-and-fusion-engine.ts | 1440 --------------------
 packages/frontend/vite.config.ts                   |    4 +-
 packages/misskey-bubble-game/.eslintignore         |    7 +
 packages/misskey-bubble-game/.eslintrc.cjs         |    9 +
 packages/misskey-bubble-game/package.json          |   31 +
 packages/misskey-bubble-game/src/game.ts           |  495 +++++++
 packages/misskey-bubble-game/src/index.ts          |   10 +
 packages/misskey-bubble-game/src/monos.ts          |  952 +++++++++++++
 packages/misskey-bubble-game/tsconfig.json         |   33 +
 packages/misskey-reversi/.eslintignore             |    7 +
 packages/misskey-reversi/.eslintrc.cjs             |    9 +
 packages/misskey-reversi/src/index.ts              |    5 +
 packages/misskey-reversi/src/maps.ts               |    5 +
 pnpm-lock.yaml                                     |  147 +-
 pnpm-workspace.yaml                                |    1 +
 17 files changed, 1665 insertions(+), 1494 deletions(-)
 delete mode 100644 packages/frontend/src/scripts/drop-and-fusion-engine.ts
 create mode 100644 packages/misskey-bubble-game/.eslintignore
 create mode 100644 packages/misskey-bubble-game/.eslintrc.cjs
 create mode 100644 packages/misskey-bubble-game/package.json
 create mode 100644 packages/misskey-bubble-game/src/game.ts
 create mode 100644 packages/misskey-bubble-game/src/index.ts
 create mode 100644 packages/misskey-bubble-game/src/monos.ts
 create mode 100644 packages/misskey-bubble-game/tsconfig.json
 create mode 100644 packages/misskey-reversi/.eslintignore
 create mode 100644 packages/misskey-reversi/.eslintrc.cjs

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index a9a68601fc..6dd826d459 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -55,12 +55,12 @@
 		"mfm-js": "0.24.0",
 		"misskey-js": "workspace:*",
 		"misskey-reversi": "workspace:*",
+		"misskey-bubble-game": "workspace:*",
 		"photoswipe": "5.4.3",
 		"punycode": "2.3.1",
 		"rollup": "4.9.1",
 		"sanitize-html": "2.11.0",
 		"sass": "1.69.5",
-		"seedrandom": "^3.0.5",
 		"shiki": "0.14.7",
 		"strict-event-emitter-types": "2.0.0",
 		"textarea-caret": "3.1.0",
diff --git a/packages/frontend/src/pages/drop-and-fusion.game.vue b/packages/frontend/src/pages/drop-and-fusion.game.vue
index 1fc0c7cd9c..51819fafd0 100644
--- a/packages/frontend/src/pages/drop-and-fusion.game.vue
+++ b/packages/frontend/src/pages/drop-and-fusion.game.vue
@@ -180,6 +180,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { computed, onDeactivated, onMounted, onUnmounted, ref, shallowRef, watch } from 'vue';
 import * as Matter from 'matter-js';
 import * as Misskey from 'misskey-js';
+import { DropAndFusionGame, Mono } from 'misskey-bubble-game';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import MkRippleEffect from '@/components/MkRippleEffect.vue';
 import * as os from '@/os.js';
@@ -193,7 +194,6 @@ import { i18n } from '@/i18n.js';
 import { useInterval } from '@/scripts/use-interval.js';
 import { apiUrl } from '@/config.js';
 import { $i } from '@/account.js';
-import { DropAndFusionGame, Mono } from '@/scripts/drop-and-fusion-engine.js';
 import * as sound from '@/scripts/sound.js';
 import MkRange from '@/components/MkRange.vue';
 import copyToClipboard from '@/scripts/copy-to-clipboard.js';
diff --git a/packages/frontend/src/scripts/drop-and-fusion-engine.ts b/packages/frontend/src/scripts/drop-and-fusion-engine.ts
deleted file mode 100644
index aef2613065..0000000000
--- a/packages/frontend/src/scripts/drop-and-fusion-engine.ts
+++ /dev/null
@@ -1,1440 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { EventEmitter } from 'eventemitter3';
-import * as Matter from 'matter-js';
-import seedrandom from 'seedrandom';
-
-export type Mono = {
-	id: string;
-	level: number;
-	sizeX: number;
-	sizeY: number;
-	shape: 'circle' | 'rectangle' | 'custom';
-	vertices?: Matter.Vector[][];
-	verticesSize?: number;
-	score: number;
-	dropCandidate: boolean;
-};
-
-type Log = {
-	frame: number;
-	operation: 'drop';
-	x: number;
-} | {
-	frame: number;
-	operation: 'hold';
-} | {
-	frame: number;
-	operation: 'surrender';
-};
-
-const NORMAL_BASE_SIZE = 32;
-const NORAML_MONOS: Mono[] = [{
-	id: '9377076d-c980-4d83-bdaf-175bc58275b7',
-	level: 10,
-	sizeX: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'circle',
-	score: 512,
-	dropCandidate: false,
-}, {
-	id: 'be9f38d2-b267-4b1a-b420-904e22e80568',
-	level: 9,
-	sizeX: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'circle',
-	score: 256,
-	dropCandidate: false,
-}, {
-	id: 'beb30459-b064-4888-926b-f572e4e72e0c',
-	level: 8,
-	sizeX: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'circle',
-	score: 128,
-	dropCandidate: false,
-}, {
-	id: 'feab6426-d9d8-49ae-849c-048cdbb6cdf0',
-	level: 7,
-	sizeX: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'circle',
-	score: 64,
-	dropCandidate: false,
-}, {
-	id: 'd6d8fed6-6d18-4726-81a1-6cf2c974df8a',
-	level: 6,
-	sizeX: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'circle',
-	score: 32,
-	dropCandidate: false,
-}, {
-	id: '249c728e-230f-4332-bbbf-281c271c75b2',
-	level: 5,
-	sizeX: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'circle',
-	score: 16,
-	dropCandidate: true,
-}, {
-	id: '23d67613-d484-4a93-b71e-3e81b19d6186',
-	level: 4,
-	sizeX: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25,
-	sizeY: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25,
-	shape: 'circle',
-	score: 8,
-	dropCandidate: true,
-}, {
-	id: '3cbd0add-ad7d-4685-bad0-29f6dddc0b99',
-	level: 3,
-	sizeX: NORMAL_BASE_SIZE * 1.25 * 1.25,
-	sizeY: NORMAL_BASE_SIZE * 1.25 * 1.25,
-	shape: 'circle',
-	score: 4,
-	dropCandidate: true,
-}, {
-	id: '8f86d4f4-ee02-41bf-ad38-1ce0ae457fb5',
-	level: 2,
-	sizeX: NORMAL_BASE_SIZE * 1.25,
-	sizeY: NORMAL_BASE_SIZE * 1.25,
-	shape: 'circle',
-	score: 2,
-	dropCandidate: true,
-}, {
-	id: '64ec4add-ce39-42b4-96cb-33908f3f118d',
-	level: 1,
-	sizeX: NORMAL_BASE_SIZE,
-	sizeY: NORMAL_BASE_SIZE,
-	shape: 'circle',
-	score: 1,
-	dropCandidate: true,
-}];
-
-const YEN_BASE_SIZE = 32;
-const YEN_SATSU_BASE_SIZE = 70;
-const YEN_MONOS: Mono[] = [{
-	id: '880f9bd9-802f-4135-a7e1-fd0e0331f726',
-	level: 10,
-	sizeX: (YEN_SATSU_BASE_SIZE * 2) * 1.25 * 1.25 * 1.25,
-	sizeY: YEN_SATSU_BASE_SIZE * 1.25 * 1.25 * 1.25,
-	shape: 'rectangle',
-	score: 10000,
-	dropCandidate: false,
-}, {
-	id: 'e807beb6-374a-4314-9cc2-aa5f17d96b6b',
-	level: 9,
-	sizeX: (YEN_SATSU_BASE_SIZE * 2) * 1.25 * 1.25,
-	sizeY: YEN_SATSU_BASE_SIZE * 1.25 * 1.25,
-	shape: 'rectangle',
-	score: 5000,
-	dropCandidate: false,
-}, {
-	id: '033445b7-8f90-4fc9-beca-71a9e87cb530',
-	level: 8,
-	sizeX: (YEN_SATSU_BASE_SIZE * 2) * 1.25,
-	sizeY: YEN_SATSU_BASE_SIZE * 1.25,
-	shape: 'rectangle',
-	score: 2000,
-	dropCandidate: false,
-}, {
-	id: '410a09ec-5f7f-46f6-b26f-cbca4ccbd091',
-	level: 7,
-	sizeX: YEN_SATSU_BASE_SIZE * 2,
-	sizeY: YEN_SATSU_BASE_SIZE,
-	shape: 'rectangle',
-	score: 1000,
-	dropCandidate: false,
-}, {
-	id: '2aae82bc-3fa4-49ad-a6b5-94d888e809f5',
-	level: 6,
-	sizeX: YEN_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: YEN_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'circle',
-	score: 500,
-	dropCandidate: false,
-}, {
-	id: 'a619bd67-d08f-4cc0-8c7e-c8072a4950cd',
-	level: 5,
-	sizeX: YEN_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: YEN_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'circle',
-	score: 100,
-	dropCandidate: true,
-}, {
-	id: 'c1c5d8e4-17d6-4455-befd-12154d731faa',
-	level: 4,
-	sizeX: YEN_BASE_SIZE * 1.25 * 1.25 * 1.25,
-	sizeY: YEN_BASE_SIZE * 1.25 * 1.25 * 1.25,
-	shape: 'circle',
-	score: 50,
-	dropCandidate: true,
-}, {
-	id: '7082648c-e428-44c4-887a-25c07a8ebdd5',
-	level: 3,
-	sizeX: YEN_BASE_SIZE * 1.25 * 1.25,
-	sizeY: YEN_BASE_SIZE * 1.25 * 1.25,
-	shape: 'circle',
-	score: 10,
-	dropCandidate: true,
-}, {
-	id: '0d8d40d5-e6e0-4d26-8a95-b8d842363379',
-	level: 2,
-	sizeX: YEN_BASE_SIZE * 1.25,
-	sizeY: YEN_BASE_SIZE * 1.25,
-	shape: 'circle',
-	score: 5,
-	dropCandidate: true,
-}, {
-	id: '9dec1b38-d99d-40de-8288-37367b983d0d',
-	level: 1,
-	sizeX: YEN_BASE_SIZE,
-	sizeY: YEN_BASE_SIZE,
-	shape: 'circle',
-	score: 1,
-	dropCandidate: true,
-}];
-
-const SQUARE_BASE_SIZE = 28;
-const SQUARE_MONOS: Mono[] = [{
-	id: 'f75fd0ba-d3d4-40a4-9712-b470e45b0525',
-	level: 10,
-	sizeX: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'rectangle',
-	score: 512,
-	dropCandidate: false,
-}, {
-	id: '7b70f4af-1c01-45fd-af72-61b1f01e03d1',
-	level: 9,
-	sizeX: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'rectangle',
-	score: 256,
-	dropCandidate: false,
-}, {
-	id: '41607ef3-b6d6-4829-95b6-3737bf8bb956',
-	level: 8,
-	sizeX: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'rectangle',
-	score: 128,
-	dropCandidate: false,
-}, {
-	id: '8a8310d2-0374-460f-bb50-ca9cd3ee3416',
-	level: 7,
-	sizeX: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'rectangle',
-	score: 64,
-	dropCandidate: false,
-}, {
-	id: '1092e069-fe1a-450b-be97-b5d477ec398c',
-	level: 6,
-	sizeX: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'rectangle',
-	score: 32,
-	dropCandidate: false,
-}, {
-	id: '2294734d-7bb8-4781-bb7b-ef3820abf3d0',
-	level: 5,
-	sizeX: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'rectangle',
-	score: 16,
-	dropCandidate: true,
-}, {
-	id: 'ea8a61af-e350-45f7-ba6a-366fcd65692a',
-	level: 4,
-	sizeX: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25,
-	sizeY: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25,
-	shape: 'rectangle',
-	score: 8,
-	dropCandidate: true,
-}, {
-	id: 'd0c74815-fc1c-4fbe-9953-c92e4b20f919',
-	level: 3,
-	sizeX: SQUARE_BASE_SIZE * 1.25 * 1.25,
-	sizeY: SQUARE_BASE_SIZE * 1.25 * 1.25,
-	shape: 'rectangle',
-	score: 4,
-	dropCandidate: true,
-}, {
-	id: 'd8fbd70e-611d-402d-87da-1a7fd8cd2c8d',
-	level: 2,
-	sizeX: SQUARE_BASE_SIZE * 1.25,
-	sizeY: SQUARE_BASE_SIZE * 1.25,
-	shape: 'rectangle',
-	score: 2,
-	dropCandidate: true,
-}, {
-	id: '35e476ee-44bd-4711-ad42-87be245d3efd',
-	level: 1,
-	sizeX: SQUARE_BASE_SIZE,
-	sizeY: SQUARE_BASE_SIZE,
-	shape: 'rectangle',
-	score: 1,
-	dropCandidate: true,
-}];
-
-const SWEETS_BASE_SIZE = 40;
-const SWEETS_MONOS: Mono[] = [{
-	id: '77f724c0-88be-4aeb-8e1a-a00ed18e3844',
-	level: 10,
-	sizeX: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'custom',
-	vertices: [
-		[
-			{
-				'x': 14,
-				'y': 2,
-			},
-			{
-				'x': 2,
-				'y': 13,
-			},
-			{
-				'x': 2,
-				'y': 31,
-			},
-			{
-				'x': 30,
-				'y': 23,
-			},
-			{
-				'x': 30,
-				'y': 7,
-			},
-			{
-				'x': 29,
-				'y': 6,
-			},
-			{
-				'x': 20,
-				'y': 4,
-			},
-			{
-				'x': 17,
-				'y': 3,
-			},
-			{
-				'x': 16,
-				'y': 2,
-			},
-		],
-	],
-	verticesSize: 32,
-	score: 400,
-	dropCandidate: false,
-}, {
-	id: 'f3468ef4-2e1e-4906-8795-f147f39f7e1f',
-	level: 9,
-	sizeX: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'custom',
-	vertices: [
-		[
-			{
-				'x': 15,
-				'y': 2,
-			},
-			{
-				'x': 14,
-				'y': 3,
-			},
-			{
-				'x': 8,
-				'y': 4,
-			},
-			{
-				'x': 6,
-				'y': 5,
-			},
-			{
-				'x': 4,
-				'y': 8,
-			},
-			{
-				'x': 4,
-				'y': 15,
-			},
-			{
-				'x': 2,
-				'y': 19,
-			},
-			{
-				'x': 2,
-				'y': 22.36,
-			},
-			{
-				'x': 3,
-				'y': 25,
-			},
-			{
-				'x': 5,
-				'y': 28,
-			},
-			{
-				'x': 10,
-				'y': 30,
-			},
-			{
-				'x': 22,
-				'y': 30,
-			},
-			{
-				'x': 27,
-				'y': 28,
-			},
-			{
-				'x': 29,
-				'y': 25,
-			},
-			{
-				'x': 30,
-				'y': 22,
-			},
-			{
-				'x': 30,
-				'y': 19,
-			},
-			{
-				'x': 28,
-				'y': 15,
-			},
-			{
-				'x': 28,
-				'y': 8,
-			},
-			{
-				'x': 26,
-				'y': 5,
-			},
-			{
-				'x': 24,
-				'y': 4,
-			},
-			{
-				'x': 18,
-				'y': 3,
-			},
-			{
-				'x': 17,
-				'y': 2,
-			},
-		],
-	],
-	verticesSize: 32,
-	score: 380,
-	dropCandidate: false,
-}, {
-	id: 'bcb41129-6f2d-44ee-89d3-86eb2df564ba',
-	level: 8,
-	sizeX: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'custom',
-	vertices: [
-		[
-			{
-				'x': 15,
-				'y': 2,
-			},
-			{
-				'x': 11,
-				'y': 3,
-			},
-			{
-				'x': 8,
-				'y': 6,
-			},
-			{
-				'x': 7,
-				'y': 8,
-			},
-			{
-				'x': 6,
-				'y': 11,
-			},
-			{
-				'x': 6,
-				'y': 13,
-			},
-			{
-				'x': 7,
-				'y': 16,
-			},
-			{
-				'x': 8,
-				'y': 18,
-			},
-			{
-				'x': 15,
-				'y': 30,
-			},
-			{
-				'x': 17,
-				'y': 30,
-			},
-			{
-				'x': 24,
-				'y': 18,
-			},
-			{
-				'x': 25,
-				'y': 16,
-			},
-			{
-				'x': 26,
-				'y': 13,
-			},
-			{
-				'x': 26,
-				'y': 11,
-			},
-			{
-				'x': 25,
-				'y': 8,
-			},
-			{
-				'x': 24,
-				'y': 6,
-			},
-			{
-				'x': 21,
-				'y': 3,
-			},
-			{
-				'x': 17,
-				'y': 2,
-			},
-		],
-	],
-	verticesSize: 32,
-	score: 300,
-	dropCandidate: false,
-}, {
-	id: 'f058e1ad-1981-409b-b3a7-302de0a43744',
-	level: 7,
-	sizeX: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'custom',
-	vertices: [
-		[
-			{
-				'x': 17,
-				'y': 2.541,
-			},
-			{
-				'x': 14,
-				'y': 5.402,
-			},
-			{
-				'x': 10,
-				'y': 7,
-			},
-			{
-				'x': 10,
-				'y': 10.367,
-			},
-			{
-				'x': 8,
-				'y': 11,
-			},
-			{
-				'x': 8,
-				'y': 14,
-			},
-			{
-				'x': 5.781,
-				'y': 16.265,
-			},
-			{
-				'x': 6.594,
-				'y': 19.627,
-			},
-			{
-				'x': 9.414,
-				'y': 21,
-			},
-			{
-				'x': 12,
-				'y': 29.988,
-			},
-			{
-				'x': 21,
-				'y': 29.988,
-			},
-			{
-				'x': 22.016,
-				'y': 22.629,
-			},
-			{
-				'x': 23,
-				'y': 21.772,
-			},
-			{
-				'x': 23,
-				'y': 19.202,
-			},
-			{
-				'x': 25.783,
-				'y': 17.473,
-			},
-			{
-				'x': 25.783,
-				'y': 14.727,
-			},
-			{
-				'x': 24,
-				'y': 13.173,
-			},
-			{
-				'x': 24,
-				'y': 10.367,
-			},
-			{
-				'x': 22,
-				'y': 9.233,
-			},
-			{
-				'x': 22,
-				'y': 6.454,
-			},
-			{
-				'x': 18,
-				'y': 5,
-			},
-		],
-	],
-	verticesSize: 32,
-	score: 300,
-	dropCandidate: false,
-}, {
-	id: 'd22cfe38-5a3b-4b9c-a1a6-907930a3d732',
-	level: 6,
-	sizeX: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'custom',
-	vertices: [
-		[
-			{
-				'x': 15,
-				'y': 2,
-			},
-			{
-				'x': 11,
-				'y': 3,
-			},
-			{
-				'x': 8,
-				'y': 5,
-			},
-			{
-				'x': 7,
-				'y': 6,
-			},
-			{
-				'x': 5,
-				'y': 9,
-			},
-			{
-				'x': 4,
-				'y': 12,
-			},
-			{
-				'x': 4,
-				'y': 20,
-			},
-			{
-				'x': 5,
-				'y': 23,
-			},
-			{
-				'x': 7,
-				'y': 26,
-			},
-			{
-				'x': 11,
-				'y': 29,
-			},
-			{
-				'x': 14,
-				'y': 30,
-			},
-			{
-				'x': 18,
-				'y': 30,
-			},
-			{
-				'x': 21,
-				'y': 29,
-			},
-			{
-				'x': 25,
-				'y': 26,
-			},
-			{
-				'x': 27,
-				'y': 23,
-			},
-			{
-				'x': 28,
-				'y': 20,
-			},
-			{
-				'x': 28,
-				'y': 12,
-			},
-			{
-				'x': 27,
-				'y': 9,
-			},
-			{
-				'x': 25,
-				'y': 6,
-			},
-			{
-				'x': 24,
-				'y': 5,
-			},
-			{
-				'x': 21,
-				'y': 3,
-			},
-			{
-				'x': 17,
-				'y': 2,
-			},
-		],
-	],
-	verticesSize: 32,
-	score: 250,
-	dropCandidate: false,
-}, {
-	id: '79867083-a073-427e-ae82-07a70d9f3b4f',
-	level: 5,
-	sizeX: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25,
-	sizeY: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25,
-	shape: 'custom',
-	vertices: [
-		[
-			{
-				'x': 9,
-				'y': 15,
-			},
-			{
-				'x': 23,
-				'y': 15,
-			},
-			{
-				'x': 30,
-				'y': 27,
-			},
-			{
-				'x': 25.7,
-				'y': 30,
-			},
-			{
-				'x': 6.34,
-				'y': 30,
-			},
-			{
-				'x': 2,
-				'y': 27,
-			},
-		],
-	],
-	verticesSize: 32,
-	score: 200,
-	dropCandidate: true,
-}, {
-	id: '2e152a12-a567-4100-b4d4-d15d81ba47b1',
-	level: 4,
-	sizeX: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25,
-	sizeY: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25,
-	shape: 'custom',
-	vertices: [
-		[
-			{
-				'x': 12,
-				'y': 2,
-			},
-			{
-				'x': 2,
-				'y': 12,
-			},
-			{
-				'x': 2,
-				'y': 14,
-			},
-			{
-				'x': 18,
-				'y': 30,
-			},
-			{
-				'x': 20,
-				'y': 30,
-			},
-			{
-				'x': 30,
-				'y': 20,
-			},
-			{
-				'x': 30,
-				'y': 18,
-			},
-			{
-				'x': 14,
-				'y': 2,
-			},
-		],
-	],
-	verticesSize: 32,
-	score: 200,
-	dropCandidate: true,
-}, {
-	id: '12250376-2258-4716-8eec-b3a7239461fc',
-	level: 3,
-	sizeX: SWEETS_BASE_SIZE * 1.25 * 1.25,
-	sizeY: SWEETS_BASE_SIZE * 1.25 * 1.25,
-	shape: 'custom',
-	vertices: [
-		[
-			{
-				'x': 12,
-				'y': 2,
-			},
-			{
-				'x': 7,
-				'y': 3,
-			},
-			{
-				'x': 3,
-				'y': 7,
-			},
-			{
-				'x': 2,
-				'y': 12,
-			},
-			{
-				'x': 3,
-				'y': 16,
-			},
-			{
-				'x': 5,
-				'y': 19,
-			},
-			{
-				'x': 8,
-				'y': 21,
-			},
-			{
-				'x': 12,
-				'y': 22,
-			},
-			{
-				'x': 18,
-				'y': 21,
-			},
-			{
-				'x': 27,
-				'y': 30,
-			},
-			{
-				'x': 30,
-				'y': 30,
-			},
-			{
-				'x': 30,
-				'y': 27,
-			},
-			{
-				'x': 21,
-				'y': 18,
-			},
-			{
-				'x': 22,
-				'y': 14.25,
-			},
-			{
-				'x': 22,
-				'y': 11,
-			},
-			{
-				'x': 21,
-				'y': 8,
-			},
-			{
-				'x': 19,
-				'y': 5,
-			},
-			{
-				'x': 16.5,
-				'y': 3,
-			},
-		],
-	],
-	verticesSize: 32,
-	score: 120,
-	dropCandidate: true,
-}, {
-	id: '4d4f2668-4be7-44a3-aa3a-856df6e25aa6',
-	level: 2,
-	sizeX: SWEETS_BASE_SIZE * 1.25,
-	sizeY: SWEETS_BASE_SIZE * 1.25,
-	shape: 'custom',
-	vertices: [
-		[
-			{
-				'x': 12,
-				'y': 1.9,
-			},
-			{
-				'x': 4,
-				'y': 4,
-			},
-			{
-				'x': 2,
-				'y': 12,
-			},
-			{
-				'x': 6,
-				'y': 13.375,
-			},
-			{
-				'x': 6,
-				'y': 18,
-			},
-			{
-				'x': 8,
-				'y': 22,
-			},
-			{
-				'x': 12,
-				'y': 25.372,
-			},
-			{
-				'x': 16,
-				'y': 26,
-			},
-			{
-				'x': 19,
-				'y': 25.372,
-			},
-			{
-				'x': 20,
-				'y': 30,
-			},
-			{
-				'x': 28,
-				'y': 27,
-			},
-			{
-				'x': 30,
-				'y': 20,
-			},
-			{
-				'x': 25.473,
-				'y': 19,
-			},
-			{
-				'x': 26,
-				'y': 15,
-			},
-			{
-				'x': 24,
-				'y': 10,
-			},
-			{
-				'x': 20,
-				'y': 7,
-			},
-			{
-				'x': 16,
-				'y': 6,
-			},
-			{
-				'x': 13,
-				'y': 6,
-			},
-		],
-	],
-	verticesSize: 32,
-	score: 20,
-	dropCandidate: true,
-}, {
-	id: 'c9984b40-4045-44c3-b260-d47b7b4625b2',
-	level: 1,
-	sizeX: SWEETS_BASE_SIZE,
-	sizeY: SWEETS_BASE_SIZE,
-	shape: 'circle',
-	score: 30,
-	dropCandidate: true,
-}];
-
-export class DropAndFusionGame extends EventEmitter<{
-	changeScore: (newScore: number) => void;
-	changeCombo: (newCombo: number) => void;
-	changeStock: (newStock: { id: string; mono: Mono }[]) => void;
-	changeHolding: (newHolding: { id: string; mono: Mono } | null) => void;
-	dropped: (x: number) => void;
-	fusioned: (x: number, y: number, nextMono: Mono | null, scoreDelta: number) => void;
-	collision: (energy: number, bodyA: Matter.Body, bodyB: Matter.Body) => void;
-	monoAdded: (mono: Mono) => void;
-	gameOver: () => void;
-}> {
-	private PHYSICS_QUALITY_FACTOR = 16; // 低いほどパフォーマンスが高いがガタガタして安定しなくなる、逆に高すぎても何故か不安定になる
-	private COMBO_INTERVAL = 60; // frame
-	public readonly GAME_VERSION = 3;
-	public readonly GAME_WIDTH = 450;
-	public readonly GAME_HEIGHT = 600;
-	public readonly DROP_COOLTIME = 30; // frame
-	public readonly PLAYAREA_MARGIN = 25;
-	private STOCK_MAX = 4;
-	private TICK_DELTA = 1000 / 60; // 60fps
-
-	public frame = 0;
-	public engine: Matter.Engine;
-	private tickCallbackQueue: { frame: number; callback: () => void; }[] = [];
-	private overflowCollider: Matter.Body;
-	private isGameOver = false;
-	private gameMode: 'normal' | 'yen' | 'square' | 'sweets' | 'space';
-	private rng: () => number;
-	private logs: Log[] = [];
-
-	/**
-	 * フィールドに出ていて、かつ合体の対象となるアイテム
-	 */
-	private fusionReadyBodyIds: Matter.Body['id'][] = [];
-
-	private gameOverReadyBodyIds: Matter.Body['id'][] = [];
-
-	/**
-	 * fusion予約アイテムのペア
-	 * TODO: これらのモノは光らせるなどの演出をすると視覚的に楽しそう
-	 */
-	private fusionReservedPairs: { bodyA: Matter.Body; bodyB: Matter.Body }[] = [];
-
-	private latestDroppedAt = 0; // frame
-	private latestFusionedAt = 0; // frame
-	private stock: { id: string; mono: Mono }[] = [];
-	private holding: { id: string; mono: Mono } | null = null;
-
-	public get monoDefinitions() {
-		switch (this.gameMode) {
-			case 'normal': return NORAML_MONOS;
-			case 'yen': return YEN_MONOS;
-			case 'square': return SQUARE_MONOS;
-			case 'sweets': return SWEETS_MONOS;
-			case 'space': return NORAML_MONOS;
-		}
-	}
-
-	private _combo = 0;
-	private get combo() {
-		return this._combo;
-	}
-	private set combo(value: number) {
-		this._combo = value;
-		this.emit('changeCombo', value);
-	}
-
-	private _score = 0;
-	private get score() {
-		return this._score;
-	}
-	private set score(value: number) {
-		this._score = value;
-		this.emit('changeScore', value);
-	}
-
-	private getMonoRenderOptions: null | ((mono: Mono) => Partial<Matter.IBodyRenderOptions>) = null;
-
-	public replayPlaybackRate = 1;
-
-	constructor(env: {
-		seed: string;
-		gameMode: DropAndFusionGame['gameMode'];
-		getMonoRenderOptions?: (mono: Mono) => Partial<Matter.IBodyRenderOptions>;
-	}) {
-		super();
-
-		//#region BIND
-		this.tick = this.tick.bind(this);
-		//#endregion
-
-		this.gameMode = env.gameMode;
-		this.getMonoRenderOptions = env.getMonoRenderOptions ?? null;
-		this.rng = seedrandom(env.seed);
-
-		// sweetsモードは重いため
-		const physicsQualityFactor = this.gameMode === 'sweets' ? 4 : this.PHYSICS_QUALITY_FACTOR;
-		this.engine = Matter.Engine.create({
-			constraintIterations: 2 * physicsQualityFactor,
-			positionIterations: 6 * physicsQualityFactor,
-			velocityIterations: 4 * physicsQualityFactor,
-			gravity: {
-				x: 0,
-				y: this.gameMode === 'space' ? 0.0125 : 1,
-			},
-			timing: {
-				timeScale: 2,
-			},
-			enableSleeping: false,
-		});
-
-		this.engine.world.bodies = [];
-
-		//#region walls
-		const WALL_OPTIONS: Matter.IChamferableBodyDefinition = {
-			label: '_wall_',
-			isStatic: true,
-			friction: 0.7,
-			slop: this.gameMode === 'space' ? 0.01 : 0.7,
-			render: {
-				strokeStyle: 'transparent',
-				fillStyle: 'transparent',
-			},
-		};
-
-		const thickness = 100;
-		Matter.Composite.add(this.engine.world, [
-			Matter.Bodies.rectangle(this.GAME_WIDTH / 2, this.GAME_HEIGHT + (thickness / 2) - this.PLAYAREA_MARGIN, this.GAME_WIDTH, thickness, WALL_OPTIONS),
-			Matter.Bodies.rectangle(this.GAME_WIDTH + (thickness / 2) - this.PLAYAREA_MARGIN, this.GAME_HEIGHT / 2, thickness, this.GAME_HEIGHT, WALL_OPTIONS),
-			Matter.Bodies.rectangle(-((thickness / 2) - this.PLAYAREA_MARGIN), this.GAME_HEIGHT / 2, thickness, this.GAME_HEIGHT, WALL_OPTIONS),
-		]);
-		//#endregion
-
-		this.overflowCollider = Matter.Bodies.rectangle(this.GAME_WIDTH / 2, 0, this.GAME_WIDTH, 200, {
-			label: '_overflow_',
-			isStatic: true,
-			isSensor: true,
-			render: {
-				strokeStyle: 'transparent',
-				fillStyle: 'transparent',
-			},
-		});
-		Matter.Composite.add(this.engine.world, this.overflowCollider);
-	}
-
-	public msToFrame(ms: number) {
-		return Math.round(ms / this.TICK_DELTA);
-	}
-
-	public frameToMs(frame: number) {
-		return frame * this.TICK_DELTA;
-	}
-
-	private createBody(mono: Mono, x: number, y: number) {
-		const options: Matter.IBodyDefinition = {
-			label: mono.id,
-			density: this.gameMode === 'space' ? 0.01 : ((mono.sizeX * mono.sizeY) / 10000),
-			restitution: this.gameMode === 'space' ? 0.5 : 0.2,
-			frictionAir: this.gameMode === 'space' ? 0 : 0.01,
-			friction: this.gameMode === 'space' ? 0.5 : 0.7,
-			frictionStatic: this.gameMode === 'space' ? 0 : 5,
-			slop: this.gameMode === 'space' ? 0.01 : 0.7,
-			//mass: 0,
-			render: this.getMonoRenderOptions ? this.getMonoRenderOptions(mono) : undefined,
-		};
-		if (mono.shape === 'circle') {
-			return Matter.Bodies.circle(x, y, mono.sizeX / 2, options);
-		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-		} else if (mono.shape === 'rectangle') {
-			return Matter.Bodies.rectangle(x, y, mono.sizeX, mono.sizeY, options);
-		} else if (mono.shape === 'custom') {
-			return Matter.Bodies.fromVertices(x, y, mono.vertices!.map(i => i.map(j => ({
-				x: (j.x / mono.verticesSize!) * mono.sizeX,
-				y: (j.y / mono.verticesSize!) * mono.sizeY,
-			}))), options);
-		} else {
-			throw new Error('unrecognized shape');
-		}
-	}
-
-	private fusion(bodyA: Matter.Body, bodyB: Matter.Body) {
-		if (this.latestFusionedAt > this.frame - this.COMBO_INTERVAL) {
-			this.combo++;
-		} else {
-			this.combo = 1;
-		}
-		this.latestFusionedAt = this.frame;
-
-		const newX = (bodyA.position.x + bodyB.position.x) / 2;
-		const newY = (bodyA.position.y + bodyB.position.y) / 2;
-
-		this.fusionReadyBodyIds = this.fusionReadyBodyIds.filter(x => x !== bodyA.id && x !== bodyB.id);
-		this.gameOverReadyBodyIds = this.gameOverReadyBodyIds.filter(x => x !== bodyA.id && x !== bodyB.id);
-		Matter.Composite.remove(this.engine.world, [bodyA, bodyB]);
-
-		const currentMono = this.monoDefinitions.find(y => y.id === bodyA.label)!;
-		const nextMono = this.monoDefinitions.find(x => x.level === currentMono.level + 1) ?? null;
-
-		if (nextMono) {
-			const body = this.createBody(nextMono, newX, newY);
-			Matter.Composite.add(this.engine.world, body);
-
-			// 連鎖してfusionした場合の分かりやすさのため少し間を置いてからfusion対象になるようにする
-			this.tickCallbackQueue.push({
-				frame: this.frame + this.msToFrame(100),
-				callback: () => {
-					this.fusionReadyBodyIds.push(body.id);
-				},
-			});
-
-			this.emit('monoAdded', nextMono);
-		}
-
-		const hasComboBonus = this.gameMode !== 'yen' && this.gameMode !== 'sweets';
-		const comboBonus = hasComboBonus ? 1 + ((this.combo - 1) / 5) : 1;
-		const additionalScore = Math.round(currentMono.score * comboBonus);
-		this.score += additionalScore;
-
-		this.emit('fusioned', newX, newY, nextMono, additionalScore);
-	}
-
-	private onCollision(event: Matter.IEventCollision<Matter.Engine>) {
-		for (const pairs of event.pairs) {
-			const { bodyA, bodyB } = pairs;
-
-			const shouldFusion = (bodyA.label === bodyB.label) &&
-				!this.fusionReservedPairs.some(x =>
-					x.bodyA.id === bodyA.id ||
-					x.bodyA.id === bodyB.id ||
-					x.bodyB.id === bodyA.id ||
-					x.bodyB.id === bodyB.id);
-
-			if (shouldFusion) {
-				if (this.fusionReadyBodyIds.includes(bodyA.id) && this.fusionReadyBodyIds.includes(bodyB.id)) {
-					this.fusion(bodyA, bodyB);
-				} else {
-					this.fusionReservedPairs.push({ bodyA, bodyB });
-					this.tickCallbackQueue.push({
-						frame: this.frame + this.msToFrame(100),
-						callback: () => {
-							this.fusionReservedPairs = this.fusionReservedPairs.filter(x => x.bodyA.id !== bodyA.id && x.bodyB.id !== bodyB.id);
-							this.fusion(bodyA, bodyB);
-						},
-					});
-				}
-			} else {
-				const energy = pairs.collision.depth;
-
-				if (bodyA.label === '_overflow_' || bodyB.label === '_overflow_') continue;
-
-				if (bodyA.label !== '_wall_' && bodyB.label !== '_wall_') {
-					if (!this.gameOverReadyBodyIds.includes(bodyA.id)) this.gameOverReadyBodyIds.push(bodyA.id);
-					if (!this.gameOverReadyBodyIds.includes(bodyB.id)) this.gameOverReadyBodyIds.push(bodyB.id);
-				}
-
-				this.emit('collision', energy, bodyA, bodyB);
-			}
-		}
-	}
-
-	private onCollisionActive(event: Matter.IEventCollision<Matter.Engine>) {
-		for (const pairs of event.pairs) {
-			const { bodyA, bodyB } = pairs;
-
-			// ハコからあふれたかどうかの判定
-			if (bodyA.id === this.overflowCollider.id || bodyB.id === this.overflowCollider.id) {
-				if (this.gameOverReadyBodyIds.includes(bodyA.id) || this.gameOverReadyBodyIds.includes(bodyB.id)) {
-					this.gameOver();
-					break;
-				}
-				continue;
-			}
-		}
-	}
-
-	public surrender() {
-		this.logs.push({
-			frame: this.frame,
-			operation: 'surrender',
-		});
-
-		this.gameOver();
-	}
-
-	private gameOver() {
-		this.isGameOver = true;
-		this.emit('gameOver');
-	}
-
-	public start() {
-		for (let i = 0; i < this.STOCK_MAX; i++) {
-			this.stock.push({
-				id: this.rng().toString(),
-				mono: this.monoDefinitions.filter(x => x.dropCandidate)[Math.floor(this.rng() * this.monoDefinitions.filter(x => x.dropCandidate).length)],
-			});
-		}
-		this.emit('changeStock', this.stock);
-
-		Matter.Events.on(this.engine, 'collisionStart', this.onCollision.bind(this));
-		Matter.Events.on(this.engine, 'collisionActive', this.onCollisionActive.bind(this));
-	}
-
-	public getLogs() {
-		return this.logs;
-	}
-
-	public tick() {
-		this.frame++;
-
-		if (this.latestFusionedAt < this.frame - this.COMBO_INTERVAL) {
-			this.combo = 0;
-		}
-
-		this.tickCallbackQueue = this.tickCallbackQueue.filter(x => {
-			if (x.frame === this.frame) {
-				x.callback();
-				return false;
-			} else {
-				return true;
-			}
-		});
-
-		Matter.Engine.update(this.engine, this.TICK_DELTA);
-
-		const hasNextTick = !this.isGameOver;
-
-		return hasNextTick;
-	}
-
-	public getActiveMonos() {
-		return this.engine.world.bodies.map(x => this.monoDefinitions.find((mono) => mono.id === x.label)!).filter(x => x !== undefined);
-	}
-
-	public drop(_x: number) {
-		if (this.isGameOver) return;
-		if (this.frame - this.latestDroppedAt < this.DROP_COOLTIME) return;
-
-		const head = this.stock.shift()!;
-		this.stock.push({
-			id: this.rng().toString(),
-			mono: this.monoDefinitions.filter(x => x.dropCandidate)[Math.floor(this.rng() * this.monoDefinitions.filter(x => x.dropCandidate).length)],
-		});
-		this.emit('changeStock', this.stock);
-
-		const inputX = Math.round(_x);
-		const x = Math.min(this.GAME_WIDTH - this.PLAYAREA_MARGIN - (head.mono.sizeX / 2), Math.max(this.PLAYAREA_MARGIN + (head.mono.sizeX / 2), inputX));
-		const body = this.createBody(head.mono, x, 50 + head.mono.sizeY / 2);
-		this.logs.push({
-			frame: this.frame,
-			operation: 'drop',
-			x: inputX,
-		});
-
-		// add force
-		if (this.gameMode === 'space') {
-			Matter.Body.applyForce(body, body.position, {
-				x: 0,
-				y: (Math.PI * head.mono.sizeX * head.mono.sizeY) / 65536,
-			});
-		}
-
-		Matter.Composite.add(this.engine.world, body);
-
-		this.fusionReadyBodyIds.push(body.id);
-		this.latestDroppedAt = this.frame;
-
-		this.emit('dropped', x);
-		this.emit('monoAdded', head.mono);
-	}
-
-	public hold() {
-		if (this.isGameOver) return;
-
-		this.logs.push({
-			frame: this.frame,
-			operation: 'hold',
-		});
-
-		if (this.holding) {
-			const head = this.stock.shift()!;
-			this.stock.unshift(this.holding);
-			this.holding = head;
-			this.emit('changeHolding', this.holding);
-			this.emit('changeStock', this.stock);
-		} else {
-			const head = this.stock.shift()!;
-			this.holding = head;
-			this.stock.push({
-				id: this.rng().toString(),
-				mono: this.monoDefinitions.filter(x => x.dropCandidate)[Math.floor(this.rng() * this.monoDefinitions.filter(x => x.dropCandidate).length)],
-			});
-			this.emit('changeHolding', this.holding);
-			this.emit('changeStock', this.stock);
-		}
-	}
-
-	public static serializeLogs(logs: Log[]) {
-		const _logs: number[][] = [];
-
-		for (let i = 0; i < logs.length; i++) {
-			const log = logs[i];
-			const frameDelta = i === 0 ? log.frame : log.frame - logs[i - 1].frame;
-
-			switch (log.operation) {
-				case 'drop':
-					_logs.push([frameDelta, 0, log.x]);
-					break;
-				case 'hold':
-					_logs.push([frameDelta, 1]);
-					break;
-				case 'surrender':
-					_logs.push([frameDelta, 2]);
-					break;
-			}
-		}
-
-		return _logs;
-	}
-
-	public static deserializeLogs(logs: number[][]) {
-		const _logs: Log[] = [];
-
-		let frame = 0;
-
-		for (const log of logs) {
-			const frameDelta = log[0];
-			frame += frameDelta;
-
-			const operation = log[1];
-
-			switch (operation) {
-				case 0:
-					_logs.push({
-						frame,
-						operation: 'drop',
-						x: log[2],
-					});
-					break;
-				case 1:
-					_logs.push({
-						frame,
-						operation: 'hold',
-					});
-					break;
-				case 2:
-					_logs.push({
-						frame,
-						operation: 'surrender',
-					});
-					break;
-			}
-		}
-
-		return _logs;
-	}
-
-	public dispose() {
-		Matter.World.clear(this.engine.world, false);
-		Matter.Engine.clear(this.engine);
-	}
-}
diff --git a/packages/frontend/vite.config.ts b/packages/frontend/vite.config.ts
index 8cdc7b59c6..84fe9e44df 100644
--- a/packages/frontend/vite.config.ts
+++ b/packages/frontend/vite.config.ts
@@ -103,7 +103,7 @@ export function getConfig(): UserConfig {
 
 		// https://vitejs.dev/guide/dep-pre-bundling.html#monorepos-and-linked-dependencies
 		optimizeDeps: {
-			include: ['misskey-js', 'misskey-reversi'],
+			include: ['misskey-js', 'misskey-reversi', 'misskey-bubble-game'],
 		},
 
 		build: {
@@ -135,7 +135,7 @@ export function getConfig(): UserConfig {
 
 			// https://vitejs.dev/guide/dep-pre-bundling.html#monorepos-and-linked-dependencies
 			commonjsOptions: {
-				include: [/misskey-js/, /misskey-reversi/, /node_modules/],
+				include: [/misskey-js/, /misskey-reversi/, /misskey-bubble-game/, /node_modules/],
 			},
 		},
 
diff --git a/packages/misskey-bubble-game/.eslintignore b/packages/misskey-bubble-game/.eslintignore
new file mode 100644
index 0000000000..f22128f047
--- /dev/null
+++ b/packages/misskey-bubble-game/.eslintignore
@@ -0,0 +1,7 @@
+node_modules
+/built
+/coverage
+/.eslintrc.js
+/jest.config.ts
+/test
+/test-d
diff --git a/packages/misskey-bubble-game/.eslintrc.cjs b/packages/misskey-bubble-game/.eslintrc.cjs
new file mode 100644
index 0000000000..e2e31e9e33
--- /dev/null
+++ b/packages/misskey-bubble-game/.eslintrc.cjs
@@ -0,0 +1,9 @@
+module.exports = {
+	parserOptions: {
+		tsconfigRootDir: __dirname,
+		project: ['./tsconfig.json'],
+	},
+	extends: [
+		'../shared/.eslintrc.js',
+	],
+};
diff --git a/packages/misskey-bubble-game/package.json b/packages/misskey-bubble-game/package.json
new file mode 100644
index 0000000000..806d693670
--- /dev/null
+++ b/packages/misskey-bubble-game/package.json
@@ -0,0 +1,31 @@
+{
+	"name": "misskey-bubble-game",
+	"version": "0.0.1",
+	"main": "./built/index.js",
+	"types": "./built/index.d.ts",
+	"scripts": {
+		"build": "tsc",
+		"watch": "nodemon -w src -e ts,js,cjs,mjs,json --exec \"pnpm run build\"",
+		"eslint": "eslint . --ext .js,.jsx,.ts,.tsx",
+		"typecheck": "tsc --noEmit",
+		"lint": "pnpm typecheck && pnpm eslint"
+	},
+	"devDependencies": {
+		"@misskey-dev/eslint-plugin": "1.0.0",
+		"@types/matter-js": "0.19.6",
+		"@types/node": "20.11.5",
+		"@types/seedrandom": "3.0.8",
+		"@typescript-eslint/eslint-plugin": "6.19.0",
+		"@typescript-eslint/parser": "6.19.0",
+		"eslint": "8.56.0",
+		"typescript": "5.3.3"
+	},
+	"files": [
+		"built"
+	],
+	"dependencies": {
+		"eventemitter3": "5.0.1",
+		"matter-js": "0.19.0",
+		"seedrandom": "3.0.5"
+	}
+}
diff --git a/packages/misskey-bubble-game/src/game.ts b/packages/misskey-bubble-game/src/game.ts
new file mode 100644
index 0000000000..e01a011eee
--- /dev/null
+++ b/packages/misskey-bubble-game/src/game.ts
@@ -0,0 +1,495 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { EventEmitter } from 'eventemitter3';
+import * as Matter from 'matter-js';
+import seedrandom from 'seedrandom';
+import { NORAML_MONOS, SQUARE_MONOS, SWEETS_MONOS, YEN_MONOS } from './monos.js';
+
+export type Mono = {
+	id: string;
+	level: number;
+	sizeX: number;
+	sizeY: number;
+	shape: 'circle' | 'rectangle' | 'custom';
+	vertices?: Matter.Vector[][];
+	verticesSize?: number;
+	score: number;
+	dropCandidate: boolean;
+};
+
+type Log = {
+	frame: number;
+	operation: 'drop';
+	x: number;
+} | {
+	frame: number;
+	operation: 'hold';
+} | {
+	frame: number;
+	operation: 'surrender';
+};
+
+export class DropAndFusionGame extends EventEmitter<{
+	changeScore: (newScore: number) => void;
+	changeCombo: (newCombo: number) => void;
+	changeStock: (newStock: { id: string; mono: Mono }[]) => void;
+	changeHolding: (newHolding: { id: string; mono: Mono } | null) => void;
+	dropped: (x: number) => void;
+	fusioned: (x: number, y: number, nextMono: Mono | null, scoreDelta: number) => void;
+	collision: (energy: number, bodyA: Matter.Body, bodyB: Matter.Body) => void;
+	monoAdded: (mono: Mono) => void;
+	gameOver: () => void;
+}> {
+	private PHYSICS_QUALITY_FACTOR = 16; // 低いほどパフォーマンスが高いがガタガタして安定しなくなる、逆に高すぎても何故か不安定になる
+	private COMBO_INTERVAL = 60; // frame
+	public readonly GAME_VERSION = 3;
+	public readonly GAME_WIDTH = 450;
+	public readonly GAME_HEIGHT = 600;
+	public readonly DROP_COOLTIME = 30; // frame
+	public readonly PLAYAREA_MARGIN = 25;
+	private STOCK_MAX = 4;
+	private TICK_DELTA = 1000 / 60; // 60fps
+
+	public frame = 0;
+	public engine: Matter.Engine;
+	private tickCallbackQueue: { frame: number; callback: () => void; }[] = [];
+	private overflowCollider: Matter.Body;
+	private isGameOver = false;
+	private gameMode: 'normal' | 'yen' | 'square' | 'sweets' | 'space';
+	private rng: () => number;
+	private logs: Log[] = [];
+
+	/**
+	 * フィールドに出ていて、かつ合体の対象となるアイテム
+	 */
+	private fusionReadyBodyIds: Matter.Body['id'][] = [];
+
+	private gameOverReadyBodyIds: Matter.Body['id'][] = [];
+
+	/**
+	 * fusion予約アイテムのペア
+	 * TODO: これらのモノは光らせるなどの演出をすると視覚的に楽しそう
+	 */
+	private fusionReservedPairs: { bodyA: Matter.Body; bodyB: Matter.Body }[] = [];
+
+	private latestDroppedAt = 0; // frame
+	private latestFusionedAt = 0; // frame
+	private stock: { id: string; mono: Mono }[] = [];
+	private holding: { id: string; mono: Mono } | null = null;
+
+	public get monoDefinitions() {
+		switch (this.gameMode) {
+			case 'normal': return NORAML_MONOS;
+			case 'yen': return YEN_MONOS;
+			case 'square': return SQUARE_MONOS;
+			case 'sweets': return SWEETS_MONOS;
+			case 'space': return NORAML_MONOS;
+		}
+	}
+
+	private _combo = 0;
+	private get combo() {
+		return this._combo;
+	}
+	private set combo(value: number) {
+		this._combo = value;
+		this.emit('changeCombo', value);
+	}
+
+	private _score = 0;
+	private get score() {
+		return this._score;
+	}
+	private set score(value: number) {
+		this._score = value;
+		this.emit('changeScore', value);
+	}
+
+	private getMonoRenderOptions: null | ((mono: Mono) => Partial<Matter.IBodyRenderOptions>) = null;
+
+	public replayPlaybackRate = 1;
+
+	constructor(env: {
+		seed: string;
+		gameMode: DropAndFusionGame['gameMode'];
+		getMonoRenderOptions?: (mono: Mono) => Partial<Matter.IBodyRenderOptions>;
+	}) {
+		super();
+
+		//#region BIND
+		this.tick = this.tick.bind(this);
+		//#endregion
+
+		this.gameMode = env.gameMode;
+		this.getMonoRenderOptions = env.getMonoRenderOptions ?? null;
+		this.rng = seedrandom(env.seed);
+
+		// sweetsモードは重いため
+		const physicsQualityFactor = this.gameMode === 'sweets' ? 4 : this.PHYSICS_QUALITY_FACTOR;
+		this.engine = Matter.Engine.create({
+			constraintIterations: 2 * physicsQualityFactor,
+			positionIterations: 6 * physicsQualityFactor,
+			velocityIterations: 4 * physicsQualityFactor,
+			gravity: {
+				x: 0,
+				y: this.gameMode === 'space' ? 0.0125 : 1,
+			},
+			timing: {
+				timeScale: 2,
+			},
+			enableSleeping: false,
+		});
+
+		this.engine.world.bodies = [];
+
+		//#region walls
+		const WALL_OPTIONS: Matter.IChamferableBodyDefinition = {
+			label: '_wall_',
+			isStatic: true,
+			friction: 0.7,
+			slop: this.gameMode === 'space' ? 0.01 : 0.7,
+			render: {
+				strokeStyle: 'transparent',
+				fillStyle: 'transparent',
+			},
+		};
+
+		const thickness = 100;
+		Matter.Composite.add(this.engine.world, [
+			Matter.Bodies.rectangle(this.GAME_WIDTH / 2, this.GAME_HEIGHT + (thickness / 2) - this.PLAYAREA_MARGIN, this.GAME_WIDTH, thickness, WALL_OPTIONS),
+			Matter.Bodies.rectangle(this.GAME_WIDTH + (thickness / 2) - this.PLAYAREA_MARGIN, this.GAME_HEIGHT / 2, thickness, this.GAME_HEIGHT, WALL_OPTIONS),
+			Matter.Bodies.rectangle(-((thickness / 2) - this.PLAYAREA_MARGIN), this.GAME_HEIGHT / 2, thickness, this.GAME_HEIGHT, WALL_OPTIONS),
+		]);
+		//#endregion
+
+		this.overflowCollider = Matter.Bodies.rectangle(this.GAME_WIDTH / 2, 0, this.GAME_WIDTH, 200, {
+			label: '_overflow_',
+			isStatic: true,
+			isSensor: true,
+			render: {
+				strokeStyle: 'transparent',
+				fillStyle: 'transparent',
+			},
+		});
+		Matter.Composite.add(this.engine.world, this.overflowCollider);
+	}
+
+	public msToFrame(ms: number) {
+		return Math.round(ms / this.TICK_DELTA);
+	}
+
+	public frameToMs(frame: number) {
+		return frame * this.TICK_DELTA;
+	}
+
+	private createBody(mono: Mono, x: number, y: number) {
+		const options: Matter.IBodyDefinition = {
+			label: mono.id,
+			density: this.gameMode === 'space' ? 0.01 : ((mono.sizeX * mono.sizeY) / 10000),
+			restitution: this.gameMode === 'space' ? 0.5 : 0.2,
+			frictionAir: this.gameMode === 'space' ? 0 : 0.01,
+			friction: this.gameMode === 'space' ? 0.5 : 0.7,
+			frictionStatic: this.gameMode === 'space' ? 0 : 5,
+			slop: this.gameMode === 'space' ? 0.01 : 0.7,
+			//mass: 0,
+			render: this.getMonoRenderOptions ? this.getMonoRenderOptions(mono) : undefined,
+		};
+		if (mono.shape === 'circle') {
+			return Matter.Bodies.circle(x, y, mono.sizeX / 2, options);
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		} else if (mono.shape === 'rectangle') {
+			return Matter.Bodies.rectangle(x, y, mono.sizeX, mono.sizeY, options);
+		} else if (mono.shape === 'custom') {
+			return Matter.Bodies.fromVertices(x, y, mono.vertices!.map(i => i.map(j => ({
+				x: (j.x / mono.verticesSize!) * mono.sizeX,
+				y: (j.y / mono.verticesSize!) * mono.sizeY,
+			}))), options);
+		} else {
+			throw new Error('unrecognized shape');
+		}
+	}
+
+	private fusion(bodyA: Matter.Body, bodyB: Matter.Body) {
+		if (this.latestFusionedAt > this.frame - this.COMBO_INTERVAL) {
+			this.combo++;
+		} else {
+			this.combo = 1;
+		}
+		this.latestFusionedAt = this.frame;
+
+		const newX = (bodyA.position.x + bodyB.position.x) / 2;
+		const newY = (bodyA.position.y + bodyB.position.y) / 2;
+
+		this.fusionReadyBodyIds = this.fusionReadyBodyIds.filter(x => x !== bodyA.id && x !== bodyB.id);
+		this.gameOverReadyBodyIds = this.gameOverReadyBodyIds.filter(x => x !== bodyA.id && x !== bodyB.id);
+		Matter.Composite.remove(this.engine.world, [bodyA, bodyB]);
+
+		const currentMono = this.monoDefinitions.find(y => y.id === bodyA.label)!;
+		const nextMono = this.monoDefinitions.find(x => x.level === currentMono.level + 1) ?? null;
+
+		if (nextMono) {
+			const body = this.createBody(nextMono, newX, newY);
+			Matter.Composite.add(this.engine.world, body);
+
+			// 連鎖してfusionした場合の分かりやすさのため少し間を置いてからfusion対象になるようにする
+			this.tickCallbackQueue.push({
+				frame: this.frame + this.msToFrame(100),
+				callback: () => {
+					this.fusionReadyBodyIds.push(body.id);
+				},
+			});
+
+			this.emit('monoAdded', nextMono);
+		}
+
+		const hasComboBonus = this.gameMode !== 'yen' && this.gameMode !== 'sweets';
+		const comboBonus = hasComboBonus ? 1 + ((this.combo - 1) / 5) : 1;
+		const additionalScore = Math.round(currentMono.score * comboBonus);
+		this.score += additionalScore;
+
+		this.emit('fusioned', newX, newY, nextMono, additionalScore);
+	}
+
+	private onCollision(event: Matter.IEventCollision<Matter.Engine>) {
+		for (const pairs of event.pairs) {
+			const { bodyA, bodyB } = pairs;
+
+			const shouldFusion = (bodyA.label === bodyB.label) &&
+				!this.fusionReservedPairs.some(x =>
+					x.bodyA.id === bodyA.id ||
+					x.bodyA.id === bodyB.id ||
+					x.bodyB.id === bodyA.id ||
+					x.bodyB.id === bodyB.id);
+
+			if (shouldFusion) {
+				if (this.fusionReadyBodyIds.includes(bodyA.id) && this.fusionReadyBodyIds.includes(bodyB.id)) {
+					this.fusion(bodyA, bodyB);
+				} else {
+					this.fusionReservedPairs.push({ bodyA, bodyB });
+					this.tickCallbackQueue.push({
+						frame: this.frame + this.msToFrame(100),
+						callback: () => {
+							this.fusionReservedPairs = this.fusionReservedPairs.filter(x => x.bodyA.id !== bodyA.id && x.bodyB.id !== bodyB.id);
+							this.fusion(bodyA, bodyB);
+						},
+					});
+				}
+			} else {
+				const energy = pairs.collision.depth;
+
+				if (bodyA.label === '_overflow_' || bodyB.label === '_overflow_') continue;
+
+				if (bodyA.label !== '_wall_' && bodyB.label !== '_wall_') {
+					if (!this.gameOverReadyBodyIds.includes(bodyA.id)) this.gameOverReadyBodyIds.push(bodyA.id);
+					if (!this.gameOverReadyBodyIds.includes(bodyB.id)) this.gameOverReadyBodyIds.push(bodyB.id);
+				}
+
+				this.emit('collision', energy, bodyA, bodyB);
+			}
+		}
+	}
+
+	private onCollisionActive(event: Matter.IEventCollision<Matter.Engine>) {
+		for (const pairs of event.pairs) {
+			const { bodyA, bodyB } = pairs;
+
+			// ハコからあふれたかどうかの判定
+			if (bodyA.id === this.overflowCollider.id || bodyB.id === this.overflowCollider.id) {
+				if (this.gameOverReadyBodyIds.includes(bodyA.id) || this.gameOverReadyBodyIds.includes(bodyB.id)) {
+					this.gameOver();
+					break;
+				}
+				continue;
+			}
+		}
+	}
+
+	public surrender() {
+		this.logs.push({
+			frame: this.frame,
+			operation: 'surrender',
+		});
+
+		this.gameOver();
+	}
+
+	private gameOver() {
+		this.isGameOver = true;
+		this.emit('gameOver');
+	}
+
+	public start() {
+		for (let i = 0; i < this.STOCK_MAX; i++) {
+			this.stock.push({
+				id: this.rng().toString(),
+				mono: this.monoDefinitions.filter(x => x.dropCandidate)[Math.floor(this.rng() * this.monoDefinitions.filter(x => x.dropCandidate).length)],
+			});
+		}
+		this.emit('changeStock', this.stock);
+
+		Matter.Events.on(this.engine, 'collisionStart', this.onCollision.bind(this));
+		Matter.Events.on(this.engine, 'collisionActive', this.onCollisionActive.bind(this));
+	}
+
+	public getLogs() {
+		return this.logs;
+	}
+
+	public tick() {
+		this.frame++;
+
+		if (this.latestFusionedAt < this.frame - this.COMBO_INTERVAL) {
+			this.combo = 0;
+		}
+
+		this.tickCallbackQueue = this.tickCallbackQueue.filter(x => {
+			if (x.frame === this.frame) {
+				x.callback();
+				return false;
+			} else {
+				return true;
+			}
+		});
+
+		Matter.Engine.update(this.engine, this.TICK_DELTA);
+
+		const hasNextTick = !this.isGameOver;
+
+		return hasNextTick;
+	}
+
+	public getActiveMonos() {
+		return this.engine.world.bodies.map(x => this.monoDefinitions.find((mono) => mono.id === x.label)!).filter(x => x !== undefined);
+	}
+
+	public drop(_x: number) {
+		if (this.isGameOver) return;
+		if (this.frame - this.latestDroppedAt < this.DROP_COOLTIME) return;
+
+		const head = this.stock.shift()!;
+		this.stock.push({
+			id: this.rng().toString(),
+			mono: this.monoDefinitions.filter(x => x.dropCandidate)[Math.floor(this.rng() * this.monoDefinitions.filter(x => x.dropCandidate).length)],
+		});
+		this.emit('changeStock', this.stock);
+
+		const inputX = Math.round(_x);
+		const x = Math.min(this.GAME_WIDTH - this.PLAYAREA_MARGIN - (head.mono.sizeX / 2), Math.max(this.PLAYAREA_MARGIN + (head.mono.sizeX / 2), inputX));
+		const body = this.createBody(head.mono, x, 50 + head.mono.sizeY / 2);
+		this.logs.push({
+			frame: this.frame,
+			operation: 'drop',
+			x: inputX,
+		});
+
+		// add force
+		if (this.gameMode === 'space') {
+			Matter.Body.applyForce(body, body.position, {
+				x: 0,
+				y: (Math.PI * head.mono.sizeX * head.mono.sizeY) / 65536,
+			});
+		}
+
+		Matter.Composite.add(this.engine.world, body);
+
+		this.fusionReadyBodyIds.push(body.id);
+		this.latestDroppedAt = this.frame;
+
+		this.emit('dropped', x);
+		this.emit('monoAdded', head.mono);
+	}
+
+	public hold() {
+		if (this.isGameOver) return;
+
+		this.logs.push({
+			frame: this.frame,
+			operation: 'hold',
+		});
+
+		if (this.holding) {
+			const head = this.stock.shift()!;
+			this.stock.unshift(this.holding);
+			this.holding = head;
+			this.emit('changeHolding', this.holding);
+			this.emit('changeStock', this.stock);
+		} else {
+			const head = this.stock.shift()!;
+			this.holding = head;
+			this.stock.push({
+				id: this.rng().toString(),
+				mono: this.monoDefinitions.filter(x => x.dropCandidate)[Math.floor(this.rng() * this.monoDefinitions.filter(x => x.dropCandidate).length)],
+			});
+			this.emit('changeHolding', this.holding);
+			this.emit('changeStock', this.stock);
+		}
+	}
+
+	public static serializeLogs(logs: Log[]) {
+		const _logs: number[][] = [];
+
+		for (let i = 0; i < logs.length; i++) {
+			const log = logs[i];
+			const frameDelta = i === 0 ? log.frame : log.frame - logs[i - 1].frame;
+
+			switch (log.operation) {
+				case 'drop':
+					_logs.push([frameDelta, 0, log.x]);
+					break;
+				case 'hold':
+					_logs.push([frameDelta, 1]);
+					break;
+				case 'surrender':
+					_logs.push([frameDelta, 2]);
+					break;
+			}
+		}
+
+		return _logs;
+	}
+
+	public static deserializeLogs(logs: number[][]) {
+		const _logs: Log[] = [];
+
+		let frame = 0;
+
+		for (const log of logs) {
+			const frameDelta = log[0];
+			frame += frameDelta;
+
+			const operation = log[1];
+
+			switch (operation) {
+				case 0:
+					_logs.push({
+						frame,
+						operation: 'drop',
+						x: log[2],
+					});
+					break;
+				case 1:
+					_logs.push({
+						frame,
+						operation: 'hold',
+					});
+					break;
+				case 2:
+					_logs.push({
+						frame,
+						operation: 'surrender',
+					});
+					break;
+			}
+		}
+
+		return _logs;
+	}
+
+	public dispose() {
+		Matter.World.clear(this.engine.world, false);
+		Matter.Engine.clear(this.engine);
+	}
+}
diff --git a/packages/misskey-bubble-game/src/index.ts b/packages/misskey-bubble-game/src/index.ts
new file mode 100644
index 0000000000..6df708763f
--- /dev/null
+++ b/packages/misskey-bubble-game/src/index.ts
@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { DropAndFusionGame, Mono } from './game.js';
+
+export {
+	DropAndFusionGame, Mono,
+};
diff --git a/packages/misskey-bubble-game/src/monos.ts b/packages/misskey-bubble-game/src/monos.ts
new file mode 100644
index 0000000000..d205c3cba5
--- /dev/null
+++ b/packages/misskey-bubble-game/src/monos.ts
@@ -0,0 +1,952 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Mono } from './game.js';
+
+const NORMAL_BASE_SIZE = 32;
+export const NORAML_MONOS: Mono[] = [{
+	id: '9377076d-c980-4d83-bdaf-175bc58275b7',
+	level: 10,
+	sizeX: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'circle',
+	score: 512,
+	dropCandidate: false,
+}, {
+	id: 'be9f38d2-b267-4b1a-b420-904e22e80568',
+	level: 9,
+	sizeX: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'circle',
+	score: 256,
+	dropCandidate: false,
+}, {
+	id: 'beb30459-b064-4888-926b-f572e4e72e0c',
+	level: 8,
+	sizeX: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'circle',
+	score: 128,
+	dropCandidate: false,
+}, {
+	id: 'feab6426-d9d8-49ae-849c-048cdbb6cdf0',
+	level: 7,
+	sizeX: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'circle',
+	score: 64,
+	dropCandidate: false,
+}, {
+	id: 'd6d8fed6-6d18-4726-81a1-6cf2c974df8a',
+	level: 6,
+	sizeX: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'circle',
+	score: 32,
+	dropCandidate: false,
+}, {
+	id: '249c728e-230f-4332-bbbf-281c271c75b2',
+	level: 5,
+	sizeX: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'circle',
+	score: 16,
+	dropCandidate: true,
+}, {
+	id: '23d67613-d484-4a93-b71e-3e81b19d6186',
+	level: 4,
+	sizeX: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25,
+	sizeY: NORMAL_BASE_SIZE * 1.25 * 1.25 * 1.25,
+	shape: 'circle',
+	score: 8,
+	dropCandidate: true,
+}, {
+	id: '3cbd0add-ad7d-4685-bad0-29f6dddc0b99',
+	level: 3,
+	sizeX: NORMAL_BASE_SIZE * 1.25 * 1.25,
+	sizeY: NORMAL_BASE_SIZE * 1.25 * 1.25,
+	shape: 'circle',
+	score: 4,
+	dropCandidate: true,
+}, {
+	id: '8f86d4f4-ee02-41bf-ad38-1ce0ae457fb5',
+	level: 2,
+	sizeX: NORMAL_BASE_SIZE * 1.25,
+	sizeY: NORMAL_BASE_SIZE * 1.25,
+	shape: 'circle',
+	score: 2,
+	dropCandidate: true,
+}, {
+	id: '64ec4add-ce39-42b4-96cb-33908f3f118d',
+	level: 1,
+	sizeX: NORMAL_BASE_SIZE,
+	sizeY: NORMAL_BASE_SIZE,
+	shape: 'circle',
+	score: 1,
+	dropCandidate: true,
+}];
+
+const YEN_BASE_SIZE = 32;
+const YEN_SATSU_BASE_SIZE = 70;
+export const YEN_MONOS: Mono[] = [{
+	id: '880f9bd9-802f-4135-a7e1-fd0e0331f726',
+	level: 10,
+	sizeX: (YEN_SATSU_BASE_SIZE * 2) * 1.25 * 1.25 * 1.25,
+	sizeY: YEN_SATSU_BASE_SIZE * 1.25 * 1.25 * 1.25,
+	shape: 'rectangle',
+	score: 10000,
+	dropCandidate: false,
+}, {
+	id: 'e807beb6-374a-4314-9cc2-aa5f17d96b6b',
+	level: 9,
+	sizeX: (YEN_SATSU_BASE_SIZE * 2) * 1.25 * 1.25,
+	sizeY: YEN_SATSU_BASE_SIZE * 1.25 * 1.25,
+	shape: 'rectangle',
+	score: 5000,
+	dropCandidate: false,
+}, {
+	id: '033445b7-8f90-4fc9-beca-71a9e87cb530',
+	level: 8,
+	sizeX: (YEN_SATSU_BASE_SIZE * 2) * 1.25,
+	sizeY: YEN_SATSU_BASE_SIZE * 1.25,
+	shape: 'rectangle',
+	score: 2000,
+	dropCandidate: false,
+}, {
+	id: '410a09ec-5f7f-46f6-b26f-cbca4ccbd091',
+	level: 7,
+	sizeX: YEN_SATSU_BASE_SIZE * 2,
+	sizeY: YEN_SATSU_BASE_SIZE,
+	shape: 'rectangle',
+	score: 1000,
+	dropCandidate: false,
+}, {
+	id: '2aae82bc-3fa4-49ad-a6b5-94d888e809f5',
+	level: 6,
+	sizeX: YEN_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: YEN_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'circle',
+	score: 500,
+	dropCandidate: false,
+}, {
+	id: 'a619bd67-d08f-4cc0-8c7e-c8072a4950cd',
+	level: 5,
+	sizeX: YEN_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: YEN_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'circle',
+	score: 100,
+	dropCandidate: true,
+}, {
+	id: 'c1c5d8e4-17d6-4455-befd-12154d731faa',
+	level: 4,
+	sizeX: YEN_BASE_SIZE * 1.25 * 1.25 * 1.25,
+	sizeY: YEN_BASE_SIZE * 1.25 * 1.25 * 1.25,
+	shape: 'circle',
+	score: 50,
+	dropCandidate: true,
+}, {
+	id: '7082648c-e428-44c4-887a-25c07a8ebdd5',
+	level: 3,
+	sizeX: YEN_BASE_SIZE * 1.25 * 1.25,
+	sizeY: YEN_BASE_SIZE * 1.25 * 1.25,
+	shape: 'circle',
+	score: 10,
+	dropCandidate: true,
+}, {
+	id: '0d8d40d5-e6e0-4d26-8a95-b8d842363379',
+	level: 2,
+	sizeX: YEN_BASE_SIZE * 1.25,
+	sizeY: YEN_BASE_SIZE * 1.25,
+	shape: 'circle',
+	score: 5,
+	dropCandidate: true,
+}, {
+	id: '9dec1b38-d99d-40de-8288-37367b983d0d',
+	level: 1,
+	sizeX: YEN_BASE_SIZE,
+	sizeY: YEN_BASE_SIZE,
+	shape: 'circle',
+	score: 1,
+	dropCandidate: true,
+}];
+
+const SQUARE_BASE_SIZE = 28;
+export const SQUARE_MONOS: Mono[] = [{
+	id: 'f75fd0ba-d3d4-40a4-9712-b470e45b0525',
+	level: 10,
+	sizeX: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'rectangle',
+	score: 512,
+	dropCandidate: false,
+}, {
+	id: '7b70f4af-1c01-45fd-af72-61b1f01e03d1',
+	level: 9,
+	sizeX: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'rectangle',
+	score: 256,
+	dropCandidate: false,
+}, {
+	id: '41607ef3-b6d6-4829-95b6-3737bf8bb956',
+	level: 8,
+	sizeX: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'rectangle',
+	score: 128,
+	dropCandidate: false,
+}, {
+	id: '8a8310d2-0374-460f-bb50-ca9cd3ee3416',
+	level: 7,
+	sizeX: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'rectangle',
+	score: 64,
+	dropCandidate: false,
+}, {
+	id: '1092e069-fe1a-450b-be97-b5d477ec398c',
+	level: 6,
+	sizeX: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'rectangle',
+	score: 32,
+	dropCandidate: false,
+}, {
+	id: '2294734d-7bb8-4781-bb7b-ef3820abf3d0',
+	level: 5,
+	sizeX: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'rectangle',
+	score: 16,
+	dropCandidate: true,
+}, {
+	id: 'ea8a61af-e350-45f7-ba6a-366fcd65692a',
+	level: 4,
+	sizeX: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25,
+	sizeY: SQUARE_BASE_SIZE * 1.25 * 1.25 * 1.25,
+	shape: 'rectangle',
+	score: 8,
+	dropCandidate: true,
+}, {
+	id: 'd0c74815-fc1c-4fbe-9953-c92e4b20f919',
+	level: 3,
+	sizeX: SQUARE_BASE_SIZE * 1.25 * 1.25,
+	sizeY: SQUARE_BASE_SIZE * 1.25 * 1.25,
+	shape: 'rectangle',
+	score: 4,
+	dropCandidate: true,
+}, {
+	id: 'd8fbd70e-611d-402d-87da-1a7fd8cd2c8d',
+	level: 2,
+	sizeX: SQUARE_BASE_SIZE * 1.25,
+	sizeY: SQUARE_BASE_SIZE * 1.25,
+	shape: 'rectangle',
+	score: 2,
+	dropCandidate: true,
+}, {
+	id: '35e476ee-44bd-4711-ad42-87be245d3efd',
+	level: 1,
+	sizeX: SQUARE_BASE_SIZE,
+	sizeY: SQUARE_BASE_SIZE,
+	shape: 'rectangle',
+	score: 1,
+	dropCandidate: true,
+}];
+
+const SWEETS_BASE_SIZE = 40;
+export const SWEETS_MONOS: Mono[] = [{
+	id: '77f724c0-88be-4aeb-8e1a-a00ed18e3844',
+	level: 10,
+	sizeX: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'custom',
+	vertices: [
+		[
+			{
+				'x': 14,
+				'y': 2,
+			},
+			{
+				'x': 2,
+				'y': 13,
+			},
+			{
+				'x': 2,
+				'y': 31,
+			},
+			{
+				'x': 30,
+				'y': 23,
+			},
+			{
+				'x': 30,
+				'y': 7,
+			},
+			{
+				'x': 29,
+				'y': 6,
+			},
+			{
+				'x': 20,
+				'y': 4,
+			},
+			{
+				'x': 17,
+				'y': 3,
+			},
+			{
+				'x': 16,
+				'y': 2,
+			},
+		],
+	],
+	verticesSize: 32,
+	score: 400,
+	dropCandidate: false,
+}, {
+	id: 'f3468ef4-2e1e-4906-8795-f147f39f7e1f',
+	level: 9,
+	sizeX: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'custom',
+	vertices: [
+		[
+			{
+				'x': 15,
+				'y': 2,
+			},
+			{
+				'x': 14,
+				'y': 3,
+			},
+			{
+				'x': 8,
+				'y': 4,
+			},
+			{
+				'x': 6,
+				'y': 5,
+			},
+			{
+				'x': 4,
+				'y': 8,
+			},
+			{
+				'x': 4,
+				'y': 15,
+			},
+			{
+				'x': 2,
+				'y': 19,
+			},
+			{
+				'x': 2,
+				'y': 22.36,
+			},
+			{
+				'x': 3,
+				'y': 25,
+			},
+			{
+				'x': 5,
+				'y': 28,
+			},
+			{
+				'x': 10,
+				'y': 30,
+			},
+			{
+				'x': 22,
+				'y': 30,
+			},
+			{
+				'x': 27,
+				'y': 28,
+			},
+			{
+				'x': 29,
+				'y': 25,
+			},
+			{
+				'x': 30,
+				'y': 22,
+			},
+			{
+				'x': 30,
+				'y': 19,
+			},
+			{
+				'x': 28,
+				'y': 15,
+			},
+			{
+				'x': 28,
+				'y': 8,
+			},
+			{
+				'x': 26,
+				'y': 5,
+			},
+			{
+				'x': 24,
+				'y': 4,
+			},
+			{
+				'x': 18,
+				'y': 3,
+			},
+			{
+				'x': 17,
+				'y': 2,
+			},
+		],
+	],
+	verticesSize: 32,
+	score: 380,
+	dropCandidate: false,
+}, {
+	id: 'bcb41129-6f2d-44ee-89d3-86eb2df564ba',
+	level: 8,
+	sizeX: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'custom',
+	vertices: [
+		[
+			{
+				'x': 15,
+				'y': 2,
+			},
+			{
+				'x': 11,
+				'y': 3,
+			},
+			{
+				'x': 8,
+				'y': 6,
+			},
+			{
+				'x': 7,
+				'y': 8,
+			},
+			{
+				'x': 6,
+				'y': 11,
+			},
+			{
+				'x': 6,
+				'y': 13,
+			},
+			{
+				'x': 7,
+				'y': 16,
+			},
+			{
+				'x': 8,
+				'y': 18,
+			},
+			{
+				'x': 15,
+				'y': 30,
+			},
+			{
+				'x': 17,
+				'y': 30,
+			},
+			{
+				'x': 24,
+				'y': 18,
+			},
+			{
+				'x': 25,
+				'y': 16,
+			},
+			{
+				'x': 26,
+				'y': 13,
+			},
+			{
+				'x': 26,
+				'y': 11,
+			},
+			{
+				'x': 25,
+				'y': 8,
+			},
+			{
+				'x': 24,
+				'y': 6,
+			},
+			{
+				'x': 21,
+				'y': 3,
+			},
+			{
+				'x': 17,
+				'y': 2,
+			},
+		],
+	],
+	verticesSize: 32,
+	score: 300,
+	dropCandidate: false,
+}, {
+	id: 'f058e1ad-1981-409b-b3a7-302de0a43744',
+	level: 7,
+	sizeX: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'custom',
+	vertices: [
+		[
+			{
+				'x': 17,
+				'y': 2.541,
+			},
+			{
+				'x': 14,
+				'y': 5.402,
+			},
+			{
+				'x': 10,
+				'y': 7,
+			},
+			{
+				'x': 10,
+				'y': 10.367,
+			},
+			{
+				'x': 8,
+				'y': 11,
+			},
+			{
+				'x': 8,
+				'y': 14,
+			},
+			{
+				'x': 5.781,
+				'y': 16.265,
+			},
+			{
+				'x': 6.594,
+				'y': 19.627,
+			},
+			{
+				'x': 9.414,
+				'y': 21,
+			},
+			{
+				'x': 12,
+				'y': 29.988,
+			},
+			{
+				'x': 21,
+				'y': 29.988,
+			},
+			{
+				'x': 22.016,
+				'y': 22.629,
+			},
+			{
+				'x': 23,
+				'y': 21.772,
+			},
+			{
+				'x': 23,
+				'y': 19.202,
+			},
+			{
+				'x': 25.783,
+				'y': 17.473,
+			},
+			{
+				'x': 25.783,
+				'y': 14.727,
+			},
+			{
+				'x': 24,
+				'y': 13.173,
+			},
+			{
+				'x': 24,
+				'y': 10.367,
+			},
+			{
+				'x': 22,
+				'y': 9.233,
+			},
+			{
+				'x': 22,
+				'y': 6.454,
+			},
+			{
+				'x': 18,
+				'y': 5,
+			},
+		],
+	],
+	verticesSize: 32,
+	score: 300,
+	dropCandidate: false,
+}, {
+	id: 'd22cfe38-5a3b-4b9c-a1a6-907930a3d732',
+	level: 6,
+	sizeX: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'custom',
+	vertices: [
+		[
+			{
+				'x': 15,
+				'y': 2,
+			},
+			{
+				'x': 11,
+				'y': 3,
+			},
+			{
+				'x': 8,
+				'y': 5,
+			},
+			{
+				'x': 7,
+				'y': 6,
+			},
+			{
+				'x': 5,
+				'y': 9,
+			},
+			{
+				'x': 4,
+				'y': 12,
+			},
+			{
+				'x': 4,
+				'y': 20,
+			},
+			{
+				'x': 5,
+				'y': 23,
+			},
+			{
+				'x': 7,
+				'y': 26,
+			},
+			{
+				'x': 11,
+				'y': 29,
+			},
+			{
+				'x': 14,
+				'y': 30,
+			},
+			{
+				'x': 18,
+				'y': 30,
+			},
+			{
+				'x': 21,
+				'y': 29,
+			},
+			{
+				'x': 25,
+				'y': 26,
+			},
+			{
+				'x': 27,
+				'y': 23,
+			},
+			{
+				'x': 28,
+				'y': 20,
+			},
+			{
+				'x': 28,
+				'y': 12,
+			},
+			{
+				'x': 27,
+				'y': 9,
+			},
+			{
+				'x': 25,
+				'y': 6,
+			},
+			{
+				'x': 24,
+				'y': 5,
+			},
+			{
+				'x': 21,
+				'y': 3,
+			},
+			{
+				'x': 17,
+				'y': 2,
+			},
+		],
+	],
+	verticesSize: 32,
+	score: 250,
+	dropCandidate: false,
+}, {
+	id: '79867083-a073-427e-ae82-07a70d9f3b4f',
+	level: 5,
+	sizeX: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25,
+	sizeY: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25 * 1.25,
+	shape: 'custom',
+	vertices: [
+		[
+			{
+				'x': 9,
+				'y': 15,
+			},
+			{
+				'x': 23,
+				'y': 15,
+			},
+			{
+				'x': 30,
+				'y': 27,
+			},
+			{
+				'x': 25.7,
+				'y': 30,
+			},
+			{
+				'x': 6.34,
+				'y': 30,
+			},
+			{
+				'x': 2,
+				'y': 27,
+			},
+		],
+	],
+	verticesSize: 32,
+	score: 200,
+	dropCandidate: true,
+}, {
+	id: '2e152a12-a567-4100-b4d4-d15d81ba47b1',
+	level: 4,
+	sizeX: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25,
+	sizeY: SWEETS_BASE_SIZE * 1.25 * 1.25 * 1.25,
+	shape: 'custom',
+	vertices: [
+		[
+			{
+				'x': 12,
+				'y': 2,
+			},
+			{
+				'x': 2,
+				'y': 12,
+			},
+			{
+				'x': 2,
+				'y': 14,
+			},
+			{
+				'x': 18,
+				'y': 30,
+			},
+			{
+				'x': 20,
+				'y': 30,
+			},
+			{
+				'x': 30,
+				'y': 20,
+			},
+			{
+				'x': 30,
+				'y': 18,
+			},
+			{
+				'x': 14,
+				'y': 2,
+			},
+		],
+	],
+	verticesSize: 32,
+	score: 200,
+	dropCandidate: true,
+}, {
+	id: '12250376-2258-4716-8eec-b3a7239461fc',
+	level: 3,
+	sizeX: SWEETS_BASE_SIZE * 1.25 * 1.25,
+	sizeY: SWEETS_BASE_SIZE * 1.25 * 1.25,
+	shape: 'custom',
+	vertices: [
+		[
+			{
+				'x': 12,
+				'y': 2,
+			},
+			{
+				'x': 7,
+				'y': 3,
+			},
+			{
+				'x': 3,
+				'y': 7,
+			},
+			{
+				'x': 2,
+				'y': 12,
+			},
+			{
+				'x': 3,
+				'y': 16,
+			},
+			{
+				'x': 5,
+				'y': 19,
+			},
+			{
+				'x': 8,
+				'y': 21,
+			},
+			{
+				'x': 12,
+				'y': 22,
+			},
+			{
+				'x': 18,
+				'y': 21,
+			},
+			{
+				'x': 27,
+				'y': 30,
+			},
+			{
+				'x': 30,
+				'y': 30,
+			},
+			{
+				'x': 30,
+				'y': 27,
+			},
+			{
+				'x': 21,
+				'y': 18,
+			},
+			{
+				'x': 22,
+				'y': 14.25,
+			},
+			{
+				'x': 22,
+				'y': 11,
+			},
+			{
+				'x': 21,
+				'y': 8,
+			},
+			{
+				'x': 19,
+				'y': 5,
+			},
+			{
+				'x': 16.5,
+				'y': 3,
+			},
+		],
+	],
+	verticesSize: 32,
+	score: 120,
+	dropCandidate: true,
+}, {
+	id: '4d4f2668-4be7-44a3-aa3a-856df6e25aa6',
+	level: 2,
+	sizeX: SWEETS_BASE_SIZE * 1.25,
+	sizeY: SWEETS_BASE_SIZE * 1.25,
+	shape: 'custom',
+	vertices: [
+		[
+			{
+				'x': 12,
+				'y': 1.9,
+			},
+			{
+				'x': 4,
+				'y': 4,
+			},
+			{
+				'x': 2,
+				'y': 12,
+			},
+			{
+				'x': 6,
+				'y': 13.375,
+			},
+			{
+				'x': 6,
+				'y': 18,
+			},
+			{
+				'x': 8,
+				'y': 22,
+			},
+			{
+				'x': 12,
+				'y': 25.372,
+			},
+			{
+				'x': 16,
+				'y': 26,
+			},
+			{
+				'x': 19,
+				'y': 25.372,
+			},
+			{
+				'x': 20,
+				'y': 30,
+			},
+			{
+				'x': 28,
+				'y': 27,
+			},
+			{
+				'x': 30,
+				'y': 20,
+			},
+			{
+				'x': 25.473,
+				'y': 19,
+			},
+			{
+				'x': 26,
+				'y': 15,
+			},
+			{
+				'x': 24,
+				'y': 10,
+			},
+			{
+				'x': 20,
+				'y': 7,
+			},
+			{
+				'x': 16,
+				'y': 6,
+			},
+			{
+				'x': 13,
+				'y': 6,
+			},
+		],
+	],
+	verticesSize: 32,
+	score: 20,
+	dropCandidate: true,
+}, {
+	id: 'c9984b40-4045-44c3-b260-d47b7b4625b2',
+	level: 1,
+	sizeX: SWEETS_BASE_SIZE,
+	sizeY: SWEETS_BASE_SIZE,
+	shape: 'circle',
+	score: 30,
+	dropCandidate: true,
+}];
diff --git a/packages/misskey-bubble-game/tsconfig.json b/packages/misskey-bubble-game/tsconfig.json
new file mode 100644
index 0000000000..f56b65e868
--- /dev/null
+++ b/packages/misskey-bubble-game/tsconfig.json
@@ -0,0 +1,33 @@
+{
+	"$schema": "https://json.schemastore.org/tsconfig",
+	"compilerOptions": {
+		"target": "ES2022",
+		"module": "nodenext",
+		"moduleResolution": "nodenext",
+		"declaration": true,
+		"declarationMap": true,
+		"sourceMap": true,
+		"outDir": "./built/",
+		"removeComments": true,
+		"strict": true,
+		"strictFunctionTypes": true,
+		"strictNullChecks": true,
+		"experimentalDecorators": true,
+		"noImplicitReturns": true,
+		"esModuleInterop": true,
+		"typeRoots": [
+			"./node_modules/@types"
+		],
+		"lib": [
+			"esnext",
+			"dom"
+		]
+	},
+	"include": [
+		"src/**/*"
+	],
+	"exclude": [
+		"node_modules",
+		"test/**/*"
+	]
+}
diff --git a/packages/misskey-reversi/.eslintignore b/packages/misskey-reversi/.eslintignore
new file mode 100644
index 0000000000..f22128f047
--- /dev/null
+++ b/packages/misskey-reversi/.eslintignore
@@ -0,0 +1,7 @@
+node_modules
+/built
+/coverage
+/.eslintrc.js
+/jest.config.ts
+/test
+/test-d
diff --git a/packages/misskey-reversi/.eslintrc.cjs b/packages/misskey-reversi/.eslintrc.cjs
new file mode 100644
index 0000000000..e2e31e9e33
--- /dev/null
+++ b/packages/misskey-reversi/.eslintrc.cjs
@@ -0,0 +1,9 @@
+module.exports = {
+	parserOptions: {
+		tsconfigRootDir: __dirname,
+		project: ['./tsconfig.json'],
+	},
+	extends: [
+		'../shared/.eslintrc.js',
+	],
+};
diff --git a/packages/misskey-reversi/src/index.ts b/packages/misskey-reversi/src/index.ts
index 20ed36f208..28964413b7 100644
--- a/packages/misskey-reversi/src/index.ts
+++ b/packages/misskey-reversi/src/index.ts
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 import { Game } from './game.js';
 
 export {
diff --git a/packages/misskey-reversi/src/maps.ts b/packages/misskey-reversi/src/maps.ts
index 85cf1a0485..b47a996c7c 100644
--- a/packages/misskey-reversi/src/maps.ts
+++ b/packages/misskey-reversi/src/maps.ts
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 /**
  * 組み込みマップ定義
  *
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 31394eb081..0a80403725 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -778,6 +778,9 @@ importers:
       mfm-js:
         specifier: 0.24.0
         version: 0.24.0
+      misskey-bubble-game:
+        specifier: workspace:*
+        version: link:../misskey-bubble-game
       misskey-js:
         specifier: workspace:*
         version: link:../misskey-js
@@ -799,9 +802,6 @@ importers:
       sass:
         specifier: 1.69.5
         version: 1.69.5
-      seedrandom:
-        specifier: ^3.0.5
-        version: 3.0.5
       shiki:
         specifier: 0.14.7
         version: 0.14.7
@@ -1026,6 +1026,43 @@ importers:
         specifier: 1.8.27
         version: 1.8.27(typescript@5.3.3)
 
+  packages/misskey-bubble-game:
+    dependencies:
+      eventemitter3:
+        specifier: 5.0.1
+        version: 5.0.1
+      matter-js:
+        specifier: 0.19.0
+        version: 0.19.0
+      seedrandom:
+        specifier: 3.0.5
+        version: 3.0.5
+    devDependencies:
+      '@misskey-dev/eslint-plugin':
+        specifier: 1.0.0
+        version: 1.0.0(@typescript-eslint/eslint-plugin@6.19.0)(@typescript-eslint/parser@6.19.0)(eslint-plugin-import@2.29.1)(eslint@8.56.0)
+      '@types/matter-js':
+        specifier: 0.19.6
+        version: 0.19.6
+      '@types/node':
+        specifier: 20.11.5
+        version: 20.11.5
+      '@types/seedrandom':
+        specifier: 3.0.8
+        version: 3.0.8
+      '@typescript-eslint/eslint-plugin':
+        specifier: 6.19.0
+        version: 6.19.0(@typescript-eslint/parser@6.19.0)(eslint@8.56.0)(typescript@5.3.3)
+      '@typescript-eslint/parser':
+        specifier: 6.19.0
+        version: 6.19.0(eslint@8.56.0)(typescript@5.3.3)
+      eslint:
+        specifier: 8.56.0
+        version: 8.56.0
+      typescript:
+        specifier: 5.3.3
+        version: 5.3.3
+
   packages/misskey-js:
     dependencies:
       '@swc/cli':
@@ -1845,7 +1882,7 @@ packages:
       '@babel/traverse': 7.22.11
       '@babel/types': 7.22.17
       convert-source-map: 1.9.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -1868,7 +1905,7 @@ packages:
       '@babel/traverse': 7.23.5
       '@babel/types': 7.23.5
       convert-source-map: 2.0.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -1970,7 +2007,7 @@ packages:
       '@babel/core': 7.23.5
       '@babel/helper-compilation-targets': 7.22.15
       '@babel/helper-plugin-utils': 7.22.5
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -3369,7 +3406,7 @@ packages:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/parser': 7.23.5
       '@babel/types': 7.22.17
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -3387,7 +3424,7 @@ packages:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/parser': 7.23.5
       '@babel/types': 7.23.5
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -4266,7 +4303,7 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       espree: 9.6.1
       globals: 13.19.0
       ignore: 5.2.4
@@ -4283,7 +4320,7 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       espree: 9.6.1
       globals: 13.19.0
       ignore: 5.2.4
@@ -4548,7 +4585,7 @@ packages:
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 2.0.1
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -5150,7 +5187,7 @@ packages:
       '@open-draft/until': 1.0.3
       '@types/debug': 4.1.7
       '@xmldom/xmldom': 0.8.6
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       headers-polyfill: 3.2.5
       outvariant: 1.4.0
       strict-event-emitter: 0.2.8
@@ -8289,6 +8326,10 @@ packages:
     resolution: {integrity: sha512-pTVB5krRGb01hr8L6BJqWGoSriqUbbvJ9Fd0Qp0eAOE//w/lFvkaVHkVB8J3wXr9U3lZDzmAjJPPQn7x4wzbWg==}
     dev: true
 
+  /@types/matter-js@0.19.6:
+    resolution: {integrity: sha512-ffk6tqJM5scla+ThXmnox+mdfCo3qYk6yMjQsNcrbo6eQ5DqorVdtnaL+1agCoYzxUjmHeiNB7poBMAmhuLY7w==}
+    dev: true
+
   /@types/mdx@2.0.3:
     resolution: {integrity: sha512-IgHxcT3RC8LzFLhKwP3gbMPeaK7BM9eBH46OdapPA7yvuIUJ8H6zHZV53J8hGZcTSnt95jANt+rTBNUUc22ACQ==}
     dev: true
@@ -8479,6 +8520,10 @@ packages:
     requiresBuild: true
     dev: false
 
+  /@types/seedrandom@3.0.8:
+    resolution: {integrity: sha512-TY1eezMU2zH2ozQoAFAQFOPpvP15g+ZgSfTZt31AUUH/Rxtnz3H+A/Sv1Snw2/amp//omibc+AEkTaA8KUeOLQ==}
+    dev: true
+
   /@types/semver@7.5.6:
     resolution: {integrity: sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==}
     dev: true
@@ -8621,7 +8666,7 @@ packages:
       '@typescript-eslint/type-utils': 6.11.0(eslint@8.53.0)(typescript@5.3.3)
       '@typescript-eslint/utils': 6.11.0(eslint@8.53.0)(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 6.11.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.53.0
       graphemer: 1.4.0
       ignore: 5.2.4
@@ -8650,7 +8695,7 @@ packages:
       '@typescript-eslint/type-utils': 6.14.0(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/utils': 6.14.0(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 6.14.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.56.0
       graphemer: 1.4.0
       ignore: 5.2.4
@@ -8679,7 +8724,7 @@ packages:
       '@typescript-eslint/type-utils': 6.19.0(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/utils': 6.19.0(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 6.19.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.56.0
       graphemer: 1.4.0
       ignore: 5.2.4
@@ -8708,7 +8753,7 @@ packages:
       '@typescript-eslint/type-utils': 6.19.0(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/utils': 6.19.0(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 6.19.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.56.0
       graphemer: 1.4.0
       ignore: 5.2.4
@@ -8734,7 +8779,7 @@ packages:
       '@typescript-eslint/types': 6.11.0
       '@typescript-eslint/typescript-estree': 6.11.0(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 6.11.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.53.0
       typescript: 5.3.3
     transitivePeerDependencies:
@@ -8755,7 +8800,7 @@ packages:
       '@typescript-eslint/types': 6.14.0
       '@typescript-eslint/typescript-estree': 6.14.0(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 6.14.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.56.0
       typescript: 5.3.3
     transitivePeerDependencies:
@@ -8776,7 +8821,7 @@ packages:
       '@typescript-eslint/types': 6.19.0
       '@typescript-eslint/typescript-estree': 6.19.0(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 6.19.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.56.0
       typescript: 5.3.3
     transitivePeerDependencies:
@@ -8819,7 +8864,7 @@ packages:
     dependencies:
       '@typescript-eslint/typescript-estree': 6.11.0(typescript@5.3.3)
       '@typescript-eslint/utils': 6.11.0(eslint@8.53.0)(typescript@5.3.3)
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.53.0
       ts-api-utils: 1.0.1(typescript@5.3.3)
       typescript: 5.3.3
@@ -8839,7 +8884,7 @@ packages:
     dependencies:
       '@typescript-eslint/typescript-estree': 6.14.0(typescript@5.3.3)
       '@typescript-eslint/utils': 6.14.0(eslint@8.56.0)(typescript@5.3.3)
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.56.0
       ts-api-utils: 1.0.1(typescript@5.3.3)
       typescript: 5.3.3
@@ -8859,7 +8904,7 @@ packages:
     dependencies:
       '@typescript-eslint/typescript-estree': 6.19.0(typescript@5.3.3)
       '@typescript-eslint/utils': 6.19.0(eslint@8.56.0)(typescript@5.3.3)
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.56.0
       ts-api-utils: 1.0.1(typescript@5.3.3)
       typescript: 5.3.3
@@ -8893,7 +8938,7 @@ packages:
     dependencies:
       '@typescript-eslint/types': 6.11.0
       '@typescript-eslint/visitor-keys': 6.11.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.5.4
@@ -8914,7 +8959,7 @@ packages:
     dependencies:
       '@typescript-eslint/types': 6.14.0
       '@typescript-eslint/visitor-keys': 6.14.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.5.4
@@ -8935,7 +8980,7 @@ packages:
     dependencies:
       '@typescript-eslint/types': 6.19.0
       '@typescript-eslint/visitor-keys': 6.19.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.3
@@ -9420,7 +9465,7 @@ packages:
     engines: {node: '>= 6.0.0'}
     requiresBuild: true
     dependencies:
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -9428,7 +9473,7 @@ packages:
     resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==}
     engines: {node: '>= 14'}
     dependencies:
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -9814,7 +9859,7 @@ packages:
     resolution: {integrity: sha512-TAlMYvOuwGyLK3PfBb5WKBXZmXz2fVCgv23d6zZFdle/q3gPjmxBaeuC0pY0Dzs5PWMSgfqqEZkrye19GlDTgw==}
     dependencies:
       archy: 1.0.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       fastq: 1.15.0
     transitivePeerDependencies:
       - supports-color
@@ -11263,6 +11308,7 @@ packages:
     dependencies:
       ms: 2.1.2
       supports-color: 5.5.0
+    dev: true
 
   /debug@4.3.4(supports-color@8.1.1):
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
@@ -11275,7 +11321,6 @@ packages:
     dependencies:
       ms: 2.1.2
       supports-color: 8.1.1
-    dev: true
 
   /decamelize-keys@1.1.1:
     resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
@@ -11492,7 +11537,7 @@ packages:
     hasBin: true
     dependencies:
       address: 1.2.2
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -11816,7 +11861,7 @@ packages:
     peerDependencies:
       esbuild: '>=0.12 <1'
     dependencies:
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       esbuild: 0.18.20
     transitivePeerDependencies:
       - supports-color
@@ -12218,7 +12263,7 @@ packages:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -12265,7 +12310,7 @@ packages:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -12895,7 +12940,7 @@ packages:
       debug:
         optional: true
     dependencies:
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
 
   /for-each@0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
@@ -13451,6 +13496,7 @@ packages:
   /has-flag@3.0.0:
     resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
     engines: {node: '>=4'}
+    dev: true
 
   /has-flag@4.0.0:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
@@ -13588,7 +13634,7 @@ packages:
     engines: {node: '>= 14'}
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -13650,7 +13696,7 @@ packages:
     engines: {node: '>= 6.0.0'}
     dependencies:
       agent-base: 5.1.1
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -13660,7 +13706,7 @@ packages:
     engines: {node: '>= 6'}
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -13669,7 +13715,7 @@ packages:
     engines: {node: '>= 14'}
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -13679,7 +13725,7 @@ packages:
     engines: {node: '>= 14'}
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -13839,7 +13885,7 @@ packages:
     dependencies:
       '@ioredis/commands': 1.2.0
       cluster-key-slot: 1.1.2
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       denque: 2.1.0
       lodash.defaults: 4.2.0
       lodash.isarguments: 3.1.0
@@ -14280,7 +14326,7 @@ packages:
     resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
     engines: {node: '>=10'}
     dependencies:
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       istanbul-lib-coverage: 3.2.0
       source-map: 0.6.1
     transitivePeerDependencies:
@@ -14997,7 +15043,7 @@ packages:
     resolution: {integrity: sha512-pJ4XLQP4Q9HTxl6RVDLJ8Cyh1uitSs0CzDBAz1uoJ4sRD/Bk7cFSXL1FUXDW3zJ7YnfliJx6eu8Jn283bpZ4Yg==}
     engines: {node: '>=10'}
     dependencies:
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       rfdc: 1.3.0
       uri-js: 4.4.1
     transitivePeerDependencies:
@@ -17608,7 +17654,7 @@ packages:
     engines: {node: '>=8.16.0'}
     dependencies:
       '@types/mime-types': 2.1.4
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       extract-zip: 1.7.0
       https-proxy-agent: 4.0.0
       mime: 2.6.0
@@ -18605,7 +18651,7 @@ packages:
     dependencies:
       '@hapi/hoek': 10.0.1
       '@hapi/wreck': 18.0.1
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       joi: 17.7.0
     transitivePeerDependencies:
       - supports-color
@@ -18805,7 +18851,7 @@ packages:
     engines: {node: '>= 14'}
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       socks: 2.7.1
     transitivePeerDependencies:
       - supports-color
@@ -18958,7 +19004,7 @@ packages:
       arg: 5.0.2
       bluebird: 3.7.2
       check-more-types: 2.24.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       execa: 5.1.1
       lazy-ass: 1.6.0
       ps-tree: 1.2.0
@@ -19222,6 +19268,7 @@ packages:
     engines: {node: '>=4'}
     dependencies:
       has-flag: 3.0.0
+    dev: true
 
   /supports-color@7.2.0:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
@@ -19844,7 +19891,7 @@ packages:
       chalk: 4.1.2
       cli-highlight: 2.1.11
       date-fns: 2.30.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       dotenv: 16.0.3
       glob: 8.1.0
       ioredis: 5.3.2
@@ -20209,7 +20256,7 @@ packages:
     hasBin: true
     dependencies:
       cac: 6.7.14
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       mlly: 1.4.0
       pathe: 1.1.1
       picocolors: 1.0.0
@@ -20321,7 +20368,7 @@ packages:
       acorn-walk: 8.2.0
       cac: 6.7.14
       chai: 4.3.10
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       happy-dom: 10.0.3
       local-pkg: 0.4.3
       magic-string: 0.30.3
@@ -20403,7 +20450,7 @@ packages:
     peerDependencies:
       eslint: '>=6.0.0'
     dependencies:
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.56.0
       eslint-scope: 7.2.2
       eslint-visitor-keys: 3.4.3
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 3a03a58253..193669e7a4 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -5,3 +5,4 @@ packages:
  - 'packages/misskey-js'
  - 'packages/misskey-js/generator'
  - 'packages/misskey-reversi'
+ - 'packages/misskey-bubble-game'
-- 
cgit v1.2.3-freya


From bc7b2f18762dac4dc515649e766741c076159757 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 20 Jan 2024 09:56:13 +0900
Subject: lint fix

---
 packages/backend/src/core/ReversiService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/core/ReversiService.ts b/packages/backend/src/core/ReversiService.ts
index cd990ba775..6e80261330 100644
--- a/packages/backend/src/core/ReversiService.ts
+++ b/packages/backend/src/core/ReversiService.ts
@@ -370,7 +370,7 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 
 		if (o.isEnded) {
 			this.globalEventService.publishReversiGameStream(game.id, 'ended', {
-				winnerId: winner,
+				winnerId: winner ?? null,
 				game: await this.reversiGameEntityService.packDetail(game.id, user),
 			});
 		}
-- 
cgit v1.2.3-freya


From e2985cf122b54c31c2b7b33188497c5e907e6dad Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 20 Jan 2024 09:59:04 +0900
Subject: lint fixes

---
 packages/misskey-reversi/src/game.ts |  26 +++---
 packages/misskey-reversi/src/maps.ts | 166 +++++++++++++++++------------------
 2 files changed, 95 insertions(+), 97 deletions(-)

diff --git a/packages/misskey-reversi/src/game.ts b/packages/misskey-reversi/src/game.ts
index 55d0b84da7..72aace7c0b 100644
--- a/packages/misskey-reversi/src/game.ts
+++ b/packages/misskey-reversi/src/game.ts
@@ -67,8 +67,7 @@ export class Game {
 		//#endregion
 
 		// ゲームが始まった時点で片方の色の石しかないか、始まった時点で勝敗が決定するようなマップの場合がある
-		if (!this.canPutSomewhere(BLACK))
-			this.turn = this.canPutSomewhere(WHITE) ? WHITE : null;
+		if (!this.canPutSomewhere(BLACK)) this.turn = this.canPutSomewhere(WHITE) ? WHITE : null;
 	}
 
 	public get blackCount() {
@@ -109,7 +108,7 @@ export class Game {
 			color,
 			pos,
 			effects,
-			turn
+			turn,
 		});
 
 		this.calcTurn();
@@ -151,7 +150,7 @@ export class Game {
 	public canPut(color: Color, pos: number): boolean {
 		return (
 			this.board[pos] !== null ? false : // 既に石が置いてある場所には打てない
-			this.opts.canPutEverywhere ? this.mapDataGet(pos) == 'empty' : // 挟んでなくても置けるモード
+			this.opts.canPutEverywhere ? this.mapDataGet(pos) === 'empty' : // 挟んでなくても置けるモード
 			this.effects(color, pos).length !== 0); // 相手の石を1つでも反転させられるか
 	}
 
@@ -164,14 +163,14 @@ export class Game {
 		const enemyColor = !color;
 
 		const diffVectors: [number, number][] = [
-			[ 0, -1], // 上
+			[0, -1], // 上
 			[+1, -1], // 右上
-			[+1,  0], // 右
+			[+1, 0], // 右
 			[+1, +1], // 右下
-			[ 0, +1], // 下
+			[0, +1], // 下
 			[-1, +1], // 左下
-			[-1,  0], // 左
-			[-1, -1]  // 左上
+			[-1, 0], // 左
+			[-1, -1], // 左上
 		];
 
 		const effectsInLine = ([dx, dy]: [number, number]): number[] => {
@@ -185,11 +184,10 @@ export class Game {
 				// 座標が指し示す位置がボード外に出たとき
 				if (this.opts.loopedBoard && this.xyToPos(
 					(x = ((x % this.mapWidth) + this.mapWidth) % this.mapWidth),
-					(y = ((y % this.mapHeight) + this.mapHeight) % this.mapHeight)) === initPos)
-						// 盤面の境界でループし、自分が石を置く位置に戻ってきたとき、挟めるようにしている (ref: Test4のマップ)
+					(y = ((y % this.mapHeight) + this.mapHeight) % this.mapHeight)) === initPos) {
+					// 盤面の境界でループし、自分が石を置く位置に戻ってきたとき、挟めるようにしている (ref: Test4のマップ)
 					return found;
-				else if (x === -1 || y === -1 || x === this.mapWidth || y === this.mapHeight)
-					return []; // 挟めないことが確定 (盤面外に到達)
+				} else if (x === -1 || y === -1 || x === this.mapWidth || y === this.mapHeight) return []; // 挟めないことが確定 (盤面外に到達)
 
 				const pos = this.xyToPos(x, y);
 				if (this.mapDataGet(pos) === 'null') return []; // 挟めないことが確定 (配置不可能なマスに到達)
@@ -209,7 +207,7 @@ export class Game {
 
 	public get winner(): Color | null {
 		return this.isEnded ?
-			this.blackCount == this.whiteCount ? null :
+			this.blackCount === this.whiteCount ? null :
 			this.opts.isLlotheo === this.blackCount > this.whiteCount ? WHITE : BLACK :
 			undefined as never;
 	}
diff --git a/packages/misskey-reversi/src/maps.ts b/packages/misskey-reversi/src/maps.ts
index b47a996c7c..c0fbae16ba 100644
--- a/packages/misskey-reversi/src/maps.ts
+++ b/packages/misskey-reversi/src/maps.ts
@@ -27,8 +27,8 @@ export const fourfour: Map = {
 		'----',
 		'-wb-',
 		'-bw-',
-		'----'
-	]
+		'----',
+	],
 };
 
 export const sixsix: Map = {
@@ -40,8 +40,8 @@ export const sixsix: Map = {
 		'--wb--',
 		'--bw--',
 		'------',
-		'------'
-	]
+		'------',
+	],
 };
 
 export const roundedSixsix: Map = {
@@ -54,8 +54,8 @@ export const roundedSixsix: Map = {
 		'--wb--',
 		'--bw--',
 		'------',
-		' ---- '
-	]
+		' ---- ',
+	],
 };
 
 export const roundedSixsix2: Map = {
@@ -68,8 +68,8 @@ export const roundedSixsix2: Map = {
 		'--wb--',
 		'--bw--',
 		' ---- ',
-		'  --  '
-	]
+		'  --  ',
+	],
 };
 
 export const eighteight: Map = {
@@ -83,8 +83,8 @@ export const eighteight: Map = {
 		'---bw---',
 		'--------',
 		'--------',
-		'--------'
-	]
+		'--------',
+	],
 };
 
 export const eighteightH28: Map = {
@@ -98,8 +98,8 @@ export const eighteightH28: Map = {
 		'b--bw--b',
 		'b------b',
 		'b------b',
-		'bbbbbbbb'
-	]
+		'bbbbbbbb',
+	],
 };
 
 export const roundedEighteight: Map = {
@@ -114,8 +114,8 @@ export const roundedEighteight: Map = {
 		'---bw---',
 		'--------',
 		'--------',
-		' ------ '
-	]
+		' ------ ',
+	],
 };
 
 export const roundedEighteight2: Map = {
@@ -130,8 +130,8 @@ export const roundedEighteight2: Map = {
 		'---bw---',
 		'--------',
 		' ------ ',
-		'  ----  '
-	]
+		'  ----  ',
+	],
 };
 
 export const roundedEighteight3: Map = {
@@ -146,8 +146,8 @@ export const roundedEighteight3: Map = {
 		'---bw---',
 		' ------ ',
 		'  ----  ',
-		'   --   '
-	]
+		'   --   ',
+	],
 };
 
 export const eighteightWithNotch: Map = {
@@ -162,8 +162,8 @@ export const eighteightWithNotch: Map = {
 		' --bw-- ',
 		'--------',
 		'--------',
-		'---  ---'
-	]
+		'---  ---',
+	],
 };
 
 export const eighteightWithSomeHoles: Map = {
@@ -178,8 +178,8 @@ export const eighteightWithSomeHoles: Map = {
 		'---bw- -',
 		' -------',
 		'--- ----',
-		'--------'
-	]
+		'--------',
+	],
 };
 
 export const circle: Map = {
@@ -194,8 +194,8 @@ export const circle: Map = {
 		'---bw---',
 		' ------ ',
 		' ------ ',
-		'   --   '
-	]
+		'   --   ',
+	],
 };
 
 export const smile: Map = {
@@ -210,8 +210,8 @@ export const smile: Map = {
 		'-- bw --',
 		'---  ---',
 		'--------',
-		' ------ '
-	]
+		' ------ ',
+	],
 };
 
 export const window: Map = {
@@ -226,8 +226,8 @@ export const window: Map = {
 		'---bw---',
 		'-  --  -',
 		'-  --  -',
-		'--------'
-	]
+		'--------',
+	],
 };
 
 export const reserved: Map = {
@@ -242,8 +242,8 @@ export const reserved: Map = {
 		'---bw---',
 		'--------',
 		'--------',
-		'b------w'
-	]
+		'b------w',
+	],
 };
 
 export const x: Map = {
@@ -258,8 +258,8 @@ export const x: Map = {
 		'---bw---',
 		'--b--w--',
 		'-b----w-',
-		'b------w'
-	]
+		'b------w',
+	],
 };
 
 export const parallel: Map = {
@@ -274,8 +274,8 @@ export const parallel: Map = {
 		'---ww---',
 		'--------',
 		'--------',
-		'--------'
-	]
+		'--------',
+	],
 };
 
 export const lackOfBlack: Map = {
@@ -289,8 +289,8 @@ export const lackOfBlack: Map = {
 		'---bw---',
 		'--------',
 		'--------',
-		'--------'
-	]
+		'--------',
+	],
 };
 
 export const squareParty: Map = {
@@ -305,8 +305,8 @@ export const squareParty: Map = {
 		'-bbbwww-',
 		'-b-bw-w-',
 		'-bbbwww-',
-		'--------'
-	]
+		'--------',
+	],
 };
 
 export const minesweeper: Map = {
@@ -321,8 +321,8 @@ export const minesweeper: Map = {
 		'-w-bw-b-',
 		'b-w--b-w',
 		'-b-bw-w-',
-		'w-w--b-b'
-	]
+		'w-w--b-b',
+	],
 };
 
 export const tenthtenth: Map = {
@@ -338,8 +338,8 @@ export const tenthtenth: Map = {
 		'----------',
 		'----------',
 		'----------',
-		'----------'
-	]
+		'----------',
+	],
 };
 
 export const hole: Map = {
@@ -356,8 +356,8 @@ export const hole: Map = {
 		'--wb--wb--',
 		'--bw--bw--',
 		'----------',
-		'----------'
-	]
+		'----------',
+	],
 };
 
 export const grid: Map = {
@@ -374,8 +374,8 @@ export const grid: Map = {
 		'- - -- - -',
 		'----------',
 		'- - -- - -',
-		'----------'
-	]
+		'----------',
+	],
 };
 
 export const cross: Map = {
@@ -392,8 +392,8 @@ export const cross: Map = {
 		'----------',
 		'   ----   ',
 		'   ----   ',
-		'   ----   '
-	]
+		'   ----   ',
+	],
 };
 
 export const charX: Map = {
@@ -410,8 +410,8 @@ export const charX: Map = {
 		' -------- ',
 		'----------',
 		'----  ----',
-		'---    ---'
-	]
+		'---    ---',
+	],
 };
 
 export const charY: Map = {
@@ -428,8 +428,8 @@ export const charY: Map = {
 		'  ------  ',
 		'  ------  ',
 		'  ------  ',
-		'  ------  '
-	]
+		'  ------  ',
+	],
 };
 
 export const walls: Map = {
@@ -446,8 +446,8 @@ export const walls: Map = {
 		'w--------w',
 		'w--------w',
 		'w--------w',
-		' bbbbbbbb '
-	]
+		' bbbbbbbb ',
+	],
 };
 
 export const cpu: Map = {
@@ -464,8 +464,8 @@ export const cpu: Map = {
 		'w--------w',
 		' -------- ',
 		'w--------w',
-		' b b  b b '
-	]
+		' b b  b b ',
+	],
 };
 
 export const checker: Map = {
@@ -482,8 +482,8 @@ export const checker: Map = {
 		'---bwbw---',
 		'----------',
 		'----------',
-		'----------'
-	]
+		'----------',
+	],
 };
 
 export const japaneseCurry: Map = {
@@ -500,8 +500,8 @@ export const japaneseCurry: Map = {
 		'w-w-w-b-b-',
 		'-w-w-w-b-b',
 		'w-w-w-w-b-',
-		'-w-w-w-w-b'
-	]
+		'-w-w-w-w-b',
+	],
 };
 
 export const mosaic: Map = {
@@ -519,7 +519,7 @@ export const mosaic: Map = {
 		' - - - - -',
 		'- - - - - ',
 		' - - - - -',
-	]
+	],
 };
 
 export const arena: Map = {
@@ -536,8 +536,8 @@ export const arena: Map = {
 		' -------- ',
 		'- ------ -',
 		' - -  - - ',
-		'- - -- - -'
-	]
+		'- - -- - -',
+	],
 };
 
 export const reactor: Map = {
@@ -554,8 +554,8 @@ export const reactor: Map = {
 		'---w  b---',
 		'- --bw-- -',
 		'w- -  - -b',
-		'-b------w-'
-	]
+		'-b------w-',
+	],
 };
 
 export const sixeight: Map = {
@@ -569,8 +569,8 @@ export const sixeight: Map = {
 		'--bw--',
 		'------',
 		'------',
-		'------'
-	]
+		'------',
+	],
 };
 
 export const spark: Map = {
@@ -587,8 +587,8 @@ export const spark: Map = {
 		' -------- ',
 		' -------- ',
 		'----------',
-		' -      - '
-	]
+		' -      - ',
+	],
 };
 
 export const islands: Map = {
@@ -605,8 +605,8 @@ export const islands: Map = {
 		'  --------',
 		'  --------',
 		'  --------',
-		'  --------'
-	]
+		'  --------',
+	],
 };
 
 export const galaxy: Map = {
@@ -625,8 +625,8 @@ export const galaxy: Map = {
 		'---w--bbb---',
 		' ---w------ ',
 		'  ---www--  ',
-		'   ------   '
-	]
+		'   ------   ',
+	],
 };
 
 export const triangle: Map = {
@@ -643,8 +643,8 @@ export const triangle: Map = {
 		' -------- ',
 		' -------- ',
 		'----------',
-		'----------'
-	]
+		'----------',
+	],
 };
 
 export const iphonex: Map = {
@@ -663,8 +663,8 @@ export const iphonex: Map = {
 		'--------',
 		'--------',
 		'--------',
-		' ------ '
-	]
+		' ------ ',
+	],
 };
 
 export const dealWithIt: Map = {
@@ -676,8 +676,8 @@ export const dealWithIt: Map = {
 		'--w-b-------',
 		' --b-w------',
 		'  --w-b---- ',
-		'   -------  '
-	]
+		'   -------  ',
+	],
 };
 
 export const bigBoard: Map = {
@@ -699,8 +699,8 @@ export const bigBoard: Map = {
 		'----------------',
 		'----------------',
 		'----------------',
-		'----------------'
-	]
+		'----------------',
+	],
 };
 
 export const twoBoard: Map = {
@@ -715,6 +715,6 @@ export const twoBoard: Map = {
 		'---bw--- ---bw---',
 		'-------- --------',
 		'-------- --------',
-		'-------- --------'
-	]
+		'-------- --------',
+	],
 };
-- 
cgit v1.2.3-freya


From 79eac66d3912c7225b8bb0704d52127da23dc8a3 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 20 Jan 2024 10:02:09 +0900
Subject: tweak reversi map

---
 packages/misskey-reversi/src/maps.ts | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/packages/misskey-reversi/src/maps.ts b/packages/misskey-reversi/src/maps.ts
index c0fbae16ba..ac57fbb72f 100644
--- a/packages/misskey-reversi/src/maps.ts
+++ b/packages/misskey-reversi/src/maps.ts
@@ -680,29 +680,6 @@ export const dealWithIt: Map = {
 	],
 };
 
-export const bigBoard: Map = {
-	name: 'Big board',
-	category: 'Special',
-	data: [
-		'----------------',
-		'----------------',
-		'----------------',
-		'----------------',
-		'----------------',
-		'----------------',
-		'----------------',
-		'-------wb-------',
-		'-------bw-------',
-		'----------------',
-		'----------------',
-		'----------------',
-		'----------------',
-		'----------------',
-		'----------------',
-		'----------------',
-	],
-};
-
 export const twoBoard: Map = {
 	name: 'Two board',
 	category: 'Special',
-- 
cgit v1.2.3-freya


From 272590ef94b63240afafdb7be8b3d758d7f59a89 Mon Sep 17 00:00:00 2001
From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 20 Jan 2024 10:10:37 +0900
Subject: fix lint

---
 packages/frontend/src/components/MkMediaAudio.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/frontend/src/components/MkMediaAudio.vue b/packages/frontend/src/components/MkMediaAudio.vue
index 53fd3b2d55..3c569e2e1e 100644
--- a/packages/frontend/src/components/MkMediaAudio.vue
+++ b/packages/frontend/src/components/MkMediaAudio.vue
@@ -22,7 +22,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<audio
 			ref="audioEl"
 			preload="metadata"
-			:class="$style.audio"
 		>
 			<source :src="audio.url">
 		</audio>
-- 
cgit v1.2.3-freya


From 44b8ac135fdc0778e1eb4d57f6afdd798f007870 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 20 Jan 2024 11:11:20 +0900
Subject: fix(dev): fix workspace settings

---
 package.json         |  5 ++++-
 scripts/clean-all.js |  9 +++++++++
 scripts/clean.js     |  3 +++
 scripts/dev.mjs      | 12 ++++++++++++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 49de5a5efd..ee50cecb11 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,10 @@
 	"workspaces": [
 		"packages/frontend",
 		"packages/backend",
-		"packages/sw"
+		"packages/sw",
+		"packages/misskey-js",
+		"packages/misskey-reversi",
+		"packages/misskey-bubble-game"
 	],
 	"private": true,
 	"scripts": {
diff --git a/scripts/clean-all.js b/scripts/clean-all.js
index 4735eed760..160014a3f3 100644
--- a/scripts/clean-all.js
+++ b/scripts/clean-all.js
@@ -16,6 +16,15 @@ const fs = require('fs');
 	fs.rmSync(__dirname + '/../packages/sw/built', { recursive: true, force: true });
 	fs.rmSync(__dirname + '/../packages/sw/node_modules', { recursive: true, force: true });
 
+	fs.rmSync(__dirname + '/../packages/misskey-js/built', { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../packages/misskey-js/node_modules', { recursive: true, force: true });
+
+	fs.rmSync(__dirname + '/../packages/misskey-reversi/built', { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../packages/misskey-reversi/node_modules', { recursive: true, force: true });
+
+	fs.rmSync(__dirname + '/../packages/misskey-bubble-game/built', { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../packages/misskey-bubble-game/node_modules', { recursive: true, force: true });
+
 	fs.rmSync(__dirname + '/../built', { recursive: true, force: true });
 	fs.rmSync(__dirname + '/../node_modules', { recursive: true, force: true });
 
diff --git a/scripts/clean.js b/scripts/clean.js
index 812553e17b..09ac786853 100644
--- a/scripts/clean.js
+++ b/scripts/clean.js
@@ -9,5 +9,8 @@ const fs = require('fs');
 	fs.rmSync(__dirname + '/../packages/backend/built', { recursive: true, force: true });
 	fs.rmSync(__dirname + '/../packages/frontend/built', { recursive: true, force: true });
 	fs.rmSync(__dirname + '/../packages/sw/built', { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../packages/misskey-js/built', { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../packages/misskey-reversi/built', { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../packages/misskey-bubble-game/built', { recursive: true, force: true });
 	fs.rmSync(__dirname + '/../built', { recursive: true, force: true });
 })();
diff --git a/scripts/dev.mjs b/scripts/dev.mjs
index 30dbebcf0f..ed0ea1fb30 100644
--- a/scripts/dev.mjs
+++ b/scripts/dev.mjs
@@ -63,3 +63,15 @@ execa('pnpm', ['--filter', 'misskey-js', 'watch'], {
 	stdout: process.stdout,
 	stderr: process.stderr,
 });
+
+execa('pnpm', ['--filter', 'misskey-reversi', 'watch'], {
+	cwd: _dirname + '/../',
+	stdout: process.stdout,
+	stderr: process.stderr,
+});
+
+execa('pnpm', ['--filter', 'misskey-bubble-game', 'watch'], {
+	cwd: _dirname + '/../',
+	stdout: process.stdout,
+	stderr: process.stderr,
+});
-- 
cgit v1.2.3-freya


From f86d0186d2420d3502b49d8a98fcd262aaa1b362 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 20 Jan 2024 11:18:53 +0900
Subject: fix(dev): fix pnpm dev

---
 packages/misskey-bubble-game/package.json |  1 +
 pnpm-lock.yaml                            |  6 ++++++
 scripts/dev.mjs                           | 24 ++++++++++++++++++------
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/packages/misskey-bubble-game/package.json b/packages/misskey-bubble-game/package.json
index 806d693670..852c923c34 100644
--- a/packages/misskey-bubble-game/package.json
+++ b/packages/misskey-bubble-game/package.json
@@ -18,6 +18,7 @@
 		"@typescript-eslint/eslint-plugin": "6.19.0",
 		"@typescript-eslint/parser": "6.19.0",
 		"eslint": "8.56.0",
+		"nodemon": "3.0.2",
 		"typescript": "5.3.3"
 	},
 	"files": [
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0a80403725..c18cee30c7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1059,6 +1059,9 @@ importers:
       eslint:
         specifier: 8.56.0
         version: 8.56.0
+      nodemon:
+        specifier: 3.0.2
+        version: 3.0.2
       typescript:
         specifier: 5.3.3
         version: 5.3.3
@@ -1180,6 +1183,9 @@ importers:
       eslint:
         specifier: 8.56.0
         version: 8.56.0
+      nodemon:
+        specifier: 3.0.2
+        version: 3.0.2
       typescript:
         specifier: 5.3.3
         version: 5.3.3
diff --git a/scripts/dev.mjs b/scripts/dev.mjs
index ed0ea1fb30..9b60af6570 100644
--- a/scripts/dev.mjs
+++ b/scripts/dev.mjs
@@ -28,37 +28,49 @@ await execa('pnpm', ['build-assets'], {
 	stderr: process.stderr,
 });
 
-execa('pnpm', ['build-pre', '--watch'], {
+await execa('pnpm', ['--filter', 'misskey-js', 'build'], {
 	cwd: _dirname + '/../',
 	stdout: process.stdout,
 	stderr: process.stderr,
 });
 
-execa('pnpm', ['build-assets', '--watch'], {
+await execa('pnpm', ['--filter', 'misskey-reversi', 'build'], {
 	cwd: _dirname + '/../',
 	stdout: process.stdout,
 	stderr: process.stderr,
 });
 
-execa('pnpm', ['--filter', 'backend', 'dev'], {
+await execa('pnpm', ['--filter', 'misskey-bubble-game', 'build'], {
 	cwd: _dirname + '/../',
 	stdout: process.stdout,
 	stderr: process.stderr,
 });
 
-execa('pnpm', ['--filter', 'frontend', 'dev'], {
+execa('pnpm', ['build-pre', '--watch'], {
 	cwd: _dirname + '/../',
 	stdout: process.stdout,
 	stderr: process.stderr,
 });
 
-execa('pnpm', ['--filter', 'sw', 'watch'], {
+execa('pnpm', ['build-assets', '--watch'], {
+	cwd: _dirname + '/../',
+	stdout: process.stdout,
+	stderr: process.stderr,
+});
+
+execa('pnpm', ['--filter', 'backend', 'dev'], {
+	cwd: _dirname + '/../',
+	stdout: process.stdout,
+	stderr: process.stderr,
+});
+
+execa('pnpm', ['--filter', 'frontend', 'dev'], {
 	cwd: _dirname + '/../',
 	stdout: process.stdout,
 	stderr: process.stderr,
 });
 
-execa('pnpm', ['--filter', 'misskey-js', 'watch'], {
+execa('pnpm', ['--filter', 'sw', 'watch'], {
 	cwd: _dirname + '/../',
 	stdout: process.stdout,
 	stderr: process.stderr,
-- 
cgit v1.2.3-freya


From b9a81edae5bfbd2a5b0d03e9b523a04ea5cf4bc5 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 20 Jan 2024 13:14:46 +0900
Subject: enhance(reversi): tweak reversi

---
 packages/backend/src/core/GlobalEventService.ts    |   8 +-
 packages/backend/src/core/ReversiService.ts        |  51 +++++-----
 .../src/core/entities/ReversiGameEntityService.ts  |   6 +-
 packages/backend/src/models/ReversiGame.ts         |   9 +-
 .../backend/src/models/json-schema/reversi-game.ts |  16 +--
 .../src/server/api/stream/channels/reversi-game.ts |   6 +-
 packages/frontend/src/pages/reversi/game.board.vue | 110 ++++++++++++---------
 packages/misskey-js/src/autogen/apiClientJSDoc.ts  |   2 +-
 packages/misskey-js/src/autogen/endpoint.ts        |   2 +-
 packages/misskey-js/src/autogen/entities.ts        |   2 +-
 packages/misskey-js/src/autogen/models.ts          |   2 +-
 packages/misskey-js/src/autogen/types.ts           |   8 +-
 packages/misskey-reversi/package.json              |  19 +++-
 packages/misskey-reversi/src/game.ts               |   7 +-
 packages/misskey-reversi/src/index.ts              |   8 +-
 packages/misskey-reversi/src/serializer.ts         |  98 ++++++++++++++++++
 16 files changed, 224 insertions(+), 130 deletions(-)
 create mode 100644 packages/misskey-reversi/src/serializer.ts

diff --git a/packages/backend/src/core/GlobalEventService.ts b/packages/backend/src/core/GlobalEventService.ts
index 11a8935be2..896149f238 100644
--- a/packages/backend/src/core/GlobalEventService.ts
+++ b/packages/backend/src/core/GlobalEventService.ts
@@ -5,6 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
+import * as Reversi from 'misskey-reversi';
 import type { MiChannel } from '@/models/Channel.js';
 import type { MiUser } from '@/models/User.js';
 import type { MiUserProfile } from '@/models/UserProfile.js';
@@ -179,12 +180,7 @@ export interface ReversiGameEventTypes {
 		key: string;
 		value: any;
 	};
-	putStone: {
-		at: number;
-		color: boolean;
-		pos: number;
-		next: boolean;
-	};
+	log: Reversi.Serializer.Log & { id: string | null };
 	syncState: {
 		crc32: string;
 	};
diff --git a/packages/backend/src/core/ReversiService.ts b/packages/backend/src/core/ReversiService.ts
index 6e80261330..9fe7255e48 100644
--- a/packages/backend/src/core/ReversiService.ts
+++ b/packages/backend/src/core/ReversiService.ts
@@ -235,11 +235,14 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 
 				const map = freshGame.map != null ? freshGame.map : getRandomMap();
 
+				const crc32 = CRC32.str(JSON.stringify(freshGame.logs)).toString();
+
 				await this.reversiGamesRepository.update(game.id, {
 					startedAt: new Date(),
 					isStarted: true,
 					black: bw,
 					map: map,
+					crc32,
 				});
 
 				//#region 盤面に最初から石がないなどして始まった瞬間に勝敗が決定する場合があるのでその処理
@@ -309,7 +312,7 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 	}
 
 	@bindThis
-	public async putStoneToGame(game: MiReversiGame, user: MiUser, pos: number) {
+	public async putStoneToGame(game: MiReversiGame, user: MiUser, pos: number, id?: string | null) {
 		if (!game.isStarted) return;
 		if (game.isEnded) return;
 		if ((game.user1Id !== user.id) && (game.user2Id !== user.id)) return;
@@ -319,56 +322,58 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 				? true
 				: false;
 
-		const o = new Reversi.Game(game.map, {
+		const engine = Reversi.Serializer.restoreGame({
+			map: game.map,
 			isLlotheo: game.isLlotheo,
 			canPutEverywhere: game.canPutEverywhere,
 			loopedBoard: game.loopedBoard,
+			logs: game.logs,
 		});
 
-		// 盤面の状態を再生
-		for (const log of game.logs) {
-			o.put(log.color, log.pos);
-		}
-
-		if (o.turn !== myColor) return;
+		if (engine.turn !== myColor) return;
+		if (!engine.canPut(myColor, pos)) return;
 
-		if (!o.canPut(myColor, pos)) return;
-		o.put(myColor, pos);
+		engine.putStone(pos);
 
 		let winner;
-		if (o.isEnded) {
-			if (o.winner === true) {
+		if (engine.isEnded) {
+			if (engine.winner === true) {
 				winner = game.black === 1 ? game.user1Id : game.user2Id;
-			} else if (o.winner === false) {
+			} else if (engine.winner === false) {
 				winner = game.black === 1 ? game.user2Id : game.user1Id;
 			} else {
 				winner = null;
 			}
 		}
 
+		const logs = Reversi.Serializer.deserializeLogs(game.logs);
+
 		const log = {
-			at: Date.now(),
-			color: myColor,
+			time: Date.now(),
+			player: myColor,
+			operation: 'put',
 			pos,
-		};
+		} as const;
+
+		logs.push(log);
 
-		const crc32 = CRC32.str(game.logs.map(x => x.pos.toString()).join('') + pos.toString()).toString();
+		const serializeLogs = Reversi.Serializer.serializeLogs(logs);
 
-		game.logs.push(log);
+		const crc32 = CRC32.str(JSON.stringify(serializeLogs)).toString();
 
 		await this.reversiGamesRepository.update(game.id, {
 			crc32,
-			isEnded: o.isEnded,
+			isEnded: engine.isEnded,
 			winnerId: winner,
-			logs: game.logs,
+			logs: serializeLogs,
 		});
 
-		this.globalEventService.publishReversiGameStream(game.id, 'putStone', {
+		this.globalEventService.publishReversiGameStream(game.id, 'log', {
 			...log,
-			next: o.turn,
+			id: id ?? null,
 		});
 
-		if (o.isEnded) {
+		if (engine.isEnded) {
 			this.globalEventService.publishReversiGameStream(game.id, 'ended', {
 				winnerId: winner ?? null,
 				game: await this.reversiGameEntityService.packDetail(game.id, user),
diff --git a/packages/backend/src/core/entities/ReversiGameEntityService.ts b/packages/backend/src/core/entities/ReversiGameEntityService.ts
index 8d95204928..a7adc681f6 100644
--- a/packages/backend/src/core/entities/ReversiGameEntityService.ts
+++ b/packages/backend/src/core/entities/ReversiGameEntityService.ts
@@ -55,11 +55,7 @@ export class ReversiGameEntityService {
 			isLlotheo: game.isLlotheo,
 			canPutEverywhere: game.canPutEverywhere,
 			loopedBoard: game.loopedBoard,
-			logs: game.logs.map(log => ({
-				at: log.at,
-				color: log.color,
-				pos: log.pos,
-			})),
+			logs: game.logs,
 			map: game.map,
 		});
 	}
diff --git a/packages/backend/src/models/ReversiGame.ts b/packages/backend/src/models/ReversiGame.ts
index d297d1f01d..dcaa5c9fa9 100644
--- a/packages/backend/src/models/ReversiGame.ts
+++ b/packages/backend/src/models/ReversiGame.ts
@@ -76,11 +76,7 @@ export class MiReversiGame {
 	@Column('jsonb', {
 		default: [],
 	})
-	public logs: {
-		at: number;
-		color: boolean;
-		pos: number;
-	}[];
+	public logs: number[][];
 
 	@Column('varchar', {
 		array: true, length: 64,
@@ -117,9 +113,6 @@ export class MiReversiGame {
 	})
 	public form2: any | null;
 
-	/**
-	 * ログのposを文字列としてすべて連結したもののCRC32値
-	 */
 	@Column('varchar', {
 		length: 32, nullable: true,
 	})
diff --git a/packages/backend/src/models/json-schema/reversi-game.ts b/packages/backend/src/models/json-schema/reversi-game.ts
index 0d23b9dc79..b94046438b 100644
--- a/packages/backend/src/models/json-schema/reversi-game.ts
+++ b/packages/backend/src/models/json-schema/reversi-game.ts
@@ -204,22 +204,8 @@ export const packedReversiGameDetailedSchema = {
 			type: 'array',
 			optional: false, nullable: false,
 			items: {
-				type: 'object',
+				type: 'array',
 				optional: false, nullable: false,
-				properties: {
-					at: {
-						type: 'number',
-						optional: false, nullable: false,
-					},
-					color: {
-						type: 'boolean',
-						optional: false, nullable: false,
-					},
-					pos: {
-						type: 'number',
-						optional: false, nullable: false,
-					},
-				},
 			},
 		},
 		map: {
diff --git a/packages/backend/src/server/api/stream/channels/reversi-game.ts b/packages/backend/src/server/api/stream/channels/reversi-game.ts
index c67c05fb09..2d8c396db9 100644
--- a/packages/backend/src/server/api/stream/channels/reversi-game.ts
+++ b/packages/backend/src/server/api/stream/channels/reversi-game.ts
@@ -45,7 +45,7 @@ class ReversiGameChannel extends Channel {
 		switch (type) {
 			case 'ready': this.ready(body); break;
 			case 'updateSettings': this.updateSettings(body.key, body.value); break;
-			case 'putStone': this.putStone(body.pos); break;
+			case 'putStone': this.putStone(body.pos, body.id); break;
 			case 'syncState': this.syncState(body.crc32); break;
 		}
 	}
@@ -72,14 +72,14 @@ class ReversiGameChannel extends Channel {
 	}
 
 	@bindThis
-	private async putStone(pos: number) {
+	private async putStone(pos: number, id: string) {
 		if (this.user == null) return;
 
 		// TODO: キャッシュしたい
 		const game = await this.reversiGamesRepository.findOneBy({ id: this.gameId! });
 		if (game == null) throw new Error('game not found');
 
-		this.reversiService.putStoneToGame(game, this.user, pos);
+		this.reversiService.putStoneToGame(game, this.user, pos, id);
 	}
 
 	@bindThis
diff --git a/packages/frontend/src/pages/reversi/game.board.vue b/packages/frontend/src/pages/reversi/game.board.vue
index 582967ad2b..bf45fc4119 100644
--- a/packages/frontend/src/pages/reversi/game.board.vue
+++ b/packages/frontend/src/pages/reversi/game.board.vue
@@ -13,12 +13,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<Mfm :key="'turn:' + turnUser.id" :text="i18n.tsx._reversi.turnOf({ name: turnUser.name ?? turnUser.username })" :plain="true" :customEmojis="turnUser.emojis"/>
 				<MkEllipsis/>
 			</div>
-			<div v-if="(logPos !== logs.length) && turnUser" class="turn">
+			<div v-if="(logPos !== game.logs.length) && turnUser" class="turn">
 				<Mfm :key="'past-turn-of:' + turnUser.id" :text="i18n.tsx._reversi.pastTurnOf({ name: turnUser.name ?? turnUser.username })" :plain="true" :customEmojis="turnUser.emojis"/>
 			</div>
 			<div v-if="iAmPlayer && !game.isEnded && !isMyTurn" class="turn1">{{ i18n.ts._reversi.opponentTurn }}<MkEllipsis/></div>
 			<div v-if="iAmPlayer && !game.isEnded && isMyTurn" class="turn2" style="animation: tada 1s linear infinite both;">{{ i18n.ts._reversi.myTurn }}</div>
-			<div v-if="game.isEnded && logPos == logs.length" class="result">
+			<div v-if="game.isEnded && logPos == game.logs.length" class="result">
 				<template v-if="game.winner">
 					<Mfm :key="'won'" :text="i18n.tsx._reversi.won({ name: game.winner.name ?? game.winner.username })" :plain="true" :customEmojis="game.winner.emojis"/>
 					<span v-if="game.surrendered != null"> ({{ i18n.ts._reversi.surrendered }})</span>
@@ -69,12 +69,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</div>
 
 		<div v-if="game.isEnded" class="_panel _gaps_s" style="padding: 16px;">
-			<div>{{ logPos }} / {{ logs.length }}</div>
+			<div>{{ logPos }} / {{ game.logs.length }}</div>
 			<div v-if="!autoplaying" class="_buttonsCenter">
 				<MkButton :disabled="logPos === 0" @click="logPos = 0"><i class="ti ti-chevrons-left"></i></MkButton>
 				<MkButton :disabled="logPos === 0" @click="logPos--"><i class="ti ti-chevron-left"></i></MkButton>
-				<MkButton :disabled="logPos === logs.length" @click="logPos++"><i class="ti ti-chevron-right"></i></MkButton>
-				<MkButton :disabled="logPos === logs.length" @click="logPos = logs.length"><i class="ti ti-chevrons-right"></i></MkButton>
+				<MkButton :disabled="logPos === game.logs.length" @click="logPos++"><i class="ti ti-chevron-right"></i></MkButton>
+				<MkButton :disabled="logPos === game.logs.length" @click="logPos = game.logs.length"><i class="ti ti-chevrons-right"></i></MkButton>
 			</div>
 			<MkButton style="margin: auto;" :disabled="autoplaying" @click="autoplay()"><i class="ti ti-player-play"></i></MkButton>
 		</div>
@@ -115,18 +115,15 @@ const props = defineProps<{
 const showBoardLabels = true;
 const autoplaying = ref<boolean>(false);
 const game = ref<Misskey.entities.ReversiGameDetailed>(deepClone(props.game));
-const logs = ref<Misskey.entities.ReversiLog[]>(game.value.logs);
-const logPos = ref<number>(logs.value.length);
-const engine = shallowRef<Reversi.Game>(new Reversi.Game(game.value.map, {
+const logPos = ref<number>(game.value.logs.length);
+const engine = shallowRef<Reversi.Game>(Reversi.Serializer.restoreGame({
+	map: game.value.map,
 	isLlotheo: game.value.isLlotheo,
 	canPutEverywhere: game.value.canPutEverywhere,
 	loopedBoard: game.value.loopedBoard,
+	logs: game.value.logs,
 }));
 
-for (const log of game.value.logs) {
-	engine.value.put(log.color, log.pos);
-}
-
 const iAmPlayer = computed(() => {
 	return game.value.user1Id === $i.id || game.value.user2Id === $i.id;
 });
@@ -177,60 +174,76 @@ const cellsStyle = computed(() => {
 
 watch(logPos, (v) => {
 	if (!game.value.isEnded) return;
-	const _o = new Reversi.Game(game.value.map, {
+	engine.value = Reversi.Serializer.restoreGame({
+		map: game.value.map,
 		isLlotheo: game.value.isLlotheo,
 		canPutEverywhere: game.value.canPutEverywhere,
 		loopedBoard: game.value.loopedBoard,
+		logs: game.value.logs.slice(0, v),
 	});
-	for (const log of logs.value.slice(0, v)) {
-		_o.put(log.color, log.pos);
-	}
-	engine.value = _o;
 });
 
 if (game.value.isStarted && !game.value.isEnded) {
 	useInterval(() => {
 		if (game.value.isEnded) return;
-		const crc32 = CRC32.str(logs.value.map(x => x.pos.toString()).join(''));
+		const crc32 = CRC32.str(JSON.stringify(game.value.logs)).toString();
+		if (_DEV_) console.log('crc32', crc32);
 		props.connection.send('syncState', {
 			crc32: crc32,
 		});
-	}, 5000, { immediate: false, afterMounted: true });
+	}, 10000, { immediate: false, afterMounted: true });
 }
 
+const appliedOps: string[] = [];
+
 function putStone(pos) {
 	if (game.value.isEnded) return;
 	if (!iAmPlayer.value) return;
 	if (!isMyTurn.value) return;
 	if (!engine.value.canPut(myColor.value!, pos)) return;
 
-	engine.value.put(myColor.value!, pos);
+	engine.value.putStone(pos);
+
 	triggerRef(engine);
 
 	// サウンドを再生する
 	//sound.play(myColor.value ? 'reversiPutBlack' : 'reversiPutWhite');
 
+	const id = Math.random().toString(36).slice(2);
 	props.connection.send('putStone', {
 		pos: pos,
+		id,
 	});
+	appliedOps.push(id);
 
 	checkEnd();
 }
 
-function onPutStone(x) {
-	logs.value.push(x);
+function onStreamLog(log: Reversi.Serializer.Log & { id: string | null }) {
+	game.value.logs = Reversi.Serializer.serializeLogs([
+		...Reversi.Serializer.deserializeLogs(game.value.logs),
+		log,
+	]);
+
 	logPos.value++;
-	engine.value.put(x.color, x.pos);
-	triggerRef(engine);
-	checkEnd();
 
-	// サウンドを再生する
-	if (x.color !== myColor.value) {
-		//sound.play(x.color ? 'reversiPutBlack' : 'reversiPutWhite');
+	if (log.id == null || !appliedOps.includes(log.id)) {
+		switch (log.operation) {
+			case 'put': {
+				engine.value.putStone(log.pos);
+				triggerRef(engine);
+				checkEnd();
+				//sound.play(x.color ? 'reversiPutBlack' : 'reversiPutWhite');
+				break;
+			}
+
+			default:
+				break;
+		}
 	}
 }
 
-function onEnded(x) {
+function onStreamEnded(x) {
 	game.value = deepClone(x.game);
 }
 
@@ -250,23 +263,20 @@ function checkEnd() {
 	}
 }
 
-function onRescue(_game) {
+function onStreamRescue(_game) {
+	console.log('rescue');
+
 	game.value = deepClone(_game);
 
-	engine.value = new Reversi.Game(game.value.map, {
+	engine.value = Reversi.Serializer.restoreGame({
+		map: game.value.map,
 		isLlotheo: game.value.isLlotheo,
 		canPutEverywhere: game.value.canPutEverywhere,
 		loopedBoard: game.value.loopedBoard,
+		logs: game.value.logs,
 	});
 
-	for (const log of game.value.logs) {
-		engine.value.put(log.color, log.pos);
-	}
-
-	triggerRef(engine);
-
-	logs.value = game.value.logs;
-	logPos.value = logs.value.length;
+	logPos.value = game.value.logs.length;
 
 	checkEnd();
 }
@@ -280,21 +290,22 @@ function surrender() {
 function autoplay() {
 	autoplaying.value = true;
 	logPos.value = 0;
+	const logs = Reversi.Serializer.deserializeLogs(game.value.logs);
 
 	window.setTimeout(() => {
 		logPos.value = 1;
 
 		let i = 1;
-		let previousLog = game.value.logs[0];
+		let previousLog = logs[0];
 		const tick = () => {
-			const log = game.value.logs[i];
-			const time = new Date(log.at).getTime() - new Date(previousLog.at).getTime();
+			const log = logs[i];
+			const time = log.time - previousLog.time;
 			setTimeout(() => {
 				i++;
 				logPos.value++;
 				previousLog = log;
 
-				if (i < game.value.logs.length) {
+				if (i < logs.length) {
 					tick();
 				} else {
 					autoplaying.value = false;
@@ -307,15 +318,15 @@ function autoplay() {
 }
 
 onMounted(() => {
-	props.connection.on('putStone', onPutStone);
-	props.connection.on('rescue', onRescue);
-	props.connection.on('ended', onEnded);
+	props.connection.on('log', onStreamLog);
+	props.connection.on('rescue', onStreamRescue);
+	props.connection.on('ended', onStreamEnded);
 });
 
 onUnmounted(() => {
-	props.connection.off('putStone', onPutStone);
-	props.connection.off('rescue', onRescue);
-	props.connection.off('ended', onEnded);
+	props.connection.off('log', onStreamLog);
+	props.connection.off('rescue', onStreamRescue);
+	props.connection.off('ended', onStreamEnded);
 });
 </script>
 
@@ -389,6 +400,7 @@ $gap: 4px;
 	background: transparent;
 	border-radius: 6px;
 	overflow: clip;
+	aspect-ratio: 1;
 
 	&.boardCell_empty {
 		border: solid 2px var(--divider);
diff --git a/packages/misskey-js/src/autogen/apiClientJSDoc.ts b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
index e4e7d13668..e1d9d7517c 100644
--- a/packages/misskey-js/src/autogen/apiClientJSDoc.ts
+++ b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
@@ -1,6 +1,6 @@
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-19T11:00:07.160Z
+ * generatedAt: 2024-01-20T01:28:01.779Z
  */
 
 import type { SwitchCaseResponseType } from '../api.js';
diff --git a/packages/misskey-js/src/autogen/endpoint.ts b/packages/misskey-js/src/autogen/endpoint.ts
index 671abd78ce..61fc519c17 100644
--- a/packages/misskey-js/src/autogen/endpoint.ts
+++ b/packages/misskey-js/src/autogen/endpoint.ts
@@ -1,6 +1,6 @@
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-19T11:00:07.158Z
+ * generatedAt: 2024-01-20T01:28:01.777Z
  */
 
 import type {
diff --git a/packages/misskey-js/src/autogen/entities.ts b/packages/misskey-js/src/autogen/entities.ts
index c14876c0e3..79b5fb0ae4 100644
--- a/packages/misskey-js/src/autogen/entities.ts
+++ b/packages/misskey-js/src/autogen/entities.ts
@@ -1,6 +1,6 @@
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-19T11:00:07.156Z
+ * generatedAt: 2024-01-20T01:28:01.775Z
  */
 
 import { operations } from './types.js';
diff --git a/packages/misskey-js/src/autogen/models.ts b/packages/misskey-js/src/autogen/models.ts
index 78f14d2250..fbd32f62d0 100644
--- a/packages/misskey-js/src/autogen/models.ts
+++ b/packages/misskey-js/src/autogen/models.ts
@@ -1,6 +1,6 @@
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-19T11:00:07.155Z
+ * generatedAt: 2024-01-20T01:28:01.774Z
  */
 
 import { components } from './types.js';
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 36facf6e28..d59f510732 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -3,7 +3,7 @@
 
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-19T11:00:07.077Z
+ * generatedAt: 2024-01-20T01:28:01.695Z
  */
 
 /**
@@ -4517,11 +4517,7 @@ export type components = {
       isLlotheo: boolean;
       canPutEverywhere: boolean;
       loopedBoard: boolean;
-      logs: {
-          at: number;
-          color: boolean;
-          pos: number;
-        }[];
+      logs: unknown[][];
       map: string[];
     };
   };
diff --git a/packages/misskey-reversi/package.json b/packages/misskey-reversi/package.json
index 8d3ca30166..34b29f5b7c 100644
--- a/packages/misskey-reversi/package.json
+++ b/packages/misskey-reversi/package.json
@@ -1,10 +1,22 @@
 {
+	"type": "module",
 	"name": "misskey-reversi",
 	"version": "0.0.1",
-	"main": "./built/index.js",
-	"types": "./built/index.d.ts",
+	"exports": {
+		".": {
+			"import": "./built/esm/index.js",
+			"types": "./built/dts/index.d.ts"
+		},
+		"./*": {
+			"import": "./built/esm/*",
+			"types": "./built/dts/*"
+		}
+	},
 	"scripts": {
-		"build": "tsc",
+		"build": "npm run ts",
+		"ts": "npm run ts-esm && npm run ts-dts",
+		"ts-esm": "tsc --outDir built/esm",
+		"ts-dts": "tsc --outDir built/dts --declaration true --emitDeclarationOnly true --declarationMap true",
 		"watch": "nodemon -w src -e ts,js,cjs,mjs,json --exec \"pnpm run build\"",
 		"eslint": "eslint . --ext .js,.jsx,.ts,.tsx",
 		"typecheck": "tsc --noEmit",
@@ -16,6 +28,7 @@
 		"@typescript-eslint/eslint-plugin": "6.19.0",
 		"@typescript-eslint/parser": "6.19.0",
 		"eslint": "8.56.0",
+		"nodemon": "3.0.2",
 		"typescript": "5.3.3"
 	},
 	"files": [
diff --git a/packages/misskey-reversi/src/game.ts b/packages/misskey-reversi/src/game.ts
index 72aace7c0b..f29b001447 100644
--- a/packages/misskey-reversi/src/game.ts
+++ b/packages/misskey-reversi/src/game.ts
@@ -46,7 +46,7 @@ export class Game {
 
 	constructor(map: string[], opts: Options) {
 		//#region binds
-		this.put = this.put.bind(this);
+		this.putStone = this.putStone.bind(this);
 		//#endregion
 
 		//#region Options
@@ -88,7 +88,10 @@ export class Game {
 		return x + (y * this.mapWidth);
 	}
 
-	public put(color: Color, pos: number) {
+	public putStone(pos: number) {
+		const color = this.turn;
+		if (color == null) return;
+
 		this.prevPos = pos;
 		this.prevColor = color;
 
diff --git a/packages/misskey-reversi/src/index.ts b/packages/misskey-reversi/src/index.ts
index 28964413b7..883b16e3d7 100644
--- a/packages/misskey-reversi/src/index.ts
+++ b/packages/misskey-reversi/src/index.ts
@@ -3,10 +3,6 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { Game } from './game.js';
-
-export {
-	Game,
-};
-
+export { Game } from './game.js';
+export * as Serializer from './serializer.js';
 export * as maps from './maps.js';
diff --git a/packages/misskey-reversi/src/serializer.ts b/packages/misskey-reversi/src/serializer.ts
new file mode 100644
index 0000000000..2e6e0475d6
--- /dev/null
+++ b/packages/misskey-reversi/src/serializer.ts
@@ -0,0 +1,98 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Game } from './game.js';
+
+export type Log = {
+	time: number;
+	player: boolean;
+	operation: 'put';
+	pos: number;
+};
+
+export type SerializedLog = number[];
+
+export function serializeLogs(logs: Log[]) {
+	const _logs: number[][] = [];
+
+	for (let i = 0; i < logs.length; i++) {
+		const log = logs[i];
+		const timeDelta = i === 0 ? log.time : log.time - logs[i - 1].time;
+
+		switch (log.operation) {
+			case 'put':
+				_logs.push([timeDelta, log.player ? 1 : 0, 0, log.pos]);
+				break;
+			//case 'surrender':
+			//	_logs.push([timeDelta, log.player, 1]);
+			//	break;
+		}
+	}
+
+	return _logs;
+}
+
+export function deserializeLogs(logs: SerializedLog[]) {
+	const _logs: Log[] = [];
+
+	let time = 0;
+
+	for (const log of logs) {
+		const timeDelta = log[0];
+		time += timeDelta;
+
+		const player = log[1];
+		const operation = log[2];
+
+		switch (operation) {
+			case 0:
+				_logs.push({
+					time,
+					player: player === 1,
+					operation: 'put',
+					pos: log[3],
+				});
+				break;
+			//case 1:
+			//	_logs.push({
+			//		time,
+			//		player: player === 1,
+			//		operation: 'surrender',
+			//	});
+			//	break;
+		}
+	}
+
+	return _logs;
+}
+
+export function restoreGame(env: {
+	map: string[];
+	isLlotheo: boolean;
+	canPutEverywhere: boolean;
+	loopedBoard: boolean;
+	logs: SerializedLog[];
+}) {
+	const logs = deserializeLogs(env.logs);
+
+	const game = new Game(env.map, {
+		isLlotheo: env.isLlotheo,
+		canPutEverywhere: env.canPutEverywhere,
+		loopedBoard: env.loopedBoard,
+	});
+
+	for (const log of logs) {
+		switch (log.operation) {
+			case 'put':
+				game.putStone(log.pos);
+				break;
+			//case 'surrender':
+			//	game.surrender(log.player);
+			//	break;
+		}
+	}
+
+	return game;
+}
-- 
cgit v1.2.3-freya


From 1de29e5566e4d44250b1949a41ce54fc0178bb40 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 20 Jan 2024 13:57:03 +0900
Subject: refactor: migrate to ESM

---
 packages/frontend/vite.config.ts          |  5 -----
 packages/misskey-bubble-game/package.json | 18 +++++++++++++++---
 packages/misskey-js/package.json          | 18 +++++++++++++++---
 packages/misskey-js/src/api.ts            |  8 ++++----
 packages/misskey-js/src/api.types.ts      |  8 ++++----
 packages/misskey-js/src/entities.ts       |  6 +++---
 packages/misskey-js/src/streaming.ts      |  6 ++++--
 7 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/packages/frontend/vite.config.ts b/packages/frontend/vite.config.ts
index df37192583..35d112f6ec 100644
--- a/packages/frontend/vite.config.ts
+++ b/packages/frontend/vite.config.ts
@@ -101,11 +101,6 @@ export function getConfig(): UserConfig {
 			__VUE_PROD_DEVTOOLS__: false,
 		},
 
-		// https://vitejs.dev/guide/dep-pre-bundling.html#monorepos-and-linked-dependencies
-		optimizeDeps: {
-			include: ['misskey-js', 'misskey-reversi', 'misskey-bubble-game'],
-		},
-
 		build: {
 			target: [
 				'chrome116',
diff --git a/packages/misskey-bubble-game/package.json b/packages/misskey-bubble-game/package.json
index 852c923c34..787a956185 100644
--- a/packages/misskey-bubble-game/package.json
+++ b/packages/misskey-bubble-game/package.json
@@ -1,10 +1,22 @@
 {
+	"type": "module",
 	"name": "misskey-bubble-game",
 	"version": "0.0.1",
-	"main": "./built/index.js",
-	"types": "./built/index.d.ts",
+	"exports": {
+		".": {
+			"import": "./built/esm/index.js",
+			"types": "./built/dts/index.d.ts"
+		},
+		"./*": {
+			"import": "./built/esm/*",
+			"types": "./built/dts/*"
+		}
+	},
 	"scripts": {
-		"build": "tsc",
+		"build": "npm run ts",
+		"ts": "npm run ts-esm && npm run ts-dts",
+		"ts-esm": "tsc --outDir built/esm",
+		"ts-dts": "tsc --outDir built/dts --declaration true --emitDeclarationOnly true --declarationMap true",
 		"watch": "nodemon -w src -e ts,js,cjs,mjs,json --exec \"pnpm run build\"",
 		"eslint": "eslint . --ext .js,.jsx,.ts,.tsx",
 		"typecheck": "tsc --noEmit",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 1e3ed99a9b..4c2d9e7254 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,11 +1,23 @@
 {
+	"type": "module",
 	"name": "misskey-js",
 	"version": "0.0.16",
 	"description": "Misskey SDK for JavaScript",
-	"main": "./built/index.js",
-	"types": "./built/index.d.ts",
+	"exports": {
+		".": {
+			"import": "./built/esm/index.js",
+			"types": "./built/dts/index.d.ts"
+		},
+		"./*": {
+			"import": "./built/esm/*",
+			"types": "./built/dts/*"
+		}
+	},
 	"scripts": {
-		"build": "tsc",
+		"build": "npm run ts",
+		"ts": "npm run ts-esm && npm run ts-dts",
+		"ts-esm": "tsc --outDir built/esm",
+		"ts-dts": "tsc --outDir built/dts --declaration true --emitDeclarationOnly true --declarationMap true",
 		"watch": "nodemon -w src -e ts,js,cjs,mjs,json --exec \"pnpm run build\"",
 		"tsd": "tsd",
 		"api": "pnpm api-extractor run --local --verbose",
diff --git a/packages/misskey-js/src/api.ts b/packages/misskey-js/src/api.ts
index 0d10faaada..2e85fc2939 100644
--- a/packages/misskey-js/src/api.ts
+++ b/packages/misskey-js/src/api.ts
@@ -1,11 +1,11 @@
-import './autogen/apiClientJSDoc';
+import './autogen/apiClientJSDoc.js';
 
-import { SwitchCaseResponseType } from './api.types';
-import type { Endpoints } from './api.types';
+import { SwitchCaseResponseType } from './api.types.js';
+import type { Endpoints } from './api.types.js';
 
 export {
 	SwitchCaseResponseType,
-} from './api.types';
+} from './api.types.js';
 
 const MK_API_ERROR = Symbol();
 
diff --git a/packages/misskey-js/src/api.types.ts b/packages/misskey-js/src/api.types.ts
index 75ab7d91b1..6320081928 100644
--- a/packages/misskey-js/src/api.types.ts
+++ b/packages/misskey-js/src/api.types.ts
@@ -1,6 +1,6 @@
-import { Endpoints as Gen } from './autogen/endpoint';
-import { UserDetailed } from './autogen/models';
-import { UsersShowRequest } from './autogen/entities';
+import { Endpoints as Gen } from './autogen/endpoint.js';
+import { UserDetailed } from './autogen/models.js';
+import { UsersShowRequest } from './autogen/entities.js';
 import {
 	SigninRequest,
 	SigninResponse,
@@ -8,7 +8,7 @@ import {
 	SignupPendingResponse,
 	SignupRequest,
 	SignupResponse,
-} from './entities';
+} from './entities.js';
 
 type Overwrite<T, U extends { [Key in keyof T]?: unknown }> = Omit<
 	T,
diff --git a/packages/misskey-js/src/entities.ts b/packages/misskey-js/src/entities.ts
index e00e192e0d..bab518e635 100644
--- a/packages/misskey-js/src/entities.ts
+++ b/packages/misskey-js/src/entities.ts
@@ -1,8 +1,8 @@
 import { ModerationLogPayloads } from './consts.js';
-import { Announcement, EmojiDetailed, MeDetailed, MeDetailedOnly, Page, User, UserDetailed } from './autogen/models';
+import { Announcement, EmojiDetailed, MeDetailed, MeDetailedOnly, Page, User, UserDetailed } from './autogen/models.js';
 
-export * from './autogen/entities';
-export * from './autogen/models';
+export * from './autogen/entities.js';
+export * from './autogen/models.js';
 
 export type ID = string;
 export type DateString = string;
diff --git a/packages/misskey-js/src/streaming.ts b/packages/misskey-js/src/streaming.ts
index c641706a4b..0f26857782 100644
--- a/packages/misskey-js/src/streaming.ts
+++ b/packages/misskey-js/src/streaming.ts
@@ -1,7 +1,9 @@
 import { EventEmitter } from 'eventemitter3';
-import ReconnectingWebsocket from 'reconnecting-websocket';
+import _ReconnectingWebsocket from 'reconnecting-websocket';
 import type { BroadcastEvents, Channels } from './streaming.types.js';
 
+const ReconnectingWebsocket = _ReconnectingWebsocket as unknown as typeof _ReconnectingWebsocket['default'];
+
 export function urlQuery(obj: Record<string, string | number | boolean | undefined>): string {
 	const params = Object.entries(obj)
 		.filter(([, v]) => Array.isArray(v) ? v.length : v !== undefined)
@@ -24,7 +26,7 @@ type StreamEvents = {
  * Misskey stream connection
  */
 export default class Stream extends EventEmitter<StreamEvents> {
-	private stream: ReconnectingWebsocket;
+	private stream: _ReconnectingWebsocket.default;
 	public state: 'initializing' | 'reconnecting' | 'connected' = 'initializing';
 	private sharedConnectionPools: Pool[] = [];
 	private sharedConnections: SharedConnection[] = [];
-- 
cgit v1.2.3-freya


From cb74b6175547d7a2de0dce17b381a0f5e1a0fd89 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 20 Jan 2024 14:01:27 +0900
Subject: fix api-extractor

---
 .gitignore                                        | 1 +
 packages/misskey-js/api-extractor.json            | 2 +-
 packages/misskey-js/src/autogen/apiClientJSDoc.ts | 2 +-
 packages/misskey-js/src/autogen/endpoint.ts       | 2 +-
 packages/misskey-js/src/autogen/entities.ts       | 2 +-
 packages/misskey-js/src/autogen/models.ts         | 2 +-
 packages/misskey-js/src/autogen/types.ts          | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index d7b486b977..bdc14fea0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,7 @@ api-docs.json
 ormconfig.json
 temp
 /packages/frontend/src/**/*.stories.ts
+tsdoc-metadata.json
 
 # blender backups
 *.blend1
diff --git a/packages/misskey-js/api-extractor.json b/packages/misskey-js/api-extractor.json
index a95281a6d5..f80d0f20a8 100644
--- a/packages/misskey-js/api-extractor.json
+++ b/packages/misskey-js/api-extractor.json
@@ -45,7 +45,7 @@
    *
    * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
    */
-  "mainEntryPointFilePath": "<projectFolder>/built/index.d.ts",
+  "mainEntryPointFilePath": "<projectFolder>/built/dts/index.d.ts",
 
   /**
    * A list of NPM package names whose exports should be treated as part of this package.
diff --git a/packages/misskey-js/src/autogen/apiClientJSDoc.ts b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
index e1d9d7517c..dc4bcd3aaa 100644
--- a/packages/misskey-js/src/autogen/apiClientJSDoc.ts
+++ b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
@@ -1,6 +1,6 @@
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-20T01:28:01.779Z
+ * generatedAt: 2024-01-20T04:59:59.768Z
  */
 
 import type { SwitchCaseResponseType } from '../api.js';
diff --git a/packages/misskey-js/src/autogen/endpoint.ts b/packages/misskey-js/src/autogen/endpoint.ts
index 61fc519c17..edf0e34b2a 100644
--- a/packages/misskey-js/src/autogen/endpoint.ts
+++ b/packages/misskey-js/src/autogen/endpoint.ts
@@ -1,6 +1,6 @@
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-20T01:28:01.777Z
+ * generatedAt: 2024-01-20T04:59:59.766Z
  */
 
 import type {
diff --git a/packages/misskey-js/src/autogen/entities.ts b/packages/misskey-js/src/autogen/entities.ts
index 79b5fb0ae4..ecf7e7f079 100644
--- a/packages/misskey-js/src/autogen/entities.ts
+++ b/packages/misskey-js/src/autogen/entities.ts
@@ -1,6 +1,6 @@
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-20T01:28:01.775Z
+ * generatedAt: 2024-01-20T04:59:59.765Z
  */
 
 import { operations } from './types.js';
diff --git a/packages/misskey-js/src/autogen/models.ts b/packages/misskey-js/src/autogen/models.ts
index fbd32f62d0..561cfd861f 100644
--- a/packages/misskey-js/src/autogen/models.ts
+++ b/packages/misskey-js/src/autogen/models.ts
@@ -1,6 +1,6 @@
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-20T01:28:01.774Z
+ * generatedAt: 2024-01-20T04:59:59.764Z
  */
 
 import { components } from './types.js';
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index d59f510732..e452636e80 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -3,7 +3,7 @@
 
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-20T01:28:01.695Z
+ * generatedAt: 2024-01-20T04:59:59.681Z
  */
 
 /**
-- 
cgit v1.2.3-freya


From 094c6e32ffd8ac271d00e07dc86048088963fb19 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 20 Jan 2024 14:05:09 +0900
Subject: add missing ext

---
 packages/misskey-js/test-d/api.ts       | 2 +-
 packages/misskey-js/test-d/streaming.ts | 2 +-
 packages/misskey-js/test/api.ts         | 2 +-
 packages/misskey-js/test/streaming.ts   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/misskey-js/test-d/api.ts b/packages/misskey-js/test-d/api.ts
index 1c2a142e8b..4b72ff4e9d 100644
--- a/packages/misskey-js/test-d/api.ts
+++ b/packages/misskey-js/test-d/api.ts
@@ -1,5 +1,5 @@
 import { expectType } from 'tsd';
-import * as Misskey from '../src';
+import * as Misskey from '../src/index.js';
 
 describe('API', () => {
 	test('success', async () => {
diff --git a/packages/misskey-js/test-d/streaming.ts b/packages/misskey-js/test-d/streaming.ts
index 6b186bd45a..b46b06e4df 100644
--- a/packages/misskey-js/test-d/streaming.ts
+++ b/packages/misskey-js/test-d/streaming.ts
@@ -1,5 +1,5 @@
 import { expectType } from 'tsd';
-import * as Misskey from '../src';
+import * as Misskey from '../src/index.js';
 
 describe('Streaming', () => {
 	test('emit type', async () => {
diff --git a/packages/misskey-js/test/api.ts b/packages/misskey-js/test/api.ts
index 6f9e656fef..fa31d23faa 100644
--- a/packages/misskey-js/test/api.ts
+++ b/packages/misskey-js/test/api.ts
@@ -1,5 +1,5 @@
 import { enableFetchMocks } from 'jest-fetch-mock';
-import { APIClient, isAPIError } from '../src/api';
+import { APIClient, isAPIError } from '../src/api.js';
 
 enableFetchMocks();
 
diff --git a/packages/misskey-js/test/streaming.ts b/packages/misskey-js/test/streaming.ts
index 9f6615a8d8..06b55cd8af 100644
--- a/packages/misskey-js/test/streaming.ts
+++ b/packages/misskey-js/test/streaming.ts
@@ -1,5 +1,5 @@
 import WS from 'jest-websocket-mock';
-import Stream from '../src/streaming';
+import Stream from '../src/streaming.js';
 
 describe('Streaming', () => {
 	test('useChannel', async () => {
-- 
cgit v1.2.3-freya


From 3bf3ba450c5d7d8da41cbe5ca2d405e38b40d631 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 20 Jan 2024 14:51:40 +0900
Subject: enhance(reversi): tweak reversi

---
 packages/frontend/assets/reversi/put.mp3           | Bin 0 -> 5014 bytes
 packages/frontend/assets/reversi/stone_b.png       | Bin 0 -> 10794 bytes
 packages/frontend/assets/reversi/stone_w.png       | Bin 0 -> 11546 bytes
 packages/frontend/src/pages/reversi/game.board.vue | 106 +++++++++++++++++----
 packages/frontend/src/pages/reversi/index.vue      |  16 ++--
 5 files changed, 97 insertions(+), 25 deletions(-)
 create mode 100644 packages/frontend/assets/reversi/put.mp3
 create mode 100644 packages/frontend/assets/reversi/stone_b.png
 create mode 100644 packages/frontend/assets/reversi/stone_w.png

diff --git a/packages/frontend/assets/reversi/put.mp3 b/packages/frontend/assets/reversi/put.mp3
new file mode 100644
index 0000000000..baa1b83195
Binary files /dev/null and b/packages/frontend/assets/reversi/put.mp3 differ
diff --git a/packages/frontend/assets/reversi/stone_b.png b/packages/frontend/assets/reversi/stone_b.png
new file mode 100644
index 0000000000..9e98455a3e
Binary files /dev/null and b/packages/frontend/assets/reversi/stone_b.png differ
diff --git a/packages/frontend/assets/reversi/stone_w.png b/packages/frontend/assets/reversi/stone_w.png
new file mode 100644
index 0000000000..f2bee593dc
Binary files /dev/null and b/packages/frontend/assets/reversi/stone_w.png differ
diff --git a/packages/frontend/src/pages/reversi/game.board.vue b/packages/frontend/src/pages/reversi/game.board.vue
index bf45fc4119..fbe44d0161 100644
--- a/packages/frontend/src/pages/reversi/game.board.vue
+++ b/packages/frontend/src/pages/reversi/game.board.vue
@@ -6,7 +6,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <MkSpacer :contentMax="600">
 	<div :class="$style.root" class="_gaps">
-		<header><b><MkA :to="userPage(blackUser)"><MkUserName :user="blackUser"/></MkA></b>({{ i18n.ts._reversi.black }}) vs <b><MkA :to="userPage(whiteUser)"><MkUserName :user="whiteUser"/></MkA></b>({{ i18n.ts._reversi.white }})</header>
+		<div style="display: flex; align-items: center; justify-content: center; gap: 10px;">
+			<span>({{ i18n.ts._reversi.black }})</span>
+			<MkAvatar style="width: 32px; height: 32px;" :user="blackUser" :showIndicator="true"/>
+			<span> vs </span>
+			<MkAvatar style="width: 32px; height: 32px;" :user="whiteUser" :showIndicator="true"/>
+			<span>({{ i18n.ts._reversi.white }})</span>
+		</div>
 
 		<div style="overflow: clip; line-height: 28px;">
 			<div v-if="!iAmPlayer && !game.isEnded && turnUser" class="turn">
@@ -49,8 +55,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 						}]"
 						@click="putStone(i)"
 					>
-						<img v-if="stone === true" style="pointer-events: none; user-select: none; display: block; width: 100%; height: 100%;" :src="blackUser.avatarUrl">
-						<img v-if="stone === false" style="pointer-events: none; user-select: none; display: block; width: 100%; height: 100%;" :src="whiteUser.avatarUrl">
+						<template v-if="useAvatarAsStone">
+							<img v-if="stone === true" :class="$style.boardCellStone" :src="blackUser.avatarUrl"/>
+							<img v-if="stone === false" :class="$style.boardCellStone" :src="whiteUser.avatarUrl"/>
+						</template>
+						<template v-else>
+							<img v-if="stone === true" :class="$style.boardCellStone" src="/client-assets/reversi/stone_b.png"/>
+							<img v-if="stone === false" :class="$style.boardCellStone" src="/client-assets/reversi/stone_w.png"/>
+						</template>
 					</div>
 				</div>
 				<div v-if="showBoardLabels" :class="$style.labelsY">
@@ -62,10 +74,41 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 		</div>
 
-		<div class="status"><b>{{ i18n.tsx._reversi.turnCount({ count: logPos }) }}</b> {{ i18n.ts._reversi.black }}:{{ engine.blackCount }} {{ i18n.ts._reversi.white }}:{{ engine.whiteCount }} {{ i18n.ts._reversi.total }}:{{ engine.blackCount + engine.whiteCount }}</div>
+		<div class="_panel" style="padding: 16px;">
+			<div>
+				<b>{{ i18n.tsx._reversi.turnCount({ count: logPos }) }}</b> {{ i18n.ts._reversi.black }}:{{ engine.blackCount }} {{ i18n.ts._reversi.white }}:{{ engine.whiteCount }} {{ i18n.ts._reversi.total }}:{{ engine.blackCount + engine.whiteCount }}
+			</div>
+			<div>
+				<div style="display: flex; align-items: center;">
+					<span style="margin-right: 8px;">({{ i18n.ts._reversi.black }})</span>
+					<MkAvatar style="width: 32px; height: 32px; margin-right: 8px;" :user="blackUser" :showIndicator="true"/>
+					<MkA :to="userPage(blackUser)"><MkUserName :user="blackUser"/></MkA>
+				</div>
+				<div> vs </div>
+				<div style="display: flex; align-items: center;">
+					<span style="margin-right: 8px;">({{ i18n.ts._reversi.white }})</span>
+					<MkAvatar style="width: 32px; height: 32px; margin-right: 8px;" :user="whiteUser" :showIndicator="true"/>
+					<MkA :to="userPage(whiteUser)"><MkUserName :user="whiteUser"/></MkA>
+				</div>
+			</div>
+			<div>
+				<p v-if="game.isLlotheo">{{ i18n.ts._reversi.isLlotheo }}</p>
+				<p v-if="game.loopedBoard">{{ i18n.ts._reversi.loopedMap }}</p>
+				<p v-if="game.canPutEverywhere">{{ i18n.ts._reversi.canPutEverywhere }}</p>
+			</div>
+		</div>
+
+		<MkFolder>
+			<template #label>{{ i18n.ts.options }}</template>
+			<div class="_gaps_s" style="text-align: left;">
+				<MkSwitch v-model="showBoardLabels">Show labels</MkSwitch>
+				<MkSwitch v-model="useAvatarAsStone">useAvatarAsStone</MkSwitch>
+			</div>
+		</MkFolder>
 
-		<div v-if="!game.isEnded && iAmPlayer" class="_buttonsCenter">
-			<MkButton danger @click="surrender">{{ i18n.ts._reversi.surrender }}</MkButton>
+		<div class="_buttonsCenter">
+			<MkButton v-if="!game.isEnded && iAmPlayer" danger @click="surrender">{{ i18n.ts._reversi.surrender }}</MkButton>
+			<MkButton @click="share">{{ i18n.ts.share }}</MkButton>
 		</div>
 
 		<div v-if="game.isEnded" class="_panel _gaps_s" style="padding: 16px;">
@@ -79,12 +122,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkButton style="margin: auto;" :disabled="autoplaying" @click="autoplay()"><i class="ti ti-player-play"></i></MkButton>
 		</div>
 
-		<div>
-			<p v-if="game.isLlotheo">{{ i18n.ts._reversi.isLlotheo }}</p>
-			<p v-if="game.loopedBoard">{{ i18n.ts._reversi.loopedMap }}</p>
-			<p v-if="game.canPutEverywhere">{{ i18n.ts._reversi.canPutEverywhere }}</p>
-		</div>
-
 		<MkA v-if="game.isEnded" :to="`/reversi`">
 			<img src="/client-assets/reversi/logo.png" style="display: block; max-width: 100%; width: 200px; margin: auto;"/>
 		</MkA>
@@ -98,12 +135,16 @@ import * as CRC32 from 'crc-32';
 import * as Misskey from 'misskey-js';
 import * as Reversi from 'misskey-reversi';
 import MkButton from '@/components/MkButton.vue';
+import MkFolder from '@/components/MkFolder.vue';
+import MkSwitch from '@/components/MkSwitch.vue';
 import { deepClone } from '@/scripts/clone.js';
 import { useInterval } from '@/scripts/use-interval.js';
 import { signinRequired } from '@/account.js';
 import { i18n } from '@/i18n.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { userPage } from '@/filters/user.js';
+import * as sound from '@/scripts/sound.js';
+import * as os from '@/os.js';
 
 const $i = signinRequired();
 
@@ -112,7 +153,8 @@ const props = defineProps<{
 	connection: Misskey.ChannelConnection;
 }>();
 
-const showBoardLabels = true;
+const showBoardLabels = ref<boolean>(false);
+const useAvatarAsStone = ref<boolean>(true);
 const autoplaying = ref<boolean>(false);
 const game = ref<Misskey.entities.ReversiGameDetailed>(deepClone(props.game));
 const logPos = ref<number>(game.value.logs.length);
@@ -206,8 +248,10 @@ function putStone(pos) {
 
 	triggerRef(engine);
 
-	// サウンドを再生する
-	//sound.play(myColor.value ? 'reversiPutBlack' : 'reversiPutWhite');
+	sound.playUrl('/client-assets/reversi/put.mp3', {
+		volume: 1,
+		playbackRate: 1,
+	});
 
 	const id = Math.random().toString(36).slice(2);
 	props.connection.send('putStone', {
@@ -232,8 +276,13 @@ function onStreamLog(log: Reversi.Serializer.Log & { id: string | null }) {
 			case 'put': {
 				engine.value.putStone(log.pos);
 				triggerRef(engine);
+
+				sound.playUrl('/client-assets/reversi/put.mp3', {
+					volume: 1,
+					playbackRate: 1,
+				});
+
 				checkEnd();
-				//sound.play(x.color ? 'reversiPutBlack' : 'reversiPutWhite');
 				break;
 			}
 
@@ -281,7 +330,13 @@ function onStreamRescue(_game) {
 	checkEnd();
 }
 
-function surrender() {
+async function surrender() {
+	const { canceled } = await os.confirm({
+		type: 'warning',
+		text: i18n.ts.areYouSure,
+	});
+	if (canceled) return;
+
 	misskeyApi('reversi/surrender', {
 		gameId: game.value.id,
 	});
@@ -317,6 +372,13 @@ function autoplay() {
 	}, 1000);
 }
 
+function share() {
+	os.post({
+		initialText: `#MisskeyReversi ${location.href}`,
+		instant: true,
+	});
+}
+
 onMounted(() => {
 	props.connection.on('log', onStreamLog);
 	props.connection.on('rescue', onStreamRescue);
@@ -341,7 +403,7 @@ $gap: 4px;
 }
 
 .board {
-	width: calc(100% - 16px);
+	width: 100%;
 	max-width: 500px;
 	margin: 0 auto;
 }
@@ -437,4 +499,12 @@ $gap: 4px;
 		border-color: transparent !important;
 	}
 }
+
+.boardCellStone {
+	pointer-events: none;
+	user-select: none;
+	display: block;
+	width: 100%;
+	height: 100%;
+}
 </style>
diff --git a/packages/frontend/src/pages/reversi/index.vue b/packages/frontend/src/pages/reversi/index.vue
index c483e36c24..d33acc95a9 100644
--- a/packages/frontend/src/pages/reversi/index.vue
+++ b/packages/frontend/src/pages/reversi/index.vue
@@ -10,9 +10,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<img src="/client-assets/reversi/logo.png" style="display: block; max-width: 100%; max-height: 200px; margin: auto;"/>
 		</div>
 
-		<div class="_buttonsCenter">
-			<MkButton primary gradate rounded @click="matchAny">{{ i18n.ts._reversi.freeMatch }}</MkButton>
-			<MkButton primary gradate rounded @click="matchUser">{{ i18n.ts.invite }}</MkButton>
+		<div class="_panel" style="padding: 16px;">
+			<div class="_buttonsCenter">
+				<MkButton primary gradate rounded @click="matchAny">{{ i18n.ts._reversi.freeMatch }}</MkButton>
+				<MkButton primary gradate rounded @click="matchUser">{{ i18n.ts.invite }}</MkButton>
+			</div>
 		</div>
 
 		<MkFolder v-if="invitations.length > 0" :defaultOpen="true">
@@ -28,12 +30,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 		<MkFolder v-if="$i" :defaultOpen="true">
 			<template #label>{{ i18n.ts._reversi.myGames }}</template>
-			<MkPagination :pagination="myGamesPagination">
+			<MkPagination :pagination="myGamesPagination" :disableAutoLoad="true">
 				<template #default="{ items }">
 					<div :class="$style.gamePreviews">
 						<MkA v-for="g in items" :key="g.id" v-panel :class="$style.gamePreview" tabindex="-1" :to="`/reversi/g/${g.id}`">
 							<div :class="$style.gamePreviewPlayers">
-								<MkAvatar :class="$style.gamePreviewPlayersAvatar" :user="g.user1"/><b><MkUserName :user="g.user1"/></b> vs <b><MkUserName :user="g.user2"/></b><MkAvatar :class="$style.gamePreviewPlayersAvatar" :user="g.user2"/>
+								<MkAvatar :class="$style.gamePreviewPlayersAvatar" :user="g.user1"/> vs <MkAvatar :class="$style.gamePreviewPlayersAvatar" :user="g.user2"/>
 							</div>
 							<div :class="$style.gamePreviewFooter">
 								<span :style="!g.isEnded ? 'color: var(--accent);' : ''">{{ g.isEnded ? i18n.ts._reversi.ended : i18n.ts._reversi.playing }}</span>
@@ -47,12 +49,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 		<MkFolder :defaultOpen="true">
 			<template #label>{{ i18n.ts._reversi.allGames }}</template>
-			<MkPagination :pagination="gamesPagination">
+			<MkPagination :pagination="gamesPagination" :disableAutoLoad="true">
 				<template #default="{ items }">
 					<div :class="$style.gamePreviews">
 						<MkA v-for="g in items" :key="g.id" v-panel :class="$style.gamePreview" tabindex="-1" :to="`/reversi/g/${g.id}`">
 							<div :class="$style.gamePreviewPlayers">
-								<MkAvatar :class="$style.gamePreviewPlayersAvatar" :user="g.user1"/><b><MkUserName :user="g.user1"/></b> vs <b><MkUserName :user="g.user2"/></b><MkAvatar :class="$style.gamePreviewPlayersAvatar" :user="g.user2"/>
+								<MkAvatar :class="$style.gamePreviewPlayersAvatar" :user="g.user1"/> vs <MkAvatar :class="$style.gamePreviewPlayersAvatar" :user="g.user2"/>
 							</div>
 							<div :class="$style.gamePreviewFooter">
 								<span :style="!g.isEnded ? 'color: var(--accent);' : ''">{{ g.isEnded ? i18n.ts._reversi.ended : i18n.ts._reversi.playing }}</span>
-- 
cgit v1.2.3-freya


From f6b7754fb1cec46e0f85ecf0028598d7a49d25ed Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 20 Jan 2024 15:52:35 +0900
Subject: :art:

---
 packages/frontend/src/pages/reversi/game.board.vue | 68 +++++++++++++++-------
 1 file changed, 48 insertions(+), 20 deletions(-)

diff --git a/packages/frontend/src/pages/reversi/game.board.vue b/packages/frontend/src/pages/reversi/game.board.vue
index fbe44d0161..b787e301be 100644
--- a/packages/frontend/src/pages/reversi/game.board.vue
+++ b/packages/frontend/src/pages/reversi/game.board.vue
@@ -44,6 +44,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<div :class="$style.boardCells" :style="cellsStyle">
 					<div
 						v-for="(stone, i) in engine.board"
+						:key="i"
 						v-tooltip="`${String.fromCharCode(65 + engine.posToXy(i)[0])}${engine.posToXy(i)[1] + 1}`"
 						:class="[$style.boardCell, {
 							[$style.boardCell_empty]: stone == null,
@@ -55,14 +56,22 @@ SPDX-License-Identifier: AGPL-3.0-only
 						}]"
 						@click="putStone(i)"
 					>
-						<template v-if="useAvatarAsStone">
-							<img v-if="stone === true" :class="$style.boardCellStone" :src="blackUser.avatarUrl"/>
-							<img v-if="stone === false" :class="$style.boardCellStone" :src="whiteUser.avatarUrl"/>
-						</template>
-						<template v-else>
-							<img v-if="stone === true" :class="$style.boardCellStone" src="/client-assets/reversi/stone_b.png"/>
-							<img v-if="stone === false" :class="$style.boardCellStone" src="/client-assets/reversi/stone_w.png"/>
-						</template>
+						<Transition
+							:enterActiveClass="$style.transition_flip_enterActive"
+							:leaveActiveClass="$style.transition_flip_leaveActive"
+							:enterFromClass="$style.transition_flip_enterFrom"
+							:leaveToClass="$style.transition_flip_leaveTo"
+							mode="default"
+						>
+							<template v-if="useAvatarAsStone">
+								<img v-if="stone === true" :class="$style.boardCellStone" :src="blackUser.avatarUrl"/>
+								<img v-else-if="stone === false" :class="$style.boardCellStone" :src="whiteUser.avatarUrl"/>
+							</template>
+							<template v-else>
+								<img v-if="stone === true" :class="$style.boardCellStone" src="/client-assets/reversi/stone_b.png"/>
+								<img v-else-if="stone === false" :class="$style.boardCellStone" src="/client-assets/reversi/stone_w.png"/>
+							</template>
+						</Transition>
 					</div>
 				</div>
 				<div v-if="showBoardLabels" :class="$style.labelsY">
@@ -74,6 +83,17 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 		</div>
 
+		<div v-if="game.isEnded" class="_panel _gaps_s" style="padding: 16px;">
+			<div>{{ logPos }} / {{ game.logs.length }}</div>
+			<div v-if="!autoplaying" class="_buttonsCenter">
+				<MkButton :disabled="logPos === 0" @click="logPos = 0"><i class="ti ti-chevrons-left"></i></MkButton>
+				<MkButton :disabled="logPos === 0" @click="logPos--"><i class="ti ti-chevron-left"></i></MkButton>
+				<MkButton :disabled="logPos === game.logs.length" @click="logPos++"><i class="ti ti-chevron-right"></i></MkButton>
+				<MkButton :disabled="logPos === game.logs.length" @click="logPos = game.logs.length"><i class="ti ti-chevrons-right"></i></MkButton>
+			</div>
+			<MkButton style="margin: auto;" :disabled="autoplaying" @click="autoplay()"><i class="ti ti-player-play"></i></MkButton>
+		</div>
+
 		<div class="_panel" style="padding: 16px;">
 			<div>
 				<b>{{ i18n.tsx._reversi.turnCount({ count: logPos }) }}</b> {{ i18n.ts._reversi.black }}:{{ engine.blackCount }} {{ i18n.ts._reversi.white }}:{{ engine.whiteCount }} {{ i18n.ts._reversi.total }}:{{ engine.blackCount + engine.whiteCount }}
@@ -111,17 +131,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkButton @click="share">{{ i18n.ts.share }}</MkButton>
 		</div>
 
-		<div v-if="game.isEnded" class="_panel _gaps_s" style="padding: 16px;">
-			<div>{{ logPos }} / {{ game.logs.length }}</div>
-			<div v-if="!autoplaying" class="_buttonsCenter">
-				<MkButton :disabled="logPos === 0" @click="logPos = 0"><i class="ti ti-chevrons-left"></i></MkButton>
-				<MkButton :disabled="logPos === 0" @click="logPos--"><i class="ti ti-chevron-left"></i></MkButton>
-				<MkButton :disabled="logPos === game.logs.length" @click="logPos++"><i class="ti ti-chevron-right"></i></MkButton>
-				<MkButton :disabled="logPos === game.logs.length" @click="logPos = game.logs.length"><i class="ti ti-chevrons-right"></i></MkButton>
-			</div>
-			<MkButton style="margin: auto;" :disabled="autoplaying" @click="autoplay()"><i class="ti ti-player-play"></i></MkButton>
-		</div>
-
 		<MkA v-if="game.isEnded" :to="`/reversi`">
 			<img src="/client-assets/reversi/logo.png" style="display: block; max-width: 100%; width: 200px; margin: auto;"/>
 		</MkA>
@@ -395,6 +404,20 @@ onUnmounted(() => {
 <style lang="scss" module>
 @use "sass:math";
 
+.transition_flip_enterActive,
+.transition_flip_leaveActive {
+	backface-visibility: hidden;
+	transition: opacity 0.5s ease, transform 0.5s ease;
+}
+.transition_flip_enterFrom {
+	transform: rotateY(-180deg);
+	opacity: 0;
+}
+.transition_flip_leaveTo {
+	transform: rotateY(180deg);
+	opacity: 0;
+}
+
 $label-size: 16px;
 $gap: 4px;
 
@@ -461,8 +484,9 @@ $gap: 4px;
 .boardCell {
 	background: transparent;
 	border-radius: 6px;
-	overflow: clip;
 	aspect-ratio: 1;
+	transform-style: preserve-3d;
+	perspective: 150px;
 
 	&.boardCell_empty {
 		border: solid 2px var(--divider);
@@ -501,10 +525,14 @@ $gap: 4px;
 }
 
 .boardCellStone {
+	position: absolute;
+	top: 0;
+	left: 0;
 	pointer-events: none;
 	user-select: none;
 	display: block;
 	width: 100%;
 	height: 100%;
+	border-radius: 6px;
 }
 </style>
-- 
cgit v1.2.3-freya


From c115b8e3227ed5ebcce4ca6e966981fe6fbe9d25 Mon Sep 17 00:00:00 2001
From: 1Step621 <86859447+1STEP621@users.noreply.github.com>
Date: Sat, 20 Jan 2024 17:28:21 +0900
Subject: Fix(frontend):
 日本語のUnicode絵文字追加辞書をインストールすると絵文字ピッカーでUnicode絵文字を検索できなくなるのを修正
 (#13046)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 絵文字辞書のサロゲートペアを修正

* update CHANGELOG.md

* Revert "update CHANGELOG.md"

This reverts commit 7c24fa611a533bb74ef7979a0356b83f3410a056.
---
 .../frontend/src/unicode-emoji-indexes/ja-JP.json  | 387 ++++++++++----------
 .../src/unicode-emoji-indexes/ja-JP_hira.json      | 389 +++++++++++----------
 2 files changed, 389 insertions(+), 387 deletions(-)

diff --git a/packages/frontend/src/unicode-emoji-indexes/ja-JP.json b/packages/frontend/src/unicode-emoji-indexes/ja-JP.json
index 908d92bf20..9c491804f2 100644
--- a/packages/frontend/src/unicode-emoji-indexes/ja-JP.json
+++ b/packages/frontend/src/unicode-emoji-indexes/ja-JP.json
@@ -61,7 +61,7 @@
 	"😔":["悲しげな顔","がっかり","顔","悲しい"],
 	"😕":["困った顔","困った","こまった","顔"],
 	"🙁":["ご機嫌斜め","顔","しかめっ面","しかめっつら","悲しい","不幸"],
-	"☹️":["しかめっつら","顔","しかめっ面","悲しい","不幸"],
+	"☹":["しかめっつら","顔","しかめっ面","悲しい","不幸"],
 	"😬":["しかめっ面","顔","しかめっつら"],
 	"🥺":["訴えかける顔","顔","物乞い","慈悲","子犬の目"],
 	"😣":["我慢している顔","顔","がんばる","頑張る"],
@@ -111,7 +111,7 @@
 	"💩":["うんち","マンガ","漫画","フン","顔","モンスター"],
 	"👻":["お化け","妖怪","顔","おとぎ話","ファンタジー","幽霊","モンスター","ハロウィーン"],
 	"💀":["ドクロ","体","死","顔","おとぎ話","モンスター","骸骨","ハロウィーン"],
-	"☠️":["ドクロマーク","体","交差した骨","死","顔","モンスター","骸骨","ハロウィーン"],
+	"☠":["ドクロマーク","体","交差した骨","死","顔","モンスター","骸骨","ハロウィーン"],
 	"👽":["宇宙人","怪獣","異星人","顔","おとぎ話","ファンタジー","モンスター","宇宙","UFO"],
 	"🤖":["ロボットの顔","顔","モンスター","ロボット"],
 	"🎃":["ジャック・オ・ランタン","イベント","お祝い","エンタメ","ハロウィン","ジャックオランタン","ランタン","かぼちゃ"],
@@ -138,7 +138,7 @@
 	"🤛":["左向きのこぶし","体","拳","左向き"],
 	"🤜":["右向きのこぶし","体","拳","右向き"],
 	"🤞":["交差させた指","体","交差","指","手","幸運"],
-	"✌️":["Vサイン","体","手","V","ブイ","勝つ","勝利","ピース"],
+	"✌":["Vサイン","体","手","V","ブイ","勝つ","勝利","ピース"],
 	"🫰":["人差し指と親指を交差した手","高い","ハート","愛","お金","スナップ"],
 	"🤘":["コルナ","体","指","手","角","最高"],
 	"🤟":["愛してるのジェスチャー","体","愛してる","好き","手"],
@@ -151,10 +151,10 @@
 	"👉":["指差し","手の甲","体","指","手","人差し指","指さす"],
 	"👆":["指差し","手の甲","体","指","手","人差し指","指さす","上"],
 	"👇":["指差し","手の甲","体","下","指","手","人差し指","指さす"],
-	"☝️":["指差し","体","指","手","人差し指","指さす","上"],
+	"☝":["指差し","体","指","手","人差し指","指さす","上"],
 	"✋":["挙手","体","手"],
 	"🤚":["手の甲","体","挙げる"],
-	"🖐️":["広げた手のひら","体","指","手","広げる"],
+	"🖐":["広げた手のひら","体","指","手","広げる"],
 	"🖖":["長寿と繁栄を","体","指","手","スポック","バルカン"],
 	"👋":["バイバイ","体","手","振る","やっほー","ヤッホー","こんにちは"],
 	"🤙":["電話の形の手","体","電話","手"],
@@ -166,7 +166,7 @@
 	"🦾":["メカニカルアーム","アクセシビリティ","義手","人口装具","体"],
 	"🖕":["中指を立てた手","体","指","手","中指"],
 	"🫵":["見ている人を指している人差し指","指す","あなた","指"],
-	"✍️":["書いている手","体","手","書く"],
+	"✍":["書いている手","体","手","書く"],
 	"🤳":["自撮り","カメラ","携帯","腕"],
 	"💅":["マニキュア","体","ケア","化粧品","コスメ","爪","ネイル"],
 	"🦵":["脚","体","キック","手足"],
@@ -179,7 +179,7 @@
 	"👂":["耳","体","鼻"],
 	"🦻":["補聴器を付けている耳","アクセシビリティ","補聴器","聞く","体","耳"],
 	"👃":["鼻","体"],
-	"👁️":["目","体"],
+	"👁":["目","体"],
 	"👀":["目","体","顔"],
 	"🧠":["脳","体","臓器","知的","賢い"],
 	"🫀":["解剖学的な心臓","解剖学","心臓学","心臓","臓器","脈"],
@@ -187,7 +187,7 @@
 	"🦴":["骨","体","骨格"],
 	"👤":["上半身のシルエット","上半身","シルエット"],
 	"👥":["上半身のシルエット","上半身","シルエット"],
-	"🗣️":["喋る頭のシルエット","顔","頭","シルエット","しゃべる","話す"],
+	"🗣":["喋る頭のシルエット","顔","頭","シルエット","しゃべる","話す"],
 	"🫂":["ハグしている人たち","さようなら","こんにちは","ハグ","ありがとう"],
 	"👶":["赤ちゃん"],
 	"👧":["女の子","少女","処女","おとめ座","星座","子供"],
@@ -281,7 +281,7 @@
 	"💂‍♂️":["男性警備員","警備員","警備","男","おとこ","男性"],
 	"🥷":["忍者","戦士","隠された","ステルス"],
 	"🕵️‍♀️":["女性の探偵","探偵","刑事","スパイ","女性","女","おんな"],
-	"🕵️":["探偵","刑事","スパイ"],
+	"🕵":["探偵","刑事","スパイ"],
 	"🕵️‍♂️":["男性の探偵","探偵","刑事","スパイ","男","おとこ","男性"],
 	"🤶":["ミセス・クロース","イベント","お祝い","クリスマス","母","サンタ","クロース","女性","女","おんな"],
 	"🧑‍🎄":["ミクスクロース","アクティビティ","お祝い","クリスマス","サンタ","クロース"],
@@ -300,7 +300,7 @@
 	"🩵":["ライトブルーのハート","シアン","ハート","ライトブルー","コガモ"],
 	"🩶":["グレーのハート","グレー","ハート","シルバー","スレート"],
 	"🕴️‍♀️":["宙に浮いたスーツの女性","ビジネス","スーツ","女性","女","おんな"],
-	"🕴️":["宙に浮いたスーツの人","ビジネス","スーツ"],
+	"🕴":["宙に浮いたスーツの人","ビジネス","スーツ"],
 	"🕴️‍♂️":["宙に浮いたスーツの男性","ビジネス","スーツ","男","おとこ","男性"],
 	"🦸‍♀️":["女性のスーパーヒーロー","空想","善","ヒロイン","超大国","女性","女","おんな"],
 	"🦸":["スーパーヒーロー","空想","善","ヒーロー","ヒロイン","超大国"],
@@ -468,7 +468,7 @@
 	"🎩":["シルクハット","アクティビティ","服","エンターテインメント","娯楽","帽子","トップス"],
 	"🎓":["卒業式の角帽","アクティビティ","帽子","お祝い","服","卒業","ハット"],
 	"👑":["冠","服","王冠","王","女王"],
-	"⛑️":["白十字のヘルメット","救助","十字","顔","帽子","ヘルメット"],
+	"⛑":["白十字のヘルメット","救助","十字","顔","帽子","ヘルメット"],
 	"🪖":["軍隊のヘルメット","軍","ヘルメット","軍隊","軍人","兵士"],
 	"🎒":["ランドセル","アクティビティ","鞄","バッグ","学生鞄","学校"],
 	"👝":["ポーチ","鞄","バッグ","服"],
@@ -476,13 +476,13 @@
 	"👜":["ハンドバッグ","鞄","バッグ","服"],
 	"💼":["ブリーフケース"],
 	"👓":["眼鏡","服","目","メガネ","アイウェア"],
-	"🕶️":["サングラス","暗い","目","眼鏡","メガネ"],
+	"🕶":["サングラス","暗い","目","眼鏡","メガネ"],
 	"🥽":["ゴーグル","服","目の保護","水泳","溶接"],
 	"🧣":["スカーフ","服","首"],
 	"🧤":["手袋","服","手"],
 	"💍":["指輪","ダイヤモンド","恋愛","ロマンス"],
 	"🌂":["閉じた傘","服","雨","傘","天気"],
-	"☂️":["傘","服","雨","天気"],
+	"☂":["傘","服","雨","天気"],
 	"🐶":["イヌの顔","犬","イヌ","顔","ペット"],
 	"🐱":["ネコの顔","猫","ネコ","顔","ペット"],
 	"🐭":["ネズミの顔","顔","ネズミ"],
@@ -536,8 +536,8 @@
 	"🐜":["アリ","蟻","昆虫"],
 	"🦗":["クリケット","コオロギ","バッタ目","昆虫"],
 	"🪳":["ゴキブリ","昆虫","害虫"],
-	"🕷️":["クモ","昆虫","蜘蛛"],
-	"🕸️":["クモの巣","クモ","巣"],
+	"🕷":["クモ","昆虫","蜘蛛"],
+	"🕸":["クモの巣","クモ","巣"],
 	"🦂":["サソリ","さそり座","さそり","星座"],
 	"🦟":["蚊","病気","熱","昆虫","マラリア","ウイルス"],
 	"🪰":["ハエ","害虫","昆虫","蛆虫"],
@@ -584,7 +584,7 @@
 	"🦇":["コウモリ","吸血鬼"],
 	"🐓":["おんどり"],
 	"🦃":["七面鳥（鳥）","七面鳥","鳥"],
-	"🕊️":["平和の鳩","鳥","鳩","飛行","平和"],
+	"🕊":["平和の鳩","鳥","鳩","飛行","平和"],
 	"🦅":["ワシ","鳥"],
 	"🦆":["アヒル","鳥"],
 	"🪿":["ガチョウ","鳥","家禽","警笛の音"],
@@ -605,7 +605,7 @@
 	"🐇":["ウサギ","バニー","ペット"],
 	"🐀":["ネズミ"],
 	"🐁":["ネズミ"],
-	"🐿️":["シマリス"],
+	"🐿":["シマリス"],
 	"🦨":["スカンク","悪臭","臭う"],
 	"🦡":["アナグマ","ラーテル","ねだる"],
 	"🦔":["ハリネズミ","顔"],
@@ -622,7 +622,7 @@
 	"🪴":["鉢植え","植物","観葉植物"],
 	"🌱":["苗木","植物","若い"],
 	"🌿":["ハーブ","葉","植物"],
-	"☘️":["クローバー","植物"],
+	"☘":["クローバー","植物"],
 	"🍀":["四つ葉のクローバー","4","クローバー","四","葉","植物"],
 	"🎍":["門松","アクティビティ","竹","お祝い","日本","松","植物"],
 	"🎋":["七夕","アクティビティ","旗","お祝い","エンターテイメント","日本","木"],
@@ -661,35 +661,35 @@
 	"🌝":["顔つき満月","明るい","顔","満ちた","月","宇宙","天気"],
 	"🌛":["顔つき上弦の月","顔","月","弦","宇宙","天気"],
 	"🌜":["顔がある下弦の月","顔","月","弦","宇宙","天気"],
-	"⭐️":["中くらいの星","星"],
+	"⭐":["中くらいの星","星"],
 	"🌟":["光る星","きらめき","赤い光","輝く","輝き","星"],
 	"💫":["くらくら","漫画","めまい","星"],
 	"✨":["キラキラ","エンターテイメント","輝き","星"],
-	"☄️":["彗星","宇宙"],
+	"☄":["彗星","宇宙"],
 	"🪐":["環のある惑星","宇宙","惑星","土星"],
 	"🌞":["顔つき太陽","明るい","顔","宇宙","太陽","天気"],
 	"☀️":["太陽の光","明るい","光線","宇宙","太陽","晴天","天気"],
-	"🌤️":["太陽と小さな雲","雲","太陽","天気"],
-	"⛅️":["晴れ時々曇り","雲","太陽","天気"],
-	"🌥️":["晴れのち曇り","雲","太陽","天気"],
-	"🌦️":["晴れのち曇り時々雨","雲","雨","太陽","天気"],
+	"🌤":["太陽と小さな雲","雲","太陽","天気"],
+	"⛅":["晴れ時々曇り","雲","太陽","天気"],
+	"🌥":["晴れのち曇り","雲","太陽","天気"],
+	"🌦":["晴れのち曇り時々雨","雲","雨","太陽","天気"],
 	"☁️":["雲","天気"],
-	"🌧️":["雨雲","雲","雨","天気"],
-	"⛈️":["雷雨","雲","雨","雷","天気"],
-	"🌩️":["雷雲","雲","雷","天気"],
-	"⚡️":["高電圧記号","危険","電気","雷","電圧","ビリビリ"],
+	"🌧":["雨雲","雲","雨","天気"],
+	"⛈":["雷雨","雲","雨","雷","天気"],
+	"🌩":["雷雲","雲","雷","天気"],
+	"⚡":["高電圧記号","危険","電気","雷","電圧","ビリビリ"],
 	"🔥":["炎","火","道具"],
 	"💥":["衝突マーク","どかーん","衝突","漫画"],
 	"❄️":["雪の結晶","冷たい","雪","天気"],
-	"🌨️":["雪雲","雲","冷","雪","天気"],
-	"☃️":["雪だるま","冷","雪","天気"],
-	"⛄️":["雪だるま","冷","雪","天気"],
-	"🌬️":["風が吹いている","風が吹く","雲","顔","天気","風"],
+	"🌨":["雪雲","雲","冷","雪","天気"],
+	"☃":["雪だるま","冷","雪","天気"],
+	"⛄":["雪だるま","冷","雪","天気"],
+	"🌬":["風が吹いている","風が吹く","雲","顔","天気","風"],
 	"💨":["ダッシュ","漫画","走る"],
-	"🌪️":["竜巻雲","雲","竜巻","天気","旋風"],
-	"🌫️":["霧","雲","天気"],
+	"🌪":["竜巻雲","雲","竜巻","天気","旋風"],
+	"🌫":["霧","雲","天気"],
 	"🌈":["虹","雨","レインボー","天気","プライド","lgbt"],
-	"☔️":["雨と傘","衣類","しずく","雨","傘","天気"],
+	"☔":["雨と傘","衣類","しずく","雨","傘","天気"],
 	"💧":["雫","ぞっとする","漫画","したたり","汗","天気"],
 	"💦":["汗マーク","漫画","濡れている","汗"],
 	"🌊":["波","海","水","天気"],
@@ -714,7 +714,7 @@
 	"🥑":["アボカド","フルーツ","果物"],
 	"🫒":["オリーブ","フルーツ"],
 	"🍆":["ナス","茄子","植物","野菜"],
-	"🌶️":["トウガラシ","辛い","コショウ","植物"],
+	"🌶":["トウガラシ","辛い","コショウ","植物"],
 	"🫑":["ピーマン","唐辛子","コショウ","植物","野菜"],
 	"🥒":["キュウリ","ピクルス","野菜"],
 	"🥬":["葉っぱの緑","チンゲン菜","キャベツ","ケール","レタス"],
@@ -793,7 +793,7 @@
 	"🍪":["クッキー","デザート","甘い"],
 	"🥠":["おみくじ入りクッキー","フォーチュンクッキー"],
 	"🥮":["月餅","秋","祭"],
-	"☕️":["ホットドリンク","飲料","コーヒー","飲み物","温かい","蒸気","お茶"],
+	"☕":["ホットドリンク","飲料","コーヒー","飲み物","温かい","蒸気","お茶"],
 	"🍵":["湯のみ","飲料","カップ","飲み物","お茶","湯飲み"],
 	"🫖":["ティーポット","ドリンク","ポット","ティー","ケトル"],
 	"🥣":["ボウルとスプーン","朝食","シリアル","お粥","オートミール","ポリッジ","食器"],
@@ -816,13 +816,13 @@
 	"🧊":["角氷","氷","立方体","冷たい","氷山"],
 	"🥄":["スプーン","食器"],
 	"🍴":["フォークとナイフ","調理","フォーク","ナイフ","食器"],
-	"🍽️":["フォークとナイフとプレート","調理","フォーク","ナイフ","プレート","食器"],
+	"🍽":["フォークとナイフとプレート","調理","フォーク","ナイフ","プレート","食器"],
 	"🥢":["箸","はし"],
 	"🥡":["テイクアウトボックス","テイクアウト","容器","お持ち帰り"],
-	"⚽️":["サッカーボール","ボール","サッカー"],
+	"⚽":["サッカーボール","ボール","サッカー"],
 	"🏀":["バスケットボール","ボール","バスケットリング"],
 	"🏈":["アメリカンフットボール","アメリカン","ボール","フットボール"],
-	"⚾️":["野球","ボール"],
+	"⚾":["野球","ボール"],
 	"🥎":["ソフトボール","ボール","試合","スポーツ"],
 	"🎾":["テニスボール","ボール","ラケット","テニス"],
 	"🏐":["バレーボール","ボール","試合"],
@@ -838,19 +838,19 @@
 	"🏏":["クリケットのバットとボール","ボール","フィールド","クリケット","試合"],
 	"🥍":["ラクロス","ボール","スティック","試合","スポーツ"],
 	"🥌":["カーリングストーン","カーリング","ストーン"],
-	"⛳️":["ゴルフのカップ","ピンフラッグ","ゴルフ","ホール"],
+	"⛳":["ゴルフのカップ","ピンフラッグ","ゴルフ","ホール"],
 	"🏹":["弓矢","射手","矢","弓","射手座","道具","星座"],
 	"🎣":["釣竿と魚","エンターテイメント","魚","棒"],
 	"🤿":["ダイビングマスク","ダイビング","スキューバ","シュノーケル"],
 	"🥊":["ボクシンググローブ","ボクシング","グローブ"],
 	"🥋":["道着","柔道","空手","武道","テコンドー","ユニフォーム"],
-	"⛸️":["アイススケート","氷"],
+	"⛸":["アイススケート","氷"],
 	"🎿":["スキーとスキーブーツ","スキー","雪"],
 	"🛷":["そり","ソリ","ルージュ","トボガン"],
-	"⛷️":["スキー","雪"],
+	"⛷":["スキー","雪"],
 	"🏂":["スノーボーダー","スキー","雪","スノーボード"],
 	"🏋️‍♀️":["ウエイトを持ち上げる女性","挙げ","重量","女性","女","おんな"],
-	"🏋️":["ウエイトを持ち上げる人","挙げ","重量"],
+	"🏋":["ウエイトを持ち上げる人","挙げ","重量"],
 	"🏋️‍♂️":["ウエイトを持ち上げる男性","挙げ","重量","男","おとこ","男性"],
 	"🤺":["フェンシングをする人","剣士","剣術","剣"],
 	"🤼‍♀️":["レスリングをする女性","レスリング","レスリング選手","女性","女","おんな"],
@@ -860,7 +860,7 @@
 	"🤸":["側転をする人","側方転回","体操"],
 	"🤸‍♂️":["側転をする男性","側方転回","体操","男","おとこ","男性"],
 	"⛹️‍♀️":["ボールをバウンドさせる女性","ボール","女性","女","おんな"],
-	"⛹️":["ボールをバウンドさせる人","ボール"],
+	"⛹":["ボールをバウンドさせる人","ボール"],
 	"⛹️‍♂️":["ボールをバウンドさせる男性","ボール","男","おとこ","男性"],
 	"🤾‍♀️":["ハンドボールをする女性","ボール","ハンドボール","女性","女","おんな"],
 	"🤾":["ハンドボールをする人","ボール","ハンドボール"],
@@ -869,7 +869,7 @@
 	"🧗":["クライミングしている人","クライミング","ロック"],
 	"🧗‍♂️":["クライミングしている男性","クライミング","ロック","男性","男","おとこ"],
 	"🏌️‍♀️":["ゴルフをする女性","ボール","ゴルフ","ゴルファー","ゴルフする","女性","女","おんな"],
-	"🏌️":["ゴルフをする人","ボール","ゴルフ","ゴルファー","ゴルフする"],
+	"🏌":["ゴルフをする人","ボール","ゴルフ","ゴルファー","ゴルフする"],
 	"🏌️‍♂️":["ゴルフをする男性","ボール","ゴルフ","ゴルファー","ゴルフする","男","おとこ","男性"],
 	"🧘‍♀️":["蓮華座の女性","瞑想","ヨガ","静穏","女性","女","おんな"],
 	"🧘":["蓮華座の人","瞑想","ヨガ","静穏"],
@@ -897,16 +897,16 @@
 	"🚵":["マウンテンバイクに乗る人","マウンテンバイクライダー","クロスバイク","自転車","自転車乗り","自転車に乗る人","山"],
 	"🚵‍♂️":["マウンテンバイクに乗る男性","マウンテンバイクライダー","クロスバイク","自転車","自転車乗り","自転車に乗る人","サイクリスト","山","男","おとこ","男性"],
 	"🎽":["ランニングシャツと襷","ランニング","襷","シャツ"],
-	"🎖️":["勲章","お祝い","メダル","軍事"],
+	"🎖":["勲章","お祝い","メダル","軍事"],
 	"🏅":["スポーツのメダル","メダル"],
 	"🥇":["金メダル","1位","金","メダル","1","第1位"],
 	"🥈":["銀メダル","メダル","2位","銀","2","第2位"],
 	"🥉":["銅メダル","銅","メダル","3位","3","第3位"],
 	"🏆":["トロフィー","賞"],
-	"🏵️":["バラ飾り","植物"],
-	"🎗️":["リマインダーリボン","お祝い","リマインダー","リボン"],
+	"🏵":["バラ飾り","植物"],
+	"🎗":["リマインダーリボン","お祝い","リマインダー","リボン"],
 	"🎫":["きっぷ","アクティビティ","入場料","エンターテイメント","チケット"],
-	"🎟️":["入場券","入場料","エンターテイメント","チケット"],
+	"🎟":["入場券","入場料","エンターテイメント","チケット"],
 	"🎪":["サーカス小屋","アクティビティ","サーカス","エンターテイメント","テント"],
 	"🤹‍♀️":["ジャグリングをする女性","天秤","ジャグリング","女性","女","おんな"],
 	"🤹":["ジャグリングをする人","バランス","ジャグリング"],
@@ -945,7 +945,7 @@
 	"🛺":["オートリキシャ","人力車","トゥクトゥク"],
 	"🚌":["バス","乗り物"],
 	"🚎":["トロリーバス","バス","路面電車","市街電車","乗り物"],
-	"🏎️":["レーシングカー","車","競争"],
+	"🏎":["レーシングカー","車","競争"],
 	"🚓":["パトカー","車","パトロール","警察","乗り物"],
 	"🚑":["救急車","乗り物"],
 	"🚒":["消防車","エンジン","炎","トラック","乗り物"],
@@ -954,7 +954,7 @@
 	"🚚":["配達用トラック","配達","トラック","乗り物"],
 	"🚛":["トレーラー","大型トラック","セミ","トラック","乗り物"],
 	"🚜":["トラクター","乗り物"],
-	"🏍️":["レースバイク","オートバイ","レース"],
+	"🏍":["レースバイク","オートバイ","レース"],
 	"🛵":["スクーター","モーター"],
 	"🚲":["自転車","バイク","乗り物"],
 	"🦼":["電動車いす","アクセシビリティ","車いす"],
@@ -984,25 +984,25 @@
 	"🚊":["路面電車","トロリーバス","乗り物"],
 	"🚉":["駅","線路","電車","乗り物"],
 	"🚁":["ヘリコプター","乗り物"],
-	"🛩️":["小型航空機","飛行機","乗り物"],
+	"🛩":["小型航空機","飛行機","乗り物"],
 	"✈️":["飛行機","乗り物"],
 	"🛫":["飛行機の離陸","飛行機","チェックイン","出発","乗り物"],
 	"🛬":["飛行機の着陸","飛行機","到着","着陸","乗り物"],
 	"🪂":["パラシュート","パラセール","スカイダイブ","ハンググライダー"],
 	"💺":["座席","椅子"],
-	"🛰️":["サテライト","衛星","宇宙","乗り物"],
+	"🛰":["サテライト","衛星","宇宙","乗り物"],
 	"🚀":["ロケット","宇宙","乗り物"],
 	"🛸":["空飛ぶ円盤","UFO","宇宙人","異星人","宇宙","空想"],
 	"🛶":["カヌー","ボート"],
-	"⛵️":["ヨット","ボート","リゾート","海","乗り物"],
-	"🛥️":["モーターボート","ボート","乗り物"],
+	"⛵":["ヨット","ボート","リゾート","海","乗り物"],
+	"🛥":["モーターボート","ボート","乗り物"],
 	"🚤":["スピードボート","ボート","乗り物"],
-	"⛴️":["フェリー","ボート"],
-	"🛳️":["旅客船","旅客","船","乗り物"],
+	"⛴":["フェリー","ボート"],
+	"🛳":["旅客船","旅客","船","乗り物"],
 	"🚢":["船","乗り物"],
 	"🛟":["救命浮き輪","浮き輪","ライフジャケット","ライフセーバー","救助","安全"],
-	"⚓️":["いかり","船","ツール"],
-	"⛽️":["ガソリンスタンド","燃料","ガソリン","給油機","サービスステーション"],
+	"⚓":["いかり","船","ツール"],
+	"⛽":["ガソリンスタンド","燃料","ガソリン","給油機","サービスステーション"],
 	"🚧":["工事中","工事用フェンス","建設工事"],
 	"🚏":["バス停","バス","停止"],
 	"🚦":["縦向きの信号機","信号機","信号","交通"],
@@ -1011,30 +1011,30 @@
 	"🎡":["観覧車","アクティビティ","遊園地","エンターテイメント","フェリス"],
 	"🎢":["ジェットコースター","アクティビティ","遊園地","コースター","エンターテイメント","ローラー"],
 	"🎠":["メリーゴーランド","アクティビティ","メリーゴーラウンド","エンターテイメント","馬"],
-	"🏗️":["建設中","建物","建設"],
+	"🏗":["建設中","建物","建設"],
 	"🌁":["霧","天気"],
 	"🗼":["東京タワー","東京","タワー"],
 	"🏭":["工場","建物"],
-	"⛲️":["噴水"],
+	"⛲":["噴水"],
 	"🎑":["お月見","アクティビティ","お祝い","授賞式","エンターテイメント","月"],
-	"⛰️":["山"],
-	"🏔️":["雪山","寒い","山","雪"],
+	"⛰":["山"],
+	"🏔":["雪山","寒い","山","雪"],
 	"🗻":["富士山","山"],
 	"🌋":["火山","噴火","山","気象"],
 	"🗾":["日本列島","日本","地図"],
-	"🏕️":["キャンプ"],
-	"⛺️":["テント","キャンプ"],
-	"🏞️":["国立公園","公園"],
-	"🛣️":["高速道路","ハイウェイ","道路"],
-	"🛤️":["線路","鉄道","電車"],
+	"🏕":["キャンプ"],
+	"⛺":["テント","キャンプ"],
+	"🏞":["国立公園","公園"],
+	"🛣":["高速道路","ハイウェイ","道路"],
+	"🛤":["線路","鉄道","電車"],
 	"🌅":["日の出","朝","太陽","天候"],
 	"🌄":["山からの日の出","朝","山","太陽","日の出","天候"],
-	"🏜️":["砂漠"],
-	"🏖️":["ビーチと傘","ビーチ","傘","パラソル"],
-	"🏝️":["無人島","砂漠","島"],
+	"🏜":["砂漠"],
+	"🏖":["ビーチと傘","ビーチ","傘","パラソル"],
+	"🏝":["無人島","砂漠","島"],
 	"🌇":["ビルに沈む夕陽","建物","夕暮れ","太陽","夕日","天気"],
 	"🌆":["夕暮れの街並み","建物","街","夕暮れ","日暮れ","風景","太陽","夕日","天気"],
-	"🏙️":["街並み","建物","街"],
+	"🏙":["街並み","建物","街"],
 	"🌃":["星空","夜","星","天気"],
 	"🌉":["夜の橋","橋","夜","天気"],
 	"🌌":["天の川","宇宙","天気"],
@@ -1042,14 +1042,14 @@
 	"🎇":["線香花火","アクティビティ","お祝い","エンターテイメント","花火","キラキラ"],
 	"🎆":["花火","アクティビティ","お祝い","エンターテイメント"],
 	"🛖":["小屋","家","扇形庫","パオ"],
-	"🏘️":["家","建物"],
+	"🏘":["家","建物"],
 	"🏰":["西洋の城","建物","城","ヨーロッパ"],
 	"🏯":["日本の城","建物","城","日本"],
-	"🏟️":["スタジアム"],
+	"🏟":["スタジアム"],
 	"🗽":["自由の女神","自由","像"],
 	"🏠":["家","建物","自宅"],
 	"🏡":["庭付きの家","建物","庭","自宅","家"],
-	"🏚️":["廃墟","建物","廃屋","家"],
+	"🏚":["廃墟","建物","廃屋","家"],
 	"🏢":["オフィスビル","建物"],
 	"🏬":["デパート","建物","店"],
 	"🏣":["日本の郵便局","建物","日本","ポスト"],
@@ -1061,24 +1061,24 @@
 	"🏫":["学校","建物"],
 	"🏩":["ラブホテル","建物","ホテル","ラブ"],
 	"💒":["結婚式","アクティビティ","チャペル","ロマンス"],
-	"🏛️":["歴史的な建物","建物","歴史的な"],
-	"⛪️":["教会","建物","クリスチャン","十字架","宗教"],
+	"🏛":["歴史的な建物","建物","歴史的な"],
+	"⛪":["教会","建物","クリスチャン","十字架","宗教"],
 	"🕌":["モスク","イスラム","ムスリム","宗教"],
 	"🛕":["ヒンドゥー教寺院","ヒンドゥー教","寺院","宗教"],
 	"🕍":["シナゴーグ","ユダヤ人","ユダヤ教","宗教","会堂"],
 	"🕋":["カアバ","イスラム","ムスリム","宗教"],
-	"⛩️":["神社","宗教","神道"],
-	"⌚️":["腕時計","時計"],
+	"⛩":["神社","宗教","神道"],
+	"⌚":["腕時計","時計"],
 	"📱":["携帯電話","携帯","コミュニケーション","モバイル","電話"],
 	"📲":["着信中","矢印","通話","携帯","コミュニケーション","モバイル","携帯電話","受信","電話"],
 	"💻":["パソコン","ノートパソコン","コンピューター","パーソナル"],
-	"⌨️":["キーボード","コンピューター"],
-	"🖥️":["デスクトップパソコン","コンピューター","デスクトップ"],
-	"🖨️":["プリンター","コンピューター"],
-	"🖱️":["3ボタンマウス","3","ボタン","コンピューター","マウス","三"],
-	"🖲️":["トラックボール","コンピューター"],
-	"🕹️":["ジョイスティック","エンターテイメント","ゲーム","ビデオゲーム"],
-	"🗜️":["圧縮","ツール","欠陥"],
+	"⌨":["キーボード","コンピューター"],
+	"🖥":["デスクトップパソコン","コンピューター","デスクトップ"],
+	"🖨":["プリンター","コンピューター"],
+	"🖱":["3ボタンマウス","3","ボタン","コンピューター","マウス","三"],
+	"🖲":["トラックボール","コンピューター"],
+	"🕹":["ジョイスティック","エンターテイメント","ゲーム","ビデオゲーム"],
+	"🗜":["圧縮","ツール","欠陥"],
 	"💽":["MD","パソコン","光ディスク","エンターテイメント","ミニディスク","光学"],
 	"💾":["フロッピーディスク","コンピューター","ディスク","フロッピー"],
 	"💿":["CDディスク","ブルーレイ","CD","コンピューター","ディスク","DVD","光学"],
@@ -1088,23 +1088,23 @@
 	"📸":["フラッシュを焚いたカメラ","カメラ","フラッシュ","ビデオ"],
 	"📹":["ビデオカメラ","カメラ","エンターテイメント","ビデオ"],
 	"🎥":["ビデオカメラ","アクティビティ","カメラ","シネマ","エンターテイメント","映画"],
-	"📽️":["映写機","シネマ","娯楽","フィルム","映画","プロジェクター","ビデオ"],
-	"🎞️":["フィルムのフレーム","シネマ","エンターテイメント","フィルム","フレーム","映画"],
+	"📽":["映写機","シネマ","娯楽","フィルム","映画","プロジェクター","ビデオ"],
+	"🎞":["フィルムのフレーム","シネマ","エンターテイメント","フィルム","フレーム","映画"],
 	"📞":["受話器","コミュニケーション","電話","受信機"],
 	"☎️":["電話","携帯電話"],
 	"📟":["ポケットベル","コミュニケーション","ポケベル"],
 	"📠":["FAX","コミュニケーション; fAX"],
 	"📺":["テレビ","エンターテイメント","TV","ビデオ"],
 	"📻":["ラジオ","エンターテイメント","ビデオ"],
-	"🎙️":["スタジオマイク","マイク","音楽","スタジオ"],
-	"🎚️":["調節バー","調節","音楽","バー"],
-	"🎛️":["コントロールノブ","コントロール","つまみ","音楽"],
-	"⏱️":["ストップウォッチ","時計"],
-	"⏲️":["タイマー時計","時計","タイマー"],
+	"🎙":["スタジオマイク","マイク","音楽","スタジオ"],
+	"🎚":["調節バー","調節","音楽","バー"],
+	"🎛":["コントロールノブ","コントロール","つまみ","音楽"],
+	"⏱":["ストップウォッチ","時計"],
+	"⏲":["タイマー時計","時計","タイマー"],
 	"⏰":["目覚まし時計","アラーム","時計"],
-	"🕰️":["置き時計","時計"],
+	"🕰":["置き時計","時計"],
 	"⏳":["砂時計","砂","タイマー"],
-	"⌛️":["砂時計","砂","タイマー"],
+	"⌛":["砂時計","砂","タイマー"],
 	"🧮":["そろばん","計算","カウント","集計表","数学"],
 	"📡":["衛星アンテナ","アンテナ","コミュニケーション","パラボラアンテナ","衛星"],
 	"🔋":["電池","バッテリー","電子","高エネルギー"],
@@ -1112,10 +1112,10 @@
 	"🔌":["コンセント","電気","プラグ"],
 	"💡":["電球","漫画","電気","ひらめき","光"],
 	"🔦":["懐中電灯","電気","光","道具","たいまつ"],
-	"🕯️":["ろうそく","光"],
+	"🕯":["ろうそく","光"],
 	"🧯":["消火器","消火","火","消す"],
-	"🗑️":["ごみ箱","ゴミ箱","ごみ","ゴミ","缶","ビン"],
-	"🛢️":["ドラム缶","ドラム","オイル"],
+	"🗑":["ごみ箱","ゴミ箱","ごみ","ゴミ","缶","ビン"],
+	"🛢":["ドラム缶","ドラム","オイル"],
 	"🛒":["ショッピングカート","カート","ショッピング","トロリー"],
 	"💸":["羽の生えたお札","銀行","紙幣","請求書","ドル","飛ぶ","お金","羽"],
 	"💵":["ドル札","銀行","紙幣","お札","通貨","ドル","お金"],
@@ -1128,20 +1128,20 @@
 	"🪪":["身分証明書","資格情報","ID","ライセンス","セキュリティ"],
 	"🧾":["領収書","会計","簿記","証拠","証明"],
 	"💎":["宝石","ダイアモンド","ジュエル","ロマンス"],
-	"⚖️":["はかり","天秤","公正","てんびん座","物差し","道具","重量","星座"],
+	"⚖":["はかり","天秤","公正","てんびん座","物差し","道具","重量","星座"],
 	"🦯":["白杖","アクセシビリティ","目が不自由"],
 	"🧰":["道具箱","胸","整備士","工具"],
 	"🔧":["レンチ","道具"],
 	"🪛":["ドライバー","ねじ","工具"],
 	"🔨":["ハンマー","道具"],
-	"⚒️":["ハンマーとつるはし","ハンマー","つるはし","道具"],
-	"🛠️":["ハンマーとレンチ","ハンマー","道具","レンチ"],
-	"⛏️":["つるはし","採掘","道具"],
+	"⚒":["ハンマーとつるはし","ハンマー","つるはし","道具"],
+	"🛠":["ハンマーとレンチ","ハンマー","道具","レンチ"],
+	"⛏":["つるはし","採掘","道具"],
 	"🪓":["斧","たたき切り","手斧","割る","木材","工具"],
 	"🪚":["木工用のこぎり","大工","材木","のこぎり","工具"],
 	"🔩":["ナットとボルト","ボルト","ナット","道具"],
-	"⚙️":["歯車","ギア","道具"],
-	"⛓️":["鎖"],
+	"⚙":["歯車","ギア","道具"],
+	"⛓":["鎖"],
 	"🪝":["フック","わな","いかさま","ペテン","誘惑","フィッシング","ツール"],
 	"🪜":["はしご","登る","横木","段","工具"],
 	"🧱":["れんが","粘土","建設","モルタル","壁"],
@@ -1151,13 +1151,13 @@
 	"🧨":["爆竹","ダイナマイト","火薬","花火"],
 	"💣":["爆弾"],
 	"🔪":["包丁","キッチンナイフ","調理","ナイフ"],
-	"🗡️":["短剣","ナイフ"],
-	"⚔️":["交差した剣","交差","剣"],
-	"🛡️":["盾"],
+	"🗡":["短剣","ナイフ"],
+	"⚔":["交差した剣","交差","剣"],
+	"🛡":["盾"],
 	"🚬":["喫煙マーク","アクティビティ","喫煙"],
-	"⚰️":["棺","死"],
+	"⚰":["棺","死"],
 	"🪦":["墓石","墓地","死","墓","墓場","ハロウィーン"],
-	"⚱️":["骨壷","死","葬儀"],
+	"⚱":["骨壷","死","葬儀"],
 	"🏺":["アンフォラ","みずがめ座","料理","飲み物","水差し","道具","星座"],
 	"🔮":["水晶玉","玉","水晶","おとぎ話","ファンタジー","占い","道具"],
 	"🪄":["魔法の杖","魔法","棒","魔女","魔法使い"],
@@ -1166,22 +1166,22 @@
 	"🪬":["ハムサ","お守り","ファティマ","手","メアリー","ミリアム","保護"],
 	"💈":["理髪店の看板柱","理髪店","床屋","散髪","看板柱"],
 	"🧲":["磁石","アトラクション","馬蹄"],
-	"⚗️":["蒸留器","化学","実験","道具"],
+	"⚗":["蒸留器","化学","実験","道具"],
 	"🧪":["試験管","化学者","化学","実験","実験室","科学"],
 	"🧫":["ペトリ皿","バクテリア","生物学者","生物学","文化","実験室"],
 	"🧬":["DNA","生物学者","進化","遺伝子","遺伝子学","生命"],
 	"🔭":["望遠鏡","ツール"],
 	"🔬":["顕微鏡","ツール"],
-	"🕳️":["穴"],
+	"🕳":["穴"],
 	"🩻":["X線","骨","医師","医療","骨格"],
 	"💊":["薬","医師","ピル","病気"],
 	"💉":["注射器","医師","薬","注射針","注射","病気","道具","ワクチン"],
 	"🩸":["血1滴","医師","薬","血液","生理"],
 	"🩹":["ガーゼ付きばんそうこう","医師","薬","バンドエイド","包帯","ばんそうこう"],
 	"🩺":["聴診器","医師","薬","心臓"],
-	"🌡️":["温度計","天気","温度"],
+	"🌡":["温度計","天気","温度"],
 	"🩼":["松葉杖","杖","障碍","怪我","移動補助","棒"],
-	"🏷️":["ラベル","荷札"],
+	"🏷":["ラベル","荷札"],
 	"🔖":["ブックマーク","しおり","印"],
 	"🚽":["トイレ"],
 	"🪠":["プランジャー","フォースカップ","配管工","吸引","トイレ"],
@@ -1200,24 +1200,24 @@
 	"🧺":["バスケット","農業","ランドリー","ピクニック"],
 	"🪣":["バケツ","たる","手桶","大だる"],
 	"🔑":["鍵","錠","パスワード"],
-	"🗝️":["古い鍵","かぎ","鍵","錠","古い"],
+	"🗝":["古い鍵","かぎ","鍵","錠","古い"],
 	"🪤":["ネズミ捕り器","餌","ネズミ","齧歯動物","輪なわ","わな"],
-	"🛋️":["ソファーとランプ","ソファー","ホテル","ランプ"],
+	"🛋":["ソファーとランプ","ソファー","ホテル","ランプ"],
 	"🪑":["椅子","座席","座る"],
 	"🛌":["宿泊施設","寝る","ホテル","睡眠","ベッド"],
-	"🛏️":["ベッド","ホテル","睡眠"],
+	"🛏":["ベッド","ホテル","睡眠"],
 	"🚪":["ドア","扉"],
 	"🪞":["鏡","反射","反射体","反射鏡"],
 	"🪟":["窓","枠","新鮮な空気","ガラス","開口部","透明","視界"],
 	"🧳":["手荷物","パッキング","旅行","スーツケース"],
-	"🛎️":["卓上ベル","ベル","ホテル"],
-	"🖼️":["額に入った写真","アート","額縁","美術館","絵画","写真"],
+	"🛎":["卓上ベル","ベル","ホテル"],
+	"🖼":["額に入った写真","アート","額縁","美術館","絵画","写真"],
 	"🧭":["コンパス","磁石","ナビゲーション","オリエンテーリング"],
-	"🗺️":["世界地図","地図","世界"],
-	"⛱️":["立てられたパラソル","雨","晴れ","傘","天気"],
+	"🗺":["世界地図","地図","世界"],
+	"⛱":["立てられたパラソル","雨","晴れ","傘","天気"],
 	"🪭":["折り畳み扇子","冷却","遠慮がち","ダンス","ファン","フラッター","熱","熱い","内気","広がる"],
 	"🗿":["モヤイ像","モアイ像","顔","像"],
-	"🛍️":["買い物袋","鞄","ホテル","買い物"],
+	"🛍":["買い物袋","鞄","ホテル","買い物"],
 	"🎈":["風船","アクティビティ","お祝い","エンターテイメント"],
 	"🎏":["こいのぼり","アクティビティ","鯉","お祝い","エンターテイメント","旗","吹流し"],
 	"🎀":["リボン","お祝い"],
@@ -1255,17 +1255,17 @@
 	"📄":["文書","ページ"],
 	"📅":["カレンダー","日付"],
 	"📆":["日めくりカレンダー","カレンダー"],
-	"🗓️":["リングカレンダー","カレンダー","パッド","らせん状"],
+	"🗓":["リングカレンダー","カレンダー","パッド","らせん状"],
 	"📇":["名刺フォルダ","カード","索引","ローラデックス"],
-	"🗃️":["カードファイル","箱","カード","ファイル"],
-	"🗳️":["投票用紙と投票箱","投票用紙","箱","票","投票"],
-	"🗄️":["ファイル収納庫","収納","ファイル"],
+	"🗃":["カードファイル","箱","カード","ファイル"],
+	"🗳":["投票用紙と投票箱","投票用紙","箱","票","投票"],
+	"🗄":["ファイル収納庫","収納","ファイル"],
 	"📋":["クリップボード"],
-	"🗒️":["リングノート","ノート","パッド","らせん状"],
+	"🗒":["リングノート","ノート","パッド","らせん状"],
 	"📁":["フォルダ","ファイル"],
 	"📂":["開いたフォルダ","ファイル","フォルダ","開いた"],
-	"🗂️":["仕切りカード","カード","仕切り","索引"],
-	"🗞️":["丸めた新聞","ニュース","新聞","紙","丸めた"],
+	"🗂":["仕切りカード","カード","仕切り","索引"],
+	"🗞":["丸めた新聞","ニュース","新聞","紙","丸めた"],
 	"📰":["新聞","コミュニケーション","ニュース","紙"],
 	"🪧":["プラカード","デモ","柵","抗議","看板"],
 	"📓":["ノート"],
@@ -1279,7 +1279,7 @@
 	"📖":["開いた本","本","開いた"],
 	"🔗":["リンク"],
 	"📎":["クリップ","ペーパークリップ"],
-	"🖇️":["繋がったペーパークリップ","コミュニケーション","リンク","ペーパークリップ"],
+	"🖇":["繋がったペーパークリップ","コミュニケーション","リンク","ペーパークリップ"],
 	"✂️":["ハサミ","はさみ","道具"],
 	"📐":["三角定規","定規","配置","三角"],
 	"📏":["定規","直定規"],
@@ -1294,13 +1294,13 @@
 	"🔒":["鍵","閉じられた","施錠"],
 	"🔓":["解錠","施錠","開ける"],
 	"🔏":["錠前とペン","インク","錠","ペン先","ペン","プライバシー"],
-	"🖊️":["左下向きのボールペン","ボールペン","コミュニケーション","ペン"],
-	"🖋️":["左下向きの万年筆","コミュニケーション","万年筆","ペン"],
+	"🖊":["左下向きのボールペン","ボールペン","コミュニケーション","ペン"],
+	"🖋":["左下向きの万年筆","コミュニケーション","万年筆","ペン"],
 	"✒️":["ペン先","ペン"],
 	"📝":["メモ","コミュニケーション","鉛筆"],
 	"✏️":["鉛筆"],
-	"🖍️":["左下向きのクレヨン","コミュニケーション","クレヨン"],
-	"🖌️":["左下向きのブラシ","コミュニケーション","ペイントブラシ","絵"],
+	"🖍":["左下向きのクレヨン","コミュニケーション","クレヨン"],
+	"🖌":["左下向きのブラシ","コミュニケーション","ペイントブラシ","絵"],
 	"🔍":["左向き虫眼鏡","眼鏡","拡大","検索","ツール"],
 	"🔎":["右向き虫眼鏡","眼鏡","拡大","検索","ツール"],
 	"❤️":["赤色のハート","ハート"],
@@ -1313,7 +1313,7 @@
 	"🖤":["黒いハート","ハート","黒","悪","悪者"],
 	"🤍":["白のハート","ハート","白"],
 	"💔":["割れたハート","ハート","壊れる","破局"],
-	"❣️":["ハートのビックリマーク","ハート","ビックリマーク","記号"],
+	"❣":["ハートのビックリマーク","ハート","ビックリマーク","記号"],
 	"💕":["2つのハート","ハート","愛"],
 	"💞":["回転するハート","ハート","回転"],
 	"💓":["鼓動するハート","ハート","鼓動","ドキドキ"],
@@ -1324,40 +1324,40 @@
 	"❤️‍🔥":["燃えているハート","ハート","火","燃える","愛","熱情","神聖なハート"],
 	"❤️‍🩹":["手当しているハート","ハート","健康になる","改善している","手当している","回復している","病み上がり","元気"],
 	"💟":["ハートのデコレーション","ハート"],
-	"☮️":["ピースマーク","平和"],
-	"✝️":["ラテン十字","クリスチャン","十字架","宗教"],
-	"☪️":["星と三日月","イスラム","ムスリム","宗教"],
-	"🕉️":["オームマーク","ヒンドゥー教","オーム","宗教"],
-	"☸️":["法輪","仏教徒","ダーマ","宗教"],
-	"✡️":["ダビデの星","ダビデ","ユダヤ人","ユダヤ教","宗教","星"],
+	"☮":["ピースマーク","平和"],
+	"✝":["ラテン十字","クリスチャン","十字架","宗教"],
+	"☪":["星と三日月","イスラム","ムスリム","宗教"],
+	"🕉":["オームマーク","ヒンドゥー教","オーム","宗教"],
+	"☸":["法輪","仏教徒","ダーマ","宗教"],
+	"✡":["ダビデの星","ダビデ","ユダヤ人","ユダヤ教","宗教","星"],
 	"🔯":["六芒星","占い","星"],
 	"🕎":["ハヌッキーヤー","燭台","メノーラー","宗教"],
-	"☯️":["陰陽","宗教","道","道家","陽","陰"],
-	"☦️":["八端十字架","クリスチャン","十字架","宗教"],
+	"☯":["陰陽","宗教","道","道家","陽","陰"],
+	"☦":["八端十字架","クリスチャン","十字架","宗教"],
 	"🪯":["カンダ","宗教","シーク教徒"],
 	"🛐":["礼拝所","宗教","礼拝"],
 	"⛎":["へびつかい座","運搬人","蛇","ヘビ","星座"],
-	"♈️":["おひつじ座","仔羊","星座"],
-	"♉️":["おうし座","牡牛","雄牛","星座"],
-	"♊️":["ふたご座","ふたご","星座"],
-	"♋️":["ガン","かに座","カニ","蟹","星座"],
-	"♌️":["しし座","ライオン","星座"],
-	"♍️":["おとめ座","乙女","処女","星座"],
-	"♎️":["てんびん座","天秤","公正","はかり","星座"],
-	"♏️":["さそり座","さそり","サソリ","星座"],
-	"♐️":["いて座","射手","射手座","星座"],
-	"♑️":["やぎ座","ヤギ","星座"],
-	"♒️":["みずがめ座","運搬人","水","星座"],
-	"♓️":["うお座","魚","星座"],
+	"♈":["おひつじ座","仔羊","星座"],
+	"♉":["おうし座","牡牛","雄牛","星座"],
+	"♊":["ふたご座","ふたご","星座"],
+	"♋":["ガン","かに座","カニ","蟹","星座"],
+	"♌":["しし座","ライオン","星座"],
+	"♍":["おとめ座","乙女","処女","星座"],
+	"♎":["てんびん座","天秤","公正","はかり","星座"],
+	"♏":["さそり座","さそり","サソリ","星座"],
+	"♐":["いて座","射手","射手座","星座"],
+	"♑":["やぎ座","ヤギ","星座"],
+	"♒":["みずがめ座","運搬人","水","星座"],
+	"♓":["うお座","魚","星座"],
 	"🆔":["四角囲みID","ID","識別"],
-	"⚛️":["元素記号","無神論者","原子"],
+	"⚛":["元素記号","無神論者","原子"],
 	"⚕️":["アスクレピオスの杖","健康","世話","医師","薬","杖","ヘビ"],
-	"☢️":["放射能標識","放射能"],
-	"☣️":["バイオハザード標識","生物災害"],
+	"☢":["放射能標識","放射能"],
+	"☣":["バイオハザード標識","生物災害"],
 	"📴":["携帯電話電源オフ","携帯","コミュニケーション","モバイル","オフ","携帯電話","電話"],
 	"📳":["マナーモード","携帯","コミュニケーション","モバイル","モード","携帯電話","電話","バイブレーション"],
 	"🈶":["四角囲み有","日本語","あり"],
-	"🈚️":["四角囲み無","四角囲み否","日本語","なし"],
+	"🈚":["四角囲み無","四角囲み否","日本語","なし"],
 	"🈸":["四角囲み申","四角囲み適","中国語","申請"],
 	"🈺":["四角囲み営","中国語","営業"],
 	"🈷️":["四角囲み月","日本語","月極"],
@@ -1378,11 +1378,11 @@
 	"🆑":["四角囲みCL","CL"],
 	"🅾️":["黒四角囲みO","血液型","O"],
 	"🆘":["四角囲みSOS","ヘルプ","SOS"],
-	"⛔️":["立入禁止","立ち入り","禁止","だめ","できない","禁じる","交通"],
+	"⛔":["立入禁止","立ち入り","禁止","だめ","できない","禁じる","交通"],
 	"📛":["名札","バッジ","名前"],
 	"🚫":["進入禁止","立ち入り","禁止","だめ","できない","禁じる"],
 	"❌":["バツ印","キャンセル","記号","掛け算","乗算","x"],
-	"⭕️":["太い大きな丸","丸","O"],
+	"⭕":["太い大きな丸","丸","O"],
 	"💢":["怒りマーク","怒り","漫画","激怒"],
 	"♨️":["温泉","温かい","湧き出る","蒸気"],
 	"🚷":["歩行者立入禁止","禁止","だめ","ない","歩行者","禁じる"],
@@ -1392,7 +1392,7 @@
 	"🔞":["18歳未満禁止","18","年齢制限","十八","禁止","だめ","ない","禁止した","未成年者"],
 	"📵":["携帯電話禁止","携帯","通信","禁止","モバイル","だめ","できない","携帯電話","禁止されている","電話"],
 	"🚭":["禁煙","禁止","だめ","できない","禁止されている","喫煙"],
-	"❗️":["赤いビックリマーク","ビックリ","マーク","記号"],
+	"❗":["赤いビックリマーク","ビックリ","マーク","記号"],
 	"❕":["白いビックリマーク","ビックリ","マーク","囲み","記号"],
 	"❓":["赤いはてなマーク","マーク","記号","はてな"],
 	"❔":["白いはてなマーク","マーク","囲み","記号","はてな"],
@@ -1402,13 +1402,13 @@
 	"🔅":["低輝度","明るさ","薄暗い","低"],
 	"🔆":["高輝度","明るい","明るさ"],
 	"🔱":["トライデント","いかり","エンブレム","船","工具"],
-	"⚜️":["ユリの紋章"],
+	"⚜":["ユリの紋章"],
 	"〽️":["庵点","印","部分"],
 	"⚠️":["警告"],
 	"🚸":["交差点を渡る子供たち","子供","交差点","歩行者","交通"],
 	"🔰":["初心者マーク","初心者","マーク","緑","日本","若葉","道具","黄"],
 	"♻️":["リサイクルマーク","リサイクル"],
-	"🈯️":["四角囲み指","日本語"],
+	"🈯":["四角囲み指","日本語"],
 	"💹":["上昇トレンドのチャートと円記号","上昇中円チャート","銀行","チャート","通貨","グラフ","成長","市場","お金","上昇","トレンド","上向き","円"],
 	"❇️":["キラキラ"],
 	"✳️":["アスタリスク (8本構成)","アスタリスク"],
@@ -1422,7 +1422,7 @@
 	"Ⓜ️":["丸囲みM","円","M"],
 	"🏧":["ATM","ATM記号","自動","銀行","出納"],
 	"🚾":["トイレ","化粧室","お手洗い","水","WC"],
-	"♿️":["車いす","アクセス","車椅子"],
+	"♿":["車いす","アクセス","車椅子"],
 	"🅿️":["黒四角囲みP","駐車場"],
 	"🈳":["四角囲み空","四角囲みの空","中国語","空室","空き","空車"],
 	"🈂️":["四角囲みサ","日本人","サービス"],
@@ -1450,26 +1450,26 @@
 	"🆒":["COOL","かっこいい","クール"],
 	"🆕":["四角囲みnew","新"],
 	"🆓":["四角囲みFREE","フリー","無料"],
-	"0⃣":["0キー","0","キー","ゼロ"],
-	"1⃣":["1キー","１","キー","一"],
-	"2⃣":["2キー","2","キー","ニ"],
-	"3⃣":["3キー","3","キー","三"],
-	"4⃣":["4キー","4","四","キー"],
-	"5⃣":["5キー","5","五","キー"],
-	"6⃣":["6キー","6","キー","六"],
-	"7⃣":["7キー","7","キー","七"],
-	"8⃣":["8キー","8","八","キー"],
-	"9⃣":["9キー","9","キー","九"],
+	"0️⃣":["0キー","0","キー","ゼロ"],
+	"1️⃣":["1キー","１","キー","一"],
+	"2️⃣":["2キー","2","キー","ニ"],
+	"3️⃣":["3キー","3","キー","三"],
+	"4️⃣":["4キー","4","四","キー"],
+	"5️⃣":["5キー","5","五","キー"],
+	"6️⃣":["6キー","6","キー","六"],
+	"7️⃣":["7キー","7","キー","七"],
+	"8️⃣":["8キー","8","八","キー"],
+	"9️⃣":["9キー","9","キー","九"],
 	"🔟":["10キー","10","キー","十"],
 	"🔢":["番号の入力記号","1234","入力","数字"],
 	"▶️":["右向き三角","再生ボタン","矢印","再生","右","三角形"],
-	"⏸️":["2本の垂直バー","一時停止ボタン","バー","2倍","一時停止","垂直"],
-	"⏯️":["右向きの三角形と二重垂直棒","再生または一時停止ボタン","矢印","一時停止","再生","右","三角形"],
-	"⏹️":["停止","停止ボタン","四角"],
-	"⏺️":["録画","録画ボタン","丸"],
+	"⏸":["2本の垂直バー","一時停止ボタン","バー","2倍","一時停止","垂直"],
+	"⏯":["右向きの三角形と二重垂直棒","再生または一時停止ボタン","矢印","一時停止","再生","右","三角形"],
+	"⏹":["停止","停止ボタン","四角"],
+	"⏺":["録画","録画ボタン","丸"],
 	"⏏️":["取り出しマーク","取り出しボタン"],
-	"⏭️":["右向きの二重三角形と垂直棒","「次の曲」ボタン","矢印","次の場面","次の曲","三角形"],
-	"⏮️":["左向きの二重三角形と垂直棒","「前の曲」ボタン","矢印","前の場面","前の曲","三角形"],
+	"⏭":["右向きの二重三角形と垂直棒","「次の曲」ボタン","矢印","次の場面","次の曲","三角形"],
+	"⏮":["左向きの二重三角形と垂直棒","「前の曲」ボタン","矢印","前の場面","前の曲","三角形"],
 	"⏩":["右向きの二重三角形","早送りボタン","矢印","2倍","高速","進む"],
 	"⏪":["左向きの二重三角形","早戻しボタン","矢印","2倍","巻き戻し"],
 	"🔀":["ねじり右向き矢印の絵文字","シャッフル","矢印","交差"],
@@ -1496,7 +1496,7 @@
 	"🔃":["ループ矢印","時計の針","矢印","時計回り","リロード"],
 	"⤴️":["右上へカーブする矢印","上へカーブする右矢印","矢印"],
 	"⤵️":["右下へカーブする矢印","下にカーブする右矢印","矢印","下"],
-	"#⃣":["#キー","ハッシュ","キー","ポンド"],
+	"#️⃣":["#キー","ハッシュ","キー","ポンド"],
 	"*⃣":["アスタリスクキー","アスタリスク","キー","星"],
 	"ℹ️":["情報源","i","インフォメーション"],
 	"🔤":["アルファベット入力","abc","アルファベット","入力","ラテン","文字"],
@@ -1532,8 +1532,8 @@
 	"🔵":["青丸","青","円","幾何学"],
 	"🟣":["紫の丸","円","幾何学","紫"],
 	"🟤":["茶色の丸","円","幾何学","茶色"],
-	"⚫️":["黒丸","円","幾何学"],
-	"⚪️":["白丸","円","幾何学"],
+	"⚫":["黒丸","円","幾何学"],
+	"⚪":["白丸","円","幾何学"],
 	"🟥":["赤の正方形","正方形","幾何学","赤"],
 	"🟧":["オレンジ色の正方形","正方形","幾何学","オレンジ"],
 	"🟨":["黄色の正方形","正方形","幾何学","黄色"],
@@ -1541,12 +1541,12 @@
 	"🟦":["青の正方形","正方形","幾何学","青"],
 	"🟪":["紫の正方形","正方形","幾何学","紫"],
 	"🟫":["茶色の正方形","正方形","幾何学","茶色"],
-	"⬛️":["黒い大きな四角","幾何学","正方形"],
-	"⬜️":["白い大きな四角","幾何学","正方形"],
+	"⬛":["黒い大きな四角","幾何学","正方形"],
+	"⬜":["白い大きな四角","幾何学","正方形"],
 	"◼️":["黒い中くらいの四角","幾何学","正方形"],
 	"◻️":["白くて中くらいの四角","幾何学","正方形"],
-	"◾️":["黒くて中くらいの小さい四角","幾何学","正方形"],
-	"◽️":["白い中くらいの小さな四角","幾何学","正方形"],
+	"◾":["黒くて中くらいの小さい四角","幾何学","正方形"],
+	"◽":["白い中くらいの小さな四角","幾何学","正方形"],
 	"▪️":["黒い小さな四角","幾何学","正方形"],
 	"▫️":["白い小さな四角","幾何学","正方形"],
 	"🔸":["小さいオレンジのダイヤモンド","ダイヤモンド","幾何学","オレンジ"],
@@ -1566,16 +1566,16 @@
 	"🔔":["ベル"],
 	"🔕":["ミュート","スラッシュベル","鐘","禁じられた","だめ","ない","禁止","静か"],
 	"🃏":["トランプのジョーカー","カード","エンターテイメント","ゲーム","ジョーカー","プレイ"],
-	"🀄️":["麻雀牌の中","ゲーム","麻雀","赤"],
+	"🀄":["麻雀牌の中","ゲーム","麻雀","赤"],
 	"♠️":["トランプのスペード","カード","ゲーム","スペード","スーツ"],
 	"♣️":["トランプのクラブ","カード","クラブ","ゲーム","スーツ"],
 	"♥️":["トランプのハート","カード","ゲーム","ハート","スーツ"],
 	"♦️":["トランプのダイヤ","カード","ダイヤ","ダイヤモンド","ゲーム","スーツ"],
 	"🎴":["花札","アクティビティ","カード","エンターテイメント","花","ゲーム","日本","プレイ"],
 	"👁‍🗨":["吹き出しの目","吹き出し","目","スピーチ","証人"],
-	"🗨️":["左向きの吹き出し","セリフ","スピーチ"],
+	"🗨":["左向きの吹き出し","セリフ","スピーチ"],
 	"💭":["考え吹き出し","吹き出し","泡","漫画","考え"],
-	"🗯️":["右向きの怒りの吹き出し","怒り","吹き出し","泡","激怒"],
+	"🗯":["右向きの怒りの吹き出し","怒り","吹き出し","泡","激怒"],
 	"💬":["吹き出し","泡","漫画","セリフ","スピーチ"],
 	"🕐":["1時","0分","1","時計","時","一"],
 	"🕑":["2時","0分","2","時計","時","二"],
@@ -1601,7 +1601,7 @@
 	"🕥":["10時半","10時","半","時刻","十","30"],
 	"🕦":["11時半","11時","半","時刻","十一","30"],
 	"🕧":["12時半","12時","半","時刻","30","十二"],
-	"🏳️":["なびく白旗","旗","なびく"],
+	"🏳":["なびく白旗","旗","なびく"],
 	"🏴":["なびく黒旗","旗","なびく"],
 	"🏁":["チェッカーフラッグ","市松模様","旗","レース"],
 	"🚩":["三角旗","旗","ポスト"],
@@ -1861,5 +1861,6 @@
 	"🇾🇹":["マヨットの旗","国旗","マヨット"],
 	"🇿🇦":["南アフリカ国旗","国旗","南","南アフリカ"],
 	"🇿🇲":["ザンビア国旗","国旗","ザンビア"],
-	"🇿🇼":["ジンバブエ国旗","国旗","ジンバブエ"]
+	"🇿🇼":["ジンバブエ国旗","国旗","ジンバブエ"],
+	"": ["渋谷109", "SHIBUYA109", "109"]
 }
diff --git a/packages/frontend/src/unicode-emoji-indexes/ja-JP_hira.json b/packages/frontend/src/unicode-emoji-indexes/ja-JP_hira.json
index 35e028627a..2ad282d501 100644
--- a/packages/frontend/src/unicode-emoji-indexes/ja-JP_hira.json
+++ b/packages/frontend/src/unicode-emoji-indexes/ja-JP_hira.json
@@ -61,7 +61,7 @@
 	"😔": ["かなしげなかお","がっかり","かお","かなしい"],
 	"😕": ["こまったかお","こまった","かお"],
 	"🙁": ["ごきげんななめ","かお","しかめっつら","かなしい","ふこう"],
-	"☹️": ["しかめっつら","かお","かなしい","ふこう"],
+	"☹": ["しかめっつら","かお","かなしい","ふこう"],
 	"😬": ["しかめっつら","かお"],
 	"🥺": ["うったえかけるかお","かお","ものごい","じひ","こいぬのめ"],
 	"😣": ["がまんしているかお","かお","がんばる"],
@@ -111,7 +111,7 @@
 	"💩": ["うんち","まんが","ふん","かお","もんすたー"],
 	"👻": ["おばけ","ようかい","かお","おとぎばなし","ふぁんたじー","ゆうれい","もんすたー","はろうぃーん"],
 	"💀": ["どくろ","からだ","し","かお","おとぎばなし","もんすたー","がいこつ","はろうぃーん"],
-	"☠️": ["どくろまーく","からだ","こうさしたほね","し","かお","もんすたー","がいこつ","はろうぃーん"],
+	"☠": ["どくろまーく","からだ","こうさしたほね","し","かお","もんすたー","がいこつ","はろうぃーん"],
 	"👽": ["うちゅうじん","かいじゅう","いせいじん","かお","おとぎばなし","ふぁんたじー","もんすたー","うちゅう","UFO"],
 	"🤖": ["ろぼっとのかお","かお","もんすたー","ろぼっと"],
 	"🎃": ["じゃっく・お・らんたん","いべんと","おいわい","えんため","はろうぃん","じゃっくおらんたん","らんたん","かぼちゃ"],
@@ -138,7 +138,7 @@
 	"🤛": ["ひだりむきのこぶし","からだ","こぶし","ひだりむき"],
 	"🤜": ["みぎむきのこぶし","からだ","こぶし","みぎむき"],
 	"🤞": ["こうささせたゆび","からだ","こうさ","ゆび","て","こううん"],
-	"✌️": ["Vさいん","からだ","て","V","ぶい","かつ","しょうり","ぴーす"],
+	"✌": ["Vさいん","からだ","て","V","ぶい","かつ","しょうり","ぴーす"],
 	"🫰": ["ひとさしゆびとおやゆびをこうさしたて","たかい","はーと","あい","おかね","すなっぷ"],
 	"🤘": ["こるな","からだ","ゆび","て","つの","さいこう"],
 	"🤟": ["あいしてるのじぇすちゃー","からだ","あいしてる","すき","て"],
@@ -151,10 +151,10 @@
 	"👉": ["ゆびさし","てのこう","からだ","ゆび","て","ひとさしゆび","ゆびさす"],
 	"👆": ["ゆびさし","てのこう","からだ","ゆび","て","ひとさしゆび","ゆびさす","うえ"],
 	"👇": ["ゆびさし","てのこう","からだ","した","ゆび","て","ひとさしゆび","ゆびさす"],
-	"☝️": ["ゆびさし","からだ","ゆび","て","ひとさしゆび","ゆびさす","うえ"],
+	"☝": ["ゆびさし","からだ","ゆび","て","ひとさしゆび","ゆびさす","うえ"],
 	"✋": ["きょしゅ","からだ","て"],
 	"🤚": ["てのこう","からだ","あげる"],
-	"🖐️": ["ひろげたてのひら","からだ","ゆび","て","ひろげる"],
+	"🖐": ["ひろげたてのひら","からだ","ゆび","て","ひろげる"],
 	"🖖": ["ちょうじゅとはんえいを","からだ","ゆび","て","すぽっく","ばるかん"],
 	"👋": ["ばいばい","からだ","て","ふる","やっほー","こんにちは"],
 	"🤙": ["でんわのかたちのて","からだ","でんわ","て"],
@@ -166,7 +166,7 @@
 	"🦾": ["めかにかるあーむ","あくせしびりてぃ","ぎしゅ","じんこうそうぐ","からだ"],
 	"🖕": ["なかゆびをたてたて","からだ","ゆび","て","なかゆび"],
 	"🫵": ["みているひとをさしているひとさしゆび","さす","あなた","ゆび"],
-	"✍️": ["かいているて","からだ","て","かく"],
+	"✍": ["かいているて","からだ","て","かく"],
 	"🤳": ["じどり","かめら","けいたい","うで"],
 	"💅": ["まにきゅあ","からだ","けあ","けしょうひん","こすめ","つめ","ねいる"],
 	"🦵": ["あし","からだ","きっく","てあし"],
@@ -179,7 +179,7 @@
 	"👂": ["みみ","からだ","はな"],
 	"🦻": ["ほちょうきをつけているみみ","あくせしびりてぃ","ほちょうき","きく","からだ","みみ"],
 	"👃": ["はな","からだ"],
-	"👁️": ["め","からだ"],
+	"👁": ["め","からだ"],
 	"👀": ["め","からだ","かお"],
 	"🧠": ["のう","からだ","ぞうき","ちてき","かしこい"],
 	"🫀": ["かいぼうがくてきなしんぞう","かいぼうがく","しんぞうがく","しんぞう","ぞうき","みゃく"],
@@ -187,7 +187,7 @@
 	"🦴": ["ほね","からだ","こっかく"],
 	"👤": ["じょうはんしんのしるえっと","じょうはんしん","しるえっと"],
 	"👥": ["じょうはんしんのしるえっと","じょうはんしん","しるえっと"],
-	"🗣️": ["しゃべるあたまのしるえっと","かお","あたま","しるえっと","しゃべる","はなす"],
+	"🗣": ["しゃべるあたまのしるえっと","かお","あたま","しるえっと","しゃべる","はなす"],
 	"🫂": ["はぐしているひとたち","さようなら","こんにちは","はぐ","ありがとう"],
 	"👶": ["あかちゃん"],
 	"👧": ["おんなのこ","しょうじょ","しょじょ","おとめざ","せいざ","こども"],
@@ -281,7 +281,7 @@
 	"💂‍♂️": ["だんせいけいびいん","けいびいん","けいび","おとこ","だんせい"],
 	"🥷": ["にんじゃ","せんし","かくされた","すてるす"],
 	"🕵️‍♀️": ["じょせいのたんてい","たんてい","けいじ","すぱい","じょせい","おんな"],
-	"🕵️": ["たんてい","けいじ","すぱい"],
+	"🕵": ["たんてい","けいじ","すぱい"],
 	"🕵️‍♂️": ["だんせいのたんてい","たんてい","けいじ","すぱい","おとこ","だんせい"],
 	"🤶": ["みせす・くろーす","いべんと","おいわい","くりすます","はは","さんた","くろーす","じょせい","おんな"],
 	"🧑‍🎄": ["みくすくろーす","あくてぃびてぃ","おいわい","くりすます","さんた","くろーす"],
@@ -300,7 +300,7 @@
 	"🩵": ["らいとぶるーのはーと","しあん","はーと","らいとぶるー","こがも"],
 	"🩶": ["ぐれーのはーと","ぐれー","はーと","しるばー","すれーと"],
 	"🕴️‍♀️": ["ちゅうにういたすーつのじょせい","びじねす","すーつ","じょせい","おんな"],
-	"🕴️": ["ちゅうにういたすーつのひと","びじねす","すーつ"],
+	"🕴": ["ちゅうにういたすーつのひと","びじねす","すーつ"],
 	"🕴️‍♂️": ["ちゅうにういたすーつのだんせい","びじねす","すーつ","おとこ","だんせい"],
 	"🦸‍♀️": ["じょせいのすーぱーひーろー","くうそう","ぜん","ひろいん","ちょうたいこく","じょせい","おんな"],
 	"🦸": ["すーぱーひーろー","くうそう","ぜん","ひーろー","ひろいん","ちょうたいこく"],
@@ -468,7 +468,7 @@
 	"🎩": ["しるくはっと","あくてぃびてぃ","ふく","えんたーていんめんと","ごらく","ぼうし","とっぷす"],
 	"🎓": ["そつぎょうしきのかくぼう","あくてぃびてぃ","ぼうし","おいわい","ふく","そつぎょう","はっと"],
 	"👑": ["かんむり","ふく","おうかん","おう","じょおう"],
-	"⛑️": ["しろじゅうじのへるめっと","きゅうじょ","じゅうじ","かお","ぼうし","へるめっと"],
+	"⛑": ["しろじゅうじのへるめっと","きゅうじょ","じゅうじ","かお","ぼうし","へるめっと"],
 	"🪖": ["ぐんたいのへるめっと","ぐん","へるめっと","ぐんたい","ぐんじん","へいし"],
 	"🎒": ["らんどせる","あくてぃびてぃ","かばん","ばっぐ","がくせいかばん","がっこう"],
 	"👝": ["ぽーち","かばん","ばっぐ","ふく"],
@@ -476,13 +476,13 @@
 	"👜": ["はんどばっぐ","かばん","ばっぐ","ふく"],
 	"💼": ["ぶりーふけーす"],
 	"👓": ["めがね","ふく","め","あいうぇあ"],
-	"🕶️": ["さんぐらす","くらい","め","めがね"],
+	"🕶": ["さんぐらす","くらい","め","めがね"],
 	"🥽": ["ごーぐる","ふく","めのほご","すいえい","ようせつ"],
 	"🧣": ["すかーふ","ふく","くび"],
 	"🧤": ["てぶくろ","ふく","て"],
 	"💍": ["ゆびわ","だいやもんど","れんあい","ろまんす"],
 	"🌂": ["とじたかさ","ふく","あめ","かさ","てんき"],
-	"☂️": ["かさ","ふく","あめ","てんき"],
+	"☂": ["かさ","ふく","あめ","てんき"],
 	"🐶": ["いぬのかお","けん","いぬ","かお","ぺっと"],
 	"🐱": ["ねこのかお","ねこ","かお","ぺっと"],
 	"🐭": ["ねずみのかお","かお","ねずみ"],
@@ -536,8 +536,8 @@
 	"🐜": ["あり","こんちゅう"],
 	"🦗": ["くりけっと","こおろぎ","ばっため","こんちゅう"],
 	"🪳": ["ごきぶり","こんちゅう","がいちゅう"],
-	"🕷️": ["くも","こんちゅう"],
-	"🕸️": ["くものす","くも","す"],
+	"🕷": ["くも","こんちゅう"],
+	"🕸": ["くものす","くも","す"],
 	"🦂": ["さそり","さそりざ","せいざ"],
 	"🦟": ["か","びょうき","ねつ","こんちゅう","まらりあ","ういるす"],
 	"🪰": ["はえ","がいちゅう","こんちゅう","うじむし"],
@@ -584,7 +584,7 @@
 	"🦇": ["こうもり","きゅうけつき"],
 	"🐓": ["おんどり"],
 	"🦃": ["しちめんちょう（とり）","しちめんちょう","とり"],
-	"🕊️": ["へいわのはと","とり","はと","ひこう","へいわ"],
+	"🕊": ["へいわのはと","とり","はと","ひこう","へいわ"],
 	"🦅": ["わし","とり"],
 	"🦆": ["あひる","とり"],
 	"🪿": ["がちょう","とり","かきん","けいてきのおと"],
@@ -605,7 +605,7 @@
 	"🐇": ["うさぎ","ばにー","ぺっと"],
 	"🐀": ["ねずみ"],
 	"🐁": ["ねずみ"],
-	"🐿️": ["しまりす"],
+	"🐿": ["しまりす"],
 	"🦨": ["すかんく","あくしゅう","におう"],
 	"🦡": ["あなぐま","らーてる","ねだる"],
 	"🦔": ["はりねずみ","かお"],
@@ -622,7 +622,7 @@
 	"🪴": ["はちうえ","しょくぶつ","かんようしょくぶつ"],
 	"🌱": ["なえぎ","しょくぶつ","わかい"],
 	"🌿": ["はーぶ","は","しょくぶつ"],
-	"☘️": ["くろーばー","しょくぶつ"],
+	"☘": ["くろーばー","しょくぶつ"],
 	"🍀": ["よっつはのくろーばー","4","くろーばー","よん","は","しょくぶつ"],
 	"🎍": ["かどまつ","あくてぃびてぃ","たけ","おいわい","にっぽん","まつ","しょくぶつ"],
 	"🎋": ["ななゆう","あくてぃびてぃ","はた","おいわい","えんたーていめんと","にっぽん"],
@@ -661,35 +661,35 @@
 	"🌝": ["かおつきまんげつ","あかるい","かお","みちた","つき","うちゅう","てんき"],
 	"🌛": ["かおつきじょうげんのつき","かお","つき","げん","うちゅう","てんき"],
 	"🌜": ["がおがあるかげんのつき","かお","つき","げん","うちゅう","てんき"],
-	"⭐️": ["ちゅうくらいのほし","ほし"],
+	"⭐": ["ちゅうくらいのほし","ほし"],
 	"🌟": ["ひかるほし","きらめき","あかいひかり","かがやく","かがやき","ほし"],
 	"💫": ["くらくら","まんが","めまい","ほし"],
 	"✨": ["きらきら","えんたーていめんと","かがやき","ほし"],
-	"☄️": ["すいせい","うちゅう"],
+	"☄": ["すいせい","うちゅう"],
 	"🪐": ["たまきのあるわくせい","うちゅう","わくせい","どせい"],
 	"🌞": ["かおつきたいよう","あかるい","かお","うちゅう","たいよう","てんき"],
 	"☀️": ["たいようのひかり","あかるい","こうせん","うちゅう","たいよう","せいてん","てんき"],
-	"🌤️": ["たいようとちいさなくも","くも","たいよう","てんき"],
-	"⛅️": ["はれときどきくもり","くも","たいよう","てんき"],
-	"🌥️": ["はれのちくもり","くも","たいよう","てんき"],
-	"🌦️": ["はれのちくもりときどきあめ","くも","あめ","たいよう","てんき"],
+	"🌤": ["たいようとちいさなくも","くも","たいよう","てんき"],
+	"⛅": ["はれときどきくもり","くも","たいよう","てんき"],
+	"🌥": ["はれのちくもり","くも","たいよう","てんき"],
+	"🌦": ["はれのちくもりときどきあめ","くも","あめ","たいよう","てんき"],
 	"☁️": ["くも","てんき"],
-	"🌧️": ["あまぐも","くも","あめ","てんき"],
-	"⛈️": ["らいう","くも","あめ","かみなり","てんき"],
-	"🌩️": ["らいうん","くも","かみなり","てんき"],
-	"⚡️": ["だかでんあつきごう","きけん","でんき","かみなり","でんあつ","びりびり"],
+	"🌧": ["あまぐも","くも","あめ","てんき"],
+	"⛈": ["らいう","くも","あめ","かみなり","てんき"],
+	"🌩": ["らいうん","くも","かみなり","てんき"],
+	"⚡": ["だかでんあつきごう","きけん","でんき","かみなり","でんあつ","びりびり"],
 	"🔥": ["えん","ひ","どうぐ"],
 	"💥": ["しょうとつまーく","どかーん","しょうとつ","まんが"],
 	"❄️": ["せつのけっしょう","つめたい","ゆき","てんき"],
-	"🌨️": ["ゆきぐも","くも","れい","ゆき","てんき"],
-	"☃️": ["ゆきだるま","れい","ゆき","てんき"],
-	"⛄️": ["ゆきだるま","れい","ゆき","てんき"],
-	"🌬️": ["かぜがふいている","かぜがふく","くも","かお","てんき","ふう"],
+	"🌨": ["ゆきぐも","くも","れい","ゆき","てんき"],
+	"☃": ["ゆきだるま","れい","ゆき","てんき"],
+	"⛄": ["ゆきだるま","れい","ゆき","てんき"],
+	"🌬": ["かぜがふいている","かぜがふく","くも","かお","てんき","ふう"],
 	"💨": ["だっしゅ","まんが","はしる"],
-	"🌪️": ["たつまきぐも","くも","たつまき","てんき","せんぷう"],
-	"🌫️": ["きり","くも","てんき"],
+	"🌪": ["たつまきぐも","くも","たつまき","てんき","せんぷう"],
+	"🌫": ["きり","くも","てんき"],
 	"🌈": ["にじ","あめ","れいんぼー","てんき","ぷらいど","lgbt"],
-	"☔️": ["うとかさ","いるい","しずく","あめ","かさ","てんき"],
+	"☔": ["うとかさ","いるい","しずく","あめ","かさ","てんき"],
 	"💧": ["しずく","ぞっとする","まんが","したたり","あせ","てんき"],
 	"💦": ["あせまーく","まんが","ぬれている","あせ"],
 	"🌊": ["なみ","うみ","みず","てんき"],
@@ -714,7 +714,7 @@
 	"🥑": ["あぼかど","ふるーつ","くだもの"],
 	"🫒": ["おりーぶ","ふるーつ"],
 	"🍆": ["なす","なすび","しょくぶつ","やさい"],
-	"🌶️": ["とうがらし","からい","こしょう","しょくぶつ"],
+	"🌶": ["とうがらし","からい","こしょう","しょくぶつ"],
 	"🫑": ["ぴーまん","とうがらし","こしょう","しょくぶつ","やさい"],
 	"🥒": ["きゅうり","ぴくるす","やさい"],
 	"🥬": ["はっぱのみどり","ちんげんさい","きゃべつ","けーる","れたす"],
@@ -793,7 +793,7 @@
 	"🍪": ["くっきー","でざーと","あまい"],
 	"🥠": ["おみくじいりくっきー","ふぉーちゅんくっきー"],
 	"🥮": ["げっぺい","あき","まつり"],
-	"☕️": ["ほっとどりんく","いんりょう","こーひー","のみもの","あたたかい","じょうき","おちゃ"],
+	"☕": ["ほっとどりんく","いんりょう","こーひー","のみもの","あたたかい","じょうき","おちゃ"],
 	"🍵": ["ゆのみ","いんりょう","かっぷ","のみもの","おちゃ"],
 	"🫖": ["てぃーぽっと","どりんく","ぽっと","てぃー","けとる"],
 	"🥣": ["ぼうるとすぷーん","ちょうしょく","しりある","おかゆ","おーとみーる","ぽりっじ","しょっき"],
@@ -816,13 +816,13 @@
 	"🧊": ["かくこおり","こおり","りっぽうたい","つめたい","ひょうざん"],
 	"🥄": ["すぷーん","しょっき"],
 	"🍴": ["ふぉーくとないふ","ちょうり","ふぉーく","ないふ","しょっき"],
-	"🍽️": ["ふぉーくとないふとぷれーと","ちょうり","ふぉーく","ないふ","ぷれーと","しょっき"],
+	"🍽": ["ふぉーくとないふとぷれーと","ちょうり","ふぉーく","ないふ","ぷれーと","しょっき"],
 	"🥢": ["はし"],
 	"🥡": ["ていくあうとぼっくす","ていくあうと","ようき","おもちかえり"],
-	"⚽️": ["さっかーぼーる","ぼーる","さっかー"],
+	"⚽": ["さっかーぼーる","ぼーる","さっかー"],
 	"🏀": ["ばすけっとぼーる","ぼーる","ばすけっとりんぐ"],
 	"🏈": ["あめりかんふっとぼーる","あめりかん","ぼーる","ふっとぼーる"],
-	"⚾️": ["やきゅう","ぼーる"],
+	"⚾": ["やきゅう","ぼーる"],
 	"🥎": ["そふとぼーる","ぼーる","しあい","すぽーつ"],
 	"🎾": ["てにすぼーる","ぼーる","らけっと","てにす"],
 	"🏐": ["ばれーぼーる","ぼーる","しあい"],
@@ -838,19 +838,19 @@
 	"🏏": ["くりけっとのばっととぼーる","ぼーる","ふぃーるど","くりけっと","しあい"],
 	"🥍": ["らくろす","ぼーる","すてぃっく","しあい","すぽーつ"],
 	"🥌": ["かーりんぐすとーん","かーりんぐ","すとーん"],
-	"⛳️": ["ごるふのかっぷ","ぴんふらっぐ","ごるふ","ほーる"],
+	"⛳": ["ごるふのかっぷ","ぴんふらっぐ","ごるふ","ほーる"],
 	"🏹": ["ゆみや","しゃしゅ","や","ゆみ","しゃしゅざ","どうぐ","せいざ"],
 	"🎣": ["つりざおとさかな","えんたーていめんと","さかな","ぼう"],
 	"🤿": ["だいびんぐますく","だいびんぐ","すきゅーば","しゅのーける"],
 	"🥊": ["ぼくしんぐぐろーぶ","ぼくしんぐ","ぐろーぶ"],
 	"🥋": ["どうぎ","じゅうどう","からて","ぶどう","てこんどー","ゆにふぉーむ"],
-	"⛸️": ["あいすすけーと","こおり"],
+	"⛸": ["あいすすけーと","こおり"],
 	"🎿": ["すきーとすきーぶーつ","すきー","ゆき"],
 	"🛷": ["そり","るーじゅ","とぼがん"],
-	"⛷️": ["すきー","ゆき"],
+	"⛷": ["すきー","ゆき"],
 	"🏂": ["すのーぼーだー","すきー","ゆき","すのーぼーど"],
 	"🏋️‍♀️": ["うえいとをもちあげるじょせい","あげ","じゅうりょう","じょせい","おんな"],
-	"🏋️": ["うえいとをもちあげるひと","あげ","じゅうりょう"],
+	"🏋": ["うえいとをもちあげるひと","あげ","じゅうりょう"],
 	"🏋️‍♂️": ["うえいとをもちあげるだんせい","あげ","じゅうりょう","おとこ","だんせい"],
 	"🤺": ["ふぇんしんぐをするひと","けんし","けんじゅつ","けん"],
 	"🤼‍♀️": ["れすりんぐをするじょせい","れすりんぐ","れすりんぐせんしゅ","じょせい","おんな"],
@@ -860,7 +860,7 @@
 	"🤸": ["そくてんをするひと","そくほうてんかい","たいそう"],
 	"🤸‍♂️": ["そくてんをするだんせい","そくほうてんかい","たいそう","おとこ","だんせい"],
 	"⛹️‍♀️": ["ぼーるをばうんどさせるじょせい","ぼーる","じょせい","おんな"],
-	"⛹️": ["ぼーるをばうんどさせるひと","ぼーる"],
+	"⛹": ["ぼーるをばうんどさせるひと","ぼーる"],
 	"⛹️‍♂️": ["ぼーるをばうんどさせるだんせい","ぼーる","おとこ","だんせい"],
 	"🤾‍♀️": ["はんどぼーるをするじょせい","ぼーる","はんどぼーる","じょせい","おんな"],
 	"🤾": ["はんどぼーるをするひと","ぼーる","はんどぼーる"],
@@ -869,7 +869,7 @@
 	"🧗": ["くらいみんぐしているひと","くらいみんぐ","ろっく"],
 	"🧗‍♂️": ["くらいみんぐしているだんせい","くらいみんぐ","ろっく","だんせい","おとこ"],
 	"🏌️‍♀️": ["ごるふをするじょせい","ぼーる","ごるふ","ごるふぁー","ごるふする","じょせい","おんな"],
-	"🏌️": ["ごるふをするひと","ぼーる","ごるふ","ごるふぁー","ごるふする"],
+	"🏌": ["ごるふをするひと","ぼーる","ごるふ","ごるふぁー","ごるふする"],
 	"🏌️‍♂️": ["ごるふをするだんせい","ぼーる","ごるふ","ごるふぁー","ごるふする","おとこ","だんせい"],
 	"🧘‍♀️": ["れんげざのじょせい","めいそう","よが","せいおん","じょせい","おんな"],
 	"🧘": ["れんげざのひと","めいそう","よが","せいおん"],
@@ -897,16 +897,16 @@
 	"🚵": ["まうんてんばいくにのるひと","まうんてんばいくらいだー","くろすばいく","じてんしゃ","じてんしゃのり","じてんしゃにのるひと","やま"],
 	"🚵‍♂️": ["まうんてんばいくにのるだんせい","まうんてんばいくらいだー","くろすばいく","じてんしゃ","じてんしゃのり","じてんしゃにのるひと","さいくりすと","やま","おとこ","だんせい"],
 	"🎽": ["らんにんぐしゃつとたすき","らんにんぐ","たすき","しゃつ"],
-	"🎖️": ["くんしょう","おいわい","めだる","ぐんじ"],
+	"🎖": ["くんしょう","おいわい","めだる","ぐんじ"],
 	"🏅": ["すぽーつのめだる","めだる"],
 	"🥇": ["きんめだる","1い","きん","めだる","1","だい1い"],
 	"🥈": ["ぎんめだる","めだる","2い","ぎん","2","だい2い"],
 	"🥉": ["どうめだる","どう","めだる","3い","3","だい3い"],
 	"🏆": ["とろふぃー","しょう"],
-	"🏵️": ["ばらかざり","しょくぶつ"],
-	"🎗️": ["りまいんだーりぼん","おいわい","りまいんだー","りぼん"],
+	"🏵": ["ばらかざり","しょくぶつ"],
+	"🎗": ["りまいんだーりぼん","おいわい","りまいんだー","りぼん"],
 	"🎫": ["きっぷ","あくてぃびてぃ","にゅうじょうりょう","えんたーていめんと","ちけっと"],
-	"🎟️": ["にゅうじょうけん","にゅうじょうりょう","えんたーていめんと","ちけっと"],
+	"🎟": ["にゅうじょうけん","にゅうじょうりょう","えんたーていめんと","ちけっと"],
 	"🎪": ["さーかすごや","あくてぃびてぃ","さーかす","えんたーていめんと","てんと"],
 	"🤹‍♀️": ["じゃぐりんぐをするじょせい","てんびん","じゃぐりんぐ","じょせい","おんな"],
 	"🤹": ["じゃぐりんぐをするひと","ばらんす","じゃぐりんぐ"],
@@ -945,7 +945,7 @@
 	"🛺": ["おーとりきしゃ","じんりきしゃ","とぅくとぅく"],
 	"🚌": ["ばす","のりもの"],
 	"🚎": ["とろりーばす","ばす","ろめんでんしゃ","しがいでんしゃ","のりもの"],
-	"🏎️": ["れーしんぐかー","くるま","きょうそう"],
+	"🏎": ["れーしんぐかー","くるま","きょうそう"],
 	"🚓": ["ぱとかー","くるま","ぱとろーる","けいさつ","のりもの"],
 	"🚑": ["きゅうきゅうしゃ","のりもの"],
 	"🚒": ["しょうぼうしゃ","えんじん","えん","とらっく","のりもの"],
@@ -954,7 +954,7 @@
 	"🚚": ["はいたつようとらっく","はいたつ","とらっく","のりもの"],
 	"🚛": ["とれーらー","おおがたとらっく","せみ","とらっく","のりもの"],
 	"🚜": ["とらくたー","のりもの"],
-	"🏍️": ["れーすばいく","おーとばい","れーす"],
+	"🏍": ["れーすばいく","おーとばい","れーす"],
 	"🛵": ["すくーたー","もーたー"],
 	"🚲": ["じてんしゃ","ばいく","のりもの"],
 	"🦼": ["でんどうくるまいす","あくせしびりてぃ","くるまいす"],
@@ -984,25 +984,25 @@
 	"🚊": ["ろめんでんしゃ","とろりーばす","のりもの"],
 	"🚉": ["えき","せんろ","でんしゃ","のりもの"],
 	"🚁": ["へりこぷたー","のりもの"],
-	"🛩️": ["こがたこうくうき","ひこうき","のりもの"],
+	"🛩": ["こがたこうくうき","ひこうき","のりもの"],
 	"✈️": ["ひこうき","のりもの"],
 	"🛫": ["ひこうきのりりく","ひこうき","ちぇっくいん","しゅっぱつ","のりもの"],
 	"🛬": ["ひこうきのちゃくりく","ひこうき","とうちゃく","ちゃくりく","のりもの"],
 	"🪂": ["ぱらしゅーと","ぱらせーる","すかいだいぶ","はんぐぐらいだー"],
 	"💺": ["ざせき","いす"],
-	"🛰️": ["さてらいと","えいせい","うちゅう","のりもの"],
+	"🛰": ["さてらいと","えいせい","うちゅう","のりもの"],
 	"🚀": ["ろけっと","うちゅう","のりもの"],
 	"🛸": ["そらとぶえんばん","UFO","うちゅうじん","いほしじん","うちゅう","くうそう"],
 	"🛶": ["かぬー","ぼーと"],
-	"⛵️": ["よっと","ぼーと","りぞーと","うみ","のりもの"],
-	"🛥️": ["もーたーぼーと","ぼーと","のりもの"],
+	"⛵": ["よっと","ぼーと","りぞーと","うみ","のりもの"],
+	"🛥": ["もーたーぼーと","ぼーと","のりもの"],
 	"🚤": ["すぴーどぼーと","ぼーと","のりもの"],
-	"⛴️": ["ふぇりー","ぼーと"],
-	"🛳️": ["りょかくせん","りょかく","ふね","のりもの"],
+	"⛴": ["ふぇりー","ぼーと"],
+	"🛳": ["りょかくせん","りょかく","ふね","のりもの"],
 	"🚢": ["ふね","のりもの"],
 	"🛟": ["きゅうめいうきわ","うきわ","らいふじゃけっと","らいふせーばー","きゅうじょ","あんぜん"],
-	"⚓️": ["いかり","ふね","つーる"],
-	"⛽️": ["がそりんすたんど","ねんりょう","がそりん","きゅうゆき","さーびすすてーしょん"],
+	"⚓": ["いかり","ふね","つーる"],
+	"⛽": ["がそりんすたんど","ねんりょう","がそりん","きゅうゆき","さーびすすてーしょん"],
 	"🚧": ["こうじちゅう","こうじようふぇんす","けんせつこうじ"],
 	"🚏": ["ばすてい","ばす","ていし"],
 	"🚦": ["たてむきのしんごうき","しんごうき","しんごう","こうつう"],
@@ -1011,30 +1011,30 @@
 	"🎡": ["かんらんしゃ","あくてぃびてぃ","ゆうえんち","えんたーていめんと","ふぇりす"],
 	"🎢": ["じぇっとこーすたー","あくてぃびてぃ","ゆうえんち","こーすたー","えんたーていめんと","ろーらー"],
 	"🎠": ["めりーごーらんど","あくてぃびてぃ","めりーごーらうんど","えんたーていめんと","うま"],
-	"🏗️": ["けんせつちゅう","たてもの","けんせつ"],
+	"🏗": ["けんせつちゅう","たてもの","けんせつ"],
 	"🌁": ["きり","てんき"],
 	"🗼": ["とうきょうたわー","とうきょう","たわー"],
 	"🏭": ["こうじょう","たてもの"],
-	"⛲️": ["ふんすい"],
+	"⛲": ["ふんすい"],
 	"🎑": ["おつきみ","あくてぃびてぃ","おいわい","じゅしょうしき","えんたーていめんと","つき"],
-	"⛰️": ["やま"],
-	"🏔️": ["ゆきやま","さむい","やま","ゆき"],
+	"⛰": ["やま"],
+	"🏔": ["ゆきやま","さむい","やま","ゆき"],
 	"🗻": ["ふじさん","やま"],
 	"🌋": ["かざん","ふんか","やま","きしょう"],
 	"🗾": ["にっぽんれっとう","にっぽん","ちず"],
-	"🏕️": ["きゃんぷ"],
-	"⛺️": ["てんと","きゃんぷ"],
-	"🏞️": ["こくりつこうえん","こうえん"],
-	"🛣️": ["こうそくどうろ","はいうぇい","どうろ"],
-	"🛤️": ["せんろ","てつどう","でんしゃ"],
+	"🏕": ["きゃんぷ"],
+	"⛺": ["てんと","きゃんぷ"],
+	"🏞": ["こくりつこうえん","こうえん"],
+	"🛣": ["こうそくどうろ","はいうぇい","どうろ"],
+	"🛤": ["せんろ","てつどう","でんしゃ"],
 	"🌅": ["ひので","あさ","たいよう","てんこう"],
 	"🌄": ["やまからのひので","あさ","やま","たいよう","ひので","てんこう"],
-	"🏜️": ["さばく"],
-	"🏖️": ["びーちとかさ","びーち","かさ","ぱらそる"],
-	"🏝️": ["むじんとう","さばく","しま"],
+	"🏜": ["さばく"],
+	"🏖": ["びーちとかさ","びーち","かさ","ぱらそる"],
+	"🏝": ["むじんとう","さばく","しま"],
 	"🌇": ["びるにしずむゆうひ","たてもの","ゆうぐれ","たいよう","ゆうひ","てんき"],
 	"🌆": ["ゆうぐれのまちなみ","たてもの","まち","ゆうぐれ","ひぐれ","ふうけい","たいよう","ゆうひ","てんき"],
-	"🏙️": ["まちなみ","たてもの","まち"],
+	"🏙": ["まちなみ","たてもの","まち"],
 	"🌃": ["ほしぞら","よる","ほし","てんき"],
 	"🌉": ["よるのはし","はし","よる","てんき"],
 	"🌌": ["あまのがわ","うちゅう","てんき"],
@@ -1042,14 +1042,14 @@
 	"🎇": ["せんこうはなび","あくてぃびてぃ","おいわい","えんたーていめんと","はなび","きらきら"],
 	"🎆": ["はなび","あくてぃびてぃ","おいわい","えんたーていめんと"],
 	"🛖": ["こや","いえ","せんけいこ","ぱお"],
-	"🏘️": ["いえ","たてもの"],
+	"🏘": ["いえ","たてもの"],
 	"🏰": ["せいようのしろ","たてもの","しろ","よーろっぱ"],
 	"🏯": ["にっぽんのしろ","たてもの","しろ","にっぽん"],
-	"🏟️": ["すたじあむ"],
+	"🏟": ["すたじあむ"],
 	"🗽": ["じゆうのめがみ","じゆう","ぞう"],
 	"🏠": ["いえ","たてもの","じたく"],
 	"🏡": ["にわつきのいえ","たてもの","にわ","じたく","いえ"],
-	"🏚️": ["はいきょ","たてもの","はいおく","いえ"],
+	"🏚": ["はいきょ","たてもの","はいおく","いえ"],
 	"🏢": ["おふぃすびる","たてもの"],
 	"🏬": ["でぱーと","たてもの","てん"],
 	"🏣": ["にっぽんのゆうびんきょく","たてもの","にっぽん","ぽすと"],
@@ -1061,24 +1061,24 @@
 	"🏫": ["がっこう","たてもの"],
 	"🏩": ["らぶほてる","たてもの","ほてる","らぶ"],
 	"💒": ["けっこんしき","あくてぃびてぃ","ちゃぺる","ろまんす"],
-	"🏛️": ["れきしてきなたてもの","たてもの","れきしてきな"],
-	"⛪️": ["きょうかい","たてもの","くりすちゃん","じゅうじか","しゅうきょう"],
+	"🏛": ["れきしてきなたてもの","たてもの","れきしてきな"],
+	"⛪": ["きょうかい","たてもの","くりすちゃん","じゅうじか","しゅうきょう"],
 	"🕌": ["もすく","いすらむ","むすりむ","しゅうきょう"],
 	"🛕": ["ひんどぅーきょうじいん","ひんどぅーきょう","じいん","しゅうきょう"],
 	"🕍": ["しなごーぐ","ゆだやじん","ゆだやきょう","しゅうきょう","かいどう"],
 	"🕋": ["かあば","いすらむ","むすりむ","しゅうきょう"],
-	"⛩️": ["じんじゃ","しゅうきょう","しんとう"],
-	"⌚️": ["うでどけい","とけい"],
+	"⛩": ["じんじゃ","しゅうきょう","しんとう"],
+	"⌚": ["うでどけい","とけい"],
 	"📱": ["けいたいでんわ","けいたい","こみゅにけーしょん","もばいる","でんわ"],
 	"📲": ["ちゃくしんちゅう","やじるし","つうわ","けいたい","こみゅにけーしょん","もばいる","けいたいでんわ","じゅしん","でんわ"],
 	"💻": ["ぱそこん","のーとぱそこん","こんぴゅーたー","ぱーそなる"],
-	"⌨️": ["きーぼーど","こんぴゅーたー"],
-	"🖥️": ["ですくとっぷぱそこん","こんぴゅーたー","ですくとっぷ"],
-	"🖨️": ["ぷりんたー","こんぴゅーたー"],
-	"🖱️": ["3ぼたんまうす","3","ぼたん","こんぴゅーたー","まうす","さん"],
-	"🖲️": ["とらっくぼーる","こんぴゅーたー"],
-	"🕹️": ["じょいすてぃっく","えんたーていめんと","げーむ","びでおげーむ"],
-	"🗜️": ["あっしゅく","つーる","けっかん"],
+	"⌨": ["きーぼーど","こんぴゅーたー"],
+	"🖥": ["ですくとっぷぱそこん","こんぴゅーたー","ですくとっぷ"],
+	"🖨": ["ぷりんたー","こんぴゅーたー"],
+	"🖱": ["3ぼたんまうす","3","ぼたん","こんぴゅーたー","まうす","さん"],
+	"🖲": ["とらっくぼーる","こんぴゅーたー"],
+	"🕹": ["じょいすてぃっく","えんたーていめんと","げーむ","びでおげーむ"],
+	"🗜": ["あっしゅく","つーる","けっかん"],
 	"💽": ["MD","ぱそこん","ひかりでぃすく","えんたーていめんと","みにでぃすく","こうがく"],
 	"💾": ["ふろっぴーでぃすく","こんぴゅーたー","でぃすく","ふろっぴー"],
 	"💿": ["CDでぃすく","ぶるーれい","CD","こんぴゅーたー","でぃすく","DVD","こうがく"],
@@ -1088,23 +1088,23 @@
 	"📸": ["ふらっしゅをたいたかめら","かめら","ふらっしゅ","びでお"],
 	"📹": ["びでおかめら","かめら","えんたーていめんと","びでお"],
 	"🎥": ["びでおかめら","あくてぃびてぃ","かめら","しねま","えんたーていめんと","えいが"],
-	"📽️": ["えいしゃき","しねま","ごらく","ふぃるむ","えいが","ぷろじぇくたー","びでお"],
-	"🎞️": ["ふぃるむのふれーむ","しねま","えんたーていめんと","ふぃるむ","ふれーむ","えいが"],
+	"📽": ["えいしゃき","しねま","ごらく","ふぃるむ","えいが","ぷろじぇくたー","びでお"],
+	"🎞": ["ふぃるむのふれーむ","しねま","えんたーていめんと","ふぃるむ","ふれーむ","えいが"],
 	"📞": ["じゅわき","こみゅにけーしょん","でんわ","じゅしんき"],
 	"☎️": ["でんわ","けいたいでんわ"],
 	"📟": ["ぽけっとべる","こみゅにけーしょん","ぽけべる"],
 	"📠": ["FAX","こみゅにけーしょん; fAX"],
 	"📺": ["てれび","えんたーていめんと","TV","びでお"],
 	"📻": ["らじお","えんたーていめんと","びでお"],
-	"🎙️": ["すたじおまいく","まいく","おんがく","すたじお"],
-	"🎚️": ["ちょうせつばー","ちょうせつ","おんがく","ばー"],
-	"🎛️": ["こんとろーるのぶ","こんとろーる","つまみ","おんがく"],
-	"⏱️": ["すとっぷうぉっち","とけい"],
-	"⏲️": ["たいまーとけい","とけい","たいまー"],
+	"🎙": ["すたじおまいく","まいく","おんがく","すたじお"],
+	"🎚": ["ちょうせつばー","ちょうせつ","おんがく","ばー"],
+	"🎛": ["こんとろーるのぶ","こんとろーる","つまみ","おんがく"],
+	"⏱": ["すとっぷうぉっち","とけい"],
+	"⏲": ["たいまーとけい","とけい","たいまー"],
 	"⏰": ["めざましとけい","あらーむ","とけい"],
-	"🕰️": ["おきどけい","とけい"],
+	"🕰": ["おきどけい","とけい"],
 	"⏳": ["すなどけい","すな","たいまー"],
-	"⌛️": ["すなどけい","すな","たいまー"],
+	"⌛": ["すなどけい","すな","たいまー"],
 	"🧮": ["そろばん","けいさん","かうんと","しゅうけいひょう","すうがく"],
 	"📡": ["えいせいあんてな","あんてな","こみゅにけーしょん","ぱらぼらあんてな","えいせい"],
 	"🔋": ["でんち","ばってりー","でんし","だかえねるぎー"],
@@ -1112,10 +1112,10 @@
 	"🔌": ["こんせんと","でんき","ぷらぐ"],
 	"💡": ["でんきゅう","まんが","でんき","ひらめき","ひかり"],
 	"🔦": ["かいちゅうでんとう","でんき","ひかり","どうぐ","たいまつ"],
-	"🕯️": ["ろうそく","ひかり"],
+	"🕯": ["ろうそく","ひかり"],
 	"🧯": ["しょうかき","しょうか","ひ","けす"],
-	"🗑️": ["ごみばこ","ごみ","かん","びん"],
-	"🛢️": ["どらむかん","どらむ","おいる"],
+	"🗑": ["ごみばこ","ごみ","かん","びん"],
+	"🛢": ["どらむかん","どらむ","おいる"],
 	"🛒": ["しょっぴんぐかーと","かーと","しょっぴんぐ","とろりー"],
 	"💸": ["はねのはえたおさつ","ぎんこう","しへい","せいきゅうしょ","どる","とぶ","おかね","はね"],
 	"💵": ["どるさつ","ぎんこう","しへい","おさつ","つうか","どる","おかね"],
@@ -1128,20 +1128,20 @@
 	"🪪": ["みぶんしょうめいしょ","しかくじょうほう","ID","らいせんす","せきゅりてぃ"],
 	"🧾": ["りょうしゅうしょ","かいけい","ぼき","しょうこ","しょうめい"],
 	"💎": ["ほうせき","だいあもんど","じゅえる","ろまんす"],
-	"⚖️": ["はかり","てんびん","こうせい","てんびんざ","ものさし","どうぐ","じゅうりょう","せいざ"],
+	"⚖": ["はかり","てんびん","こうせい","てんびんざ","ものさし","どうぐ","じゅうりょう","せいざ"],
 	"🦯": ["しろつえ","あくせしびりてぃ","めがふじゆう"],
 	"🧰": ["どうぐばこ","むね","せいびし","こうぐ"],
 	"🔧": ["れんち","どうぐ"],
 	"🪛": ["どらいばー","ねじ","こうぐ"],
 	"🔨": ["はんまー","どうぐ"],
-	"⚒️": ["はんまーとつるはし","はんまー","つるはし","どうぐ"],
-	"🛠️": ["はんまーとれんち","はんまー","どうぐ","れんち"],
-	"⛏️": ["つるはし","さいくつ","どうぐ"],
+	"⚒": ["はんまーとつるはし","はんまー","つるはし","どうぐ"],
+	"🛠": ["はんまーとれんち","はんまー","どうぐ","れんち"],
+	"⛏": ["つるはし","さいくつ","どうぐ"],
 	"🪓": ["おの","たたきぎり","ておの","われる","もくざい","こうぐ"],
 	"🪚": ["もっこうようのこぎり","だいく","ざいもく","のこぎり","こうぐ"],
 	"🔩": ["なっととぼると","ぼると","なっと","どうぐ"],
-	"⚙️": ["はぐるま","ぎあ","どうぐ"],
-	"⛓️": ["くさり"],
+	"⚙": ["はぐるま","ぎあ","どうぐ"],
+	"⛓": ["くさり"],
 	"🪝": ["ふっく","わな","いかさま","ぺてん","ゆうわく","ふぃっしんぐ","つーる"],
 	"🪜": ["はしご","のぼる","よこぎ","だん","こうぐ"],
 	"🧱": ["れんが","ねんど","けんせつ","もるたる","かべ"],
@@ -1151,13 +1151,13 @@
 	"🧨": ["ばくちく","だいなまいと","かやく","はなび"],
 	"💣": ["ばくだん"],
 	"🔪": ["ほうちょう","きっちんないふ","ちょうり","ないふ"],
-	"🗡️": ["たんけん","ないふ"],
-	"⚔️": ["こうさしたけん","こうさ","けん"],
-	"🛡️": ["たて"],
+	"🗡": ["たんけん","ないふ"],
+	"⚔": ["こうさしたけん","こうさ","けん"],
+	"🛡": ["たて"],
 	"🚬": ["きつえんまーく","あくてぃびてぃ","きつえん"],
-	"⚰️": ["かん","し"],
+	"⚰": ["かん","し"],
 	"🪦": ["はかいし","ぼち","し","ぼ","はかば","はろうぃーん"],
-	"⚱️": ["こつつぼ","し","そうぎ"],
+	"⚱": ["こつつぼ","し","そうぎ"],
 	"🏺": ["あんふぉら","みずがめざ","りょうり","のみもの","みずさし","どうぐ","せいざ"],
 	"🔮": ["すいしょうだま","たま","すいしょう","おとぎばなし","ふぁんたじー","うらない","どうぐ"],
 	"🪄": ["まほうのつえ","まほう","ぼう","まじょ","まほうつかい"],
@@ -1166,22 +1166,22 @@
 	"🪬": ["はむさ","おまもり","ふぁてぃま","て","めありー","みりあむ","ほご"],
 	"💈": ["りはつてんのかんばんばしら","りはつてん","とこや","さんぱつ","かんばんばしら"],
 	"🧲": ["じしゃく","あとらくしょん","ばてい"],
-	"⚗️": ["じょうりゅうき","かがく","じっけん","どうぐ"],
+	"⚗": ["じょうりゅうき","かがく","じっけん","どうぐ"],
 	"🧪": ["しけんかん","かがくしゃ","かがく","じっけん","じっけんしつ"],
 	"🧫": ["ぺとりさら","ばくてりあ","せいぶつがくしゃ","せいぶつがく","ぶんか","じっけんしつ"],
 	"🧬": ["DNA","せいぶつがくしゃ","しんか","いでんし","いでんしがく","せいめい"],
 	"🔭": ["ぼうえんきょう","つーる"],
 	"🔬": ["けんびきょう","つーる"],
-	"🕳️": ["あな"],
+	"🕳": ["あな"],
 	"🩻": ["Xせん","ほね","いし","いりょう","こっかく"],
 	"💊": ["くすり","いし","ぴる","びょうき"],
 	"💉": ["ちゅうしゃき","いし","くすり","ちゅうしゃはり","ちゅうしゃ","びょうき","どうぐ","わくちん"],
 	"🩸": ["ち1てき","いし","くすり","けつえき","せいり"],
 	"🩹": ["がーぜつきばんそうこう","いし","くすり","ばんどえいど","ほうたい","ばんそうこう"],
 	"🩺": ["ちょうしんき","いし","くすり","しんぞう"],
-	"🌡️": ["おんどけい","てんき","おんど"],
+	"🌡": ["おんどけい","てんき","おんど"],
 	"🩼": ["まつばづえ","つえ","しょうがい","けが","いどうほじょ","ぼう"],
-	"🏷️": ["らべる","にふだ"],
+	"🏷": ["らべる","にふだ"],
 	"🔖": ["ぶっくまーく","しおり","しるし"],
 	"🚽": ["といれ"],
 	"🪠": ["ぷらんじゃー","ふぉーすかっぷ","はいかんこう","きゅういん","といれ"],
@@ -1200,24 +1200,24 @@
 	"🧺": ["ばすけっと","のうぎょう","らんどりー","ぴくにっく"],
 	"🪣": ["ばけつ","たる","ておけ","おおだる"],
 	"🔑": ["かぎ","じょう","ぱすわーど"],
-	"🗝️": ["ふるいかぎ","かぎ","じょう","ふるい"],
+	"🗝": ["ふるいかぎ","かぎ","じょう","ふるい"],
 	"🪤": ["ねずみとりき","えさ","ねずみ","かじはどうぶつ","わなわ","わな"],
-	"🛋️": ["そふぁーとらんぷ","そふぁー","ほてる","らんぷ"],
+	"🛋": ["そふぁーとらんぷ","そふぁー","ほてる","らんぷ"],
 	"🪑": ["いす","ざせき","すわる"],
 	"🛌": ["しゅくはくしせつ","ねる","ほてる","すいみん","べっど"],
-	"🛏️": ["べっど","ほてる","すいみん"],
+	"🛏": ["べっど","ほてる","すいみん"],
 	"🚪": ["どあ","とびら"],
 	"🪞": ["かがみ","はんしゃ","はんしゃたい","はんしゃきょう"],
 	"🪟": ["まど","わく","しんせんなくうき","がらす","かいこうぶ","とうめい","しかい"],
 	"🧳": ["てにもつ","ぱっきんぐ","りょこう","すーつけーす"],
-	"🛎️": ["たくじょうべる","べる","ほてる"],
-	"🖼️": ["がくにはいったしゃしん","あーと","がくぶち","びじゅつかん","かいが","しゃしん"],
+	"🛎": ["たくじょうべる","べる","ほてる"],
+	"🖼": ["がくにはいったしゃしん","あーと","がくぶち","びじゅつかん","かいが","しゃしん"],
 	"🧭": ["こんぱす","じしゃく","なびげーしょん","おりえんてーりんぐ"],
-	"🗺️": ["せかいちず","ちず","せかい"],
-	"⛱️": ["たてられたぱらそる","あめ","はれ","かさ","てんき"],
+	"🗺": ["せかいちず","ちず","せかい"],
+	"⛱": ["たてられたぱらそる","あめ","はれ","かさ","てんき"],
 	"🪭": ["おりたたみせんす","れいきゃく","えんりょがち","だんす","ふぁん","ふらったー","ねつ","あつい","うちき","ひろがる"],
 	"🗿": ["もやいぞう","もあいぞう","かお","ぞう"],
-	"🛍️": ["かいものぶくろ","かばん","ほてる","かいもの"],
+	"🛍": ["かいものぶくろ","かばん","ほてる","かいもの"],
 	"🎈": ["ふうせん","あくてぃびてぃ","おいわい","えんたーていめんと"],
 	"🎏": ["こいのぼり","あくてぃびてぃ","こい","おいわい","えんたーていめんと","はた","ふきながし"],
 	"🎀": ["りぼん","おいわい"],
@@ -1255,17 +1255,17 @@
 	"📄": ["ぶんしょ","ぺーじ"],
 	"📅": ["かれんだー","ひづけ"],
 	"📆": ["ひめくりかれんだー","かれんだー"],
-	"🗓️": ["りんぐかれんだー","かれんだー","ぱっど","らせんじょう"],
+	"🗓": ["りんぐかれんだー","かれんだー","ぱっど","らせんじょう"],
 	"📇": ["めいしふぉるだ","かーど","さくいん","ろーらでっくす"],
-	"🗃️": ["かーどふぁいる","はこ","かーど","ふぁいる"],
-	"🗳️": ["とうひょうようしととうひょうばこ","とうひょうようし","はこ","ひょう","とうひょう"],
-	"🗄️": ["ふぁいるしゅうのうこ","しゅうのう","ふぁいる"],
+	"🗃": ["かーどふぁいる","はこ","かーど","ふぁいる"],
+	"🗳": ["とうひょうようしととうひょうばこ","とうひょうようし","はこ","ひょう","とうひょう"],
+	"🗄": ["ふぁいるしゅうのうこ","しゅうのう","ふぁいる"],
 	"📋": ["くりっぷぼーど"],
-	"🗒️": ["りんぐのーと","のーと","ぱっど","らせんじょう"],
+	"🗒": ["りんぐのーと","のーと","ぱっど","らせんじょう"],
 	"📁": ["ふぉるだ","ふぁいる"],
 	"📂": ["ひらいたふぉるだ","ふぁいる","ふぉるだ","ひらいた"],
-	"🗂️": ["しきりかーど","かーど","しきり","さくいん"],
-	"🗞️": ["まるめたしんぶん","にゅーす","しんぶん","かみ","まるめた"],
+	"🗂": ["しきりかーど","かーど","しきり","さくいん"],
+	"🗞": ["まるめたしんぶん","にゅーす","しんぶん","かみ","まるめた"],
 	"📰": ["しんぶん","こみゅにけーしょん","にゅーす","かみ"],
 	"🪧": ["ぷらかーど","でも","しがらみ","こうぎ","かんばん"],
 	"📓": ["のーと"],
@@ -1279,7 +1279,7 @@
 	"📖": ["ひらいたほん","ほん","ひらいた"],
 	"🔗": ["りんく"],
 	"📎": ["くりっぷ","ぺーぱーくりっぷ"],
-	"🖇️": ["つながったぺーぱーくりっぷ","こみゅにけーしょん","りんく","ぺーぱーくりっぷ"],
+	"🖇": ["つながったぺーぱーくりっぷ","こみゅにけーしょん","りんく","ぺーぱーくりっぷ"],
 	"✂️": ["はさみ","どうぐ"],
 	"📐": ["さんかくじょうぎ","じょうぎ","はいち","さんかく"],
 	"📏": ["じょうぎ","ちょくじょうぎ"],
@@ -1294,13 +1294,13 @@
 	"🔒": ["かぎ","とじられた","せじょう"],
 	"🔓": ["かいじょう","せじょう","あける"],
 	"🔏": ["じょうまえとぺん","いんく","じょう","ぺんさき","ぺん","ぷらいばしー"],
-	"🖊️": ["ひだりしたむきのぼーるぺん","ぼーるぺん","こみゅにけーしょん","ぺん"],
-	"🖋️": ["ひだりしたむきのまんねんひつ","こみゅにけーしょん","まんねんひつ","ぺん"],
+	"🖊": ["ひだりしたむきのぼーるぺん","ぼーるぺん","こみゅにけーしょん","ぺん"],
+	"🖋": ["ひだりしたむきのまんねんひつ","こみゅにけーしょん","まんねんひつ","ぺん"],
 	"✒️": ["ぺんさき","ぺん"],
 	"📝": ["めも","こみゅにけーしょん","えんぴつ"],
 	"✏️": ["えんぴつ"],
-	"🖍️": ["ひだりしたむきのくれよん","こみゅにけーしょん","くれよん"],
-	"🖌️": ["ひだりしたむきのぶらし","こみゅにけーしょん","ぺいんとぶらし","え"],
+	"🖍": ["ひだりしたむきのくれよん","こみゅにけーしょん","くれよん"],
+	"🖌": ["ひだりしたむきのぶらし","こみゅにけーしょん","ぺいんとぶらし","え"],
 	"🔍": ["ひだりむきむしめがね","めがね","かくだい","けんさく","つーる"],
 	"🔎": ["みぎむきむしめがね","めがね","かくだい","けんさく","つーる"],
 	"❤️": ["あかいろのはーと","はーと"],
@@ -1313,7 +1313,7 @@
 	"🖤": ["くろいはーと","はーと","くろ","あく","わるもの"],
 	"🤍": ["しろのはーと","はーと","しろ"],
 	"💔": ["われたはーと","はーと","こわれる","はきょく"],
-	"❣️": ["はーとのびっくりまーく","はーと","びっくりまーく","きごう"],
+	"❣": ["はーとのびっくりまーく","はーと","びっくりまーく","きごう"],
 	"💕": ["2つのはーと","はーと","あい"],
 	"💞": ["かいてんするはーと","はーと","かいてん"],
 	"💓": ["こどうするはーと","はーと","こどう","どきどき"],
@@ -1324,40 +1324,40 @@
 	"❤️‍🔥": ["もえているはーと","はーと","ひ","もえる","あい","ねつじょう","しんせいなはーと"],
 	"❤️‍🩹": ["てあてしているはーと","はーと","けんこうになる","かいぜんしている","てあてしている","かいふくしている","やみあがり","げんき"],
 	"💟": ["はーとのでこれーしょん","はーと"],
-	"☮️": ["ぴーすまーく","へいわ"],
-	"✝️": ["らてんじゅうじ","くりすちゃん","じゅうじか","しゅうきょう"],
-	"☪️": ["ほしとみかづき","いすらむ","むすりむ","しゅうきょう"],
-	"🕉️": ["おーむまーく","ひんどぅーきょう","おーむ","しゅうきょう"],
-	"☸️": ["ほうりん","ぶっきょうと","だーま","しゅうきょう"],
-	"✡️": ["だびでのほし","だびで","ゆだやじん","ゆだやきょう","しゅうきょう","ほし"],
+	"☮": ["ぴーすまーく","へいわ"],
+	"✝": ["らてんじゅうじ","くりすちゃん","じゅうじか","しゅうきょう"],
+	"☪": ["ほしとみかづき","いすらむ","むすりむ","しゅうきょう"],
+	"🕉": ["おーむまーく","ひんどぅーきょう","おーむ","しゅうきょう"],
+	"☸": ["ほうりん","ぶっきょうと","だーま","しゅうきょう"],
+	"✡": ["だびでのほし","だびで","ゆだやじん","ゆだやきょう","しゅうきょう","ほし"],
 	"🔯": ["ろくぼうせい","うらない","ほし"],
 	"🕎": ["はぬっきーやー","しょくだい","めのーらー","しゅうきょう"],
-	"☯️": ["いんよう","しゅうきょう","どう","どうか","ひ","かげ"],
-	"☦️": ["はったんじゅうじか","くりすちゃん","じゅうじか","しゅうきょう"],
+	"☯": ["いんよう","しゅうきょう","どう","どうか","ひ","かげ"],
+	"☦": ["はったんじゅうじか","くりすちゃん","じゅうじか","しゅうきょう"],
 	"🪯": ["かんだ","しゅうきょう","しーくきょうと"],
 	"🛐": ["れいはいしょ","しゅうきょう","れいはい"],
 	"⛎": ["へびつかいざ","うんぱんにん","へび","せいざ"],
-	"♈️": ["おひつじざ","こひつじ","せいざ"],
-	"♉️": ["おうしざ","おすうし","ゆううし","せいざ"],
-	"♊️": ["ふたござ","ふたご","せいざ"],
-	"♋️": ["がん","かにざ","かに","せいざ"],
-	"♌️": ["ししざ","らいおん","せいざ"],
-	"♍️": ["おとめざ","おとめ","しょじょ","せいざ"],
-	"♎️": ["てんびんざ","てんびん","こうせい","はかり","せいざ"],
-	"♏️": ["さそりざ","さそり","せいざ"],
-	"♐️": ["いてざ","しゃしゅ","しゃしゅざ","せいざ"],
-	"♑️": ["やぎざ","やぎ","せいざ"],
-	"♒️": ["みずがめざ","うんぱんじん","みず","せいざ"],
-	"♓️": ["うおざ","さかな","せいざ"],
+	"♈": ["おひつじざ","こひつじ","せいざ"],
+	"♉": ["おうしざ","おすうし","ゆううし","せいざ"],
+	"♊": ["ふたござ","ふたご","せいざ"],
+	"♋": ["がん","かにざ","かに","せいざ"],
+	"♌": ["ししざ","らいおん","せいざ"],
+	"♍": ["おとめざ","おとめ","しょじょ","せいざ"],
+	"♎": ["てんびんざ","てんびん","こうせい","はかり","せいざ"],
+	"♏": ["さそりざ","さそり","せいざ"],
+	"♐": ["いてざ","しゃしゅ","しゃしゅざ","せいざ"],
+	"♑": ["やぎざ","やぎ","せいざ"],
+	"♒": ["みずがめざ","うんぱんじん","みず","せいざ"],
+	"♓": ["うおざ","さかな","せいざ"],
 	"🆔": ["しかくかこみID","ID","しきべつ"],
-	"⚛️": ["げんそきごう","むしんろんしゃ","げんし"],
+	"⚛": ["げんそきごう","むしんろんしゃ","げんし"],
 	"⚕️": ["あすくれぴおすのつえ","けんこう","せわ","いし","くすり","つえ","へび"],
-	"☢️": ["ほうしゃのうひょうしき","ほうしゃのう"],
-	"☣️": ["ばいおはざーどひょうしき","せいぶつさいがい"],
+	"☢": ["ほうしゃのうひょうしき","ほうしゃのう"],
+	"☣": ["ばいおはざーどひょうしき","せいぶつさいがい"],
 	"📴": ["けいたいでんわでんげんおふ","けいたい","こみゅにけーしょん","もばいる","おふ","けいたいでんわ","でんわ"],
 	"📳": ["まなーもーど","けいたい","こみゅにけーしょん","もばいる","もーど","けいたいでんわ","でんわ","ばいぶれーしょん"],
 	"🈶": ["しかくかこみゆう","にほんご","あり"],
-	"🈚️": ["しかくかこみむ","しかくかこみいな","にほんご","なし"],
+	"🈚": ["しかくかこみむ","しかくかこみいな","にほんご","なし"],
 	"🈸": ["しかくかこみしん","しかくかこみてき","ちゅうごくご","しんせい"],
 	"🈺": ["しかくかこみえい","ちゅうごくご","えいぎょう"],
 	"🈷️": ["しかくかこみつき","にほんご","つきぎめ"],
@@ -1378,11 +1378,11 @@
 	"🆑": ["しかくかこみCL","CL"],
 	"🅾️": ["くろしかくかこみO","けつえきがた","O"],
 	"🆘": ["しかくかこみSOS","へるぷ","SOS"],
-	"⛔️": ["たちいりきんし","たちいり","きんし","だめ","できない","きんじる","こうつう"],
+	"⛔": ["たちいりきんし","たちいり","きんし","だめ","できない","きんじる","こうつう"],
 	"📛": ["なふだ","ばっじ","なまえ"],
 	"🚫": ["しんにゅうきんし","たちいり","きんし","だめ","できない","きんじる"],
 	"❌": ["ばつしるし","きゃんせる","きごう","かけざん","じょうざん","x"],
-	"⭕️": ["ふといおおきなまる","まる","O"],
+	"⭕": ["ふといおおきなまる","まる","O"],
 	"💢": ["いかりまーく","いかり","まんが","げきど"],
 	"♨️": ["おんせん","あたたかい","わきでる","じょうき"],
 	"🚷": ["ほこうしゃたちいりきんし","きんし","だめ","ない","ほこうしゃ","きんじる"],
@@ -1392,7 +1392,7 @@
 	"🔞": ["18さいみまんきんし","18","ねんれいせいげん","じゅうはち","きんし","だめ","ない","きんしした","みせいねんしゃ"],
 	"📵": ["けいたいでんわきんし","けいたい","つうしん","きんし","もばいる","だめ","できない","けいたいでんわ","きんしされている","でんわ"],
 	"🚭": ["きんえん","きんし","だめ","できない","きんしされている","きつえん"],
-	"❗️": ["あかいびっくりまーく","びっくり","まーく","きごう"],
+	"❗": ["あかいびっくりまーく","びっくり","まーく","きごう"],
 	"❕": ["しろいびっくりまーく","びっくり","まーく","かこみ","きごう"],
 	"❓": ["あかいはてなまーく","まーく","きごう","はてな"],
 	"❔": ["しろいはてなまーく","まーく","かこみ","きごう","はてな"],
@@ -1402,13 +1402,13 @@
 	"🔅": ["ていきど","あかるさ","うすぐらい","てい"],
 	"🔆": ["こうきど","あかるい","あかるさ"],
 	"🔱": ["とらいでんと","いかり","えんぶれむ","ふね","こうぐ"],
-	"⚜️": ["ゆりのもんしょう"],
+	"⚜": ["ゆりのもんしょう"],
 	"〽️": ["いおりてん","しるし","ぶぶん"],
 	"⚠️": ["けいこく"],
 	"🚸": ["こうさてんをわたるこどもたち","こども","こうさてん","ほこうしゃ","こうつう"],
 	"🔰": ["しょしんしゃまーく","しょしんしゃ","まーく","みどり","にっぽん","わかば","どうぐ","き"],
 	"♻️": ["りさいくるまーく","りさいくる"],
-	"🈯️": ["しかくかこみゆび","にほんご"],
+	"🈯": ["しかくかこみゆび","にほんご"],
 	"💹": ["じょうしょうとれんどのちゃーととえんきごう","じょうしょうちゅうえんちゃーと","ぎんこう","ちゃーと","つうか","ぐらふ","せいちょう","しじょう","おかね","じょうしょう","とれんど","うわむき","えん"],
 	"❇️": ["きらきら"],
 	"✳️": ["あすたりすく (8ほんこうせい)","あすたりすく"],
@@ -1422,7 +1422,7 @@
 	"Ⓜ️": ["まるかこみM","えん","M"],
 	"🏧": ["ATM","ATMきごう","じどう","ぎんこう","すいとう"],
 	"🚾": ["といれ","けしょうしつ","おてあらい","みず","WC"],
-	"♿️": ["くるまいす","あくせす"],
+	"♿": ["くるまいす","あくせす"],
 	"🅿️": ["くろしかくかこみP","ちゅうしゃじょう"],
 	"🈳": ["しかくかこみそら","しかくかこみのそら","ちゅうごくご","そらしつ","あき","くうしゃ"],
 	"🈂️": ["しかくかこみさ","にっぽんじん","さーびす"],
@@ -1450,26 +1450,26 @@
 	"🆒": ["COOL","かっこいい","くーる"],
 	"🆕": ["しかくかこみnew","しん"],
 	"🆓": ["しかくかこみFREE","ふりー","むりょう"],
-	"0⃣": ["0きー","0","きー","ぜろ"],
-	"1⃣": ["1きー","いち","きー"],
-	"2⃣": ["2きー","2","きー","に"],
-	"3⃣": ["3きー","3","きー","さん"],
-	"4⃣": ["4きー","4","よん","きー"],
-	"5⃣": ["5きー","5","ご","きー"],
-	"6⃣": ["6きー","6","きー","ろく"],
-	"7⃣": ["7きー","7","きー","なな"],
-	"8⃣": ["8きー","8","はち","きー"],
-	"9⃣": ["9きー","9","きー","きゅう"],
+	"0️⃣": ["0きー","0","きー","ぜろ"],
+	"1️⃣": ["1きー","いち","きー"],
+	"2️⃣": ["2きー","2","きー","に"],
+	"3️⃣": ["3きー","3","きー","さん"],
+	"4️⃣": ["4きー","4","よん","きー"],
+	"5️⃣": ["5きー","5","ご","きー"],
+	"6️⃣": ["6きー","6","きー","ろく"],
+	"7️⃣": ["7きー","7","きー","なな"],
+	"8️⃣": ["8きー","8","はち","きー"],
+	"9️⃣": ["9きー","9","きー","きゅう"],
 	"🔟": ["10きー","10","きー","じゅう"],
 	"🔢": ["ばんごうのにゅうりょくきごう","1234","にゅうりょく","すうじ"],
 	"▶️": ["みぎむきさんかく","さいせいぼたん","やじるし","さいせい","みぎ","さんかっけい"],
-	"⏸️": ["2ほんのすいちょくばー","いちじていしぼたん","ばー","2ばい","いちじていし","すいちょく"],
-	"⏯️": ["みぎむきのさんかっけいとにじゅうすいちょくぼう","さいせいまたはいちじていしぼたん","やじるし","いちじていし","さいせい","みぎ","さんかっけい"],
-	"⏹️": ["ていし","ていしぼたん","しかく"],
-	"⏺️": ["ろくが","ろくがぼたん","まる"],
+	"⏸": ["2ほんのすいちょくばー","いちじていしぼたん","ばー","2ばい","いちじていし","すいちょく"],
+	"⏯": ["みぎむきのさんかっけいとにじゅうすいちょくぼう","さいせいまたはいちじていしぼたん","やじるし","いちじていし","さいせい","みぎ","さんかっけい"],
+	"⏹": ["ていし","ていしぼたん","しかく"],
+	"⏺": ["ろくが","ろくがぼたん","まる"],
 	"⏏️": ["とりだしまーく","とりだしぼたん"],
-	"⏭️": ["みぎむきのにじゅうさんかっけいとすいちょくぼう","「つぎのきょく」ぼたん","やじるし","つぎのばめん","つぎのきょく","さんかっけい"],
-	"⏮️": ["ひだりむきのにじゅうさんかっけいとすいちょくぼう","「まえのきょく」ぼたん","やじるし","まえのばめん","まえのきょく","さんかっけい"],
+	"⏭": ["みぎむきのにじゅうさんかっけいとすいちょくぼう","「つぎのきょく」ぼたん","やじるし","つぎのばめん","つぎのきょく","さんかっけい"],
+	"⏮": ["ひだりむきのにじゅうさんかっけいとすいちょくぼう","「まえのきょく」ぼたん","やじるし","まえのばめん","まえのきょく","さんかっけい"],
 	"⏩": ["みぎむきのにじゅうさんかっけい","はやおくりぼたん","やじるし","2ばい","こうそく","すすむ"],
 	"⏪": ["ひだりむきのにじゅうさんかっけい","はやもどしぼたん","やじるし","2ばい","まきもどし"],
 	"🔀": ["ねじりみぎむきやじるしのえもじ","しゃっふる","やじるし","こうさ"],
@@ -1496,7 +1496,7 @@
 	"🔃": ["るーぷやじるし","とけいのはり","やじるし","とけいまわり","りろーど"],
 	"⤴️": ["みぎうえへかーぶするやじるし","うえへかーぶするみぎやじるし","やじるし"],
 	"⤵️": ["みぎしたへかーぶするやじるし","したにかーぶするみぎやじるし","やじるし","した"],
-	"#⃣": ["#きー","はっしゅ","きー","ぽんど"],
+	"#️⃣": ["#きー","はっしゅ","きー","ぽんど"],
 	"*⃣": ["あすたりすくきー","あすたりすく","きー","ほし"],
 	"ℹ️": ["じょうほうげん","i","いんふぉめーしょん"],
 	"🔤": ["あるふぁべっとにゅうりょく","abc","あるふぁべっと","にゅうりょく","らてん","もじ"],
@@ -1532,8 +1532,8 @@
 	"🔵": ["あおまる","あお","えん","きかがく"],
 	"🟣": ["むらさきのまる","えん","きかがく","むらさき"],
 	"🟤": ["ちゃいろのまる","えん","きかがく","ちゃいろ"],
-	"⚫️": ["くろまる","えん","きかがく"],
-	"⚪️": ["しろまる","えん","きかがく"],
+	"⚫": ["くろまる","えん","きかがく"],
+	"⚪": ["しろまる","えん","きかがく"],
 	"🟥": ["あかのせいほうけい","せいほうけい","きかがく","あか"],
 	"🟧": ["おれんじしょくのせいほうけい","せいほうけい","きかがく","おれんじ"],
 	"🟨": ["きいろのせいほうけい","せいほうけい","きかがく","きいろ"],
@@ -1541,12 +1541,12 @@
 	"🟦": ["あおのせいほうけい","せいほうけい","きかがく","あお"],
 	"🟪": ["むらさきのせいほうけい","せいほうけい","きかがく","むらさき"],
 	"🟫": ["ちゃいろのせいほうけい","せいほうけい","きかがく","ちゃいろ"],
-	"⬛️": ["くろいおおきなしかく","きかがく","せいほうけい"],
-	"⬜️": ["しろいおおきなしかく","きかがく","せいほうけい"],
+	"⬛": ["くろいおおきなしかく","きかがく","せいほうけい"],
+	"⬜": ["しろいおおきなしかく","きかがく","せいほうけい"],
 	"◼️": ["くろいちゅうくらいのしかく","きかがく","せいほうけい"],
 	"◻️": ["しろくてちゅうくらいのしかく","きかがく","せいほうけい"],
-	"◾️": ["くろくてちゅうくらいのちいさいしかく","きかがく","せいほうけい"],
-	"◽️": ["しろいちゅうくらいのちいさなしかく","きかがく","せいほうけい"],
+	"◾": ["くろくてちゅうくらいのちいさいしかく","きかがく","せいほうけい"],
+	"◽": ["しろいちゅうくらいのちいさなしかく","きかがく","せいほうけい"],
 	"▪️": ["くろいちいさなしかく","きかがく","せいほうけい"],
 	"▫️": ["しろいちいさなしかく","きかがく","せいほうけい"],
 	"🔸": ["ちいさいおれんじのだいやもんど","だいやもんど","きかがく","おれんじ"],
@@ -1566,16 +1566,16 @@
 	"🔔": ["べる"],
 	"🔕": ["みゅーと","すらっしゅべる","かね","きんじられた","だめ","ない","きんし","しずか"],
 	"🃏": ["とらんぷのじょーかー","かーど","えんたーていめんと","げーむ","じょーかー","ぷれい"],
-	"🀄️": ["まーじゃんぱいのちゅう","げーむ","まーじゃん","あか"],
+	"🀄": ["まーじゃんぱいのちゅう","げーむ","まーじゃん","あか"],
 	"♠️": ["とらんぷのすぺーど","かーど","げーむ","すぺーど","すーつ"],
 	"♣️": ["とらんぷのくらぶ","かーど","くらぶ","げーむ","すーつ"],
 	"♥️": ["とらんぷのはーと","かーど","げーむ","はーと","すーつ"],
 	"♦️": ["とらんぷのだいや","かーど","だいや","だいやもんど","げーむ","すーつ"],
 	"🎴": ["はなふだ","あくてぃびてぃ","かーど","えんたーていめんと","はな","げーむ","にっぽん","ぷれい"],
 	"👁‍🗨": ["ふきだしのめ","ふきだし","め","すぴーち","しょうにん"],
-	"🗨️": ["ひだりむきのふきだし","せりふ","すぴーち"],
+	"🗨": ["ひだりむきのふきだし","せりふ","すぴーち"],
 	"💭": ["かんがえふきだし","ふきだし","あわ","まんが","かんがえ"],
-	"🗯️": ["みぎむきのいかりのふきだし","いかり","ふきだし","あわ","げきど"],
+	"🗯": ["みぎむきのいかりのふきだし","いかり","ふきだし","あわ","げきど"],
 	"💬": ["ふきだし","あわ","まんが","せりふ","すぴーち"],
 	"🕐": ["1じ","0ふん","1","とけい","とき","いち"],
 	"🕑": ["2じ","0ふん","2","とけい","とき","に"],
@@ -1601,7 +1601,7 @@
 	"🕥": ["10じはん","10じ","はん","じこく","じゅう","30"],
 	"🕦": ["11じはん","11じ","はん","じこく","じゅういち","30"],
 	"🕧": ["12じはん","12じ","はん","じこく","30","じゅうに"],
-	"🏳️": ["なびくしろはた","はた","なびく"],
+	"🏳": ["なびくしろはた","はた","なびく"],
 	"🏴": ["なびくくろはた","はた","なびく"],
 	"🏁": ["ちぇっかーふらっぐ","いちまつもよう","はた","れーす"],
 	"🚩": ["さんかくはた","はた","ぽすと"],
@@ -1861,5 +1861,6 @@
 	"🇾🇹": ["まよっとのはた","こっき","まよっと"],
 	"🇿🇦": ["みなみあふりかこっき","こっき","みなみ","みなみあふりか"],
 	"🇿🇲": ["ざんびあこっき","こっき","ざんびあ"],
-	"🇿🇼": ["じんばぶえこっき","こっき","じんばぶえ"]
-}
\ No newline at end of file
+	"🇿🇼": ["じんばぶえこっき","こっき","じんばぶえ"],
+	"": ["しぶや109", "SHIBUYA109", "109"]
+}
-- 
cgit v1.2.3-freya


From 3cb543f75d36302f5937aefa5ba0f39ac107122f Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 20 Jan 2024 18:12:24 +0900
Subject: enhance(reversi): tweak reversi

Resolve #13048
---
 packages/frontend/assets/reversi/matched.mp3       | Bin 0 -> 43884 bytes
 packages/frontend/src/pages/reversi/game.board.vue |   1 +
 packages/frontend/src/pages/reversi/index.vue      |  10 +++++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 packages/frontend/assets/reversi/matched.mp3

diff --git a/packages/frontend/assets/reversi/matched.mp3 b/packages/frontend/assets/reversi/matched.mp3
new file mode 100644
index 0000000000..f26d07614e
Binary files /dev/null and b/packages/frontend/assets/reversi/matched.mp3 differ
diff --git a/packages/frontend/src/pages/reversi/game.board.vue b/packages/frontend/src/pages/reversi/game.board.vue
index b787e301be..3a24777db8 100644
--- a/packages/frontend/src/pages/reversi/game.board.vue
+++ b/packages/frontend/src/pages/reversi/game.board.vue
@@ -487,6 +487,7 @@ $gap: 4px;
 	aspect-ratio: 1;
 	transform-style: preserve-3d;
 	perspective: 150px;
+	transition: border 0.25s ease, opacity 0.25s ease;
 
 	&.boardCell_empty {
 		border: solid 2px var(--divider);
diff --git a/packages/frontend/src/pages/reversi/index.vue b/packages/frontend/src/pages/reversi/index.vue
index d33acc95a9..5fbbbef2c5 100644
--- a/packages/frontend/src/pages/reversi/index.vue
+++ b/packages/frontend/src/pages/reversi/index.vue
@@ -10,11 +10,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<img src="/client-assets/reversi/logo.png" style="display: block; max-width: 100%; max-height: 200px; margin: auto;"/>
 		</div>
 
-		<div class="_panel" style="padding: 16px;">
+		<div class="_panel _gaps" style="padding: 16px;">
 			<div class="_buttonsCenter">
 				<MkButton primary gradate rounded @click="matchAny">{{ i18n.ts._reversi.freeMatch }}</MkButton>
 				<MkButton primary gradate rounded @click="matchUser">{{ i18n.ts.invite }}</MkButton>
 			</div>
+			<div style="font-size: 90%; opacity: 0.7; text-align: center;"><i class="ti ti-music"></i> {{ i18n.ts.soundWillBePlayed }}</div>
 		</div>
 
 		<MkFolder v-if="invitations.length > 0" :defaultOpen="true">
@@ -101,6 +102,7 @@ import MkPagination from '@/components/MkPagination.vue';
 import { useRouter } from '@/global/router/supplier.js';
 import * as os from '@/os.js';
 import { useInterval } from '@/scripts/use-interval.js';
+import * as sound from '@/scripts/sound.js';
 
 const myGamesPagination = {
 	endpoint: 'reversi/games' as const,
@@ -141,6 +143,12 @@ const matchingAny = ref<boolean>(false);
 function startGame(game: Misskey.entities.ReversiGameDetailed) {
 	matchingUser.value = null;
 	matchingAny.value = false;
+
+	sound.playUrl('/client-assets/reversi/matched.mp3', {
+		volume: 1,
+		playbackRate: 1,
+	});
+
 	router.push(`/reversi/g/${game.id}`);
 }
 
-- 
cgit v1.2.3-freya


From 7d574870265197e5e9ba1d56b0b2d8ee44a0647f Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 20 Jan 2024 18:14:20 +0900
Subject: Update Dockerfile

---
 Dockerfile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 922ce4dca3..a8d3dbcd89 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,6 +24,8 @@ COPY --link ["packages/backend/package.json", "./packages/backend/"]
 COPY --link ["packages/frontend/package.json", "./packages/frontend/"]
 COPY --link ["packages/sw/package.json", "./packages/sw/"]
 COPY --link ["packages/misskey-js/package.json", "./packages/misskey-js/"]
+COPY --link ["packages/misskey-reversi/package.json", "./packages/misskey-reversi/"]
+COPY --link ["packages/misskey-bubble-game/package.json", "./packages/misskey-bubble-game/"]
 
 RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \
 	pnpm i --frozen-lockfile --aggregate-output
@@ -52,6 +54,8 @@ COPY --link ["pnpm-lock.yaml", "pnpm-workspace.yaml", "package.json", "./"]
 COPY --link ["scripts", "./scripts"]
 COPY --link ["packages/backend/package.json", "./packages/backend/"]
 COPY --link ["packages/misskey-js/package.json", "./packages/misskey-js/"]
+COPY --link ["packages/misskey-reversi/package.json", "./packages/misskey-reversi/"]
+COPY --link ["packages/misskey-bubble-game/package.json", "./packages/misskey-bubble-game/"]
 
 RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \
 	pnpm i --frozen-lockfile --aggregate-output
@@ -79,8 +83,12 @@ WORKDIR /misskey
 COPY --chown=misskey:misskey --from=target-builder /misskey/node_modules ./node_modules
 COPY --chown=misskey:misskey --from=target-builder /misskey/packages/backend/node_modules ./packages/backend/node_modules
 COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-js/node_modules ./packages/misskey-js/node_modules
+COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-reversi/node_modules ./packages/misskey-reversi/node_modules
+COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-bubble-game/node_modules ./packages/misskey-bubble-game/node_modules
 COPY --chown=misskey:misskey --from=native-builder /misskey/built ./built
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-js/built ./packages/misskey-js/built
+COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-reversi/built ./packages/misskey-reversi/built
+COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-bubble-game/built ./packages/misskey-bubble-game/built
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/built ./packages/backend/built
 COPY --chown=misskey:misskey --from=native-builder /misskey/fluent-emojis /misskey/fluent-emojis
 COPY --chown=misskey:misskey . ./
-- 
cgit v1.2.3-freya


From fcd7ffe95639ac74117e438ba68c5e3df7560dcb Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 20 Jan 2024 21:23:33 +0900
Subject: enhance(reversi): tweak reversi

---
 packages/backend/src/core/GlobalEventService.ts    |  4 +-
 packages/backend/src/core/ReversiService.ts        |  5 +++
 .../src/server/api/stream/channels/reversi-game.ts | 14 +++++--
 packages/frontend/src/pages/reversi/game.board.vue | 47 +++++++++++++++++++---
 packages/frontend/src/pages/reversi/index.vue      | 10 ++++-
 packages/frontend/src/scripts/use-interval.ts      | 12 +++++-
 6 files changed, 79 insertions(+), 13 deletions(-)

diff --git a/packages/backend/src/core/GlobalEventService.ts b/packages/backend/src/core/GlobalEventService.ts
index 896149f238..e599912e2b 100644
--- a/packages/backend/src/core/GlobalEventService.ts
+++ b/packages/backend/src/core/GlobalEventService.ts
@@ -181,8 +181,8 @@ export interface ReversiGameEventTypes {
 		value: any;
 	};
 	log: Reversi.Serializer.Log & { id: string | null };
-	syncState: {
-		crc32: string;
+	heatbeat: {
+		userId: MiUser['id'];
 	};
 	started: {
 		game: Packed<'ReversiGameDetailed'>;
diff --git a/packages/backend/src/core/ReversiService.ts b/packages/backend/src/core/ReversiService.ts
index 9fe7255e48..e626cbaf19 100644
--- a/packages/backend/src/core/ReversiService.ts
+++ b/packages/backend/src/core/ReversiService.ts
@@ -405,6 +405,11 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 		return this.reversiGamesRepository.findOneBy({ id });
 	}
 
+	@bindThis
+	public async heatbeat(game: MiReversiGame, user: MiUser) {
+		this.globalEventService.publishReversiGameStream(game.id, 'heatbeat', { userId: user.id });
+	}
+
 	@bindThis
 	public dispose(): void {
 	}
diff --git a/packages/backend/src/server/api/stream/channels/reversi-game.ts b/packages/backend/src/server/api/stream/channels/reversi-game.ts
index 2d8c396db9..c5d05e5cfb 100644
--- a/packages/backend/src/server/api/stream/channels/reversi-game.ts
+++ b/packages/backend/src/server/api/stream/channels/reversi-game.ts
@@ -46,7 +46,7 @@ class ReversiGameChannel extends Channel {
 			case 'ready': this.ready(body); break;
 			case 'updateSettings': this.updateSettings(body.key, body.value); break;
 			case 'putStone': this.putStone(body.pos, body.id); break;
-			case 'syncState': this.syncState(body.crc32); break;
+			case 'heatbeat': this.heatbeat(body.crc32); break;
 		}
 	}
 
@@ -83,15 +83,21 @@ class ReversiGameChannel extends Channel {
 	}
 
 	@bindThis
-	private async syncState(crc32: string | number) {
+	private async heatbeat(crc32?: string | number | null) {
 		// TODO: キャッシュしたい
 		const game = await this.reversiGamesRepository.findOneBy({ id: this.gameId! });
 		if (game == null) throw new Error('game not found');
 
 		if (!game.isStarted) return;
 
-		if (crc32.toString() !== game.crc32) {
-			this.send('rescue', await this.reversiGameEntityService.packDetail(game, this.user));
+		if (crc32 != null) {
+			if (crc32.toString() !== game.crc32) {
+				this.send('rescue', await this.reversiGameEntityService.packDetail(game, this.user));
+			}
+		}
+
+		if (this.user && (game.user1Id === this.user.id || game.user2Id === this.user.id)) {
+			this.reversiService.heatbeat(game, this.user);
 		}
 	}
 
diff --git a/packages/frontend/src/pages/reversi/game.board.vue b/packages/frontend/src/pages/reversi/game.board.vue
index 3a24777db8..2f09cf39e8 100644
--- a/packages/frontend/src/pages/reversi/game.board.vue
+++ b/packages/frontend/src/pages/reversi/game.board.vue
@@ -22,7 +22,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<div v-if="(logPos !== game.logs.length) && turnUser" class="turn">
 				<Mfm :key="'past-turn-of:' + turnUser.id" :text="i18n.tsx._reversi.pastTurnOf({ name: turnUser.name ?? turnUser.username })" :plain="true" :customEmojis="turnUser.emojis"/>
 			</div>
-			<div v-if="iAmPlayer && !game.isEnded && !isMyTurn" class="turn1">{{ i18n.ts._reversi.opponentTurn }}<MkEllipsis/></div>
+			<div v-if="iAmPlayer && !game.isEnded && !isMyTurn" class="turn1">{{ i18n.ts._reversi.opponentTurn }}<MkEllipsis/><soan v-if="opponentNotResponding" style="margin-left: 8px;">({{ i18n.ts.notResponding }})</soan></div>
 			<div v-if="iAmPlayer && !game.isEnded && isMyTurn" class="turn2" style="animation: tada 1s linear infinite both;">{{ i18n.ts._reversi.myTurn }}</div>
 			<div v-if="game.isEnded && logPos == game.logs.length" class="result">
 				<template v-if="game.winner">
@@ -139,7 +139,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, onUnmounted, ref, shallowRef, triggerRef, watch } from 'vue';
+import { computed, onActivated, onDeactivated, onMounted, onUnmounted, ref, shallowRef, triggerRef, watch } from 'vue';
 import * as CRC32 from 'crc-32';
 import * as Misskey from 'misskey-js';
 import * as Reversi from 'misskey-reversi';
@@ -239,7 +239,7 @@ if (game.value.isStarted && !game.value.isEnded) {
 		if (game.value.isEnded) return;
 		const crc32 = CRC32.str(JSON.stringify(game.value.logs)).toString();
 		if (_DEV_) console.log('crc32', crc32);
-		props.connection.send('syncState', {
+		props.connection.send('heatbeat', {
 			crc32: crc32,
 		});
 	}, 10000, { immediate: false, afterMounted: true });
@@ -339,6 +339,27 @@ function onStreamRescue(_game) {
 	checkEnd();
 }
 
+const opponentLastHeatbeatedAt = ref<number>(Date.now());
+const opponentNotResponding = ref<boolean>(false);
+
+useInterval(() => {
+	if (game.value.isEnded) return;
+	if (!iAmPlayer.value) return;
+
+	if (Date.now() - opponentLastHeatbeatedAt.value > 20000) {
+		opponentNotResponding.value = true;
+	} else {
+		opponentNotResponding.value = false;
+	}
+}, 1000, { immediate: false, afterMounted: true });
+
+function onStreamHeatbeat({ userId }) {
+	if ($i.id === userId) return;
+
+	opponentNotResponding.value = false;
+	opponentLastHeatbeatedAt.value = Date.now();
+}
+
 async function surrender() {
 	const { canceled } = await os.confirm({
 		type: 'warning',
@@ -390,12 +411,28 @@ function share() {
 
 onMounted(() => {
 	props.connection.on('log', onStreamLog);
+	props.connection.on('heatbeat', onStreamHeatbeat);
 	props.connection.on('rescue', onStreamRescue);
 	props.connection.on('ended', onStreamEnded);
 });
 
+onActivated(() => {
+	props.connection.on('log', onStreamLog);
+	props.connection.on('heatbeat', onStreamHeatbeat);
+	props.connection.on('rescue', onStreamRescue);
+	props.connection.on('ended', onStreamEnded);
+});
+
+onDeactivated(() => {
+	props.connection.off('log', onStreamLog);
+	props.connection.off('heatbeat', onStreamHeatbeat);
+	props.connection.off('rescue', onStreamRescue);
+	props.connection.off('ended', onStreamEnded);
+});
+
 onUnmounted(() => {
 	props.connection.off('log', onStreamLog);
+	props.connection.off('heatbeat', onStreamHeatbeat);
 	props.connection.off('rescue', onStreamRescue);
 	props.connection.off('ended', onStreamEnded);
 });
@@ -483,7 +520,7 @@ $gap: 4px;
 
 .boardCell {
 	background: transparent;
-	border-radius: 6px;
+	border-radius: 100%;
 	aspect-ratio: 1;
 	transform-style: preserve-3d;
 	perspective: 150px;
@@ -534,6 +571,6 @@ $gap: 4px;
 	display: block;
 	width: 100%;
 	height: 100%;
-	border-radius: 6px;
+	border-radius: 100%;
 }
 </style>
diff --git a/packages/frontend/src/pages/reversi/index.vue b/packages/frontend/src/pages/reversi/index.vue
index 5fbbbef2c5..796e732208 100644
--- a/packages/frontend/src/pages/reversi/index.vue
+++ b/packages/frontend/src/pages/reversi/index.vue
@@ -89,7 +89,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, onUnmounted, ref } from 'vue';
+import { computed, onDeactivated, onMounted, onUnmounted, ref } from 'vue';
 import * as Misskey from 'misskey-js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
@@ -214,6 +214,14 @@ onMounted(() => {
 	});
 });
 
+onDeactivated(() => {
+	cancelMatching();
+});
+
+onUnmounted(() => {
+	cancelMatching();
+});
+
 definePageMetadata(computed(() => ({
 	title: 'Reversi',
 	icon: 'ti ti-device-gamepad',
diff --git a/packages/frontend/src/scripts/use-interval.ts b/packages/frontend/src/scripts/use-interval.ts
index b8c5431fb6..d8ffb2205b 100644
--- a/packages/frontend/src/scripts/use-interval.ts
+++ b/packages/frontend/src/scripts/use-interval.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { onMounted, onUnmounted } from 'vue';
+import { onActivated, onDeactivated, onMounted, onUnmounted } from 'vue';
 
 export function useInterval(fn: () => void, interval: number, options: {
 	immediate: boolean;
@@ -28,6 +28,16 @@ export function useInterval(fn: () => void, interval: number, options: {
 		intervalId = null;
 	};
 
+	onActivated(() => {
+		if (intervalId) return;
+		if (options.immediate) fn();
+		intervalId = window.setInterval(fn, interval);
+	});
+
+	onDeactivated(() => {
+		clear();
+	});
+
 	onUnmounted(() => {
 		clear();
 	});
-- 
cgit v1.2.3-freya


From 576484835ebe0c896b7fd242c7f8d58b32579da6 Mon Sep 17 00:00:00 2001
From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 21 Jan 2024 05:26:13 +0900
Subject: enhance(frontend):
 ノート作成画面の添付メニューから直接ファイルを消せるように (#12858)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* (enhance) 添付画面から直接ファイルを消せるように

* Update Changelog

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---
 CHANGELOG.md                                       |  1 +
 locales/index.d.ts                                 |  1 +
 locales/ja-JP.yml                                  |  1 +
 .../frontend/src/components/MkPostFormAttaches.vue | 24 ++++++++++++++++++++++
 4 files changed, 27 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6dd704c5b..993899ca2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@
 - Enhance: 絵文字ピッカー・オートコンプリートで、完全一致した絵文字を優先的に表示するように
 - Enhance: Playの説明欄にMFMを使えるように
 - Enhance: チャンネルノートの場合は詳細ページからその前後のノートを見れるように
+- Enhance: ノート作成画面のファイル添付メニューから直接ファイルを削除できるように
 - Enhance: MFMの属性でオートコンプリートが使用できるように #12735
 - Fix: ネイティブモードの絵文字がモノクロにならないように
 - Fix: v2023.12.0で追加された「モデレーターがユーザーのアイコンもしくはバナー画像を未設定状態にできる機能」が管理画面上で正しく表示されていない問題を修正
diff --git a/locales/index.d.ts b/locales/index.d.ts
index f7f952175f..5656e9fbca 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -536,6 +536,7 @@ export interface Locale extends ILocale {
      * 添付取り消し
      */
     "attachCancel": string;
+    "deleteFile": string;
     /**
      * センシティブとして設定
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 6c8a453023..86f253c8c4 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -130,6 +130,7 @@ overwriteFromPinnedEmojis: "全般設定から上書きする"
 reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、＋を押して追加します。"
 rememberNoteVisibility: "公開範囲を記憶する"
 attachCancel: "添付取り消し"
+deleteFile: "ファイルを削除"
 markAsSensitive: "センシティブとして設定"
 unmarkAsSensitive: "センシティブを解除する"
 enterFileName: "ファイル名を入力"
diff --git a/packages/frontend/src/components/MkPostFormAttaches.vue b/packages/frontend/src/components/MkPostFormAttaches.vue
index 31dc48194e..7e8b3b1167 100644
--- a/packages/frontend/src/components/MkPostFormAttaches.vue
+++ b/packages/frontend/src/components/MkPostFormAttaches.vue
@@ -56,6 +56,23 @@ function detachMedia(id: string) {
 	}
 }
 
+async function detachAndDeleteMedia(file: Misskey.entities.DriveFile) {
+	if (mock) return;
+
+	detachMedia(file.id);
+
+	const { canceled } = await os.confirm({
+		type: 'warning',
+		text: i18n.t('driveFileDeleteConfirm', { name: file.name }),
+	});
+
+	if (canceled) return;
+
+	os.apiWithDialog('drive/files/delete', {
+		fileId: file.id,
+	});
+}
+
 function toggleSensitive(file) {
 	if (mock) {
 		emit('changeSensitive', file, !file.isSensitive);
@@ -138,6 +155,13 @@ function showFileMenu(file: Misskey.entities.DriveFile, ev: MouseEvent): void {
 		text: i18n.ts.attachCancel,
 		icon: 'ti ti-circle-x',
 		action: () => { detachMedia(file.id); },
+	}, {
+		type: 'divider',
+	}, {
+		text: i18n.ts.deleteFile,
+		icon: 'ti ti-trash',
+		danger: true,
+		action: () => { detachAndDeleteMedia(file); },
 	}], ev.currentTarget ?? ev.target).then(() => menuShowing = false);
 	menuShowing = true;
 }
-- 
cgit v1.2.3-freya


From a17251d913c822e3113b47ed8135eecb3f06c445 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 21 Jan 2024 10:07:43 +0900
Subject: enhance(reversi): tweak reversi

---
 locales/index.d.ts                                 |  11 +
 locales/ja-JP.yml                                  |   2 +
 .../backend/migration/1705793785675-reversi-3.js   |  18 ++
 .../backend/migration/1705794768153-reversi-4.js   |  18 ++
 .../backend/migration/1705798904141-reversi-5.js   |  16 ++
 packages/backend/src/core/GlobalEventService.ts    |   3 -
 packages/backend/src/core/ReversiService.ts        | 240 ++++++++++++++++-----
 .../src/core/entities/ReversiGameEntityService.ts  |  10 +-
 packages/backend/src/models/ReversiGame.ts         |  20 +-
 .../backend/src/models/json-schema/reversi-game.ts |  32 ++-
 .../src/server/api/endpoints/reversi/surrender.ts  |   2 +-
 .../src/server/api/stream/channels/reversi-game.ts |  49 ++---
 packages/frontend/src/pages/reversi/game.board.vue |  65 +++---
 .../frontend/src/pages/reversi/game.setting.vue    |  20 ++
 packages/misskey-js/src/autogen/apiClientJSDoc.ts  |   2 +-
 packages/misskey-js/src/autogen/endpoint.ts        |   2 +-
 packages/misskey-js/src/autogen/entities.ts        |   2 +-
 packages/misskey-js/src/autogen/models.ts          |   2 +-
 packages/misskey-js/src/autogen/types.ts           |  16 +-
 19 files changed, 395 insertions(+), 135 deletions(-)
 create mode 100644 packages/backend/migration/1705793785675-reversi-3.js
 create mode 100644 packages/backend/migration/1705794768153-reversi-4.js
 create mode 100644 packages/backend/migration/1705798904141-reversi-5.js

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 5656e9fbca..6e763cda10 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -536,6 +536,9 @@ export interface Locale extends ILocale {
      * 添付取り消し
      */
     "attachCancel": string;
+    /**
+     * ファイルを削除
+     */
     "deleteFile": string;
     /**
      * センシティブとして設定
@@ -9482,6 +9485,10 @@ export interface Locale extends ILocale {
          * 投了により
          */
         "surrendered": string;
+        /**
+         * 時間切れ
+         */
+        "timeout": string;
         /**
          * 引き分け
          */
@@ -9534,6 +9541,10 @@ export interface Locale extends ILocale {
          * どこでも置けるモード
          */
         "canPutEverywhere": string;
+        /**
+         * 1ターンの時間制限
+         */
+        "timeLimitForEachTurn": string;
         /**
          * フリーマッチ
          */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 86f253c8c4..fd1c891ee7 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2527,6 +2527,7 @@ _reversi:
   pastTurnOf: "{name}のターン"
   surrender: "投了"
   surrendered: "投了により"
+  timeout: "時間切れ"
   drawn: "引き分け"
   won: "{name}の勝ち"
   black: "黒"
@@ -2540,5 +2541,6 @@ _reversi:
   isLlotheo: "石の少ない方が勝ち(ロセオ)"
   loopedMap: "ループマップ"
   canPutEverywhere: "どこでも置けるモード"
+  timeLimitForEachTurn: "1ターンの時間制限"
   freeMatch: "フリーマッチ"
   lookingForPlayer: "対戦相手を探しています"
diff --git a/packages/backend/migration/1705793785675-reversi-3.js b/packages/backend/migration/1705793785675-reversi-3.js
new file mode 100644
index 0000000000..2faf9ae6d5
--- /dev/null
+++ b/packages/backend/migration/1705793785675-reversi-3.js
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class Reversi31705793785675 {
+    name = 'Reversi31705793785675'
+
+    async up(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "reversi_game" RENAME COLUMN "surrendered" TO "surrenderedUserId"`);
+        await queryRunner.query(`ALTER TABLE "reversi_game" ADD "timeoutUserId" character varying(32)`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "reversi_game" DROP COLUMN "timeoutUserId"`);
+			await queryRunner.query(`ALTER TABLE "reversi_game" RENAME COLUMN "surrenderedUserId" TO "surrendered"`);
+    }
+}
diff --git a/packages/backend/migration/1705794768153-reversi-4.js b/packages/backend/migration/1705794768153-reversi-4.js
new file mode 100644
index 0000000000..5b7bacb21e
--- /dev/null
+++ b/packages/backend/migration/1705794768153-reversi-4.js
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class Reversi41705794768153 {
+    name = 'Reversi41705794768153'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "reversi_game" ADD "endedAt" TIMESTAMP WITH TIME ZONE`);
+        await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."endedAt" IS 'The ended date of the ReversiGame.'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`COMMENT ON COLUMN "reversi_game"."endedAt" IS 'The ended date of the ReversiGame.'`);
+        await queryRunner.query(`ALTER TABLE "reversi_game" DROP COLUMN "endedAt"`);
+    }
+}
diff --git a/packages/backend/migration/1705798904141-reversi-5.js b/packages/backend/migration/1705798904141-reversi-5.js
new file mode 100644
index 0000000000..7ca7221604
--- /dev/null
+++ b/packages/backend/migration/1705798904141-reversi-5.js
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class Reversi51705798904141 {
+    name = 'Reversi51705798904141'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "reversi_game" ADD "timeLimitForEachTurn" smallint NOT NULL DEFAULT '90'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "reversi_game" DROP COLUMN "timeLimitForEachTurn"`);
+    }
+}
diff --git a/packages/backend/src/core/GlobalEventService.ts b/packages/backend/src/core/GlobalEventService.ts
index e599912e2b..5ddd100e6c 100644
--- a/packages/backend/src/core/GlobalEventService.ts
+++ b/packages/backend/src/core/GlobalEventService.ts
@@ -181,9 +181,6 @@ export interface ReversiGameEventTypes {
 		value: any;
 	};
 	log: Reversi.Serializer.Log & { id: string | null };
-	heatbeat: {
-		userId: MiUser['id'];
-	};
 	started: {
 		game: Packed<'ReversiGameDetailed'>;
 	};
diff --git a/packages/backend/src/core/ReversiService.ts b/packages/backend/src/core/ReversiService.ts
index e626cbaf19..b2a4032d4b 100644
--- a/packages/backend/src/core/ReversiService.ts
+++ b/packages/backend/src/core/ReversiService.ts
@@ -25,6 +25,7 @@ import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { IdService } from '@/core/IdService.js';
 import type { Packed } from '@/misc/json-schema.js';
 import { NotificationService } from '@/core/NotificationService.js';
+import { Serialized } from '@/types.js';
 import { ReversiGameEntityService } from './entities/ReversiGameEntityService.js';
 import type { OnApplicationShutdown, OnModuleInit } from '@nestjs/common';
 
@@ -55,6 +56,11 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 		this.notificationService = this.moduleRef.get(NotificationService.name);
 	}
 
+	@bindThis
+	private async cacheGame(game: MiReversiGame) {
+		await this.redisClient.setex(`reversi:game:cache:${game.id}`, 60 * 3, JSON.stringify(game));
+	}
+
 	@bindThis
 	public async matchSpecificUser(me: MiUser, targetUser: MiUser): Promise<MiReversiGame | null> {
 		if (targetUser.id === me.id) {
@@ -83,6 +89,7 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 				bw: 'random',
 				isLlotheo: false,
 			}).then(x => this.reversiGamesRepository.findOneByOrFail(x.identifiers[0]));
+			this.cacheGame(game);
 
 			const packed = await this.reversiGameEntityService.packDetail(game, { id: targetUser.id });
 			this.globalEventService.publishReversiStream(targetUser.id, 'matched', { game: packed });
@@ -125,6 +132,7 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 				bw: 'random',
 				isLlotheo: false,
 			}).then(x => this.reversiGamesRepository.findOneByOrFail(x.identifiers[0]));
+			this.cacheGame(game);
 
 			const packed = await this.reversiGameEntityService.packDetail(game, { id: invitorId });
 			this.globalEventService.publishReversiStream(invitorId, 'matched', { game: packed });
@@ -160,6 +168,7 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 				bw: 'random',
 				isLlotheo: false,
 			}).then(x => this.reversiGamesRepository.findOneByOrFail(x.identifiers[0]));
+			this.cacheGame(game);
 
 			const packed = await this.reversiGameEntityService.packDetail(game, { id: matchedUserId });
 			this.globalEventService.publishReversiStream(matchedUserId, 'matched', { game: packed });
@@ -182,33 +191,47 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 	}
 
 	@bindThis
-	public async gameReady(game: MiReversiGame, user: MiUser, ready: boolean) {
+	public async gameReady(gameId: MiReversiGame['id'], user: MiUser, ready: boolean) {
+		const game = await this.get(gameId);
+		if (game == null) throw new Error('game not found');
 		if (game.isStarted) return;
 
 		let isBothReady = false;
 
 		if (game.user1Id === user.id) {
-			await this.reversiGamesRepository.update(game.id, {
-				user1Ready: ready,
-			});
+			const updatedGame = await this.reversiGamesRepository.createQueryBuilder().update()
+				.set({
+					user1Ready: ready,
+				})
+				.where('id = :id', { id: game.id })
+				.returning('*')
+				.execute()
+				.then((response) => response.raw[0]);
+			this.cacheGame(updatedGame);
 
 			this.globalEventService.publishReversiGameStream(game.id, 'changeReadyStates', {
 				user1: ready,
-				user2: game.user2Ready,
+				user2: updatedGame.user2Ready,
 			});
 
-			if (ready && game.user2Ready) isBothReady = true;
+			if (ready && updatedGame.user2Ready) isBothReady = true;
 		} else if (game.user2Id === user.id) {
-			await this.reversiGamesRepository.update(game.id, {
-				user2Ready: ready,
-			});
+			const updatedGame = await this.reversiGamesRepository.createQueryBuilder().update()
+				.set({
+					user2Ready: ready,
+				})
+				.where('id = :id', { id: game.id })
+				.returning('*')
+				.execute()
+				.then((response) => response.raw[0]);
+			this.cacheGame(updatedGame);
 
 			this.globalEventService.publishReversiGameStream(game.id, 'changeReadyStates', {
-				user1: game.user1Ready,
+				user1: updatedGame.user1Ready,
 				user2: ready,
 			});
 
-			if (ready && game.user1Ready) isBothReady = true;
+			if (ready && updatedGame.user1Ready) isBothReady = true;
 		} else {
 			return;
 		}
@@ -237,45 +260,62 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 
 				const crc32 = CRC32.str(JSON.stringify(freshGame.logs)).toString();
 
-				await this.reversiGamesRepository.update(game.id, {
-					startedAt: new Date(),
-					isStarted: true,
-					black: bw,
-					map: map,
-					crc32,
-				});
+				const updatedGame = await this.reversiGamesRepository.createQueryBuilder().update()
+					.set({
+						startedAt: new Date(),
+						isStarted: true,
+						black: bw,
+						map: map,
+						crc32,
+					})
+					.where('id = :id', { id: game.id })
+					.returning('*')
+					.execute()
+					.then((response) => response.raw[0]);
+				this.cacheGame(updatedGame);
 
 				//#region 盤面に最初から石がないなどして始まった瞬間に勝敗が決定する場合があるのでその処理
-				const o = new Reversi.Game(map, {
+				const engine = new Reversi.Game(map, {
 					isLlotheo: freshGame.isLlotheo,
 					canPutEverywhere: freshGame.canPutEverywhere,
 					loopedBoard: freshGame.loopedBoard,
 				});
 
-				if (o.isEnded) {
+				if (engine.isEnded) {
 					let winner;
-					if (o.winner === true) {
-						winner = freshGame.black === 1 ? freshGame.user1Id : freshGame.user2Id;
-					} else if (o.winner === false) {
-						winner = freshGame.black === 1 ? freshGame.user2Id : freshGame.user1Id;
+					if (engine.winner === true) {
+						winner = bw === 1 ? freshGame.user1Id : freshGame.user2Id;
+					} else if (engine.winner === false) {
+						winner = bw === 1 ? freshGame.user2Id : freshGame.user1Id;
 					} else {
 						winner = null;
 					}
 
-					await this.reversiGamesRepository.update(game.id, {
-						isEnded: true,
-						winnerId: winner,
-					});
+					const updatedGame = await this.reversiGamesRepository.createQueryBuilder().update()
+						.set({
+							isEnded: true,
+							endedAt: new Date(),
+							winnerId: winner,
+						})
+						.where('id = :id', { id: game.id })
+						.returning('*')
+						.execute()
+						.then((response) => response.raw[0]);
+					this.cacheGame(updatedGame);
 
 					this.globalEventService.publishReversiGameStream(game.id, 'ended', {
 						winnerId: winner,
-						game: await this.reversiGameEntityService.packDetail(game.id, user),
+						game: await this.reversiGameEntityService.packDetail(game.id),
 					});
+
+					return;
 				}
 				//#endregion
 
+				this.redisClient.setex(`reversi:game:turnTimer:${game.id}:1`, updatedGame.timeLimitForEachTurn, '');
+
 				this.globalEventService.publishReversiGameStream(game.id, 'started', {
-					game: await this.reversiGameEntityService.packDetail(game.id, user),
+					game: await this.reversiGameEntityService.packDetail(game.id),
 				});
 			}, 3000);
 		}
@@ -292,17 +332,27 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 	}
 
 	@bindThis
-	public async updateSettings(game: MiReversiGame, user: MiUser, key: string, value: any) {
+	public async updateSettings(gameId: MiReversiGame['id'], user: MiUser, key: string, value: any) {
+		const game = await this.get(gameId);
+		if (game == null) throw new Error('game not found');
 		if (game.isStarted) return;
 		if ((game.user1Id !== user.id) && (game.user2Id !== user.id)) return;
 		if ((game.user1Id === user.id) && game.user1Ready) return;
 		if ((game.user2Id === user.id) && game.user2Ready) return;
 
-		if (!['map', 'bw', 'isLlotheo', 'canPutEverywhere', 'loopedBoard'].includes(key)) return;
+		if (!['map', 'bw', 'isLlotheo', 'canPutEverywhere', 'loopedBoard', 'timeLimitForEachTurn'].includes(key)) return;
 
-		await this.reversiGamesRepository.update(game.id, {
-			[key]: value,
-		});
+		// TODO: より厳格なバリデーション
+
+		const updatedGame = await this.reversiGamesRepository.createQueryBuilder().update()
+			.set({
+				[key]: value,
+			})
+			.where('id = :id', { id: game.id })
+			.returning('*')
+			.execute()
+			.then((response) => response.raw[0]);
+		this.cacheGame(updatedGame);
 
 		this.globalEventService.publishReversiGameStream(game.id, 'updateSettings', {
 			userId: user.id,
@@ -312,7 +362,9 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 	}
 
 	@bindThis
-	public async putStoneToGame(game: MiReversiGame, user: MiUser, pos: number, id?: string | null) {
+	public async putStoneToGame(gameId: MiReversiGame['id'], user: MiUser, pos: number, id?: string | null) {
+		const game = await this.get(gameId);
+		if (game == null) throw new Error('game not found');
 		if (!game.isStarted) return;
 		if (game.isEnded) return;
 		if ((game.user1Id !== user.id) && (game.user2Id !== user.id)) return;
@@ -361,12 +413,18 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 
 		const crc32 = CRC32.str(JSON.stringify(serializeLogs)).toString();
 
-		await this.reversiGamesRepository.update(game.id, {
-			crc32,
-			isEnded: engine.isEnded,
-			winnerId: winner,
-			logs: serializeLogs,
-		});
+		const updatedGame = await this.reversiGamesRepository.createQueryBuilder().update()
+			.set({
+				crc32,
+				isEnded: engine.isEnded,
+				winnerId: winner,
+				logs: serializeLogs,
+			})
+			.where('id = :id', { id: game.id })
+			.returning('*')
+			.execute()
+			.then((response) => response.raw[0]);
+		this.cacheGame(updatedGame);
 
 		this.globalEventService.publishReversiGameStream(game.id, 'log', {
 			...log,
@@ -376,38 +434,112 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 		if (engine.isEnded) {
 			this.globalEventService.publishReversiGameStream(game.id, 'ended', {
 				winnerId: winner ?? null,
-				game: await this.reversiGameEntityService.packDetail(game.id, user),
+				game: await this.reversiGameEntityService.packDetail(game.id),
 			});
+		} else {
+			this.redisClient.setex(`reversi:game:turnTimer:${game.id}:${engine.turn ? '1' : '0'}`, updatedGame.timeLimitForEachTurn, '');
 		}
 	}
 
 	@bindThis
-	public async surrender(game: MiReversiGame, user: MiUser) {
+	public async surrender(gameId: MiReversiGame['id'], user: MiUser) {
+		const game = await this.get(gameId);
+		if (game == null) throw new Error('game not found');
 		if (game.isEnded) return;
 		if ((game.user1Id !== user.id) && (game.user2Id !== user.id)) return;
 
 		const winnerId = game.user1Id === user.id ? game.user2Id : game.user1Id;
 
-		await this.reversiGamesRepository.update(game.id, {
-			surrendered: user.id,
-			isEnded: true,
-			winnerId: winnerId,
-		});
+		const updatedGame = await this.reversiGamesRepository.createQueryBuilder().update()
+			.set({
+				isEnded: true,
+				endedAt: new Date(),
+				winnerId: winnerId,
+				surrenderedUserId: user.id,
+			})
+			.where('id = :id', { id: game.id })
+			.returning('*')
+			.execute()
+			.then((response) => response.raw[0]);
+		this.cacheGame(updatedGame);
 
 		this.globalEventService.publishReversiGameStream(game.id, 'ended', {
 			winnerId: winnerId,
-			game: await this.reversiGameEntityService.packDetail(game.id, user),
+			game: await this.reversiGameEntityService.packDetail(game.id),
 		});
 	}
 
 	@bindThis
-	public async get(id: MiReversiGame['id']) {
-		return this.reversiGamesRepository.findOneBy({ id });
+	public async checkTimeout(gameId: MiReversiGame['id']) {
+		const game = await this.get(gameId);
+		if (game == null) throw new Error('game not found');
+		if (game.isEnded) return;
+
+		const engine = Reversi.Serializer.restoreGame({
+			map: game.map,
+			isLlotheo: game.isLlotheo,
+			canPutEverywhere: game.canPutEverywhere,
+			loopedBoard: game.loopedBoard,
+			logs: game.logs,
+		});
+
+		if (engine.turn == null) return;
+
+		const timer = await this.redisClient.exists(`reversi:game:turnTimer:${game.id}:${engine.turn ? '1' : '0'}`);
+
+		if (timer === 0) {
+			const winnerId = engine.turn ? (game.black === 1 ? game.user2Id : game.user1Id) : (game.black === 1 ? game.user1Id : game.user2Id);
+
+			const updatedGame = await this.reversiGamesRepository.createQueryBuilder().update()
+				.set({
+					isEnded: true,
+					endedAt: new Date(),
+					winnerId: winnerId,
+					timeoutUserId: engine.turn ? (game.black === 1 ? game.user1Id : game.user2Id) : (game.black === 1 ? game.user2Id : game.user1Id),
+				})
+				.where('id = :id', { id: game.id })
+				.returning('*')
+				.execute()
+				.then((response) => response.raw[0]);
+			this.cacheGame(updatedGame);
+
+			this.globalEventService.publishReversiGameStream(game.id, 'ended', {
+				winnerId: winnerId,
+				game: await this.reversiGameEntityService.packDetail(game.id),
+			});
+		}
+	}
+
+	@bindThis
+	public async get(id: MiReversiGame['id']): Promise<MiReversiGame | null> {
+		const cached = await this.redisClient.get(`reversi:game:cache:${id}`);
+		if (cached != null) {
+			const parsed = JSON.parse(cached) as Serialized<MiReversiGame>;
+			return {
+				...parsed,
+				startedAt: parsed.startedAt != null ? new Date(parsed.startedAt) : null,
+				endedAt: parsed.endedAt != null ? new Date(parsed.endedAt) : null,
+			};
+		} else {
+			const game = await this.reversiGamesRepository.findOneBy({ id });
+			if (game == null) return null;
+
+			this.cacheGame(game);
+
+			return game;
+		}
 	}
 
 	@bindThis
-	public async heatbeat(game: MiReversiGame, user: MiUser) {
-		this.globalEventService.publishReversiGameStream(game.id, 'heatbeat', { userId: user.id });
+	public async checkCrc(gameId: MiReversiGame['id'], crc32: string | number) {
+		const game = await this.get(gameId);
+		if (game == null) throw new Error('game not found');
+
+		if (crc32.toString() !== game.crc32) {
+			return await this.reversiGameEntityService.packDetail(game);
+		} else {
+			return null;
+		}
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/entities/ReversiGameEntityService.ts b/packages/backend/src/core/entities/ReversiGameEntityService.ts
index a7adc681f6..bcb0fd5a6f 100644
--- a/packages/backend/src/core/entities/ReversiGameEntityService.ts
+++ b/packages/backend/src/core/entities/ReversiGameEntityService.ts
@@ -37,6 +37,7 @@ export class ReversiGameEntityService {
 			id: game.id,
 			createdAt: this.idService.parse(game.id).date.toISOString(),
 			startedAt: game.startedAt && game.startedAt.toISOString(),
+			endedAt: game.endedAt && game.endedAt.toISOString(),
 			isStarted: game.isStarted,
 			isEnded: game.isEnded,
 			form1: game.form1,
@@ -49,12 +50,14 @@ export class ReversiGameEntityService {
 			user2: this.userEntityService.pack(game.user2Id, me),
 			winnerId: game.winnerId,
 			winner: game.winnerId ? this.userEntityService.pack(game.winnerId, me) : null,
-			surrendered: game.surrendered,
+			surrenderedUserId: game.surrenderedUserId,
+			timeoutUserId: game.timeoutUserId,
 			black: game.black,
 			bw: game.bw,
 			isLlotheo: game.isLlotheo,
 			canPutEverywhere: game.canPutEverywhere,
 			loopedBoard: game.loopedBoard,
+			timeLimitForEachTurn: game.timeLimitForEachTurn,
 			logs: game.logs,
 			map: game.map,
 		});
@@ -79,6 +82,7 @@ export class ReversiGameEntityService {
 			id: game.id,
 			createdAt: this.idService.parse(game.id).date.toISOString(),
 			startedAt: game.startedAt && game.startedAt.toISOString(),
+			endedAt: game.endedAt && game.endedAt.toISOString(),
 			isStarted: game.isStarted,
 			isEnded: game.isEnded,
 			form1: game.form1,
@@ -91,12 +95,14 @@ export class ReversiGameEntityService {
 			user2: this.userEntityService.pack(game.user2Id, me),
 			winnerId: game.winnerId,
 			winner: game.winnerId ? this.userEntityService.pack(game.winnerId, me) : null,
-			surrendered: game.surrendered,
+			surrenderedUserId: game.surrenderedUserId,
+			timeoutUserId: game.timeoutUserId,
 			black: game.black,
 			bw: game.bw,
 			isLlotheo: game.isLlotheo,
 			canPutEverywhere: game.canPutEverywhere,
 			loopedBoard: game.loopedBoard,
+			timeLimitForEachTurn: game.timeLimitForEachTurn,
 		});
 	}
 
diff --git a/packages/backend/src/models/ReversiGame.ts b/packages/backend/src/models/ReversiGame.ts
index dcaa5c9fa9..11d236e458 100644
--- a/packages/backend/src/models/ReversiGame.ts
+++ b/packages/backend/src/models/ReversiGame.ts
@@ -13,6 +13,12 @@ export class MiReversiGame {
 	})
 	public startedAt: Date | null;
 
+	@Column('timestamp with time zone', {
+		nullable: true,
+		comment: 'The ended date of the ReversiGame.',
+	})
+	public endedAt: Date | null;
+
 	@Column(id())
 	public user1Id: MiUser['id'];
 
@@ -71,7 +77,19 @@ export class MiReversiGame {
 		...id(),
 		nullable: true,
 	})
-	public surrendered: MiUser['id'] | null;
+	public surrenderedUserId: MiUser['id'] | null;
+
+	@Column({
+		...id(),
+		nullable: true,
+	})
+	public timeoutUserId: MiUser['id'] | null;
+
+	// in sec
+	@Column('smallint', {
+		default: 90,
+	})
+	public timeLimitForEachTurn: number;
 
 	@Column('jsonb', {
 		default: [],
diff --git a/packages/backend/src/models/json-schema/reversi-game.ts b/packages/backend/src/models/json-schema/reversi-game.ts
index b94046438b..4ac4d165d8 100644
--- a/packages/backend/src/models/json-schema/reversi-game.ts
+++ b/packages/backend/src/models/json-schema/reversi-game.ts
@@ -21,6 +21,11 @@ export const packedReversiGameLiteSchema = {
 			optional: false, nullable: true,
 			format: 'date-time',
 		},
+		endedAt: {
+			type: 'string',
+			optional: false, nullable: true,
+			format: 'date-time',
+		},
 		isStarted: {
 			type: 'boolean',
 			optional: false, nullable: false,
@@ -75,7 +80,12 @@ export const packedReversiGameLiteSchema = {
 			optional: false, nullable: true,
 			ref: 'User',
 		},
-		surrendered: {
+		surrenderedUserId: {
+			type: 'string',
+			optional: false, nullable: true,
+			format: 'id',
+		},
+		timeoutUserId: {
 			type: 'string',
 			optional: false, nullable: true,
 			format: 'id',
@@ -100,6 +110,10 @@ export const packedReversiGameLiteSchema = {
 			type: 'boolean',
 			optional: false, nullable: false,
 		},
+		timeLimitForEachTurn: {
+			type: 'number',
+			optional: false, nullable: false,
+		},
 	},
 } as const;
 
@@ -121,6 +135,11 @@ export const packedReversiGameDetailedSchema = {
 			optional: false, nullable: true,
 			format: 'date-time',
 		},
+		endedAt: {
+			type: 'string',
+			optional: false, nullable: true,
+			format: 'date-time',
+		},
 		isStarted: {
 			type: 'boolean',
 			optional: false, nullable: false,
@@ -175,7 +194,12 @@ export const packedReversiGameDetailedSchema = {
 			optional: false, nullable: true,
 			ref: 'User',
 		},
-		surrendered: {
+		surrenderedUserId: {
+			type: 'string',
+			optional: false, nullable: true,
+			format: 'id',
+		},
+		timeoutUserId: {
 			type: 'string',
 			optional: false, nullable: true,
 			format: 'id',
@@ -200,6 +224,10 @@ export const packedReversiGameDetailedSchema = {
 			type: 'boolean',
 			optional: false, nullable: false,
 		},
+		timeLimitForEachTurn: {
+			type: 'number',
+			optional: false, nullable: false,
+		},
 		logs: {
 			type: 'array',
 			optional: false, nullable: false,
diff --git a/packages/backend/src/server/api/endpoints/reversi/surrender.ts b/packages/backend/src/server/api/endpoints/reversi/surrender.ts
index c47d36be33..c809142e07 100644
--- a/packages/backend/src/server/api/endpoints/reversi/surrender.ts
+++ b/packages/backend/src/server/api/endpoints/reversi/surrender.ts
@@ -62,7 +62,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw new ApiError(meta.errors.accessDenied);
 			}
 
-			await this.reversiService.surrender(game, me);
+			await this.reversiService.surrender(game.id, me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/stream/channels/reversi-game.ts b/packages/backend/src/server/api/stream/channels/reversi-game.ts
index c5d05e5cfb..77eaa6d1d3 100644
--- a/packages/backend/src/server/api/stream/channels/reversi-game.ts
+++ b/packages/backend/src/server/api/stream/channels/reversi-game.ts
@@ -32,11 +32,6 @@ class ReversiGameChannel extends Channel {
 	public async init(params: any) {
 		this.gameId = params.gameId as string;
 
-		const game = await this.reversiGamesRepository.findOneBy({
-			id: this.gameId,
-		});
-		if (game == null) return;
-
 		this.subscriber.on(`reversiGameStream:${this.gameId}`, this.send);
 	}
 
@@ -46,7 +41,8 @@ class ReversiGameChannel extends Channel {
 			case 'ready': this.ready(body); break;
 			case 'updateSettings': this.updateSettings(body.key, body.value); break;
 			case 'putStone': this.putStone(body.pos, body.id); break;
-			case 'heatbeat': this.heatbeat(body.crc32); break;
+			case 'checkState': this.checkState(body.crc32); break;
+			case 'claimTimeIsUp': this.claimTimeIsUp(); break;
 		}
 	}
 
@@ -54,51 +50,38 @@ class ReversiGameChannel extends Channel {
 	private async updateSettings(key: string, value: any) {
 		if (this.user == null) return;
 
-		// TODO: キャッシュしたい
-		const game = await this.reversiGamesRepository.findOneBy({ id: this.gameId! });
-		if (game == null) throw new Error('game not found');
-
-		this.reversiService.updateSettings(game, this.user, key, value);
+		this.reversiService.updateSettings(this.gameId!, this.user, key, value);
 	}
 
 	@bindThis
 	private async ready(ready: boolean) {
 		if (this.user == null) return;
 
-		const game = await this.reversiGamesRepository.findOneBy({ id: this.gameId! });
-		if (game == null) throw new Error('game not found');
-
-		this.reversiService.gameReady(game, this.user, ready);
+		this.reversiService.gameReady(this.gameId!, this.user, ready);
 	}
 
 	@bindThis
 	private async putStone(pos: number, id: string) {
 		if (this.user == null) return;
 
-		// TODO: キャッシュしたい
-		const game = await this.reversiGamesRepository.findOneBy({ id: this.gameId! });
-		if (game == null) throw new Error('game not found');
-
-		this.reversiService.putStoneToGame(game, this.user, pos, id);
+		this.reversiService.putStoneToGame(this.gameId!, this.user, pos, id);
 	}
 
 	@bindThis
-	private async heatbeat(crc32?: string | number | null) {
-		// TODO: キャッシュしたい
-		const game = await this.reversiGamesRepository.findOneBy({ id: this.gameId! });
-		if (game == null) throw new Error('game not found');
-
-		if (!game.isStarted) return;
+	private async checkState(crc32: string | number) {
+		if (crc32 != null) return;
 
-		if (crc32 != null) {
-			if (crc32.toString() !== game.crc32) {
-				this.send('rescue', await this.reversiGameEntityService.packDetail(game, this.user));
-			}
+		const game = await this.reversiService.checkCrc(this.gameId!, crc32);
+		if (game) {
+			this.send('rescue', game);
 		}
+	}
 
-		if (this.user && (game.user1Id === this.user.id || game.user2Id === this.user.id)) {
-			this.reversiService.heatbeat(game, this.user);
-		}
+	@bindThis
+	private async claimTimeIsUp() {
+		if (this.user == null) return;
+
+		this.reversiService.checkTimeout(this.gameId!);
 	}
 
 	@bindThis
diff --git a/packages/frontend/src/pages/reversi/game.board.vue b/packages/frontend/src/pages/reversi/game.board.vue
index 2f09cf39e8..5e28f55902 100644
--- a/packages/frontend/src/pages/reversi/game.board.vue
+++ b/packages/frontend/src/pages/reversi/game.board.vue
@@ -15,19 +15,20 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</div>
 
 		<div style="overflow: clip; line-height: 28px;">
-			<div v-if="!iAmPlayer && !game.isEnded && turnUser" class="turn">
+			<div v-if="!iAmPlayer && !game.isEnded && turnUser">
 				<Mfm :key="'turn:' + turnUser.id" :text="i18n.tsx._reversi.turnOf({ name: turnUser.name ?? turnUser.username })" :plain="true" :customEmojis="turnUser.emojis"/>
 				<MkEllipsis/>
 			</div>
-			<div v-if="(logPos !== game.logs.length) && turnUser" class="turn">
+			<div v-if="(logPos !== game.logs.length) && turnUser">
 				<Mfm :key="'past-turn-of:' + turnUser.id" :text="i18n.tsx._reversi.pastTurnOf({ name: turnUser.name ?? turnUser.username })" :plain="true" :customEmojis="turnUser.emojis"/>
 			</div>
-			<div v-if="iAmPlayer && !game.isEnded && !isMyTurn" class="turn1">{{ i18n.ts._reversi.opponentTurn }}<MkEllipsis/><soan v-if="opponentNotResponding" style="margin-left: 8px;">({{ i18n.ts.notResponding }})</soan></div>
-			<div v-if="iAmPlayer && !game.isEnded && isMyTurn" class="turn2" style="animation: tada 1s linear infinite both;">{{ i18n.ts._reversi.myTurn }}</div>
-			<div v-if="game.isEnded && logPos == game.logs.length" class="result">
+			<div v-if="iAmPlayer && !game.isEnded && !isMyTurn">{{ i18n.ts._reversi.opponentTurn }}<MkEllipsis/><span style="margin-left: 1em; opacity: 0.7;">({{ i18n.tsx.remainingN({ n: opTurnTimerRmain }) }})</span></div>
+			<div v-if="iAmPlayer && !game.isEnded && isMyTurn"><span style="display: inline-block; font-weight: bold; animation: tada 1s linear infinite both;">{{ i18n.ts._reversi.myTurn }}</span><span style="margin-left: 1em; opacity: 0.7;">({{ i18n.tsx.remainingN({ n: myTurnTimerRmain }) }})</span></div>
+			<div v-if="game.isEnded && logPos == game.logs.length">
 				<template v-if="game.winner">
 					<Mfm :key="'won'" :text="i18n.tsx._reversi.won({ name: game.winner.name ?? game.winner.username })" :plain="true" :customEmojis="game.winner.emojis"/>
-					<span v-if="game.surrendered != null"> ({{ i18n.ts._reversi.surrendered }})</span>
+					<span v-if="game.surrenderedUserId != null"> ({{ i18n.ts._reversi.surrendered }})</span>
+					<span v-if="game.timeoutUserId != null"> ({{ i18n.ts._reversi.timeout }})</span>
 				</template>
 				<template v-else>{{ i18n.ts._reversi.drawn }}</template>
 			</div>
@@ -239,7 +240,7 @@ if (game.value.isStarted && !game.value.isEnded) {
 		if (game.value.isEnded) return;
 		const crc32 = CRC32.str(JSON.stringify(game.value.logs)).toString();
 		if (_DEV_) console.log('crc32', crc32);
-		props.connection.send('heatbeat', {
+		props.connection.send('checkState', {
 			crc32: crc32,
 		});
 	}, 10000, { immediate: false, afterMounted: true });
@@ -269,9 +270,31 @@ function putStone(pos) {
 	});
 	appliedOps.push(id);
 
+	myTurnTimerRmain.value = game.value.timeLimitForEachTurn;
+	opTurnTimerRmain.value = game.value.timeLimitForEachTurn;
+
 	checkEnd();
 }
 
+const myTurnTimerRmain = ref<number>(game.value.timeLimitForEachTurn);
+const opTurnTimerRmain = ref<number>(game.value.timeLimitForEachTurn);
+
+const TIMER_INTERVAL_SEC = 3;
+useInterval(() => {
+	if (myTurnTimerRmain.value > 0) {
+		myTurnTimerRmain.value = Math.max(0, myTurnTimerRmain.value - TIMER_INTERVAL_SEC);
+	}
+	if (opTurnTimerRmain.value > 0) {
+		opTurnTimerRmain.value = Math.max(0, opTurnTimerRmain.value - TIMER_INTERVAL_SEC);
+	}
+
+	if (iAmPlayer.value) {
+		if ((isMyTurn.value && myTurnTimerRmain.value === 0) || (!isMyTurn.value && opTurnTimerRmain.value === 0)) {
+			props.connection.send('claimTimeIsUp', {});
+		}
+	}
+}, TIMER_INTERVAL_SEC * 1000, { immediate: false, afterMounted: true });
+
 function onStreamLog(log: Reversi.Serializer.Log & { id: string | null }) {
 	game.value.logs = Reversi.Serializer.serializeLogs([
 		...Reversi.Serializer.deserializeLogs(game.value.logs),
@@ -286,6 +309,9 @@ function onStreamLog(log: Reversi.Serializer.Log & { id: string | null }) {
 				engine.value.putStone(log.pos);
 				triggerRef(engine);
 
+				myTurnTimerRmain.value = game.value.timeLimitForEachTurn;
+				opTurnTimerRmain.value = game.value.timeLimitForEachTurn;
+
 				sound.playUrl('/client-assets/reversi/put.mp3', {
 					volume: 1,
 					playbackRate: 1,
@@ -339,27 +365,6 @@ function onStreamRescue(_game) {
 	checkEnd();
 }
 
-const opponentLastHeatbeatedAt = ref<number>(Date.now());
-const opponentNotResponding = ref<boolean>(false);
-
-useInterval(() => {
-	if (game.value.isEnded) return;
-	if (!iAmPlayer.value) return;
-
-	if (Date.now() - opponentLastHeatbeatedAt.value > 20000) {
-		opponentNotResponding.value = true;
-	} else {
-		opponentNotResponding.value = false;
-	}
-}, 1000, { immediate: false, afterMounted: true });
-
-function onStreamHeatbeat({ userId }) {
-	if ($i.id === userId) return;
-
-	opponentNotResponding.value = false;
-	opponentLastHeatbeatedAt.value = Date.now();
-}
-
 async function surrender() {
 	const { canceled } = await os.confirm({
 		type: 'warning',
@@ -411,28 +416,24 @@ function share() {
 
 onMounted(() => {
 	props.connection.on('log', onStreamLog);
-	props.connection.on('heatbeat', onStreamHeatbeat);
 	props.connection.on('rescue', onStreamRescue);
 	props.connection.on('ended', onStreamEnded);
 });
 
 onActivated(() => {
 	props.connection.on('log', onStreamLog);
-	props.connection.on('heatbeat', onStreamHeatbeat);
 	props.connection.on('rescue', onStreamRescue);
 	props.connection.on('ended', onStreamEnded);
 });
 
 onDeactivated(() => {
 	props.connection.off('log', onStreamLog);
-	props.connection.off('heatbeat', onStreamHeatbeat);
 	props.connection.off('rescue', onStreamRescue);
 	props.connection.off('ended', onStreamEnded);
 });
 
 onUnmounted(() => {
 	props.connection.off('log', onStreamLog);
-	props.connection.off('heatbeat', onStreamHeatbeat);
 	props.connection.off('rescue', onStreamRescue);
 	props.connection.off('ended', onStreamEnded);
 });
diff --git a/packages/frontend/src/pages/reversi/game.setting.vue b/packages/frontend/src/pages/reversi/game.setting.vue
index 301a177de1..360b75745c 100644
--- a/packages/frontend/src/pages/reversi/game.setting.vue
+++ b/packages/frontend/src/pages/reversi/game.setting.vue
@@ -49,6 +49,22 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</MkRadios>
 			</MkFolder>
 
+			<MkFolder :defaultOpen="true">
+				<template #label>{{ i18n.ts._reversi.timeLimitForEachTurn }}</template>
+				<template #suffix>{{ game.timeLimitForEachTurn }}{{ i18n.ts._time.second }}</template>
+
+				<MkRadios v-model="game.timeLimitForEachTurn">
+					<option :value="5">5{{ i18n.ts._time.second }}</option>
+					<option :value="10">10{{ i18n.ts._time.second }}</option>
+					<option :value="30">30{{ i18n.ts._time.second }}</option>
+					<option :value="60">60{{ i18n.ts._time.second }}</option>
+					<option :value="90">90{{ i18n.ts._time.second }}</option>
+					<option :value="120">120{{ i18n.ts._time.second }}</option>
+					<option :value="180">180{{ i18n.ts._time.second }}</option>
+					<option :value="3600">3600{{ i18n.ts._time.second }}</option>
+				</MkRadios>
+			</MkFolder>
+
 			<MkFolder :defaultOpen="true">
 				<template #label>{{ i18n.ts._reversi.rules }}</template>
 
@@ -125,6 +141,10 @@ watch(() => game.value.bw, () => {
 	updateSettings('bw');
 });
 
+watch(() => game.value.timeLimitForEachTurn, () => {
+	updateSettings('timeLimitForEachTurn');
+});
+
 function chooseMap(ev: MouseEvent) {
 	const menu: MenuItem[] = [];
 
diff --git a/packages/misskey-js/src/autogen/apiClientJSDoc.ts b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
index dc4bcd3aaa..ea41f2cb55 100644
--- a/packages/misskey-js/src/autogen/apiClientJSDoc.ts
+++ b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
@@ -1,6 +1,6 @@
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-20T04:59:59.768Z
+ * generatedAt: 2024-01-21T01:01:12.332Z
  */
 
 import type { SwitchCaseResponseType } from '../api.js';
diff --git a/packages/misskey-js/src/autogen/endpoint.ts b/packages/misskey-js/src/autogen/endpoint.ts
index edf0e34b2a..f551053524 100644
--- a/packages/misskey-js/src/autogen/endpoint.ts
+++ b/packages/misskey-js/src/autogen/endpoint.ts
@@ -1,6 +1,6 @@
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-20T04:59:59.766Z
+ * generatedAt: 2024-01-21T01:01:12.330Z
  */
 
 import type {
diff --git a/packages/misskey-js/src/autogen/entities.ts b/packages/misskey-js/src/autogen/entities.ts
index ecf7e7f079..b0adbeaf93 100644
--- a/packages/misskey-js/src/autogen/entities.ts
+++ b/packages/misskey-js/src/autogen/entities.ts
@@ -1,6 +1,6 @@
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-20T04:59:59.765Z
+ * generatedAt: 2024-01-21T01:01:12.328Z
  */
 
 import { operations } from './types.js';
diff --git a/packages/misskey-js/src/autogen/models.ts b/packages/misskey-js/src/autogen/models.ts
index 561cfd861f..306f0cd6b4 100644
--- a/packages/misskey-js/src/autogen/models.ts
+++ b/packages/misskey-js/src/autogen/models.ts
@@ -1,6 +1,6 @@
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-20T04:59:59.764Z
+ * generatedAt: 2024-01-21T01:01:12.327Z
  */
 
 import { components } from './types.js';
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index e452636e80..5d2b6e2e3b 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -3,7 +3,7 @@
 
 /*
  * version: 2023.12.2
- * generatedAt: 2024-01-20T04:59:59.681Z
+ * generatedAt: 2024-01-21T01:01:12.246Z
  */
 
 /**
@@ -4465,6 +4465,8 @@ export type components = {
       createdAt: string;
       /** Format: date-time */
       startedAt: string | null;
+      /** Format: date-time */
+      endedAt: string | null;
       isStarted: boolean;
       isEnded: boolean;
       form1: Record<string, never> | null;
@@ -4481,12 +4483,15 @@ export type components = {
       winnerId: string | null;
       winner: components['schemas']['User'] | null;
       /** Format: id */
-      surrendered: string | null;
+      surrenderedUserId: string | null;
+      /** Format: id */
+      timeoutUserId: string | null;
       black: number | null;
       bw: string;
       isLlotheo: boolean;
       canPutEverywhere: boolean;
       loopedBoard: boolean;
+      timeLimitForEachTurn: number;
     };
     ReversiGameDetailed: {
       /** Format: id */
@@ -4495,6 +4500,8 @@ export type components = {
       createdAt: string;
       /** Format: date-time */
       startedAt: string | null;
+      /** Format: date-time */
+      endedAt: string | null;
       isStarted: boolean;
       isEnded: boolean;
       form1: Record<string, never> | null;
@@ -4511,12 +4518,15 @@ export type components = {
       winnerId: string | null;
       winner: components['schemas']['User'] | null;
       /** Format: id */
-      surrendered: string | null;
+      surrenderedUserId: string | null;
+      /** Format: id */
+      timeoutUserId: string | null;
       black: number | null;
       bw: string;
       isLlotheo: boolean;
       canPutEverywhere: boolean;
       loopedBoard: boolean;
+      timeLimitForEachTurn: number;
       logs: unknown[][];
       map: string[];
     };
-- 
cgit v1.2.3-freya


From 4de77784c9ee5bf787e7bda41aae84d81edff78a Mon Sep 17 00:00:00 2001
From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 21 Jan 2024 11:50:05 +0900
Subject: enhance(sw): オフライン表示のデザインを改善 (#13052)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance(sw): オフライン表示のデザインを改善

* Update Changelog

* fix

* fix

* fix

* 言語が取得できなかった場合のフォールバックを追加

* (change) translation key
---
 CHANGELOG.md          |  3 +++
 locales/index.d.ts    | 10 ++++++++++
 locales/ja-JP.yml     |  4 ++++
 packages/sw/src/sw.ts | 17 +++++++++++++----
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 993899ca2f..716937d628 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,9 @@
 - Fix: ipv4とipv6の両方が利用可能な環境でallowedPrivateNetworksが設定されていた場合プライベートipの検証ができていなかった問題を修正
 - Fix: properly handle cc followers
 
+### Service Worker
+- Enhance: オフライン表示のデザインを改善・多言語対応
+
 ## 2023.12.2
 
 ### General
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 6e763cda10..910b1edad8 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -9554,6 +9554,16 @@ export interface Locale extends ILocale {
          */
         "lookingForPlayer": string;
     };
+    "_offlineScreen": {
+        /**
+         * オフライン - サーバーに接続できません
+         */
+        "title": string;
+        /**
+         * サーバーに接続できません
+         */
+        "header": string;
+    };
 }
 declare const locales: {
     [lang: string]: Locale;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index fd1c891ee7..6460397db7 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2544,3 +2544,7 @@ _reversi:
   timeLimitForEachTurn: "1ターンの時間制限"
   freeMatch: "フリーマッチ"
   lookingForPlayer: "対戦相手を探しています"
+
+_offlineScreen:
+  title: "オフライン - サーバーに接続できません"
+  header: "サーバーに接続できません"
diff --git a/packages/sw/src/sw.ts b/packages/sw/src/sw.ts
index b79fd8ce7a..f423eaca20 100644
--- a/packages/sw/src/sw.ts
+++ b/packages/sw/src/sw.ts
@@ -6,6 +6,7 @@
 import { get } from 'idb-keyval';
 import * as Misskey from 'misskey-js';
 import type { PushNotificationDataMap } from '@/types.js';
+import type { I18n, Locale } from '@/scripts/i18n.js';
 import { createEmptyNotification, createNotification } from '@/scripts/create-notification.js';
 import { swLang } from '@/scripts/lang.js';
 import * as swos from '@/scripts/operations.js';
@@ -26,8 +27,15 @@ globalThis.addEventListener('activate', ev => {
 	);
 });
 
-function offlineContentHTML(): string {
-	return `<!doctype html>Offline. Service Worker @${_VERSION_} <button onclick="location.reload()">reload</button>`;
+async function offlineContentHTML() {
+	const i18n = await (swLang.i18n ?? swLang.fetchLocale()) as Partial<I18n<Locale>>;
+	const messages = {
+		title: i18n.ts?._offlineScreen?.title ?? 'Offline - Could not connect to server',
+		header: i18n.ts?._offlineScreen?.header ?? 'Could not connect to server',
+		reload: i18n.ts?.reload ?? 'Reload',
+	};
+
+	return `<!DOCTYPE html><html lang="ja"><head><meta charset="UTF-8"><meta content="width=device-width,initial-scale=1"name="viewport"><title>${messages.title}</title><style>body{background-color:#0c1210;color:#dee7e4;font-family:Hiragino Maru Gothic Pro,BIZ UDGothic,Roboto,HelveticaNeue,Arial,sans-serif;line-height:1.35;display:flex;flex-direction:column;align-items:center;justify-content:center;min-height:100vh;margin:0;padding:24px;box-sizing:border-box}.icon{max-width:120px;width:100%;height:auto;margin-bottom:20px;}.message{text-align:center;font-size:20px;font-weight:700;margin-bottom:20px}.version{text-align:center;font-size:90%;margin-bottom:20px}button{padding:7px 14px;min-width:100px;font-weight:700;font-family:Hiragino Maru Gothic Pro,BIZ UDGothic,Roboto,HelveticaNeue,Arial,sans-serif;line-height:1.35;border-radius:99rem;background-color:#b4e900;color:#192320;border:none;cursor:pointer;-webkit-tap-highlight-color:transparent}button:hover{background-color:#c6ff03}</style></head><body><svg class="icon"fill="none"height="24"stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"stroke-width="2"viewBox="0 0 24 24"width="24"xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z"fill="none"stroke="none"/><path d="M9.58 5.548c.24 -.11 .492 -.207 .752 -.286c1.88 -.572 3.956 -.193 5.444 1c1.488 1.19 2.162 3.007 1.77 4.769h.99c1.913 0 3.464 1.56 3.464 3.486c0 .957 -.383 1.824 -1.003 2.454m-2.997 1.033h-11.343c-2.572 -.004 -4.657 -2.011 -4.657 -4.487c0 -2.475 2.085 -4.482 4.657 -4.482c.13 -.582 .37 -1.128 .7 -1.62"/><path d="M3 3l18 18"/></svg><div class="message">${messages.header}</div><div class="version">v${_VERSION_}</div><button onclick="reloadPage()">${messages.reload}</button><script>function reloadPage(){location.reload(!0)}</script></body></html>`;
 }
 
 globalThis.addEventListener('fetch', ev => {
@@ -43,8 +51,9 @@ globalThis.addEventListener('fetch', ev => {
 	if (!isHTMLRequest) return;
 	ev.respondWith(
 		fetch(ev.request)
-			.catch(() => {
-				return new Response(offlineContentHTML(), {
+			.catch(async () => {
+				const html = await offlineContentHTML();
+				return new Response(html, {
 					status: 200,
 					headers: {
 						'content-type': 'text/html',
-- 
cgit v1.2.3-freya


From 6039f27bd50ef1fbbbe6bffe12b18614c9e5b85c Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 21 Jan 2024 12:05:51 +0900
Subject: enhance(reversi): tweak reversi

---
 locales/index.d.ts                                 |   4 +
 locales/ja-JP.yml                                  |   1 +
 packages/backend/src/core/GlobalEventService.ts    |   3 +
 packages/backend/src/core/ReversiService.ts        | 175 ++++++++++++---------
 .../src/server/api/stream/channels/reversi-game.ts |   8 +
 .../frontend/src/pages/reversi/game.setting.vue    |  17 +-
 packages/frontend/src/pages/reversi/game.vue       |  19 +++
 7 files changed, 149 insertions(+), 78 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 910b1edad8..5e00e539f2 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -9553,6 +9553,10 @@ export interface Locale extends ILocale {
          * 対戦相手を探しています
          */
         "lookingForPlayer": string;
+        /**
+         * 対局がキャンセルされました
+         */
+        "gameCanceled": string;
     };
     "_offlineScreen": {
         /**
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 6460397db7..915b9a2080 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2544,6 +2544,7 @@ _reversi:
   timeLimitForEachTurn: "1ターンの時間制限"
   freeMatch: "フリーマッチ"
   lookingForPlayer: "対戦相手を探しています"
+  gameCanceled: "対局がキャンセルされました"
 
 _offlineScreen:
   title: "オフライン - サーバーに接続できません"
diff --git a/packages/backend/src/core/GlobalEventService.ts b/packages/backend/src/core/GlobalEventService.ts
index 5ddd100e6c..5b4c8cb44f 100644
--- a/packages/backend/src/core/GlobalEventService.ts
+++ b/packages/backend/src/core/GlobalEventService.ts
@@ -188,6 +188,9 @@ export interface ReversiGameEventTypes {
 		winnerId: MiUser['id'] | null;
 		game: Packed<'ReversiGameDetailed'>;
 	};
+	canceled: {
+		userId: MiUser['id'];
+	};
 }
 //#endregion
 
diff --git a/packages/backend/src/core/ReversiService.ts b/packages/backend/src/core/ReversiService.ts
index b2a4032d4b..f97f71eb43 100644
--- a/packages/backend/src/core/ReversiService.ts
+++ b/packages/backend/src/core/ReversiService.ts
@@ -61,6 +61,11 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 		await this.redisClient.setex(`reversi:game:cache:${game.id}`, 60 * 3, JSON.stringify(game));
 	}
 
+	@bindThis
+	private async deleteGameCache(gameId: MiReversiGame['id']) {
+		await this.redisClient.del(`reversi:game:cache:${gameId}`);
+	}
+
 	@bindThis
 	public async matchSpecificUser(me: MiUser, targetUser: MiUser): Promise<MiReversiGame | null> {
 		if (targetUser.id === me.id) {
@@ -239,88 +244,93 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 		if (isBothReady) {
 			// 3秒後、両者readyならゲーム開始
 			setTimeout(async () => {
-				const freshGame = await this.reversiGamesRepository.findOneBy({ id: game.id });
+				const freshGame = await this.get(game.id);
 				if (freshGame == null || freshGame.isStarted || freshGame.isEnded) return;
 				if (!freshGame.user1Ready || !freshGame.user2Ready) return;
 
-				let bw: number;
-				if (freshGame.bw === 'random') {
-					bw = Math.random() > 0.5 ? 1 : 2;
-				} else {
-					bw = parseInt(freshGame.bw, 10);
-				}
-
-				function getRandomMap() {
-					const mapCount = Object.entries(Reversi.maps).length;
-					const rnd = Math.floor(Math.random() * mapCount);
-					return Object.values(Reversi.maps)[rnd].data;
-				}
-
-				const map = freshGame.map != null ? freshGame.map : getRandomMap();
-
-				const crc32 = CRC32.str(JSON.stringify(freshGame.logs)).toString();
-
-				const updatedGame = await this.reversiGamesRepository.createQueryBuilder().update()
-					.set({
-						startedAt: new Date(),
-						isStarted: true,
-						black: bw,
-						map: map,
-						crc32,
-					})
-					.where('id = :id', { id: game.id })
-					.returning('*')
-					.execute()
-					.then((response) => response.raw[0]);
-				this.cacheGame(updatedGame);
-
-				//#region 盤面に最初から石がないなどして始まった瞬間に勝敗が決定する場合があるのでその処理
-				const engine = new Reversi.Game(map, {
-					isLlotheo: freshGame.isLlotheo,
-					canPutEverywhere: freshGame.canPutEverywhere,
-					loopedBoard: freshGame.loopedBoard,
-				});
-
-				if (engine.isEnded) {
-					let winner;
-					if (engine.winner === true) {
-						winner = bw === 1 ? freshGame.user1Id : freshGame.user2Id;
-					} else if (engine.winner === false) {
-						winner = bw === 1 ? freshGame.user2Id : freshGame.user1Id;
-					} else {
-						winner = null;
-					}
-
-					const updatedGame = await this.reversiGamesRepository.createQueryBuilder().update()
-						.set({
-							isEnded: true,
-							endedAt: new Date(),
-							winnerId: winner,
-						})
-						.where('id = :id', { id: game.id })
-						.returning('*')
-						.execute()
-						.then((response) => response.raw[0]);
-					this.cacheGame(updatedGame);
-
-					this.globalEventService.publishReversiGameStream(game.id, 'ended', {
-						winnerId: winner,
-						game: await this.reversiGameEntityService.packDetail(game.id),
-					});
-
-					return;
-				}
-				//#endregion
-
-				this.redisClient.setex(`reversi:game:turnTimer:${game.id}:1`, updatedGame.timeLimitForEachTurn, '');
-
-				this.globalEventService.publishReversiGameStream(game.id, 'started', {
-					game: await this.reversiGameEntityService.packDetail(game.id),
-				});
+				this.startGame(freshGame);
 			}, 3000);
 		}
 	}
 
+	@bindThis
+	private async startGame(game: MiReversiGame) {
+		let bw: number;
+		if (game.bw === 'random') {
+			bw = Math.random() > 0.5 ? 1 : 2;
+		} else {
+			bw = parseInt(game.bw, 10);
+		}
+
+		function getRandomMap() {
+			const mapCount = Object.entries(Reversi.maps).length;
+			const rnd = Math.floor(Math.random() * mapCount);
+			return Object.values(Reversi.maps)[rnd].data;
+		}
+
+		const map = game.map != null ? game.map : getRandomMap();
+
+		const crc32 = CRC32.str(JSON.stringify(game.logs)).toString();
+
+		const updatedGame = await this.reversiGamesRepository.createQueryBuilder().update()
+			.set({
+				startedAt: new Date(),
+				isStarted: true,
+				black: bw,
+				map: map,
+				crc32,
+			})
+			.where('id = :id', { id: game.id })
+			.returning('*')
+			.execute()
+			.then((response) => response.raw[0]);
+		this.cacheGame(updatedGame);
+
+		//#region 盤面に最初から石がないなどして始まった瞬間に勝敗が決定する場合があるのでその処理
+		const engine = new Reversi.Game(map, {
+			isLlotheo: game.isLlotheo,
+			canPutEverywhere: game.canPutEverywhere,
+			loopedBoard: game.loopedBoard,
+		});
+
+		if (engine.isEnded) {
+			let winner;
+			if (engine.winner === true) {
+				winner = bw === 1 ? game.user1Id : game.user2Id;
+			} else if (engine.winner === false) {
+				winner = bw === 1 ? game.user2Id : game.user1Id;
+			} else {
+				winner = null;
+			}
+
+			const updatedGame = await this.reversiGamesRepository.createQueryBuilder().update()
+				.set({
+					isEnded: true,
+					endedAt: new Date(),
+					winnerId: winner,
+				})
+				.where('id = :id', { id: game.id })
+				.returning('*')
+				.execute()
+				.then((response) => response.raw[0]);
+			this.cacheGame(updatedGame);
+
+			this.globalEventService.publishReversiGameStream(game.id, 'ended', {
+				winnerId: winner,
+				game: await this.reversiGameEntityService.packDetail(game.id),
+			});
+
+			return;
+		}
+		//#endregion
+
+		this.redisClient.setex(`reversi:game:turnTimer:${game.id}:1`, updatedGame.timeLimitForEachTurn, '');
+
+		this.globalEventService.publishReversiGameStream(game.id, 'started', {
+			game: await this.reversiGameEntityService.packDetail(game.id),
+		});
+	}
+
 	@bindThis
 	public async getInvitations(user: MiUser): Promise<MiUser['id'][]> {
 		const invitations = await this.redisClient.zrange(
@@ -510,6 +520,21 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 		}
 	}
 
+	@bindThis
+	public async cancelGame(gameId: MiReversiGame['id'], user: MiUser) {
+		const game = await this.get(gameId);
+		if (game == null) throw new Error('game not found');
+		if (game.isStarted) return;
+		if ((game.user1Id !== user.id) && (game.user2Id !== user.id)) return;
+
+		await this.reversiGamesRepository.delete(game.id);
+		this.deleteGameCache(game.id);
+
+		this.globalEventService.publishReversiGameStream(game.id, 'canceled', {
+			userId: user.id,
+		});
+	}
+
 	@bindThis
 	public async get(id: MiReversiGame['id']): Promise<MiReversiGame | null> {
 		const cached = await this.redisClient.get(`reversi:game:cache:${id}`);
diff --git a/packages/backend/src/server/api/stream/channels/reversi-game.ts b/packages/backend/src/server/api/stream/channels/reversi-game.ts
index 77eaa6d1d3..df92137f51 100644
--- a/packages/backend/src/server/api/stream/channels/reversi-game.ts
+++ b/packages/backend/src/server/api/stream/channels/reversi-game.ts
@@ -40,6 +40,7 @@ class ReversiGameChannel extends Channel {
 		switch (type) {
 			case 'ready': this.ready(body); break;
 			case 'updateSettings': this.updateSettings(body.key, body.value); break;
+			case 'cancel': this.cancelGame(); break;
 			case 'putStone': this.putStone(body.pos, body.id); break;
 			case 'checkState': this.checkState(body.crc32); break;
 			case 'claimTimeIsUp': this.claimTimeIsUp(); break;
@@ -60,6 +61,13 @@ class ReversiGameChannel extends Channel {
 		this.reversiService.gameReady(this.gameId!, this.user, ready);
 	}
 
+	@bindThis
+	private async cancelGame() {
+		if (this.user == null) return;
+
+		this.reversiService.cancelGame(this.gameId!, this.user);
+	}
+
 	@bindThis
 	private async putStone(pos: number, id: string) {
 		if (this.user == null) return;
diff --git a/packages/frontend/src/pages/reversi/game.setting.vue b/packages/frontend/src/pages/reversi/game.setting.vue
index 360b75745c..9ca107278b 100644
--- a/packages/frontend/src/pages/reversi/game.setting.vue
+++ b/packages/frontend/src/pages/reversi/game.setting.vue
@@ -86,7 +86,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<template v-if="!isReady && !isOpReady">{{ i18n.ts._reversi.waitingBoth }}<MkEllipsis/></template>
 				</div>
 				<div class="_buttonsCenter">
-					<MkButton rounded danger @click="exit">{{ i18n.ts.cancel }}</MkButton>
+					<MkButton rounded danger @click="cancel">{{ i18n.ts.cancel }}</MkButton>
 					<MkButton v-if="!isReady" rounded primary @click="ready">{{ i18n.ts._reversi.ready }}</MkButton>
 					<MkButton v-if="isReady" rounded @click="unready">{{ i18n.ts._reversi.cancelReady }}</MkButton>
 				</div>
@@ -109,9 +109,12 @@ import MkSwitch from '@/components/MkSwitch.vue';
 import MkFolder from '@/components/MkFolder.vue';
 import * as os from '@/os.js';
 import { MenuItem } from '@/types/menu.js';
+import { useRouter } from '@/global/router/supplier.js';
 
 const $i = signinRequired();
 
+const router = useRouter();
+
 const mapCategories = Array.from(new Set(Object.values(Reversi.maps).map(x => x.category)));
 
 const props = defineProps<{
@@ -171,8 +174,16 @@ function chooseMap(ev: MouseEvent) {
 	os.popupMenu(menu, ev.currentTarget ?? ev.target);
 }
 
-function exit() {
-	props.connection.send('exit', {});
+async function cancel() {
+	const { canceled } = await os.confirm({
+		type: 'warning',
+		text: i18n.ts.areYouSure,
+	});
+	if (canceled) return;
+
+	props.connection.send('cancel', {});
+
+	router.push('/reversi');
 }
 
 function ready() {
diff --git a/packages/frontend/src/pages/reversi/game.vue b/packages/frontend/src/pages/reversi/game.vue
index dbbeb20f42..0bdbfbcf54 100644
--- a/packages/frontend/src/pages/reversi/game.vue
+++ b/packages/frontend/src/pages/reversi/game.vue
@@ -17,6 +17,14 @@ import GameBoard from './game.board.vue';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { useStream } from '@/stream.js';
+import { signinRequired } from '@/account.js';
+import { useRouter } from '@/global/router/supplier.js';
+import * as os from '@/os.js';
+import { i18n } from '@/i18n.js';
+
+const $i = signinRequired();
+
+const router = useRouter();
 
 const props = defineProps<{
 	gameId: string;
@@ -45,6 +53,17 @@ async function fetchGame() {
 	connection.value.on('started', x => {
 		game.value = x.game;
 	});
+	connection.value.on('canceled', x => {
+		connection.value?.dispose();
+
+		if (x.userId !== $i.id) {
+			os.alert({
+				type: 'warning',
+				text: i18n.ts._reversi.gameCanceled,
+			});
+			router.push('/reversi');
+		}
+	});
 }
 
 onMounted(() => {
-- 
cgit v1.2.3-freya


From b3cc17ea0d53edca3b7f7a648ae94a591ec98d44 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 21 Jan 2024 17:08:36 +0900
Subject: enhance(reversi): tweak reversi

---
 packages/frontend/assets/reversi/lose.mp3          | Bin 0 -> 9565 bytes
 packages/frontend/assets/reversi/win.mp3           | Bin 0 -> 25703 bytes
 packages/frontend/src/pages/reversi/game.board.vue | 124 ++++++++++++-------
 .../frontend/src/pages/reversi/game.setting.vue    | 135 +++++++++++----------
 4 files changed, 154 insertions(+), 105 deletions(-)
 create mode 100644 packages/frontend/assets/reversi/lose.mp3
 create mode 100644 packages/frontend/assets/reversi/win.mp3

diff --git a/packages/frontend/assets/reversi/lose.mp3 b/packages/frontend/assets/reversi/lose.mp3
new file mode 100644
index 0000000000..b62d50baf7
Binary files /dev/null and b/packages/frontend/assets/reversi/lose.mp3 differ
diff --git a/packages/frontend/assets/reversi/win.mp3 b/packages/frontend/assets/reversi/win.mp3
new file mode 100644
index 0000000000..25402ce2a6
Binary files /dev/null and b/packages/frontend/assets/reversi/win.mp3 differ
diff --git a/packages/frontend/src/pages/reversi/game.board.vue b/packages/frontend/src/pages/reversi/game.board.vue
index 5e28f55902..6ad779c605 100644
--- a/packages/frontend/src/pages/reversi/game.board.vue
+++ b/packages/frontend/src/pages/reversi/game.board.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkSpacer :contentMax="600">
+<MkSpacer :contentMax="500">
 	<div :class="$style.root" class="_gaps">
 		<div style="display: flex; align-items: center; justify-content: center; gap: 10px;">
 			<span>({{ i18n.ts._reversi.black }})</span>
@@ -35,53 +35,55 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</div>
 
 		<div :class="$style.board">
-			<div v-if="showBoardLabels" :class="$style.labelsX">
-				<span v-for="i in game.map[0].length" :class="$style.labelsXLabel">{{ String.fromCharCode(64 + i) }}</span>
-			</div>
-			<div style="display: flex;">
-				<div v-if="showBoardLabels" :class="$style.labelsY">
-					<div v-for="i in game.map.length" :class="$style.labelsYLabel">{{ i }}</div>
+			<div :class="$style.boardInner">
+				<div v-if="showBoardLabels" :class="$style.labelsX">
+					<span v-for="i in game.map[0].length" :class="$style.labelsXLabel">{{ String.fromCharCode(64 + i) }}</span>
 				</div>
-				<div :class="$style.boardCells" :style="cellsStyle">
-					<div
-						v-for="(stone, i) in engine.board"
-						:key="i"
-						v-tooltip="`${String.fromCharCode(65 + engine.posToXy(i)[0])}${engine.posToXy(i)[1] + 1}`"
-						:class="[$style.boardCell, {
-							[$style.boardCell_empty]: stone == null,
-							[$style.boardCell_none]: engine.map[i] === 'null',
-							[$style.boardCell_isEnded]: game.isEnded,
-							[$style.boardCell_myTurn]: !game.isEnded && isMyTurn,
-							[$style.boardCell_can]: turnUser ? engine.canPut(turnUser.id === blackUser.id, i) : null,
-							[$style.boardCell_prev]: engine.prevPos === i
-						}]"
-						@click="putStone(i)"
-					>
-						<Transition
-							:enterActiveClass="$style.transition_flip_enterActive"
-							:leaveActiveClass="$style.transition_flip_leaveActive"
-							:enterFromClass="$style.transition_flip_enterFrom"
-							:leaveToClass="$style.transition_flip_leaveTo"
-							mode="default"
+				<div style="display: flex;">
+					<div v-if="showBoardLabels" :class="$style.labelsY">
+						<div v-for="i in game.map.length" :class="$style.labelsYLabel">{{ i }}</div>
+					</div>
+					<div :class="$style.boardCells" :style="cellsStyle">
+						<div
+							v-for="(stone, i) in engine.board"
+							:key="i"
+							v-tooltip="`${String.fromCharCode(65 + engine.posToXy(i)[0])}${engine.posToXy(i)[1] + 1}`"
+							:class="[$style.boardCell, {
+								[$style.boardCell_empty]: stone == null,
+								[$style.boardCell_none]: engine.map[i] === 'null',
+								[$style.boardCell_isEnded]: game.isEnded,
+								[$style.boardCell_myTurn]: !game.isEnded && isMyTurn,
+								[$style.boardCell_can]: turnUser ? engine.canPut(turnUser.id === blackUser.id, i) : null,
+								[$style.boardCell_prev]: engine.prevPos === i
+							}]"
+							@click="putStone(i)"
 						>
-							<template v-if="useAvatarAsStone">
-								<img v-if="stone === true" :class="$style.boardCellStone" :src="blackUser.avatarUrl"/>
-								<img v-else-if="stone === false" :class="$style.boardCellStone" :src="whiteUser.avatarUrl"/>
-							</template>
-							<template v-else>
-								<img v-if="stone === true" :class="$style.boardCellStone" src="/client-assets/reversi/stone_b.png"/>
-								<img v-else-if="stone === false" :class="$style.boardCellStone" src="/client-assets/reversi/stone_w.png"/>
-							</template>
-						</Transition>
+							<Transition
+								:enterActiveClass="$style.transition_flip_enterActive"
+								:leaveActiveClass="$style.transition_flip_leaveActive"
+								:enterFromClass="$style.transition_flip_enterFrom"
+								:leaveToClass="$style.transition_flip_leaveTo"
+								mode="default"
+							>
+								<template v-if="useAvatarAsStone">
+									<img v-if="stone === true" :class="$style.boardCellStone" :src="blackUser.avatarUrl"/>
+									<img v-else-if="stone === false" :class="$style.boardCellStone" :src="whiteUser.avatarUrl"/>
+								</template>
+								<template v-else>
+									<img v-if="stone === true" :class="$style.boardCellStone" src="/client-assets/reversi/stone_b.png"/>
+									<img v-else-if="stone === false" :class="$style.boardCellStone" src="/client-assets/reversi/stone_w.png"/>
+								</template>
+							</Transition>
+						</div>
+					</div>
+					<div v-if="showBoardLabels" :class="$style.labelsY">
+						<div v-for="i in game.map.length" :class="$style.labelsYLabel">{{ i }}</div>
 					</div>
 				</div>
-				<div v-if="showBoardLabels" :class="$style.labelsY">
-					<div v-for="i in game.map.length" :class="$style.labelsYLabel">{{ i }}</div>
+				<div v-if="showBoardLabels" :class="$style.labelsX">
+					<span v-for="i in game.map[0].length" :class="$style.labelsXLabel">{{ String.fromCharCode(64 + i) }}</span>
 				</div>
 			</div>
-			<div v-if="showBoardLabels" :class="$style.labelsX">
-				<span v-for="i in game.map[0].length" :class="$style.labelsXLabel">{{ String.fromCharCode(64 + i) }}</span>
-			</div>
 		</div>
 
 		<div v-if="game.isEnded" class="_panel _gaps_s" style="padding: 16px;">
@@ -155,6 +157,7 @@ import { misskeyApi } from '@/scripts/misskey-api.js';
 import { userPage } from '@/filters/user.js';
 import * as sound from '@/scripts/sound.js';
 import * as os from '@/os.js';
+import { confetti } from '@/scripts/confetti.js';
 
 const $i = signinRequired();
 
@@ -329,6 +332,22 @@ function onStreamLog(log: Reversi.Serializer.Log & { id: string | null }) {
 
 function onStreamEnded(x) {
 	game.value = deepClone(x.game);
+
+	if (game.value.winnerId === $i.id) {
+		confetti({
+			duration: 1000 * 3,
+		});
+
+		sound.playUrl('/client-assets/reversi/win.mp3', {
+			volume: 1,
+			playbackRate: 1,
+		});
+	} else {
+		sound.playUrl('/client-assets/reversi/lose.mp3', {
+			volume: 1,
+			playbackRate: 1,
+		});
+	}
 }
 
 function checkEnd() {
@@ -465,8 +484,27 @@ $gap: 4px;
 
 .board {
 	width: 100%;
-	max-width: 500px;
+	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;
+
+	background: var(--panel);
+	box-shadow: 0 0 2px 1px #ce8a5c, inset 0 0 1px 1px #693410;
+	border-radius: 8px;
+}
+
+@container (max-width: 400px) {
+	.boardInner {
+		padding: 16px;
+	}
 }
 
 .labelsX {
diff --git a/packages/frontend/src/pages/reversi/game.setting.vue b/packages/frontend/src/pages/reversi/game.setting.vue
index 9ca107278b..d69176e25a 100644
--- a/packages/frontend/src/pages/reversi/game.setting.vue
+++ b/packages/frontend/src/pages/reversi/game.setting.vue
@@ -8,72 +8,74 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<MkSpacer :contentMax="600">
 		<div style="text-align: center;"><b><MkUserName :user="game.user1"/></b> vs <b><MkUserName :user="game.user2"/></b></div>
 
-		<div class="_gaps">
-			<div style="font-size: 1.5em; text-align: center;">{{ i18n.ts._reversi.gameSettings }}</div>
-
-			<div class="_panel">
-				<div style="display: flex; align-items: center; padding: 16px; border-bottom: solid 1px var(--divider);">
-					<div>{{ mapName }}</div>
-					<MkButton style="margin-left: auto;" @click="chooseMap">{{ i18n.ts._reversi.chooseBoard }}</MkButton>
-				</div>
+		<div :class="{ [$style.disallow]: isReady }">
+			<div class="_gaps" :class="{ [$style.disallowInner]: isReady }">
+				<div style="font-size: 1.5em; text-align: center;">{{ i18n.ts._reversi.gameSettings }}</div>
+
+				<div class="_panel">
+					<div style="display: flex; align-items: center; padding: 16px; border-bottom: solid 1px var(--divider);">
+						<div>{{ mapName }}</div>
+						<MkButton style="margin-left: auto;" @click="chooseMap">{{ i18n.ts._reversi.chooseBoard }}</MkButton>
+					</div>
 
-				<div style="padding: 16px;">
-					<div v-if="game.map == null"><i class="ti ti-dice"></i></div>
-					<div v-else :class="$style.board" :style="{ 'grid-template-rows': `repeat(${ game.map.length }, 1fr)`, 'grid-template-columns': `repeat(${ game.map[0].length }, 1fr)` }">
-						<div v-for="(x, i) in game.map.join('')" :class="[$style.boardCell, { [$style.boardCellNone]: x == ' ' }]" @click="onMapCellClick(i, x)">
-							<i v-if="x === 'b' || x === 'w'" style="pointer-events: none; user-select: none;" :class="x === 'b' ? 'ti ti-circle-filled' : 'ti ti-circle'"></i>
+					<div style="padding: 16px;">
+						<div v-if="game.map == null"><i class="ti ti-dice"></i></div>
+						<div v-else :class="$style.board" :style="{ 'grid-template-rows': `repeat(${ game.map.length }, 1fr)`, 'grid-template-columns': `repeat(${ game.map[0].length }, 1fr)` }">
+							<div v-for="(x, i) in game.map.join('')" :class="[$style.boardCell, { [$style.boardCellNone]: x == ' ' }]" @click="onMapCellClick(i, x)">
+								<i v-if="x === 'b' || x === 'w'" style="pointer-events: none; user-select: none;" :class="x === 'b' ? 'ti ti-circle-filled' : 'ti ti-circle'"></i>
+							</div>
 						</div>
 					</div>
 				</div>
-			</div>
 
-			<MkFolder :defaultOpen="true">
-				<template #label>{{ i18n.ts._reversi.blackOrWhite }}</template>
-
-				<MkRadios v-model="game.bw">
-					<option value="random">{{ i18n.ts.random }}</option>
-					<option :value="'1'">
-						<I18n :src="i18n.ts._reversi.blackIs" tag="span">
-							<template #name>
-								<b><MkUserName :user="game.user1"/></b>
-							</template>
-						</I18n>
-					</option>
-					<option :value="'2'">
-						<I18n :src="i18n.ts._reversi.blackIs" tag="span">
-							<template #name>
-								<b><MkUserName :user="game.user2"/></b>
-							</template>
-						</I18n>
-					</option>
-				</MkRadios>
-			</MkFolder>
-
-			<MkFolder :defaultOpen="true">
-				<template #label>{{ i18n.ts._reversi.timeLimitForEachTurn }}</template>
-				<template #suffix>{{ game.timeLimitForEachTurn }}{{ i18n.ts._time.second }}</template>
-
-				<MkRadios v-model="game.timeLimitForEachTurn">
-					<option :value="5">5{{ i18n.ts._time.second }}</option>
-					<option :value="10">10{{ i18n.ts._time.second }}</option>
-					<option :value="30">30{{ i18n.ts._time.second }}</option>
-					<option :value="60">60{{ i18n.ts._time.second }}</option>
-					<option :value="90">90{{ i18n.ts._time.second }}</option>
-					<option :value="120">120{{ i18n.ts._time.second }}</option>
-					<option :value="180">180{{ i18n.ts._time.second }}</option>
-					<option :value="3600">3600{{ i18n.ts._time.second }}</option>
-				</MkRadios>
-			</MkFolder>
-
-			<MkFolder :defaultOpen="true">
-				<template #label>{{ i18n.ts._reversi.rules }}</template>
-
-				<div class="_gaps_s">
-					<MkSwitch v-model="game.isLlotheo" @update:modelValue="updateSettings('isLlotheo')">{{ i18n.ts._reversi.isLlotheo }}</MkSwitch>
-					<MkSwitch v-model="game.loopedBoard" @update:modelValue="updateSettings('loopedBoard')">{{ i18n.ts._reversi.loopedMap }}</MkSwitch>
-					<MkSwitch v-model="game.canPutEverywhere" @update:modelValue="updateSettings('canPutEverywhere')">{{ i18n.ts._reversi.canPutEverywhere }}</MkSwitch>
-				</div>
-			</MkFolder>
+				<MkFolder :defaultOpen="true">
+					<template #label>{{ i18n.ts._reversi.blackOrWhite }}</template>
+
+					<MkRadios v-model="game.bw">
+						<option value="random">{{ i18n.ts.random }}</option>
+						<option :value="'1'">
+							<I18n :src="i18n.ts._reversi.blackIs" tag="span">
+								<template #name>
+									<b><MkUserName :user="game.user1"/></b>
+								</template>
+							</I18n>
+						</option>
+						<option :value="'2'">
+							<I18n :src="i18n.ts._reversi.blackIs" tag="span">
+								<template #name>
+									<b><MkUserName :user="game.user2"/></b>
+								</template>
+							</I18n>
+						</option>
+					</MkRadios>
+				</MkFolder>
+
+				<MkFolder :defaultOpen="true">
+					<template #label>{{ i18n.ts._reversi.timeLimitForEachTurn }}</template>
+					<template #suffix>{{ game.timeLimitForEachTurn }}{{ i18n.ts._time.second }}</template>
+
+					<MkRadios v-model="game.timeLimitForEachTurn">
+						<option :value="5">5{{ i18n.ts._time.second }}</option>
+						<option :value="10">10{{ i18n.ts._time.second }}</option>
+						<option :value="30">30{{ i18n.ts._time.second }}</option>
+						<option :value="60">60{{ i18n.ts._time.second }}</option>
+						<option :value="90">90{{ i18n.ts._time.second }}</option>
+						<option :value="120">120{{ i18n.ts._time.second }}</option>
+						<option :value="180">180{{ i18n.ts._time.second }}</option>
+						<option :value="3600">3600{{ i18n.ts._time.second }}</option>
+					</MkRadios>
+				</MkFolder>
+
+				<MkFolder :defaultOpen="true">
+					<template #label>{{ i18n.ts._reversi.rules }}</template>
+
+					<div class="_gaps_s">
+						<MkSwitch v-model="game.isLlotheo" @update:modelValue="updateSettings('isLlotheo')">{{ i18n.ts._reversi.isLlotheo }}</MkSwitch>
+						<MkSwitch v-model="game.loopedBoard" @update:modelValue="updateSettings('loopedBoard')">{{ i18n.ts._reversi.loopedMap }}</MkSwitch>
+						<MkSwitch v-model="game.canPutEverywhere" @update:modelValue="updateSettings('canPutEverywhere')">{{ i18n.ts._reversi.canPutEverywhere }}</MkSwitch>
+					</div>
+				</MkFolder>
+			</div>
 		</div>
 	</MkSpacer>
 	<template #footer>
@@ -123,7 +125,7 @@ const props = defineProps<{
 }>();
 
 const game = ref<Misskey.entities.ReversiGameDetailed>(deepClone(props.game));
-const isLlotheo = ref<boolean>(false);
+
 const mapName = computed(() => {
 	if (game.value.map == null) return 'Random';
 	const found = Object.values(Reversi.maps).find(x => x.data.join('') === game.value.map.join(''));
@@ -236,6 +238,15 @@ onUnmounted(() => {
 </script>
 
 <style lang="scss" module>
+.disallow {
+	cursor: not-allowed;
+}
+.disallowInner {
+	pointer-events: none;
+	user-select: none;
+	opacity: 0.7;
+}
+
 .board {
 	display: grid;
 	grid-gap: 4px;
-- 
cgit v1.2.3-freya


From 4c87e98e1245a88f8eb2a49d71214fa7163d8676 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 21 Jan 2024 18:08:49 +0900
Subject: fix(frontend):
 MkHorizontalSwipeでメニューを閉じるのに2回クリックが必要になる問題を修正
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#13055
---
 .../frontend/src/components/MkHorizontalSwipe.vue  | 43 +++++++++++-----------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/packages/frontend/src/components/MkHorizontalSwipe.vue b/packages/frontend/src/components/MkHorizontalSwipe.vue
index a7d0d5a3e4..55bb4b13b0 100644
--- a/packages/frontend/src/components/MkHorizontalSwipe.vue
+++ b/packages/frontend/src/components/MkHorizontalSwipe.vue
@@ -6,10 +6,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <div
 	ref="rootEl"
-	:class="[$style.transitionRoot, (defaultStore.state.animation && $style.enableAnimation)]"
-	@touchstart="touchStart"
-	@touchmove="touchMove"
-	@touchend="touchEnd"
+	:class="[$style.transitionRoot]"
+	@touchstart.passive="touchStart"
+	@touchmove.passive="touchMove"
+	@touchend.passive="touchEnd"
 >
 	<Transition
 		:class="[$style.transitionChildren, { [$style.swiping]: isSwipingForClass }]"
@@ -25,6 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</Transition>
 </div>
 </template>
+
 <script lang="ts" setup>
 import { ref, shallowRef, computed, nextTick, watch } from 'vue';
 import type { Tab } from '@/components/global/MkPageHeader.tabs.vue';
@@ -154,7 +155,7 @@ function touchEnd(event: TouchEvent) {
 
 	pullDistance.value = 0;
 	isSwiping.value = false;
-	setTimeout(() => {
+	window.setTimeout(() => {
 		isSwipingForClass.value = false;
 	}, 400);
 }
@@ -178,29 +179,29 @@ watch(tabModel, (newTab, oldTab) => {
 </script>
 
 <style lang="scss" module>
-.transitionRoot.enableAnimation {
+.transitionRoot {
 	display: grid;
 	grid-template-columns: 100%;
 	overflow: clip;
+}
 
-	.transitionChildren {
-		grid-area: 1 / 1 / 2 / 2;
-		transform: translateX(var(--swipe));
+.transitionChildren {
+	grid-area: 1 / 1 / 2 / 2;
+	transform: translateX(var(--swipe));
 
-		&.swipeAnimation_enterActive,
-		&.swipeAnimation_leaveActive {
-			transition: transform .3s cubic-bezier(0.65, 0.05, 0.36, 1);
-		}
+	&.swipeAnimation_enterActive,
+	&.swipeAnimation_leaveActive {
+		transition: transform .3s cubic-bezier(0.65, 0.05, 0.36, 1);
+	}
 
-		&.swipeAnimationRight_leaveTo,
-		&.swipeAnimationLeft_enterFrom {
-			transform: translateX(calc(100% + 24px));
-		}
+	&.swipeAnimationRight_leaveTo,
+	&.swipeAnimationLeft_enterFrom {
+		transform: translateX(calc(100% + 24px));
+	}
 
-		&.swipeAnimationRight_enterFrom,
-		&.swipeAnimationLeft_leaveTo {
-			transform: translateX(calc(-100% - 24px));
-		}
+	&.swipeAnimationRight_enterFrom,
+	&.swipeAnimationLeft_leaveTo {
+		transform: translateX(calc(-100% - 24px));
 	}
 }
 
-- 
cgit v1.2.3-freya


From fb309f3d4f49b56464e3dd97d6540e092294baf2 Mon Sep 17 00:00:00 2001
From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 21 Jan 2024 18:14:42 +0900
Subject: return a `Vary: Accept` header for all dual-format endpoints #365
 (#13044)

`/users/:user`, `/@:user`, `/notes/:note` return different responses
depending on the request's `Accept:` header. If we don't consistently
return a `Vary: Accept` header, browsers and caching proxies will get
confused, and return AP representations when HTML was requested, or
vice versa.

Co-authored-by: dakkar <dakkar@thenautilus.net>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---
 packages/backend/src/server/ActivityPubServerService.ts | 4 ++++
 packages/backend/src/server/web/ClientServerService.ts  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/packages/backend/src/server/ActivityPubServerService.ts b/packages/backend/src/server/ActivityPubServerService.ts
index 68e426b5bc..4fa6b8afee 100644
--- a/packages/backend/src/server/ActivityPubServerService.ts
+++ b/packages/backend/src/server/ActivityPubServerService.ts
@@ -648,6 +648,8 @@ export class ActivityPubServerService {
 		});
 
 		fastify.get<{ Params: { user: string; } }>('/users/:user', { constraints: { apOrHtml: 'ap' } }, async (request, reply) => {
+			vary(reply.raw, 'Accept');
+
 			const userId = request.params.user;
 
 			const user = await this.usersRepository.findOneBy({
@@ -660,6 +662,8 @@ export class ActivityPubServerService {
 		});
 
 		fastify.get<{ Params: { user: string; } }>('/@:user', { constraints: { apOrHtml: 'ap' } }, async (request, reply) => {
+			vary(reply.raw, 'Accept');
+
 			const user = await this.usersRepository.findOneBy({
 				usernameLower: request.params.user.toLowerCase(),
 				host: IsNull(),
diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts
index 3e35d5415e..2de5156fec 100644
--- a/packages/backend/src/server/web/ClientServerService.ts
+++ b/packages/backend/src/server/web/ClientServerService.ts
@@ -476,6 +476,8 @@ export class ClientServerService {
 				isSuspended: false,
 			});
 
+			vary(reply.raw, 'Accept');
+
 			if (user != null) {
 				const profile = await this.userProfilesRepository.findOneByOrFail({ userId: user.id });
 				const meta = await this.metaService.fetch();
@@ -515,6 +517,8 @@ export class ClientServerService {
 				return;
 			}
 
+			vary(reply.raw, 'Accept');
+
 			reply.redirect(`/@${user.username}${ user.host == null ? '' : '@' + user.host}`);
 		});
 
-- 
cgit v1.2.3-freya


From 0580ba1fb5a1c9608b454e7533f582a265905ab7 Mon Sep 17 00:00:00 2001
From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 21 Jan 2024 18:29:17 +0900
Subject: enhance(frontend):
 タイムラインフィルターの設定を保持＋センシティブなノートを隠せるように
 (#12848)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* (enhance) タイムラインフィルターの状態を記憶するように

* fix

* (enhance) センシティブな投稿をミュート形式で表示する(TLのみ)

* fix

* Update Changelog

* Fix changelog

* Lintエラーを潰す

* Update locales/ja-JP.yml

* hideSensitive -> withSensitive

* Update CHANGELOG.md

* Update ja-JP.yml

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---
 CHANGELOG.md                                    |  3 +
 locales/index.d.ts                              |  2 +
 locales/ja-JP.yml                               |  2 +
 packages/frontend/src/components/MkNote.vue     | 30 +++++++--
 packages/frontend/src/components/MkTimeline.vue |  1 +
 packages/frontend/src/pages/timeline.vue        | 89 ++++++++++++++++++++-----
 packages/frontend/src/store.ts                  | 10 +--
 7 files changed, 110 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 716937d628..adcb6fd70c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,9 @@
 - Enhance: 絵文字ピッカー・オートコンプリートで、完全一致した絵文字を優先的に表示するように
 - Enhance: Playの説明欄にMFMを使えるように
 - Enhance: チャンネルノートの場合は詳細ページからその前後のノートを見れるように
+- Enhance: タイムラインフィルターの設定をすべて保持できるように
+	- 今までの「TLに他の人への返信を含める」設定は一旦リセットされます
+- Enhance: タイムラインフィルターに「センシティブなファイルを含むノートを表示」を追加
 - Enhance: ノート作成画面のファイル添付メニューから直接ファイルを削除できるように
 - Enhance: MFMの属性でオートコンプリートが使用できるように #12735
 - Fix: ネイティブモードの絵文字がモノクロにならないように
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 5e00e539f2..5ef82d12fb 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -4824,6 +4824,8 @@ export interface Locale extends ILocale {
      * タイトルへ
      */
     "backToTitle": string;
+    "withSensitive": string;
+    "userSaysSomethingSensitive": string;
     /**
      * スワイプしてタブを切り替える
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 915b9a2080..180f7f5732 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1202,6 +1202,8 @@ replaying: "リプレイ中"
 ranking: "ランキング"
 lastNDays: "直近{n}日"
 backToTitle: "タイトルへ"
+withSensitive: "センシティブなファイルを含むノートを表示"
+userSaysSomethingSensitive: "{name}のセンシティブなファイルを含む投稿"
 enableHorizontalSwipe: "スワイプしてタブを切り替える"
 
 _bubbleGame:
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index d7bb64661b..7448fd34e3 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div
-	v-if="!hardMuted && !muted"
+	v-if="!hardMuted && muted === false"
 	v-show="!isDeleted"
 	ref="el"
 	v-hotkey="keymap"
@@ -134,7 +134,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</article>
 </div>
 <div v-else-if="!hardMuted" :class="$style.muted" @click="muted = false">
-	<I18n :src="i18n.ts.userSaysSomething" tag="small">
+	<I18n v-if="muted === 'sensitiveMute'" :src="i18n.ts.userSaysSomethingSensitive" tag="small">
+		<template #name>
+			<MkA v-user-preview="appearNote.userId" :to="userPage(appearNote.user)">
+				<MkUserName :user="appearNote.user"/>
+			</MkA>
+		</template>
+	</I18n>
+	<I18n v-else :src="i18n.ts.userSaysSomething" tag="small">
 		<template #name>
 			<MkA v-user-preview="appearNote.userId" :to="userPage(appearNote.user)">
 				<MkUserName :user="appearNote.user"/>
@@ -203,6 +210,7 @@ const emit = defineEmits<{
 	(ev: 'removeReaction', emoji: string): void;
 }>();
 
+const inTimeline = inject<boolean>('inTimeline', false);
 const inChannel = inject('inChannel', null);
 const currentClip = inject<Ref<Misskey.entities.Clip> | null>('currentClip', null);
 
@@ -250,19 +258,27 @@ const isLong = shouldCollapsed(appearNote.value, urls.value ?? []);
 const collapsed = ref(appearNote.value.cw == null && isLong);
 const isDeleted = ref(false);
 const muted = ref(checkMute(appearNote.value, $i?.mutedWords));
-const hardMuted = ref(props.withHardMute && checkMute(appearNote.value, $i?.hardMutedWords));
+const hardMuted = ref(props.withHardMute && checkMute(appearNote.value, $i?.hardMutedWords, true));
 const translation = ref<Misskey.entities.NotesTranslateResponse | null>(null);
 const translating = ref(false);
 const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.value.user.instance);
 const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || (appearNote.value.visibility === 'followers' && appearNote.value.userId === $i.id));
 const renoteCollapsed = ref(defaultStore.state.collapseRenotes && isRenote && (($i && ($i.id === note.value.userId || $i.id === appearNote.value.userId)) || (appearNote.value.myReaction != null)));
 
-function checkMute(note: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null): boolean {
+/* Overload FunctionにLintが対応していないのでコメントアウト
+function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly: true): boolean;
+function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly: false): boolean | 'sensitiveMute';
+*/
+function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly = false): boolean | 'sensitiveMute' {
 	if (mutedWords == null) return false;
 
-	if (checkWordMute(note, $i, mutedWords)) return true;
-	if (note.reply && checkWordMute(note.reply, $i, mutedWords)) return true;
-	if (note.renote && checkWordMute(note.renote, $i, mutedWords)) return true;
+	if (checkWordMute(noteToCheck, $i, mutedWords)) return true;
+	if (noteToCheck.reply && checkWordMute(noteToCheck.reply, $i, mutedWords)) return true;
+	if (noteToCheck.renote && checkWordMute(noteToCheck.renote, $i, mutedWords)) return true;
+
+	if (checkOnly) return false;
+
+	if (inTimeline && !defaultStore.state.tl.filter.withSensitive && noteToCheck.files?.some((v) => v.isSensitive)) return 'sensitiveMute';
 	return false;
 }
 
diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue
index 8a5076ea1d..9ea654213e 100644
--- a/packages/frontend/src/components/MkTimeline.vue
+++ b/packages/frontend/src/components/MkTimeline.vue
@@ -49,6 +49,7 @@ const emit = defineEmits<{
 	(ev: 'queue', count: number): void;
 }>();
 
+provide('inTimeline', true);
 provide('inChannel', computed(() => props.src === 'channel'));
 
 type TimelineQueryType = {
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index 666a9968b2..3481113f87 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -66,17 +66,51 @@ const rootEl = shallowRef<HTMLElement>();
 
 const queue = ref(0);
 const srcWhenNotSignin = ref(isLocalTimelineAvailable ? 'local' : 'global');
-const src = computed({ get: () => ($i ? defaultStore.reactiveState.tl.value.src : srcWhenNotSignin.value), set: (x) => saveSrc(x) });
-const withRenotes = ref(true);
-const withReplies = ref($i ? defaultStore.state.tlWithReplies : false);
-const onlyFiles = ref(false);
+const src = computed({
+	get: () => ($i ? defaultStore.reactiveState.tl.value.src : srcWhenNotSignin.value),
+	set: (x) => saveSrc(x),
+});
+const withRenotes = computed({
+	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+	get: () => (defaultStore.reactiveState.tl.value.filter?.withRenotes ?? saveTlFilter('withRenotes', true)),
+	set: (x) => saveTlFilter('withRenotes', x),
+});
+const withReplies = computed({
+	get: () => {
+		if (!$i) return false;
+		if (['local', 'social'].includes(src.value) && onlyFiles.value) {
+			return false;
+		} else {
+			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+			return defaultStore.reactiveState.tl.value.filter?.withReplies ?? saveTlFilter('withReplies', true);
+		}
+	},
+	set: (x) => saveTlFilter('withReplies', x),
+});
+const onlyFiles = computed({
+	get: () => {
+		if (['local', 'social'].includes(src.value) && withReplies.value) {
+			return false;
+		} else {
+			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+			return defaultStore.reactiveState.tl.value.filter?.onlyFiles ?? saveTlFilter('onlyFiles', false);
+		}
+	},
+	set: (x) => saveTlFilter('onlyFiles', x),
+});
+const withSensitive = computed({
+	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+	get: () => (defaultStore.reactiveState.tl.value.filter?.withSensitive ?? saveTlFilter('withSensitive', true)),
+	set: (x) => {
+		saveTlFilter('withSensitive', x);
 
-watch(src, () => {
-	queue.value = 0;
+		// これだけはクライアント側で完結する処理なので手動でリロード
+		tlComponent.value?.reloadTimeline();
+	},
 });
 
-watch(withReplies, (x) => {
-	if ($i) defaultStore.set('tlWithReplies', x);
+watch(src, () => {
+	queue.value = 0;
 });
 
 function queueUpdated(q: number): void {
@@ -154,18 +188,38 @@ async function chooseChannel(ev: MouseEvent): Promise<void> {
 }
 
 function saveSrc(newSrc: 'home' | 'local' | 'social' | 'global' | `list:${string}`): void {
-	let userList = null;
+	const out = {
+		...defaultStore.state.tl,
+		src: newSrc,
+	};
+
 	if (newSrc.startsWith('userList:')) {
 		const id = newSrc.substring('userList:'.length);
-		userList = defaultStore.reactiveState.pinnedUserLists.value.find(l => l.id === id);
+		out.userList = defaultStore.reactiveState.pinnedUserLists.value.find(l => l.id === id) ?? null;
 	}
-	defaultStore.set('tl', {
-		src: newSrc,
-		userList,
-	});
+
+	defaultStore.set('tl', out);
 	srcWhenNotSignin.value = newSrc;
 }
 
+function saveTlFilter(key: keyof typeof defaultStore.state.tl.filter, newValue: boolean) {
+	if (key !== 'withReplies' || $i) {
+		const out = { ...defaultStore.state.tl };
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		if (!out.filter) {
+			out.filter = {
+				withRenotes: true,
+				withReplies: true,
+				withSensitive: true,
+				onlyFiles: false,
+			};
+		}
+		out.filter[key] = newValue;
+		defaultStore.set('tl', out);
+	}
+	return newValue;
+}
+
 async function timetravel(): Promise<void> {
 	const { canceled, result: date } = await os.inputDate({
 		title: i18n.ts.date,
@@ -202,6 +256,10 @@ const headerActions = computed(() => {
 					ref: withReplies,
 					disabled: onlyFiles,
 				} : undefined, {
+					type: 'switch',
+					text: i18n.ts.withSensitive,
+					ref: withSensitive,
+				}, {
 					type: 'switch',
 					text: i18n.ts.fileAttachedOnly,
 					ref: onlyFiles,
@@ -215,8 +273,7 @@ const headerActions = computed(() => {
 			icon: 'ti ti-refresh',
 			text: i18n.ts.reload,
 			handler: (ev: Event) => {
-				console.log('called');
-				tlComponent.value.reloadTimeline();
+				tlComponent.value?.reloadTimeline();
 			},
 		});
 	}
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 21b796caa1..5635e99650 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -184,6 +184,12 @@ export const defaultStore = markRaw(new Storage('base', {
 		default: {
 			src: 'home' as 'home' | 'local' | 'social' | 'global' | `list:${string}`,
 			userList: null as Misskey.entities.UserList | null,
+			filter: {
+				withReplies: true,
+				withRenotes: true,
+				withSensitive: true,
+				onlyFiles: false,
+			},
 		},
 	},
 	pinnedUserLists: {
@@ -391,10 +397,6 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: false,
 	},
-	tlWithReplies: {
-		where: 'device',
-		default: false,
-	},
 	defaultWithReplies: {
 		where: 'account',
 		default: false,
-- 
cgit v1.2.3-freya


From 90e0a6e2c3883c36d57782abdd57e522e8d726ae Mon Sep 17 00:00:00 2001
From: 1Step621 <86859447+1STEP621@users.noreply.github.com>
Date: Sun, 21 Jan 2024 18:30:05 +0900
Subject: Enhance(frontend): 絵文字編集ダイアログをウィンドウにする (#13047)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 絵文字編集ダイアログをウィンドウにする

* update CHANGELOG.md
---
 CHANGELOG.md                                      |  1 +
 packages/frontend/src/pages/emoji-edit-dialog.vue | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index adcb6fd70c..f669c0366e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
 - Enhance: タイムラインフィルターに「センシティブなファイルを含むノートを表示」を追加
 - Enhance: ノート作成画面のファイル添付メニューから直接ファイルを削除できるように
 - Enhance: MFMの属性でオートコンプリートが使用できるように #12735
+- Enhance: 絵文字編集ダイアログをモーダルではなくウィンドウで表示するように
 - Fix: ネイティブモードの絵文字がモノクロにならないように
 - Fix: v2023.12.0で追加された「モデレーターがユーザーのアイコンもしくはバナー画像を未設定状態にできる機能」が管理画面上で正しく表示されていない問題を修正
 - Fix: AiScriptの`readline`関数が不正な値を返すことがある問題のv2023.12.0時点での修正がPlay以外に適用されていないのを修正
diff --git a/packages/frontend/src/pages/emoji-edit-dialog.vue b/packages/frontend/src/pages/emoji-edit-dialog.vue
index 9dcc7bc035..2682c487ee 100644
--- a/packages/frontend/src/pages/emoji-edit-dialog.vue
+++ b/packages/frontend/src/pages/emoji-edit-dialog.vue
@@ -4,10 +4,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkModalWindow
-	ref="dialog"
-	:width="400"
-	@close="dialog.close()"
+<MkWindow
+	ref="windowEl"
+	:initialWidth="400"
+	:initialHeight="500"
+	:canResize="false"
+	@close="windowEl.close()"
 	@closed="$emit('closed')"
 >
 	<template v-if="emoji" #header>:{{ emoji.name }}:</template>
@@ -73,13 +75,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkButton primary rounded style="margin: 0 auto;" @click="done"><i class="ti ti-check"></i> {{ props.emoji ? i18n.ts.update : i18n.ts.create }}</MkButton>
 		</div>
 	</div>
-</MkModalWindow>
+</MkWindow>
 </template>
 
 <script lang="ts" setup>
 import { computed, watch, ref } from 'vue';
 import * as Misskey from 'misskey-js';
-import MkModalWindow from '@/components/MkModalWindow.vue';
+import MkWindow from '@/components/MkWindow.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkInfo from '@/components/MkInfo.vue';
@@ -96,7 +98,7 @@ const props = defineProps<{
 	emoji?: any,
 }>();
 
-const dialog = ref<InstanceType<typeof MkModalWindow> | null>(null);
+const windowEl = ref<InstanceType<typeof MkWindow> | null>(null);
 const name = ref<string>(props.emoji ? props.emoji.name : '');
 const category = ref<string>(props.emoji ? props.emoji.category : '');
 const aliases = ref<string>(props.emoji ? props.emoji.aliases.join(' ') : '');
@@ -170,7 +172,7 @@ async function done() {
 			},
 		});
 
-		dialog.value.close();
+		windowEl.value.close();
 	} else {
 		const created = await os.apiWithDialog('admin/emoji/add', params);
 
@@ -178,7 +180,7 @@ async function done() {
 			created: created,
 		});
 
-		dialog.value.close();
+		windowEl.value.close();
 	}
 }
 
@@ -195,7 +197,7 @@ async function del() {
 		emit('done', {
 			deleted: true,
 		});
-		dialog.value.close();
+		windowEl.value.close();
 	});
 }
 </script>
-- 
cgit v1.2.3-freya


From f4657eb16ff6b36a3ee3b86c85caa0f3c585694d Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 21 Jan 2024 18:43:01 +0900
Subject: update deps

---
 locales/index.d.ts               |    8 +-
 package.json                     |   12 +-
 packages/backend/package.json    |   52 +-
 packages/backend/src/postgres.ts |   32 +-
 packages/frontend/package.json   |   74 +-
 packages/misskey-js/package.json |   18 +-
 packages/sw/package.json         |    8 +-
 pnpm-lock.yaml                   | 3130 ++++++++++++++++----------------------
 8 files changed, 1454 insertions(+), 1880 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 5ef82d12fb..5d345b88e6 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -4824,8 +4824,14 @@ export interface Locale extends ILocale {
      * タイトルへ
      */
     "backToTitle": string;
+    /**
+     * センシティブなファイルを含むノートを表示
+     */
     "withSensitive": string;
-    "userSaysSomethingSensitive": string;
+    /**
+     * {name}のセンシティブなファイルを含む投稿
+     */
+    "userSaysSomethingSensitive": ParameterizedString<"name">;
     /**
      * スワイプしてタブを切り替える
      */
diff --git a/package.json b/package.json
index ee50cecb11..13d1cc8e22 100644
--- a/package.json
+++ b/package.json
@@ -49,17 +49,17 @@
 	},
 	"dependencies": {
 		"execa": "8.0.1",
-		"cssnano": "6.0.2",
+		"cssnano": "6.0.3",
 		"js-yaml": "4.1.0",
-		"postcss": "8.4.32",
-		"terser": "5.26.0",
+		"postcss": "8.4.33",
+		"terser": "5.27.0",
 		"typescript": "5.3.3"
 	},
 	"devDependencies": {
-		"@typescript-eslint/eslint-plugin": "6.14.0",
-		"@typescript-eslint/parser": "6.14.0",
+		"@typescript-eslint/eslint-plugin": "6.19.0",
+		"@typescript-eslint/parser": "6.19.0",
 		"cross-env": "7.0.3",
-		"cypress": "13.6.1",
+		"cypress": "13.6.3",
 		"eslint": "8.56.0",
 		"start-server-and-test": "2.0.3",
 		"ncp": "2.0.0"
diff --git a/packages/backend/package.json b/packages/backend/package.json
index f8e82c5a1c..61f2bef89f 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -72,11 +72,11 @@
 		"@bull-board/ui": "5.10.2",
 		"@discordapp/twemoji": "15.0.2",
 		"@fastify/accepts": "4.3.0",
-		"@fastify/cookie": "9.2.0",
+		"@fastify/cookie": "9.3.1",
 		"@fastify/cors": "8.5.0",
 		"@fastify/express": "2.3.0",
 		"@fastify/http-proxy": "9.3.0",
-		"@fastify/multipart": "8.0.0",
+		"@fastify/multipart": "8.1.0",
 		"@fastify/static": "6.12.0",
 		"@fastify/view": "8.2.0",
 		"@misskey-dev/sharp-read-bmp": "^1.1.1",
@@ -85,20 +85,20 @@
 		"@nestjs/core": "10.2.10",
 		"@nestjs/testing": "10.2.10",
 		"@peertube/http-signature": "1.7.0",
-		"@simplewebauthn/server": "8.3.5",
+		"@simplewebauthn/server": "9.0.0",
 		"@sinonjs/fake-timers": "11.2.2",
 		"@smithy/node-http-handler": "2.1.10",
 		"@swc/cli": "0.1.63",
-		"@swc/core": "1.3.100",
+		"@swc/core": "1.3.105",
 		"@twemoji/parser": "15.0.0",
 		"accepts": "1.3.8",
 		"ajv": "8.12.0",
 		"archiver": "6.0.1",
-		"async-mutex": "0.4.0",
+		"async-mutex": "0.4.1",
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
 		"body-parser": "1.20.2",
-		"bullmq": "4.15.4",
+		"bullmq": "5.1.4",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "9.0.1",
 		"chalk": "5.3.0",
@@ -110,10 +110,10 @@
 		"crc-32": "^1.2.2",
 		"date-fns": "2.30.0",
 		"deep-email-validator": "0.1.21",
-		"fastify": "4.24.3",
+		"fastify": "4.25.2",
 		"fastify-raw-body": "4.3.0",
 		"feed": "4.2.2",
-		"file-type": "18.7.0",
+		"file-type": "19.0.0",
 		"fluent-ffmpeg": "2.1.2",
 		"form-data": "4.0.0",
 		"got": "14.0.0",
@@ -125,11 +125,11 @@
 		"ipaddr.js": "2.1.0",
 		"is-svg": "5.0.0",
 		"js-yaml": "4.1.0",
-		"jsdom": "23.0.1",
+		"jsdom": "23.2.0",
 		"json5": "2.2.3",
 		"jsonld": "8.3.2",
-		"jsrsasign": "10.9.0",
-		"meilisearch": "0.36.0",
+		"jsrsasign": "11.0.0",
+		"meilisearch": "0.37.0",
 		"mfm-js": "0.24.0",
 		"microformats-parser": "2.0.2",
 		"mime-types": "2.1.35",
@@ -139,13 +139,13 @@
 		"nanoid": "5.0.4",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.2",
-		"nodemailer": "6.9.7",
+		"nodemailer": "6.9.8",
 		"nsfwjs": "2.4.2",
 		"oauth": "0.10.0",
 		"oauth2orize": "1.12.0",
 		"oauth2orize-pkce": "0.1.2",
 		"os-utils": "0.0.14",
-		"otpauth": "9.2.1",
+		"otpauth": "9.2.2",
 		"parse5": "7.1.2",
 		"pg": "8.11.3",
 		"pkce-challenge": "4.0.1",
@@ -169,25 +169,25 @@
 		"slacc": "0.0.10",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
-		"systeminformation": "5.21.20",
+		"systeminformation": "5.21.23",
 		"tinycolor2": "1.6.0",
 		"tmp": "0.2.1",
 		"tsc-alias": "1.8.8",
 		"tsconfig-paths": "4.2.0",
-		"typeorm": "0.3.17",
+		"typeorm": "0.3.19",
 		"typescript": "5.3.3",
 		"ulid": "2.3.0",
 		"vary": "1.1.2",
-		"web-push": "3.6.6",
-		"ws": "8.15.1",
+		"web-push": "3.6.7",
+		"ws": "8.16.0",
 		"xev": "3.0.2"
 	},
 	"devDependencies": {
 		"@jest/globals": "29.7.0",
-		"@misskey-dev/eslint-plugin": "^1.0.0",
-		"@nestjs/platform-express": "^10.3.0",
+		"@misskey-dev/eslint-plugin": "1.0.0",
+		"@nestjs/platform-express": "10.3.0",
 		"@simplewebauthn/typescript-types": "8.3.4",
-		"@swc/jest": "0.2.29",
+		"@swc/jest": "0.2.31",
 		"@types/accepts": "1.3.7",
 		"@types/archiver": "6.0.2",
 		"@types/bcryptjs": "2.4.6",
@@ -204,7 +204,7 @@
 		"@types/jsrsasign": "10.5.12",
 		"@types/mime-types": "2.1.4",
 		"@types/ms": "0.7.34",
-		"@types/node": "20.10.5",
+		"@types/node": "20.11.5",
 		"@types/node-fetch": "3.0.3",
 		"@types/nodemailer": "6.4.14",
 		"@types/oauth": "0.9.4",
@@ -227,9 +227,9 @@
 		"@types/vary": "1.1.3",
 		"@types/web-push": "3.6.3",
 		"@types/ws": "8.5.10",
-		"@typescript-eslint/eslint-plugin": "6.14.0",
-		"@typescript-eslint/parser": "6.14.0",
-		"aws-sdk-client-mock": "3.0.0",
+		"@typescript-eslint/eslint-plugin": "6.19.0",
+		"@typescript-eslint/parser": "6.19.0",
+		"aws-sdk-client-mock": "3.0.1",
 		"cross-env": "7.0.3",
 		"eslint": "8.56.0",
 		"eslint-plugin-import": "2.29.1",
@@ -237,8 +237,8 @@
 		"fkill": "^9.0.0",
 		"jest": "29.7.0",
 		"jest-mock": "29.7.0",
-		"nodemon": "3.0.2",
-		"pid-port": "^1.0.0",
+		"nodemon": "3.0.3",
+		"pid-port": "1.0.0",
 		"simple-oauth2": "5.0.0"
 	}
 }
diff --git a/packages/backend/src/postgres.ts b/packages/backend/src/postgres.ts
index 1e063c8673..543cedc867 100644
--- a/packages/backend/src/postgres.ts
+++ b/packages/backend/src/postgres.ts
@@ -211,22 +211,24 @@ export function createPostgresDataSource(config: Config) {
 			statement_timeout: 1000 * 10,
 			...config.db.extra,
 		},
-		replication: config.dbReplications ? {
-			master: {
-				host: config.db.host,
-				port: config.db.port,
-				username: config.db.user,
-				password: config.db.pass,
-				database: config.db.db,
+		...(config.dbReplications ? {
+			replication: {
+				master: {
+					host: config.db.host,
+					port: config.db.port,
+					username: config.db.user,
+					password: config.db.pass,
+					database: config.db.db,
+				},
+				slaves: config.dbSlaves!.map(rep => ({
+					host: rep.host,
+					port: rep.port,
+					username: rep.user,
+					password: rep.pass,
+					database: rep.db,
+				})),
 			},
-			slaves: config.dbSlaves!.map(rep => ({
-				host: rep.host,
-				port: rep.port,
-				username: rep.user,
-				password: rep.pass,
-				database: rep.db,
-			})),
-		} : undefined,
+		} : {}),
 		synchronize: process.env.NODE_ENV === 'test',
 		dropSchema: process.env.NODE_ENV === 'test',
 		cache: !config.db.disableCache && process.env.NODE_ENV !== 'test' ? { // dbをcloseしても何故かredisのコネクションが内部的に残り続けるようで、テストの際に支障が出るため無効にする(キャッシュも含めてテストしたいため本当は有効にしたいが...)
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 6dd826d459..6dffc2a3f4 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -39,7 +39,7 @@
 		"chartjs-chart-matrix": "2.0.1",
 		"chartjs-plugin-gradient": "0.6.1",
 		"chartjs-plugin-zoom": "2.0.1",
-		"chromatic": "10.1.0",
+		"chromatic": "10.3.1",
 		"compare-versions": "6.1.0",
 		"crc-32": "^1.2.2",
 		"cropperjs": "2.0.0-beta.4",
@@ -58,13 +58,13 @@
 		"misskey-bubble-game": "workspace:*",
 		"photoswipe": "5.4.3",
 		"punycode": "2.3.1",
-		"rollup": "4.9.1",
+		"rollup": "4.9.6",
 		"sanitize-html": "2.11.0",
-		"sass": "1.69.5",
+		"sass": "1.70.0",
 		"shiki": "0.14.7",
 		"strict-event-emitter-types": "2.0.0",
 		"textarea-caret": "3.1.0",
-		"three": "0.159.0",
+		"three": "0.160.0",
 		"throttle-debounce": "5.0.0",
 		"tinycolor2": "1.6.0",
 		"tsc-alias": "1.8.8",
@@ -72,70 +72,70 @@
 		"typescript": "5.3.3",
 		"uuid": "9.0.1",
 		"v-code-diff": "1.7.2",
-		"vite": "5.0.10",
-		"vue": "3.4.3",
+		"vite": "5.0.12",
+		"vue": "3.4.15",
 		"vuedraggable": "next"
 	},
 	"devDependencies": {
 		"@misskey-dev/eslint-plugin": "^1.0.0",
 		"@misskey-dev/summaly": "^5.0.3",
-		"@storybook/addon-actions": "7.6.5",
-		"@storybook/addon-essentials": "7.6.5",
-		"@storybook/addon-interactions": "7.6.5",
-		"@storybook/addon-links": "7.6.5",
-		"@storybook/addon-storysource": "7.6.5",
-		"@storybook/addons": "7.6.5",
-		"@storybook/blocks": "7.6.5",
-		"@storybook/core-events": "7.6.5",
+		"@storybook/addon-actions": "7.6.10",
+		"@storybook/addon-essentials": "7.6.10",
+		"@storybook/addon-interactions": "7.6.10",
+		"@storybook/addon-links": "7.6.10",
+		"@storybook/addon-storysource": "7.6.10",
+		"@storybook/addons": "7.6.10",
+		"@storybook/blocks": "7.6.10",
+		"@storybook/core-events": "7.6.10",
 		"@storybook/jest": "0.2.3",
-		"@storybook/manager-api": "7.6.5",
-		"@storybook/preview-api": "7.6.5",
-		"@storybook/react": "7.6.5",
-		"@storybook/react-vite": "7.6.5",
+		"@storybook/manager-api": "7.6.10",
+		"@storybook/preview-api": "7.6.10",
+		"@storybook/react": "7.6.10",
+		"@storybook/react-vite": "7.6.10",
 		"@storybook/testing-library": "0.2.2",
-		"@storybook/theming": "7.6.5",
-		"@storybook/types": "7.6.5",
-		"@storybook/vue3": "7.6.5",
-		"@storybook/vue3-vite": "7.6.5",
+		"@storybook/theming": "7.6.10",
+		"@storybook/types": "7.6.10",
+		"@storybook/vue3": "7.6.10",
+		"@storybook/vue3-vite": "7.6.10",
 		"@testing-library/vue": "8.0.1",
 		"@types/escape-regexp": "0.0.3",
 		"@types/estree": "1.0.5",
-		"@types/matter-js": "0.19.5",
+		"@types/matter-js": "0.19.6",
 		"@types/micromatch": "4.0.6",
-		"@types/node": "20.10.5",
+		"@types/node": "20.11.5",
 		"@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.7",
 		"@types/ws": "8.5.10",
-		"@typescript-eslint/eslint-plugin": "6.14.0",
-		"@typescript-eslint/parser": "6.14.0",
-		"@vitest/coverage-v8": "0.34.6",
-		"@vue/runtime-core": "3.4.3",
-		"acorn": "8.11.2",
+		"@typescript-eslint/eslint-plugin": "6.19.0",
+		"@typescript-eslint/parser": "6.19.0",
+		"@vitest/coverage-v8": "1.2.1",
+		"@vue/runtime-core": "3.4.15",
+		"acorn": "8.11.3",
 		"cross-env": "7.0.3",
-		"cypress": "13.6.1",
+		"cypress": "13.6.3",
 		"eslint": "8.56.0",
 		"eslint-plugin-import": "2.29.1",
-		"eslint-plugin-vue": "9.19.2",
+		"eslint-plugin-vue": "9.20.1",
 		"fast-glob": "3.3.2",
 		"happy-dom": "10.0.3",
 		"intersection-observer": "0.12.2",
 		"micromatch": "4.0.5",
-		"msw": "1.3.2",
+		"msw": "2.1.2",
 		"msw-storybook-addon": "1.10.0",
-		"nodemon": "3.0.2",
-		"prettier": "3.1.1",
+		"nodemon": "3.0.3",
+		"prettier": "3.2.4",
 		"react": "18.2.0",
 		"react-dom": "18.2.0",
 		"start-server-and-test": "2.0.3",
-		"storybook": "7.6.5",
+		"storybook": "7.6.10",
 		"storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme",
 		"vite-plugin-turbosnap": "1.0.3",
-		"vitest": "0.34.6",
+		"vitest": "1.2.1",
 		"vitest-fetch-mock": "0.2.2",
-		"vue-eslint-parser": "9.3.2",
+		"vue-eslint-parser": "9.4.0",
 		"vue-tsc": "1.8.27"
 	}
 }
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 4c2d9e7254..6419eec87d 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -34,21 +34,21 @@
 		"url": "git+https://github.com/misskey-dev/misskey.js.git"
 	},
 	"devDependencies": {
-		"@microsoft/api-extractor": "7.38.5",
-		"@misskey-dev/eslint-plugin": "^1.0.0",
-		"@swc/jest": "0.2.29",
+		"@microsoft/api-extractor": "7.39.1",
+		"@misskey-dev/eslint-plugin": "1.0.0",
+		"@swc/jest": "0.2.31",
 		"@types/jest": "29.5.11",
-		"@types/node": "20.10.5",
-		"@typescript-eslint/eslint-plugin": "6.14.0",
-		"@typescript-eslint/parser": "6.14.0",
+		"@types/node": "20.11.5",
+		"@typescript-eslint/eslint-plugin": "6.19.0",
+		"@typescript-eslint/parser": "6.19.0",
 		"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.0.2",
-		"tsd": "0.30.0",
+		"nodemon": "3.0.3",
+		"tsd": "0.30.4",
 		"typescript": "5.3.3"
 	},
 	"files": [
@@ -56,7 +56,7 @@
 	],
 	"dependencies": {
 		"@swc/cli": "0.1.63",
-		"@swc/core": "1.3.100",
+		"@swc/core": "1.3.105",
 		"eventemitter3": "5.0.1",
 		"reconnecting-websocket": "4.4.0"
 	}
diff --git a/packages/sw/package.json b/packages/sw/package.json
index 270bf09bd5..d0be929fb6 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -9,17 +9,17 @@
 		"lint": "pnpm typecheck && pnpm eslint"
 	},
 	"dependencies": {
-		"esbuild": "0.19.9",
+		"esbuild": "0.19.11",
 		"idb-keyval": "6.2.1",
 		"misskey-js": "workspace:*"
 	},
 	"devDependencies": {
-		"@misskey-dev/eslint-plugin": "^1.0.0",
-		"@typescript-eslint/parser": "6.14.0",
+		"@misskey-dev/eslint-plugin": "1.0.0",
+		"@typescript-eslint/parser": "6.19.0",
 		"@typescript/lib-webworker": "npm:@types/serviceworker@0.0.67",
 		"eslint": "8.56.0",
 		"eslint-plugin-import": "2.29.1",
-		"nodemon": "3.0.2",
+		"nodemon": "3.0.3",
 		"typescript": "5.3.3"
 	},
 	"type": "module"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c18cee30c7..b752b8ae40 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,8 +13,8 @@ importers:
   .:
     dependencies:
       cssnano:
-        specifier: 6.0.2
-        version: 6.0.2(postcss@8.4.32)
+        specifier: 6.0.3
+        version: 6.0.3(postcss@8.4.33)
       execa:
         specifier: 8.0.1
         version: 8.0.1
@@ -22,11 +22,11 @@ importers:
         specifier: 4.1.0
         version: 4.1.0
       postcss:
-        specifier: 8.4.32
-        version: 8.4.32
+        specifier: 8.4.33
+        version: 8.4.33
       terser:
-        specifier: 5.26.0
-        version: 5.26.0
+        specifier: 5.27.0
+        version: 5.27.0
       typescript:
         specifier: 5.3.3
         version: 5.3.3
@@ -36,17 +36,17 @@ importers:
         version: 4.4.0
     devDependencies:
       '@typescript-eslint/eslint-plugin':
-        specifier: 6.14.0
-        version: 6.14.0(@typescript-eslint/parser@6.14.0)(eslint@8.56.0)(typescript@5.3.3)
+        specifier: 6.19.0
+        version: 6.19.0(@typescript-eslint/parser@6.19.0)(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
-        specifier: 6.14.0
-        version: 6.14.0(eslint@8.56.0)(typescript@5.3.3)
+        specifier: 6.19.0
+        version: 6.19.0(eslint@8.56.0)(typescript@5.3.3)
       cross-env:
         specifier: 7.0.3
         version: 7.0.3
       cypress:
-        specifier: 13.6.1
-        version: 13.6.1
+        specifier: 13.6.3
+        version: 13.6.3
       eslint:
         specifier: 8.56.0
         version: 8.56.0
@@ -81,8 +81,8 @@ importers:
         specifier: 4.3.0
         version: 4.3.0
       '@fastify/cookie':
-        specifier: 9.2.0
-        version: 9.2.0
+        specifier: 9.3.1
+        version: 9.3.1
       '@fastify/cors':
         specifier: 8.5.0
         version: 8.5.0
@@ -93,8 +93,8 @@ importers:
         specifier: 9.3.0
         version: 9.3.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
       '@fastify/multipart':
-        specifier: 8.0.0
-        version: 8.0.0
+        specifier: 8.1.0
+        version: 8.1.0
       '@fastify/static':
         specifier: 6.12.0
         version: 6.12.0
@@ -120,8 +120,8 @@ importers:
         specifier: 1.7.0
         version: 1.7.0
       '@simplewebauthn/server':
-        specifier: 8.3.5
-        version: 8.3.5
+        specifier: 9.0.0
+        version: 9.0.0
       '@sinonjs/fake-timers':
         specifier: 11.2.2
         version: 11.2.2
@@ -130,10 +130,10 @@ importers:
         version: 2.1.10
       '@swc/cli':
         specifier: 0.1.63
-        version: 0.1.63(@swc/core@1.3.100)(chokidar@3.5.3)
+        version: 0.1.63(@swc/core@1.3.105)(chokidar@3.5.3)
       '@swc/core':
-        specifier: 1.3.100
-        version: 1.3.100
+        specifier: 1.3.105
+        version: 1.3.105
       '@twemoji/parser':
         specifier: 15.0.0
         version: 15.0.0
@@ -147,8 +147,8 @@ importers:
         specifier: 6.0.1
         version: 6.0.1
       async-mutex:
-        specifier: 0.4.0
-        version: 0.4.0
+        specifier: 0.4.1
+        version: 0.4.1
       bcryptjs:
         specifier: 2.4.3
         version: 2.4.3
@@ -159,8 +159,8 @@ importers:
         specifier: 1.20.2
         version: 1.20.2
       bullmq:
-        specifier: 4.15.4
-        version: 4.15.4
+        specifier: 5.1.4
+        version: 5.1.4
       cacheable-lookup:
         specifier: 7.0.0
         version: 7.0.0
@@ -195,8 +195,8 @@ importers:
         specifier: 0.1.21
         version: 0.1.21
       fastify:
-        specifier: 4.24.3
-        version: 4.24.3
+        specifier: 4.25.2
+        version: 4.25.2
       fastify-raw-body:
         specifier: 4.3.0
         version: 4.3.0
@@ -204,8 +204,8 @@ importers:
         specifier: 4.2.2
         version: 4.2.2
       file-type:
-        specifier: 18.7.0
-        version: 18.7.0
+        specifier: 19.0.0
+        version: 19.0.0
       fluent-ffmpeg:
         specifier: 2.1.2
         version: 2.1.2
@@ -240,8 +240,8 @@ importers:
         specifier: 4.1.0
         version: 4.1.0
       jsdom:
-        specifier: 23.0.1
-        version: 23.0.1(bufferutil@4.0.7)(utf-8-validate@6.0.3)
+        specifier: 23.2.0
+        version: 23.2.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
       json5:
         specifier: 2.2.3
         version: 2.2.3
@@ -249,11 +249,11 @@ importers:
         specifier: 8.3.2
         version: 8.3.2
       jsrsasign:
-        specifier: 10.9.0
-        version: 10.9.0
+        specifier: 11.0.0
+        version: 11.0.0
       meilisearch:
-        specifier: 0.36.0
-        version: 0.36.0
+        specifier: 0.37.0
+        version: 0.37.0
       mfm-js:
         specifier: 0.24.0
         version: 0.24.0
@@ -282,8 +282,8 @@ importers:
         specifier: 3.3.2
         version: 3.3.2
       nodemailer:
-        specifier: 6.9.7
-        version: 6.9.7
+        specifier: 6.9.8
+        version: 6.9.8
       nsfwjs:
         specifier: 2.4.2
         version: 2.4.2(@tensorflow/tfjs@4.4.0)
@@ -300,8 +300,8 @@ importers:
         specifier: 0.0.14
         version: 0.0.14
       otpauth:
-        specifier: 9.2.1
-        version: 9.2.1
+        specifier: 9.2.2
+        version: 9.2.2
       parse5:
         specifier: 7.1.2
         version: 7.1.2
@@ -372,8 +372,8 @@ importers:
         specifier: 2.1.0
         version: 2.1.0
       systeminformation:
-        specifier: 5.21.20
-        version: 5.21.20
+        specifier: 5.21.23
+        version: 5.21.23
       tinycolor2:
         specifier: 1.6.0
         version: 1.6.0
@@ -387,8 +387,8 @@ importers:
         specifier: 4.2.0
         version: 4.2.0
       typeorm:
-        specifier: 0.3.17
-        version: 0.3.17(ioredis@5.3.2)(pg@8.11.3)
+        specifier: 0.3.19
+        version: 0.3.19(ioredis@5.3.2)(pg@8.11.3)
       typescript:
         specifier: 5.3.3
         version: 5.3.3
@@ -399,11 +399,11 @@ importers:
         specifier: 1.1.2
         version: 1.1.2
       web-push:
-        specifier: 3.6.6
-        version: 3.6.6
+        specifier: 3.6.7
+        version: 3.6.7
       ws:
-        specifier: 8.15.1
-        version: 8.15.1(bufferutil@4.0.7)(utf-8-validate@6.0.3)
+        specifier: 8.16.0
+        version: 8.16.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
       xev:
         specifier: 3.0.2
         version: 3.0.2
@@ -500,17 +500,17 @@ importers:
         specifier: 29.7.0
         version: 29.7.0
       '@misskey-dev/eslint-plugin':
-        specifier: ^1.0.0
-        version: 1.0.0(@typescript-eslint/eslint-plugin@6.14.0)(@typescript-eslint/parser@6.14.0)(eslint-plugin-import@2.29.1)(eslint@8.56.0)
+        specifier: 1.0.0
+        version: 1.0.0(@typescript-eslint/eslint-plugin@6.19.0)(@typescript-eslint/parser@6.19.0)(eslint-plugin-import@2.29.1)(eslint@8.56.0)
       '@nestjs/platform-express':
-        specifier: ^10.3.0
+        specifier: 10.3.0
         version: 10.3.0(@nestjs/common@10.2.10)(@nestjs/core@10.2.10)
       '@simplewebauthn/typescript-types':
         specifier: 8.3.4
         version: 8.3.4
       '@swc/jest':
-        specifier: 0.2.29
-        version: 0.2.29(@swc/core@1.3.100)
+        specifier: 0.2.31
+        version: 0.2.31(@swc/core@1.3.105)
       '@types/accepts':
         specifier: 1.3.7
         version: 1.3.7
@@ -560,8 +560,8 @@ importers:
         specifier: 0.7.34
         version: 0.7.34
       '@types/node':
-        specifier: 20.10.5
-        version: 20.10.5
+        specifier: 20.11.5
+        version: 20.11.5
       '@types/node-fetch':
         specifier: 3.0.3
         version: 3.0.3
@@ -629,14 +629,14 @@ importers:
         specifier: 8.5.10
         version: 8.5.10
       '@typescript-eslint/eslint-plugin':
-        specifier: 6.14.0
-        version: 6.14.0(@typescript-eslint/parser@6.14.0)(eslint@8.56.0)(typescript@5.3.3)
+        specifier: 6.19.0
+        version: 6.19.0(@typescript-eslint/parser@6.19.0)(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
-        specifier: 6.14.0
-        version: 6.14.0(eslint@8.56.0)(typescript@5.3.3)
+        specifier: 6.19.0
+        version: 6.19.0(eslint@8.56.0)(typescript@5.3.3)
       aws-sdk-client-mock:
-        specifier: 3.0.0
-        version: 3.0.0
+        specifier: 3.0.1
+        version: 3.0.1
       cross-env:
         specifier: 7.0.3
         version: 7.0.3
@@ -645,7 +645,7 @@ importers:
         version: 8.56.0
       eslint-plugin-import:
         specifier: 2.29.1
-        version: 2.29.1(@typescript-eslint/parser@6.14.0)(eslint@8.56.0)
+        version: 2.29.1(@typescript-eslint/parser@6.19.0)(eslint@8.56.0)
       execa:
         specifier: 8.0.1
         version: 8.0.1
@@ -654,15 +654,15 @@ importers:
         version: 9.0.0
       jest:
         specifier: 29.7.0
-        version: 29.7.0(@types/node@20.10.5)
+        version: 29.7.0(@types/node@20.11.5)
       jest-mock:
         specifier: 29.7.0
         version: 29.7.0
       nodemon:
-        specifier: 3.0.2
-        version: 3.0.2
+        specifier: 3.0.3
+        version: 3.0.3
       pid-port:
-        specifier: ^1.0.0
+        specifier: 1.0.0
         version: 1.0.0
       simple-oauth2:
         specifier: 5.0.0
@@ -684,13 +684,13 @@ importers:
         version: 2.2.1-misskey.10
       '@rollup/plugin-json':
         specifier: 6.1.0
-        version: 6.1.0(rollup@4.9.1)
+        version: 6.1.0(rollup@4.9.6)
       '@rollup/plugin-replace':
         specifier: 5.0.5
-        version: 5.0.5(rollup@4.9.1)
+        version: 5.0.5(rollup@4.9.6)
       '@rollup/pluginutils':
         specifier: 5.1.0
-        version: 5.1.0(rollup@4.9.1)
+        version: 5.1.0(rollup@4.9.6)
       '@syuilo/aiscript':
         specifier: 0.17.0
         version: 0.17.0
@@ -702,7 +702,7 @@ importers:
         version: 15.0.0
       '@vitejs/plugin-vue':
         specifier: 5.0.2
-        version: 5.0.2(vite@5.0.10)(vue@3.4.3)
+        version: 5.0.2(vite@5.0.12)(vue@3.4.15)
       '@vue/compiler-sfc':
         specifier: 3.4.3
         version: 3.4.3
@@ -737,8 +737,8 @@ importers:
         specifier: 2.0.1
         version: 2.0.1(chart.js@4.4.1)
       chromatic:
-        specifier: 10.1.0
-        version: 10.1.0
+        specifier: 10.3.1
+        version: 10.3.1
       compare-versions:
         specifier: 6.1.0
         version: 6.1.0
@@ -794,14 +794,14 @@ importers:
         specifier: 2.3.1
         version: 2.3.1
       rollup:
-        specifier: 4.9.1
-        version: 4.9.1
+        specifier: 4.9.6
+        version: 4.9.6
       sanitize-html:
         specifier: 2.11.0
         version: 2.11.0
       sass:
-        specifier: 1.69.5
-        version: 1.69.5
+        specifier: 1.70.0
+        version: 1.70.0
       shiki:
         specifier: 0.14.7
         version: 0.14.7
@@ -812,8 +812,8 @@ importers:
         specifier: 3.1.0
         version: 3.1.0
       three:
-        specifier: 0.159.0
-        version: 0.159.0
+        specifier: 0.160.0
+        version: 0.160.0
       throttle-debounce:
         specifier: 5.0.0
         version: 5.0.0
@@ -834,80 +834,80 @@ importers:
         version: 9.0.1
       v-code-diff:
         specifier: 1.7.2
-        version: 1.7.2(vue@3.4.3)
+        version: 1.7.2(vue@3.4.15)
       vite:
-        specifier: 5.0.10
-        version: 5.0.10(@types/node@20.10.5)(sass@1.69.5)(terser@5.26.0)
+        specifier: 5.0.12
+        version: 5.0.12(@types/node@20.11.5)(sass@1.70.0)(terser@5.27.0)
       vue:
-        specifier: 3.4.3
-        version: 3.4.3(typescript@5.3.3)
+        specifier: 3.4.15
+        version: 3.4.15(typescript@5.3.3)
       vuedraggable:
         specifier: next
-        version: 4.1.0(vue@3.4.3)
+        version: 4.1.0(vue@3.4.15)
     devDependencies:
       '@misskey-dev/eslint-plugin':
         specifier: ^1.0.0
-        version: 1.0.0(@typescript-eslint/eslint-plugin@6.14.0)(@typescript-eslint/parser@6.14.0)(eslint-plugin-import@2.29.1)(eslint@8.56.0)
+        version: 1.0.0(@typescript-eslint/eslint-plugin@6.19.0)(@typescript-eslint/parser@6.19.0)(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: 7.6.5
-        version: 7.6.5
+        specifier: 7.6.10
+        version: 7.6.10
       '@storybook/addon-essentials':
-        specifier: 7.6.5
-        version: 7.6.5(react-dom@18.2.0)(react@18.2.0)
+        specifier: 7.6.10
+        version: 7.6.10(react-dom@18.2.0)(react@18.2.0)
       '@storybook/addon-interactions':
-        specifier: 7.6.5
-        version: 7.6.5
+        specifier: 7.6.10
+        version: 7.6.10
       '@storybook/addon-links':
-        specifier: 7.6.5
-        version: 7.6.5(react@18.2.0)
+        specifier: 7.6.10
+        version: 7.6.10(react@18.2.0)
       '@storybook/addon-storysource':
-        specifier: 7.6.5
-        version: 7.6.5
+        specifier: 7.6.10
+        version: 7.6.10
       '@storybook/addons':
-        specifier: 7.6.5
-        version: 7.6.5(react-dom@18.2.0)(react@18.2.0)
+        specifier: 7.6.10
+        version: 7.6.10(react-dom@18.2.0)(react@18.2.0)
       '@storybook/blocks':
-        specifier: 7.6.5
-        version: 7.6.5(react-dom@18.2.0)(react@18.2.0)
+        specifier: 7.6.10
+        version: 7.6.10(react-dom@18.2.0)(react@18.2.0)
       '@storybook/core-events':
-        specifier: 7.6.5
-        version: 7.6.5
+        specifier: 7.6.10
+        version: 7.6.10
       '@storybook/jest':
         specifier: 0.2.3
-        version: 0.2.3(vitest@0.34.6)
+        version: 0.2.3(vitest@1.2.1)
       '@storybook/manager-api':
-        specifier: 7.6.5
-        version: 7.6.5(react-dom@18.2.0)(react@18.2.0)
+        specifier: 7.6.10
+        version: 7.6.10(react-dom@18.2.0)(react@18.2.0)
       '@storybook/preview-api':
-        specifier: 7.6.5
-        version: 7.6.5
+        specifier: 7.6.10
+        version: 7.6.10
       '@storybook/react':
-        specifier: 7.6.5
-        version: 7.6.5(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3)
+        specifier: 7.6.10
+        version: 7.6.10(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3)
       '@storybook/react-vite':
-        specifier: 7.6.5
-        version: 7.6.5(react-dom@18.2.0)(react@18.2.0)(rollup@4.9.1)(typescript@5.3.3)(vite@5.0.10)
+        specifier: 7.6.10
+        version: 7.6.10(react-dom@18.2.0)(react@18.2.0)(rollup@4.9.6)(typescript@5.3.3)(vite@5.0.12)
       '@storybook/testing-library':
         specifier: 0.2.2
         version: 0.2.2
       '@storybook/theming':
-        specifier: 7.6.5
-        version: 7.6.5(react-dom@18.2.0)(react@18.2.0)
+        specifier: 7.6.10
+        version: 7.6.10(react-dom@18.2.0)(react@18.2.0)
       '@storybook/types':
-        specifier: 7.6.5
-        version: 7.6.5
+        specifier: 7.6.10
+        version: 7.6.10
       '@storybook/vue3':
-        specifier: 7.6.5
-        version: 7.6.5(@vue/compiler-core@3.4.3)(vue@3.4.3)
+        specifier: 7.6.10
+        version: 7.6.10(vue@3.4.15)
       '@storybook/vue3-vite':
-        specifier: 7.6.5
-        version: 7.6.5(@vue/compiler-core@3.4.3)(typescript@5.3.3)(vite@5.0.10)(vue@3.4.3)
+        specifier: 7.6.10
+        version: 7.6.10(typescript@5.3.3)(vite@5.0.12)(vue@3.4.15)
       '@testing-library/vue':
         specifier: 8.0.1
-        version: 8.0.1(@vue/compiler-sfc@3.4.3)(vue@3.4.3)
+        version: 8.0.1(@vue/compiler-sfc@3.4.3)(vue@3.4.15)
       '@types/escape-regexp':
         specifier: 0.0.3
         version: 0.0.3
@@ -915,14 +915,14 @@ importers:
         specifier: 1.0.5
         version: 1.0.5
       '@types/matter-js':
-        specifier: 0.19.5
-        version: 0.19.5
+        specifier: 0.19.6
+        version: 0.19.6
       '@types/micromatch':
         specifier: 4.0.6
         version: 4.0.6
       '@types/node':
-        specifier: 20.10.5
-        version: 20.10.5
+        specifier: 20.11.5
+        version: 20.11.5
       '@types/punycode':
         specifier: 2.1.3
         version: 2.1.3
@@ -942,35 +942,35 @@ importers:
         specifier: 8.5.10
         version: 8.5.10
       '@typescript-eslint/eslint-plugin':
-        specifier: 6.14.0
-        version: 6.14.0(@typescript-eslint/parser@6.14.0)(eslint@8.56.0)(typescript@5.3.3)
+        specifier: 6.19.0
+        version: 6.19.0(@typescript-eslint/parser@6.19.0)(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
-        specifier: 6.14.0
-        version: 6.14.0(eslint@8.56.0)(typescript@5.3.3)
+        specifier: 6.19.0
+        version: 6.19.0(eslint@8.56.0)(typescript@5.3.3)
       '@vitest/coverage-v8':
-        specifier: 0.34.6
-        version: 0.34.6(vitest@0.34.6)
+        specifier: 1.2.1
+        version: 1.2.1(vitest@1.2.1)
       '@vue/runtime-core':
-        specifier: 3.4.3
-        version: 3.4.3
+        specifier: 3.4.15
+        version: 3.4.15
       acorn:
-        specifier: 8.11.2
-        version: 8.11.2
+        specifier: 8.11.3
+        version: 8.11.3
       cross-env:
         specifier: 7.0.3
         version: 7.0.3
       cypress:
-        specifier: 13.6.1
-        version: 13.6.1
+        specifier: 13.6.3
+        version: 13.6.3
       eslint:
         specifier: 8.56.0
         version: 8.56.0
       eslint-plugin-import:
         specifier: 2.29.1
-        version: 2.29.1(@typescript-eslint/parser@6.14.0)(eslint@8.56.0)
+        version: 2.29.1(@typescript-eslint/parser@6.19.0)(eslint@8.56.0)
       eslint-plugin-vue:
-        specifier: 9.19.2
-        version: 9.19.2(eslint@8.56.0)
+        specifier: 9.20.1
+        version: 9.20.1(eslint@8.56.0)
       fast-glob:
         specifier: 3.3.2
         version: 3.3.2
@@ -984,17 +984,17 @@ importers:
         specifier: 4.0.5
         version: 4.0.5
       msw:
-        specifier: 1.3.2
-        version: 1.3.2(typescript@5.3.3)
+        specifier: 2.1.2
+        version: 2.1.2(typescript@5.3.3)
       msw-storybook-addon:
         specifier: 1.10.0
-        version: 1.10.0(msw@1.3.2)
+        version: 1.10.0(msw@2.1.2)
       nodemon:
-        specifier: 3.0.2
-        version: 3.0.2
+        specifier: 3.0.3
+        version: 3.0.3
       prettier:
-        specifier: 3.1.1
-        version: 3.1.1
+        specifier: 3.2.4
+        version: 3.2.4
       react:
         specifier: 18.2.0
         version: 18.2.0
@@ -1005,23 +1005,23 @@ importers:
         specifier: 2.0.3
         version: 2.0.3
       storybook:
-        specifier: 7.6.5
-        version: 7.6.5
+        specifier: 7.6.10
+        version: 7.6.10
       storybook-addon-misskey-theme:
         specifier: github:misskey-dev/storybook-addon-misskey-theme
-        version: github.com/misskey-dev/storybook-addon-misskey-theme/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@7.6.5)(@storybook/components@7.6.5)(@storybook/core-events@7.6.5)(@storybook/manager-api@7.6.5)(@storybook/preview-api@7.6.5)(@storybook/theming@7.6.5)(@storybook/types@7.6.5)(react-dom@18.2.0)(react@18.2.0)
+        version: github.com/misskey-dev/storybook-addon-misskey-theme/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@7.6.10)(@storybook/components@7.6.5)(@storybook/core-events@7.6.10)(@storybook/manager-api@7.6.10)(@storybook/preview-api@7.6.10)(@storybook/theming@7.6.10)(@storybook/types@7.6.10)(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@10.0.3)(sass@1.69.5)(terser@5.26.0)
+        specifier: 1.2.1
+        version: 1.2.1(@types/node@20.11.5)(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)
+        version: 0.2.2(vitest@1.2.1)
       vue-eslint-parser:
-        specifier: 9.3.2
-        version: 9.3.2(eslint@8.56.0)
+        specifier: 9.4.0
+        version: 9.4.0(eslint@8.56.0)
       vue-tsc:
         specifier: 1.8.27
         version: 1.8.27(typescript@5.3.3)
@@ -1070,10 +1070,10 @@ importers:
     dependencies:
       '@swc/cli':
         specifier: 0.1.63
-        version: 0.1.63(@swc/core@1.3.100)(chokidar@3.5.3)
+        version: 0.1.63(@swc/core@1.3.105)(chokidar@3.5.3)
       '@swc/core':
-        specifier: 1.3.100
-        version: 1.3.100
+        specifier: 1.3.105
+        version: 1.3.105
       eventemitter3:
         specifier: 5.0.1
         version: 5.0.1
@@ -1082,32 +1082,32 @@ importers:
         version: 4.4.0
     devDependencies:
       '@microsoft/api-extractor':
-        specifier: 7.38.5
-        version: 7.38.5(@types/node@20.10.5)
+        specifier: 7.39.1
+        version: 7.39.1(@types/node@20.11.5)
       '@misskey-dev/eslint-plugin':
-        specifier: ^1.0.0
-        version: 1.0.0(@typescript-eslint/eslint-plugin@6.14.0)(@typescript-eslint/parser@6.14.0)(eslint-plugin-import@2.29.1)(eslint@8.56.0)
+        specifier: 1.0.0
+        version: 1.0.0(@typescript-eslint/eslint-plugin@6.19.0)(@typescript-eslint/parser@6.19.0)(eslint-plugin-import@2.29.1)(eslint@8.56.0)
       '@swc/jest':
-        specifier: 0.2.29
-        version: 0.2.29(@swc/core@1.3.100)
+        specifier: 0.2.31
+        version: 0.2.31(@swc/core@1.3.105)
       '@types/jest':
         specifier: 29.5.11
         version: 29.5.11
       '@types/node':
-        specifier: 20.10.5
-        version: 20.10.5
+        specifier: 20.11.5
+        version: 20.11.5
       '@typescript-eslint/eslint-plugin':
-        specifier: 6.14.0
-        version: 6.14.0(@typescript-eslint/parser@6.14.0)(eslint@8.56.0)(typescript@5.3.3)
+        specifier: 6.19.0
+        version: 6.19.0(@typescript-eslint/parser@6.19.0)(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
-        specifier: 6.14.0
-        version: 6.14.0(eslint@8.56.0)(typescript@5.3.3)
+        specifier: 6.19.0
+        version: 6.19.0(eslint@8.56.0)(typescript@5.3.3)
       eslint:
         specifier: 8.56.0
         version: 8.56.0
       jest:
         specifier: 29.7.0
-        version: 29.7.0(@types/node@20.10.5)
+        version: 29.7.0(@types/node@20.11.5)
       jest-fetch-mock:
         specifier: 3.0.3
         version: 3.0.3
@@ -1121,11 +1121,11 @@ importers:
         specifier: 2.0.0
         version: 2.0.0
       nodemon:
-        specifier: 3.0.2
-        version: 3.0.2
+        specifier: 3.0.3
+        version: 3.0.3
       tsd:
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.30.4
+        version: 0.30.4
       typescript:
         specifier: 5.3.3
         version: 5.3.3
@@ -1193,8 +1193,8 @@ importers:
   packages/sw:
     dependencies:
       esbuild:
-        specifier: 0.19.9
-        version: 0.19.9
+        specifier: 0.19.11
+        version: 0.19.11
       idb-keyval:
         specifier: 6.2.1
         version: 6.2.1
@@ -1203,11 +1203,11 @@ importers:
         version: link:../misskey-js
     devDependencies:
       '@misskey-dev/eslint-plugin':
-        specifier: ^1.0.0
-        version: 1.0.0(@typescript-eslint/eslint-plugin@6.19.0)(@typescript-eslint/parser@6.14.0)(eslint-plugin-import@2.29.1)(eslint@8.56.0)
+        specifier: 1.0.0
+        version: 1.0.0(@typescript-eslint/eslint-plugin@6.19.0)(@typescript-eslint/parser@6.19.0)(eslint-plugin-import@2.29.1)(eslint@8.56.0)
       '@typescript-eslint/parser':
-        specifier: 6.14.0
-        version: 6.14.0(eslint@8.56.0)(typescript@5.3.3)
+        specifier: 6.19.0
+        version: 6.19.0(eslint@8.56.0)(typescript@5.3.3)
       '@typescript/lib-webworker':
         specifier: npm:@types/serviceworker@0.0.67
         version: /@types/serviceworker@0.0.67
@@ -1216,10 +1216,10 @@ importers:
         version: 8.56.0
       eslint-plugin-import:
         specifier: 2.29.1
-        version: 2.29.1(@typescript-eslint/parser@6.14.0)(eslint@8.56.0)
+        version: 2.29.1(@typescript-eslint/parser@6.19.0)(eslint@8.56.0)
       nodemon:
-        specifier: 3.0.2
-        version: 3.0.2
+        specifier: 3.0.3
+        version: 3.0.3
       typescript:
         specifier: 5.3.3
         version: 5.3.3
@@ -1252,6 +1252,14 @@ packages:
     resolution: {integrity: sha512-QAkD5kK2b1WfjDS/UQn/qQkbwF31uqRjPTrsCs5ZG9BQGAkjwvqGFjjPqAuzac/IYzpPtRzjCP1WrTuAIjMrXg==}
     dev: true
 
+  /@asamuzakjp/dom-selector@2.0.2:
+    resolution: {integrity: sha512-x1KXOatwofR6ZAYzXRBL5wrdV0vwNxlTCK9NCuLqAzQYARqGcvFwiJA6A1ERuh+dgeA4Dxm3JBYictIes+SqUQ==}
+    dependencies:
+      bidi-js: 1.0.3
+      css-tree: 2.3.1
+      is-potential-custom-element-name: 1.0.1
+    dev: false
+
   /@aw-web-design/x-default-browser@1.4.126:
     resolution: {integrity: sha512-Xk1sIhyNC/esHGGVjL/niHLowM0csl/kFO5uawBy4IrWwy0o1G8LGt3jP6nmWGz+USxeeqbihAmp/oVZju6wug==}
     hasBin: true
@@ -1906,7 +1914,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.5
+      '@babel/parser': 7.23.6
       '@babel/template': 7.22.15
       '@babel/traverse': 7.23.5
       '@babel/types': 7.23.5
@@ -3387,7 +3395,7 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/code-frame': 7.23.5
-      '@babel/parser': 7.23.5
+      '@babel/parser': 7.23.6
       '@babel/types': 7.23.5
     dev: true
 
@@ -3428,7 +3436,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.5
+      '@babel/parser': 7.23.6
       '@babel/types': 7.23.5
       debug: 4.3.4(supports-color@8.1.1)
       globals: 11.12.0
@@ -3461,6 +3469,15 @@ packages:
       '@babel/helper-validator-identifier': 7.22.20
       to-fast-properties: 2.0.0
 
+  /@babel/types@7.23.6:
+    resolution: {integrity: sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==}
+    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
@@ -3494,6 +3511,24 @@ packages:
       '@bull-board/api': 5.10.2(@bull-board/ui@5.10.2)
     dev: false
 
+  /@bundled-es-modules/cookie@2.0.0:
+    resolution: {integrity: sha512-Or6YHg/kamKHpxULAdSqhGqnWFneIXu1NKvvfBBzKGwpVsYuFIQ5aBPHDnnoR3ghW1nvSkALd+EF9iMtY7Vjxw==}
+    dependencies:
+      cookie: 0.5.0
+    dev: true
+
+  /@bundled-es-modules/js-levenshtein@2.0.1:
+    resolution: {integrity: sha512-DERMS3yfbAljKsQc0U2wcqGKUWpdFjwqWuoMugEJlqBnKO180/n+4SR/J8MRDt1AN48X1ovgoD9KrdVXcaa3Rg==}
+    dependencies:
+      js-levenshtein: 1.1.6
+    dev: true
+
+  /@bundled-es-modules/statuses@1.0.1:
+    resolution: {integrity: sha512-yn7BklA5acgcBr+7w064fGV+SGIFySjCKpqjcWgBAIfrAkY+4GQTJJHQMeT3V/sgz23VTEVV8TtOmkvJAhFVfg==}
+    dependencies:
+      statuses: 2.0.1
+    dev: true
+
   /@canvas/image-data@1.0.0:
     resolution: {integrity: sha512-BxOqI5LgsIQP1odU5KMwV9yoijleOPzHL18/YvNqF9KFSGF2K/DLlYAbDQsWqd/1nbaFuSkYD/191dpMtNh4vw==}
     dev: false
@@ -3707,30 +3742,29 @@ packages:
       react: 18.2.0
     dev: true
 
-  /@esbuild/android-arm64@0.18.20:
-    resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==}
+  /@esbuild/aix-ppc64@0.19.11:
+    resolution: {integrity: sha512-FnzU0LyE3ySQk7UntJO4+qIiQgI7KoODnZg5xzXIrFJlKd2P2gwHsHY4927xj9y5PJmJSzULiUCWmv7iWnNa7g==}
     engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
+    cpu: [ppc64]
+    os: [aix]
     requiresBuild: true
-    dev: true
     optional: true
 
-  /@esbuild/android-arm64@0.19.8:
-    resolution: {integrity: sha512-B8JbS61bEunhfx8kasogFENgQfr/dIp+ggYXwTqdbMAgGDhRa3AaPpQMuQU0rNxDLECj6FhDzk1cF9WHMVwrtA==}
+  /@esbuild/android-arm64@0.18.20:
+    resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
     requiresBuild: true
+    dev: true
     optional: true
 
-  /@esbuild/android-arm64@0.19.9:
-    resolution: {integrity: sha512-q4cR+6ZD0938R19MyEW3jEsMzbb/1rulLXiNAJQADD/XYp7pT+rOS5JGxvpRW8dFDEfjW4wLgC/3FXIw4zYglQ==}
+  /@esbuild/android-arm64@0.19.11:
+    resolution: {integrity: sha512-aiu7K/5JnLj//KOnOfEZ0D90obUkRzDMyqd/wNAUQ34m4YUPVhRZpnqKV9uqDGxT7cToSDnIHsGooyIczu9T+Q==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@esbuild/android-arm@0.18.20:
@@ -3742,21 +3776,12 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-arm@0.19.8:
-    resolution: {integrity: sha512-31E2lxlGM1KEfivQl8Yf5aYU/mflz9g06H6S15ITUFQueMFtFjESRMoDSkvMo8thYvLBax+VKTPlpnx+sPicOA==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/android-arm@0.19.9:
-    resolution: {integrity: sha512-jkYjjq7SdsWuNI6b5quymW0oC83NN5FdRPuCbs9HZ02mfVdAP8B8eeqLSYU3gb6OJEaY5CQabtTFbqBf26H3GA==}
+  /@esbuild/android-arm@0.19.11:
+    resolution: {integrity: sha512-5OVapq0ClabvKvQ58Bws8+wkLCV+Rxg7tUVbo9xu034Nm536QTII4YzhaFriQ7rMrorfnFKUsArD2lqKbFY4vw==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@esbuild/android-x64@0.18.20:
@@ -3768,21 +3793,12 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-x64@0.19.8:
-    resolution: {integrity: sha512-rdqqYfRIn4jWOp+lzQttYMa2Xar3OK9Yt2fhOhzFXqg0rVWEfSclJvZq5fZslnz6ypHvVf3CT7qyf0A5pM682A==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/android-x64@0.19.9:
-    resolution: {integrity: sha512-KOqoPntWAH6ZxDwx1D6mRntIgZh9KodzgNOy5Ebt9ghzffOk9X2c1sPwtM9P+0eXbefnDhqYfkh5PLP5ULtWFA==}
+  /@esbuild/android-x64@0.19.11:
+    resolution: {integrity: sha512-eccxjlfGw43WYoY9QgB82SgGgDbibcqyDTlk3l3C0jOVHKxrjdc9CTwDUQd0vkvYg5um0OH+GpxYvp39r+IPOg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@esbuild/darwin-arm64@0.18.20:
@@ -3794,21 +3810,12 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-arm64@0.19.8:
-    resolution: {integrity: sha512-RQw9DemMbIq35Bprbboyf8SmOr4UXsRVxJ97LgB55VKKeJOOdvsIPy0nFyF2l8U+h4PtBx/1kRf0BelOYCiQcw==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/darwin-arm64@0.19.9:
-    resolution: {integrity: sha512-KBJ9S0AFyLVx2E5D8W0vExqRW01WqRtczUZ8NRu+Pi+87opZn5tL4Y0xT0mA4FtHctd0ZgwNoN639fUUGlNIWw==}
+  /@esbuild/darwin-arm64@0.19.11:
+    resolution: {integrity: sha512-ETp87DRWuSt9KdDVkqSoKoLFHYTrkyz2+65fj9nfXsaV3bMhTCjtQfw3y+um88vGRKRiF7erPrh/ZuIdLUIVxQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@esbuild/darwin-x64@0.18.20:
@@ -3820,23 +3827,14 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-x64@0.19.8:
-    resolution: {integrity: sha512-3sur80OT9YdeZwIVgERAysAbwncom7b4bCI2XKLjMfPymTud7e/oY4y+ci1XVp5TfQp/bppn7xLw1n/oSQY3/Q==}
+  /@esbuild/darwin-x64@0.19.11:
+    resolution: {integrity: sha512-fkFUiS6IUK9WYUO/+22omwetaSNl5/A8giXvQlcinLIjVkxwTLSktbF5f/kJMftM2MJp9+fXqZ5ezS7+SALp4g==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
     optional: true
 
-  /@esbuild/darwin-x64@0.19.9:
-    resolution: {integrity: sha512-vE0VotmNTQaTdX0Q9dOHmMTao6ObjyPm58CHZr1UK7qpNleQyxlFlNCaHsHx6Uqv86VgPmR4o2wdNq3dP1qyDQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/freebsd-arm64@0.18.20:
     resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==}
     engines: {node: '>=12'}
@@ -3846,21 +3844,12 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-arm64@0.19.8:
-    resolution: {integrity: sha512-WAnPJSDattvS/XtPCTj1tPoTxERjcTpH6HsMr6ujTT+X6rylVe8ggxk8pVxzf5U1wh5sPODpawNicF5ta/9Tmw==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/freebsd-arm64@0.19.9:
-    resolution: {integrity: sha512-uFQyd/o1IjiEk3rUHSwUKkqZwqdvuD8GevWF065eqgYfexcVkxh+IJgwTaGZVu59XczZGcN/YMh9uF1fWD8j1g==}
+  /@esbuild/freebsd-arm64@0.19.11:
+    resolution: {integrity: sha512-lhoSp5K6bxKRNdXUtHoNc5HhbXVCS8V0iZmDvyWvYq9S5WSfTIHU2UGjcGt7UeS6iEYp9eeymIl5mJBn0yiuxA==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@esbuild/freebsd-x64@0.18.20:
@@ -3872,21 +3861,12 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-x64@0.19.8:
-    resolution: {integrity: sha512-ICvZyOplIjmmhjd6mxi+zxSdpPTKFfyPPQMQTK/w+8eNK6WV01AjIztJALDtwNNfFhfZLux0tZLC+U9nSyA5Zg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/freebsd-x64@0.19.9:
-    resolution: {integrity: sha512-WMLgWAtkdTbTu1AWacY7uoj/YtHthgqrqhf1OaEWnZb7PQgpt8eaA/F3LkV0E6K/Lc0cUr/uaVP/49iE4M4asA==}
+  /@esbuild/freebsd-x64@0.19.11:
+    resolution: {integrity: sha512-JkUqn44AffGXitVI6/AbQdoYAq0TEullFdqcMY/PCUZ36xJ9ZJRtQabzMA+Vi7r78+25ZIBosLTOKnUXBSi1Kw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@esbuild/linux-arm64@0.18.20:
@@ -3898,21 +3878,12 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-arm64@0.19.8:
-    resolution: {integrity: sha512-z1zMZivxDLHWnyGOctT9JP70h0beY54xDDDJt4VpTX+iwA77IFsE1vCXWmprajJGa+ZYSqkSbRQ4eyLCpCmiCQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/linux-arm64@0.19.9:
-    resolution: {integrity: sha512-PiPblfe1BjK7WDAKR1Cr9O7VVPqVNpwFcPWgfn4xu0eMemzRp442hXyzF/fSwgrufI66FpHOEJk0yYdPInsmyQ==}
+  /@esbuild/linux-arm64@0.19.11:
+    resolution: {integrity: sha512-LneLg3ypEeveBSMuoa0kwMpCGmpu8XQUh+mL8XXwoYZ6Be2qBnVtcDI5azSvh7vioMDhoJFZzp9GWp9IWpYoUg==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@esbuild/linux-arm@0.18.20:
@@ -3924,21 +3895,12 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-arm@0.19.8:
-    resolution: {integrity: sha512-H4vmI5PYqSvosPaTJuEppU9oz1dq2A7Mr2vyg5TF9Ga+3+MGgBdGzcyBP7qK9MrwFQZlvNyJrvz6GuCaj3OukQ==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/linux-arm@0.19.9:
-    resolution: {integrity: sha512-C/ChPohUYoyUaqn1h17m/6yt6OB14hbXvT8EgM1ZWaiiTYz7nWZR0SYmMnB5BzQA4GXl3BgBO1l8MYqL/He3qw==}
+  /@esbuild/linux-arm@0.19.11:
+    resolution: {integrity: sha512-3CRkr9+vCV2XJbjwgzjPtO8T0SZUmRZla+UL1jw+XqHZPkPgZiyWvbDvl9rqAN8Zl7qJF0O/9ycMtjU67HN9/Q==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@esbuild/linux-ia32@0.18.20:
@@ -3950,21 +3912,12 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ia32@0.19.8:
-    resolution: {integrity: sha512-1a8suQiFJmZz1khm/rDglOc8lavtzEMRo0v6WhPgxkrjcU0LkHj+TwBrALwoz/OtMExvsqbbMI0ChyelKabSvQ==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/linux-ia32@0.19.9:
-    resolution: {integrity: sha512-f37i/0zE0MjDxijkPSQw1CO/7C27Eojqb+r3BbHVxMLkj8GCa78TrBZzvPyA/FNLUMzP3eyHCVkAopkKVja+6Q==}
+  /@esbuild/linux-ia32@0.19.11:
+    resolution: {integrity: sha512-caHy++CsD8Bgq2V5CodbJjFPEiDPq8JJmBdeyZ8GWVQMjRD0sU548nNdwPNvKjVpamYYVL40AORekgfIubwHoA==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@esbuild/linux-loong64@0.18.20:
@@ -3976,21 +3929,12 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-loong64@0.19.8:
-    resolution: {integrity: sha512-fHZWS2JJxnXt1uYJsDv9+b60WCc2RlvVAy1F76qOLtXRO+H4mjt3Tr6MJ5l7Q78X8KgCFudnTuiQRBhULUyBKQ==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/linux-loong64@0.19.9:
-    resolution: {integrity: sha512-t6mN147pUIf3t6wUt3FeumoOTPfmv9Cc6DQlsVBpB7eCpLOqQDyWBP1ymXn1lDw4fNUSb/gBcKAmvTP49oIkaA==}
+  /@esbuild/linux-loong64@0.19.11:
+    resolution: {integrity: sha512-ppZSSLVpPrwHccvC6nQVZaSHlFsvCQyjnvirnVjbKSHuE5N24Yl8F3UwYUUR1UEPaFObGD2tSvVKbvR+uT1Nrg==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@esbuild/linux-mips64el@0.18.20:
@@ -4002,21 +3946,12 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-mips64el@0.19.8:
-    resolution: {integrity: sha512-Wy/z0EL5qZYLX66dVnEg9riiwls5IYnziwuju2oUiuxVc+/edvqXa04qNtbrs0Ukatg5HEzqT94Zs7J207dN5Q==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/linux-mips64el@0.19.9:
-    resolution: {integrity: sha512-jg9fujJTNTQBuDXdmAg1eeJUL4Jds7BklOTkkH80ZgQIoCTdQrDaHYgbFZyeTq8zbY+axgptncko3v9p5hLZtw==}
+  /@esbuild/linux-mips64el@0.19.11:
+    resolution: {integrity: sha512-B5x9j0OgjG+v1dF2DkH34lr+7Gmv0kzX6/V0afF41FkPMMqaQ77pH7CrhWeR22aEeHKaeZVtZ6yFwlxOKPVFyg==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@esbuild/linux-ppc64@0.18.20:
@@ -4028,23 +3963,14 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ppc64@0.19.8:
-    resolution: {integrity: sha512-ETaW6245wK23YIEufhMQ3HSeHO7NgsLx8gygBVldRHKhOlD1oNeNy/P67mIh1zPn2Hr2HLieQrt6tWrVwuqrxg==}
+  /@esbuild/linux-ppc64@0.19.11:
+    resolution: {integrity: sha512-MHrZYLeCG8vXblMetWyttkdVRjQlQUb/oMgBNurVEnhj4YWOr4G5lmBfZjHYQHHN0g6yDmCAQRR8MUHldvvRDA==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-ppc64@0.19.9:
-    resolution: {integrity: sha512-tkV0xUX0pUUgY4ha7z5BbDS85uI7ABw3V1d0RNTii7E9lbmV8Z37Pup2tsLV46SQWzjOeyDi1Q7Wx2+QM8WaCQ==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/linux-riscv64@0.18.20:
     resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==}
     engines: {node: '>=12'}
@@ -4054,21 +3980,12 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-riscv64@0.19.8:
-    resolution: {integrity: sha512-T2DRQk55SgoleTP+DtPlMrxi/5r9AeFgkhkZ/B0ap99zmxtxdOixOMI570VjdRCs9pE4Wdkz7JYrsPvsl7eESg==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/linux-riscv64@0.19.9:
-    resolution: {integrity: sha512-DfLp8dj91cufgPZDXr9p3FoR++m3ZJ6uIXsXrIvJdOjXVREtXuQCjfMfvmc3LScAVmLjcfloyVtpn43D56JFHg==}
+  /@esbuild/linux-riscv64@0.19.11:
+    resolution: {integrity: sha512-f3DY++t94uVg141dozDu4CCUkYW+09rWtaWfnb3bqe4w5NqmZd6nPVBm+qbz7WaHZCoqXqHz5p6CM6qv3qnSSQ==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@esbuild/linux-s390x@0.18.20:
@@ -4080,21 +3997,12 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-s390x@0.19.8:
-    resolution: {integrity: sha512-NPxbdmmo3Bk7mbNeHmcCd7R7fptJaczPYBaELk6NcXxy7HLNyWwCyDJ/Xx+/YcNH7Im5dHdx9gZ5xIwyliQCbg==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/linux-s390x@0.19.9:
-    resolution: {integrity: sha512-zHbglfEdC88KMgCWpOl/zc6dDYJvWGLiUtmPRsr1OgCViu3z5GncvNVdf+6/56O2Ca8jUU+t1BW261V6kp8qdw==}
+  /@esbuild/linux-s390x@0.19.11:
+    resolution: {integrity: sha512-A5xdUoyWJHMMlcSMcPGVLzYzpcY8QP1RtYzX5/bS4dvjBGVxdhuiYyFwp7z74ocV7WDc0n1harxmpq2ePOjI0Q==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@esbuild/linux-x64@0.18.20:
@@ -4106,21 +4014,12 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-x64@0.19.8:
-    resolution: {integrity: sha512-lytMAVOM3b1gPypL2TRmZ5rnXl7+6IIk8uB3eLsV1JwcizuolblXRrc5ShPrO9ls/b+RTp+E6gbsuLWHWi2zGg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/linux-x64@0.19.9:
-    resolution: {integrity: sha512-JUjpystGFFmNrEHQnIVG8hKwvA2DN5o7RqiO1CVX8EN/F/gkCjkUMgVn6hzScpwnJtl2mPR6I9XV1oW8k9O+0A==}
+  /@esbuild/linux-x64@0.19.11:
+    resolution: {integrity: sha512-grbyMlVCvJSfxFQUndw5mCtWs5LO1gUlwP4CDi4iJBbVpZcqLVT29FxgGuBJGSzyOxotFG4LoO5X+M1350zmPA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@esbuild/netbsd-x64@0.18.20:
@@ -4132,21 +4031,12 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/netbsd-x64@0.19.8:
-    resolution: {integrity: sha512-hvWVo2VsXz/8NVt1UhLzxwAfo5sioj92uo0bCfLibB0xlOmimU/DeAEsQILlBQvkhrGjamP0/el5HU76HAitGw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/netbsd-x64@0.19.9:
-    resolution: {integrity: sha512-GThgZPAwOBOsheA2RUlW5UeroRfESwMq/guy8uEe3wJlAOjpOXuSevLRd70NZ37ZrpO6RHGHgEHvPg1h3S1Jug==}
+  /@esbuild/netbsd-x64@0.19.11:
+    resolution: {integrity: sha512-13jvrQZJc3P230OhU8xgwUnDeuC/9egsjTkXN49b3GcS5BKvJqZn86aGM8W9pd14Kd+u7HuFBMVtrNGhh6fHEQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@esbuild/openbsd-x64@0.18.20:
@@ -4158,21 +4048,12 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/openbsd-x64@0.19.8:
-    resolution: {integrity: sha512-/7Y7u77rdvmGTxR83PgaSvSBJCC2L3Kb1M/+dmSIvRvQPXXCuC97QAwMugBNG0yGcbEGfFBH7ojPzAOxfGNkwQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/openbsd-x64@0.19.9:
-    resolution: {integrity: sha512-Ki6PlzppaFVbLnD8PtlVQfsYw4S9n3eQl87cqgeIw+O3sRr9IghpfSKY62mggdt1yCSZ8QWvTZ9jo9fjDSg9uw==}
+  /@esbuild/openbsd-x64@0.19.11:
+    resolution: {integrity: sha512-ysyOGZuTp6SNKPE11INDUeFVVQFrhcNDVUgSQVDzqsqX38DjhPEPATpid04LCoUr2WXhQTEZ8ct/EgJCUDpyNw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@esbuild/sunos-x64@0.18.20:
@@ -4184,21 +4065,12 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/sunos-x64@0.19.8:
-    resolution: {integrity: sha512-9Lc4s7Oi98GqFA4HzA/W2JHIYfnXbUYgekUP/Sm4BG9sfLjyv6GKKHKKVs83SMicBF2JwAX6A1PuOLMqpD001w==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/sunos-x64@0.19.9:
-    resolution: {integrity: sha512-MLHj7k9hWh4y1ddkBpvRj2b9NCBhfgBt3VpWbHQnXRedVun/hC7sIyTGDGTfsGuXo4ebik2+3ShjcPbhtFwWDw==}
+  /@esbuild/sunos-x64@0.19.11:
+    resolution: {integrity: sha512-Hf+Sad9nVwvtxy4DXCZQqLpgmRTQqyFyhT3bZ4F2XlJCjxGmRFF0Shwn9rzhOYRB61w9VMXUkxlBy56dk9JJiQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@esbuild/win32-arm64@0.18.20:
@@ -4210,21 +4082,12 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-arm64@0.19.8:
-    resolution: {integrity: sha512-rq6WzBGjSzihI9deW3fC2Gqiak68+b7qo5/3kmB6Gvbh/NYPA0sJhrnp7wgV4bNwjqM+R2AApXGxMO7ZoGhIJg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/win32-arm64@0.19.9:
-    resolution: {integrity: sha512-GQoa6OrQ8G08guMFgeXPH7yE/8Dt0IfOGWJSfSH4uafwdC7rWwrfE6P9N8AtPGIjUzdo2+7bN8Xo3qC578olhg==}
+  /@esbuild/win32-arm64@0.19.11:
+    resolution: {integrity: sha512-0P58Sbi0LctOMOQbpEOvOL44Ne0sqbS0XWHMvvrg6NE5jQ1xguCSSw9jQeUk2lfrXYsKDdOe6K+oZiwKPilYPQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@esbuild/win32-ia32@0.18.20:
@@ -4236,23 +4099,14 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-ia32@0.19.8:
-    resolution: {integrity: sha512-AIAbverbg5jMvJznYiGhrd3sumfwWs8572mIJL5NQjJa06P8KfCPWZQ0NwZbPQnbQi9OWSZhFVSUWjjIrn4hSw==}
+  /@esbuild/win32-ia32@0.19.11:
+    resolution: {integrity: sha512-6YOrWS+sDJDmshdBIQU+Uoyh7pQKrdykdefC1avn76ss5c+RN6gut3LZA4E2cH5xUEp5/cA0+YxRaVtRAb0xBg==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
     optional: true
 
-  /@esbuild/win32-ia32@0.19.9:
-    resolution: {integrity: sha512-UOozV7Ntykvr5tSOlGCrqU3NBr3d8JqPes0QWN2WOXfvkWVGRajC+Ym0/Wj88fUgecUCLDdJPDF0Nna2UK3Qtg==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/win32-x64@0.18.20:
     resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==}
     engines: {node: '>=12'}
@@ -4262,21 +4116,12 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-x64@0.19.8:
-    resolution: {integrity: sha512-bfZ0cQ1uZs2PqpulNL5j/3w+GDhP36k1K5c38QdQg+Swy51jFZWWeIkteNsufkQxp986wnqRRsb/bHbY1WQ7TA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    optional: true
-
-  /@esbuild/win32-x64@0.19.9:
-    resolution: {integrity: sha512-oxoQgglOP7RH6iasDrhY+R/3cHrfwIDvRlT4CGChflq6twk8iENeVvMJjmvBb94Ik1Z+93iGO27err7w6l54GQ==}
+  /@esbuild/win32-x64@0.19.11:
+    resolution: {integrity: sha512-vfkhltrjCAb603XaFhqhAF4LGDi2M4OrCRrFusyQ+iTLQ/o60QQXxc9cZC/FFpihBI9N1Grn6SMKVJ4KP7Fuiw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
-    dev: false
     optional: true
 
   /@eslint-community/eslint-utils@4.4.0(eslint@8.53.0):
@@ -4383,8 +4228,8 @@ packages:
     resolution: {integrity: sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==}
     engines: {node: '>=14'}
 
-  /@fastify/cookie@9.2.0:
-    resolution: {integrity: sha512-fkg1yjjQRHPFAxSHeLC8CqYuNzvR6Lwlj/KjrzQcGjNBK+K82nW+UfCjfN71g1GkoVoc1GTOgIWkFJpcMfMkHQ==}
+  /@fastify/cookie@9.3.1:
+    resolution: {integrity: sha512-h1NAEhB266+ZbZ0e9qUE6NnNR07i7DnNXWG9VbbZ8uC6O/hxHpl+Zoe5sw1yfdZ2U6XhToUGDnzQtWJdCaPwfg==}
     dependencies:
       cookie-signature: 1.2.1
       fastify-plugin: 4.5.0
@@ -4401,10 +4246,6 @@ packages:
     resolution: {integrity: sha512-J8TOSBq3SoZbDhM9+R/u77hP93gz/rajSA+K2kGyijPpORPWUXHUpTaleoj+92As0S9uPRP7Oi8IqMf0u+ro6A==}
     dev: false
 
-  /@fastify/error@3.2.0:
-    resolution: {integrity: sha512-KAfcLa+CnknwVi5fWogrLXgidLic+GXnLjijXdpl8pvkvbXU5BGa37iZO9FGvsh9ZL4y+oFi5cbHBm5UOG+dmQ==}
-    dev: false
-
   /@fastify/error@3.4.0:
     resolution: {integrity: sha512-e/mafFwbK3MNqxUcFBLgHhgxsF8UT1m8aj0dAlqEa2nJEgPsRtpHTZ3ObgrgkZ2M1eJHPTwgyUl/tXkvabsZdQ==}
     dev: false
@@ -4430,25 +4271,21 @@ packages:
       '@fastify/reply-from': 9.0.1
       fast-querystring: 1.1.2
       fastify-plugin: 4.5.0
-      ws: 8.15.1(bufferutil@4.0.7)(utf-8-validate@6.0.3)
+      ws: 8.16.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
     dev: false
 
-  /@fastify/multipart@8.0.0:
-    resolution: {integrity: sha512-xaH1pGIqYnIJjYs5qG6ryhPSFnWuJIfSXYqEUtzmcyREkMk0SwONd2y+SZ9JXfDmETAC/Ogtc/SRbz+AjZhCkw==}
+  /@fastify/multipart@8.1.0:
+    resolution: {integrity: sha512-sRX9X4ZhAqRbe2kDvXY2NK7i6Wf1Rm2g/CjpGYYM7+Np8E6uWQXcj761j08qPfPO8PJXM+vJ7yrKbK1GPB+OeQ==}
     dependencies:
       '@fastify/busboy': 1.1.0
       '@fastify/deepmerge': 1.3.0
-      '@fastify/error': 3.2.0
-      '@fastify/swagger': 8.6.0
-      '@fastify/swagger-ui': 1.9.0
+      '@fastify/error': 3.4.0
       fastify-plugin: 4.5.0
       secure-json-parse: 2.7.0
       stream-wormhole: 1.1.0
-    transitivePeerDependencies:
-      - supports-color
     dev: false
 
   /@fastify/reply-from@9.0.1:
@@ -4484,28 +4321,6 @@ packages:
       p-limit: 3.1.0
     dev: false
 
-  /@fastify/swagger-ui@1.9.0:
-    resolution: {integrity: sha512-7RTq2bI2cg4k6WsY69k8MZ8GnH6VUSbczJGnTotUKH+fOY9Cg3y8NEvPUREfwRzguI+3N+v8gp6H0UAohayldA==}
-    dependencies:
-      '@fastify/static': 6.12.0
-      fastify-plugin: 4.5.0
-      openapi-types: 12.1.3
-      rfdc: 1.3.0
-      yaml: 2.3.1
-    dev: false
-
-  /@fastify/swagger@8.6.0:
-    resolution: {integrity: sha512-PGde7ryn0nsX/BpSrjP4Ade8RK2M0uBIU4Iow3Qt3kWa/70p1fM7AW28kS3dKERnwT0VwrUdxU3ftrRI+DsNTw==}
-    dependencies:
-      fastify-plugin: 4.5.0
-      json-schema-resolver: 2.0.0
-      openapi-types: 12.1.3
-      rfdc: 1.3.0
-      yaml: 2.3.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
   /@fastify/view@8.2.0:
     resolution: {integrity: sha512-hBSiBofCnJNlPHEMZWpO1SL84eqOaqujJ1hR3jntFyZZCkweH5jMs12DKYyGesjVll7SJFRRxPUBB8kmUmneRQ==}
     dependencies:
@@ -4697,11 +4512,11 @@ packages:
       - ts-node
     dev: true
 
-  /@jest/create-cache-key-function@27.5.1:
-    resolution: {integrity: sha512-dmH1yW+makpTSURTy8VzdUwFnfQh1G8R+DxO2Ho2FFmBbKFEVm+3jWdvFhE2VqB/LATCTokkP0dotjyQyw5/AQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+  /@jest/create-cache-key-function@29.7.0:
+    resolution: {integrity: sha512-4QqS3LY5PBmTRHj9sAg1HLoPzqAI0uOX6wI/TRqHIcOxlFidy6YEmCQJk6FSZjNLGCeubDMfmkWL+qaLKhSGQA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 27.5.1
+      '@jest/types': 29.6.3
     dev: true
 
   /@jest/environment@29.7.0:
@@ -4839,7 +4654,7 @@ packages:
     resolution: {integrity: sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.5
       '@jest/types': 29.6.3
       '@jridgewell/trace-mapping': 0.3.18
       babel-plugin-istanbul: 6.1.1
@@ -4881,7 +4696,7 @@ packages:
       chalk: 4.1.2
     dev: true
 
-  /@joshwooding/vite-plugin-react-docgen-typescript@0.3.0(typescript@5.3.3)(vite@5.0.10):
+  /@joshwooding/vite-plugin-react-docgen-typescript@0.3.0(typescript@5.3.3)(vite@5.0.12):
     resolution: {integrity: sha512-2D6y7fNvFmsLmRt6UCOFJPvFoPMJGT0Uh1Wg0RaigUp7kdQPs6yYn8Dmx6GZkOH/NW0yMTwRz/p0SRMMRo50vA==}
     peerDependencies:
       typescript: '>= 4.3.x'
@@ -4895,7 +4710,7 @@ packages:
       magic-string: 0.27.0
       react-docgen-typescript: 2.2.2(typescript@5.3.3)
       typescript: 5.3.3
-      vite: 5.0.10(@types/node@20.10.5)(sass@1.69.5)(terser@5.26.0)
+      vite: 5.0.12(@types/node@20.11.5)(sass@1.70.0)(terser@5.27.0)
     dev: true
 
   /@jridgewell/gen-mapping@0.3.2:
@@ -4993,24 +4808,24 @@ packages:
       react: 18.2.0
     dev: true
 
-  /@microsoft/api-extractor-model@7.28.3(@types/node@20.10.5):
-    resolution: {integrity: sha512-wT/kB2oDbdZXITyDh2SQLzaWwTOFbV326fP0pUwNW00WeliARs0qjmXBWmGWardEzp2U3/axkO3Lboqun6vrig==}
+  /@microsoft/api-extractor-model@7.28.4(@types/node@20.11.5):
+    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.62.0(@types/node@20.10.5)
+      '@rushstack/node-core-library': 3.63.0(@types/node@20.11.5)
     transitivePeerDependencies:
       - '@types/node'
     dev: true
 
-  /@microsoft/api-extractor@7.38.5(@types/node@20.10.5):
-    resolution: {integrity: sha512-c/w2zfqBcBJxaCzpJNvFoouWewcYrUOfeu5ZkWCCIXTF9a/gXM85RGevEzlMAIEGM/kssAAZSXRJIZ3Q5vLFow==}
+  /@microsoft/api-extractor@7.39.1(@types/node@20.11.5):
+    resolution: {integrity: sha512-V0HtCufWa8hZZvSmlEzQZfINcJkHAU/bmpyJQj6w+zpI87EkR8DuBOW6RWrO9c7mUYFZoDaNgUTyKo83ytv+QQ==}
     hasBin: true
     dependencies:
-      '@microsoft/api-extractor-model': 7.28.3(@types/node@20.10.5)
+      '@microsoft/api-extractor-model': 7.28.4(@types/node@20.11.5)
       '@microsoft/tsdoc': 0.14.2
       '@microsoft/tsdoc-config': 0.16.2
-      '@rushstack/node-core-library': 3.62.0(@types/node@20.10.5)
+      '@rushstack/node-core-library': 3.63.0(@types/node@20.11.5)
       '@rushstack/rig-package': 0.5.1
       '@rushstack/ts-command-line': 4.17.1
       colors: 1.2.5
@@ -5018,7 +4833,7 @@ packages:
       resolve: 1.22.8
       semver: 7.5.4
       source-map: 0.6.1
-      typescript: 5.0.4
+      typescript: 5.3.3
     transitivePeerDependencies:
       - '@types/node'
     dev: true
@@ -5054,34 +4869,6 @@ 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@6.14.0)(@typescript-eslint/parser@6.14.0)(eslint-plugin-import@2.29.1)(eslint@8.56.0):
-    resolution: {integrity: sha512-dh6UbcrNDVg5DD8k8Qh4ab30OPpuEYIlJCqaBV/lkIV8wNN/AfCJ2V7iTP8V8KjryM4t+sf5IqzQLQnT0mWI4A==}
-    peerDependencies:
-      '@typescript-eslint/eslint-plugin': '>= 6'
-      '@typescript-eslint/parser': '>= 6'
-      eslint: '>= 3'
-      eslint-plugin-import: '>= 2'
-    dependencies:
-      '@typescript-eslint/eslint-plugin': 6.14.0(@typescript-eslint/parser@6.14.0)(eslint@8.56.0)(typescript@5.3.3)
-      '@typescript-eslint/parser': 6.14.0(eslint@8.56.0)(typescript@5.3.3)
-      eslint: 8.56.0
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.14.0)(eslint@8.56.0)
-    dev: true
-
-  /@misskey-dev/eslint-plugin@1.0.0(@typescript-eslint/eslint-plugin@6.19.0)(@typescript-eslint/parser@6.14.0)(eslint-plugin-import@2.29.1)(eslint@8.56.0):
-    resolution: {integrity: sha512-dh6UbcrNDVg5DD8k8Qh4ab30OPpuEYIlJCqaBV/lkIV8wNN/AfCJ2V7iTP8V8KjryM4t+sf5IqzQLQnT0mWI4A==}
-    peerDependencies:
-      '@typescript-eslint/eslint-plugin': '>= 6'
-      '@typescript-eslint/parser': '>= 6'
-      eslint: '>= 3'
-      eslint-plugin-import: '>= 2'
-    dependencies:
-      '@typescript-eslint/eslint-plugin': 6.19.0(@typescript-eslint/parser@6.14.0)(eslint@8.56.0)(typescript@5.3.3)
-      '@typescript-eslint/parser': 6.14.0(eslint@8.56.0)(typescript@5.3.3)
-      eslint: 8.56.0
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.14.0)(eslint@8.56.0)
-    dev: true
-
   /@misskey-dev/eslint-plugin@1.0.0(@typescript-eslint/eslint-plugin@6.19.0)(@typescript-eslint/parser@6.19.0)(eslint-plugin-import@2.29.1)(eslint@8.56.0):
     resolution: {integrity: sha512-dh6UbcrNDVg5DD8k8Qh4ab30OPpuEYIlJCqaBV/lkIV8wNN/AfCJ2V7iTP8V8KjryM4t+sf5IqzQLQnT0mWI4A==}
     peerDependencies:
@@ -5178,28 +4965,21 @@ packages:
     dev: false
     optional: true
 
-  /@mswjs/cookies@0.2.2:
-    resolution: {integrity: sha512-mlN83YSrcFgk7Dm1Mys40DLssI1KdJji2CMKN8eOlBqsTADYzj2+jWzsANsUTFbxDMWPD5e9bfA1RGqBpS3O1g==}
-    engines: {node: '>=14'}
-    dependencies:
-      '@types/set-cookie-parser': 2.4.3
-      set-cookie-parser: 2.6.0
+  /@mswjs/cookies@1.1.0:
+    resolution: {integrity: sha512-0ZcCVQxifZmhwNBoQIrystCb+2sWBY2Zw8lpfJBPCHGCA/HWqehITeCRVIv4VMy8MPlaHo2w2pTHFV2pFfqKPw==}
+    engines: {node: '>=18'}
     dev: true
 
-  /@mswjs/interceptors@0.17.10:
-    resolution: {integrity: sha512-N8x7eSLGcmUFNWZRxT1vsHvypzIRgQYdG0rJey/rZCy6zT/30qDt8Joj7FxzGNLSwXbeZqJOMqDurp7ra4hgbw==}
-    engines: {node: '>=14'}
+  /@mswjs/interceptors@0.25.14:
+    resolution: {integrity: sha512-2dnIxl+obqIqjoPXTFldhe6pcdOrqiz+GcLaQQ6hmL02OldAF7nIC+rUgTWm+iF6lvmyCVhFFqbgbapNhR8eag==}
+    engines: {node: '>=18'}
     dependencies:
-      '@open-draft/until': 1.0.3
-      '@types/debug': 4.1.7
-      '@xmldom/xmldom': 0.8.6
-      debug: 4.3.4(supports-color@8.1.1)
-      headers-polyfill: 3.2.5
-      outvariant: 1.4.0
-      strict-event-emitter: 0.2.8
-      web-encoding: 1.1.5
-    transitivePeerDependencies:
-      - supports-color
+      '@open-draft/deferred-promise': 2.2.0
+      '@open-draft/logger': 0.3.0
+      '@open-draft/until': 2.1.0
+      is-node-process: 1.2.0
+      outvariant: 1.4.2
+      strict-event-emitter: 0.5.1
     dev: true
 
   /@ndelangen/get-tarball@3.0.7:
@@ -5366,48 +5146,59 @@ packages:
     resolution: {integrity: sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==}
     dev: true
 
-  /@open-draft/until@1.0.3:
-    resolution: {integrity: sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q==}
+  /@open-draft/deferred-promise@2.2.0:
+    resolution: {integrity: sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==}
+    dev: true
+
+  /@open-draft/logger@0.3.0:
+    resolution: {integrity: sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==}
+    dependencies:
+      is-node-process: 1.2.0
+      outvariant: 1.4.2
+    dev: true
+
+  /@open-draft/until@2.1.0:
+    resolution: {integrity: sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==}
     dev: true
 
-  /@peculiar/asn1-android@2.3.6:
-    resolution: {integrity: sha512-zkYh4DsiRhiNfg6tWaUuRc+huwlb9XJbmeZLrjTz9v76UK1Ehq3EnfJFED6P3sdznW/nqWe46LoM9JrqxcD58g==}
+  /@peculiar/asn1-android@2.3.10:
+    resolution: {integrity: sha512-z9Rx9cFJv7UUablZISe7uksNbFJCq13hO0yEAOoIpAymALTLlvUOSLnGiQS7okPaM5dP42oTLhezH6XDXRXjGw==}
     dependencies:
-      '@peculiar/asn1-schema': 2.3.6
+      '@peculiar/asn1-schema': 2.3.8
       asn1js: 3.0.5
       tslib: 2.6.2
     dev: false
 
-  /@peculiar/asn1-ecc@2.3.6:
-    resolution: {integrity: sha512-Hu1xzMJQWv8/GvzOiinaE6XiD1/kEhq2C/V89UEoWeZ2fLUcGNIvMxOr/pMyL0OmpRWj/mhCTXOZp4PP+a0aTg==}
+  /@peculiar/asn1-ecc@2.3.8:
+    resolution: {integrity: sha512-Ah/Q15y3A/CtxbPibiLM/LKcMbnLTdUdLHUgdpB5f60sSvGkXzxJCu5ezGTFHogZXWNX3KSmYqilCrfdmBc6pQ==}
     dependencies:
-      '@peculiar/asn1-schema': 2.3.6
-      '@peculiar/asn1-x509': 2.3.6
+      '@peculiar/asn1-schema': 2.3.8
+      '@peculiar/asn1-x509': 2.3.8
       asn1js: 3.0.5
       tslib: 2.6.2
     dev: false
 
-  /@peculiar/asn1-rsa@2.3.6:
-    resolution: {integrity: sha512-DswjJyAXZnvESuImGNTvbNKvh1XApBVqU+r3UmrFFTAI23gv62byl0f5OFKWTNhCf66WQrd3sklpsCZc/4+jwA==}
+  /@peculiar/asn1-rsa@2.3.8:
+    resolution: {integrity: sha512-ES/RVEHu8VMYXgrg3gjb1m/XG0KJWnV4qyZZ7mAg7rrF3VTmRbLxO8mk+uy0Hme7geSMebp+Wvi2U6RLLEs12Q==}
     dependencies:
-      '@peculiar/asn1-schema': 2.3.6
-      '@peculiar/asn1-x509': 2.3.6
+      '@peculiar/asn1-schema': 2.3.8
+      '@peculiar/asn1-x509': 2.3.8
       asn1js: 3.0.5
       tslib: 2.6.2
     dev: false
 
-  /@peculiar/asn1-schema@2.3.6:
-    resolution: {integrity: sha512-izNRxPoaeJeg/AyH8hER6s+H7p4itk+03QCa4sbxI3lNdseQYCuxzgsuNK8bTXChtLTjpJz6NmXKA73qLa3rCA==}
+  /@peculiar/asn1-schema@2.3.8:
+    resolution: {integrity: sha512-ULB1XqHKx1WBU/tTFIA+uARuRoBVZ4pNdOA878RDrRbBfBGcSzi5HBkdScC6ZbHn8z7L8gmKCgPC1LHRrP46tA==}
     dependencies:
       asn1js: 3.0.5
       pvtsutils: 1.3.5
       tslib: 2.6.2
     dev: false
 
-  /@peculiar/asn1-x509@2.3.6:
-    resolution: {integrity: sha512-dRwX31R1lcbIdzbztiMvLNTDoGptxdV7HocNx87LfKU0fEWh7fTWJjx4oV+glETSy6heF/hJHB2J4RGB3vVSYg==}
+  /@peculiar/asn1-x509@2.3.8:
+    resolution: {integrity: sha512-voKxGfDU1c6r9mKiN5ZUsZWh3Dy1BABvTM3cimf0tztNwyMJPhiXY94eRTgsMQe6ViLfT6EoXxkWVzcm3mFAFw==}
     dependencies:
-      '@peculiar/asn1-schema': 2.3.6
+      '@peculiar/asn1-schema': 2.3.8
       asn1js: 3.0.5
       ipaddr.js: 2.1.0
       pvtsutils: 1.3.5
@@ -5432,13 +5223,13 @@ packages:
   /@radix-ui/number@1.0.1:
     resolution: {integrity: sha512-T5gIdVO2mmPW3NNhjNgEP3cqMXjXL9UbO0BzWcXfvdBs+BohbQxvd/K5hSVKmn9/lbTdsQVKbUcP5WLCwvUbBg==}
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
     dev: true
 
   /@radix-ui/primitive@1.0.1:
     resolution: {integrity: sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==}
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
     dev: true
 
   /@radix-ui/react-arrow@1.0.3(react-dom@18.2.0)(react@18.2.0):
@@ -5454,7 +5245,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
@@ -5473,7 +5264,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/react-compose-refs': 1.0.1(react@18.2.0)
       '@radix-ui/react-context': 1.0.1(react@18.2.0)
       '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
@@ -5491,7 +5282,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       react: 18.2.0
     dev: true
 
@@ -5504,7 +5295,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       react: 18.2.0
     dev: true
 
@@ -5517,7 +5308,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       react: 18.2.0
     dev: true
 
@@ -5534,7 +5325,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-compose-refs': 1.0.1(react@18.2.0)
       '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
@@ -5553,7 +5344,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       react: 18.2.0
     dev: true
 
@@ -5570,7 +5361,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/react-compose-refs': 1.0.1(react@18.2.0)
       '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-use-callback-ref': 1.0.1(react@18.2.0)
@@ -5587,7 +5378,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/react-use-layout-effect': 1.0.1(react@18.2.0)
       react: 18.2.0
     dev: true
@@ -5605,7 +5396,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@floating-ui/react-dom': 2.0.2(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-arrow': 1.0.3(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-compose-refs': 1.0.1(react@18.2.0)
@@ -5633,7 +5424,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
@@ -5652,7 +5443,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/react-slot': 1.0.2(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
@@ -5671,7 +5462,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-collection': 1.0.3(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-compose-refs': 1.0.1(react@18.2.0)
@@ -5698,7 +5489,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/number': 1.0.1
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-collection': 1.0.3(react-dom@18.2.0)(react@18.2.0)
@@ -5737,7 +5528,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
@@ -5752,7 +5543,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/react-compose-refs': 1.0.1(react@18.2.0)
       react: 18.2.0
     dev: true
@@ -5770,7 +5561,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-context': 1.0.1(react@18.2.0)
       '@radix-ui/react-direction': 1.0.1(react@18.2.0)
@@ -5795,7 +5586,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.0.1(react@18.2.0)
@@ -5816,7 +5607,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-context': 1.0.1(react@18.2.0)
       '@radix-ui/react-direction': 1.0.1(react@18.2.0)
@@ -5837,7 +5628,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       react: 18.2.0
     dev: true
 
@@ -5850,7 +5641,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/react-use-callback-ref': 1.0.1(react@18.2.0)
       react: 18.2.0
     dev: true
@@ -5864,7 +5655,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/react-use-callback-ref': 1.0.1(react@18.2.0)
       react: 18.2.0
     dev: true
@@ -5878,7 +5669,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       react: 18.2.0
     dev: true
 
@@ -5891,7 +5682,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       react: 18.2.0
     dev: true
 
@@ -5904,7 +5695,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/rect': 1.0.1
       react: 18.2.0
     dev: true
@@ -5918,7 +5709,7 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/react-use-layout-effect': 1.0.1(react@18.2.0)
       react: 18.2.0
     dev: true
@@ -5936,7 +5727,7 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
       '@radix-ui/react-primitive': 1.0.3(react-dom@18.2.0)(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
@@ -5945,7 +5736,7 @@ packages:
   /@radix-ui/rect@1.0.1:
     resolution: {integrity: sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ==}
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
     dev: true
 
   /@readme/better-ajv-errors@1.6.0(ajv@8.12.0):
@@ -5990,7 +5781,7 @@ packages:
       openapi-types: 12.1.3
     dev: true
 
-  /@rollup/plugin-json@6.1.0(rollup@4.9.1):
+  /@rollup/plugin-json@6.1.0(rollup@4.9.6):
     resolution: {integrity: sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -5999,11 +5790,11 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.9.1)
-      rollup: 4.9.1
+      '@rollup/pluginutils': 5.1.0(rollup@4.9.6)
+      rollup: 4.9.6
     dev: false
 
-  /@rollup/plugin-replace@5.0.5(rollup@4.9.1):
+  /@rollup/plugin-replace@5.0.5(rollup@4.9.6):
     resolution: {integrity: sha512-rYO4fOi8lMaTg/z5Jb+hKnrHHVn8j2lwkqwyS4kTRhKyWOLf2wST2sWXr4WzWiTcoHTp2sTjqUbqIj2E39slKQ==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -6012,12 +5803,12 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.9.1)
+      '@rollup/pluginutils': 5.1.0(rollup@4.9.6)
       magic-string: 0.30.5
-      rollup: 4.9.1
+      rollup: 4.9.6
     dev: false
 
-  /@rollup/pluginutils@5.1.0(rollup@4.9.1):
+  /@rollup/pluginutils@5.1.0(rollup@4.9.6):
     resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -6029,108 +5820,108 @@ packages:
       '@types/estree': 1.0.5
       estree-walker: 2.0.2
       picomatch: 2.3.1
-      rollup: 4.9.1
+      rollup: 4.9.6
 
-  /@rollup/rollup-android-arm-eabi@4.9.1:
-    resolution: {integrity: sha512-6vMdBZqtq1dVQ4CWdhFwhKZL6E4L1dV6jUjuBvsavvNJSppzi6dLBbuV+3+IyUREaj9ZFvQefnQm28v4OCXlig==}
+  /@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.9.1:
-    resolution: {integrity: sha512-Jto9Fl3YQ9OLsTDWtLFPtaIMSL2kwGyGoVCmPC8Gxvym9TCZm4Sie+cVeblPO66YZsYH8MhBKDMGZ2NDxuk/XQ==}
+  /@rollup/rollup-android-arm64@4.9.6:
+    resolution: {integrity: sha512-T14aNLpqJ5wzKNf5jEDpv5zgyIqcpn1MlwCrUXLrwoADr2RkWA0vOWP4XxbO9aiO3dvMCQICZdKeDrFl7UMClw==}
     cpu: [arm64]
     os: [android]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-darwin-arm64@4.9.1:
-    resolution: {integrity: sha512-LtYcLNM+bhsaKAIGwVkh5IOWhaZhjTfNOkGzGqdHvhiCUVuJDalvDxEdSnhFzAn+g23wgsycmZk1vbnaibZwwA==}
+  /@rollup/rollup-darwin-arm64@4.9.6:
+    resolution: {integrity: sha512-CqNNAyhRkTbo8VVZ5R85X73H3R5NX9ONnKbXuHisGWC0qRbTTxnF1U4V9NafzJbgGM0sHZpdO83pLPzq8uOZFw==}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
     optional: true
 
-  /@rollup/rollup-darwin-x64@4.9.1:
-    resolution: {integrity: sha512-KyP/byeXu9V+etKO6Lw3E4tW4QdcnzDG/ake031mg42lob5tN+5qfr+lkcT/SGZaH2PdW4Z1NX9GHEkZ8xV7og==}
+  /@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.9.1:
-    resolution: {integrity: sha512-Yqz/Doumf3QTKplwGNrCHe/B2p9xqDghBZSlAY0/hU6ikuDVQuOUIpDP/YcmoT+447tsZTmirmjgG3znvSCR0Q==}
+  /@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.9.1:
-    resolution: {integrity: sha512-u3XkZVvxcvlAOlQJ3UsD1rFvLWqu4Ef/Ggl40WAVCuogf4S1nJPHh5RTgqYFpCOvuGJ7H5yGHabjFKEZGExk5Q==}
+  /@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.9.1:
-    resolution: {integrity: sha512-0XSYN/rfWShW+i+qjZ0phc6vZ7UWI8XWNz4E/l+6edFt+FxoEghrJHjX1EY/kcUGCnZzYYRCl31SNdfOi450Aw==}
+  /@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.9.1:
-    resolution: {integrity: sha512-LmYIO65oZVfFt9t6cpYkbC4d5lKHLYv5B4CSHRpnANq0VZUQXGcCPXHzbCXCz4RQnx7jvlYB1ISVNCE/omz5cw==}
+  /@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.9.1:
-    resolution: {integrity: sha512-kr8rEPQ6ns/Lmr/hiw8sEVj9aa07gh1/tQF2Y5HrNCCEPiCBGnBUt9tVusrcBBiJfIt1yNaXN6r1CCmpbFEDpg==}
+  /@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.9.1:
-    resolution: {integrity: sha512-t4QSR7gN+OEZLG0MiCgPqMWZGwmeHhsM4AkegJ0Kiy6TnJ9vZ8dEIwHw1LcZKhbHxTY32hp9eVCMdR3/I8MGRw==}
+  /@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.9.1:
-    resolution: {integrity: sha512-7XI4ZCBN34cb+BH557FJPmh0kmNz2c25SCQeT9OiFWEgf8+dL6ZwJ8f9RnUIit+j01u07Yvrsuu1rZGxJCc51g==}
+  /@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.9.1:
-    resolution: {integrity: sha512-yE5c2j1lSWOH5jp+Q0qNL3Mdhr8WuqCNVjc6BxbVfS5cAS6zRmdiw7ktb8GNpDCEUJphILY6KACoFoRtKoqNQg==}
+  /@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.9.1:
-    resolution: {integrity: sha512-PyJsSsafjmIhVgaI1Zdj7m8BB8mMckFah/xbpplObyHfiXzKcI5UOUXRyOdHW7nz4DpMCuzLnF7v5IWHenCwYA==}
+  /@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.62.0(@types/node@20.10.5):
-    resolution: {integrity: sha512-88aJn2h8UpSvdwuDXBv1/v1heM6GnBf3RjEy6ZPP7UnzHNCqOHA2Ut+ScYUbXcqIdfew9JlTAe3g+cnX9xQ/Aw==}
+  /@rushstack/node-core-library@3.63.0(@types/node@20.11.5):
+    resolution: {integrity: sha512-Q7B3dVpBQF1v+mUfxNcNZh5uHVR8ntcnkN5GYjbBLrxUYHBGKbnCM+OdcN+hzCpFlLBH6Ob0dEHhZ0spQwf24A==}
     peerDependencies:
       '@types/node': '*'
     peerDependenciesMeta:
       '@types/node':
         optional: true
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       colors: 1.2.5
       fs-extra: 7.0.1
       import-lazy: 4.0.0
@@ -6170,25 +5961,30 @@ packages:
     resolution: {integrity: sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==}
     dev: true
 
-  /@simplewebauthn/server@8.3.5:
-    resolution: {integrity: sha512-Y6FkggTkzUdPk3cG3LLCiv7rqPQ3QI7g//RU9937G1pxogChvx12Y7/AZdWeMoeP+LFl0fPpdc1bIE0etJOxGA==}
+  /@simplewebauthn/server@9.0.0:
+    resolution: {integrity: sha512-pm3UWhZrneBoSDQmtYTScZeOhcKbPch/zmMgfJZJY3sE1l0VAQsAKlIjoLGRrw2vXYSL7Eslhh0Qdb301IPxTQ==}
     engines: {node: '>=16.0.0'}
     dependencies:
       '@hexagon/base64': 1.1.27
-      '@peculiar/asn1-android': 2.3.6
-      '@peculiar/asn1-ecc': 2.3.6
-      '@peculiar/asn1-rsa': 2.3.6
-      '@peculiar/asn1-schema': 2.3.6
-      '@peculiar/asn1-x509': 2.3.6
-      '@simplewebauthn/typescript-types': 8.3.4
+      '@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.0
       cbor-x: 1.5.4
       cross-fetch: 4.0.0
     transitivePeerDependencies:
       - encoding
     dev: false
 
+  /@simplewebauthn/types@9.0.0:
+    resolution: {integrity: sha512-Lo6LLNQee66D//KueYy9AyX7oiQ7BBKJgdLzP3l0HJDrV4GRSzSAii8AtigBGOeNc8hOQsF/D8itItyuZX9djA==}
+    dev: false
+
   /@simplewebauthn/typescript-types@8.3.4:
     resolution: {integrity: sha512-38xtca0OqfRVNloKBrFB5LEM6PN5vzFbJG6rAutPVrtGHFYxPdiV3btYWq0eAZAZmP+dqFPYJxJWeJrGfmYHng==}
+    dev: true
 
   /@sinclair/typebox@0.24.51:
     resolution: {integrity: sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==}
@@ -6212,12 +6008,6 @@ packages:
     engines: {node: '>=16'}
     dev: false
 
-  /@sinonjs/commons@1.8.6:
-    resolution: {integrity: sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==}
-    dependencies:
-      type-detect: 4.0.8
-    dev: true
-
   /@sinonjs/commons@2.0.0:
     resolution: {integrity: sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==}
     dependencies:
@@ -6241,14 +6031,8 @@ packages:
       '@sinonjs/commons': 3.0.0
     dev: false
 
-  /@sinonjs/fake-timers@9.1.2:
-    resolution: {integrity: sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==}
-    dependencies:
-      '@sinonjs/commons': 1.8.6
-    dev: true
-
-  /@sinonjs/samsam@7.0.1:
-    resolution: {integrity: sha512-zsAk2Jkiq89mhZovB2LLOdTCxJF4hqqTToGP0ASWlhp4I1hqOjcfmZGafXntCN7MDC6yySH0mFHrYtHceOeLmw==}
+  /@sinonjs/samsam@8.0.0:
+    resolution: {integrity: sha512-Bp8KUVlLp8ibJZrnvq2foVhP0IVX2CIprMJPK0vqGqgrDa0OHVKeZyBykqskkrdxV6yKBPmGasO8LVjAKR3Gew==}
     dependencies:
       '@sinonjs/commons': 2.0.0
       lodash.get: 4.4.2
@@ -6722,10 +6506,10 @@ packages:
     resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
     dev: false
 
-  /@storybook/addon-actions@7.6.5:
-    resolution: {integrity: sha512-lW/m9YcaNfBZk+TZLxyzHdd563mBWpsUIveOKYjcPdl/q0FblWWZrRsFHqwLK1ldZ4AZXs8J/47G8CBr6Ew2uQ==}
+  /@storybook/addon-actions@7.6.10:
+    resolution: {integrity: sha512-pcKmf0H/caGzKDy8cz1adNSjv+KOBWLJ11RzGExrWm+Ad5ACifwlsQPykJ3TQ/21sTd9IXVrE9uuq4LldEnPbg==}
     dependencies:
-      '@storybook/core-events': 7.6.5
+      '@storybook/core-events': 7.6.10
       '@storybook/global': 5.0.0
       '@types/uuid': 9.0.7
       dequal: 2.0.3
@@ -6733,18 +6517,18 @@ packages:
       uuid: 9.0.1
     dev: true
 
-  /@storybook/addon-backgrounds@7.6.5:
-    resolution: {integrity: sha512-wZZOL19vg4TTRtOTl71XKqPe5hQx3XUh9Fle0wOi91FiFrBdqusrppnyS89wPS8RQG5lXEOFEUvYcMmdCcdZfw==}
+  /@storybook/addon-backgrounds@7.6.10:
+    resolution: {integrity: sha512-kGzsN1QkfyI8Cz7TErEx9OCB3PMzpCFGLd/iy7FreXwbMbeAQ3/9fYgKUsNOYgOhuTz7S09koZUWjS/WJuZGFA==}
     dependencies:
       '@storybook/global': 5.0.0
       memoizerific: 1.11.3
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/addon-controls@7.6.5(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-EdSZ2pYf74mOXZGGJ22lrDvdvL0YKc95iWv9FFEhUFOloMy/0OZPB2ybYmd2KVCy3SeIE4Zfeiw8pDXdCUniOQ==}
+  /@storybook/addon-controls@7.6.10(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-LjwCQRMWq1apLtFwDi6U8MI6ITUr+KhxJucZ60tfc58RgB2v8ayozyDAonFEONsx9YSR1dNIJ2Z/e2rWTBJeYA==}
     dependencies:
-      '@storybook/blocks': 7.6.5(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/blocks': 7.6.10(react-dom@18.2.0)(react@18.2.0)
       lodash: 4.17.21
       ts-dedent: 2.2.0
     transitivePeerDependencies:
@@ -6756,27 +6540,27 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/addon-docs@7.6.5(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-D9tZyD41IujCHiPYdfS2bKtZRJPNwO4EydzyqODXppomluhFbY3uTEaf0H1UFnJLQxWNXZ7rr3aS0V3O6yu8pA==}
+  /@storybook/addon-docs@7.6.10(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-GtyQ9bMx1AOOtl6ZS9vwK104HFRK+tqzxddRRxhXkpyeKu3olm9aMgXp35atE/3fJSqyyDm2vFtxxH8mzBA20A==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
       '@jest/transform': 29.7.0
       '@mdx-js/react': 2.3.0(react@18.2.0)
-      '@storybook/blocks': 7.6.5(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/client-logger': 7.6.5
-      '@storybook/components': 7.6.5(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/csf-plugin': 7.6.5
-      '@storybook/csf-tools': 7.6.5
+      '@storybook/blocks': 7.6.10(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/client-logger': 7.6.10
+      '@storybook/components': 7.6.10(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/csf-plugin': 7.6.10
+      '@storybook/csf-tools': 7.6.10
       '@storybook/global': 5.0.0
       '@storybook/mdx2-csf': 1.0.0
-      '@storybook/node-logger': 7.6.5
-      '@storybook/postinstall': 7.6.5
-      '@storybook/preview-api': 7.6.5
-      '@storybook/react-dom-shim': 7.6.5(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/theming': 7.6.5(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/types': 7.6.5
+      '@storybook/node-logger': 7.6.10
+      '@storybook/postinstall': 7.6.10
+      '@storybook/preview-api': 7.6.10
+      '@storybook/react-dom-shim': 7.6.10(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/theming': 7.6.10(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.6.10
       fs-extra: 11.1.1
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
@@ -6790,25 +6574,25 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/addon-essentials@7.6.5(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-VCLj1JAEpGoqF5iFJOo1CZFFck/tg4m/98DLdQuNuXvxT6jqaF0NI9UUQuJLIGteDCR7NKRbTFc1hV3/Ev+Ziw==}
+  /@storybook/addon-essentials@7.6.10(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-cjbuCCK/3dtUity0Uqi5LwbkgfxqCCE5x5mXZIk9lTMeDz5vB9q6M5nzncVDy8F8przF3NbDLLgxKlt8wjiICg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@storybook/addon-actions': 7.6.5
-      '@storybook/addon-backgrounds': 7.6.5
-      '@storybook/addon-controls': 7.6.5(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/addon-docs': 7.6.5(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/addon-highlight': 7.6.5
-      '@storybook/addon-measure': 7.6.5
-      '@storybook/addon-outline': 7.6.5
-      '@storybook/addon-toolbars': 7.6.5
-      '@storybook/addon-viewport': 7.6.5
-      '@storybook/core-common': 7.6.5
-      '@storybook/manager-api': 7.6.5(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/node-logger': 7.6.5
-      '@storybook/preview-api': 7.6.5
+      '@storybook/addon-actions': 7.6.10
+      '@storybook/addon-backgrounds': 7.6.10
+      '@storybook/addon-controls': 7.6.10(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-docs': 7.6.10(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/addon-highlight': 7.6.10
+      '@storybook/addon-measure': 7.6.10
+      '@storybook/addon-outline': 7.6.10
+      '@storybook/addon-toolbars': 7.6.10
+      '@storybook/addon-viewport': 7.6.10
+      '@storybook/core-common': 7.6.10
+      '@storybook/manager-api': 7.6.10(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/node-logger': 7.6.10
+      '@storybook/preview-api': 7.6.10
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       ts-dedent: 2.2.0
@@ -6819,24 +6603,24 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/addon-highlight@7.6.5:
-    resolution: {integrity: sha512-CxzmIb30F9nLPQwT0lCPYhOAwGlGF4IkgkO8hYA7VfGCGUkJZEyyN/YkP/ZCUSdCIRChDBouR3KiFFd4mDFKzg==}
+  /@storybook/addon-highlight@7.6.10:
+    resolution: {integrity: sha512-dIuS5QmoT1R+gFOcf6CoBa6D9UR5/wHCfPqPRH8dNNcCLtIGSHWQ4v964mS5OCq1Huj7CghmR15lOUk7SaYwUA==}
     dependencies:
       '@storybook/global': 5.0.0
     dev: true
 
-  /@storybook/addon-interactions@7.6.5:
-    resolution: {integrity: sha512-8Hzt9u1DQzFvtGER/hCGIvGpCoVwzVoqpM98f2KAIVx/NMFmRW7UyKihXzw1j2t4q2ZaF2jZDYWCBqlP+iwILA==}
+  /@storybook/addon-interactions@7.6.10:
+    resolution: {integrity: sha512-lEsAdP/PrOZK/KmRbZ/fU4RjEqDP+e/PBlVVVJT2QvHniWK/xxkjCD0axsHU/XuaeQRFhmg0/KR342PC/cIf9A==}
     dependencies:
       '@storybook/global': 5.0.0
-      '@storybook/types': 7.6.5
+      '@storybook/types': 7.6.10
       jest-mock: 27.5.1
       polished: 4.2.2
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/addon-links@7.6.5(react@18.2.0):
-    resolution: {integrity: sha512-Lx4Ng+iXt0YpIrKGr+nOZlpN9ypOoEDoP/7bZ6m7GXuVAkDm3JrRCBp7e2ZKSKcTxPdjPuO9HVKkIjtqjINlpw==}
+  /@storybook/addon-links@7.6.10(react@18.2.0):
+    resolution: {integrity: sha512-s/WkSYHpr2pb9p57j6u/xDBg3TKJhBq55YMl0GB5gXgkRPIeuGbPhGJhm2yTGVFLvXgr/aHHnOxb/R/W8PiRhA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
     peerDependenciesMeta:
@@ -6849,66 +6633,66 @@ packages:
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/addon-measure@7.6.5:
-    resolution: {integrity: sha512-tlUudVQSrA+bwI4dhO8J7nYHtYdylcBZ86ybnqMmdTthsnyc7jnaFVQwbb6bbQJpPxvEvoNds5bVGUFocuvymQ==}
+  /@storybook/addon-measure@7.6.10:
+    resolution: {integrity: sha512-OVfTI56+kc4hLWfZ/YPV3WKj/aA9e4iKXYxZyPdhfX4Z8TgZdD1wv9Z6e8DKS0H5kuybYrHKHaID5ki6t7qz3w==}
     dependencies:
       '@storybook/global': 5.0.0
       tiny-invariant: 1.3.1
     dev: true
 
-  /@storybook/addon-outline@7.6.5:
-    resolution: {integrity: sha512-P7X4+Z9L/l/RZW9UvvM+iuK2SUHD22KPc+dbYOifRXDovUqhfmcKVh1CUqTDMyZrg2ZAbropehMz1eI9BlQfxg==}
+  /@storybook/addon-outline@7.6.10:
+    resolution: {integrity: sha512-RVJrEoPArhI6zAIMNl1Gz0zrj84BTfEWYYz0yDWOTVgvN411ugsoIk1hw0671MOneXJ2RcQ9MFIeV/v6AVDQYg==}
     dependencies:
       '@storybook/global': 5.0.0
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/addon-storysource@7.6.5:
-    resolution: {integrity: sha512-mlGReftuGxfyfLXsnw4GF03G79w3rKKRclNasOVPuAR2vlSTRyltoglZ8TcXfxNQ+RzywtEZkjD7SeJZsuvBbQ==}
+  /@storybook/addon-storysource@7.6.10:
+    resolution: {integrity: sha512-ZtMiO26Bqd2oEovEeJ5ulvIL/rsAuHHpjAgBRZd/Byw25DQKY3GTqGtV474Wjm5tzj7HWhfk69fqAv87HnveCw==}
     dependencies:
-      '@storybook/source-loader': 7.6.5
+      '@storybook/source-loader': 7.6.10
       estraverse: 5.3.0
       tiny-invariant: 1.3.1
     dev: true
 
-  /@storybook/addon-toolbars@7.6.5:
-    resolution: {integrity: sha512-/zqWbVNE/SHc8I5Prnd2Q8U57RGEIYvHfeXjfkuLcE2Quc4Iss4x/9eU7SKu4jm+IOO2s0wlN6HcqI3XEf2XxA==}
+  /@storybook/addon-toolbars@7.6.10:
+    resolution: {integrity: sha512-PaXY/oj9yxF7/H0CNdQKcioincyCkfeHpISZriZbZqhyqsjn3vca7RFEmsB88Q+ou6rMeqyA9st+6e2cx/Ct6A==}
     dev: true
 
-  /@storybook/addon-viewport@7.6.5:
-    resolution: {integrity: sha512-9ghKTaduIUvQ6oShmWLuwMeTjtMR4RgKeKHrTJ7THMqvE/ydDPCYeL7ugF65ocXZSEz/QmxdK7uL686ZMKsqNA==}
+  /@storybook/addon-viewport@7.6.10:
+    resolution: {integrity: sha512-+bA6juC/lH4vEhk+w0rXakaG8JgLG4MOYrIudk5vJKQaC6X58LIM9N4kzIS2KSExRhkExXBPrWsnMfCo7uxmKg==}
     dependencies:
       memoizerific: 1.11.3
     dev: true
 
-  /@storybook/addons@7.6.5(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-v+d8io1MsgTd7rruYInfKXY0c1uXn+ADLxAppUI0PUwPFYwg9tLn3cvwgt5SVum9E5IkVQwXoW6JNkDC5fC8XQ==}
+  /@storybook/addons@7.6.10(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-lv/oT4ZGMKfXh6bB7LbuRP85bwRprBPYuMMl+e1Ikvu5WTfqVoJRYjc7mvXaIHGCI6DZ/nFcbRjra6q8ZhoDgw==}
     dependencies:
-      '@storybook/manager-api': 7.6.5(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/preview-api': 7.6.5
-      '@storybook/types': 7.6.5
+      '@storybook/manager-api': 7.6.10(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.6.10
+      '@storybook/types': 7.6.10
     transitivePeerDependencies:
       - react
       - react-dom
     dev: true
 
-  /@storybook/blocks@7.6.5(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-/NjuYkPks5w9lKn47KLgVC5cBkwfc+ERAp0CY0Xe//BQJkP+bcI8lE8d9Qc9IXFbOTvYEULeQrFgCkesk5BmLg==}
+  /@storybook/blocks@7.6.10(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-oSIukGC3yuF8pojABC/HLu5tv2axZvf60TaUs8eDg7+NiiKhzYSPoMQxs5uMrKngl+EJDB92ESgWT9vvsfvIPg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@storybook/channels': 7.6.5
-      '@storybook/client-logger': 7.6.5
-      '@storybook/components': 7.6.5(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/core-events': 7.6.5
+      '@storybook/channels': 7.6.10
+      '@storybook/client-logger': 7.6.10
+      '@storybook/components': 7.6.10(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/core-events': 7.6.10
       '@storybook/csf': 0.1.2
-      '@storybook/docs-tools': 7.6.5
+      '@storybook/docs-tools': 7.6.10
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.6.5(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/preview-api': 7.6.5
-      '@storybook/theming': 7.6.5(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/types': 7.6.5
+      '@storybook/manager-api': 7.6.10(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.6.10
+      '@storybook/theming': 7.6.10(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.6.10
       '@types/lodash': 4.14.191
       color-convert: 2.0.1
       dequal: 2.0.3
@@ -6930,13 +6714,13 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/builder-manager@7.6.5:
-    resolution: {integrity: sha512-FQyI+tfzMam2XKXq7k921YVafIJs9Vqvos5qx8vyRnRffo55UU8tgunwjGn0PswtbMm6sThVqE0C0ZzVr7RG8A==}
+  /@storybook/builder-manager@7.6.10:
+    resolution: {integrity: sha512-f+YrjZwohGzvfDtH8BHzqM3xW0p4vjjg9u7uzRorqUiNIAAKHpfNrZ/WvwPlPYmrpAHt4xX/nXRJae4rFSygPw==}
     dependencies:
       '@fal-works/esbuild-plugin-global-externals': 2.1.2
-      '@storybook/core-common': 7.6.5
-      '@storybook/manager': 7.6.5
-      '@storybook/node-logger': 7.6.5
+      '@storybook/core-common': 7.6.10
+      '@storybook/manager': 7.6.10
+      '@storybook/node-logger': 7.6.10
       '@types/ejs': 3.1.2
       '@types/find-cache-dir': 3.2.1
       '@yarnpkg/esbuild-plugin-pnp': 3.0.0-rc.15(esbuild@0.18.20)
@@ -6954,8 +6738,8 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/builder-vite@7.6.5(typescript@5.3.3)(vite@5.0.10):
-    resolution: {integrity: sha512-VbAYTGr92lgCWTwO2Z7NgSW3f5/K4Vr0Qxa2IlTgMCymWdDbWdIQiREcmCP0vjAGM2ftq1+vxngohVgx/r7pUw==}
+  /@storybook/builder-vite@7.6.10(typescript@5.3.3)(vite@5.0.12):
+    resolution: {integrity: sha512-qxe19axiNJVdIKj943e1ucAmADwU42fTGgMSdBzzrvfH3pSOmx2057aIxRzd8YtBRnj327eeqpgCHYIDTunMYQ==}
     peerDependencies:
       '@preact/preset-vite': '*'
       typescript: '>= 4.3.x'
@@ -6969,14 +6753,14 @@ packages:
       vite-plugin-glimmerx:
         optional: true
     dependencies:
-      '@storybook/channels': 7.6.5
-      '@storybook/client-logger': 7.6.5
-      '@storybook/core-common': 7.6.5
-      '@storybook/csf-plugin': 7.6.5
-      '@storybook/node-logger': 7.6.5
-      '@storybook/preview': 7.6.5
-      '@storybook/preview-api': 7.6.5
-      '@storybook/types': 7.6.5
+      '@storybook/channels': 7.6.10
+      '@storybook/client-logger': 7.6.10
+      '@storybook/core-common': 7.6.10
+      '@storybook/csf-plugin': 7.6.10
+      '@storybook/node-logger': 7.6.10
+      '@storybook/preview': 7.6.10
+      '@storybook/preview-api': 7.6.10
+      '@storybook/types': 7.6.10
       '@types/find-cache-dir': 3.2.1
       browser-assert: 1.2.1
       es-module-lexer: 0.9.3
@@ -6986,12 +6770,23 @@ packages:
       magic-string: 0.30.5
       rollup: 3.29.4
       typescript: 5.3.3
-      vite: 5.0.10(@types/node@20.10.5)(sass@1.69.5)(terser@5.26.0)
+      vite: 5.0.12(@types/node@20.11.5)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
       - encoding
       - supports-color
     dev: true
 
+  /@storybook/channels@7.6.10:
+    resolution: {integrity: sha512-ITCLhFuDBKgxetuKnWwYqMUWlU7zsfH3gEKZltTb+9/2OAWR7ez0iqU7H6bXP1ridm0DCKkt2UMWj2mmr9iQqg==}
+    dependencies:
+      '@storybook/client-logger': 7.6.10
+      '@storybook/core-events': 7.6.10
+      '@storybook/global': 5.0.0
+      qs: 6.11.1
+      telejson: 7.2.0
+      tiny-invariant: 1.3.1
+    dev: true
+
   /@storybook/channels@7.6.5:
     resolution: {integrity: sha512-FIlNkyfQy9uHoJfAFL2/wO3ASGJELFvBzURBE2rcEF/TS7GcUiqWnBfiDxAbwSEjSOm2F0eEq3UXhaZEjpJHDw==}
     dependencies:
@@ -7003,22 +6798,22 @@ packages:
       tiny-invariant: 1.3.1
     dev: true
 
-  /@storybook/cli@7.6.5:
-    resolution: {integrity: sha512-w+Y8dx5oCLQVESOVmpsQuFksr/ewARKrnSKl9kwnVMN4sMgjOgoZ3zmV66J7SKexvwyuwlOjf840pmEglGdPPg==}
+  /@storybook/cli@7.6.10:
+    resolution: {integrity: sha512-pK1MEseMm73OMO2OVoSz79QWX8ymxgIGM8IeZTCo9gImiVRChMNDFYcv8yPWkjuyesY8c15CoO48aR7pdA1OjQ==}
     hasBin: true
     dependencies:
       '@babel/core': 7.23.5
       '@babel/preset-env': 7.23.5(@babel/core@7.23.5)
       '@babel/types': 7.23.5
       '@ndelangen/get-tarball': 3.0.7
-      '@storybook/codemod': 7.6.5
-      '@storybook/core-common': 7.6.5
-      '@storybook/core-events': 7.6.5
-      '@storybook/core-server': 7.6.5
-      '@storybook/csf-tools': 7.6.5
-      '@storybook/node-logger': 7.6.5
-      '@storybook/telemetry': 7.6.5
-      '@storybook/types': 7.6.5
+      '@storybook/codemod': 7.6.10
+      '@storybook/core-common': 7.6.10
+      '@storybook/core-events': 7.6.10
+      '@storybook/core-server': 7.6.10
+      '@storybook/csf-tools': 7.6.10
+      '@storybook/node-logger': 7.6.10
+      '@storybook/telemetry': 7.6.10
+      '@storybook/types': 7.6.10
       '@types/semver': 7.5.6
       '@yarnpkg/fslib': 2.10.3
       '@yarnpkg/libzip': 2.3.0
@@ -7043,7 +6838,6 @@ packages:
       puppeteer-core: 2.1.1
       read-pkg-up: 7.0.1
       semver: 7.5.4
-      simple-update-notifier: 2.0.0
       strip-json-comments: 3.1.1
       tempy: 1.0.1
       ts-dedent: 2.2.0
@@ -7055,22 +6849,28 @@ packages:
       - utf-8-validate
     dev: true
 
+  /@storybook/client-logger@7.6.10:
+    resolution: {integrity: sha512-U7bbpu21ntgePMz/mKM18qvCSWCUGCUlYru8mgVlXLCKqFqfTeP887+CsPEQf29aoE3cLgDrxqbRJ1wxX9kL9A==}
+    dependencies:
+      '@storybook/global': 5.0.0
+    dev: true
+
   /@storybook/client-logger@7.6.5:
     resolution: {integrity: sha512-S5aROWgssqg7tcs9lgW5wmCAz4SxMAtioiyVj5oFecmPCbQtFVIAREYzeoxE4GfJL+plrfRkum4BzziANn8EhQ==}
     dependencies:
       '@storybook/global': 5.0.0
     dev: true
 
-  /@storybook/codemod@7.6.5:
-    resolution: {integrity: sha512-K5C9ltBClZ0aSyujGt3RJFtRicrUZy8nzhHrcADUj27rrQD26jH/p+Y05jWKj9JcI8SyMg978GN5X/1aw2Y31A==}
+  /@storybook/codemod@7.6.10:
+    resolution: {integrity: sha512-pzFR0nocBb94vN9QCJLC3C3dP734ZigqyPmd0ZCDj9Xce2ytfHK3v1lKB6TZWzKAZT8zztauECYxrbo4LVuagw==}
     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': 7.6.5
-      '@storybook/node-logger': 7.6.5
-      '@storybook/types': 7.6.5
+      '@storybook/csf-tools': 7.6.10
+      '@storybook/node-logger': 7.6.10
+      '@storybook/types': 7.6.10
       '@types/cross-spawn': 6.0.2
       cross-spawn: 7.0.3
       globby: 11.1.0
@@ -7082,6 +6882,29 @@ packages:
       - supports-color
     dev: true
 
+  /@storybook/components@7.6.10(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-H5hF8pxwtbt0LxV24KMMsPlbYG9Oiui3ObvAQkvGu6q62EYxRPeNSrq3GBI5XEbI33OJY9bT24cVaZx18dXqwQ==}
+    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-select': 1.2.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-toolbar': 1.0.4(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/client-logger': 7.6.10
+      '@storybook/csf': 0.1.2
+      '@storybook/global': 5.0.0
+      '@storybook/theming': 7.6.10(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.6.10
+      memoizerific: 1.11.3
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      use-resize-observer: 9.1.0(react-dom@18.2.0)(react@18.2.0)
+      util-deprecate: 1.0.2
+    transitivePeerDependencies:
+      - '@types/react'
+      - '@types/react-dom'
+    dev: true
+
   /@storybook/components@7.6.5(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-w4ZucbBBZ+NKMWlJKVj2I/bMBBq7gzDp9lzc4+8QaQ3vUPXKqc1ilIPYo/7UR5oxwDVMZocmMSgl9L8lvf7+Mw==}
     peerDependencies:
@@ -7105,19 +6928,19 @@ packages:
       - '@types/react-dom'
     dev: true
 
-  /@storybook/core-client@7.6.5:
-    resolution: {integrity: sha512-6FtyJcz8MSl+JYwNJZ53FM6rkT27pFHWcJPdtw/9229Ec8as9RpkNeZ/NBZjRTeDkn9Ki0VOiVAefNie9tZ/8Q==}
+  /@storybook/core-client@7.6.10:
+    resolution: {integrity: sha512-DjnzSzSNDmZyxyg6TxugzWQwOsW+n/iWVv6sHNEvEd5STr0mjuJjIEELmv58LIr5Lsre5+LEddqHsyuLyt8ubg==}
     dependencies:
-      '@storybook/client-logger': 7.6.5
-      '@storybook/preview-api': 7.6.5
+      '@storybook/client-logger': 7.6.10
+      '@storybook/preview-api': 7.6.10
     dev: true
 
-  /@storybook/core-common@7.6.5:
-    resolution: {integrity: sha512-z4EgzZSIVbID6Ib0jhh3jimKeaDWU8OOhoZYfn3galFmgQWowWOv1oMgipWiXfRLWw9DaLFQiCHIdLANH+VO2g==}
+  /@storybook/core-common@7.6.10:
+    resolution: {integrity: sha512-K3YWqjCKMnpvYsWNjOciwTH6zWbuuZzmOiipziZaVJ+sB1XYmH52Y3WGEm07TZI8AYK9DRgwA13dR/7W0nw72Q==}
     dependencies:
-      '@storybook/core-events': 7.6.5
-      '@storybook/node-logger': 7.6.5
-      '@storybook/types': 7.6.5
+      '@storybook/core-events': 7.6.10
+      '@storybook/node-logger': 7.6.10
+      '@storybook/types': 7.6.10
       '@types/find-cache-dir': 3.2.1
       '@types/node': 18.17.15
       '@types/node-fetch': 2.6.4
@@ -7143,30 +6966,36 @@ packages:
       - supports-color
     dev: true
 
+  /@storybook/core-events@7.6.10:
+    resolution: {integrity: sha512-yccDH67KoROrdZbRKwxgTswFMAco5nlCyxszCDASCLygGSV2Q2e+YuywrhchQl3U6joiWi3Ps1qWu56NeNafag==}
+    dependencies:
+      ts-dedent: 2.2.0
+    dev: true
+
   /@storybook/core-events@7.6.5:
     resolution: {integrity: sha512-zk2q/qicYXAzHA4oV3GDbIql+Kd4TOHUgDE8e4jPCOPp856z2ScqEKUAbiJizs6eEJOH4nW9Db1kuzgrBVEykQ==}
     dependencies:
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/core-server@7.6.5:
-    resolution: {integrity: sha512-BfKzK/ObTjUcPvE5/r1pogCifM/4nLRhOUYJl7XekwHkOQwn19e6H3/ku1W3jDoYXBu642Dc9X7l/ERjKTqxFg==}
+  /@storybook/core-server@7.6.10:
+    resolution: {integrity: sha512-2icnqJkn3vwq0eJPP0rNaHd7IOvxYf5q4lSVl2AWTxo/Ae19KhokI6j/2vvS2XQJMGQszwshlIwrZUNsj5p0yw==}
     dependencies:
       '@aw-web-design/x-default-browser': 1.4.126
       '@discoveryjs/json-ext': 0.5.7
-      '@storybook/builder-manager': 7.6.5
-      '@storybook/channels': 7.6.5
-      '@storybook/core-common': 7.6.5
-      '@storybook/core-events': 7.6.5
+      '@storybook/builder-manager': 7.6.10
+      '@storybook/channels': 7.6.10
+      '@storybook/core-common': 7.6.10
+      '@storybook/core-events': 7.6.10
       '@storybook/csf': 0.1.2
-      '@storybook/csf-tools': 7.6.5
+      '@storybook/csf-tools': 7.6.10
       '@storybook/docs-mdx': 0.1.0
       '@storybook/global': 5.0.0
-      '@storybook/manager': 7.6.5
-      '@storybook/node-logger': 7.6.5
-      '@storybook/preview-api': 7.6.5
-      '@storybook/telemetry': 7.6.5
-      '@storybook/types': 7.6.5
+      '@storybook/manager': 7.6.10
+      '@storybook/node-logger': 7.6.10
+      '@storybook/preview-api': 7.6.10
+      '@storybook/telemetry': 7.6.10
+      '@storybook/types': 7.6.10
       '@types/detect-port': 1.3.2
       '@types/node': 18.17.15
       '@types/pretty-hrtime': 1.0.1
@@ -7192,7 +7021,7 @@ packages:
       util: 0.12.5
       util-deprecate: 1.0.2
       watchpack: 2.4.0
-      ws: 8.15.1(bufferutil@4.0.7)(utf-8-validate@6.0.3)
+      ws: 8.16.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
     transitivePeerDependencies:
       - bufferutil
       - encoding
@@ -7200,24 +7029,24 @@ packages:
       - utf-8-validate
     dev: true
 
-  /@storybook/csf-plugin@7.6.5:
-    resolution: {integrity: sha512-iQ8Y/Qq1IUhHRddjDVicWJA2sM7OZA1FR97OvWUT2240WjCuQSCfy32JD8TQlYjqXgEolJeLPv3zW4qH5om4LQ==}
+  /@storybook/csf-plugin@7.6.10:
+    resolution: {integrity: sha512-Sc+zZg/BnPH2X28tthNaQBnDiFfO0QmfjVoOx0fGYM9SvY3P5ehzWwp5hMRBim6a/twOTzePADtqYL+t6GMqqg==}
     dependencies:
-      '@storybook/csf-tools': 7.6.5
+      '@storybook/csf-tools': 7.6.10
       unplugin: 1.4.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@storybook/csf-tools@7.6.5:
-    resolution: {integrity: sha512-1iaCh7nt+WE7Q5UwRhLLc5flMNoAV/vBr0tvDSCKiHaO+D3dZzlZOe/U+S6wegdyN2QNcvT2xs179CcrX6Qp6w==}
+  /@storybook/csf-tools@7.6.10:
+    resolution: {integrity: sha512-TnDNAwIALcN6SA4l00Cb67G02XMOrYU38bIpFJk5VMDX2dvgPjUtJNBuLmEbybGcOt7nPyyFIHzKcY5FCVGoWA==}
     dependencies:
       '@babel/generator': 7.23.5
-      '@babel/parser': 7.23.5
+      '@babel/parser': 7.23.6
       '@babel/traverse': 7.23.5
       '@babel/types': 7.23.5
       '@storybook/csf': 0.1.2
-      '@storybook/types': 7.6.5
+      '@storybook/types': 7.6.10
       fs-extra: 11.1.1
       recast: 0.23.4
       ts-dedent: 2.2.0
@@ -7235,12 +7064,12 @@ packages:
     resolution: {integrity: sha512-JDaBR9lwVY4eSH5W8EGHrhODjygPd6QImRbwjAuJNEnY0Vw4ie3bPkeGfnacB3OBW6u/agqPv2aRlR46JcAQLg==}
     dev: true
 
-  /@storybook/docs-tools@7.6.5:
-    resolution: {integrity: sha512-UyHkHu5Af6jMpYsR4lZ69D32GQGeA0pLAn7jaBbQndgAjBdK1ykZcifiUC7Wz1hG7+YpuYspEGuDEddOh+X8FQ==}
+  /@storybook/docs-tools@7.6.10:
+    resolution: {integrity: sha512-UgbikducoXzqQHf2TozO0f2rshaeBNnShVbL5Ai4oW7pDymBmrfzdjGbF/milO7yxNKcoIByeoNmu384eBamgQ==}
     dependencies:
-      '@storybook/core-common': 7.6.5
-      '@storybook/preview-api': 7.6.5
-      '@storybook/types': 7.6.5
+      '@storybook/core-common': 7.6.10
+      '@storybook/preview-api': 7.6.10
+      '@storybook/types': 7.6.10
       '@types/doctrine': 0.0.3
       assert: 2.1.0
       doctrine: 3.0.0
@@ -7260,11 +7089,11 @@ packages:
     resolution: {integrity: sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==}
     dev: true
 
-  /@storybook/jest@0.2.3(vitest@0.34.6):
+  /@storybook/jest@0.2.3(vitest@1.2.1):
     resolution: {integrity: sha512-ov5izrmbAFObzKeh9AOC5MlmFxAcf0o5i6YFGae9sDx6DGh6alXsRM+chIbucVkUwVHVlSzdfbLDEFGY/ShaYw==}
     dependencies:
       '@storybook/expect': 28.1.3-5
-      '@testing-library/jest-dom': 6.1.2(@types/jest@28.1.3)(vitest@0.34.6)
+      '@testing-library/jest-dom': 6.1.2(@types/jest@28.1.3)(vitest@1.2.1)
       '@types/jest': 28.1.3
       jest-mock: 27.5.1
     transitivePeerDependencies:
@@ -7273,21 +7102,20 @@ packages:
       - vitest
     dev: true
 
-  /@storybook/manager-api@7.6.5(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-tE3OShOcs6A3XtI3NJd6hYQOZLaP++Fn0dCtowBwYh/vS1EN/AyroVmL97tsxn1DZTyoRt0GidwbB6dvLMBOwA==}
+  /@storybook/manager-api@7.6.10(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-8eGVpRlpunuFScDtc7nxpPJf/4kJBAAZlNdlhmX09j8M3voX6GpcxabBamSEX5pXZqhwxQCshD4IbqBmjvadlw==}
     dependencies:
-      '@storybook/channels': 7.6.5
-      '@storybook/client-logger': 7.6.5
-      '@storybook/core-events': 7.6.5
+      '@storybook/channels': 7.6.10
+      '@storybook/client-logger': 7.6.10
+      '@storybook/core-events': 7.6.10
       '@storybook/csf': 0.1.2
       '@storybook/global': 5.0.0
-      '@storybook/router': 7.6.5
-      '@storybook/theming': 7.6.5(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/types': 7.6.5
+      '@storybook/router': 7.6.10
+      '@storybook/theming': 7.6.10(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.6.10
       dequal: 2.0.3
       lodash: 4.17.21
       memoizerific: 1.11.3
-      semver: 7.5.4
       store2: 2.14.2
       telejson: 7.2.0
       ts-dedent: 2.2.0
@@ -7296,31 +7124,31 @@ packages:
       - react-dom
     dev: true
 
-  /@storybook/manager@7.6.5:
-    resolution: {integrity: sha512-y1KLH0O1PGPyMxGMvOhppzFSO7r4ibjTve5iqsI0JZwxUjNuBKRLYbrhXdAyC2iacvxYNrHgevae1k9XdD+FQw==}
+  /@storybook/manager@7.6.10:
+    resolution: {integrity: sha512-Co3sLCbNYY6O4iH2ggmRDLCPWLj03JE5s/DOG8OVoXc6vBwTc/Qgiyrsxxp6BHQnPpM0mxL6aKAxE3UjsW/Nog==}
     dev: true
 
   /@storybook/mdx2-csf@1.0.0:
     resolution: {integrity: sha512-dBAnEL4HfxxJmv7LdEYUoZlQbWj9APZNIbOaq0tgF8XkxiIbzqvgB0jhL/9UOrysSDbQWBiCRTu2wOVxedGfmw==}
     dev: true
 
-  /@storybook/node-logger@7.6.5:
-    resolution: {integrity: sha512-xKw6IH1wLkIssekdBv3bd13xYKUF1t8EwqDR8BYcN8AVjZlqJMTifssqG4bYV+G/B7J3tz4ugJ5nmtWg6RQ0Qw==}
+  /@storybook/node-logger@7.6.10:
+    resolution: {integrity: sha512-ZBuqrv4bjJzKXyfRGFkVIi+z6ekn6rOPoQao4KmsfLNQAUUsEdR8Baw/zMnnU417zw5dSEaZdpuwx75SCQAeOA==}
     dev: true
 
-  /@storybook/postinstall@7.6.5:
-    resolution: {integrity: sha512-12WxfpqGKsk7GQ3KWiZSbamsYK8vtRmhOTkavZ9IQkcJ/zuVfmqK80/Mds+njJMudUPzuREuSFGWACczo17EDA==}
+  /@storybook/postinstall@7.6.10:
+    resolution: {integrity: sha512-SMdXtednPCy3+SRJ7oN1OPN1oVFhj3ih+ChOEX8/kZ5J3nfmV3wLPtsZvFGUCf0KWQEP1xL+1Urv48mzMKcV/w==}
     dev: true
 
-  /@storybook/preview-api@7.6.5:
-    resolution: {integrity: sha512-9XzuDXXgNuA6dDZ3DXsUwEG6ElxeTbzLuYuzcjtS1FusSICZ2iYmxfS0GfSud9MjPPYOJYoSOvMdIHjorjgByA==}
+  /@storybook/preview-api@7.6.10:
+    resolution: {integrity: sha512-5A3etoIwZCx05yuv3KSTv1wynN4SR4rrzaIs/CTBp3BC4q1RBL+Or/tClk0IJPXQMlx/4Y134GtNIBbkiDofpw==}
     dependencies:
-      '@storybook/channels': 7.6.5
-      '@storybook/client-logger': 7.6.5
-      '@storybook/core-events': 7.6.5
+      '@storybook/channels': 7.6.10
+      '@storybook/client-logger': 7.6.10
+      '@storybook/core-events': 7.6.10
       '@storybook/csf': 0.1.2
       '@storybook/global': 5.0.0
-      '@storybook/types': 7.6.5
+      '@storybook/types': 7.6.10
       '@types/qs': 6.9.7
       dequal: 2.0.3
       lodash: 4.17.21
@@ -7331,12 +7159,12 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/preview@7.6.5:
-    resolution: {integrity: sha512-zmLa7C7yFGTYhgGZXoecdww9rx0Z5HpNi/GDBRWoNSK+FEdE8Jj2jF5NJ2ncldtYIyegz9ku29JFMKbhMj9K5Q==}
+  /@storybook/preview@7.6.10:
+    resolution: {integrity: sha512-F07BzVXTD3byq+KTWtvsw3pUu3fQbyiBNLFr2CnfU4XSdLKja5lDt8VqDQq70TayVQOf5qfUTzRd4M6pQkjw1w==}
     dev: true
 
-  /@storybook/react-dom-shim@7.6.5(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-Qp3N3zENdvx20ikHmz5yI03z+mAWF8bUAwUofqXarVtZUkBNtvfTfUwgAezOAF0eClClH+ktIziIKd976tLSPw==}
+  /@storybook/react-dom-shim@7.6.10(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-M+N/h6ximacaFdIDjMN2waNoWwApeVYTpFeoDppiFTvdBTXChyIuiPgYX9QSg7gDz92OaA52myGOot4wGvXVzg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -7345,24 +7173,24 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: true
 
-  /@storybook/react-vite@7.6.5(react-dom@18.2.0)(react@18.2.0)(rollup@4.9.1)(typescript@5.3.3)(vite@5.0.10):
-    resolution: {integrity: sha512-fIoSBbou3rQdOo6qX/nD5givb3qIOSwXeZWjAqRB6560cqmeSQFlRGtKUJ0nzQYADwJ0/iNHz3nOvJOOSnPepA==}
+  /@storybook/react-vite@7.6.10(react-dom@18.2.0)(react@18.2.0)(rollup@4.9.6)(typescript@5.3.3)(vite@5.0.12):
+    resolution: {integrity: sha512-YE2+J1wy8nO+c6Nv/hBMu91Edew3K184L1KSnfoZV8vtq2074k1Me/8pfe0QNuq631AncpfCYNb37yBAXQ/80w==}
     engines: {node: '>=16'}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
       vite: ^3.0.0 || ^4.0.0 || ^5.0.0
     dependencies:
-      '@joshwooding/vite-plugin-react-docgen-typescript': 0.3.0(typescript@5.3.3)(vite@5.0.10)
-      '@rollup/pluginutils': 5.1.0(rollup@4.9.1)
-      '@storybook/builder-vite': 7.6.5(typescript@5.3.3)(vite@5.0.10)
-      '@storybook/react': 7.6.5(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3)
-      '@vitejs/plugin-react': 3.1.0(vite@5.0.10)
+      '@joshwooding/vite-plugin-react-docgen-typescript': 0.3.0(typescript@5.3.3)(vite@5.0.12)
+      '@rollup/pluginutils': 5.1.0(rollup@4.9.6)
+      '@storybook/builder-vite': 7.6.10(typescript@5.3.3)(vite@5.0.12)
+      '@storybook/react': 7.6.10(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3)
+      '@vitejs/plugin-react': 3.1.0(vite@5.0.12)
       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.0.10(@types/node@20.10.5)(sass@1.69.5)(terser@5.26.0)
+      vite: 5.0.12(@types/node@20.11.5)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
       - '@preact/preset-vite'
       - encoding
@@ -7372,8 +7200,8 @@ packages:
       - vite-plugin-glimmerx
     dev: true
 
-  /@storybook/react@7.6.5(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-z0l5T+gL//VekMXnHi+lW5qr7OQ8X7WoeIRMk38e62ppSpGUZRfoxRmmhU/9YcIFAlCgMaoLSYmhOceKGRZuVw==}
+  /@storybook/react@7.6.10(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3):
+    resolution: {integrity: sha512-wwBn1cg2uZWW4peqqBjjU7XGmFq8HdkVUtWwh6dpfgmlY1Aopi+vPgZt7pY9KkWcTOq5+DerMdSfwxukpc3ajQ==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -7383,13 +7211,13 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.6.5
-      '@storybook/core-client': 7.6.5
-      '@storybook/docs-tools': 7.6.5
+      '@storybook/client-logger': 7.6.10
+      '@storybook/core-client': 7.6.10
+      '@storybook/docs-tools': 7.6.10
       '@storybook/global': 5.0.0
-      '@storybook/preview-api': 7.6.5
-      '@storybook/react-dom-shim': 7.6.5(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/types': 7.6.5
+      '@storybook/preview-api': 7.6.10
+      '@storybook/react-dom-shim': 7.6.10(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.6.10
       '@types/escodegen': 0.0.6
       '@types/estree': 0.0.51
       '@types/node': 18.17.15
@@ -7412,30 +7240,30 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/router@7.6.5:
-    resolution: {integrity: sha512-QiTC86gRuoepzzmS6HNJZTwfz/n27NcqtaVEIxJi1Yvsx2/kLa9NkRhylNkfTuZ1gEry9stAlKWanMsB2aKyjQ==}
+  /@storybook/router@7.6.10:
+    resolution: {integrity: sha512-G/H4Jn2+y8PDe8Zbq4DVxF/TPn0/goSItdILts39JENucHiuGBCjKjSWGBe1rkwKi1tUbB3yhxJVrLagxFEPpQ==}
     dependencies:
-      '@storybook/client-logger': 7.6.5
+      '@storybook/client-logger': 7.6.10
       memoizerific: 1.11.3
       qs: 6.11.1
     dev: true
 
-  /@storybook/source-loader@7.6.5:
-    resolution: {integrity: sha512-3GpXJY9GUOOl3Uq/xcsJ12XWLBNZJwUWzwkBm4Eev1xl5eg/ygeyJflwM5egsA1NfkV77hNxtjQcbfw4cBtqdg==}
+  /@storybook/source-loader@7.6.10:
+    resolution: {integrity: sha512-S3nOWyj+sdpsqJqKGIN3DKE1q+Q0KYxEyPlPCawMFazozUH7tOodTIqmHBqJZCSNqdC4M1S/qcL8vpP4PfXhuA==}
     dependencies:
       '@storybook/csf': 0.1.2
-      '@storybook/types': 7.6.5
+      '@storybook/types': 7.6.10
       estraverse: 5.3.0
       lodash: 4.17.21
       prettier: 2.8.8
     dev: true
 
-  /@storybook/telemetry@7.6.5:
-    resolution: {integrity: sha512-FiLRh9k9LoGphqgBqPYySWdGqplihiZyDwqdo+Qs19RcQ/eiKg0W7fdA09nStcdcsHmDl/1cMfRhz9KUiMtwOw==}
+  /@storybook/telemetry@7.6.10:
+    resolution: {integrity: sha512-p3mOSUtIyy2tF1z6pQXxNh1JzYFcAm97nUgkwLzF07GfEdVAPM+ftRSLFbD93zVvLEkmLTlsTiiKaDvOY/lQWg==}
     dependencies:
-      '@storybook/client-logger': 7.6.5
-      '@storybook/core-common': 7.6.5
-      '@storybook/csf-tools': 7.6.5
+      '@storybook/client-logger': 7.6.10
+      '@storybook/core-common': 7.6.10
+      '@storybook/csf-tools': 7.6.10
       chalk: 4.1.2
       detect-package-manager: 2.0.1
       fetch-retry: 5.0.4
@@ -7454,6 +7282,20 @@ packages:
       ts-dedent: 2.2.0
     dev: true
 
+  /@storybook/theming@7.6.10(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-f5tuy7yV3TOP3fIboSqpgLHy0wKayAw/M8HxX0jVET4Z4fWlFK0BiHJabQ+XEdAfQM97XhPFHB2IPbwsqhCEcQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    dependencies:
+      '@emotion/use-insertion-effect-with-fallbacks': 1.0.0(react@18.2.0)
+      '@storybook/client-logger': 7.6.10
+      '@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/theming@7.6.5(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-RpcWT0YEgiobO41McVPDfQQHHFnjyr1sJnNTPJIvOUgSfURdgSj17mQVxtD5xcXcPWUdle5UhIOrCixHbL/NNw==}
     peerDependencies:
@@ -7468,6 +7310,15 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: true
 
+  /@storybook/types@7.6.10:
+    resolution: {integrity: sha512-hcS2HloJblaMpCAj2axgGV+53kgSRYPT0a1PG1IHsZaYQILfHSMmBqM8XzXXYTsgf9250kz3dqFX1l0n3EqMlQ==}
+    dependencies:
+      '@storybook/channels': 7.6.10
+      '@types/babel__core': 7.20.0
+      '@types/express': 4.17.17
+      file-system-cache: 2.3.0
+    dev: true
+
   /@storybook/types@7.6.5:
     resolution: {integrity: sha512-Q757v+fYZZSaEpks/zDL5YgXRozxkgKakXFc+BoQHK5q5sVhJ+0jvpLJiAQAniIIaMIkqY/G24Kd6Uo6UdKBCg==}
     dependencies:
@@ -7477,22 +7328,21 @@ packages:
       file-system-cache: 2.3.0
     dev: true
 
-  /@storybook/vue3-vite@7.6.5(@vue/compiler-core@3.4.3)(typescript@5.3.3)(vite@5.0.10)(vue@3.4.3):
-    resolution: {integrity: sha512-7wUCq2Lrjlekftd5ha3hG0GSGbbzuc370cKkBqSmwFuOfI38z5+VeYt7nDtAlncxcpVSH7DejTGRuKTlC7NyYg==}
+  /@storybook/vue3-vite@7.6.10(typescript@5.3.3)(vite@5.0.12)(vue@3.4.15):
+    resolution: {integrity: sha512-5f0Rh4PTVEeAI86ybihfN+rHGXXLNiRsoGKinpJSb7hkfsq/L7u3sVCXJwH/qsG+rUJlZyHs3kfa4/Kgyyi3Mg==}
     engines: {node: ^14.18 || >=16}
     peerDependencies:
       vite: ^3.0.0 || ^4.0.0 || ^5.0.0
     dependencies:
-      '@storybook/builder-vite': 7.6.5(typescript@5.3.3)(vite@5.0.10)
-      '@storybook/core-server': 7.6.5
-      '@storybook/vue3': 7.6.5(@vue/compiler-core@3.4.3)(vue@3.4.3)
-      '@vitejs/plugin-vue': 4.5.2(vite@5.0.10)(vue@3.4.3)
+      '@storybook/builder-vite': 7.6.10(typescript@5.3.3)(vite@5.0.12)
+      '@storybook/core-server': 7.6.10
+      '@storybook/vue3': 7.6.10(vue@3.4.15)
+      '@vitejs/plugin-vue': 4.5.2(vite@5.0.12)(vue@3.4.15)
       magic-string: 0.30.5
-      vite: 5.0.10(@types/node@20.10.5)(sass@1.69.5)(terser@5.26.0)
-      vue-docgen-api: 4.64.1(vue@3.4.3)
+      vite: 5.0.12(@types/node@20.11.5)(sass@1.70.0)(terser@5.27.0)
+      vue-docgen-api: 4.64.1(vue@3.4.15)
     transitivePeerDependencies:
       - '@preact/preset-vite'
-      - '@vue/compiler-core'
       - bufferutil
       - encoding
       - supports-color
@@ -7502,30 +7352,29 @@ packages:
       - vue
     dev: true
 
-  /@storybook/vue3@7.6.5(@vue/compiler-core@3.4.3)(vue@3.4.3):
-    resolution: {integrity: sha512-tv/9rVc3XXDOJu5hfZtKhrhM8x4GTLKon62Rmaxlq06weqkGlfBi/V/g1EZ7OE71Pi+woKS/TX7p9qbRrvgahg==}
+  /@storybook/vue3@7.6.10(vue@3.4.15):
+    resolution: {integrity: sha512-FeZ9zjuudQgCdKPs2K8sU6TgEyrMjKrCN3e8+XXX5CAMSwLDV8IfexaaMF0ehYW6Wp0dgCIm0cVNBV3u8vtRRw==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
-      '@vue/compiler-core': ^3.0.0
       vue: ^3.0.0
     dependencies:
-      '@storybook/core-client': 7.6.5
-      '@storybook/docs-tools': 7.6.5
+      '@storybook/core-client': 7.6.10
+      '@storybook/docs-tools': 7.6.10
       '@storybook/global': 5.0.0
-      '@storybook/preview-api': 7.6.5
-      '@storybook/types': 7.6.5
+      '@storybook/preview-api': 7.6.10
+      '@storybook/types': 7.6.10
       '@vue/compiler-core': 3.4.3
       lodash: 4.17.21
       ts-dedent: 2.2.0
       type-fest: 2.19.0
-      vue: 3.4.3(typescript@5.3.3)
+      vue: 3.4.15(typescript@5.3.3)
       vue-component-type-helpers: 1.8.27
     transitivePeerDependencies:
       - encoding
       - supports-color
     dev: true
 
-  /@swc/cli@0.1.63(@swc/core@1.3.100)(chokidar@3.5.3):
+  /@swc/cli@0.1.63(@swc/core@1.3.105)(chokidar@3.5.3):
     resolution: {integrity: sha512-EM9oxxHzmmsprYRbGqsS2M4M/Gr5Gkcl0ROYYIdlUyTkhOiX822EQiRCpPCwdutdnzH2GyaTN7wc6i0Y+CKd3A==}
     engines: {node: '>= 12.13'}
     hasBin: true
@@ -7537,7 +7386,7 @@ packages:
         optional: true
     dependencies:
       '@mole-inc/bin-wrapper': 8.0.1
-      '@swc/core': 1.3.100
+      '@swc/core': 1.3.105
       chokidar: 3.5.3
       commander: 7.2.0
       fast-glob: 3.3.2
@@ -7557,8 +7406,8 @@ packages:
     dev: false
     optional: true
 
-  /@swc/core-darwin-arm64@1.3.100:
-    resolution: {integrity: sha512-XVWFsKe6ei+SsDbwmsuRkYck1SXRpO60Hioa4hoLwR8fxbA9eVp6enZtMxzVVMBi8ej5seZ4HZQeAWepbukiBw==}
+  /@swc/core-darwin-arm64@1.3.105:
+    resolution: {integrity: sha512-buWeweLVDXXmcnfIemH4PGnpjwsDTUGitnPchdftb0u1FU8zSSP/lw/pUCBDG/XvWAp7c/aFxgN4CyG0j7eayA==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [darwin]
@@ -7574,8 +7423,8 @@ packages:
     dev: false
     optional: true
 
-  /@swc/core-darwin-x64@1.3.100:
-    resolution: {integrity: sha512-KF/MXrnH1nakm1wbt4XV8FS7kvqD9TGmVxeJ0U4bbvxXMvzeYUurzg3AJUTXYmXDhH/VXOYJE5N5RkwZZPs5iA==}
+  /@swc/core-darwin-x64@1.3.105:
+    resolution: {integrity: sha512-hFmXPApqjA/8sy/9NpljHVaKi1OvL9QkJ2MbbTCCbJERuHMpMUeMBUWipHRfepGHFhU+9B9zkEup/qJaJR4XIg==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [darwin]
@@ -7602,6 +7451,14 @@ packages:
     dev: false
     optional: true
 
+  /@swc/core-linux-arm-gnueabihf@1.3.105:
+    resolution: {integrity: sha512-mwXyMC41oMKkKrPpL8uJpOxw7fyfQoVtIw3Y5p0Blabk+espNYqix0E8VymHdRKuLmM//z5wVmMsuHdGBHvZeg==}
+    engines: {node: '>=10'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
   /@swc/core-linux-arm-gnueabihf@1.3.56:
     resolution: {integrity: sha512-LWwPo6NnJkH01+ukqvkoNIOpMdw+Zundm4vBeicwyVrkP+mC3kwVfi03TUFpQUz3kRKdw/QEnxGTj+MouCPbtw==}
     engines: {node: '>=10'}
@@ -7611,8 +7468,8 @@ packages:
     dev: false
     optional: true
 
-  /@swc/core-linux-arm64-gnu@1.3.100:
-    resolution: {integrity: sha512-p8hikNnAEJrw5vHCtKiFT4hdlQxk1V7vqPmvUDgL/qe2menQDK/i12tbz7/3BEQ4UqUPnvwpmVn2d19RdEMNxw==}
+  /@swc/core-linux-arm64-gnu@1.3.105:
+    resolution: {integrity: sha512-H7yEIVydnUtqBSUxwmO6vpIQn7j+Rr0DF6ZOORPyd/SFzQJK9cJRtmJQ3ZMzlJ1Bb+1gr3MvjgLEnmyCYEm2Hg==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
@@ -7628,8 +7485,8 @@ packages:
     dev: false
     optional: true
 
-  /@swc/core-linux-arm64-musl@1.3.100:
-    resolution: {integrity: sha512-BWx/0EeY89WC4q3AaIaBSGfQxkYxIlS3mX19dwy2FWJs/O+fMvF9oLk/CyJPOZzbp+1DjGeeoGFuDYpiNO91JA==}
+  /@swc/core-linux-arm64-musl@1.3.105:
+    resolution: {integrity: sha512-Jg7RTFT3pGFdGt5elPV6oDkinRy7q9cXpenjXnJnM2uvx3jOwnsAhexPyCDHom8SHL0j+9kaLLC66T3Gz1E4UA==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
@@ -7645,8 +7502,8 @@ packages:
     dev: false
     optional: true
 
-  /@swc/core-linux-x64-gnu@1.3.100:
-    resolution: {integrity: sha512-XUdGu3dxAkjsahLYnm8WijPfKebo+jHgHphDxaW0ovI6sTdmEGFDew7QzKZRlbYL2jRkUuuKuDGvD6lO5frmhA==}
+  /@swc/core-linux-x64-gnu@1.3.105:
+    resolution: {integrity: sha512-DJghplpyusAmp1X5pW/y93MmS/u83Sx5GrpJxI6KLPa82+NItTgMcl8KBQmW5GYAJpVKZyaIvBanS5TdR8aN2w==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
@@ -7662,8 +7519,8 @@ packages:
     dev: false
     optional: true
 
-  /@swc/core-linux-x64-musl@1.3.100:
-    resolution: {integrity: sha512-PhoXKf+f0OaNW/GCuXjJ0/KfK9EJX7z2gko+7nVnEA0p3aaPtbP6cq1Ubbl6CMoPL+Ci3gZ7nYumDqXNc3CtLQ==}
+  /@swc/core-linux-x64-musl@1.3.105:
+    resolution: {integrity: sha512-wD5jL2dZH/5nPNssBo6jhOvkI0lmWnVR4vnOXWjuXgjq1S0AJpO5jdre/6pYLmf26hft3M42bteDnjR4AAZ38w==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
@@ -7679,8 +7536,8 @@ packages:
     dev: false
     optional: true
 
-  /@swc/core-win32-arm64-msvc@1.3.100:
-    resolution: {integrity: sha512-PwLADZN6F9cXn4Jw52FeP/MCLVHm8vwouZZSOoOScDtihjY495SSjdPnlosMaRSR4wJQssGwiD/4MbpgQPqbAw==}
+  /@swc/core-win32-arm64-msvc@1.3.105:
+    resolution: {integrity: sha512-UqJtwILUHRw2+3UTPnRkZrzM/bGdQtbR4UFdp79mZQYfryeOUVNg7aJj/bWUTkKtLiZ3o+FBNrM/x2X1mJX5bA==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [win32]
@@ -7696,8 +7553,8 @@ packages:
     dev: false
     optional: true
 
-  /@swc/core-win32-ia32-msvc@1.3.100:
-    resolution: {integrity: sha512-0f6nicKSLlDKlyPRl2JEmkpBV4aeDfRQg6n8mPqgL7bliZIcDahG0ej+HxgNjZfS3e0yjDxsNRa6sAqWU2Z60A==}
+  /@swc/core-win32-ia32-msvc@1.3.105:
+    resolution: {integrity: sha512-Z95C6vZgBEJ1snidYyjVKnVWiy/ZpPiIFIXGWkDr4ZyBgL3eZX12M6LzZ+NApHKffrbO4enbFyFomueBQgS2oA==}
     engines: {node: '>=10'}
     cpu: [ia32]
     os: [win32]
@@ -7713,8 +7570,8 @@ packages:
     dev: false
     optional: true
 
-  /@swc/core-win32-x64-msvc@1.3.100:
-    resolution: {integrity: sha512-b7J0rPoMkRTa3XyUGt8PwCaIBuYWsL2DqbirrQKRESzgCvif5iNpqaM6kjIjI/5y5q1Ycv564CB51YDpiS8EtQ==}
+  /@swc/core-win32-x64-msvc@1.3.105:
+    resolution: {integrity: sha512-3J8fkyDPFsS3mszuYUY4Wfk7/B2oio9qXUwF3DzOs2MK+XgdyMLIptIxL7gdfitXJBH8k39uVjrIw1JGJDjyFA==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [win32]
@@ -7730,8 +7587,8 @@ packages:
     dev: false
     optional: true
 
-  /@swc/core@1.3.100:
-    resolution: {integrity: sha512-7dKgTyxJjlrMwFZYb1auj3Xq0D8ZBe+5oeIgfMlRU05doXZypYJe0LAk0yjj3WdbwYzpF+T1PLxwTWizI0pckw==}
+  /@swc/core@1.3.105:
+    resolution: {integrity: sha512-me2VZyr3OjqRpFrYQJJYy7x/zbFSl9nt+MAGnIcBtjDsN00iTVqEaKxBjPBFQV9BDAgPz2SRWes/DhhVm5SmMw==}
     engines: {node: '>=10'}
     requiresBuild: true
     peerDependencies:
@@ -7743,27 +7600,28 @@ packages:
       '@swc/counter': 0.1.1
       '@swc/types': 0.1.5
     optionalDependencies:
-      '@swc/core-darwin-arm64': 1.3.100
-      '@swc/core-darwin-x64': 1.3.100
-      '@swc/core-linux-arm64-gnu': 1.3.100
-      '@swc/core-linux-arm64-musl': 1.3.100
-      '@swc/core-linux-x64-gnu': 1.3.100
-      '@swc/core-linux-x64-musl': 1.3.100
-      '@swc/core-win32-arm64-msvc': 1.3.100
-      '@swc/core-win32-ia32-msvc': 1.3.100
-      '@swc/core-win32-x64-msvc': 1.3.100
+      '@swc/core-darwin-arm64': 1.3.105
+      '@swc/core-darwin-x64': 1.3.105
+      '@swc/core-linux-arm-gnueabihf': 1.3.105
+      '@swc/core-linux-arm64-gnu': 1.3.105
+      '@swc/core-linux-arm64-musl': 1.3.105
+      '@swc/core-linux-x64-gnu': 1.3.105
+      '@swc/core-linux-x64-musl': 1.3.105
+      '@swc/core-win32-arm64-msvc': 1.3.105
+      '@swc/core-win32-ia32-msvc': 1.3.105
+      '@swc/core-win32-x64-msvc': 1.3.105
 
   /@swc/counter@0.1.1:
     resolution: {integrity: sha512-xVRaR4u9hcYjFvcSg71Lz5Bo4//CyjAAfMxa7UsaDSYxAshflUkVJWiyVWrfxC59z2kP1IzI4/1BEpnhI9o3Mw==}
 
-  /@swc/jest@0.2.29(@swc/core@1.3.100):
-    resolution: {integrity: sha512-8reh5RvHBsSikDC3WGCd5ZTd2BXKkyOdK7QwynrCH58jk2cQFhhHhFBg/jvnWZehUQe/EoOImLENc9/DwbBFow==}
+  /@swc/jest@0.2.31(@swc/core@1.3.105):
+    resolution: {integrity: sha512-Gh0Ste380O8KUY1IqsKr+aOvqqs2Loa+WcWWVNwl+lhXqOWK1iTFAP1K0IDfLqAuFP68+D/PxcpBJn21e6Quvw==}
     engines: {npm: '>= 7.0.0'}
     peerDependencies:
       '@swc/core': '*'
     dependencies:
-      '@jest/create-cache-key-function': 27.5.1
-      '@swc/core': 1.3.100
+      '@jest/create-cache-key-function': 29.7.0
+      '@swc/core': 1.3.105
       jsonc-parser: 3.2.0
     dev: true
 
@@ -7954,7 +7812,7 @@ packages:
       pretty-format: 27.5.1
     dev: true
 
-  /@testing-library/jest-dom@6.1.2(@types/jest@28.1.3)(vitest@0.34.6):
+  /@testing-library/jest-dom@6.1.2(@types/jest@28.1.3)(vitest@1.2.1):
     resolution: {integrity: sha512-NP9jl1Q2qDDtx+cqogowtQtmgD2OVs37iMSIsTv5eN5ETRkf26Kj6ugVwA93/gZzzFWQAsgkKkcftDe91BJCkQ==}
     engines: {node: '>=14', npm: '>=6', yarn: '>=1'}
     peerDependencies:
@@ -7981,7 +7839,7 @@ packages:
       dom-accessibility-api: 0.5.16
       lodash: 4.17.21
       redent: 3.0.0
-      vitest: 0.34.6(happy-dom@10.0.3)(sass@1.69.5)(terser@5.26.0)
+      vitest: 1.2.1(@types/node@20.11.5)(happy-dom@10.0.3)(sass@1.70.0)(terser@5.27.0)
     dev: true
 
   /@testing-library/user-event@14.4.3(@testing-library/dom@9.2.0):
@@ -7993,7 +7851,7 @@ packages:
       '@testing-library/dom': 9.2.0
     dev: true
 
-  /@testing-library/vue@8.0.1(@vue/compiler-sfc@3.4.3)(vue@3.4.3):
+  /@testing-library/vue@8.0.1(@vue/compiler-sfc@3.4.3)(vue@3.4.15):
     resolution: {integrity: sha512-l51ZEpjTQ6glq3wM+asQ1GbKJMGcxwgHEygETx0aCRN4TjFEGvMZy4YdWKs/y7bu4bmLrxcxhbEPP7iPSW/2OQ==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -8003,8 +7861,8 @@ packages:
       '@babel/runtime': 7.23.2
       '@testing-library/dom': 9.3.3
       '@vue/compiler-sfc': 3.4.3
-      '@vue/test-utils': 2.4.1(vue@3.4.3)
-      vue: 3.4.3(typescript@5.3.3)
+      '@vue/test-utils': 2.4.1(vue@3.4.15)
+      vue: 3.4.15(typescript@5.3.3)
     transitivePeerDependencies:
       - '@vue/server-renderer'
     dev: true
@@ -8030,7 +7888,7 @@ packages:
   /@types/accepts@1.3.7:
     resolution: {integrity: sha512-Pay9fq2lM2wXPWbteBsRAGiWH2hig4ZE2asK+mm7kUzlxRTfL961rj89I6zV/E3PcIkDqyuBEcMxFT7rccugeQ==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /@types/archiver@6.0.2:
@@ -8050,7 +7908,7 @@ packages:
   /@types/babel__core@7.20.0:
     resolution: {integrity: sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==}
     dependencies:
-      '@babel/parser': 7.23.5
+      '@babel/parser': 7.23.6
       '@babel/types': 7.23.5
       '@types/babel__generator': 7.6.4
       '@types/babel__template': 7.4.1
@@ -8066,7 +7924,7 @@ packages:
   /@types/babel__template@7.4.1:
     resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
     dependencies:
-      '@babel/parser': 7.23.5
+      '@babel/parser': 7.23.6
       '@babel/types': 7.23.5
     dev: true
 
@@ -8084,7 +7942,7 @@ packages:
     resolution: {integrity: sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==}
     dependencies:
       '@types/connect': 3.4.35
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /@types/braces@3.0.1:
@@ -8106,16 +7964,6 @@ packages:
       cbor: 9.0.1
     dev: true
 
-  /@types/chai-subset@1.3.3:
-    resolution: {integrity: sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==}
-    dependencies:
-      '@types/chai': 4.3.5
-    dev: true
-
-  /@types/chai@4.3.5:
-    resolution: {integrity: sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==}
-    dev: true
-
   /@types/color-convert@2.0.3:
     resolution: {integrity: sha512-2Q6wzrNiuEvYxVQqhh7sXM2mhIhvZR/Paq4FdsQkOMgWsCIkKvSGj8Le1/XalulrmgOzPMqNa0ix+ePY4hTrfg==}
     dependencies:
@@ -8136,8 +7984,8 @@ packages:
     resolution: {integrity: sha512-QVSSvno3dE0MgO76pJhmv4Qyi/j0Yk9pBp0Y7TJ2Tlj+KCgJWY6qX7nnxCOLkZ3VYRSIk1WTxCvwUSdx6CCLdg==}
     dev: true
 
-  /@types/cookie@0.4.1:
-    resolution: {integrity: sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==}
+  /@types/cookie@0.6.0:
+    resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==}
     dev: true
 
   /@types/cross-spawn@6.0.2:
@@ -8146,12 +7994,6 @@ packages:
       '@types/node': 20.11.5
     dev: true
 
-  /@types/debug@4.1.7:
-    resolution: {integrity: sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==}
-    dependencies:
-      '@types/ms': 0.7.34
-    dev: true
-
   /@types/detect-port@1.3.2:
     resolution: {integrity: sha512-xxgAGA2SAU4111QefXPSp5eGbDm/hW6zhvYl9IeEPZEry9F4d66QAHm5qpUXjb6IsevZV/7emAEx5MhP6O192g==}
     dev: true
@@ -8222,7 +8064,7 @@ packages:
   /@types/fluent-ffmpeg@2.1.24:
     resolution: {integrity: sha512-g5oQO8Jgi2kFS3tTub7wLvfLztr1s8tdXmRd8PiL/hLMLzTIAyMR2sANkTggM/rdEDAg3d63nYRRVepwBiCw5A==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /@types/glob@7.2.0:
@@ -8248,7 +8090,7 @@ packages:
   /@types/http-link-header@1.0.5:
     resolution: {integrity: sha512-AxhIKR8UbyoqCTNp9rRepkktHuUOw3DjfOfDCaO9kwI8AYzjhxyrvZq4+mRw/2daD3hYDknrtSeV6SsPwmc71w==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /@types/istanbul-lib-coverage@2.0.4:
@@ -8281,8 +8123,8 @@ packages:
       pretty-format: 29.7.0
     dev: true
 
-  /@types/js-levenshtein@1.1.1:
-    resolution: {integrity: sha512-qC4bCqYGy1y/NP7dDVr7KJarn+PbX1nSpwA7JXdu0HxT3QYjO8MJ+cntENtHFVy2dRAyBV23OZ6MxsW1AM1L8g==}
+  /@types/js-levenshtein@1.1.3:
+    resolution: {integrity: sha512-jd+Q+sD20Qfu9e2aEXogiO3vpOC1PYJOUdyN9gvs4Qrvkg4wF43L5OhqrPeokdv8TL0/mXoYfpkcoGZMNN2pkQ==}
     dev: true
 
   /@types/js-yaml@4.0.9:
@@ -8292,7 +8134,7 @@ packages:
   /@types/jsdom@21.1.6:
     resolution: {integrity: sha512-/7kkMsC+/kMs7gAYmmBR9P0vGTnOoLhQhyhQJSlXGI5bzTHp6xdo0TtKWQAsz6pmSAeVqKSbqeyP6hytqr9FDw==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       '@types/tough-cookie': 4.0.2
       parse5: 7.1.2
     dev: true
@@ -8328,10 +8170,6 @@ packages:
     requiresBuild: true
     dev: false
 
-  /@types/matter-js@0.19.5:
-    resolution: {integrity: sha512-pTVB5krRGb01hr8L6BJqWGoSriqUbbvJ9Fd0Qp0eAOE//w/lFvkaVHkVB8J3wXr9U3lZDzmAjJPPQn7x4wzbWg==}
-    dev: true
-
   /@types/matter-js@0.19.6:
     resolution: {integrity: sha512-ffk6tqJM5scla+ThXmnox+mdfCo3qYk6yMjQsNcrbo6eQ5DqorVdtnaL+1agCoYzxUjmHeiNB7poBMAmhuLY7w==}
     dev: true
@@ -8382,11 +8220,6 @@ packages:
     resolution: {integrity: sha512-2yrWpBk32tvV/JAd3HNHWuZn/VDN1P+72hWirHnvsvTGSqbANi+kSeuQR9yAHnbvaBvHDsoTdXV0Fe+iRtHLKA==}
     dev: true
 
-  /@types/node@20.10.5:
-    resolution: {integrity: sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==}
-    dependencies:
-      undici-types: 5.26.5
-
   /@types/node@20.11.5:
     resolution: {integrity: sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==}
     dependencies:
@@ -8401,7 +8234,7 @@ packages:
   /@types/nodemailer@6.4.14:
     resolution: {integrity: sha512-fUWthHO9k9DSdPCSPRqcu6TWhYyxTBg382vlNIttSe9M7XfsT06y0f24KHXtbnijPGGRIcVvdKHTNikOI6qiHA==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /@types/normalize-package-data@2.4.1:
@@ -8418,13 +8251,13 @@ packages:
     resolution: {integrity: sha512-Ali0fUUn+zgr4Yy/pCTFbuiaiJpq7l7OQwFnxYVchNbNGIx0c4Wkcdje6WO89I91RAaYF+gVc1pOaizA4YKZmA==}
     dependencies:
       '@types/express': 4.17.17
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /@types/oauth@0.9.4:
     resolution: {integrity: sha512-qk9orhti499fq5XxKCCEbd0OzdPZuancneyse3KtR+vgMiHRbh+mn8M4G6t64ob/Fg+GZGpa565MF/2dKWY32A==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /@types/offscreencanvas@2019.3.0:
@@ -8440,7 +8273,7 @@ packages:
   /@types/pg@8.10.9:
     resolution: {integrity: sha512-UksbANNE/f8w0wOMxVKKIrLCbEMV+oM1uKejmwXr39olg4xqcfBDbXxObJAt6XxHbDa4XTKOlUEcEltXDX+XLQ==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       pg-protocol: 1.6.0
       pg-types: 4.0.1
     dev: true
@@ -8464,7 +8297,7 @@ packages:
   /@types/qrcode@1.5.5:
     resolution: {integrity: sha512-CdfBi/e3Qk+3Z/fXYShipBT13OJ2fDO2Q2w5CIP5anLTLIndQG9z6P1cnm+8zCWSpm5dnxMFd/uREtb0EXuQzg==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /@types/qs@6.9.7:
@@ -8488,7 +8321,7 @@ packages:
     dependencies:
       '@types/prop-types': 15.7.5
       '@types/scheduler': 0.16.2
-      csstype: 3.1.2
+      csstype: 3.1.3
     dev: true
 
   /@types/readdir-glob@1.1.1:
@@ -8545,12 +8378,6 @@ packages:
     resolution: {integrity: sha512-7TCH7iNsCSNb+aUD9M/36TekrWFSLCjNK8zw/3n5kOtRjbLtDfGYMXTrDnGhSfqXNwpqmt9Vd90w5C/ad1tX6Q==}
     dev: true
 
-  /@types/set-cookie-parser@2.4.3:
-    resolution: {integrity: sha512-7QhnH7bi+6KAhBB+Auejz1uV9DHiopZqu7LfR/5gZZTkejJV5nYeZZpgfFoE0N8aDsXuiYpfKyfyMatCwQhyTQ==}
-    dependencies:
-      '@types/node': 20.11.5
-    dev: true
-
   /@types/sharp@0.32.0:
     resolution: {integrity: sha512-OOi3kL+FZDnPhVzsfD37J88FNeZh6gQsGcLc95NbeURRGvmSjeXiDcyWzF2o3yh/gQAUn2uhh/e+CPCa5nwAxw==}
     deprecated: This is a stub types definition. sharp provides its own type definitions, so you do not need this installed.
@@ -8584,6 +8411,10 @@ packages:
     resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==}
     dev: true
 
+  /@types/statuses@2.0.4:
+    resolution: {integrity: sha512-eqNDvZsCNY49OAXB0Firg/Sc2BgoWsntsLUdybGFOhAfCD6QJ2n9HXUIHGqt5qjrxmMv4wS8WLAw43ZkKcJ8Pw==}
+    dev: true
+
   /@types/throttle-debounce@5.0.2:
     resolution: {integrity: sha512-pDzSNulqooSKvSNcksnV72nk8p7gRqN8As71Sp28nov1IgmPKWbOEIwAWvBME5pPTtaXJAvG3O4oc76HlQ4kqQ==}
     dev: true
@@ -8611,13 +8442,13 @@ packages:
   /@types/vary@1.1.3:
     resolution: {integrity: sha512-XJT8/ZQCL7NUut9QDLf6l24JfAEl7bnNdgxfj50cHIpEPRJLHHDDFOAq6i+GsEmeFfH7NamhBE4c4Thtb2egWg==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /@types/web-push@3.6.3:
     resolution: {integrity: sha512-v3oT4mMJsHeJ/rraliZ+7TbZtr5bQQuxcgD7C3/1q/zkAj29c8RE0F9lVZVu3hiQe5Z9fYcBreV7TLnfKR+4mg==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /@types/webgl-ext@0.0.30:
@@ -8628,7 +8459,7 @@ packages:
   /@types/ws@8.5.10:
     resolution: {integrity: sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==}
     dependencies:
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
     dev: true
 
   /@types/yargs-parser@21.0.0:
@@ -8684,64 +8515,6 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/eslint-plugin@6.14.0(@typescript-eslint/parser@6.14.0)(eslint@8.56.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-1ZJBykBCXaSHG94vMMKmiHoL0MhNHKSVlcHVYZNw+BKxufhqQVTOawNpwwI1P5nIFZ/4jLVop0mcY6mJJDFNaw==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-    peerDependencies:
-      '@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': 6.14.0(eslint@8.56.0)(typescript@5.3.3)
-      '@typescript-eslint/scope-manager': 6.14.0
-      '@typescript-eslint/type-utils': 6.14.0(eslint@8.56.0)(typescript@5.3.3)
-      '@typescript-eslint/utils': 6.14.0(eslint@8.56.0)(typescript@5.3.3)
-      '@typescript-eslint/visitor-keys': 6.14.0
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.56.0
-      graphemer: 1.4.0
-      ignore: 5.2.4
-      natural-compare: 1.4.0
-      semver: 7.5.4
-      ts-api-utils: 1.0.1(typescript@5.3.3)
-      typescript: 5.3.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@typescript-eslint/eslint-plugin@6.19.0(@typescript-eslint/parser@6.14.0)(eslint@8.56.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-DUCUkQNklCQYnrBSSikjVChdc84/vMPDQSgJTHBZ64G9bA9w0Crc0rd2diujKbTdp6w2J47qkeHQLoi0rpLCdg==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-    peerDependencies:
-      '@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': 6.14.0(eslint@8.56.0)(typescript@5.3.3)
-      '@typescript-eslint/scope-manager': 6.19.0
-      '@typescript-eslint/type-utils': 6.19.0(eslint@8.56.0)(typescript@5.3.3)
-      '@typescript-eslint/utils': 6.19.0(eslint@8.56.0)(typescript@5.3.3)
-      '@typescript-eslint/visitor-keys': 6.19.0
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.56.0
-      graphemer: 1.4.0
-      ignore: 5.2.4
-      natural-compare: 1.4.0
-      semver: 7.5.4
-      ts-api-utils: 1.0.1(typescript@5.3.3)
-      typescript: 5.3.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@typescript-eslint/eslint-plugin@6.19.0(@typescript-eslint/parser@6.19.0)(eslint@8.56.0)(typescript@5.3.3):
     resolution: {integrity: sha512-DUCUkQNklCQYnrBSSikjVChdc84/vMPDQSgJTHBZ64G9bA9w0Crc0rd2diujKbTdp6w2J47qkeHQLoi0rpLCdg==}
     engines: {node: ^16.0.0 || >=18.0.0}
@@ -8792,27 +8565,6 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser@6.14.0(eslint@8.56.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-QjToC14CKacd4Pa7JK4GeB/vHmWFJckec49FR4hmIRf97+KXole0T97xxu9IFiPxVQ1DBWrQ5wreLwAGwWAVQA==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-    peerDependencies:
-      eslint: ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/scope-manager': 6.14.0
-      '@typescript-eslint/types': 6.14.0
-      '@typescript-eslint/typescript-estree': 6.14.0(typescript@5.3.3)
-      '@typescript-eslint/visitor-keys': 6.14.0
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.56.0
-      typescript: 5.3.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@typescript-eslint/parser@6.19.0(eslint@8.56.0)(typescript@5.3.3):
     resolution: {integrity: sha512-1DyBLG5SH7PYCd00QlroiW60YJ4rWMuUGa/JBV0iZuqi4l4IK3twKPq5ZkEebmGqRjXWVgsUzfd3+nZveewgow==}
     engines: {node: ^16.0.0 || >=18.0.0}
@@ -8842,14 +8594,6 @@ packages:
       '@typescript-eslint/visitor-keys': 6.11.0
     dev: true
 
-  /@typescript-eslint/scope-manager@6.14.0:
-    resolution: {integrity: sha512-VT7CFWHbZipPncAZtuALr9y3EuzY1b1t1AEkIq2bTXUPKw+pHoXflGNG5L+Gv6nKul1cz1VH8fz16IThIU0tdg==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-    dependencies:
-      '@typescript-eslint/types': 6.14.0
-      '@typescript-eslint/visitor-keys': 6.14.0
-    dev: true
-
   /@typescript-eslint/scope-manager@6.19.0:
     resolution: {integrity: sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==}
     engines: {node: ^16.0.0 || >=18.0.0}
@@ -8878,26 +8622,6 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/type-utils@6.14.0(eslint@8.56.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-x6OC9Q7HfYKqjnuNu5a7kffIYs3No30isapRBJl1iCHLitD8O0lFbRcVGiOcuyN837fqXzPZ1NS10maQzZMKqw==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-    peerDependencies:
-      eslint: ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/typescript-estree': 6.14.0(typescript@5.3.3)
-      '@typescript-eslint/utils': 6.14.0(eslint@8.56.0)(typescript@5.3.3)
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.56.0
-      ts-api-utils: 1.0.1(typescript@5.3.3)
-      typescript: 5.3.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@typescript-eslint/type-utils@6.19.0(eslint@8.56.0)(typescript@5.3.3):
     resolution: {integrity: sha512-mcvS6WSWbjiSxKCwBcXtOM5pRkPQ6kcDds/juxcy/727IQr3xMEcwr/YLHW2A2+Fp5ql6khjbKBzOyjuPqGi/w==}
     engines: {node: ^16.0.0 || >=18.0.0}
@@ -8923,11 +8647,6 @@ packages:
     engines: {node: ^16.0.0 || >=18.0.0}
     dev: true
 
-  /@typescript-eslint/types@6.14.0:
-    resolution: {integrity: sha512-uty9H2K4Xs8E47z3SnXEPRNDfsis8JO27amp2GNCnzGETEW3yTqEIVg5+AI7U276oGF/tw6ZA+UesxeQ104ceA==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-    dev: true
-
   /@typescript-eslint/types@6.19.0:
     resolution: {integrity: sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==}
     engines: {node: ^16.0.0 || >=18.0.0}
@@ -8954,27 +8673,6 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/typescript-estree@6.14.0(typescript@5.3.3):
-    resolution: {integrity: sha512-yPkaLwK0yH2mZKFE/bXkPAkkFgOv15GJAUzgUVonAbv0Hr4PK/N2yaA/4XQbTZQdygiDkpt5DkxPELqHguNvyw==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/types': 6.14.0
-      '@typescript-eslint/visitor-keys': 6.14.0
-      debug: 4.3.4(supports-color@8.1.1)
-      globby: 11.1.0
-      is-glob: 4.0.3
-      semver: 7.5.4
-      ts-api-utils: 1.0.1(typescript@5.3.3)
-      typescript: 5.3.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@typescript-eslint/typescript-estree@6.19.0(typescript@5.3.3):
     resolution: {integrity: sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==}
     engines: {node: ^16.0.0 || >=18.0.0}
@@ -9016,25 +8714,6 @@ packages:
       - typescript
     dev: true
 
-  /@typescript-eslint/utils@6.14.0(eslint@8.56.0)(typescript@5.3.3):
-    resolution: {integrity: sha512-XwRTnbvRr7Ey9a1NT6jqdKX8y/atWG+8fAIu3z73HSP8h06i3r/ClMhmaF/RGWGW1tHJEwij1uEg2GbEmPYvYg==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-    peerDependencies:
-      eslint: ^7.0.0 || ^8.0.0
-    dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
-      '@types/json-schema': 7.0.12
-      '@types/semver': 7.5.6
-      '@typescript-eslint/scope-manager': 6.14.0
-      '@typescript-eslint/types': 6.14.0
-      '@typescript-eslint/typescript-estree': 6.14.0(typescript@5.3.3)
-      eslint: 8.56.0
-      semver: 7.5.4
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-    dev: true
-
   /@typescript-eslint/utils@6.19.0(eslint@8.56.0)(typescript@5.3.3):
     resolution: {integrity: sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw==}
     engines: {node: ^16.0.0 || >=18.0.0}
@@ -9062,14 +8741,6 @@ packages:
       eslint-visitor-keys: 3.4.3
     dev: true
 
-  /@typescript-eslint/visitor-keys@6.14.0:
-    resolution: {integrity: sha512-fB5cw6GRhJUz03MrROVuj5Zm/Q+XWlVdIsFj+Zb1Hvqouc8t+XP2H5y53QYU/MGtd2dPg6/vJJlhoX3xc2ehfw==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-    dependencies:
-      '@typescript-eslint/types': 6.14.0
-      eslint-visitor-keys: 3.4.3
-    dev: true
-
   /@typescript-eslint/visitor-keys@6.19.0:
     resolution: {integrity: sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==}
     engines: {node: ^16.0.0 || >=18.0.0}
@@ -9082,7 +8753,7 @@ packages:
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
     dev: true
 
-  /@vitejs/plugin-react@3.1.0(vite@5.0.10):
+  /@vitejs/plugin-react@3.1.0(vite@5.0.12):
     resolution: {integrity: sha512-AfgcRL8ZBhAlc3BFdigClmTUMISmmzHn7sB2h9U1odvc5U/MjWXsAaz18b/WoppUTDBzxOJwo2VdClfUcItu9g==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -9093,89 +8764,92 @@ packages:
       '@babel/plugin-transform-react-jsx-source': 7.19.6(@babel/core@7.23.5)
       magic-string: 0.27.0
       react-refresh: 0.14.0
-      vite: 5.0.10(@types/node@20.10.5)(sass@1.69.5)(terser@5.26.0)
+      vite: 5.0.12(@types/node@20.11.5)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@vitejs/plugin-vue@4.5.2(vite@5.0.10)(vue@3.4.3):
+  /@vitejs/plugin-vue@4.5.2(vite@5.0.12)(vue@3.4.15):
     resolution: {integrity: sha512-UGR3DlzLi/SaVBPX0cnSyE37vqxU3O6chn8l0HJNzQzDia6/Au2A4xKv+iIJW8w2daf80G7TYHhi1pAUjdZ0bQ==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       vite: ^4.0.0 || ^5.0.0
       vue: ^3.2.25
     dependencies:
-      vite: 5.0.10(@types/node@20.10.5)(sass@1.69.5)(terser@5.26.0)
-      vue: 3.4.3(typescript@5.3.3)
+      vite: 5.0.12(@types/node@20.11.5)(sass@1.70.0)(terser@5.27.0)
+      vue: 3.4.15(typescript@5.3.3)
     dev: true
 
-  /@vitejs/plugin-vue@5.0.2(vite@5.0.10)(vue@3.4.3):
+  /@vitejs/plugin-vue@5.0.2(vite@5.0.12)(vue@3.4.15):
     resolution: {integrity: sha512-kEjJHrLb5ePBvjD0SPZwJlw1QTRcjjCA9sB5VyfonoXVBxTS7TMnqL6EkLt1Eu61RDeiuZ/WN9Hf6PxXhPI2uA==}
     engines: {node: ^18.0.0 || >=20.0.0}
     peerDependencies:
       vite: ^5.0.0
       vue: ^3.2.25
     dependencies:
-      vite: 5.0.10(@types/node@20.10.5)(sass@1.69.5)(terser@5.26.0)
-      vue: 3.4.3(typescript@5.3.3)
+      vite: 5.0.12(@types/node@20.11.5)(sass@1.70.0)(terser@5.27.0)
+      vue: 3.4.15(typescript@5.3.3)
     dev: false
 
-  /@vitest/coverage-v8@0.34.6(vitest@0.34.6):
-    resolution: {integrity: sha512-fivy/OK2d/EsJFoEoxHFEnNGTg+MmdZBAVK9Ka4qhXR2K3J0DS08vcGVwzDtXSuUMabLv4KtPcpSKkcMXFDViw==}
+  /@vitest/coverage-v8@1.2.1(vitest@1.2.1):
+    resolution: {integrity: sha512-fJEhKaDwGMZtJUX7BRcGxooGwg1Hl0qt53mVup/ZJeznhvL5EodteVnb/mcByhEcvVWbK83ZF31c7nPEDi4LOQ==}
     peerDependencies:
-      vitest: '>=0.32.0 <1'
+      vitest: ^1.0.0
     dependencies:
       '@ampproject/remapping': 2.2.1
       '@bcoe/v8-coverage': 0.2.3
-      istanbul-lib-coverage: 3.2.0
+      debug: 4.3.4(supports-color@8.1.1)
+      istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 4.0.1
-      istanbul-reports: 3.1.5
-      magic-string: 0.30.3
+      istanbul-reports: 3.1.6
+      magic-string: 0.30.5
+      magicast: 0.3.3
       picocolors: 1.0.0
-      std-env: 3.3.3
+      std-env: 3.7.0
       test-exclude: 6.0.0
-      v8-to-istanbul: 9.1.0
-      vitest: 0.34.6(happy-dom@10.0.3)(sass@1.69.5)(terser@5.26.0)
+      v8-to-istanbul: 9.2.0
+      vitest: 1.2.1(@types/node@20.11.5)(happy-dom@10.0.3)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@vitest/expect@0.34.6:
-    resolution: {integrity: sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==}
+  /@vitest/expect@1.2.1:
+    resolution: {integrity: sha512-/bqGXcHfyKgFWYwIgFr1QYDaR9e64pRKxgBNWNXPefPFRhgm+K3+a/dS0cUGEreWngets3dlr8w8SBRw2fCfFQ==}
     dependencies:
-      '@vitest/spy': 0.34.6
-      '@vitest/utils': 0.34.6
+      '@vitest/spy': 1.2.1
+      '@vitest/utils': 1.2.1
       chai: 4.3.10
     dev: true
 
-  /@vitest/runner@0.34.6:
-    resolution: {integrity: sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==}
+  /@vitest/runner@1.2.1:
+    resolution: {integrity: sha512-zc2dP5LQpzNzbpaBt7OeYAvmIsRS1KpZQw4G3WM/yqSV1cQKNKwLGmnm79GyZZjMhQGlRcSFMImLjZaUQvNVZQ==}
     dependencies:
-      '@vitest/utils': 0.34.6
-      p-limit: 4.0.0
+      '@vitest/utils': 1.2.1
+      p-limit: 5.0.0
       pathe: 1.1.1
     dev: true
 
-  /@vitest/snapshot@0.34.6:
-    resolution: {integrity: sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==}
+  /@vitest/snapshot@1.2.1:
+    resolution: {integrity: sha512-Tmp/IcYEemKaqAYCS08sh0vORLJkMr0NRV76Gl8sHGxXT5151cITJCET20063wk0Yr/1koQ6dnmP6eEqezmd/Q==}
     dependencies:
       magic-string: 0.30.5
       pathe: 1.1.1
       pretty-format: 29.7.0
     dev: true
 
-  /@vitest/spy@0.34.6:
-    resolution: {integrity: sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==}
+  /@vitest/spy@1.2.1:
+    resolution: {integrity: sha512-vG3a/b7INKH7L49Lbp0IWrG6sw9j4waWAucwnksPB1r1FTJgV7nkBByd9ufzu6VWya/QTvQW4V9FShZbZIB2UQ==}
     dependencies:
-      tinyspy: 2.1.1
+      tinyspy: 2.2.0
     dev: true
 
-  /@vitest/utils@0.34.6:
-    resolution: {integrity: sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==}
+  /@vitest/utils@1.2.1:
+    resolution: {integrity: sha512-bsH6WVZYe/J2v3+81M5LDU8kW76xWObKIURpPrOXm2pjBniBu2MERI/XP60GpS4PHU3jyK50LUutOwrx4CyHUg==}
     dependencies:
       diff-sequences: 29.6.3
-      loupe: 2.3.6
+      estree-walker: 3.0.3
+      loupe: 2.3.7
       pretty-format: 29.7.0
     dev: true
 
@@ -9198,23 +8872,23 @@ packages:
       path-browserify: 1.0.1
     dev: true
 
-  /@vue/compiler-core@3.3.11:
-    resolution: {integrity: sha512-h97/TGWBilnLuRaj58sxNrsUU66fwdRKLOLQ9N/5iNDfp+DZhYH9Obhe0bXxhedl8fjAgpRANpiZfbgWyruQ0w==}
+  /@vue/compiler-core@3.3.12:
+    resolution: {integrity: sha512-qAtjyG3GBLG0chzp5xGCyRLLe6wFCHmjI82aGzwuGKyznNP+GJJMxjc0wOYWDB2YKfho7niJFdoFpo0CZZQg9w==}
     dependencies:
       '@babel/parser': 7.23.5
-      '@vue/shared': 3.3.11
+      '@vue/shared': 3.3.12
       estree-walker: 2.0.2
       source-map-js: 1.0.2
     dev: true
 
-  /@vue/compiler-core@3.3.12:
-    resolution: {integrity: sha512-qAtjyG3GBLG0chzp5xGCyRLLe6wFCHmjI82aGzwuGKyznNP+GJJMxjc0wOYWDB2YKfho7niJFdoFpo0CZZQg9w==}
+  /@vue/compiler-core@3.4.15:
+    resolution: {integrity: sha512-XcJQVOaxTKCnth1vCxEChteGuwG6wqnUHxAm1DO3gCz0+uXKaJNx8/digSz4dLALCy8n2lKq24jSUs8segoqIw==}
     dependencies:
-      '@babel/parser': 7.23.5
-      '@vue/shared': 3.3.12
+      '@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.3:
     resolution: {integrity: sha512-u8jzgFg0EDtSrb/hG53Wwh1bAOQFtc1ZCegBpA/glyvTlgHl+tq13o1zvRfLbegYUw/E4mSTGOiCnAJ9SJ+lsg==}
@@ -9225,13 +8899,6 @@ packages:
       estree-walker: 2.0.2
       source-map-js: 1.0.2
 
-  /@vue/compiler-dom@3.3.11:
-    resolution: {integrity: sha512-zoAiUIqSKqAJ81WhfPXYmFGwDRuO+loqLxvXmfUdR5fOitPoUiIeFI9cTTyv9MU5O1+ZZglJVTusWzy+wfk5hw==}
-    dependencies:
-      '@vue/compiler-core': 3.3.11
-      '@vue/shared': 3.3.11
-    dev: true
-
   /@vue/compiler-dom@3.3.12:
     resolution: {integrity: sha512-RdJU9oEYaoPKUdGXCy0l+i4clesdDeLmbvRlszoc9iagsnBnMmQtYfCPVQ5BHB6o7K4SCucDdJM2Dh3oXB0D6g==}
     dependencies:
@@ -9239,12 +8906,31 @@ packages:
       '@vue/shared': 3.3.12
     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
+
   /@vue/compiler-dom@3.4.3:
     resolution: {integrity: sha512-oGF1E9/htI6JWj/lTJgr6UgxNCtNHbM6xKVreBWeZL9QhRGABRVoWGAzxmtBfSOd+w0Zi5BY0Es/tlJrN6WgEg==}
     dependencies:
       '@vue/compiler-core': 3.4.3
       '@vue/shared': 3.4.3
 
+  /@vue/compiler-sfc@3.4.15:
+    resolution: {integrity: sha512-LCn5M6QpkpFsh3GQvs2mJUOAlBQcCco8D60Bcqmf3O3w5a+KWS5GvYbrrJBkgvL1BDnTp+e8q0lXCLgHhKguBA==}
+    dependencies:
+      '@babel/parser': 7.23.6
+      '@vue/compiler-core': 3.4.15
+      '@vue/compiler-dom': 3.4.15
+      '@vue/compiler-ssr': 3.4.15
+      '@vue/shared': 3.4.15
+      estree-walker: 2.0.2
+      magic-string: 0.30.5
+      postcss: 8.4.33
+      source-map-js: 1.0.2
+
   /@vue/compiler-sfc@3.4.3:
     resolution: {integrity: sha512-NuJqb5is9I4uzv316VRUDYgIlPZCG8D+ARt5P4t5UDShIHKL25J3TGZAUryY/Aiy0DsY7srJnZL5ryB6DD63Zw==}
     dependencies:
@@ -9258,6 +8944,12 @@ packages:
       postcss: 8.4.32
       source-map-js: 1.0.2
 
+  /@vue/compiler-ssr@3.4.15:
+    resolution: {integrity: sha512-1jdeQyiGznr8gjFDadVmOJqZiLNSsMa5ZgqavkPZ8O2wjHv0tVuAEsw5hTdUoUW4232vpBbL/wJhzVW/JwY1Uw==}
+    dependencies:
+      '@vue/compiler-dom': 3.4.15
+      '@vue/shared': 3.4.15
+
   /@vue/compiler-ssr@3.4.3:
     resolution: {integrity: sha512-wnYQtMBkeFSxgSSQbYGQeXPhQacQiog2c6AlvMldQH6DB+gSXK/0F6DVXAJfEiuBSgBhUc8dwrrG5JQcqwalsA==}
     dependencies:
@@ -9284,45 +8976,44 @@ packages:
       vue-template-compiler: 2.7.14
     dev: true
 
-  /@vue/reactivity@3.4.3:
-    resolution: {integrity: sha512-q5f9HLDU+5aBKizXHAx0w4whkIANs1Muiq9R5YXm0HtorSlflqv9u/ohaMxuuhHWCji4xqpQ1eL04WvmAmGnFg==}
+  /@vue/reactivity@3.4.15:
+    resolution: {integrity: sha512-55yJh2bsff20K5O84MxSvXKPHHt17I2EomHznvFiJCAZpJTNW8IuLj1xZWMLELRhBK3kkFV/1ErZGHJfah7i7w==}
     dependencies:
-      '@vue/shared': 3.4.3
+      '@vue/shared': 3.4.15
 
-  /@vue/runtime-core@3.4.3:
-    resolution: {integrity: sha512-C1r6QhB1qY7D591RCSFhMULyzL9CuyrGc+3PpB0h7dU4Qqw6GNyo4BNFjHZVvsWncrUlKX3DIKg0Y7rNNr06NQ==}
+  /@vue/runtime-core@3.4.15:
+    resolution: {integrity: sha512-6E3by5m6v1AkW0McCeAyhHTw+3y17YCOKG0U0HDKDscV4Hs0kgNT5G+GCHak16jKgcCDHpI9xe5NKb8sdLCLdw==}
     dependencies:
-      '@vue/reactivity': 3.4.3
-      '@vue/shared': 3.4.3
+      '@vue/reactivity': 3.4.15
+      '@vue/shared': 3.4.15
 
-  /@vue/runtime-dom@3.4.3:
-    resolution: {integrity: sha512-wrsprg7An5Ec+EhPngWdPuzkp0BEUxAKaQtN9dPU/iZctPyD9aaXmVtehPJerdQxQale6gEnhpnfywNw3zOv2A==}
+  /@vue/runtime-dom@3.4.15:
+    resolution: {integrity: sha512-EVW8D6vfFVq3V/yDKNPBFkZKGMFSvZrUQmx196o/v2tHKdwWdiZjYUBS+0Ez3+ohRyF8Njwy/6FH5gYJ75liUw==}
     dependencies:
-      '@vue/runtime-core': 3.4.3
-      '@vue/shared': 3.4.3
+      '@vue/runtime-core': 3.4.15
+      '@vue/shared': 3.4.15
       csstype: 3.1.3
 
-  /@vue/server-renderer@3.4.3(vue@3.4.3):
-    resolution: {integrity: sha512-BUxt8oVGMKKsqSkM1uU3d3Houyfy4WAc2SpSQRebNd+XJGATVkW/rO129jkyL+kpB/2VRKzE63zwf5RtJ3XuZw==}
+  /@vue/server-renderer@3.4.15(vue@3.4.15):
+    resolution: {integrity: sha512-3HYzaidu9cHjrT+qGUuDhFYvF/j643bHC6uUN9BgM11DVy+pM6ATsG6uPBLnkwOgs7BpJABReLmpL3ZPAsUaqw==}
     peerDependencies:
-      vue: 3.4.3
+      vue: 3.4.15
     dependencies:
-      '@vue/compiler-ssr': 3.4.3
-      '@vue/shared': 3.4.3
-      vue: 3.4.3(typescript@5.3.3)
-
-  /@vue/shared@3.3.11:
-    resolution: {integrity: sha512-u2G8ZQ9IhMWTMXaWqZycnK4UthG1fA238CD+DP4Dm4WJi5hdUKKLg0RMRaRpDPNMdkTwIDkp7WtD0Rd9BH9fLw==}
-    dev: true
+      '@vue/compiler-ssr': 3.4.15
+      '@vue/shared': 3.4.15
+      vue: 3.4.15(typescript@5.3.3)
 
   /@vue/shared@3.3.12:
     resolution: {integrity: sha512-6p0Yin0pclvnER7BLNOQuod9Z+cxSYh8pSh7CzHnWNjAIP6zrTlCdHRvSCb1aYEx6i3Q3kvfuWU7nG16CgG1ag==}
     dev: true
 
+  /@vue/shared@3.4.15:
+    resolution: {integrity: sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g==}
+
   /@vue/shared@3.4.3:
     resolution: {integrity: sha512-rIwlkkP1n4uKrRzivAKPZIEkHiuwY5mmhMJ2nZKCBLz8lTUlE73rQh4n1OnnMurXt1vcUNyH4ZPfdh8QweTjpQ==}
 
-  /@vue/test-utils@2.4.1(vue@3.4.3):
+  /@vue/test-utils@2.4.1(vue@3.4.15):
     resolution: {integrity: sha512-VO8nragneNzUZUah6kOjiFmD/gwRjUauG9DROh6oaOeFwX1cZRUNHhdeogE8635cISigXFTtGLUQWx5KCb0xeg==}
     peerDependencies:
       '@vue/server-renderer': ^3.0.1
@@ -9332,7 +9023,7 @@ packages:
         optional: true
     dependencies:
       js-beautify: 1.14.9
-      vue: 3.4.3(typescript@5.3.3)
+      vue: 3.4.15(typescript@5.3.3)
       vue-component-type-helpers: 1.8.4
     dev: true
 
@@ -9341,11 +9032,6 @@ packages:
     requiresBuild: true
     dev: false
 
-  /@xmldom/xmldom@0.8.6:
-    resolution: {integrity: sha512-uRjjusqpoqfmRkTaNuLJ2VohVr67Q5YwDATW3VU7PfzTj6IRaihGrYI7zckGZjxQPBIp63nfvJbM+Yu5ICh0Bg==}
-    engines: {node: '>=10.0.0'}
-    dev: true
-
   /@yarnpkg/esbuild-plugin-pnp@3.0.0-rc.15(esbuild@0.18.20):
     resolution: {integrity: sha512-kYzDJO5CA9sy+on/s2aIW0411AklfCi8Ck/4QDivOqsMKpStZA2SsR+X27VTggGwpStWaLrjJcDcdDMowtG8MA==}
     engines: {node: '>=14.15.0'}
@@ -9372,12 +9058,6 @@ packages:
       tslib: 1.14.1
     dev: true
 
-  /@zxing/text-encoding@0.9.0:
-    resolution: {integrity: sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==}
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /abbrev@1.1.1:
     resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
 
@@ -9412,12 +9092,12 @@ packages:
       acorn: 7.4.1
     dev: true
 
-  /acorn-jsx@5.3.2(acorn@8.11.2):
+  /acorn-jsx@5.3.2(acorn@8.11.3):
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      acorn: 8.11.2
+      acorn: 8.11.3
     dev: true
 
   /acorn-walk@7.2.0:
@@ -9425,8 +9105,8 @@ packages:
     engines: {node: '>=0.4.0'}
     dev: true
 
-  /acorn-walk@8.2.0:
-    resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
+  /acorn-walk@8.3.2:
+    resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==}
     engines: {node: '>=0.4.0'}
     dev: true
 
@@ -9435,8 +9115,8 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
-  /acorn@8.11.2:
-    resolution: {integrity: sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==}
+  /acorn@8.11.3:
+    resolution: {integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==}
     engines: {node: '>=0.4.0'}
     hasBin: true
 
@@ -9834,10 +9514,10 @@ packages:
     resolution: {integrity: sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==}
     dev: true
 
-  /async-mutex@0.4.0:
-    resolution: {integrity: sha512-eJFZ1YhRR8UN8eBLoNzcDPcy/jqjsg6I1AP+KvWQX80BqOSW1oJPJXDylPUEeMr2ZQvHgnQ//Lp6f3RQ1zI7HA==}
+  /async-mutex@0.4.1:
+    resolution: {integrity: sha512-WfoBo4E/TbCX1G95XTjbWTE3X2XLG0m1Xbv2cwOtuPdyH9CZvnaA5nCt1ucjaKEgW2A5IF71hxrRhr83Je5xjA==}
     dependencies:
-      tslib: 2.6.1
+      tslib: 2.6.2
     dev: false
 
   /async@3.2.4:
@@ -9871,12 +9551,12 @@ packages:
       - supports-color
     dev: false
 
-  /aws-sdk-client-mock@3.0.0:
-    resolution: {integrity: sha512-4mBiWhuLYLZe1+K/iB8eYy5SAZyW2se+Keyh5u9QouMt6/qJ5SRZhss68xvUX5g3ApzROJ06QPRziYHP6buuvQ==}
+  /aws-sdk-client-mock@3.0.1:
+    resolution: {integrity: sha512-9VAzJLl8mz99KP9HjOm/93d8vznRRUTpJooPBOunRdUAnVYopCe9xmMuu7eVemu8fQ+w6rP7o5bBK1kAFkB2KQ==}
     dependencies:
       '@types/sinon': 10.0.13
-      sinon: 14.0.2
-      tslib: 2.5.3
+      sinon: 16.1.3
+      tslib: 2.6.2
     dev: true
 
   /aws-sign2@0.7.0:
@@ -9949,7 +9629,7 @@ packages:
     resolution: {integrity: sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/template': 7.22.5
+      '@babel/template': 7.22.15
       '@babel/types': 7.23.5
       '@types/babel__core': 7.20.0
       '@types/babel__traverse': 7.20.0
@@ -10050,6 +9730,12 @@ packages:
       open: 8.4.2
     dev: true
 
+  /bidi-js@1.0.3:
+    resolution: {integrity: sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==}
+    dependencies:
+      require-from-string: 2.0.2
+    dev: false
+
   /big-integer@1.6.51:
     resolution: {integrity: sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==}
     engines: {node: '>=0.6'}
@@ -10264,14 +9950,14 @@ packages:
     dependencies:
       node-gyp-build: 4.6.0
 
-  /bullmq@4.15.4:
-    resolution: {integrity: sha512-lrEtiERjYPPfb0OEXva5G8cF6kbtJFy/BmIL0yjmO+kj2eSVjCpAVVeYikxoqKtaYyEnNFal7ERVLanEvp+1Lw==}
+  /bullmq@5.1.4:
+    resolution: {integrity: sha512-j/AjaPc8BhyrH7b2MyZpi4cUtGH8TJTxonZUmXEefmKU8z5DcldzmlXPief0P4+qvN0A7qwWZH3n0F+GsWgQkg==}
     dependencies:
       cron-parser: 4.8.1
       glob: 8.1.0
       ioredis: 5.3.2
       lodash: 4.17.21
-      msgpackr: 1.9.2
+      msgpackr: 1.10.1
       node-abort-controller: 3.1.1
       semver: 7.5.4
       tslib: 2.6.2
@@ -10608,8 +10294,8 @@ packages:
     engines: {node: '>=10'}
     requiresBuild: true
 
-  /chromatic@10.1.0:
-    resolution: {integrity: sha512-S+ztO8f1k/LckuzJKCqaTs6AfUQ0eLNT9kEoyCUwX7gkJnveQo5JStCfY55v30zogjRkHJpwqzEfSXl6AwO2tQ==}
+  /chromatic@10.3.1:
+    resolution: {integrity: sha512-IHczKH3K3vVeZGE3XyCy/T8EQH2mGUEyQ9QUuULrWlYCfo760cnzehdTjrpuIUetkHtv7noA5Hmn6joQlz3Ufw==}
     hasBin: true
     dev: false
 
@@ -10931,11 +10617,6 @@ packages:
     engines: {node: '>=6.6.0'}
     dev: false
 
-  /cookie@0.4.2:
-    resolution: {integrity: sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==}
-    engines: {node: '>= 0.6'}
-    dev: true
-
   /cookie@0.5.0:
     resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==}
     engines: {node: '>= 0.6'}
@@ -10978,7 +10659,7 @@ packages:
       readable-stream: 3.6.0
     dev: false
 
-  /create-jest@29.7.0(@types/node@20.10.5):
+  /create-jest@29.7.0(@types/node@20.11.5):
     resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -10987,7 +10668,7 @@ packages:
       chalk: 4.1.2
       exit: 0.1.2
       graceful-fs: 4.2.11
-      jest-config: 29.7.0(@types/node@20.10.5)
+      jest-config: 29.7.0(@types/node@20.11.5)
       jest-util: 29.7.0
       prompts: 2.4.2
     transitivePeerDependencies:
@@ -11063,13 +10744,13 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /css-declaration-sorter@7.1.1(postcss@8.4.32):
+  /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.32
+      postcss: 8.4.33
     dev: false
 
   /css-select@5.1.0:
@@ -11109,62 +10790,62 @@ packages:
     engines: {node: '>=4'}
     hasBin: true
 
-  /cssnano-preset-default@6.0.2(postcss@8.4.32):
-    resolution: {integrity: sha512-VnZybFeZ63AiVqIUNlxqMxpj9VU8B5j0oKgP7WyVt/7mkyf97KsYkNzsPTV/RVmy54Pg7cBhOK4WATbdCB44gw==}
+  /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:
-      css-declaration-sorter: 7.1.1(postcss@8.4.32)
-      cssnano-utils: 4.0.1(postcss@8.4.32)
-      postcss: 8.4.32
-      postcss-calc: 9.0.1(postcss@8.4.32)
-      postcss-colormin: 6.0.1(postcss@8.4.32)
-      postcss-convert-values: 6.0.1(postcss@8.4.32)
-      postcss-discard-comments: 6.0.1(postcss@8.4.32)
-      postcss-discard-duplicates: 6.0.1(postcss@8.4.32)
-      postcss-discard-empty: 6.0.1(postcss@8.4.32)
-      postcss-discard-overridden: 6.0.1(postcss@8.4.32)
-      postcss-merge-longhand: 6.0.1(postcss@8.4.32)
-      postcss-merge-rules: 6.0.2(postcss@8.4.32)
-      postcss-minify-font-values: 6.0.1(postcss@8.4.32)
-      postcss-minify-gradients: 6.0.1(postcss@8.4.32)
-      postcss-minify-params: 6.0.1(postcss@8.4.32)
-      postcss-minify-selectors: 6.0.1(postcss@8.4.32)
-      postcss-normalize-charset: 6.0.1(postcss@8.4.32)
-      postcss-normalize-display-values: 6.0.1(postcss@8.4.32)
-      postcss-normalize-positions: 6.0.1(postcss@8.4.32)
-      postcss-normalize-repeat-style: 6.0.1(postcss@8.4.32)
-      postcss-normalize-string: 6.0.1(postcss@8.4.32)
-      postcss-normalize-timing-functions: 6.0.1(postcss@8.4.32)
-      postcss-normalize-unicode: 6.0.1(postcss@8.4.32)
-      postcss-normalize-url: 6.0.1(postcss@8.4.32)
-      postcss-normalize-whitespace: 6.0.1(postcss@8.4.32)
-      postcss-ordered-values: 6.0.1(postcss@8.4.32)
-      postcss-reduce-initial: 6.0.1(postcss@8.4.32)
-      postcss-reduce-transforms: 6.0.1(postcss@8.4.32)
-      postcss-svgo: 6.0.1(postcss@8.4.32)
-      postcss-unique-selectors: 6.0.1(postcss@8.4.32)
-    dev: false
-
-  /cssnano-utils@4.0.1(postcss@8.4.32):
+      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.32
+      postcss: 8.4.33
     dev: false
 
-  /cssnano@6.0.2(postcss@8.4.32):
-    resolution: {integrity: sha512-Tu9wv8UdN6CoiQnIVkCNvi+0rw/BwFWOJBlg2bVfEyKaadSuE3Gq/DD8tniVvggTJGwK88UjqZp7zL5sv6t1aA==}
+  /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.0.2(postcss@8.4.32)
+      cssnano-preset-default: 6.0.3(postcss@8.4.33)
       lilconfig: 3.0.0
-      postcss: 8.4.32
+      postcss: 8.4.33
     dev: false
 
   /csso@5.0.5:
@@ -11174,17 +10855,13 @@ packages:
       css-tree: 2.2.1
     dev: false
 
-  /cssstyle@3.0.0:
-    resolution: {integrity: sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==}
-    engines: {node: '>=14'}
+  /cssstyle@4.0.1:
+    resolution: {integrity: sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ==}
+    engines: {node: '>=18'}
     dependencies:
       rrweb-cssom: 0.6.0
     dev: false
 
-  /csstype@3.1.2:
-    resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}
-    dev: true
-
   /csstype@3.1.3:
     resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
 
@@ -11194,15 +10871,14 @@ packages:
       uniq: 1.0.1
     dev: false
 
-  /cypress@13.6.1:
-    resolution: {integrity: sha512-k1Wl5PQcA/4UoTffYKKaxA0FJKwg8yenYNYRzLt11CUR0Kln+h7Udne6mdU1cUIdXBDTVZWtmiUjzqGs7/pEpw==}
+  /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/node': 18.17.15
       '@types/sinonjs__fake-timers': 8.1.1
       '@types/sizzle': 2.3.3
       arch: 2.2.0
@@ -11274,6 +10950,10 @@ packages:
       '@babel/runtime': 7.21.0
     dev: false
 
+  /dayjs@1.11.10:
+    resolution: {integrity: sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==}
+    dev: false
+
   /dayjs@1.11.7:
     resolution: {integrity: sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==}
     dev: true
@@ -11903,64 +11583,35 @@ packages:
       '@esbuild/win32-x64': 0.18.20
     dev: true
 
-  /esbuild@0.19.8:
-    resolution: {integrity: sha512-l7iffQpT2OrZfH2rXIp7/FkmaeZM0vxbxN9KfiCwGYuZqzMg/JdvX26R31Zxn/Pxvsrg3Y9N6XTcnknqDyyv4w==}
+  /esbuild@0.19.11:
+    resolution: {integrity: sha512-HJ96Hev2hX/6i5cDVwcqiJBBtuo9+FeIJOtZ9W1kA5M6AMJRHUZlpYZ1/SbEwtO0ioNAW8rUooVpC/WehY2SfA==}
     engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      '@esbuild/android-arm': 0.19.8
-      '@esbuild/android-arm64': 0.19.8
-      '@esbuild/android-x64': 0.19.8
-      '@esbuild/darwin-arm64': 0.19.8
-      '@esbuild/darwin-x64': 0.19.8
-      '@esbuild/freebsd-arm64': 0.19.8
-      '@esbuild/freebsd-x64': 0.19.8
-      '@esbuild/linux-arm': 0.19.8
-      '@esbuild/linux-arm64': 0.19.8
-      '@esbuild/linux-ia32': 0.19.8
-      '@esbuild/linux-loong64': 0.19.8
-      '@esbuild/linux-mips64el': 0.19.8
-      '@esbuild/linux-ppc64': 0.19.8
-      '@esbuild/linux-riscv64': 0.19.8
-      '@esbuild/linux-s390x': 0.19.8
-      '@esbuild/linux-x64': 0.19.8
-      '@esbuild/netbsd-x64': 0.19.8
-      '@esbuild/openbsd-x64': 0.19.8
-      '@esbuild/sunos-x64': 0.19.8
-      '@esbuild/win32-arm64': 0.19.8
-      '@esbuild/win32-ia32': 0.19.8
-      '@esbuild/win32-x64': 0.19.8
-
-  /esbuild@0.19.9:
-    resolution: {integrity: sha512-U9CHtKSy+EpPsEBa+/A2gMs/h3ylBC0H0KSqIg7tpztHerLi6nrrcoUJAkNCEPumx8yJ+Byic4BVwHgRbN0TBg==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
-    optionalDependencies:
-      '@esbuild/android-arm': 0.19.9
-      '@esbuild/android-arm64': 0.19.9
-      '@esbuild/android-x64': 0.19.9
-      '@esbuild/darwin-arm64': 0.19.9
-      '@esbuild/darwin-x64': 0.19.9
-      '@esbuild/freebsd-arm64': 0.19.9
-      '@esbuild/freebsd-x64': 0.19.9
-      '@esbuild/linux-arm': 0.19.9
-      '@esbuild/linux-arm64': 0.19.9
-      '@esbuild/linux-ia32': 0.19.9
-      '@esbuild/linux-loong64': 0.19.9
-      '@esbuild/linux-mips64el': 0.19.9
-      '@esbuild/linux-ppc64': 0.19.9
-      '@esbuild/linux-riscv64': 0.19.9
-      '@esbuild/linux-s390x': 0.19.9
-      '@esbuild/linux-x64': 0.19.9
-      '@esbuild/netbsd-x64': 0.19.9
-      '@esbuild/openbsd-x64': 0.19.9
-      '@esbuild/sunos-x64': 0.19.9
-      '@esbuild/win32-arm64': 0.19.9
-      '@esbuild/win32-ia32': 0.19.9
-      '@esbuild/win32-x64': 0.19.9
-    dev: false
+      '@esbuild/aix-ppc64': 0.19.11
+      '@esbuild/android-arm': 0.19.11
+      '@esbuild/android-arm64': 0.19.11
+      '@esbuild/android-x64': 0.19.11
+      '@esbuild/darwin-arm64': 0.19.11
+      '@esbuild/darwin-x64': 0.19.11
+      '@esbuild/freebsd-arm64': 0.19.11
+      '@esbuild/freebsd-x64': 0.19.11
+      '@esbuild/linux-arm': 0.19.11
+      '@esbuild/linux-arm64': 0.19.11
+      '@esbuild/linux-ia32': 0.19.11
+      '@esbuild/linux-loong64': 0.19.11
+      '@esbuild/linux-mips64el': 0.19.11
+      '@esbuild/linux-ppc64': 0.19.11
+      '@esbuild/linux-riscv64': 0.19.11
+      '@esbuild/linux-s390x': 0.19.11
+      '@esbuild/linux-x64': 0.19.11
+      '@esbuild/netbsd-x64': 0.19.11
+      '@esbuild/openbsd-x64': 0.19.11
+      '@esbuild/sunos-x64': 0.19.11
+      '@esbuild/win32-arm64': 0.19.11
+      '@esbuild/win32-ia32': 0.19.11
+      '@esbuild/win32-x64': 0.19.11
 
   /escalade@3.1.1:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
@@ -12055,35 +11706,6 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.14.0)(eslint-import-resolver-node@0.3.9)(eslint@8.56.0):
-    resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@typescript-eslint/parser': '*'
-      eslint: '*'
-      eslint-import-resolver-node: '*'
-      eslint-import-resolver-typescript: '*'
-      eslint-import-resolver-webpack: '*'
-    peerDependenciesMeta:
-      '@typescript-eslint/parser':
-        optional: true
-      eslint:
-        optional: true
-      eslint-import-resolver-node:
-        optional: true
-      eslint-import-resolver-typescript:
-        optional: true
-      eslint-import-resolver-webpack:
-        optional: true
-    dependencies:
-      '@typescript-eslint/parser': 6.14.0(eslint@8.56.0)(typescript@5.3.3)
-      debug: 3.2.7(supports-color@8.1.1)
-      eslint: 8.56.0
-      eslint-import-resolver-node: 0.3.9
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.19.0)(eslint-import-resolver-node@0.3.9)(eslint@8.56.0):
     resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==}
     engines: {node: '>=4'}
@@ -12148,41 +11770,6 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.14.0)(eslint@8.56.0):
-    resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@typescript-eslint/parser': '*'
-      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-    peerDependenciesMeta:
-      '@typescript-eslint/parser':
-        optional: true
-    dependencies:
-      '@typescript-eslint/parser': 6.14.0(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.56.0
-      eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.14.0)(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
-      minimatch: 3.1.2
-      object.fromentries: 2.0.7
-      object.groupby: 1.0.1
-      object.values: 1.1.7
-      semver: 6.3.1
-      tsconfig-paths: 3.15.0
-    transitivePeerDependencies:
-      - eslint-import-resolver-typescript
-      - eslint-import-resolver-webpack
-      - supports-color
-    dev: true
-
   /eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.19.0)(eslint@8.56.0):
     resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==}
     engines: {node: '>=4'}
@@ -12218,8 +11805,8 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-vue@9.19.2(eslint@8.56.0):
-    resolution: {integrity: sha512-CPDqTOG2K4Ni2o4J5wixkLVNwgctKXFu6oBpVJlpNq7f38lh9I80pRTouZSJ2MAebPJlINU/KTFSXyQfBUlymA==}
+  /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
@@ -12230,7 +11817,7 @@ packages:
       nth-check: 2.1.1
       postcss-selector-parser: 6.0.13
       semver: 7.5.4
-      vue-eslint-parser: 9.3.2(eslint@8.56.0)
+      vue-eslint-parser: 9.4.0(eslint@8.56.0)
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
       - supports-color
@@ -12351,8 +11938,8 @@ packages:
     resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: 8.11.2
-      acorn-jsx: 5.3.2(acorn@8.11.2)
+      acorn: 8.11.3
+      acorn-jsx: 5.3.2(acorn@8.11.3)
       eslint-visitor-keys: 3.4.3
     dev: true
 
@@ -12388,7 +11975,6 @@ packages:
     resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
     dependencies:
       '@types/estree': 1.0.5
-    dev: false
 
   /esutils@2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
@@ -12431,6 +12017,7 @@ packages:
   /events@3.3.0:
     resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
     engines: {node: '>=0.8.x'}
+    dev: false
 
   /execa@0.7.0:
     resolution: {integrity: sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==}
@@ -12708,8 +12295,8 @@ packages:
       secure-json-parse: 2.7.0
     dev: false
 
-  /fastify@4.24.3:
-    resolution: {integrity: sha512-6HHJ+R2x2LS3y1PqxnwEIjOTZxFl+8h4kSC/TuDPXtA+v2JnV9yEtOsNSKK1RMD7sIR2y1ZsA4BEFaid/cK5pg==}
+  /fastify@4.25.2:
+    resolution: {integrity: sha512-SywRouGleDHvRh054onj+lEZnbC1sBCLkR0UY3oyJwjD4BdZJUrxBqfkfCaqn74pVCwBaRHGuL3nEWeHbHzAfw==}
     dependencies:
       '@fastify/ajv-compiler': 3.5.0
       '@fastify/error': 3.4.0
@@ -12721,7 +12308,7 @@ packages:
       find-my-way: 7.7.0
       light-my-request: 5.11.0
       pino: 8.17.0
-      process-warning: 2.2.0
+      process-warning: 3.0.0
       proxy-addr: 2.0.7
       rfdc: 1.3.0
       secure-json-parse: 2.7.0
@@ -12796,9 +12383,9 @@ packages:
       token-types: 5.0.1
     dev: false
 
-  /file-type@18.7.0:
-    resolution: {integrity: sha512-ihHtXRzXEziMrQ56VSgU7wkxh55iNchFkosu7Y9/S+tXHdKyrGjVK0ujbqNnsxzea+78MaLhN6PGmfYSAv1ACw==}
-    engines: {node: '>=14.16'}
+  /file-type@19.0.0:
+    resolution: {integrity: sha512-s7cxa7/leUWLiXO78DVVfBVse+milos9FitauDLG1pI7lNaJ2+5lzPnr2N24ym+84HVwJL6hVuGfgVE+ALvU8Q==}
+    engines: {node: '>=18'}
     dependencies:
       readable-web-to-node-stream: 3.0.2
       strtok3: 7.0.0
@@ -13561,8 +13148,8 @@ packages:
     hasBin: true
     dev: true
 
-  /headers-polyfill@3.2.5:
-    resolution: {integrity: sha512-tUCGvt191vNSQgttSyJoibR+VO+I6+iCHIUdhzEMJKE+EAL8BwCN7fUOZlY4ofOelNHsK+gEjxB/B+9N3EWtdA==}
+  /headers-polyfill@4.0.2:
+    resolution: {integrity: sha512-EWGTfnTqAO2L/j5HZgoM/3z82L7necsJ0pO9Tp0X1wil3PDLrkypTBRgVO2ExehEEvUycejZD3FuRaXpZZc3kw==}
     dev: true
 
   /highlight.js@10.7.3:
@@ -13678,11 +13265,9 @@ packages:
       quick-lru: 5.1.1
       resolve-alpn: 1.2.1
 
-  /http_ece@1.1.0:
-    resolution: {integrity: sha512-bptAfCDdPJxOs5zYSe7Y3lpr772s1G346R4Td5LgRUeCwIGpCGDUTJxRrhTNcAXbx37spge0kWEIH7QAYWNTlA==}
-    engines: {node: '>=4'}
-    dependencies:
-      urlsafe-base64: 1.0.0
+  /http_ece@1.2.0:
+    resolution: {integrity: sha512-JrF8SSLVmcvc5NducxgyOrKXe3EsyHMgBFgSaIUGmArKe+rwr0uphRkRXvwiom3I+fpIfoItveHrfudL8/rxuA==}
+    engines: {node: '>=16'}
     dev: false
 
   /https-proxy-agent@2.2.4:
@@ -13716,16 +13301,6 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /https-proxy-agent@7.0.0:
-    resolution: {integrity: sha512-0euwPCRyAPSgGdzD1IVN9nJYHtBhJwb6XPfbpQcYbPCwrBidX6GzxmchnaF4sfF/jPb74Ojx5g4yTg3sixlyPw==}
-    engines: {node: '>= 14'}
-    dependencies:
-      agent-base: 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
   /https-proxy-agent@7.0.2:
     resolution: {integrity: sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==}
     engines: {node: '>= 14'}
@@ -14293,12 +13868,17 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /istanbul-lib-coverage@3.2.2:
+    resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
+    engines: {node: '>=8'}
+    dev: true
+
   /istanbul-lib-instrument@5.2.1:
     resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
     engines: {node: '>=8'}
     dependencies:
       '@babel/core': 7.23.5
-      '@babel/parser': 7.23.5
+      '@babel/parser': 7.23.6
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.0
       semver: 6.3.1
@@ -14311,7 +13891,7 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       '@babel/core': 7.23.5
-      '@babel/parser': 7.23.5
+      '@babel/parser': 7.23.6
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.0
       semver: 7.5.4
@@ -14323,7 +13903,7 @@ packages:
     resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==}
     engines: {node: '>=10'}
     dependencies:
-      istanbul-lib-coverage: 3.2.0
+      istanbul-lib-coverage: 3.2.2
       make-dir: 4.0.0
       supports-color: 7.2.0
     dev: true
@@ -14333,7 +13913,7 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       debug: 4.3.4(supports-color@8.1.1)
-      istanbul-lib-coverage: 3.2.0
+      istanbul-lib-coverage: 3.2.2
       source-map: 0.6.1
     transitivePeerDependencies:
       - supports-color
@@ -14347,6 +13927,14 @@ packages:
       istanbul-lib-report: 3.0.1
     dev: true
 
+  /istanbul-reports@3.1.6:
+    resolution: {integrity: sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==}
+    engines: {node: '>=8'}
+    dependencies:
+      html-escaper: 2.0.2
+      istanbul-lib-report: 3.0.1
+    dev: true
+
   /iterare@1.2.1:
     resolution: {integrity: sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==}
     engines: {node: '>=6'}
@@ -14407,7 +13995,7 @@ packages:
       - supports-color
     dev: true
 
-  /jest-cli@29.7.0(@types/node@20.10.5):
+  /jest-cli@29.7.0(@types/node@20.11.5):
     resolution: {integrity: sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -14421,10 +14009,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.10.5)
+      create-jest: 29.7.0(@types/node@20.11.5)
       exit: 0.1.2
       import-local: 3.1.0
-      jest-config: 29.7.0(@types/node@20.10.5)
+      jest-config: 29.7.0(@types/node@20.11.5)
       jest-util: 29.7.0
       jest-validate: 29.7.0
       yargs: 17.6.2
@@ -14435,46 +14023,6 @@ packages:
       - ts-node
     dev: true
 
-  /jest-config@29.7.0(@types/node@20.10.5):
-    resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      '@types/node': '*'
-      ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      ts-node:
-        optional: true
-    dependencies:
-      '@babel/core': 7.22.11
-      '@jest/test-sequencer': 29.7.0
-      '@jest/types': 29.6.3
-      '@types/node': 20.10.5
-      babel-jest: 29.7.0(@babel/core@7.22.11)
-      chalk: 4.1.2
-      ci-info: 3.7.1
-      deepmerge: 4.2.2
-      glob: 7.2.3
-      graceful-fs: 4.2.11
-      jest-circus: 29.7.0
-      jest-environment-node: 29.7.0
-      jest-get-type: 29.6.3
-      jest-regex-util: 29.6.3
-      jest-resolve: 29.7.0
-      jest-runner: 29.7.0
-      jest-util: 29.7.0
-      jest-validate: 29.7.0
-      micromatch: 4.0.5
-      parse-json: 5.2.0
-      pretty-format: 29.7.0
-      slash: 3.0.0
-      strip-json-comments: 3.1.1
-    transitivePeerDependencies:
-      - babel-plugin-macros
-      - supports-color
-    dev: true
-
   /jest-config@29.7.0(@types/node@20.11.5):
     resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -14669,7 +14217,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 20.10.5
+      '@types/node': 20.11.5
       jest-util: 29.7.0
     dev: true
 
@@ -14857,7 +14405,7 @@ packages:
       supports-color: 8.1.1
     dev: true
 
-  /jest@29.7.0(@types/node@20.10.5):
+  /jest@29.7.0(@types/node@20.11.5):
     resolution: {integrity: sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -14870,7 +14418,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.10.5)
+      jest-cli: 29.7.0(@types/node@20.11.5)
     transitivePeerDependencies:
       - '@types/node'
       - babel-plugin-macros
@@ -14967,7 +14515,7 @@ packages:
         optional: true
     dependencies:
       '@babel/core': 7.23.5
-      '@babel/parser': 7.23.5
+      '@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)
@@ -14991,8 +14539,8 @@ packages:
       - supports-color
     dev: true
 
-  /jsdom@23.0.1(bufferutil@4.0.7)(utf-8-validate@6.0.3):
-    resolution: {integrity: sha512-2i27vgvlUsGEBO9+/kJQRbtqtm+191b5zAZrU/UezVmnC2dlDAFLgDYJvAEi94T4kjsRKkezEtLQTgsNEsW2lQ==}
+  /jsdom@23.2.0(bufferutil@4.0.7)(utf-8-validate@6.0.3):
+    resolution: {integrity: sha512-L88oL7D/8ufIES+Zjz7v0aes+oBMh2Xnh3ygWvL0OaICOomKEPKuPnIfBJekiXr+BHbbMjrWn/xqrDQuxFTeyA==}
     engines: {node: '>=18'}
     peerDependencies:
       canvas: ^2.11.2
@@ -15000,7 +14548,8 @@ packages:
       canvas:
         optional: true
     dependencies:
-      cssstyle: 3.0.0
+      '@asamuzakjp/dom-selector': 2.0.2
+      cssstyle: 4.0.1
       data-urls: 5.0.0
       decimal.js: 10.4.3
       form-data: 4.0.0
@@ -15008,7 +14557,6 @@ packages:
       http-proxy-agent: 7.0.0
       https-proxy-agent: 7.0.2
       is-potential-custom-element-name: 1.0.1
-      nwsapi: 2.2.7
       parse5: 7.1.2
       rrweb-cssom: 0.6.0
       saxes: 6.0.0
@@ -15019,7 +14567,7 @@ packages:
       whatwg-encoding: 3.1.1
       whatwg-mimetype: 4.0.0
       whatwg-url: 14.0.0
-      ws: 8.15.1(bufferutil@4.0.7)(utf-8-validate@6.0.3)
+      ws: 8.16.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
       xml-name-validator: 5.0.0
     transitivePeerDependencies:
       - bufferutil
@@ -15045,17 +14593,6 @@ packages:
     resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
     dev: true
 
-  /json-schema-resolver@2.0.0:
-    resolution: {integrity: sha512-pJ4XLQP4Q9HTxl6RVDLJ8Cyh1uitSs0CzDBAz1uoJ4sRD/Bk7cFSXL1FUXDW3zJ7YnfliJx6eu8Jn283bpZ4Yg==}
-    engines: {node: '>=10'}
-    dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
-      rfdc: 1.3.0
-      uri-js: 4.4.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
   /json-schema-traverse@0.4.1:
     resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
 
@@ -15152,8 +14689,8 @@ packages:
       verror: 1.10.0
     dev: true
 
-  /jsrsasign@10.9.0:
-    resolution: {integrity: sha512-QWLUikj1SBJGuyGK8tjKSx3K7Y69KYJnrs/pQ1KZ6wvZIkHkWjZ1PJDpuvc1/28c1uP0KW9qn1eI1LzHQqDOwQ==}
+  /jsrsasign@11.0.0:
+    resolution: {integrity: sha512-BtRwVKS+5dsgPpAtzJcpo5OoWjSs1/zllSBG0+8o8/aV0Ki76m6iZwHnwnsqoTdhfFZDN1XIdcaZr5ZkP+H2gg==}
     dev: false
 
   /jssha@3.3.1:
@@ -15297,9 +14834,12 @@ packages:
       wrap-ansi: 7.0.0
     dev: true
 
-  /local-pkg@0.4.3:
-    resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==}
+  /local-pkg@0.5.0:
+    resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==}
     engines: {node: '>=14'}
+    dependencies:
+      mlly: 1.5.0
+      pkg-types: 1.0.3
     dev: true
 
   /locate-path@3.0.0:
@@ -15393,6 +14933,13 @@ packages:
 
   /loupe@2.3.6:
     resolution: {integrity: sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==}
+    deprecated: Please upgrade to 2.3.7 which fixes GHSA-4q6p-r6v2-jvc5
+    dependencies:
+      get-func-name: 2.0.2
+    dev: true
+
+  /loupe@2.3.7:
+    resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==}
     dependencies:
       get-func-name: 2.0.2
     dev: true
@@ -15453,19 +15000,20 @@ packages:
       '@jridgewell/sourcemap-codec': 1.4.15
     dev: true
 
-  /magic-string@0.30.3:
-    resolution: {integrity: sha512-B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.4.15
-    dev: true
-
   /magic-string@0.30.5:
     resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==}
     engines: {node: '>=12'}
     dependencies:
       '@jridgewell/sourcemap-codec': 1.4.15
 
+  /magicast@0.3.3:
+    resolution: {integrity: sha512-ZbrP1Qxnpoes8sz47AM0z08U+jW6TyRgZzcWy3Ma3vDhJttwMwAFDMMQFobwdBxByBD46JYmxRzeF7w2+wJEuw==}
+    dependencies:
+      '@babel/parser': 7.23.6
+      '@babel/types': 7.23.6
+      source-map-js: 1.0.2
+    dev: true
+
   /mailcheck@1.1.1:
     resolution: {integrity: sha512-3WjL8+ZDouZwKlyJBMp/4LeziLFXgleOdsYu87piGcMLqhBzCsy2QFdbtAwv757TFC/rtqd738fgJw1tFQCSgA==}
     dev: false
@@ -15569,8 +15117,8 @@ packages:
     resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
     engines: {node: '>= 0.6'}
 
-  /meilisearch@0.36.0:
-    resolution: {integrity: sha512-swcvEYrct0/zsGj3jlbPm1OYxbH14IURnlysKlXywNicIQ5EMkSYLYCLCwOuBKAaGcdISWdgdylH9TXVLegmOQ==}
+  /meilisearch@0.37.0:
+    resolution: {integrity: sha512-LdbK6JmRghCawrmWKJSEQF0OiE82md+YqJGE/U2JcCD8ROwlhTx0KM6NX4rQt0u0VpV0QZVG9umYiu3CSSIJAQ==}
     dependencies:
       cross-fetch: 3.1.6
     transitivePeerDependencies:
@@ -15836,13 +15384,13 @@ packages:
     hasBin: true
     dev: false
 
-  /mlly@1.4.0:
-    resolution: {integrity: sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==}
+  /mlly@1.5.0:
+    resolution: {integrity: sha512-NPVQvAY1xr1QoVeG0cy8yUYC7FQcOx6evl/RjT1wL5FvzPnzOysoqB/jmx/DhssT2dYa8nxECLAaFI/+gVLhDQ==}
     dependencies:
-      acorn: 8.11.2
-      pathe: 1.1.1
+      acorn: 8.11.3
+      pathe: 1.1.2
       pkg-types: 1.0.3
-      ufo: 1.1.2
+      ufo: 1.3.2
     dev: true
 
   /mnemonist@0.39.6:
@@ -15891,55 +15439,54 @@ packages:
     dev: false
     optional: true
 
-  /msgpackr@1.9.2:
-    resolution: {integrity: sha512-xtDgI3Xv0AAiZWLRGDchyzBwU6aq0rwJ+W+5Y4CZhEWtkl/hJtFFLc+3JtGTw7nz1yquxs7nL8q/yA2aqpflIQ==}
+  /msgpackr@1.10.1:
+    resolution: {integrity: sha512-r5VRLv9qouXuLiIBrLpl2d5ZvPt8svdQTl5/vMvE4nzDMyEX4sgW5yWhuBBj5UmgwOTWj8CIdSXn5sAfsHAWIQ==}
     optionalDependencies:
       msgpackr-extract: 3.0.2
     dev: false
 
-  /msw-storybook-addon@1.10.0(msw@1.3.2):
+  /msw-storybook-addon@1.10.0(msw@2.1.2):
     resolution: {integrity: sha512-soCTMTf7DnLeaMnFHPrtVgbyeFTJALVvnDHpzzXpJad+HOzJgQdwU4EAzVfDs1q+X5cVEgxOdAhSMC7ljvnSXg==}
     peerDependencies:
       msw: '>=0.35.0 <2.0.0'
     dependencies:
       is-node-process: 1.2.0
-      msw: 1.3.2(typescript@5.3.3)
+      msw: 2.1.2(typescript@5.3.3)
     dev: true
 
-  /msw@1.3.2(typescript@5.3.3):
-    resolution: {integrity: sha512-wKLhFPR+NitYTkQl5047pia0reNGgf0P6a1eTnA5aNlripmiz0sabMvvHcicE8kQ3/gZcI0YiPFWmYfowfm3lA==}
-    engines: {node: '>=14'}
+  /msw@2.1.2(typescript@5.3.3):
+    resolution: {integrity: sha512-7OKbeZNFQTCPFe++o+zZHMkQRIUi4D/5N1dAD3lOlaV+2Wpv3Srp3VFrFeH+2ftZJbb4jAiC0caZoW1efr80KQ==}
+    engines: {node: '>=18'}
     hasBin: true
     requiresBuild: true
     peerDependencies:
-      typescript: '>= 4.4.x <= 5.2.x'
+      typescript: '>= 4.7.x <= 5.3.x'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@mswjs/cookies': 0.2.2
-      '@mswjs/interceptors': 0.17.10
-      '@open-draft/until': 1.0.3
-      '@types/cookie': 0.4.1
-      '@types/js-levenshtein': 1.1.1
+      '@bundled-es-modules/cookie': 2.0.0
+      '@bundled-es-modules/js-levenshtein': 2.0.1
+      '@bundled-es-modules/statuses': 1.0.1
+      '@mswjs/cookies': 1.1.0
+      '@mswjs/interceptors': 0.25.14
+      '@open-draft/until': 2.1.0
+      '@types/cookie': 0.6.0
+      '@types/js-levenshtein': 1.1.3
+      '@types/statuses': 2.0.4
       chalk: 4.1.2
       chokidar: 3.5.3
-      cookie: 0.4.2
       graphql: 16.8.1
-      headers-polyfill: 3.2.5
+      headers-polyfill: 4.0.2
       inquirer: 8.2.5
       is-node-process: 1.2.0
       js-levenshtein: 1.1.6
-      node-fetch: 2.7.0
-      outvariant: 1.4.0
+      outvariant: 1.4.2
       path-to-regexp: 6.2.1
-      strict-event-emitter: 0.4.6
-      type-fest: 2.19.0
+      strict-event-emitter: 0.5.1
+      type-fest: 4.9.0
       typescript: 5.3.3
-      yargs: 17.6.2
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
+      yargs: 17.7.2
     dev: true
 
   /muggle-string@0.3.1:
@@ -16195,8 +15742,8 @@ packages:
   /node-releases@2.0.14:
     resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==}
 
-  /nodemailer@6.9.7:
-    resolution: {integrity: sha512-rUtR77ksqex/eZRLmQ21LKVH5nAAsVicAtAYudK7JgwenEDZ0UIQ1adUGqErz7sMkWYxWTTU1aeP2Jga6WQyJw==}
+  /nodemailer@6.9.8:
+    resolution: {integrity: sha512-cfrYUk16e67Ks051i4CntM9kshRYei1/o/Gi8K1d+R34OIs21xdFnW7Pt7EucmVKA0LKtqUGNcjMZ7ehjl49mQ==}
     engines: {node: '>=6.0.0'}
     dev: false
 
@@ -16217,6 +15764,23 @@ packages:
       undefsafe: 2.0.5
     dev: true
 
+  /nodemon@3.0.3:
+    resolution: {integrity: sha512-7jH/NXbFPxVaMwmBCC2B9F/V6X1VkEdNgx3iu9jji8WxWcvhMWkmhNWhI5077zknOnZnBzba9hZP6bCPJLSReQ==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      chokidar: 3.5.3
+      debug: 4.3.4(supports-color@5.5.0)
+      ignore-by-default: 1.0.1
+      minimatch: 3.1.2
+      pstree.remy: 1.1.8
+      semver: 7.5.4
+      simple-update-notifier: 2.0.0
+      supports-color: 5.5.0
+      touch: 3.1.0
+      undefsafe: 2.0.5
+    dev: true
+
   /nofilter@3.1.0:
     resolution: {integrity: sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g==}
     engines: {node: '>=12.19'}
@@ -16330,10 +15894,6 @@ packages:
     dependencies:
       boolbase: 1.0.0
 
-  /nwsapi@2.2.7:
-    resolution: {integrity: sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==}
-    dev: false
-
   /oauth-sign@0.9.0:
     resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==}
     dev: false
@@ -16478,6 +16038,7 @@ packages:
 
   /openapi-types@12.1.3:
     resolution: {integrity: sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw==}
+    dev: true
 
   /openapi-typescript@6.7.3:
     resolution: {integrity: sha512-es3mGcDXV6TKPo6n3aohzHm0qxhLyR39MhF6mkD1FwFGjhxnqMqfSIgM0eCpInZvqatve4CxmXcMZw3jnnsaXw==}
@@ -16543,14 +16104,14 @@ packages:
     resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}
     dev: true
 
-  /otpauth@9.2.1:
-    resolution: {integrity: sha512-/MRvcm63pzK20NCsIOe8Btun42/yWNylPbUo/h5dMpSRJpoAJstWodEUjm4zUDeT1+Vbqif2E8IcP4trl1U4gQ==}
+  /otpauth@9.2.2:
+    resolution: {integrity: sha512-2VcnYRUmq1dNckIfySNYP32ITWp1bvTeAEW0BSCR6G3GBf3a5zb9E+ubY62t3Dma9RjoHlvd7QpmzHfJZRkiNg==}
     dependencies:
       jssha: 3.3.1
     dev: false
 
-  /outvariant@1.4.0:
-    resolution: {integrity: sha512-AlWY719RF02ujitly7Kk/0QlV+pXGFDHrHf9O2OKqyqgBieaPOIeuSkL8sRK6j2WK+/ZAURq2kZsY0d8JapUiw==}
+  /outvariant@1.4.2:
+    resolution: {integrity: sha512-Ou3dJ6bA/UJ5GVHxah4LnqDwZRwAmWxrG3wtrHrbGnP4RnLCtA64A4F+ae7Y8ww660JaddSoArUR5HjipWSHAQ==}
     dev: true
 
   /p-cancelable@2.1.1:
@@ -16584,9 +16145,9 @@ packages:
     dependencies:
       yocto-queue: 0.1.0
 
-  /p-limit@4.0.0:
-    resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  /p-limit@5.0.0:
+    resolution: {integrity: sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==}
+    engines: {node: '>=18'}
     dependencies:
       yocto-queue: 1.0.0
     dev: true
@@ -16764,6 +16325,10 @@ packages:
     resolution: {integrity: sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==}
     dev: true
 
+  /pathe@1.1.2:
+    resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
+    dev: true
+
   /pathval@1.1.1:
     resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==}
     dev: true
@@ -16965,7 +16530,7 @@ packages:
     resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==}
     dependencies:
       jsonc-parser: 3.2.0
-      mlly: 1.4.0
+      mlly: 1.5.0
       pathe: 1.1.1
     dev: true
 
@@ -17001,22 +16566,22 @@ packages:
     resolution: {integrity: sha512-Sz2Lkdxz6F2Pgnpi9U5Ng/WdWAUZxmHrNPoVlm3aAemxoy2Qy7LGjQg4uf8qKelDAUW94F4np3iH2YPf2qefcQ==}
     engines: {node: '>=10'}
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
     dev: true
 
-  /postcss-calc@9.0.1(postcss@8.4.32):
+  /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.32
+      postcss: 8.4.33
       postcss-selector-parser: 6.0.13
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-colormin@6.0.1(postcss@8.4.32):
-    resolution: {integrity: sha512-Tb9aR2wCJCzKuNjIeMzVNd0nXjQy25HDgFmmaRsHnP0eP/k8uQWE4S8voX5S2coO5CeKrp+USFs1Ayv9Tpxx6w==}
+  /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
@@ -17024,244 +16589,244 @@ packages:
       browserslist: 4.22.2
       caniuse-api: 3.0.0
       colord: 2.9.3
-      postcss: 8.4.32
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-convert-values@6.0.1(postcss@8.4.32):
-    resolution: {integrity: sha512-zTd4Vh0HxGkhg5aHtfCogcRHzGkvblfdWlQ53lIh1cJhYcGyIxh2hgtKoVh40AMktRERet+JKdB04nNG19kjmA==}
+  /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.22.2
-      postcss: 8.4.32
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-discard-comments@6.0.1(postcss@8.4.32):
+  /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.32
+      postcss: 8.4.33
     dev: false
 
-  /postcss-discard-duplicates@6.0.1(postcss@8.4.32):
+  /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.32
+      postcss: 8.4.33
     dev: false
 
-  /postcss-discard-empty@6.0.1(postcss@8.4.32):
+  /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.32
+      postcss: 8.4.33
     dev: false
 
-  /postcss-discard-overridden@6.0.1(postcss@8.4.32):
+  /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.32
+      postcss: 8.4.33
     dev: false
 
-  /postcss-merge-longhand@6.0.1(postcss@8.4.32):
-    resolution: {integrity: sha512-vmr/HZQzaPXc45FRvSctqFTF05UaDnTn5ABX+UtQPJznDWT/QaFbVc/pJ5C2YPxx2J2XcfmWowlKwtCDwiQ5hA==}
+  /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.32
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
-      stylehacks: 6.0.1(postcss@8.4.32)
+      stylehacks: 6.0.2(postcss@8.4.33)
     dev: false
 
-  /postcss-merge-rules@6.0.2(postcss@8.4.32):
-    resolution: {integrity: sha512-6lm8bl0UfriSfxI+F/cezrebqqP8w702UC6SjZlUlBYwuRVNbmgcJuQU7yePIvD4MNT53r/acQCUAyulrpgmeQ==}
+  /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.22.2
       caniuse-api: 3.0.0
-      cssnano-utils: 4.0.1(postcss@8.4.32)
-      postcss: 8.4.32
-      postcss-selector-parser: 6.0.13
+      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.1(postcss@8.4.32):
+  /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.32
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-minify-gradients@6.0.1(postcss@8.4.32):
+  /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.1(postcss@8.4.32)
-      postcss: 8.4.32
+      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.0.1(postcss@8.4.32):
-    resolution: {integrity: sha512-eFvGWArqh4khPIgPDu6SZNcaLctx97nO7c59OXnRtGntAp5/VS4gjMhhW9qUFsK6mQ27pEZGt2kR+mPizI+Z9g==}
+  /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.22.2
-      cssnano-utils: 4.0.1(postcss@8.4.32)
-      postcss: 8.4.32
+      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.1(postcss@8.4.32):
-    resolution: {integrity: sha512-mfReq5wrS6vkunxvJp6GDuOk+Ak6JV7134gp8L+ANRnV9VwqzTvBtX6lpohooVU750AR0D3pVx2Zn6uCCwOAfQ==}
+  /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.32
-      postcss-selector-parser: 6.0.13
+      postcss: 8.4.33
+      postcss-selector-parser: 6.0.15
     dev: false
 
-  /postcss-normalize-charset@6.0.1(postcss@8.4.32):
+  /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.32
+      postcss: 8.4.33
     dev: false
 
-  /postcss-normalize-display-values@6.0.1(postcss@8.4.32):
+  /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.32
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-normalize-positions@6.0.1(postcss@8.4.32):
+  /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.32
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-normalize-repeat-style@6.0.1(postcss@8.4.32):
+  /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.32
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-normalize-string@6.0.1(postcss@8.4.32):
+  /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.32
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-normalize-timing-functions@6.0.1(postcss@8.4.32):
+  /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.32
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-normalize-unicode@6.0.1(postcss@8.4.32):
-    resolution: {integrity: sha512-ok9DsI94nEF79MkvmLfHfn8ddnKXA7w+8YuUoz5m7b6TOdoaRCpvu/QMHXQs9+DwUbvp+ytzz04J55CPy77PuQ==}
+  /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.22.2
-      postcss: 8.4.32
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-normalize-url@6.0.1(postcss@8.4.32):
+  /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.32
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-normalize-whitespace@6.0.1(postcss@8.4.32):
+  /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.32
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
-  /postcss-ordered-values@6.0.1(postcss@8.4.32):
+  /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.1(postcss@8.4.32)
-      postcss: 8.4.32
+      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.0.1(postcss@8.4.32):
-    resolution: {integrity: sha512-cgzsI2ThG1PMSdSyM9A+bVxiiVgPIVz9f5c6H+TqEv0CA89iCOO81mwLWRWLgOKFtQkKob9nNpnkxG/1RlgFcA==}
+  /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.22.2
       caniuse-api: 3.0.0
-      postcss: 8.4.32
+      postcss: 8.4.33
     dev: false
 
-  /postcss-reduce-transforms@6.0.1(postcss@8.4.32):
+  /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.32
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
     dev: false
 
@@ -17272,25 +16837,33 @@ packages:
       cssesc: 3.0.0
       util-deprecate: 1.0.2
 
-  /postcss-svgo@6.0.1(postcss@8.4.32):
-    resolution: {integrity: sha512-eWV4Rrqa06LzTgqirOv5Ln6WTGyU7Pbeqj9WEyKo9tpnWixNATVJMeaEcOHOW1ZYyjcG8wSJwX/28DvU3oy3HA==}
+  /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.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.32
+      postcss: 8.4.33
       postcss-value-parser: 4.2.0
-      svgo: 3.1.0
+      svgo: 3.2.0
     dev: false
 
-  /postcss-unique-selectors@6.0.1(postcss@8.4.32):
-    resolution: {integrity: sha512-/KCCEpNNR7oXVJ38/Id7GC9Nt0zxO1T3zVbhVaq6F6LSG+3gU3B7+QuTHfD0v8NPEHlzewAout29S0InmB78EQ==}
+  /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.32
-      postcss-selector-parser: 6.0.13
+      postcss: 8.4.33
+      postcss-selector-parser: 6.0.15
     dev: false
 
   /postcss-value-parser@4.2.0:
@@ -17305,6 +16878,14 @@ packages:
       picocolors: 1.0.0
       source-map-js: 1.0.2
 
+  /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
+
   /postgres-array@2.0.0:
     resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
     engines: {node: '>=4'}
@@ -17382,8 +16963,8 @@ packages:
     hasBin: true
     dev: true
 
-  /prettier@3.1.1:
-    resolution: {integrity: sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==}
+  /prettier@3.2.4:
+    resolution: {integrity: sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==}
     engines: {node: '>=14'}
     hasBin: true
     dev: true
@@ -17463,6 +17044,10 @@ packages:
     resolution: {integrity: sha512-/1WZ8+VQjR6avWOgHeEPd7SDQmFQ1B5mC1eRXsCm5TarlNmx/wCsa5GEaxGm05BORRtyG/Ex/3xq3TuRvq57qg==}
     dev: false
 
+  /process-warning@3.0.0:
+    resolution: {integrity: sha512-mqn0kFRl0EoqhnL0GQ0veqFHyIN1yig9RHh/InzORTUiZHFRAur+aMtRkELNwGs9aNwKS6tg/An4NYBPGwvtzQ==}
+    dev: false
+
   /process@0.11.10:
     resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
     engines: {node: '>= 0.6.0'}
@@ -18123,7 +17708,7 @@ packages:
   /regenerator-transform@0.15.2:
     resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==}
     dependencies:
-      '@babel/runtime': 7.23.2
+      '@babel/runtime': 7.23.4
     dev: true
 
   /regexp.prototype.flags@1.4.3:
@@ -18362,24 +17947,26 @@ packages:
       fsevents: 2.3.3
     dev: true
 
-  /rollup@4.9.1:
-    resolution: {integrity: sha512-pgPO9DWzLoW/vIhlSoDByCzcpX92bKEorbgXuZrqxByte3JFk2xSW2JEeAcyLc9Ru9pqcNNW+Ob7ntsk2oT/Xw==}
+  /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.9.1
-      '@rollup/rollup-android-arm64': 4.9.1
-      '@rollup/rollup-darwin-arm64': 4.9.1
-      '@rollup/rollup-darwin-x64': 4.9.1
-      '@rollup/rollup-linux-arm-gnueabihf': 4.9.1
-      '@rollup/rollup-linux-arm64-gnu': 4.9.1
-      '@rollup/rollup-linux-arm64-musl': 4.9.1
-      '@rollup/rollup-linux-riscv64-gnu': 4.9.1
-      '@rollup/rollup-linux-x64-gnu': 4.9.1
-      '@rollup/rollup-linux-x64-musl': 4.9.1
-      '@rollup/rollup-win32-arm64-msvc': 4.9.1
-      '@rollup/rollup-win32-ia32-msvc': 4.9.1
-      '@rollup/rollup-win32-x64-msvc': 4.9.1
+      '@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:
@@ -18457,8 +18044,8 @@ packages:
       postcss: 8.4.32
     dev: false
 
-  /sass@1.69.5:
-    resolution: {integrity: sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==}
+  /sass@1.70.0:
+    resolution: {integrity: sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ==}
     engines: {node: '>=14.0.0'}
     hasBin: true
     dependencies:
@@ -18556,6 +18143,7 @@ packages:
 
   /set-cookie-parser@2.6.0:
     resolution: {integrity: sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==}
+    dev: false
 
   /setimmediate@1.0.5:
     resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
@@ -18675,12 +18263,12 @@ packages:
       semver: 7.5.4
     dev: true
 
-  /sinon@14.0.2:
-    resolution: {integrity: sha512-PDpV0ZI3ZCS3pEqx0vpNp6kzPhHrLx72wA0G+ZLaaJjLIYeE0n8INlgaohKuGy7hP0as5tbUd23QWu5U233t+w==}
+  /sinon@16.1.3:
+    resolution: {integrity: sha512-mjnWWeyxcAf9nC0bXcPmiDut+oE8HYridTNzBbF98AYVLmWwGRp2ISEpyhYflG1ifILT+eNn3BmKUJPxjXUPlA==}
     dependencies:
-      '@sinonjs/commons': 2.0.0
-      '@sinonjs/fake-timers': 9.1.2
-      '@sinonjs/samsam': 7.0.1
+      '@sinonjs/commons': 3.0.0
+      '@sinonjs/fake-timers': 10.3.0
+      '@sinonjs/samsam': 8.0.0
       diff: 5.1.0
       nise: 5.1.4
       supports-color: 7.2.0
@@ -19023,8 +18611,8 @@ packages:
     resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
     engines: {node: '>= 0.8'}
 
-  /std-env@3.3.3:
-    resolution: {integrity: sha512-Rz6yejtVyWnVjC1RFvNmYL10kgjC49EOghxWn0RFqlCHGFpQx+Xe7yW3I4ceK1SGrWIGMjD5Kbue8W/udkbMJg==}
+  /std-env@3.7.0:
+    resolution: {integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==}
     dev: true
 
   /stop-iteration-iterator@1.0.0:
@@ -19038,11 +18626,11 @@ packages:
     resolution: {integrity: sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w==}
     dev: true
 
-  /storybook@7.6.5:
-    resolution: {integrity: sha512-uHPrL+g/0v6iIVtDA8J0uWd3jDZcdr51lCR/vPXTkrCY1uVaFjswzl8EMy5PR05I7jMpKUzkJWZtFbgbh9e1Bw==}
+  /storybook@7.6.10:
+    resolution: {integrity: sha512-ypFeGhQTUBBfqSUVZYh7wS5ghn3O2wILCiQc4459SeUpvUn+skcqw/TlrwGSoF5EWjDA7gtRrWDxO3mnlPt5Cw==}
     hasBin: true
     dependencies:
-      '@storybook/cli': 7.6.5
+      '@storybook/cli': 7.6.10
     transitivePeerDependencies:
       - bufferutil
       - encoding
@@ -19094,14 +18682,8 @@ packages:
     resolution: {integrity: sha512-Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA==}
     dev: false
 
-  /strict-event-emitter@0.2.8:
-    resolution: {integrity: sha512-KDf/ujU8Zud3YaLtMCcTI4xkZlZVIYxTLr+XIULexP+77EEVWixeXroLUXQXiVtH4XH2W7jr/3PT1v3zBuvc3A==}
-    dependencies:
-      events: 3.3.0
-    dev: true
-
-  /strict-event-emitter@0.4.6:
-    resolution: {integrity: sha512-12KWeb+wixJohmnwNFerbyiBrAlq5qJLwIt38etRtKtmmHyDSoGlIqFE9wx+4IwG0aDjI7GV8tc8ZccjWZZtTg==}
+  /strict-event-emitter@0.5.1:
+    resolution: {integrity: sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==}
     dev: true
 
   /string-argv@0.3.1:
@@ -19235,10 +18817,10 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /strip-literal@1.0.1:
-    resolution: {integrity: sha512-QZTsipNpa2Ppr6v1AmJHESqJ3Uz247MUS0OjrnnZjFAvEoWqxuyFuXn2xLgMtRnijJShAa1HL0gtJyUs7u7n3Q==}
+  /strip-literal@1.3.0:
+    resolution: {integrity: sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==}
     dependencies:
-      acorn: 8.11.2
+      acorn: 8.11.3
     dev: true
 
   /strip-outer@2.0.0:
@@ -19258,15 +18840,15 @@ packages:
       peek-readable: 5.0.0
     dev: false
 
-  /stylehacks@6.0.1(postcss@8.4.32):
-    resolution: {integrity: sha512-jTqG2aIoX2fYg0YsGvqE4ooE/e75WmaEjnNiP6Ag7irLtHxML8NJRxRxS0HyDpde8DRGuEXTFVHVfR5Tmbxqzg==}
+  /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.22.2
-      postcss: 8.4.32
-      postcss-selector-parser: 6.0.13
+      postcss: 8.4.33
+      postcss-selector-parser: 6.0.15
     dev: false
 
   /supports-color@5.5.0:
@@ -19305,8 +18887,8 @@ packages:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
 
-  /svgo@3.1.0:
-    resolution: {integrity: sha512-R5SnNA89w1dYgNv570591F66v34b3eQShpIBcQtZtM5trJwm1VvxbIoMpRYY3ybTAutcKTLEmTsdnaknOHbiQA==}
+  /svgo@3.2.0:
+    resolution: {integrity: sha512-4PP6CMW/V7l/GmKRKzsLR8xxjdHTV4IMvhTnpuHwwBazSIlw5W/5SmPjN8Dwyt7lKbSJrRDgp4t9ph0HgChFBQ==}
     engines: {node: '>=14.0.0'}
     hasBin: true
     dependencies:
@@ -19327,8 +18909,8 @@ packages:
     resolution: {integrity: sha512-AsS729u2RHUfEra9xJrE39peJcc2stq2+poBXX8bcM08Y6g9j/i/PUzwNQqkaJde7Ntg1TO7bSREbR5sdosQ+g==}
     dev: true
 
-  /systeminformation@5.21.20:
-    resolution: {integrity: sha512-AyS1fNc+MDoAJtFknFbbo587H8h6yejJwM+H9rVusnOToIEkiMehMyD5JM7o3j55Cto20MawIZrcgNMgd4BfOQ==}
+  /systeminformation@5.21.23:
+    resolution: {integrity: sha512-hI8W9WoPKgRAahVsfqfqg7H6JyIQXoA5RKOohUSOeyZwG+D0vnLOdXaKAUvdaMaL6CCsfN4x3mQYUIY4Qaalcg==}
     engines: {node: '>=8.0.0'}
     os: [darwin, linux, win32, freebsd, openbsd, netbsd, sunos, android]
     hasBin: true
@@ -19428,13 +19010,13 @@ packages:
       unique-string: 2.0.0
     dev: true
 
-  /terser@5.26.0:
-    resolution: {integrity: sha512-dytTGoE2oHgbNV9nTzgBEPaqAWvcJNl66VZ0BkJqlvp71IjO8CxdBx/ykCNb47cLnCmCvRZ6ZR0tLkqvZCdVBQ==}
+  /terser@5.27.0:
+    resolution: {integrity: sha512-bi1HRwVRskAjheeYl291n3JC4GgO/Ty4z1nVs5AAsmonJulGxpSektecnNedrwK9C7vpvVtcX3cw00VSLt7U2A==}
     engines: {node: '>=10'}
     hasBin: true
     dependencies:
       '@jridgewell/source-map': 0.3.5
-      acorn: 8.11.2
+      acorn: 8.11.3
       commander: 2.20.3
       source-map-support: 0.5.21
 
@@ -19478,8 +19060,8 @@ packages:
       real-require: 0.2.0
     dev: false
 
-  /three@0.159.0:
-    resolution: {integrity: sha512-eCmhlLGbBgucuo4VEA9IO3Qpc7dh8Bd4VKzr7WfW4+8hMcIfoAVi1ev0pJYN9PTTsCslbcKgBwr2wNZ1EvLInA==}
+  /three@0.160.0:
+    resolution: {integrity: sha512-DLU8lc0zNIPkM7rH5/e1Ks1Z8tWCGRq6g8mPowdDJpw1CFBJMU7UoJjC6PefXW7z//SSl0b2+GCw14LB+uDhng==}
     dev: false
 
   /throttle-debounce@5.0.0:
@@ -19514,21 +19096,21 @@ packages:
     engines: {node: '>=6'}
     dev: false
 
-  /tinybench@2.5.0:
-    resolution: {integrity: sha512-kRwSG8Zx4tjF9ZiyH4bhaebu+EDz1BOx9hOigYHlUW4xxI/wKIUQUqo018UlU4ar6ATPBsaMrdbKZ+tmPdohFA==}
+  /tinybench@2.6.0:
+    resolution: {integrity: sha512-N8hW3PG/3aOoZAN5V/NSAEDz0ZixDSSt5b/a05iqtpgfLWMSVuCo7w0k2vVvEjdrIoeGqZzweX2WlyioNIHchA==}
     dev: true
 
   /tinycolor2@1.6.0:
     resolution: {integrity: sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==}
     dev: false
 
-  /tinypool@0.7.0:
-    resolution: {integrity: sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==}
+  /tinypool@0.8.2:
+    resolution: {integrity: sha512-SUszKYe5wgsxnNOVlBYO6IC+8VGWdVGZWAqUxp3UErNBtptZvWbwyUOyzNL59zigz2rCA92QiL3wvG+JDSdJdQ==}
     engines: {node: '>=14.0.0'}
     dev: true
 
-  /tinyspy@2.1.1:
-    resolution: {integrity: sha512-XPJL2uSzcOyBMky6OFrusqWlzfFrXtE0hPuMgW8A2HmaqrPo4ZQHRN/V0QXN3FSjKxpsbRrFc5LI7KOwBsT1/w==}
+  /tinyspy@2.2.0:
+    resolution: {integrity: sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==}
     engines: {node: '>=14.0.0'}
     dev: true
 
@@ -19690,8 +19272,8 @@ packages:
       strip-bom: 3.0.0
     dev: false
 
-  /tsd@0.30.0:
-    resolution: {integrity: sha512-aHL4rEuf3wwRzKCH8yqsE1oMAJYn7SAQ2JfWSgjr1e5/fqr+ggohQazECMpSoRAqSQeM/iIFugoyL/0eFwdTcA==}
+  /tsd@0.30.4:
+    resolution: {integrity: sha512-ncC4SwAeUk0OTcXt5h8l0/gOLHJSp9ogosvOADT6QYzrl0ITm398B3wkz8YESqefIsEEwvYAU8bvo7/rcN/M0Q==}
     engines: {node: '>=14.16'}
     hasBin: true
     dependencies:
@@ -19710,13 +19292,6 @@ packages:
   /tslib@2.5.0:
     resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==}
 
-  /tslib@2.5.3:
-    resolution: {integrity: sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==}
-
-  /tslib@2.6.1:
-    resolution: {integrity: sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==}
-    dev: false
-
   /tslib@2.6.2:
     resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
 
@@ -19785,6 +19360,11 @@ packages:
     engines: {node: '>=12.20'}
     dev: true
 
+  /type-fest@4.9.0:
+    resolution: {integrity: sha512-KS/6lh/ynPGiHD/LnAobrEFq3Ad4pBzOlJ1wAnJx9N4EYoqFhMfLIBjUT2UEx4wg5ZE+cC1ob6DCSpppVo+rtg==}
+    engines: {node: '>=16'}
+    dev: true
+
   /type-is@1.6.18:
     resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
     engines: {node: '>= 0.6'}
@@ -19833,20 +19413,20 @@ packages:
   /typedarray@0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
 
-  /typeorm@0.3.17(ioredis@5.3.2)(pg@8.11.3):
-    resolution: {integrity: sha512-UDjUEwIQalO9tWw9O2A4GU+sT3oyoUXheHJy4ft+RFdnRdQctdQ34L9SqE2p7LdwzafHx1maxT+bqXON+Qnmig==}
+  /typeorm@0.3.19(ioredis@5.3.2)(pg@8.11.3):
+    resolution: {integrity: sha512-OGelrY5qEoAU80mR1iyvmUHiKCPUydL6xp6bebXzS7jyv/X70Gp/jBWRAfF4qGOfy2A7orMiGRfwsBUNbEL65g==}
     engines: {node: '>= 12.9.0'}
     hasBin: true
     peerDependencies:
       '@google-cloud/spanner': ^5.18.0
       '@sap/hana-client': ^2.12.25
-      better-sqlite3: ^7.1.2 || ^8.0.0
+      better-sqlite3: ^7.1.2 || ^8.0.0 || ^9.0.0
       hdb-pool: ^0.1.6
       ioredis: ^5.0.4
-      mongodb: ^5.2.0
-      mssql: ^9.1.1
+      mongodb: ^5.8.0
+      mssql: ^9.1.1 || ^10.0.1
       mysql2: ^2.2.5 || ^3.0.1
-      oracledb: ^5.1.0
+      oracledb: ^6.3.0
       pg: ^8.5.1
       pg-native: ^3.0.0
       pg-query-stream: ^4.0.0
@@ -19896,35 +19476,29 @@ packages:
       buffer: 6.0.3
       chalk: 4.1.2
       cli-highlight: 2.1.11
-      date-fns: 2.30.0
+      dayjs: 1.11.10
       debug: 4.3.4(supports-color@8.1.1)
       dotenv: 16.0.3
-      glob: 8.1.0
+      glob: 10.3.10
       ioredis: 5.3.2
       mkdirp: 2.1.6
       pg: 8.11.3
       reflect-metadata: 0.1.14
       sha.js: 2.4.11
-      tslib: 2.5.3
-      uuid: 9.0.0
+      tslib: 2.6.2
+      uuid: 9.0.1
       yargs: 17.6.2
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /typescript@5.0.4:
-    resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==}
-    engines: {node: '>=12.20'}
-    hasBin: true
-    dev: true
-
   /typescript@5.3.3:
     resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==}
     engines: {node: '>=14.17'}
     hasBin: true
 
-  /ufo@1.1.2:
-    resolution: {integrity: sha512-TrY6DsjTQQgyS3E3dBaOXf0TpPD8u9FVrVYmKVegJuFw51n/YB9XPt+U6ydzFG5ZIN7+DIjPbNmXoBj9esYhgQ==}
+  /ufo@1.3.2:
+    resolution: {integrity: sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==}
     dev: true
 
   /uglify-js@3.17.4:
@@ -20077,7 +19651,7 @@ packages:
   /unplugin@1.4.0:
     resolution: {integrity: sha512-5x4eIEL6WgbzqGtF9UV8VEC/ehKptPXDS6L2b0mv4FRMkJxRtjaJfOWDd6a8+kYbqsjklix7yWP0N3SUepjXcg==}
     dependencies:
-      acorn: 8.11.2
+      acorn: 8.11.3
       chokidar: 3.5.3
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.5.0
@@ -20120,10 +19694,6 @@ packages:
       querystringify: 2.2.0
       requires-port: 1.0.0
 
-  /urlsafe-base64@1.0.0:
-    resolution: {integrity: sha512-RtuPeMy7c1UrHwproMZN9gN6kiZ0SvJwRaEzwZY0j9MypEkFqyBaKv176jvlPtg58Zh36bOkS0NFABXMHvvGCA==}
-    dev: false
-
   /use-callback-ref@1.3.0(react@18.2.0):
     resolution: {integrity: sha512-3FT9PRuRdbB9HfXhEq35u4oZkvpJ5kuYbpqhCfmiZyReuRgpnhDlbr2ZEnnuS0RrJAPn6l23xjFg9kpDM+Ms7w==}
     engines: {node: '>=10'}
@@ -20198,15 +19768,11 @@ packages:
     resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
     hasBin: true
 
-  /uuid@9.0.0:
-    resolution: {integrity: sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==}
-    dev: false
-
   /uuid@9.0.1:
     resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
     hasBin: true
 
-  /v-code-diff@1.7.2(vue@3.4.3):
+  /v-code-diff@1.7.2(vue@3.4.15):
     resolution: {integrity: sha512-y+q8ZHf8GfphYLhcZbjAKcId/h6vZujS71Ryq5u+dI6Jg4ZLTdLrBNVSzYpHywHSSFFfBMdilm6XvVryEaH4+A==}
     requiresBuild: true
     peerDependencies:
@@ -20219,8 +19785,8 @@ packages:
       diff: 5.1.0
       diff-match-patch: 1.0.5
       highlight.js: 11.8.0
-      vue: 3.4.3(typescript@5.3.3)
-      vue-demi: 0.13.11(vue@3.4.3)
+      vue: 3.4.15(typescript@5.3.3)
+      vue-demi: 0.13.11(vue@3.4.15)
     dev: false
 
   /v8-to-istanbul@9.1.0:
@@ -20232,6 +19798,15 @@ packages:
       convert-source-map: 1.9.0
     dev: true
 
+  /v8-to-istanbul@9.2.0:
+    resolution: {integrity: sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==}
+    engines: {node: '>=10.12.0'}
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.18
+      '@types/istanbul-lib-coverage': 2.0.4
+      convert-source-map: 2.0.0
+    dev: true
+
   /validate-npm-package-license@3.0.4:
     resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
     dependencies:
@@ -20256,17 +19831,16 @@ packages:
       core-util-is: 1.0.2
       extsprintf: 1.3.0
 
-  /vite-node@0.34.6(@types/node@20.10.5)(sass@1.69.5)(terser@5.26.0):
-    resolution: {integrity: sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==}
-    engines: {node: '>=v14.18.0'}
+  /vite-node@1.2.1(@types/node@20.11.5)(sass@1.70.0)(terser@5.27.0):
+    resolution: {integrity: sha512-fNzHmQUSOY+y30naohBvSW7pPn/xn3Ib/uqm+5wAJQJiqQsU0NBR78XdRJb04l4bOFKjpTWld0XAfkKlrDbySg==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     dependencies:
       cac: 6.7.14
       debug: 4.3.4(supports-color@8.1.1)
-      mlly: 1.4.0
       pathe: 1.1.1
       picocolors: 1.0.0
-      vite: 5.0.10(@types/node@20.10.5)(sass@1.69.5)(terser@5.26.0)
+      vite: 5.0.12(@types/node@20.11.5)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -20282,8 +19856,8 @@ packages:
     resolution: {integrity: sha512-p4D8CFVhZS412SyQX125qxyzOgIFouwOcvjZWk6bQbNPR1wtaEzFT6jZxAjf1dejlGqa6fqHcuCvQea6EWUkUA==}
     dev: true
 
-  /vite@5.0.10(@types/node@20.10.5)(sass@1.69.5)(terser@5.26.0):
-    resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==}
+  /vite@5.0.12(@types/node@20.11.5)(sass@1.70.0)(terser@5.27.0):
+    resolution: {integrity: sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -20310,43 +19884,43 @@ packages:
       terser:
         optional: true
     dependencies:
-      '@types/node': 20.10.5
-      esbuild: 0.19.8
-      postcss: 8.4.32
-      rollup: 4.9.1
-      sass: 1.69.5
-      terser: 5.26.0
+      '@types/node': 20.11.5
+      esbuild: 0.19.11
+      postcss: 8.4.33
+      rollup: 4.9.6
+      sass: 1.70.0
+      terser: 5.27.0
     optionalDependencies:
       fsevents: 2.3.3
 
-  /vitest-fetch-mock@0.2.2(vitest@0.34.6):
+  /vitest-fetch-mock@0.2.2(vitest@1.2.1):
     resolution: {integrity: sha512-XmH6QgTSjCWrqXoPREIdbj40T7i1xnGmAsTAgfckoO75W1IEHKR8hcPCQ7SO16RsdW1t85oUm6pcQRLeBgjVYQ==}
     engines: {node: '>=14.14.0'}
     peerDependencies:
       vitest: '>=0.16.0'
     dependencies:
       cross-fetch: 3.1.5
-      vitest: 0.34.6(happy-dom@10.0.3)(sass@1.69.5)(terser@5.26.0)
+      vitest: 1.2.1(@types/node@20.11.5)(happy-dom@10.0.3)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
       - encoding
     dev: true
 
-  /vitest@0.34.6(happy-dom@10.0.3)(sass@1.69.5)(terser@5.26.0):
-    resolution: {integrity: sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==}
-    engines: {node: '>=v14.18.0'}
+  /vitest@1.2.1(@types/node@20.11.5)(happy-dom@10.0.3)(sass@1.70.0)(terser@5.27.0):
+    resolution: {integrity: sha512-TRph8N8rnSDa5M2wKWJCMnztCZS9cDcgVTQ6tsTFTG/odHJ4l5yNVqvbeDJYJRZ6is3uxaEpFs8LL6QM+YFSdA==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
-      '@vitest/browser': '*'
-      '@vitest/ui': '*'
+      '@types/node': ^18.0.0 || >=20.0.0
+      '@vitest/browser': ^1.0.0
+      '@vitest/ui': ^1.0.0
       happy-dom: '*'
       jsdom: '*'
-      playwright: '*'
-      safaridriver: '*'
-      webdriverio: '*'
     peerDependenciesMeta:
       '@edge-runtime/vm':
         optional: true
+      '@types/node':
+        optional: true
       '@vitest/browser':
         optional: true
       '@vitest/ui':
@@ -20355,37 +19929,29 @@ packages:
         optional: true
       jsdom:
         optional: true
-      playwright:
-        optional: true
-      safaridriver:
-        optional: true
-      webdriverio:
-        optional: true
     dependencies:
-      '@types/chai': 4.3.5
-      '@types/chai-subset': 1.3.3
-      '@types/node': 20.10.5
-      '@vitest/expect': 0.34.6
-      '@vitest/runner': 0.34.6
-      '@vitest/snapshot': 0.34.6
-      '@vitest/spy': 0.34.6
-      '@vitest/utils': 0.34.6
-      acorn: 8.11.2
-      acorn-walk: 8.2.0
+      '@types/node': 20.11.5
+      '@vitest/expect': 1.2.1
+      '@vitest/runner': 1.2.1
+      '@vitest/snapshot': 1.2.1
+      '@vitest/spy': 1.2.1
+      '@vitest/utils': 1.2.1
+      acorn-walk: 8.3.2
       cac: 6.7.14
       chai: 4.3.10
       debug: 4.3.4(supports-color@8.1.1)
+      execa: 8.0.1
       happy-dom: 10.0.3
-      local-pkg: 0.4.3
-      magic-string: 0.30.3
+      local-pkg: 0.5.0
+      magic-string: 0.30.5
       pathe: 1.1.1
       picocolors: 1.0.0
-      std-env: 3.3.3
-      strip-literal: 1.0.1
-      tinybench: 2.5.0
-      tinypool: 0.7.0
-      vite: 5.0.10(@types/node@20.10.5)(sass@1.69.5)(terser@5.26.0)
-      vite-node: 0.34.6(@types/node@20.10.5)(sass@1.69.5)(terser@5.26.0)
+      std-env: 3.7.0
+      strip-literal: 1.3.0
+      tinybench: 2.6.0
+      tinypool: 0.8.2
+      vite: 5.0.12(@types/node@20.11.5)(sass@1.70.0)(terser@5.27.0)
+      vite-node: 1.2.1(@types/node@20.11.5)(sass@1.70.0)(terser@5.27.0)
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less
@@ -20417,7 +19983,7 @@ packages:
     resolution: {integrity: sha512-6bnLkn8O0JJyiFSIF0EfCogzeqNXpnjJ0vW/SZzNHfe6sPx30lTtTXlE5TFs2qhJlAtDFybStVNpL73cPe3OMQ==}
     dev: true
 
-  /vue-demi@0.13.11(vue@3.4.3):
+  /vue-demi@0.13.11(vue@3.4.15):
     resolution: {integrity: sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==}
     engines: {node: '>=12'}
     hasBin: true
@@ -20429,15 +19995,15 @@ packages:
       '@vue/composition-api':
         optional: true
     dependencies:
-      vue: 3.4.3(typescript@5.3.3)
+      vue: 3.4.15(typescript@5.3.3)
     dev: false
 
-  /vue-docgen-api@4.64.1(vue@3.4.3):
+  /vue-docgen-api@4.64.1(vue@3.4.15):
     resolution: {integrity: sha512-jbOf7ByE3Zvtuk+429Jorl+eIeh2aB2Fx1GUo3xJd1aByJWE8KDlSEa6b11PB1ze8f0sRUBraRDinICCk0KY7g==}
     dependencies:
-      '@babel/parser': 7.23.5
+      '@babel/parser': 7.23.6
       '@babel/types': 7.23.5
-      '@vue/compiler-dom': 3.3.11
+      '@vue/compiler-dom': 3.4.3
       '@vue/compiler-sfc': 3.4.3
       ast-types: 0.14.2
       hash-sum: 2.0.0
@@ -20445,13 +20011,13 @@ packages:
       pug: 3.0.2
       recast: 0.22.0
       ts-map: 1.0.3
-      vue-inbrowser-compiler-independent-utils: 4.64.1(vue@3.4.3)
+      vue-inbrowser-compiler-independent-utils: 4.64.1(vue@3.4.15)
     transitivePeerDependencies:
       - vue
     dev: true
 
-  /vue-eslint-parser@9.3.2(eslint@8.56.0):
-    resolution: {integrity: sha512-q7tWyCVaV9f8iQyIA5Mkj/S6AoJ9KBN8IeUSf3XEmBrOtxOZnfTg5s4KClbZBCK3GtnT/+RyCLZyDHuZwTuBjg==}
+  /vue-eslint-parser@9.4.0(eslint@8.56.0):
+    resolution: {integrity: sha512-7KsNBb6gHFA75BtneJsoK/dbZ281whUIwFYdQxA68QrCrGMXYzUMbPDHGcOQ0OocIVKrWSKWXZ4mL7tonCXoUw==}
     engines: {node: ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '>=6.0.0'
@@ -20468,12 +20034,12 @@ packages:
       - supports-color
     dev: true
 
-  /vue-inbrowser-compiler-independent-utils@4.64.1(vue@3.4.3):
+  /vue-inbrowser-compiler-independent-utils@4.64.1(vue@3.4.15):
     resolution: {integrity: sha512-Hn32n07XZ8j9W8+fmOXPQL+i+W2e/8i6mkH4Ju3H6nR0+cfvmWM95GhczYi5B27+Y8JlCKgAo04IUiYce4mKAw==}
     peerDependencies:
       vue: '>=2'
     dependencies:
-      vue: 3.4.3(typescript@5.3.3)
+      vue: 3.4.15(typescript@5.3.3)
     dev: true
 
   /vue-template-compiler@2.7.14:
@@ -20495,28 +20061,28 @@ packages:
       typescript: 5.3.3
     dev: true
 
-  /vue@3.4.3(typescript@5.3.3):
-    resolution: {integrity: sha512-GjN+culMAGv/mUbkIv8zMKItno8npcj5gWlXkSxf1SPTQf8eJ4A+YfHIvQFyL1IfuJcMl3soA7SmN1fRxbf/wA==}
+  /vue@3.4.15(typescript@5.3.3):
+    resolution: {integrity: sha512-jC0GH4KkWLWJOEQjOpkqU1bQsBwf4R1rsFtw5GQJbjHVKWDzO6P0nWWBTmjp1xSemAioDFj1jdaK1qa3DnMQoQ==}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@vue/compiler-dom': 3.4.3
-      '@vue/compiler-sfc': 3.4.3
-      '@vue/runtime-dom': 3.4.3
-      '@vue/server-renderer': 3.4.3(vue@3.4.3)
-      '@vue/shared': 3.4.3
+      '@vue/compiler-dom': 3.4.15
+      '@vue/compiler-sfc': 3.4.15
+      '@vue/runtime-dom': 3.4.15
+      '@vue/server-renderer': 3.4.15(vue@3.4.15)
+      '@vue/shared': 3.4.15
       typescript: 5.3.3
 
-  /vuedraggable@4.1.0(vue@3.4.3):
+  /vuedraggable@4.1.0(vue@3.4.15):
     resolution: {integrity: sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==}
     peerDependencies:
       vue: ^3.0.1
     dependencies:
       sortablejs: 1.14.0
-      vue: 3.4.3(typescript@5.3.3)
+      vue: 3.4.15(typescript@5.3.3)
     dev: false
 
   /w3c-xmlserializer@5.0.0:
@@ -20560,22 +20126,14 @@ packages:
       defaults: 1.0.4
     dev: true
 
-  /web-encoding@1.1.5:
-    resolution: {integrity: sha512-HYLeVCdJ0+lBYV2FvNZmv3HJ2Nt0QYXqZojk3d9FJOLkwnuhzM9tmamh8d7HPM8QqjKH8DeHkFTx+CFlWpZZDA==}
-    dependencies:
-      util: 0.12.5
-    optionalDependencies:
-      '@zxing/text-encoding': 0.9.0
-    dev: true
-
-  /web-push@3.6.6:
-    resolution: {integrity: sha512-SyteEck9fiCskNmPxs/GFhJsZrIyLfRvjWNmcUwULLJyCU0f1oxo2sWTokXA1mDAq9vxk4e4gVcb/8agq73NkQ==}
+  /web-push@3.6.7:
+    resolution: {integrity: sha512-OpiIUe8cuGjrj3mMBFWY+e4MMIkW3SVT+7vEIjvD9kejGUypv8GPDf84JdPWskK8zMRIJ6xYGm+Kxr8YkPyA0A==}
     engines: {node: '>= 16'}
     hasBin: true
     dependencies:
       asn1.js: 5.4.1
-      http_ece: 1.1.0
-      https-proxy-agent: 7.0.0
+      http_ece: 1.2.0
+      https-proxy-agent: 7.0.2
       jws: 4.0.0
       minimist: 1.2.8
     transitivePeerDependencies:
@@ -20794,8 +20352,8 @@ packages:
       async-limiter: 1.0.1
     dev: true
 
-  /ws@8.15.1(bufferutil@4.0.7)(utf-8-validate@6.0.3):
-    resolution: {integrity: sha512-W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ==}
+  /ws@8.16.0(bufferutil@4.0.7)(utf-8-validate@6.0.3):
+    resolution: {integrity: sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
       bufferutil: ^4.0.1
@@ -20868,11 +20426,6 @@ packages:
   /yallist@4.0.0:
     resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
 
-  /yaml@2.3.1:
-    resolution: {integrity: sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==}
-    engines: {node: '>= 14'}
-    dev: false
-
   /yargs-parser@18.1.3:
     resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
     engines: {node: '>=6'}
@@ -20931,6 +20484,19 @@ packages:
       y18n: 5.0.8
       yargs-parser: 21.1.1
 
+  /yargs@17.7.2:
+    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
+    engines: {node: '>=12'}
+    dependencies:
+      cliui: 8.0.1
+      escalade: 3.1.1
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      string-width: 4.2.3
+      y18n: 5.0.8
+      yargs-parser: 21.1.1
+    dev: true
+
   /yauzl@2.10.0:
     resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
     dependencies:
@@ -20975,7 +20541,7 @@ packages:
     engines: {vscode: ^1.83.0}
     dev: false
 
-  github.com/misskey-dev/storybook-addon-misskey-theme/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@7.6.5)(@storybook/components@7.6.5)(@storybook/core-events@7.6.5)(@storybook/manager-api@7.6.5)(@storybook/preview-api@7.6.5)(@storybook/theming@7.6.5)(@storybook/types@7.6.5)(react-dom@18.2.0)(react@18.2.0):
+  github.com/misskey-dev/storybook-addon-misskey-theme/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@7.6.10)(@storybook/components@7.6.5)(@storybook/core-events@7.6.10)(@storybook/manager-api@7.6.10)(@storybook/preview-api@7.6.10)(@storybook/theming@7.6.10)(@storybook/types@7.6.10)(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
@@ -20996,13 +20562,13 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/blocks': 7.6.5(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/blocks': 7.6.10(react-dom@18.2.0)(react@18.2.0)
       '@storybook/components': 7.6.5(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/core-events': 7.6.5
-      '@storybook/manager-api': 7.6.5(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/preview-api': 7.6.5
-      '@storybook/theming': 7.6.5(react-dom@18.2.0)(react@18.2.0)
-      '@storybook/types': 7.6.5
+      '@storybook/core-events': 7.6.10
+      '@storybook/manager-api': 7.6.10(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/preview-api': 7.6.10
+      '@storybook/theming': 7.6.10(react-dom@18.2.0)(react@18.2.0)
+      '@storybook/types': 7.6.10
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: true
-- 
cgit v1.2.3-freya


From b52fe6cc86785f5ab25726cd0d393a0922b7800c Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 21 Jan 2024 18:44:51 +0900
Subject: New Crowdin updates (#12845)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Lao)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Lao)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Lao)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Romanian)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Arabic)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Dutch)

* New translations ja-jp.yml (Polish)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Slovak)

* New translations ja-jp.yml (Swedish)

* New translations ja-jp.yml (Ukrainian)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Bengali)

* New translations ja-jp.yml (Uzbek)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Korean (Gyeongsang))

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Arabic)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Greek)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Polish)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Slovak)

* New translations ja-jp.yml (Ukrainian)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Bengali)

* New translations ja-jp.yml (Uzbek)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Korean (Gyeongsang))

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Arabic)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Slovak)

* New translations ja-jp.yml (Ukrainian)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Romanian)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Arabic)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Greek)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Polish)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Slovak)

* New translations ja-jp.yml (Ukrainian)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Bengali)

* New translations ja-jp.yml (Uzbek)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Korean (Gyeongsang))

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Chinese Simplified)
---
 locales/ar-SA.yml |   6 +
 locales/bn-BD.yml |   5 +
 locales/ca-ES.yml | 630 ++++++++++++++++++++++++++++++++++++-
 locales/cs-CZ.yml |   6 +
 locales/de-DE.yml |  10 +
 locales/el-GR.yml |   3 +
 locales/en-US.yml |  14 +
 locales/es-ES.yml |  75 +++++
 locales/fr-FR.yml |  30 +-
 locales/id-ID.yml | 111 +++++++
 locales/it-IT.yml |   8 +
 locales/ja-KS.yml |  64 ++++
 locales/ko-GS.yml |   5 +
 locales/ko-KR.yml |  13 +-
 locales/lo-LA.yml |  71 +++--
 locales/nl-NL.yml |   2 +
 locales/pl-PL.yml |   5 +
 locales/pt-PT.yml |   6 +
 locales/ro-RO.yml |   4 +
 locales/ru-RU.yml |  90 +++---
 locales/sk-SK.yml |   6 +
 locales/sv-SE.yml |   2 +
 locales/th-TH.yml | 907 +++++++++++++++++++++++++++++++++++-------------------
 locales/uk-UA.yml |   6 +
 locales/uz-UZ.yml |   5 +
 locales/vi-VN.yml |   6 +
 locales/zh-CN.yml | 347 +++++++++++++++++++--
 locales/zh-TW.yml | 129 ++++++--
 28 files changed, 2118 insertions(+), 448 deletions(-)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index 0a7d86cc89..a1e68691f9 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -360,6 +360,8 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "فعّل hCaptcha"
 hcaptchaSiteKey: "مفتاح الموقع"
 hcaptchaSecretKey: "المفتاح السري"
+mcaptchaSiteKey: "مفتاح الموقع"
+mcaptchaSecretKey: "المفتاح السري"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "تمكين reCAPTCHA"
 recaptchaSiteKey: "مفتاح الموقع"
@@ -1010,6 +1012,7 @@ icon: "الصورة الرمزية"
 replies: "رد"
 renotes: "أعد النشر"
 flip: "اقلب"
+lastNDays: "آخر {n} أيام"
 _initialAccountSetting:
   accountCreated: "نجح إنشاء حسابك!"
   letsStartAccountSetup: "إذا كنت جديدًا لنعدّ حسابك الشخصي."
@@ -1414,6 +1417,7 @@ _profile:
 _exportOrImport:
   allNotes: "كل الملاحظات"
   favoritedNotes: " الملاحظات المفضلة"
+  clips: "مِشبك"
   followingList: "المتابَعون"
   muteList: "المستخدمون المكتومون"
   blockingList: "المستخدمون المحجوبون"
@@ -1561,3 +1565,5 @@ _moderationLogTypes:
   suspend: "علِق"
   resetPassword: "أعد تعيين كلمتك السرية"
   createInvitation: "ولِّد دعوة"
+_reversi:
+  total: "المجموع"
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index 77ba3f0306..427c2d90cc 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -357,6 +357,8 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "hCaptcha চালু করুন"
 hcaptchaSiteKey: "সাইট কী"
 hcaptchaSecretKey: "সিক্রেট কী"
+mcaptchaSiteKey: "সাইট কী"
+mcaptchaSecretKey: "সিক্রেট কী"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "reCAPTCHA চালু করুন"
 recaptchaSiteKey: "সাইট কী"
@@ -1190,6 +1192,7 @@ _profile:
   changeBanner: "ব্যানার পরিবর্তন করুন"
 _exportOrImport:
   allNotes: "সকল নোট"
+  clips: "ক্লিপ"
   followingList: "অনুসরণ করা হচ্ছে"
   muteList: "মিউট"
   blockingList: "ব্লক"
@@ -1341,3 +1344,5 @@ _webhookSettings:
 _moderationLogTypes:
   suspend: "স্থগিত করা"
   resetPassword: "পাসওয়ার্ড রিসেট করুন"
+_reversi:
+  total: "মোট"
diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index 727e473cf3..7a4944cd1f 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -336,8 +336,12 @@ whenServerDisconnected: "Quan es perdi la connexió al servidor"
 disconnectedFromServer: "Desconnectat pel servidor"
 reload: "Actualitza"
 doNothing: "Ignora"
-accept: "Accepta"
-normal: "Nomal"
+reloadConfirm: "Vols recarregar?"
+watch: "Veure"
+unwatch: "Deixar de veure"
+accept: "Acceptar"
+reject: "Denegar"
+normal: "Normal"
 instanceName: "Nom del servidor"
 instanceDescription: "Descripció del servidor"
 maintainerName: "Nom de l'administrador"
@@ -355,25 +359,56 @@ connectService: "Connecta"
 disconnectService: "Desconnecta"
 enableLocalTimeline: "Activa la línia de temps local"
 enableGlobalTimeline: "Activa la línia de temps global"
+disablingTimelinesInfo: "Fins i tot si aquestes línies de temps són desactivades, els administradors i els moderadors poden continuar visualitzant per conveniència."
 registration: "Registre"
+enableRegistration: "Permet els registres d'usuaris"
 invite: "Convida"
+driveCapacityPerLocalAccount: "Capacitat del disc per usuaris locals"
+driveCapacityPerRemoteAccount: "Capacitat del disc per usuaris remots"
+inMb: "En megabytes"
+bannerUrl: "Adreça URL del bàner"
+backgroundImageUrl: "Adreça URL de la imatge de fons"
 basicInfo: "Informació bàsica"
 pinnedUsers: "Usuaris fixats"
+pinnedUsersDescription: "Llista d'usuaris, separats per salts de línia, que seran fixats a la pestanya \"Explorar\"."
+pinnedPages: "Pàgines fixades"
+pinnedPagesDescription: "Escriu els camins de les pàgines que vols fixar a la pàgina d'inici d'aquesta instància. Separades per salts de línia."
+pinnedClipId: "ID del retall fixat"
 pinnedNotes: "Nota fixada"
+hcaptcha: "hCaptcha"
+enableHcaptcha: "Activar hCaptcha"
+hcaptchaSiteKey: "Clau del lloc"
+hcaptchaSecretKey: "Clau secreta"
+mcaptcha: "mCaptcha"
+enableMcaptcha: "Activar mCaptcha"
+mcaptchaSiteKey: "Clau del lloc"
+mcaptchaSecretKey: "Clau secreta"
+mcaptchaInstanceUrl: "Adreça URL del servidor mCaptcha"
+recaptcha: "reCAPTCHA"
+enableRecaptcha: "Activar reCAPTCHA"
+recaptchaSiteKey: "Clau del lloc"
+recaptchaSecretKey: "Clau secreta"
 turnstile: "Turnstile"
 enableTurnstile: "Activar Turnstile"
 turnstileSiteKey: "Clau del lloc"
 turnstileSecretKey: "Clau secreta"
+avoidMultiCaptchaConfirm: "Fer servir diferents sistemes de Captcha a la vegada pot causar problemes entre ells. Vols desactivar els altres sistemes de Captcha activats? Si els vols mantenir actius fes clic a cancel·lar."
 antennas: "Antena"
 manageAntennas: "Gestiona les antenes"
+name: "Nom"
 antennaSource: "Font de l'antena"
 antennaKeywords: "Paraules clau a seguir"
 antennaExcludeKeywords: "Paraules clau a excloure"
 antennaKeywordsDescription: "Separar amb espais per la condició AND o amb salts de línia per la condició OR."
 notifyAntenna: "Notifica'm les publicacions noves"
 withFileAntenna: "Només les publicacions amb fitxers"
+enableServiceworker: "Activar les notificacions al navegador"
 antennaUsersDescription: "Llistar un nom d'usuari per línia"
+caseSensitive: "Sensible a majúscules i minúscules "
+withReplies: "Inclou respostes"
+connectedTo: "Aquests comptes hi són connectats"
 notesAndReplies: "Amb respostes"
+withFiles: "Incloure arxius"
 silence: "Silencia"
 silenceConfirm: "Segur que vols silenciar aquest usuari?"
 unsilence: "Deixa de silenciar"
@@ -389,20 +424,40 @@ userList: "Llistes"
 about: "Informació"
 aboutMisskey: "Quant a Misskey"
 administrator: "Administrador/a"
+token: "Codi de verificació"
+2fa: "Autenticació de doble factor"
+setupOf2fa: "Configurar l'autenticació de doble factor"
+totp: "Aplicació d'autenticació"
+totpDescription: "Escriu una contrasenya d'un sol us fent servir l'aplicació d'autenticació"
 moderator: "Moderador/a"
 moderation: "Moderació"
+moderationNote: "Nota de moderació "
+addModerationNote: "Afegir una nota de moderació "
+moderationLogs: "Registre de moderació "
 nUsersMentioned: "{n} usuaris mencionats"
+securityKeyAndPasskey: "Clau de seguretat / Clau de pas"
 securityKey: "Clau de seguretat"
+lastUsed: "Fet servir per última vegada"
+lastUsedAt: "Fet servir per última vegada: {t}"
 unregister: "Cancel·la el registre"
 passwordLessLogin: "Inici de sessió sense contrasenya"
+passwordLessLoginDescription: "Permet l'inici de sessió sense contrasenya fent servir només una Clau de seguretat/Clau de pas"
 resetPassword: "Restableix la contrasenya"
 newPasswordIs: "La contrasenya nova és «{password}»"
 reduceUiAnimation: "Redueix les animacions de la interfície"
 share: "Comparteix"
 notFound: "No s'ha trobat"
+notFoundDescription: "No es troba cap pàgina que correspongui a aquesta adreça"
+uploadFolder: "Carpeta per defecte per pujades"
+markAsReadAllNotifications: "Marca totes les notificacions com a llegides"
 markAsReadAllUnreadNotes: "Marca-ho tot com a llegit"
+markAsReadAllTalkMessages: "Marcar tots els missatges com llegits"
 help: "Ajuda"
+inputMessageHere: "Escriu aquí el teu missatge "
+close: "Tancar"
 invites: "Convida"
+members: "Membres"
+transfer: "Transferir"
 title: "Títol"
 text: "Text"
 enable: "Habilita"
@@ -472,12 +527,62 @@ objectStorage: "Emmagatzematge d'objectes\n"
 useObjectStorage: "Utilitzar l'emmagatzematge d'objectes"
 objectStorageBaseUrl: "Base d'enllaç"
 objectStorageBaseUrlDesc: "Prefix d'enllaç utilitzat per a fer referencia als fitxers. Especifica l'enllaç del teu CDN o Proxy si n'estàs utilitzant qualsevol, en cas contrari, especifica l'enllaç al que es pot accedir públicament segons la guia de servei que vosté utilitza.\nPer l'ús d'S3 utilitza 'https://<bucket>.s3.amazonaws.com' I per a GCS o serveis equivalents utilitza 'https://storage.googleapis.com/<bucket>'."
+objectStorageBucket: "Dipòsit "
+objectStorageBucketDesc: "Escriu el nom del dipòsit que fas servir al teu proveïdor d'emmagatzematge "
+objectStoragePrefix: "Prefix"
+objectStoragePrefixDesc: "Els fitxers es deixaren a directoris amb aquest prefix"
+objectStorageEndpoint: "Endpoint"
+objectStorageEndpointDesc: "Deixa'l buit si fas servir AWS S3, si no és així específica un punt d'entrada com '<host>' o '<host>:<port>', depenent del servei que facis servir."
+objectStorageRegion: "Regió "
+objectStorageRegionDesc: "Especifica una regió com 'xx-east-1'. Si el teu servei no diferència regions has de posar 'us-east-1'. Deixa'l buit si fas servir variables d'entorn o un arxiu de configuració d'AWS."
+objectStorageUseSSL: "Fes servir SSL"
+objectStorageUseSSLDesc: "Desactiva'l si no tens pensat fer servir HTTPS per les connexions de l'API"
+objectStorageUseProxy: "Connectar-se  mitjançant un Proxy"
+objectStorageUseProxyDesc: "Desactiva'l si no faràs servir un Proxy per les connexions de l'API"
+objectStorageSetPublicRead: "Configurar les pujades com públiques "
+s3ForcePathStyleDesc: "Si s3ForcePathStyle es troba activat el nom del dipòsit s'ha d'incloure a l'adreça URL en comtes del nom del host. Potser que necessitis activar-ho quan facis servir, per exemple, Minio a un servidor propi."
+serverLogs: "Registres del servidor"
+deleteAll: "Esborrar tot"
+showFixedPostForm: "Mostrar el formulari per escriure a l'inici de la línia de temps"
+showFixedPostFormInChannel: "Mostrar el formulari d'escriptura al principi de la línia de temps (Canals)"
+withRepliesByDefaultForNewlyFollowed: "Inclou les respostes d'usuaris nous seguits a la línia de temps per defecte."
 newNoteRecived: "Hi ha publicacions noves"
+sounds: "Sons"
+sound: "So"
+listen: "Escoltar"
+none: "Res"
+showInPage: "Mostrar a la pàgina "
+popout: "Finestra emergent"
+volume: "Volum"
+masterVolume: "Volum principal"
+notUseSound: "Sense so"
+useSoundOnlyWhenActive: "Reproduir sons només quan Misskey estigui actiu"
+details: "Detalls"
+chooseEmoji: "Tria un emoji"
+unableToProcess: "L'operació no pot ser completada "
+recentUsed: "Utilitzat recentment"
+install: "Instal·lació "
+uninstall: "Desinstal·lar "
+installedApps: "Aplicacions autoritzades "
+nothing: "No hi ha res per veure aquí "
 installedDate: "Data d'instal·lació"
+lastUsedDate: "Utilitzat per última vegada"
 state: "Estat"
 sort: "Ordena"
 ascendingOrder: "Ascendent"
 descendingOrder: "Descendent"
+scratchpad: "Bloc de proves"
+scratchpadDescription: "El bloc de proves proporciona un entorn experimental per AiScript. Pot escriure i verificar els resultats que interactuen amb Misskey."
+output: "Sortida"
+script: "Script"
+disablePagesScript: "Desactivar AiScript a les pàgines "
+updateRemoteUser: "Actualitzar la informació de l'usuari remot"
+unsetUserAvatar: "Desactivar l'avatar "
+unsetUserAvatarConfirm: "Segur que vols desactivar l'avatar?"
+unsetUserBanner: "Desactivar el bàner "
+unsetUserBannerConfirm: "Segur que vols desactivar el bàner?"
+deleteAllFiles: "Esborrar tots els arxius"
+deleteAllFilesConfirm: "Segur que vols esborrar tots els arxius?"
 removeAllFollowing: "Deixar de seguir tots els usuaris seguits"
 removeAllFollowingDescription: "El fet d'executar això, et farà deixar de seguir a tots els usuaris de {host}. Si us plau, executa això si l'amfitrió, per exemple, ja no existeix."
 userSuspended: "Aquest usuari ha sigut suspès"
@@ -526,31 +631,543 @@ medium: "Mitjà"
 small: "Petit"
 generateAccessToken: "Genera codi d'accés"
 permission: "Permisos"
+adminPermission: "Permisos d'administrador "
 enableAll: "Habilita tot"
 disableAll: "Deshabilita tot"
 tokenRequested: "Donar accés al compte"
+pluginTokenRequestedDescription: "Aquest connector podrà fer servir tots els permisos configurats aquí."
+notificationType: "Tipus de notificació "
+edit: "Editar"
+emailServer: "Servidor de correu electrònic "
+enableEmail: "Activar l'enviament de correus electrònics "
+emailConfigInfo: "Es fa servir per confirmar el teu correu quan et registres o oblides la contrasenya "
+email: "Correu electrònic"
+emailAddress: "Adreça de correu electrònic"
+smtpConfig: "Configuració del servidor SMTP"
 smtpHost: "Amfitrió"
+smtpPort: "Port"
 smtpUser: "Nom d'usuari"
 smtpPass: "Contrasenya"
+emptyToDisableSmtpAuth: "No omplis el nom d'usuari i la contrasenya si vols deshabilitar l'autenticació SMTP"
+smtpSecure: "Fes servir SSL/TLS per connexions SMTP"
+smtpSecureInfo: "Desactiva això quan facis servir connexions STARTTLS"
+testEmail: "Prova l'enviament de correu "
+wordMute: "Silenciar paraules "
+hardWordMute: "Silenciar paraules fortes"
+regexpError: "Error de l'expressió regular "
+regexpErrorDescription: "S'ha produït un error a l'expressió regular a la línia {line} de les paraules silenciades {tab}:"
+instanceMute: "Silenciar servidor"
+userSaysSomething: "{name} n'ha dit alguna cosa"
+makeActive: "Activar"
+display: "Veure"
+copy: "Copiar"
+metrics: "Mètriques"
+overview: "Visió General"
+logs: "Registres"
+delayed: "Endarrerits "
+database: "Bases de dades"
+channel: "Canals"
+create: "Crear"
+notificationSetting: "Paràmetres de notificacions"
+notificationSettingDesc: "Selecciona els tipus de notificacions que es mostraran"
+useGlobalSetting: "Fer servir la configuració global"
+useGlobalSettingDesc: "Si s'activa, es farà servir la configuració de notificacions del teu comte. Si no s'activa es poden fer configuracions individuals."
+other: "Altre"
+regenerateLoginToken: "Regenerar clau de seguretat d'inici de sessió"
+regenerateLoginTokenDescription: "Regenera la clau de seguretat que es fa servir internament durant l'inici de sessió. Normalment aquesta acció no és necessària. Si es regenera es tancarà la sessió a tots els dispositius amb una sessió activa."
+theKeywordWhenSearchingForCustomEmoji: "Cercar un emoji personalitzat "
+setMultipleBySeparatingWithSpace: "Separa múltiples entrades amb un espai"
+fileIdOrUrl: "ID de l'arxiu o URL"
+behavior: "Comportament"
+sample: "Mostrar"
+abuseReports: "Denúncies "
+reportAbuse: "Denuncia un abús "
+reportAbuseRenote: "Denuncia una renota"
+reportAbuseOf: "Denuncia a {name}"
+fillAbuseReportDescription: "Omple els detalls sobre aquesta denúncia. Si la denúncia és sobre una nota en concret inclou l'adreça URL."
+abuseReported: "La teva denúncia s'ha enviat. Moltes gràcies."
+reporter: "Denunciant "
+reporteeOrigin: "Origen de la denúncia "
+reporterOrigin: "Origen del denunciant"
+forwardReport: "Transferir la denúncia a una instància remota"
+forwardReportIsAnonymous: "En comptes del teu compte, es farà servir un compte anònim com a denunciat a la instància remota."
+send: "Enviar"
+abuseMarkAsResolved: "Marcar la denúncia com a resolta"
+openInNewTab: "Obre a una pestanya nova"
+openInSideView: "Obre a una vista lateral"
+defaultNavigationBehaviour: "Navegació per defecte"
+editTheseSettingsMayBreakAccount: "Editar aquestes opcions pot deixar inoperatiu el teu compte"
+instanceTicker: "Informació de notes de la instància "
+waitingFor: "Esperant {x}"
+random: "Aleatori "
+system: "Sistema"
+switchUi: "Canviar interfície d'usuari "
+desktop: "Escriptori"
+clip: "Retalls"
+createNew: "Crear"
+optional: "Opcional"
+createNewClip: "Crear un nou Retall"
+unclip: "Treure Retall"
+confirmToUnclipAlreadyClippedNote: "Aquesta nota ja és inclosa al Retall \"{name}\". Vols treure-la d'aquest retall?"
+public: "Públic "
+private: "Privat"
+i18nInfo: "Misskey està sent traduït a diferents idiomes per voluntaris. Pots ajudar aquí {link}."
+manageAccessTokens: "Administrar claus de seguretat d'accés "
+accountInfo: "Informació del compte"
+notesCount: "Comptador de notes"
+repliesCount: "Nombre de respostes"
 renotesCount: "Impulsos fets"
+repliedCount: "Nombre de respostes rebudes"
 renotedCount: "Impulsos rebuts"
+followingCount: "Nombre de comptes seguits"
+followersCount: "Nombre de seguidors"
+sentReactionsCount: "Nombre de reaccions enviades"
+receivedReactionsCount: "Nombre de reaccions rebudes"
+pollVotesCount: "Nombre de vots enviats a enquestes"
+pollVotedCount: "Nombre de vots rebuts a les enquestes"
+yes: "Sí "
+no: "No"
+driveFilesCount: "Nombre de fitxers al Disc"
+driveUsage: "Utilització de l'espai del Disc"
+noCrawle: "Rebutjar la indexació dels buscadors"
+noCrawleDescription: "No permetis que els buscadors indexin el teu perfil, notes, pàgines, etc."
+lockedAccountInfo: "Tret que establiu la visibilitat de la nota a \"Només seguidors\", les vostres notes seran visibles per qualsevol persona, fins i tot si heu d'aprovar els seguidors manualment"
+alwaysMarkSensitive: "Marcar com a sensible per defecte"
+loadRawImages: "Carregar les imatges originals en comptes de miniatures "
+disableShowingAnimatedImages: "No reproduir imatges animades"
+highlightSensitiveMedia: "Ressalta els medis marcats com a sensibles"
+verificationEmailSent: "S'ha enviat un correu electrònic de verificació. Fes clic a l'enllaç per completar la verificació."
+notSet: "Sense definir"
+emailVerified: "El correu electrònic s'ha verificat"
+noteFavoritesCount: "Nombre de notes favorites "
+pageLikesCount: "Nombre de Pàgines que t'agraden "
+pageLikedCount: "Nombre d'agraïments rebuts a les Pàgines "
+contact: "Contacte"
+useSystemFont: "Fes servir la font per defecte del sistema"
+clips: "Retalls"
+experimentalFeatures: "Característiques experimentals"
+experimental: "Experimental"
+thisIsExperimentalFeature: "Aquesta és una característica experimental. La seva funcionalitat pot canviar, i pot ser que no funcioni degudament."
+developer: "Programador"
+makeExplorable: "Fes que el compte sigui visible a la secció \"Explorar\""
+makeExplorableDescription: "Si desactives aquesta opció, el teu compte no sortirà a la secció \"Explorar\""
+showGapBetweenNotesInTimeline: "Mostra una separació entre els articles a la línia de temps"
+duplicate: "Duplicat"
+left: "Esquerra"
+center: "Centre"
+wide: "Gran"
+narrow: "Estret"
+reloadToApplySetting: "Aquest ajust només s'aplicarà després de recarregar la pàgina. Vols fer-ho ara?"
+needReloadToApply: "Es requereix recarregar per reflectir aquesta opció "
+showTitlebar: "Mostra la barra del títol "
 clearCache: "Esborra la memòria cau"
+onlineUsersCount: "{n} Usuaris es troben en línia "
+nUsers: "{n} Usuaris"
+nNotes: "{n} Notes"
+sendErrorReports: "Enviar informes d'error "
+sendErrorReportsDescription: "Quan s'activa, es compartirà amb Misskey informació detallada de l'error quan es trobi un problema això farà pujar la qualitat de Misskey.\nAixò inclourà informació com la versió del SO que fas servir, el navegador web que fas servir, la teva activitat a Misskey, etc."
+myTheme: "El meu tema"
+backgroundColor: "Color de fons"
+accentColor: "Color principal"
+textColor: "Color del text"
+saveAs: "Desar com..."
+advanced: "Avançat"
+advancedSettings: "Configuració avançada"
+value: "Valor"
+createdAt: "Creat el"
+updatedAt: "Actualitzat el"
+saveConfirm: "Desar canvis?"
+deleteConfirm: "Segur que vols esborrar?"
+invalidValue: "Valor invàlid."
+registry: "Registre "
+closeAccount: "Tancar el compte"
+currentVersion: "Versió actual"
+latestVersion: "Versió nova"
+youAreRunningUpToDateClient: "Ja estàs fent servir la versió més recent del client."
+newVersionOfClientAvailable: "Tens disponible una versió del client més recent."
+usageAmount: "Ús "
+capacity: "Capacitat"
+inUse: "Fet servir"
+editCode: "Editar el codi"
+apply: "Aplicar"
+receiveAnnouncementFromInstance: "Rep notificacions d'aquesta instància "
+emailNotification: "Notificacions per correu electrònic "
+publish: "Publicar"
+inChannelSearch: "Cerca al canal"
+useReactionPickerForContextMenu: "Fes clic al botó dret del ratolí per obrir el menú de reaccions"
+typingUsers: "{users} està/estàn Escrivint "
+jumpToSpecifiedDate: "Ves a una data concreta"
 showingPastTimeline: "Estàs veient una línia de temps antiga"
+clear: "Tornar"
+markAllAsRead: "Marcar tot com llegit"
+goBack: "Tornar"
+unlikeConfirm: "Vols esborrar el teu m'agrada?"
+fullView: "Vista completa."
+quitFullView: "Sortir de la vista completa"
+addDescription: "Afegeix una descripció "
+userPagePinTip: "Podeu seleccionar \"Fixar al perfil\" del menú de notes individuals per mostrar les notes aquí."
+notSpecifiedMentionWarning: "Aquesta nota esmenta usuaris que no es troben com a destinataris"
 info: "Informació"
+userInfo: "Informació de l'usuari"
+unknown: "Desconegut"
+onlineStatus: "Connectat"
+hideOnlineStatus: "Ocultar l'estat de connexió"
+hideOnlineStatusDescription: "Ocultant el teu estat de connexió redueix les funcionalitats d'algunes funcions com la cerca."
+online: "Connectat"
+active: "Actiu"
+offline: "Desconnectat"
+notRecommended: "No recomanat"
+botProtection: "Protecció contra bots"
+instanceBlocking: "Instàncies blocades/silenciades"
+selectAccount: "Seleccionar un compte"
+switchAccount: "Canviar de compte"
+enabled: "Activat"
+disabled: "Desactivat"
+quickAction: "Accions ràpides"
 user: "Usuaris"
 administration: "Administració"
+accounts: "Comptes"
+switch: "Canvia"
+noMaintainerInformationWarning: "La informació de l'administrador no s'ha configurat"
+noBotProtectionWarning: "La protecció contra bots no s'ha configurat."
+configure: "Configurar"
+postToGallery: "Crear una nova publicació a la galeria"
+postToHashtag: "Pública a aquesta etiqueta"
+gallery: "Galeria"
+recentPosts: "Articles recents"
+popularPosts: "Articles populars"
+shareWithNote: "Comparteix amb una nota"
+ads: "Anuncis"
+expiration: ""
+startingperiod: "Inici"
+memo: "Recordatori"
+priority: "Prioritat"
+high: "Alta"
 middle: "Mitjà"
+low: "Baixa"
+emailNotConfiguredWarning: "Adreça de correu electrònic"
+ratio: "Proporció"
+previewNoteText: "Mostrar vista prèvia"
+customCss: "CSS personalitzat"
+customCssWarn: "Aquesta configuració només hauries de configurar-la si saps que fas. Si poses valors inadequats pots fer que el client deixi de funcionar correctament."
 global: "Global"
+squareAvatars: "Mostrar avatars quadrats"
+sent: "Enviar"
+received: "Rebut"
+searchResult: "Resultats de la cerca"
+hashtags: "Etiquetes"
+troubleshooting: "Solucionar problemes"
+useBlurEffect: "Fes servir efectes de desenfocament a la interfície"
+learnMore: "Saber més "
+misskeyUpdated: "Misskey s'ha actualitzat "
+whatIsNew: "Mostra canvis"
+translate: "Traduir "
+translatedFrom: "Traduït del {x}"
+accountDeletionInProgress: "S'està produint l'eliminació del compte"
+usernameInfo: "Un nom que identifiqui el teu compte d'altres en aquest servidor. Pots fer servir lletres (a~z, A~Z), números (0~9) i guions baixos (_). Els noms d'usuari no es poden canviar després."
+aiChanMode: "Mode IA"
+devMode: "Mode desenvolupador"
+keepCw: "Mantenir els avisos de contingut"
+pubSub: "Comptes Pub/Sub"
+lastCommunication: "Última comunicació "
+resolved: "Resolt"
+unresolved: "Sense resoldre"
+breakFollow: "Deixar de seguir"
+breakFollowConfirm: "Vols deixar de seguir?"
+itsOn: "Activat"
+itsOff: "Desactivat"
+on: "Activar"
+off: "Desactivar"
+emailRequiredForSignup: "Demanar correu electrònic per registrar-se "
+unread: "Sense llegir"
+filter: "Filtrar"
+controlPanel: "Panel de control"
+manageAccounts: "Gestionar comptes"
+makeReactionsPublic: "Reaccions públiques "
+makeReactionsPublicDescription: "Això fa que totes les teves reaccions siguin visibles públicament "
+classic: "Clàssic "
+muteThread: "Silenciar el fil"
+unmuteThread: "Deixar de silenciar el fil"
+followingVisibility: "Visibilitat dels seguiments"
+followersVisibility: "Visibilitat dels seguidors"
+continueThread: "Veure la continuació del fil"
+deleteAccountConfirm: "Això eliminarà el teu compte irreversiblement. Procedir?"
+incorrectPassword: "Contrasenya incorrecta."
+voteConfirm: "Confirma el teu vot \"{choice}\""
+hide: "Amagar"
+useDrawerReactionPickerForMobile: "Mostrar el selector de reaccions com un calaix al mòbil "
+welcomeBackWithName: "Benvingut de nou, {name}"
+clickToFinishEmailVerification: "Si us plau, fes clic a [{ok}] per completar la verificació per correu electrònic "
+overridedDeviceKind: "Tipus de dispositiu"
+smartphone: "Telèfon intel·ligent"
+tablet: "Tauleta"
+auto: "Automàtic "
+themeColor: "Color del tema"
+size: "Mida"
+numberOfColumn: "Nombre de columnes"
 searchByGoogle: "Cercar"
+instanceDefaultLightTheme: "Tema clar per defecte de tota la instància "
+instanceDefaultDarkTheme: "Tema fosc per defecte de tota la instància "
+instanceDefaultThemeDescription: "Introdueix el codi del tema en format d'objecte"
+mutePeriod: "Duració del silenci"
+period: "Límit de temps"
+indefinitely: "Permanent"
+tenMinutes: "10 minuts"
+oneHour: "1 hora"
+oneDay: "Un dia"
+oneWeek: "Una setmana"
+oneMonth: "Un mes"
+reflectMayTakeTime: "Això pot trigar una estona a tenir efecte"
+failedToFetchAccountInformation: "No es pot obtenir la informació del compte"
+rateLimitExceeded: "S'ha arribat al màxim de peticions"
+cropImage: "Retalla la imatge"
+cropImageAsk: "Vols retallar la imatge?"
+cropYes: "Retallar"
+cropNo: "Fer servir tal qual"
 file: "Fitxers"
+recentNHours: "Últimes {n} hores"
+recentNDays: "Últims {n} dies"
+noEmailServerWarning: "Correu electrònic del servidor sense configurar"
+thereIsUnresolvedAbuseReportWarning: "Hi ha informes sense solucionar."
+recommended: "Recomanat"
+check: "Verificar"
+driveCapOverrideLabel: "Canvia la capacitat del Disc per aquest usuari"
+driveCapOverrideCaption: "Restableix la mida original posant un valor de 0 o menys."
+requireAdminForView: "Has de ser administrador per poder veure això."
+isSystemAccount: "Un compte creat i operat automàticament pel sistema."
+typeToConfirm: "Si us plau, escriu {x} per confirmar"
+deleteAccount: "Esborrar el compte"
+document: "Documentació"
+numberOfPageCache: "Nombre de pàgines a la memòria cau"
+numberOfPageCacheDescription: "Incrementant aquest nombre farà que millori l'experiència de l'usuari, però es farà servir més memòria al dispositiu de l'usuari."
+logoutConfirm: "Vols sortir?"
+lastActiveDate: "Fet servir per última vegada"
+statusbar: "Barra d'estat"
+pleaseSelect: "Selecciona una opció"
+reverse: "Invertir"
+colored: "Colorit"
+refreshInterval: "Interval d'actualització "
+label: "Etiqueta"
+type: "Tipus"
+speed: "Velocitat"
+slow: "Lent"
+fast: "Ràpid "
+sensitiveMediaDetection: "Detecció de contingut sensible"
+localOnly: "Només local"
+remoteOnly: "Només remot"
+failedToUpload: "Ha fallat la pujada"
+cannotUploadBecauseInappropriate: "Aquest fitxer no es pot pujar perquè s'ha trobat que algunes parts són inapropiades."
+cannotUploadBecauseNoFreeSpace: "Ha fallat la pujada del fitxer perquè no hi ha capacitat al Disc."
+cannotUploadBecauseExceedsFileSizeLimit: "Aquest fitxer no es pot pujar perquè supera la mida permesa."
+beta: "Proves"
+enableAutoSensitive: "Marcar com a sensible automàticament "
+enableAutoSensitiveDescription: "Permet la detecció i el marcat automàtic dels mitjans sensibles fent servir aprenentatge automàtic quan sigui possible. Si aquesta opció es troba desactivada potser que estigui activada per a tota la instància. "
+activeEmailValidationDescription: "Activa la validació estricta de comptes de correu electrònic, inclou la validació d'adreces d'un sol ús i si es possible comunicar-se amb aquestes. Quan es troba desactivada només es vàlida el format del correu electrònic."
+navbar: "Barra de navegació "
+shuffle: "Aleatori"
+account: "Compte"
+move: "Mou"
+pushNotification: "Enviament de notificacions"
+subscribePushNotification: "Activar l'enviament de notificacions"
+unsubscribePushNotification: "Desactivar l'enviament de notificacions"
+pushNotificationAlreadySubscribed: "L'enviament de notificacions ja és activat"
+pushNotificationNotSupported: "El teu navegador o la teva instància no suporta l'enviament de notificacions "
+sendPushNotificationReadMessage: "Esborrar les notificacions enviades quan s'hagin llegit"
+sendPushNotificationReadMessageCaption: "Això pot fer que el teu dispositiu consumeixi més bateria"
+windowMaximize: "Maximitzar "
+windowMinimize: "Minimitzar"
+windowRestore: "Restaurar"
+caption: "Llegenda"
+loggedInAsBot: "Identificat com a bot"
+tools: "Eines"
+cannotLoad: "No es pot carregar"
+numberOfProfileView: "Visualitzacions del perfil"
+like: "M'agrada "
+unlike: "Treure m'agrada "
+numberOfLikes: "M'agraden "
+show: "Veure"
+neverShow: "No mostrar més "
+remindMeLater: "Recorda-m'ho més tard"
+didYouLikeMisskey: "T'està agradant Misskey?"
+pleaseDonate: "A {host} fem servir el software lliure Misskey. Considera fer un donatiu a Misskey perquè pugui continuar el seu desenvolupament!"
+roles: "Rols"
+role: "Rols"
+noRole: "No s'han trobat rols"
+normalUser: "Usuari normal"
+undefined: "Sense definir"
+assign: "Assignar "
+unassign: "Treure"
+color: "Color"
+manageCustomEmojis: "Gestiona els emojis personalitzats"
+manageAvatarDecorations: "Gestiona les decoracions dels avatars "
+youCannotCreateAnymore: "Has arribat al màxim de creacions"
+cannotPerformTemporary: "Temporalment no disponible"
+cannotPerformTemporaryDescription: "Aquesta acció no es pot dur a terme temporalment per arribar al seu límit d'execució. Pots esperar una mica i tornar-ho a intentar."
+invalidParamError: "Paràmetres incorrectes "
+invalidParamErrorDescription: "Els paràmetres demanats no són correctes. Normalment això es deu a un error, però també pot ser a alguna entrada excedint els límits o similar."
+permissionDeniedError: "Operació no permesa "
+permissionDeniedErrorDescription: "Aquest compte no té suficients permisos per dur a terme aquesta acció "
+preset: "Predefinit"
+selectFromPresets: "Escull des dels predefinits"
+achievements: "Assoliments"
+gotInvalidResponseError: "Resposta del servidor invàlida "
+gotInvalidResponseErrorDescription: "No es pot contactar amb el servidor o potser es troba fora de línia per manteniment. Provar-ho de nou més tard."
+thisPostMayBeAnnoying: "Aquesta nota pot ser molesta per algú."
+thisPostMayBeAnnoyingHome: "Publicar a la línia de temps d'Inici"
+thisPostMayBeAnnoyingCancel: "Cancel·lar "
+thisPostMayBeAnnoyingIgnore: "Publicar de totes maneres"
+collapseRenotes: "Col·lapsar les renotes que ja has vist"
+internalServerError: "Error intern del servidor"
+internalServerErrorDescription: "El servidor ha fallat de manera inexplicable."
+copyErrorInfo: "Copiar la informació de l'error "
+joinThisServer: "Registra't en aquesta instància "
+exploreOtherServers: "Cerca una altra instància "
+letsLookAtTimeline: "Dona una ullada a la línia de temps"
+disableFederationConfirm: "Vols treure la federació?"
+disableFederationConfirmWarn: "Fins i tot traient la federació, les publicacions continuaren sent públiques, a no ser que es digui el contrari. Normalment no has de tocar això."
+disableFederationOk: "Desactivar"
+invitationRequiredToRegister: "Aquesta instància només permet el registre per invitació. Per registrar-te has d'introduir el codi d'invitació."
+emailNotSupported: "Aquesta instància no suporta l'enviament de correus electrònics "
+postToTheChannel: "Publicar a un Canal"
+cannotBeChangedLater: "Això ja no es podrà canviar."
+reactionAcceptance: "Acceptació de reaccions "
+likeOnly: "Només m'agraden "
+likeOnlyForRemote: "Tot (només m'agraden d'instàncies remotes)"
+nonSensitiveOnly: "Només sense contingut sensible"
+nonSensitiveOnlyForLocalLikeOnlyForRemote: "Només contingut no sensible (Només m'agraden d'instàncies remotes)"
+rolesAssignedToMe: "Rols assignats "
+resetPasswordConfirm: "Vols canviar la teva contrasenya?"
+sensitiveWords: "Paraules sensibles"
+sensitiveWordsDescription: "La visibilitat de totes les notes que continguin qualsevol de les paraules configurades seran, automàticament, afegides a \"Inici\". Pots llistar diferents paraules separant les per línies noves."
+myClips: "Els meus retalls"
+drivecleaner: "Netejador de Disc"
+retryAllQueuesNow: "Prova de nou d'executar totes les cues"
+retryAllQueuesConfirmTitle: "Tornar a intentar-ho tot?"
+retryAllQueuesConfirmText: "Això farà que la càrrega del servidor augmenti temporalment."
+enableChartsForRemoteUser: "Generar gràfiques d'usuaris remots"
+enableChartsForFederatedInstances: "Generar gràfiques d'instàncies remotes"
+showClipButtonInNoteFooter: "Afegir \"Retall\" al menú d'acció de la nota"
+reactionsDisplaySize: "Mida de les reaccions"
+accountMoved: "Aquest usuari té un compte nou:"
+accountMovedShort: "Aquest compte ha sigut migrat"
+operationForbidden: "Operació no permesa "
+forceShowAds: "Mostra els anuncis sempre "
+addMemo: "Afegir recordatori"
+editMemo: "Editar recordatori"
+reactionsList: "Reaccions"
+renotesList: "Impulsos"
+notificationDisplay: "Notificacions"
+leftTop: "Dalt a l'esquerra "
+rightTop: "Dalt a la dreta "
+leftBottom: "A baix a l'esquerra"
+rightBottom: "A baix a la dreta"
+stackAxis: "Apilar en direcció "
+vertical: "Vertical"
+horizontal: "Horitzontal "
+position: "Posició "
+serverRules: "Regles del servidor"
+pleaseConfirmBelowBeforeSignup: "Per obrir un compte en aquest servidor, has de llegir i acceptar el següent."
+pleaseAgreeAllToContinue: "Has d'acceptar tots els camps de dalt per poder continuar."
+continue: "Continuar"
+preservedUsernames: "Noms d'usuaris reservats"
+preservedUsernamesDescription: "Llistat de noms d'usuaris que no es poden fer servir separats per salts de linia. Aquests noms d'usuaris no estaran disponibles quan es creï un compte d'usuari normal, però els administradors els poden fer servir per crear comptes manualment. Per altre banda els comptes ja creats amb aquests noms d'usuari no es veure'n afectats."
+createNoteFromTheFile: "Compon una nota des d'aquest fitxer"
+archive: "Arxiu"
+channelArchiveConfirmTitle: "Vols arxivar {name}?"
+channelArchiveConfirmDescription: "Un Canal arxivat no apareixerà a la llista de canals o als resultats de cerca. Tampoc es poden afegir noves entrades."
+thisChannelArchived: "Aquest Canal ha sigut arxivat."
+displayOfNote: "Mostrar notes"
+initialAccountSetting: "Configuració del perfil"
+youFollowing: "Seguit"
+preventAiLearning: "Descartar l'ús d'aprenentatge automàtic (IA Generativa)"
+preventAiLearningDescription: "Demanar els indexadors no fer servir els texts, imatges, etc. en cap conjunt de dades per alimentar l'aprenentatge automàtic (IA Predictiva/ Generativa). Això s'aconsegueix afegint la etiqueta \"noai\" com a resposta HTML al contingut corresponent. Prevenir aquest ús totalment pot ser que no sigui aconseguit, ja que molts indexadors poden obviar aquesta etiqueta."
+options: "Opcions"
+specifyUser: "Especificar usuari"
+failedToPreviewUrl: "Vista prèvia no disponible"
+update: "Actualitzar"
+rolesThatCanBeUsedThisEmojiAsReaction: "Rols que poden fer servir aquest emoji com a reacció "
+rolesThatCanBeUsedThisEmojiAsReactionEmptyDescription: "Si cap rol es especificat tothom ho pot fer servir"
+rolesThatCanBeUsedThisEmojiAsReactionPublicRoleWarn: "Aquests rols han de ser públics "
+cancelReactionConfirm: "Vols esborrar la teva reacció?"
+changeReactionConfirm: "Vols canviar la teva reacció?"
+later: "Més tard"
+goToMisskey: "Ves a Misskey"
+additionalEmojiDictionary: "Diccionari d'emojis adicionals"
+installed: "Instal·lats "
+branding: "Marca"
+enableServerMachineStats: "Publicar estadístiques del maquinari del servidor"
+enableIdenticonGeneration: "Activar la generació d'icones d'identificació "
+turnOffToImprovePerformance: "Desactivant aquesta opció es pot millorar el rendiment."
 icon: "Icona"
 replies: "Respondre"
 renotes: "Impulsa"
+externalServices: "Serveis externs"
+impressum: "Impressum"
+impressumUrl: "Adreça URL impressum"
+impressumDescription: "A països, com Alemanya, la inclusió de la informació de contacte de l'operador (un Impressum) és requereix de manera legal per llocs comercials."
+privacyPolicy: "Política de privacitat"
+privacyPolicyUrl: "Adreça URL de la política de privacitat"
+tosAndPrivacyPolicy: "Termes d'ús i política de privacitat"
+avatarDecorations: "Decoracions dels avatars"
+attach: "Adjuntar"
+detach: "Eliminar"
+detachAll: "Treure tot"
+angle: "Angle"
+flip: "Girar"
+showAvatarDecorations: "Mostrar les decoracions dels avatars"
+releaseToRefresh: "Deixar anar per actualitzar"
+refreshing: "Recarregant..."
+pullDownToRefresh: "Llisca cap a baix per recarregar"
+disableStreamingTimeline: "Desactivar l'actualització en temps real de les línies de temps"
+useGroupedNotifications: "Mostrar les notificacions agrupades "
+signupPendingError: "Hi ha hagut un problema verificant l'adreça de correu electrònic. L'enllaç pot haver caducat."
+cwNotationRequired: "Si està activat \"Amagar contingut\" s'ha d'escriure una descripció "
+doReaction: "Afegeix una reacció "
+code: "Codi"
+reloadRequiredToApplySettings: "És necessari recarregar la pàgina per aplicar els canvis."
+remainingN: "Queden: {n}"
+overwriteContentConfirm: "Vols substituir el contingut actual?"
+seasonalScreenEffect: "Efectes de pantalla segons les estacions"
+decorate: "Decorar"
+addMfmFunction: "Afegeix funcions MFM"
+enableQuickAddMfmFunction: "Activar accés ràpid per afegir funcions MFM"
+lastNDays: "Últims {n} dies"
+_announcement:
+  forExistingUsers: "Anunci per usuaris registrats"
+  forExistingUsersDescription: "Aquest avís només es mostrarà als usuaris existents fins al moment de la publicació. Si no també es mostrarà als usuaris que es registrin després de la publicació."
+  needConfirmationToRead: "Es necessita confirmació de lectura de la notificació "
+  needConfirmationToReadDescription: "Si s'activa es mostrarà un diàleg per confirmar la lectura d'aquesta notificació. A més aquesta notificació serà exclosa de qualsevol funcionalitat com \"Marcar tot com a llegit\"."
+  end: "Final de la notificació "
+  tooManyActiveAnnouncementDescription: "Tenir massa notificacions actives pot empitjorar l'experiència de l'usuari. Considera finalitzar els anuncis que siguin antics."
+  readConfirmTitle: "Marcar com llegida?"
+  readConfirmText: "Això marcarà el contingut de \"{title}\" com llegit."
+  shouldNotBeUsedToPresentPermanentInfo: "Ja que l'ús de notificacions pot impactar l'experiència dels nous usuaris, és recomanable fer servir les notificacions amb el flux d'informació en comptes de fer-les servir en un únic bloc."
+  dialogAnnouncementUxWarn: "Tenir dues o més notificacions amb l'estil de finestres pot impactar l'experiència de l'usuari, és per això que és recomana fer-lo servir amb cura."
+  silence: "Sense notificacions"
+  silenceDescription: "Activant aquesta opció la notificació no es mostrarà ni l'usuari l'haurà de llegir."
+_initialAccountSetting:
+  accountCreated: "S'ha completat la creació del compte!"
+  letsStartAccountSetup: "Posem ràpidament la configuració inicial del compte."
+  letsFillYourProfile: "Comencem establint el teu perfil."
+  profileSetting: "Configuració del perfil"
+  privacySetting: "Configuració de seguretat"
+  theseSettingsCanEditLater: "Aquests ajustos es poden canviar més tard."
+  youCanEditMoreSettingsInSettingsPageLater: "A més d'això, es poden fer diferents configuracions a través de la pàgina de configuració. Assegureu-vos de comprovar-ho més tard."
 _role:
+  assignTarget: "Assignar "
+  priority: "Prioritat"
   _priority:
+    low: "Baixa"
     middle: "Mitjà"
+    high: "Alta"
   _options:
+    canManageCustomEmojis: "Gestiona els emojis personalitzats"
+    canManageAvatarDecorations: "Gestiona les decoracions dels avatars "
     antennaMax: "Nombre màxim d'antenes"
+_ffVisibility:
+  public: "Publicar"
+_ad:
+  back: "Tornar"
 _email:
   _follow:
     title: "t'ha seguit"
@@ -589,9 +1206,11 @@ _visibility:
   home: "Inici"
   followers: "Seguidors"
 _profile:
+  name: "Nom"
   username: "Nom d'usuari"
 _exportOrImport:
   allNotes: "Totes les publicacions"
+  clips: "Retalls"
   followingList: "Seguint"
   muteList: "Silencia"
   blockingList: "Bloqueja"
@@ -604,6 +1223,7 @@ _timelines:
   social: "Social"
   global: "Global"
 _play:
+  script: "Script"
   summary: "Descripció"
 _pages:
   contents: "Contingut"
@@ -645,8 +1265,14 @@ _deck:
     tl: "Línia de temps"
     antenna: "Antena"
     list: "Llistes"
+    channel: "Canals"
     mentions: "Mencions"
     direct: "Publicacions directes"
+_webhookSettings:
+  name: "Nom"
+  active: "Activat"
 _moderationLogTypes:
   suspend: "Suspèn"
   resetPassword: "Restableix la contrasenya"
+_reversi:
+  total: "Total"
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index 1e064c4911..025497a442 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -366,6 +366,8 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "Aktivovat hCaptchu"
 hcaptchaSiteKey: "Klíč stránky"
 hcaptchaSecretKey: "Tajný Klíč (Secret Key)"
+mcaptchaSiteKey: "Klíč stránky"
+mcaptchaSecretKey: "Tajný Klíč (Secret Key)"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Zapnout ReCAPTCHu"
 recaptchaSiteKey: "Klíč stránky"
@@ -1093,6 +1095,7 @@ icon: "Avatar"
 replies: "Odpovědět"
 renotes: "Přeposlat"
 flip: "Otočit"
+lastNDays: "Posledních {n} dnů"
 _initialAccountSetting:
   accountCreated: "Váš účet byl úspěšně vytvořen!"
   letsStartAccountSetup: "Pro začátek si nastavte svůj profil."
@@ -1825,6 +1828,7 @@ _profile:
 _exportOrImport:
   allNotes: "Všechny poznámky"
   favoritedNotes: "Oblíbené poznámky"
+  clips: "Oříznout"
   followingList: "Sledovaní"
   muteList: "Ztlumit"
   blockingList: "Zablokovat"
@@ -2016,3 +2020,5 @@ _moderationLogTypes:
   suspend: "Zmrazit"
   resetPassword: "Resetovat heslo"
   createInvitation: "Vygenerovat pozvánku"
+_reversi:
+  total: "Celkem"
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 4c32b3dda4..a4bf41d917 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -121,9 +121,12 @@ sensitive: "Sensibel"
 add: "Hinzufügen"
 reaction: "Reaktionen"
 reactions: "Reaktionen"
+emojiPicker: "Emoji auswählen"
+pinnedEmojisForReactionSettingDescription: "Wähle die Emojis aus, um sie an zu pinnen"
 reactionSettingDescription2: "Ziehe um Anzuordnen, klicke um zu löschen, drücke „+“ um hinzuzufügen"
 rememberNoteVisibility: "Notizsichtbarkeit merken"
 attachCancel: "Anhang entfernen"
+deleteFile: "Datei gelöscht"
 markAsSensitive: "Als sensibel markieren"
 unmarkAsSensitive: "Als nicht sensibel markieren"
 enterFileName: "Dateinamen eingeben"
@@ -372,6 +375,8 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "hCaptcha aktivieren"
 hcaptchaSiteKey: "Site key"
 hcaptchaSecretKey: "Secret key"
+mcaptchaSiteKey: "Site key"
+mcaptchaSecretKey: "Secret key"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "reCAPTCHA aktivieren"
 recaptchaSiteKey: "Site key"
@@ -619,6 +624,7 @@ medium: "Mittel"
 small: "Klein"
 generateAccessToken: "Zugriffstoken generieren"
 permission: "Berechtigungen"
+adminPermission: "Administratorberechtigung"
 enableAll: "Alle aktivieren"
 disableAll: "Alle deaktivieren"
 tokenRequested: "Zugriff zum Benutzerkonto gewähren"
@@ -1165,6 +1171,7 @@ signupPendingError: "Beim Überprüfen der Mailadresse ist etwas schiefgelaufen.
 cwNotationRequired: "Ist \"Inhaltswarnung verwenden\" aktiviert, muss eine Beschreibung gegeben werden."
 doReaction: "Reagieren"
 code: "Code"
+lastNDays: "Letzten {n} Tage"
 _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."
@@ -1952,6 +1959,7 @@ _profile:
 _exportOrImport:
   allNotes: "Alle Notizen"
   favoritedNotes: "Als Favorit markierte Notizen"
+  clips: "Clip erstellen"
   followingList: "Gefolgte Benutzer"
   muteList: "Stummschaltungen"
   blockingList: "Blockierungen"
@@ -2234,3 +2242,5 @@ _externalResourceInstaller:
     _themeInstallFailed:
       title: "Das Farbschema konnte nicht installiert werden"
       description: "Während der Installation des Farbschemas ist ein Problem aufgetreten. Bitte versuche es erneut. Detaillierte Fehlerinformationen können über die Javascript-Konsole abgerufen werden."
+_reversi:
+  total: "Gesamt"
diff --git a/locales/el-GR.yml b/locales/el-GR.yml
index 30a52b726e..2098c7ef50 100644
--- a/locales/el-GR.yml
+++ b/locales/el-GR.yml
@@ -356,6 +356,7 @@ _profile:
   username: "Όνομα μέλους"
 _exportOrImport:
   allNotes: "Όλα τα σημειώματα"
+  clips: "Κλιπ"
   followingList: "Ακολουθεί"
   muteList: "Μέλη σε σίγαση"
   blockingList: "Μπλοκαρισμένα μέλη"
@@ -395,3 +396,5 @@ _webhookSettings:
   name: "Όνομα"
 _moderationLogTypes:
   suspend: "Αποβολή"
+_reversi:
+  total: "Σύνολο"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index ed71b5a190..c5a8976d5d 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -126,6 +126,7 @@ emojiPickerDisplay: "Emoji picker display"
 reactionSettingDescription2: "Drag to reorder, click to delete, press \"+\" to add."
 rememberNoteVisibility: "Remember note visibility settings"
 attachCancel: "Remove attachment"
+deleteFile: "File deleted"
 markAsSensitive: "Mark as sensitive"
 unmarkAsSensitive: "Unmark as sensitive"
 enterFileName: "Enter filename"
@@ -375,6 +376,8 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "Enable hCaptcha"
 hcaptchaSiteKey: "Site key"
 hcaptchaSecretKey: "Secret key"
+mcaptchaSiteKey: "Site key"
+mcaptchaSecretKey: "Secret key"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Enable reCAPTCHA"
 recaptchaSiteKey: "Site key"
@@ -1173,6 +1176,10 @@ doReaction: "Add reaction"
 code: "Code"
 reloadRequiredToApplySettings: "Reloading is required to apply the settings."
 decorate: "Decorate"
+bubbleGame: "Bubble Game"
+sfx: "Sound Effects"
+replay: "Replay"
+lastNDays: "Last {n} days"
 _announcement:
   forExistingUsers: "Existing users only"
   forExistingUsersDescription: "This announcement will only be shown to users existing at the point of publishment if enabled. If disabled, those newly signing up after it has been posted will also see it."
@@ -1543,6 +1550,10 @@ _achievements:
     _tutorialCompleted:
       title: "Misskey Elementary Course Diploma"
       description: "Tutorial completed"
+    _bubbleGameExplodingHead:
+      title: "🤯"
+    _bubbleGameDoubleExplodingHead:
+      title: "Double🤯"
 _role:
   new: "New role"
   edit: "Edit role"
@@ -2043,6 +2054,7 @@ _profile:
 _exportOrImport:
   allNotes: "All notes"
   favoritedNotes: "Favorite notes"
+  clips: "Clip"
   followingList: "Followed users"
   muteList: "Muted users"
   blockingList: "Blocked users"
@@ -2340,3 +2352,5 @@ _dataSaver:
   _code:
     title: "Code highlighting"
     description: "If code highlighting notations are used in MFM, etc., they will not load until tapped. Syntax highlighting requires downloading the highlight definition files for each programming language. Therefore, disabling the automatic loading of these files is expected to reduce the amount of communication data."
+_reversi:
+  total: "Total"
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 9aa7bc4e70..ab29462804 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -130,6 +130,7 @@ overwriteFromPinnedEmojis: "Sobreescribir los emojis fijados"
 reactionSettingDescription2: "Arrastre para reordenar, click para borrar, apriete la tecla + para añadir."
 rememberNoteVisibility: "Recordar visibilidad"
 attachCancel: "Quitar adjunto"
+deleteFile: "Archivo eliminado"
 markAsSensitive: "Marcar como sensible"
 unmarkAsSensitive: "Desmarcar como sensible"
 enterFileName: "Ingrese el nombre del archivo"
@@ -379,6 +380,11 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "Habilitar hCaptcha"
 hcaptchaSiteKey: "Clave del sitio"
 hcaptchaSecretKey: "Clave secreta"
+mcaptcha: "mCaptcha"
+enableMcaptcha: "Activar mCaptcha"
+mcaptchaSiteKey: "Clave del sitio"
+mcaptchaSecretKey: "Clave secreta"
+mcaptchaInstanceUrl: "URL del servidor mCaptcha"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "activar reCAPTCHA"
 recaptchaSiteKey: "Clave del sitio"
@@ -626,6 +632,7 @@ medium: "Mediano"
 small: "Pequeño"
 generateAccessToken: "Generar token de acceso"
 permission: "Permisos"
+adminPermission: "Permiso de administrador"
 enableAll: "Activar todo"
 disableAll: "Desactivar todo"
 tokenRequested: "Permiso de acceso a la cuenta"
@@ -669,6 +676,7 @@ useGlobalSettingDesc: "Al activarse, se usará la configuración de notificacion
 other: "Otro"
 regenerateLoginToken: "Regenerar token de login"
 regenerateLoginTokenDescription: "Regenerar el token usado internamente durante el login. No siempre es necesario hacerlo. Al hacerlo de nuevo, se deslogueará en todos los dispositivos."
+theKeywordWhenSearchingForCustomEmoji: "Palabra clave para buscar el emoji personalizado."
 setMultipleBySeparatingWithSpace: "Puedes añadir mas de uno, separado por espacios."
 fileIdOrUrl: "Id del archivo o URL"
 behavior: "Comportamiento"
@@ -1181,6 +1189,18 @@ remainingN: "Faltan: {n}"
 overwriteContentConfirm: "¿Quieres sustituir todo el contenido actual?"
 seasonalScreenEffect: "Efectos de pantalla asociados a estaciones"
 decorate: "Decorar"
+addMfmFunction: "Añadir función MFM"
+enableQuickAddMfmFunction: "Activar acceso rápido para añadir funciones MFM"
+bubbleGame: "Bubble Game"
+sfx: "Efectos de sonido"
+soundWillBePlayed: "Se reproducirán efector sonoros"
+showReplay: "Ver reproducción"
+replay: "Reproducir"
+replaying: "Reproduciendo"
+ranking: "Clasificación"
+lastNDays: "Últimos {n} días"
+_bubbleGame:
+  howToPlay: "Cómo jugar"
 _announcement:
   forExistingUsers: "Solo para usuarios registrados"
   forExistingUsersDescription: "Este anuncio solo se mostrará a aquellos usuarios registrados en el momento de su publicación. Si se deshabilita esta opción, aquellos usuarios que se registren tras su publicación también lo verán."
@@ -1551,6 +1571,10 @@ _achievements:
     _tutorialCompleted:
       title: "Diploma del Curso Básico de Misskey"
       description: "Tutorial completado"
+    _bubbleGameExplodingHead:
+      title: "🤯"
+    _bubbleGameDoubleExplodingHead:
+      title: "Doble 🤯"
 _role:
   new: "Crear rol"
   edit: "Editar rol"
@@ -1933,6 +1957,54 @@ _permissions:
   "write:flash": "Editar Plays"
   "read:flash-likes": "Ver los Play que me gustan"
   "write:flash-likes": "Editar lista de Play que me gustan"
+  "read:admin:abuse-user-reports": "Ver reportes de usuarios"
+  "write:admin:delete-account": "Eliminar cuentas de usuario"
+  "write:admin:delete-all-files-of-a-user": "Eliminar todos los archivos de un usuario"
+  "read:admin:index-stats": "Ver datos indexados"
+  "read:admin:user-ips": "Ver dirección IP de usuario"
+  "read:admin:meta": "Ver metadatos de la instancia"
+  "write:admin:reset-password": "Restablecer contraseñas de usuario"
+  "write:admin:resolve-abuse-user-report": "Resolución de reportes de usuario"
+  "write:admin:send-email": "Enviar email"
+  "read:admin:server-info": "Ver información del servidor"
+  "read:admin:show-moderation-log": "Ver log de moderación"
+  "read:admin:show-user": "Ver información privada de usuario"
+  "read:admin:show-users": "Ver información privada de usuario"
+  "write:admin:suspend-user": "Suspender cuentas de usuario"
+  "write:admin:unset-user-avatar": "Quitar avatares de usuario"
+  "write:admin:unset-user-banner": "Quitar banner de usuarios"
+  "write:admin:unsuspend-user": "Quitar suspensión de cuentas de usuario"
+  "write:admin:meta": "Edición de metadatos de la instancia"
+  "write:admin:user-note": "Moderación de notas"
+  "write:admin:roles": "Edición de roles de usuario"
+  "read:admin:roles": "Ver roles de usuario"
+  "write:admin:relays": "Edición de relays"
+  "read:admin:relays": "Ver relays"
+  "write:admin:invite-codes": "Edición de códigos de invitación"
+  "read:admin:invite-codes": "Ver códigos de invitación"
+  "write:admin:announcements": "Edición de anuncios"
+  "read:admin:announcements": "Ver anuncios"
+  "write:admin:avatar-decorations": "Edición de decoración de avatares"
+  "read:admin:avatar-decorations": "Ver decoraciones de avatar"
+  "write:admin:federation": "Edición de federación de instancias"
+  "write:admin:account": "Edición de cuentas de usuario"
+  "read:admin:account": "Ver cuentas de usuario"
+  "write:admin:emoji": "Edición de emojis"
+  "read:admin:emoji": "Ver emojis"
+  "write:admin:queue": "Edición de cola de tareas"
+  "read:admin:queue": "Ver cola de tareas"
+  "write:admin:promo": "Edición de promociones"
+  "write:admin:drive": "Edición de Drive de usuarios"
+  "read:admin:drive": "Ver Drive de usuarios"
+  "read:admin:stream": "Usar la API de Websocket para administradores"
+  "write:admin:ad": "Edición de anuncios"
+  "read:admin:ad": "Ver anuncios"
+  "write:invite-codes": "Crear códigos de invitación"
+  "read:invite-codes": "Ver códigos de invitación"
+  "write:clip-favorite": "Marcar me gusta en clips"
+  "read:clip-favorite": "Ver los clips que me gustan"
+  "read:federation": "Ver instancias federadas"
+  "write:report-abuse": "Crear reportes de usuario"
 _auth:
   shareAccessTitle: "Permisos de la aplicación"
   shareAccess: "¿Desea permitir el acceso a la cuenta \"{name}\"?"
@@ -2054,6 +2126,7 @@ _profile:
 _exportOrImport:
   allNotes: "Todas las notas"
   favoritedNotes: "Notas favoritas"
+  clips: "Clip"
   followingList: "Siguiendo"
   muteList: "Silenciados"
   blockingList: "Bloqueados"
@@ -2353,3 +2426,5 @@ _dataSaver:
   _code:
     title: "Resaltar código"
     description: "Si se usa resaltado de código en MFM, etc., no se cargará hasta pulsar en ello. El resaltado de sintaxis requiere la descarga de archivos de definición para cada lenguaje de programación. Debido a esto, al deshabilitar la carga automática de estos archivos reducirás el consumo de datos."
+_reversi:
+  total: "Total"
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index 26e756e96e..50de0cd5a1 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -130,6 +130,7 @@ overwriteFromPinnedEmojis: "Remplacer par les émojis épinglés globalement"
 reactionSettingDescription2: "Déplacer pour réorganiser, cliquer pour effacer, utiliser « + » pour ajouter."
 rememberNoteVisibility: "Se souvenir de la visibilité des notes"
 attachCancel: "Supprimer le fichier attaché"
+deleteFile: "Fichier supprimé"
 markAsSensitive: "Marquer comme sensible"
 unmarkAsSensitive: "Supprimer le marquage comme sensible"
 enterFileName: "Entrer le nom du fichier"
@@ -168,7 +169,7 @@ cacheRemoteSensitiveFilesDescription: "Si vous désactivez ce paramètre, les fi
 flagAsBot: "Ce compte est un robot"
 flagAsBotDescription: "Si ce compte est géré de manière automatisée, choisissez cette option. Si elle est activée, elle agira comme un marqueur pour les autres développeurs afin d'éviter des chaînes d'interaction sans fin avec d'autres robots et d'ajuster les systèmes internes de Misskey pour traiter ce compte comme un robot."
 flagAsCat: "Ce compte est un chat"
-flagAsCatDescription: "Activer l'option \" Je suis un chat \" pour ce compte."
+flagAsCatDescription: "Miaou miaou miaou ?"
 flagShowTimelineReplies: "Afficher les réponses dans le fil"
 flagShowTimelineRepliesDescription: "Affiche les réponses des utilisateurs aux notes des autres utilisateurs dans la timeline si cette option est activée."
 autoAcceptFollowed: "Accepter automatiquement les demandes d’abonnement venant d’utilisateur·rice·s que vous suivez"
@@ -379,6 +380,8 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "Activer hCaptcha"
 hcaptchaSiteKey: "Clé du site"
 hcaptchaSecretKey: "Clé secrète"
+mcaptchaSiteKey: "Clé du site"
+mcaptchaSecretKey: "Clé secrète"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Activer reCAPTCHA"
 recaptchaSiteKey: "Clé du site"
@@ -696,7 +699,7 @@ system: "Système"
 switchUi: "Modifier l'interface utilisateur"
 desktop: "Bureau"
 clip: "Clip"
-createNew: "Créer nouveau"
+createNew: "Créer"
 optional: "Facultatif"
 createNewClip: "Créer un nouveau clip"
 unclip: "Supprimer le clip"
@@ -1081,12 +1084,24 @@ 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"
+cancelReactionConfirm: "Supprimez la réaction ?"
 later: "Plus tard"
 goToMisskey: "Retour vers Misskey"
 additionalEmojiDictionary: "Dictionnaires d'émojis additionnels"
 installed: "Installé"
 branding: "Image de marque"
+enableServerMachineStats: "Publier les statistiques du matériel du serveur"
+enableIdenticonGeneration: "Générer les identicons des utilisateurs"
+turnOffToImprovePerformance: "Désactiver peut améliorer la performance."
+createInviteCode: "Créer un code d'invitation"
+createWithOptions: "Options"
+createCount: "Quantité à créer"
+inviteCodeCreated: "Code d'invitation créé"
+inviteLimitExceeded: "Vous avez atteint la limite de codes d'invitation que vous pouvez générer."
 expirationDate: "Date d’expiration"
+noExpirationDate: "Ne pas expirer"
+inviteCodeUsedAt: "Code d'invitation utilisé à"
+registeredUserUsingInviteCode: "Code d'invitation utilisé par"
 waitingForMailAuth: "En attente de la vérification de l'adresse courriel"
 inviteCodeCreator: "Créateur·rice de ce code d'invitation"
 usedAt: "Utilisé le"
@@ -1100,12 +1115,13 @@ icon: "Avatar"
 forYou: "Pour vous"
 currentAnnouncements: "Annonces actuelles"
 pastAnnouncements: "Annonces passées"
-replies: "Répondre"
-renotes: "Renoter"
+replies: "Réponses"
+renotes: "Renotes"
 loadReplies: "Inclure les réponses"
 loadConversation: "Afficher la conversation"
 pinnedList: "Liste épinglée"
 notifyNotes: "Notifier à propos des nouvelles notes"
+unnotifyNotes: "Ne pas notifier pour la publication des notes"
 authentication: "Authentification"
 authenticationRequiredToContinue: "Veuillez vous authentifier pour continuer"
 dateAndTime: "Date et heure"
@@ -1147,7 +1163,9 @@ remainingN: "Restants : {n}"
 overwriteContentConfirm: "Voulez-vous remplacer le contenu actuel ?"
 seasonalScreenEffect: "Effet d'écran saisonnier"
 decorate: "Décorer"
+lastNDays: "Derniers {n} jours"
 _announcement:
+  forExistingUsers: "Pour les utilisateurs existants seulement"
   readConfirmTitle: "Marquer comme lu ?"
   shouldNotBeUsedToPresentPermanentInfo: "Puisque cela pourrait nuire considérablement à l'expérience utilisateur pour les nouveaux utilisateurs, il est recommandé d'utiliser les annonces pour afficher des informations temporaires plutôt que des informations persistantes."
   dialogAnnouncementUxWarn: "Avoir deux ou plus annonces de style dialogue en même temps pourrait nuire considérablement à l'expérience utilisateur. Veuillez les utiliser avec caution."
@@ -1242,6 +1260,7 @@ _accountMigration:
   startMigration: "Migrer"
   movedTo: "Compte vers lequel vous migrez :"
 _achievements:
+  earnedAt: "Date d'obtention"
   _types:
     _notes1:
       title: "Je viens tout juste de configurer mon msky"
@@ -1799,6 +1818,7 @@ _profile:
   avatarDecorationMax: "Vous pouvez mettre au plus {max} décorations d'avatar."
 _exportOrImport:
   allNotes: "Toutes les notes"
+  clips: "Clip"
   followingList: "Abonnements"
   muteList: "Comptes masqués"
   blockingList: "Comptes bloqués"
@@ -2063,3 +2083,5 @@ _dataSaver:
   _code:
     title: "Mise en évidence du code"
     description: "Si la notation de mise en évidence du code est utilisée, par exemple dans la MFM, elle ne sera pas chargée tant qu'elle n'aura pas été tapée. La mise en évidence du code nécessite le chargement du fichier de définition de chaque langue à mettre en évidence, mais comme ces fichiers ne sont plus chargés automatiquement, on peut s'attendre à une réduction du trafic de données."
+_reversi:
+  total: "Total"
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index 156af44d89..e6c92b423c 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -125,9 +125,12 @@ emojiPicker: "Emoji Picker"
 pinnedEmojisForReactionSettingDescription: "Atur sematan emoji pada reaksi"
 pinnedEmojisSettingDescription: "Atur sematan emoji pada masukan emoji"
 emojiPickerDisplay: "Tampilan Emoji Picker"
+overwriteFromPinnedEmojisForReaction: "Timpa dari pengaturan reaksi"
+overwriteFromPinnedEmojis: "Timpa dari pengaturan umum"
 reactionSettingDescription2: "Geser untuk memindah urutan emoji, klik untuk menghapus, tekan \"+\" untuk menambahkan"
 rememberNoteVisibility: "Ingat pengaturan visibilitas catatan"
 attachCancel: "Hapus lampiran"
+deleteFile: "Berkas dihapus"
 markAsSensitive: "Tandai sebagai konten sensitif"
 unmarkAsSensitive: "Hapus tanda konten sensitif"
 enterFileName: "Masukkan nama berkas"
@@ -377,6 +380,9 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "Nyalakan hCaptcha"
 hcaptchaSiteKey: "Site Key"
 hcaptchaSecretKey: "Secret Key"
+mcaptcha: "mCaptcha"
+mcaptchaSiteKey: "Site key"
+mcaptchaSecretKey: "Secret Key"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Nyalakan reCAPTCHA"
 recaptchaSiteKey: "Site key"
@@ -667,6 +673,7 @@ useGlobalSettingDesc: "Jika dinyalakan, setelan notifikasi akun kamu akan diguna
 other: "Lainnya"
 regenerateLoginToken: "Perbarui token login"
 regenerateLoginTokenDescription: "Perbarui token yang digunakan secara internal saat login. Normalnya aksi ini tidak diperlukan. Jika diperbarui, semua perangkat akan dilogout."
+theKeywordWhenSearchingForCustomEmoji: "Kata kunci ini digunakan untuk mencari emoji kustom yang dicari."
 setMultipleBySeparatingWithSpace: "Kamu dapat menyetel banyak dengan memisahkannya menggunakan spasi."
 fileIdOrUrl: "File-ID atau URL"
 behavior: "Perilaku"
@@ -879,6 +886,8 @@ makeReactionsPublicDescription: "Pengaturan ini akan membuat daftar dari semua r
 classic: "Klasik"
 muteThread: "Bisukan thread"
 unmuteThread: "Suarakan thread"
+followingVisibility: "Visibilitas mengikuti"
+followersVisibility: "Visibilitas pengikut"
 continueThread: "Lihat lanjutan thread"
 deleteAccountConfirm: "Akun akan dihapus. Apakah kamu yakin?"
 incorrectPassword: "Kata sandi salah."
@@ -1174,7 +1183,17 @@ doReaction: "Tambahkan reaksi"
 code: "Kode"
 reloadRequiredToApplySettings: "Muat ulang diperlukan untuk menerapkan pengaturan."
 remainingN: "Sisa : {n}"
+overwriteContentConfirm: "Apakah kamu yakin untuk menimpa konten saat ini?"
+seasonalScreenEffect: "Efek layar musiman"
 decorate: "Dekor"
+addMfmFunction: "Tambahkan dekorasi"
+enableQuickAddMfmFunction: "Tampilkan pemilih MFM tingkat lanjut"
+bubbleGame: "Bubble Game"
+sfx: "Efek Suara"
+lastNDays: "{n} hari terakhir"
+backToTitle: "Ke Judul"
+_bubbleGame:
+  howToPlay: "Cara bermain"
 _announcement:
   forExistingUsers: "Hanya pengguna yang telah ada"
   forExistingUsersDescription: "Pengumuman ini akan dimunculkan ke pengguna yang sudah ada dari titik waktu publikasi jika dinyalakan. Apabila dimatikan, mereka yang baru mendaftar setelah publikasi ini akan juga melihatnya."
@@ -1184,7 +1203,10 @@ _announcement:
   tooManyActiveAnnouncementDescription: "Terlalu banyak pengumuman dapat memperburuk pengalaman pengguna. Mohon pertimbangkan untuk mengarsipkan pengumuman yang sudah usang/tidak relevan."
   readConfirmTitle: "Tandai telah dibaca?"
   readConfirmText: "Aksi ini akan menandai konten dari \"{title}\" telah dibaca."
+  shouldNotBeUsedToPresentPermanentInfo: "Karena dapat berdampak pada pengalaman pengguna untuk pengguna baru, sangat direkomendasikan untuk menggunakan notifikasi secara mengalir daripada tetap."
+  dialogAnnouncementUxWarn: "Memiliki dua atau lebih gaya dialog notifikasi secara bersamaan dapat berdampak signifikan pada pengalaman pengguna, mohon untuk menggunakannya dengan hati-hati."
   silence: "Tiada notifikasi"
+  silenceDescription: "Apabila diaktifkan, notifikasi dari pengumuman ini akan dilewatkan dan pengguna tidak perlu membacanya."
 _initialAccountSetting:
   accountCreated: "Akun kamu telah sukses dibuat!"
   letsStartAccountSetup: "Untuk pemula, ayo atur profilmu dulu."
@@ -1197,6 +1219,7 @@ _initialAccountSetting:
   pushNotificationDescription: "Menyalakan notifikasi dorong akan membuatmu menerima notifikasi dari {name} secara langsung ke perangkatmu."
   initialAccountSettingCompleted: "Pengaturan profil selesai!"
   haveFun: "Selamat menikmati, {name}!"
+  youCanContinueTutorial: "Kamu dapat menjutkan ke tutorial dalam bagaimana menggunakan {name} (Misskey) atau kamu dapat keluar dari pemasangan ini dan langsung menggunakannya segera."
   startTutorial: "Mulai Tutorial"
   skipAreYouSure: "Yakin melewati atur profil?"
   laterAreYouSure: "Yakin banget untuk atur profil nanti?"
@@ -1210,6 +1233,10 @@ _initialTutorial:
     description: "Di sini kamu dapat mempelajari dasar-dasar dari penggunaan Misskey dan fitur-fiturnya."
   _note:
     title: "Apa itu Catatan?"
+    description: "Postingan di Misskey disebut sebagai 'Catatan'. Catatan ditampilkan secara kronologis pada lini masa dan dimutakhirkan secara real-time."
+    reply: "Klik pada tombol ini untuk membalas ke sebuah pesan. Bisa juga untuk membalas ke sebuah balasan dan melanjutkannya seperti percakapan selayaknya utas."
+    renote: "Kamu dapat membagikan catatan ke lini masa milikmu. Kamu juga dapat mengutipnya dengan komentarmu."
+    reaction: "Kamu dapat menambahkan reaksi ke Catatan. Detil lebih lanjut akan dijelaskan di halaman berikutnya."
   _reaction:
     title: "Apa itu Reaksi?"
   _timeline:
@@ -1774,6 +1801,14 @@ _sfx:
   notification: "Notifikasi"
   antenna: "Penerimaan Antenna"
   channel: "Notifikasi Kanal"
+  reaction: "Ketika memilih reaksi"
+_soundSettings:
+  driveFile: "Menggunakan berkas audio dalam Drive"
+  driveFileWarn: "Pilih berkas audio dari Drive"
+  driveFileTypeWarn: "Berkas ini tidak didukung"
+  driveFileTypeWarnDescription: "Pilih berkas audio"
+  driveFileDurationWarn: "Audio ini terlalu panjang"
+  driveFileDurationWarnDescription: "Audio panjang dapat mengganggu penggunaan Misskey. Masih ingin melanjutkan?"
 _ago:
   future: "Masa depan"
   justNow: "Baru saja"
@@ -1785,6 +1820,14 @@ _ago:
   monthsAgo: "{n} bulan lalu"
   yearsAgo: "{n} tahun lalu"
   invalid: "Tidak ada sama sekali disini"
+_timeIn:
+  seconds: "dalam {n} detik"
+  minutes: "dalam {n} menit"
+  hours: "dalam {n} jam"
+  days: "dalam {n} hari"
+  weeks: "dalam {n} minggu"
+  months: "dalam {n} bulan"
+  years: "dalam {n} tahun"
 _time:
   second: "detik"
   minute: "menit"
@@ -1972,9 +2015,11 @@ _profile:
   changeAvatar: "Ubah avatar"
   changeBanner: "Ubah header"
   verifiedLinkDescription: "Dengan memasukkan URL yang mengandung tautan ke profil kamu di sini, ikon verifikasi kepemilikan dapat ditampilkan di sebelah kolom ini."
+  avatarDecorationMax: "Dapat ditambahkan hingga {max} dekorasi."
 _exportOrImport:
   allNotes: "Semua catatan"
   favoritedNotes: "Catatan favorit"
+  clips: "Klip"
   followingList: "Ikuti"
   muteList: "Bisukan"
   blockingList: "Blokir"
@@ -2093,12 +2138,16 @@ _notification:
   pollEnded: "Hasil Kuesioner telah keluar"
   newNote: "Catatan baru"
   unreadAntennaNote: "Antena {name}"
+  roleAssigned: "Peran Diberikan"
   emptyPushNotificationMessage: "Pembaruan notifikasi dorong"
   achievementEarned: "Pencapaian didapatkan"
   testNotification: "Tes notifikasi"
   checkNotificationBehavior: "Cek tampilan notifikasi"
   sendTestNotification: "Kirim tes notifikasi"
   notificationWillBeDisplayedLikeThis: "Notifikasi akan terlihat seperti ini"
+  reactedBySomeUsers: "{n} orang memberikan reaksi"
+  renotedBySomeUsers: "{n} orang telah merenote"
+  followedBySomeUsers: "{n} orang telah mengikuti"
   _types:
     all: "Semua"
     note: "Catatan baru"
@@ -2111,6 +2160,7 @@ _notification:
     pollEnded: "Jajak pendapat berakhir"
     receiveFollowRequest: "Permintaan mengikuti diterima"
     followRequestAccepted: "Permintaan mengikuti disetujui"
+    roleAssigned: "Peran Diberikan"
     achievementEarned: "Pencapaian didapatkan"
     app: "Notifikasi dari aplikasi tertaut"
   _actions:
@@ -2202,6 +2252,11 @@ _moderationLogTypes:
   createAd: "Iklan telah dibuat"
   deleteAd: "Iklan telah dihapus"
   updateAd: "Iklan telah diperbaharui"
+  createAvatarDecoration: "Buat dekorasi avatar"
+  updateAvatarDecoration: "Perbarui dekorasi avatar"
+  deleteAvatarDecoration: "Hapus dekorasi avatar"
+  unsetUserAvatar: "Hapus avatar pengguna"
+  unsetUserBanner: "Hapus banner pengguna"
 _fileViewer:
   title: "Rincian berkas"
   type: "Jenis berkas"
@@ -2210,3 +2265,59 @@ _fileViewer:
   uploadedAt: "Diunggah pada"
   attachedNotes: "Catatan yang dilampirkan"
   thisPageCanBeSeenFromTheAuthor: "Halaman ini hanya dapat dilihat oleh pengguna yang mengunggah bekas ini."
+_externalResourceInstaller:
+  title: "Pasang dari situs eksternal"
+  checkVendorBeforeInstall: "Pastikan sumber dari sumber daya ini terpercaya sebelum melakukan pemasangan."
+  _plugin:
+    title: "Apakah kamu ingin memasang plugin ini?"
+    metaTitle: "Informasi plugin"
+  _theme:
+    title: "Apakah kamu ingin memasang tema ini?"
+    metaTitle: "Informasi tema"
+  _meta:
+    base: "Skema warna dasar"
+  _vendorInfo:
+    title: "Informasi sumber"
+    endpoint: "Referensi Endpoint"
+    hashVerify: "Verifikasi hash"
+  _errors:
+    _invalidParams:
+      title: "Parameter tidak valid"
+      description: "Tidak cukup informasi untuk memuat data dari situs eksternal. Mohon konfirmasi kembali URL yang dimasukkan."
+    _resourceTypeNotSupported:
+      title: "Sumber daya eksternal ini tidak didukung"
+      description: "Tipe sumber daya eksternal ini tidak didukung. Mohon kontak administrator dari situs tersebut."
+    _failedToFetch:
+      title: "Gagal memuat data"
+      fetchErrorDescription: "Kesalahan terjadi ketika menghubungkan dengan situs eksternal. Jika percobaan kembali tidak dapat memperbaiki masalah ini, mohon hubungi administrator dari situs tersebut."
+      parseErrorDescription: "Kesalahan terjadi dalam memproses data yang dimuat dari situs eksternal. Mohon hubungi administrator dari situs tersebut."
+    _hashUnmatched:
+      title: "Verifikasi data gagal"
+      description: "Kesalahan terjadi dalam memverifikasi integritas data yang diambil. Sebagai pencegahan keamanan, pemasangan tidak dapat dilanjutkan. Mohon hubungi administrator dari situs tersebut."
+    _pluginParseFailed:
+      title: "Kesalahan AiScript"
+      description: "Data yang diminta telah diambil dengan sukses, namun kesalahan terjadi ketika AiScript melakukan parsing. Mohon hubungi pembuat plugin. Detil kesalahan dapat dilihat pada konsol Javascript."
+    _pluginInstallFailed:
+      title: "Pemasangan plugin gagal"
+      description: "Kesalahan terjadi ketika pemasangan plugin. Mohon coba lagi. Detil kesalahan dapat dilihat pada konsol Javascript."
+    _themeParseFailed:
+      title: "Parsing tema gagal"
+      description: "Data yang diminta telah diambil dengan sukses, namun kesalahan terjadi ketika tema melakukan parsing. Mohon hubungi pembuat tema. Detil kesalahan dapat dilihat pada konsol Javascript."
+    _themeInstallFailed:
+      title: "Pemasangan tema gagal"
+      description: "Kesalahan terjadi ketika pemasangan tema. Mohon coba lagi. Detil kesalahan dapat dilihat pada konsol Javascript."
+_dataSaver:
+  _media:
+    title: "Memuat media"
+    description: "Mencegah gambar/video dimuat secara otomatis. Menyembunyikan gambar/video dan akan dimuat ketika diketuk."
+  _avatar:
+    title: "Gambar avatar"
+    description: "Hentikan animasi gambar avatar. Gambar animasi dapat berukuran lebih besar dari gambar biasa, berpotensi pada pengurangan lalu lintas data lebih jauh."
+  _urlPreview:
+    title: "Gambar kecil URL pratinjau"
+    description: "Gambar kecil URL pratinjau tidak akan dimuat lagi."
+  _code:
+    title: "Penyorotan kode"
+    description: "Jika notasi penyorotan kode digunakan di MFM, dll. Fungsi tersebut tidak akan dimuat apabila tidak diketuk. Penyorotan sintaks membutuhkan pengunduhan berkas definisi penyorotan untuk setiap bahasa pemrograman. Oleh sebab itu, menonaktifkan pemuatan otomatis dari berkas ini dilakukan untuk mengurangi jumlah komunikasi data."
+_reversi:
+  total: "Jumlah"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index 6ce6cd5604..b7b3fb1833 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -130,6 +130,7 @@ overwriteFromPinnedEmojis: "Sovrascrivi con le impostazioni globali"
 reactionSettingDescription2: "Trascina per riorganizzare, clicca per cancellare, usa il pulsante \"+\" per aggiungere."
 rememberNoteVisibility: "Ricordare le impostazioni di visibilità delle note"
 attachCancel: "Rimuovi allegato"
+deleteFile: "File da Drive eliminato"
 markAsSensitive: "Segna come esplicito"
 unmarkAsSensitive: "Non segnare come esplicito "
 enterFileName: "Nome del file"
@@ -379,6 +380,9 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "Abilita hCaptcha"
 hcaptchaSiteKey: "Chiave del sito"
 hcaptchaSecretKey: "Chiave segreta"
+enableMcaptcha: "Abilita hCaptcha"
+mcaptchaSiteKey: "Chiave del sito"
+mcaptchaSecretKey: "Chiave segreta"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Abilita reCAPTCHA"
 recaptchaSiteKey: "Chiave del sito"
@@ -1179,6 +1183,7 @@ remainingN: "Rimangono: {n}"
 overwriteContentConfirm: "Vuoi davvero sostituire l'attuale contenuto?"
 seasonalScreenEffect: "Schermate in base alla stagione"
 decorate: "Decora"
+lastNDays: "Ultimi {n} giorni"
 _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."
@@ -2051,6 +2056,7 @@ _profile:
 _exportOrImport:
   allNotes: "Tutte le note"
   favoritedNotes: "Note preferite"
+  clips: "Clip"
   followingList: "Follow"
   muteList: "Elenco profili silenziati"
   blockingList: "Elenco profili bloccati"
@@ -2348,3 +2354,5 @@ _dataSaver:
   _code:
     title: "Codice evidenziato"
     description: "Impedire che il codice sorgente sia automaticamente evidenziato. Evidenziare il codice richiede il caricamento di un file per ogni linguaggio. Puoi evidenziare soltanto il codice che intendi leggere e ridurre il traffico inutilizzato."
+_reversi:
+  total: "Totale"
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index 4bd44f56d9..79219a8b9f 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -130,6 +130,7 @@ overwriteFromPinnedEmojis: "全般設定から上書きする"
 reactionSettingDescription2: "ドラッグで並び替え、クリックで削除、＋を押して追加やで。"
 rememberNoteVisibility: "公開範囲覚えといて"
 attachCancel: "のっけるのやめる"
+deleteFile: "ファイルをほかす"
 markAsSensitive: "ちょっとこれはアカン"
 unmarkAsSensitive: "そこまでアカンことないやろ"
 enterFileName: "ファイル名を入れてや"
@@ -379,6 +380,8 @@ hcaptcha: "hCaptcha（キャプチャ）"
 enableHcaptcha: "hCaptcha（キャプチャ）をつけとく"
 hcaptchaSiteKey: "サイトキー"
 hcaptchaSecretKey: "シークレットキー"
+mcaptchaSiteKey: "サイトキー"
+mcaptchaSecretKey: "シークレットキー"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "reCAPTCHA（リキャプチャ）を有効にする"
 recaptchaSiteKey: "サイトキー"
@@ -669,6 +672,7 @@ useGlobalSettingDesc: "オンにすると、アカウントの通知設定が使
 other: "その他"
 regenerateLoginToken: "ログイントークンを再生成"
 regenerateLoginTokenDescription: "ログインに使われる内部トークンをもっかい作るで。いつもならこれをやる必要はないで。もっかい作ると、全部のデバイスでログアウトされるで気ぃつけてなー。"
+theKeywordWhenSearchingForCustomEmoji: "カスタム絵文字を探すときのキーワードになるで。"
 setMultipleBySeparatingWithSpace: "スペースで区切って何個でも設定できるで。"
 fileIdOrUrl: "ファイルIDかURL"
 behavior: "動作"
@@ -881,6 +885,8 @@ makeReactionsPublicDescription: "あんたがしたツッコミ一覧を誰で
 classic: "クラシック"
 muteThread: "スレッドをミュート"
 unmuteThread: "スレッドのミュートを解除"
+followingVisibility: "フォローの公開範囲"
+followersVisibility: "フォロワーの公開範囲"
 continueThread: "さらにスレッドを見るで"
 deleteAccountConfirm: "アカウントを消すで？ええんか？"
 incorrectPassword: "パスワードがちゃうわ。"
@@ -1179,6 +1185,9 @@ remainingN: "残り:{n}"
 overwriteContentConfirm: "今の内容に上書きされるけどいい？"
 seasonalScreenEffect: "季節にあった画面の動き"
 decorate: "デコる"
+addMfmFunction: "装飾つける"
+enableQuickAddMfmFunction: "ややこしいMFMのピッカーを出す"
+lastNDays: "直近{n}日"
 _announcement:
   forExistingUsers: "もうおるユーザーのみ"
   forExistingUsersDescription: "オンにしたらこのお知らせができた時点でおる人らにだけお知らせが行くで。切ったらこの知らせが行ったあとにアカウント作った人にもちゃんとお知らせが行くで。"
@@ -1639,6 +1648,7 @@ _emailUnavailable:
   disposable: "ずーっと使えるアドレスじゃないみたいや"
   mx: "正しいメールサーバーじゃないっぽいわ"
   smtp: "メールサーバーがうんともすんとも言わへん"
+  banned: "このメールアドレスはあかん"
 _ffVisibility:
   public: "公開"
   followers: "フォロワーだけに公開"
@@ -1930,6 +1940,55 @@ _permissions:
   "write:flash": "Playを操作する"
   "read:flash-likes": "Playのええやん！を見る"
   "write:flash-likes": "Playのええやん！を見る"
+  "read:admin:abuse-user-reports": "ユーザーからの通報を見る"
+  "write:admin:delete-account": "ユーザーアカウント消す"
+  "write:admin:delete-all-files-of-a-user": "ユーザーのファイル全部ほかす"
+  "read:admin:index-stats": "データベースインデックスの情報見る"
+  "read:admin:table-stats": "データベーステーブルの情報見る"
+  "read:admin:user-ips": "ユーザーのIPアドレスを見る"
+  "read:admin:meta": "インスタンスのメタデータ見る"
+  "write:admin:reset-password": "ユーザーのパスワードをリセット"
+  "write:admin:resolve-abuse-user-report": "ユーザーからの通報を解決する"
+  "write:admin:send-email": "メール送る"
+  "read:admin:server-info": "サーバーの情報見る"
+  "read:admin:show-moderation-log": "モデレーションログ見る"
+  "read:admin:show-user": "ユーザーのプライベートな情報見る"
+  "read:admin:show-users": "ユーザーのプライベートな情報見る"
+  "write:admin:suspend-user": "ユーザーを凍結"
+  "write:admin:unset-user-avatar": "ユーザーのアバターを削除"
+  "write:admin:unset-user-banner": "ユーザーのバナーを削除"
+  "write:admin:unsuspend-user": "ユーザーの凍結解除"
+  "write:admin:meta": "インスタンスのメタデータいじる"
+  "write:admin:user-note": "モデレーションノートいじる"
+  "write:admin:roles": "ロールをいじる"
+  "read:admin:roles": "ロール見る"
+  "write:admin:relays": "リレーいじる"
+  "read:admin:relays": "リレー見る"
+  "write:admin:invite-codes": "招待コードいじる"
+  "read:admin:invite-codes": "招待コード見る"
+  "write:admin:announcements": "お知らせいじる"
+  "read:admin:announcements": "お知らせ見る"
+  "write:admin:avatar-decorations": "アバターデコレーションをいじる"
+  "read:admin:avatar-decorations": "アバターデコレーション見る"
+  "write:admin:federation": "連合の情報いじる"
+  "write:admin:account": "ユーザーアカウントいじる"
+  "read:admin:account": "ユーザーの情報見る"
+  "write:admin:emoji": "絵文字いじる"
+  "read:admin:emoji": "絵文字見る"
+  "write:admin:queue": "ジョブキューいじる"
+  "read:admin:queue": "ジョブキューの情報見る"
+  "write:admin:promo": "プロモーションノートいじる"
+  "write:admin:drive": "ユーザーのドライブいじる"
+  "read:admin:drive": "ユーザーのドライブの情報見る"
+  "read:admin:stream": "管理者用のWebsocket API使う"
+  "write:admin:ad": "広告いじる"
+  "read:admin:ad": "広告見る"
+  "write:invite-codes": "招待コード作る"
+  "read:invite-codes": "招待コード取得"
+  "write:clip-favorite": "クリップのいいねいじる"
+  "read:clip-favorite": "クリップのいいね見る"
+  "read:federation": "連合の情報取得"
+  "write:report-abuse": "違反報告"
 _auth:
   shareAccessTitle: "アプリへのアクセス許してやったらどうや"
   shareAccess: "「{name}」がアカウントにアクセスすることを許可してええか？"
@@ -2051,6 +2110,7 @@ _profile:
 _exportOrImport:
   allNotes: "全てのノート"
   favoritedNotes: "お気に入りにしたノート"
+  clips: "クリップ"
   followingList: "フォロー"
   muteList: "ミュート"
   blockingList: "ブロック"
@@ -2169,6 +2229,7 @@ _notification:
   pollEnded: "アンケートの結果が出たみたいや"
   newNote: "さらの投稿"
   unreadAntennaNote: "アンテナ {name}"
+  roleAssigned: "ロールが付与されたで"
   emptyPushNotificationMessage: "プッシュ通知の更新をしといたで"
   achievementEarned: "実績を獲得しとるで"
   testNotification: "通知テスト"
@@ -2190,6 +2251,7 @@ _notification:
     pollEnded: "アンケートが終了したで"
     receiveFollowRequest: "フォロー許可してほしいみたいやで"
     followRequestAccepted: "フォローが受理されたで"
+    roleAssigned: "ロールが付与された"
     achievementEarned: "実績の獲得"
     app: "連携アプリからの通知や"
   _actions:
@@ -2348,3 +2410,5 @@ _dataSaver:
   _code:
     title: "コードハイライト"
     description: "MFMとかでコードハイライト記法が使われてるとき、タップするまで読み込まれへんくなるで。コードハイライトではハイライトする言語ごとにその決めてるファイルを読む必要はあんねんな。けどな、それは自動で読み込まれなくなるから、通信量を少なくできることができるねん。"
+_reversi:
+  total: "合計"
diff --git a/locales/ko-GS.yml b/locales/ko-GS.yml
index 566667ba79..9187c25827 100644
--- a/locales/ko-GS.yml
+++ b/locales/ko-GS.yml
@@ -373,6 +373,8 @@ hcaptcha: "에이치캡차"
 enableHcaptcha: "에이치캡차 키기"
 hcaptchaSiteKey: "사이트키"
 hcaptchaSecretKey: "시크릿키"
+mcaptchaSiteKey: "사이트키"
+mcaptchaSecretKey: "시크릿키"
 recaptcha: "리캡차"
 enableRecaptcha: "리캡차 키기"
 recaptchaSiteKey: "사이트키"
@@ -680,6 +682,7 @@ _profile:
   name: "이럼"
   username: "사용자 이럼"
 _exportOrImport:
+  clips: "클립 맨걸기"
   followingList: "팔로잉"
   muteList: "수ᇚ후기"
   blockingList: "차단하기"
@@ -721,3 +724,5 @@ _moderationLogTypes:
   deleteUserAnnouncement: "사용자 공지 걸 뭉캐기"
   resetPassword: "비밀번호 재설정"
   resolveAbuseReport: "신고 해겔하기"
+_reversi:
+  total: "합계"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 4a13012eed..673c7757df 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -130,6 +130,7 @@ overwriteFromPinnedEmojis: "일반 설정을 덮어쓰기"
 reactionSettingDescription2: "끌어서 순서 변경, 클릭해서 삭제, ＋를 눌러서 추가할 수 있습니다."
 rememberNoteVisibility: "공개 범위를 기억하기"
 attachCancel: "첨부 취소"
+deleteFile: "파일 삭제"
 markAsSensitive: "열람주의로 설정"
 unmarkAsSensitive: "열람주의 해제"
 enterFileName: "파일명을 입력"
@@ -379,6 +380,9 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "hCaptcha 활성화"
 hcaptchaSiteKey: "사이트 키"
 hcaptchaSecretKey: "시크릿 키"
+enableMcaptcha: "mCaptcha 활성화"
+mcaptchaSiteKey: "사이트 키"
+mcaptchaSecretKey: "시크릿 키"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "reCAPTCHA 활성화"
 recaptchaSiteKey: "사이트 키"
@@ -1151,7 +1155,7 @@ showRepliesToOthersInTimeline: "타임라인에 다른 사람에게 보내는 
 hideRepliesToOthersInTimeline: "타임라인에 다른 사람에게 보내는 답글을 포함하지 않음"
 showRepliesToOthersInTimelineAll: "타임라인에 현재 팔로우 중인 사람 전원의 답글을 포함하게 하기"
 hideRepliesToOthersInTimelineAll: "타임라인에 현재 팔로우 중인 사람 전원의 답글이 나오지 않게 하기"
-confirmShowRepliesAll: "이 조작은 되돌릴 수 없습니다. 정말로 타임라인에 현재 팔로우 중인 사람 전원의 답글이 나오지 않게 하시겠습니까?"
+confirmShowRepliesAll: "이 조작은 되돌릴 수 없습니다. 정말로 타임라인에 현재 팔로우 중인 사람 전원의 답글이 나오게 하시겠습니까?"
 confirmHideRepliesAll: "이 조작은 되돌릴 수 없습니다. 정말로 타임라인에 현재 팔로우 중인 사람 전원의 답글이 나오지 않게 하시겠습니까?"
 externalServices: "외부 서비스"
 impressum: "운영자 정보"
@@ -1183,6 +1187,10 @@ seasonalScreenEffect: "계절에 따른 효과 보이기"
 decorate: "장식하기"
 addMfmFunction: "장식 추가하기"
 enableQuickAddMfmFunction: "상급자용 MFM 선택기 표시하기"
+sfx: "효과음"
+lastNDays: "최근 {n}일"
+_bubbleGame:
+  howToPlay: "설명"
 _announcement:
   forExistingUsers: "기존 유저에게만 알림"
   forExistingUsersDescription: "활성화하면 이 공지사항을 게시한 시점에서 이미 가입한 유저에게만 표시합니다. 비활성화하면 게시 후에 가입한 유저에게도 표시합니다."
@@ -2105,6 +2113,7 @@ _profile:
 _exportOrImport:
   allNotes: "모든 노트"
   favoritedNotes: "즐겨찾기한 노트"
+  clips: "클립"
   followingList: "팔로잉"
   muteList: "뮤트"
   blockingList: "차단"
@@ -2404,3 +2413,5 @@ _dataSaver:
   _code:
     title: "문자열 강조"
     description: "MFM 등으로 문자열 강조 기법을 사용할 때 누르기 전에는 불러오지 않습니다. 문자열 강조에서는 강조할 언어마다 그 정의 파일을 불러와야 하지만 이를 자동으로 불러오지 않으므로 데이터 사용량을 줄일 수 있습니다."
+_reversi:
+  total: "합계"
diff --git a/locales/lo-LA.yml b/locales/lo-LA.yml
index c9e5aea1ed..fa4b3b6f9a 100644
--- a/locales/lo-LA.yml
+++ b/locales/lo-LA.yml
@@ -1,9 +1,9 @@
 ---
 _lang_: "ພາສາລາວ"
-headlineMisskey: "ເຊື່ອມຕໍ່ເຄືອຂ່າຍໂດຍຫມາຍເຫດ"
-introMisskey: "ຍິນດີຕ້ອນຮັບ! Misskey ເປັນແຫຼ່ງເປີດ, ການບໍລິການ microblogging ກະຈາຍ\nສ້າງ \"ບັນທຶກ\" ເພື່ອແບ່ງປັນຄວາມຄິດຂອງທ່ານກັບທຸກໆຄົນທີ່ຢູ່ອ້ອມຮອບທ່ານ 📡\nດ້ວຍ \"ປະຕິກິລິຍາ\", ທ່ານຍັງສາມາດສະແດງຄວາມຮູ້ສຶກຂອງທ່ານຢ່າງໄວວາກ່ຽວກັບບັນທຶກຂອງທຸກໆຄົນ 👍\nມາສຳຫຼວດໂລກໃໝ່! 🚀"
+headlineMisskey: "ເຊື່ອມຕໍ່ເຄືອຂ່າຍໂດຍ note"
+introMisskey: "ຍິນດີຕ້ອນຮັບ! Misskey ເປັນຊອຟແວopensource, ສຳລັບບໍລິການ microblogging ແບບ decentralized\nສ້າງ “note” ເພື່ອແບ່ງປັນຄວາມຄິດຂອງທ່ານກັບທຸກໆ ຄົນທີ່ຢູ່ອ້ອມຮອບທ່ານ 📡\nຢ່າລືມ “reaction” ໂນຕຂອງລາວເພື່ອສະແດງຄວາມຮູ້ສຶກ 👍\nມາສຳຫຼວດໂລກໃໝ່ແນ! 🚀"
 poweredByMisskeyDescription: "{name} ແມ່ນສ່ວນໜຶ່ງຂອງການບໍລິການທີ່ຂັບເຄື່ອນໂດຍແພລດຟອມ open source. <b>Misskey</b> (ເອີ້ນວ່າ \"Misskey instance\")"
-monthAndDay: "{ເດືອນ}/{ມື້}"
+monthAndDay: "ເດືອນ{month} / ວັນ{day}"
 search: "ຄົ້ນຫາ"
 notifications: "ການແຈ້ງເຕືອນ"
 username: "ຊື່ຜູ້ໃຊ້"
@@ -15,25 +15,25 @@ gotIt: "ເຂົ້າໃຈແລ້ວ!"
 cancel: "ຍົກເລີກ"
 noThankYou: "ບໍ່​ແມ່ນ​ຕອນ​ນີ້"
 enterUsername: "ປ້ອນຊື່ຜູ້ໃຊ້"
-renotedBy: "Renoted ໂດຍ {ຜູ້ໃຊ້}"
-noNotes: "ບໍ່ມີຫມາຍເຫດ"
+renotedBy: "Renoted ໂດຍ {user}"
+noNotes: "ບໍ່ມີ note"
 noNotifications: "ບໍ່ມີການແຈ້ງເຕືອນ"
 instance: "ອີນສະແຕນ"
 settings: "ກຳນົດຄ່າ"
 notificationSettings: "ຕັ້ງຄ່າການແຈ້ງເຕືອນ"
 basicSettings: "ການຕັ້ງຄ່າພື້ນຖານ"
 otherSettings: "ການຕັ້ງຄ່າອື່ນໆ"
-openInWindow: "ເປີດຢູ່ໃນປ່ອງຢ້ຽມ"
+openInWindow: "ເປີດໃນປ່ອງຢ້ຽມ"
 profile: "ໂພຼຟາຍ"
-timeline: "​ເສັ້ນກຳ​ນົດ​ເວ​ລາ​"
+timeline: "ໄທມ໌ໄລນ໌"
 noAccountDescription: "ຜູ້ໃຊ້ນີ້ຍັງບໍ່ໄດ້ຂຽນໃນຊີວະປະຫວັດຂອງເຂົາເຈົ້າເທື່ອ"
 login: "ເຂົ້າ​ສູ່​ລະ​ບົບ"
 loggingIn: "ກຳລັງເຂົ້າສູ່ລະບົບ..."
 logout: "ອອກ​ຈາກ​ລະ​ບົບ"
 signup: "ລົງ​ທະ​ບຽນ"
-uploading: "ການອັບໂຫຼດ..."
+uploading: "ກຳລັງອັບໂຫຼດ..."
 save: "ບັນທຶກ"
-users: "ຜູ້ໃຊ້ຕ່າງໆ"
+users: "ຜູ້ໃຊ້"
 addUser: "ເພີ່ມຜູ້ໃຊ້"
 favorite: "ເພີ່ມໃສ່ລາຍການທີ່ມັກ"
 favorites: "ລາຍການທີ່ມັກ"
@@ -41,13 +41,14 @@ unfavorite: "ລຶບອອກຈາກລາຍການທີ່ມັກ"
 favorited: "ເພີ່ມໃສ່ລາຍການທີ່ມັກແລ້ວ"
 alreadyFavorited: "ເພີ່ມເຂົ້າໃນລາຍການທີ່ມັກແລ້ວ."
 cantFavorite: "ບໍ່ສາມາດເພີ່ມໃສ່ລາຍການທີ່ມັກໄດ້."
-pin: "ປັກໝຸດໄປຫາໂປຣໄຟລ໌"
-unpin: "ຖອດປັກໝຸດອອກຈາກໂປຣໄຟລ໌"
+pin: "ປັກໝຸດ"
+unpin: "ຖອດປັກໝຸດອອກ"
 copyContent: "ຄັດລອກເນື້ອຫາ"
-copyLink: "ສຳເນົາລິ້ງ"
+copyLink: "ຄັດລອກລິ້ງ"
+copyLinkRenote: "ຄັດລອກລິ້ງຂອງ renote"
 delete: "ລຶບ"
-deleteAndEdit: "ລົບ​ແລະ​ແກ້​ໄຂ​"
-deleteAndEditConfirm: "ເຈົ້າ​ແນ່​ໃຈ​ບໍ່? ທີ່ທ່ານຕ້ອງການທີ່ຈະລຶບບັນທຶກນີ້ແລະແກ້ໄຂມັນ ທ່ານອາດຈະສູນເສຍການໂຕ້ຕອບ, ບັນທຶກ, ແລະການຕອບກັບທັງໝົດ"
+deleteAndEdit: "ລຶບ​ແລະ​ແກ້​ໄຂ​"
+deleteAndEditConfirm: "ເຈົ້າ​ແນ່​ໃຈ​ບໍ່? ທີ່ທ່ານຕ້ອງການທີ່ຈະລຶບ note ນີ້ ແລະແກ້ໄຂມັນ ທ່ານອາດຈະສູນເສຍ reaction, renote, ແລະການຕອບກັບທັງໝົດ"
 addToList: "ເພີ່ມໃສ່ລາຍຊື່"
 addToAntenna: "ເພີ່ມໃສ່ເສົາອາກາດ"
 sendMessage: "ສົ່ງຂໍ້ຄວາມ"
@@ -66,15 +67,15 @@ showLess: "ປິດ"
 youGotNewFollower: "ໄດ້ຕິດຕາມທ່ານ"
 receiveFollowRequest: "ປະຕິບັດຕາມຄໍາຮ້ອງຂໍທີ່ໄດ້ຮັບ"
 followRequestAccepted: "ຜູ້ຕິດຕາມໄດ້ຍອມຮັບຄໍາຮ້ອງຂໍຂອງທ່ານ"
-mention: "ໄດ້ກ່າວມາ"
+mention: "ກ່າວຖືງ"
 mentions: "ກ່າວເຖິງ"
-directNotes: "ໂດຍກົງຫມາຍເຫດ"
+directNotes: "ໂພສ Direct note"
 importAndExport: "ນໍາເຂົ້າ / ສົ່ງອອກ"
 import: "ນຳເຂົ້າ"
-export: "ນຳອອກ"
+export: "ສົ່ງອອກ"
 files: "ໄຟລ໌"
 download: "ດາວໂຫລດ"
-driveFileDeleteConfirm: "ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການລຶບໄຟລ໌ \"{name}\"? ບັນທຶກທີ່ມີໄຟລ໌ແນບນີ້ຈະຖືກລຶບຖິ້ມ"
+driveFileDeleteConfirm: "ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການລຶບໄຟລ໌ \"{name}\"? note ທີ່ມີໄຟລ໌ແນບນີ້ຈະຖືກລຶບຖິ້ມ"
 unfollowConfirm: "ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການເຊົາຕິດຕາມ {name}?"
 exportRequested: "ໃນເວລາທີ່ທ່ານໄດ້ຮ້ອງຂໍການສົ່ງອອກ ມັນອາດຈະໃຊ້ເວລາບາງເວລາ ແລະມັນຈະຖືກເພີ່ມໃສ່ drive ຂອງທ່ານເມື່ອມັນສຳເລັດແລ້ວ"
 importRequested: "ໃນເວລາທີ່ທ່ານໄດ້ຮ້ອງຂໍການນໍາເຂົ້າ ມັນອາດຈະໃຊ້ເວລາບາງເວລາ"
@@ -86,7 +87,7 @@ following: "ກຳລັງຕິດຕາມ"
 followers: "ຜູ້ຕິດຕາມ"
 followsYou: "ຕິດ​ຕາມ​ເຈົ້າ"
 createList: "ສ້າງລາຍຊື່"
-manageLists: "ການບໍລິຫານບັນຊີລາຍການ"
+manageLists: "ຈັດການລາຍຊື່"
 error: "ຂໍ້ຜິດພາດ"
 somethingHappened: "​ອຸຍ, ມີ​ບາງ​ຢ່າງ​ຜິ​ດ​ພາດ"
 retry: "ລອງໃຫມ່"
@@ -96,30 +97,30 @@ serverIsDead: "ເຊີບເວີນີ້ບໍ່ຕອບສະໜອງ 
 youShouldUpgradeClient: "ເພື່ອເບິ່ງໜ້ານີ້, ກະລຸນາໂຫຼດຂໍ້ມູນຄືນໃໝ່ເພື່ອອັບເດດລູກຄ້າຂອງທ່ານ"
 enterListName: "ໃສ່ຊື່ສຳລັບລາຍຊື່"
 privacy: "ຄວາມເປັນສ່ວນຕົວ"
-makeFollowManuallyApprove: "ປະຕິບັດຕາມການຮ້ອງຂໍຮຽກຮ້ອງໃຫ້ມີການອະນຸມັດ"
-defaultNoteVisibility: "ເປັນຄ່າເລີ່ມຕົ້ນ"
+makeFollowManuallyApprove: "ຕິດຕາມຄຳຂໍທີ່ຕ້ອງໄດ້ຮັບການອະນຸມັດ"
+defaultNoteVisibility: "ການເບິ່ງເຫັນທີ່ເປັນຄ່າເລີ່ມຕົ້ນ"
 follow: "ກຳລັງຕິດຕາມ"
-followRequest: "ສົ່ງ​ການ​ຮ້ອງ​ຂໍ​ປະ​ຕິ​ບ​ຕາມ​"
-followRequests: "ປະຕິບັດຕາມຄໍາຮ້ອງຂໍ"
+followRequest: "ສົ່ງ​ຄຳຂໍ​ຕິ​ດ​ຕາມ​"
+followRequests: "ສົ່ງ​ຄຳຂໍ​ຕິ​ດ​ຕາມ​"
 unfollow: "ເຊົາຕິດຕາມ"
-followRequestPending: "ປະຕິບັດຕາມຄໍາຮ້ອງຂໍທີ່ລໍຖ້າຢູ່"
-enterEmoji: "ປ້ອນອີໂມຈິ"
+followRequestPending: "ລໍຖ້າການອະນຸມັດໃຫ້ຕິດຕາມ"
+enterEmoji: "ປ້ອນເອໂມຈິ"
 renote: "Renote"
 unrenote: "ເລີກ Renote"
-renoted: "ເກັບບັນທຶກໄວ້"
-cantRenote: "ໂພສນີ້ບໍ່ສາມາດຖືກບັນທຶກໄວ້ຄືນໃໝ່ໄດ້"
+renoted: "renote ແລ້ວ"
+cantRenote: "ໂພສນີ້ບໍ່ສາມາດ renote ໃໝ່ໄດ້"
 cantReRenote: "ບໍ່ສາມາດບັນທຶກຄືນໃໝ່ໄດ້"
-quote: "ລວມຂໍ້ຄວາມອ້າງອີງ"
-inChannelRenote: "ຊ່ອງພຽງແຕ່ Renote"
-inChannelQuote: "ຊ່ອງເທົ່ານັ້ນ Quote"
-pinnedNote: "ບັນທຶກທີ່ປັກໝຸດໄວ້"
-pinned: "ປັກໝຸດໄປຫາໂປຣໄຟລ໌"
+quote: "ອ້າງອີງ"
+inChannelRenote: "Renote ໃນ channel ເທົ່ານັ້ນ"
+inChannelQuote: "ອ້າງອິງໃນ channel ເທົ່ານັ້ນ"
+pinnedNote: "note ທີ່ປັກໝຸດໄວ້"
+pinned: "ປັກໝຸດ"
 you: "ເຈົ້າ"
 clickToShow: "ກົດເພື່ອສະແດງໃຫ້ເຫັນ"
 sensitive: "NSFW"
 add: "ເພີ່ມ"
-reaction: "ປະຕິກິລິຍາ"
-reactions: "ປະຕິກິລິຍາ"
+reaction: "reaction"
+reactions: "reaction"
 attachCancel: "ເອົາໄຟລ໌ແນບ"
 mute: "ປີດສຽງ"
 unmute: "ເປີດສຽງ"
@@ -306,6 +307,8 @@ basicInfo: "ຂໍ້ມຸນເບື້ອງຕົ້ນ"
 pinnedNotes: "ບັນທຶກທີ່ປັກໝຸດໄວ້"
 hcaptchaSiteKey: "ກະແຈໄຊທ໌"
 hcaptchaSecretKey: "ກະແຈລັບ"
+mcaptchaSiteKey: "ກະແຈໄຊທ໌"
+mcaptchaSecretKey: "ກະແຈລັບ"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "ເປີດໃຊ້ງານລີແຄ໋ບຈາ"
 recaptchaSiteKey: "ກະແຈໄຊທ໌"
diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index 98f1693129..e33b978bc8 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -348,6 +348,8 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "Inschakelen hCaptcha"
 hcaptchaSiteKey: "Site sleutel"
 hcaptchaSecretKey: "Geheime sleutel"
+mcaptchaSiteKey: "Site sleutel"
+mcaptchaSecretKey: "Geheime sleutel"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Inschakelen reCAPTCHA"
 recaptchaSiteKey: "Site sleutel"
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index 496e9bfc30..e075f40815 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -345,6 +345,8 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "Włącz hCaptcha"
 hcaptchaSiteKey: "Klucz strony"
 hcaptchaSecretKey: "Tajny klucz"
+mcaptchaSiteKey: "Klucz strony"
+mcaptchaSecretKey: "Tajny klucz"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Włącz reCAPTCHA"
 recaptchaSiteKey: "Klucz strony"
@@ -1232,6 +1234,7 @@ _profile:
 _exportOrImport:
   allNotes: "Wszystkie wpisy"
   favoritedNotes: "Ulubione wpisy"
+  clips: "Klip"
   followingList: "Obserwowani"
   muteList: "Wycisz"
   blockingList: "Zablokuj"
@@ -1394,3 +1397,5 @@ _webhookSettings:
 _moderationLogTypes:
   suspend: "Zawieś"
   resetPassword: "Zresetuj hasło"
+_reversi:
+  total: "Łącznie"
diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml
index f969d711c0..3d0dcfba8a 100644
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@@ -368,6 +368,8 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "Ativar hCaptcha"
 hcaptchaSiteKey: "Chave do sítio ‘web’"
 hcaptchaSecretKey: "Chave secreta"
+mcaptchaSiteKey: "Chave do sítio ‘web’"
+mcaptchaSecretKey: "Chave secreta"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Habilitar reCAPTCHA"
 recaptchaSiteKey: "Chave do sítio ‘web’"
@@ -1008,6 +1010,7 @@ replies: "Responder"
 renotes: "Repostar"
 keepScreenOn: "Manter a tela do dispositivo sempre ligada"
 flip: "Inversão"
+lastNDays: "Últimos {n} dias"
 _initialAccountSetting:
   followUsers: "Siga usuários que lhe interessam para criar a sua linha do tempo."
 _serverSettings:
@@ -1400,6 +1403,7 @@ _profile:
   username: "Nome de usuário"
 _exportOrImport:
   favoritedNotes: "Notas nos favoritos"
+  clips: "Clipe"
   followingList: "Seguindo"
   muteList: "Silenciar"
   blockingList: "Bloquear"
@@ -1494,3 +1498,5 @@ _webhookSettings:
 _moderationLogTypes:
   suspend: "Suspender"
   resetPassword: "Redefinir senha"
+_reversi:
+  total: "Total"
diff --git a/locales/ro-RO.yml b/locales/ro-RO.yml
index 10be9539cf..695eb2501f 100644
--- a/locales/ro-RO.yml
+++ b/locales/ro-RO.yml
@@ -359,6 +359,8 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "Activează hCaptcha"
 hcaptchaSiteKey: "Site key"
 hcaptchaSecretKey: "Secret key"
+mcaptchaSiteKey: "Site key"
+mcaptchaSecretKey: "Secret key"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Activează reCAPTCHA"
 recaptchaSiteKey: "Site key"
@@ -725,3 +727,5 @@ _webhookSettings:
 _moderationLogTypes:
   suspend: "Suspendă"
   resetPassword: "Resetează parola"
+_reversi:
+  total: "Total"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 25f409df92..e5dc3a83cf 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -53,8 +53,8 @@ addToAntenna: "Добавить к антенне"
 sendMessage: "Отправить сообщение"
 copyRSS: "Скопировать RSS"
 copyUsername: "Скопировать имя пользователя"
-copyUserId: "Скопировать ID пользователя"
-copyNoteId: "Скопировать ID заметки"
+copyUserId: "Скопировать идентификатор пользователя"
+copyNoteId: "Скопировать идентификатор заметки"
 copyFileId: "Скопировать ID файла"
 copyFolderId: "Скопировать ID папки"
 copyProfileUrl: "Скопировать URL профиля "
@@ -134,8 +134,8 @@ unmarkAsSensitive: "Снять отметку «не для всех»"
 enterFileName: "Введите имя файла"
 mute: "Скрыть"
 unmute: "Отменить скрытие"
-renoteMute: "Заглушить репосты"
-renoteUnmute: "Включить репосты"
+renoteMute: "Скрыть репосты"
+renoteUnmute: "Открыть репосты"
 block: "Заблокировать"
 unblock: "Разблокировать"
 suspend: "Заморозить"
@@ -161,8 +161,8 @@ addEmoji: "Добавить эмодзи"
 settingGuide: "Рекомендуемые настройки"
 cacheRemoteFiles: "Кешировать внешние файлы"
 cacheRemoteFilesDescription: "Когда эта настройка отключена, файлы с других сайтов будут загружаться прямо оттуда. Это сэкономит место на сервере, но увеличит трафик, так как не будут создаваться эскизы."
-cacheRemoteSensitiveFiles: "Кешировать внешние файлы"
-cacheRemoteSensitiveFilesDescription: "Описание удаленных внешних файлов в кэше"
+cacheRemoteSensitiveFiles: "Кэшировать внешние файлы «не для всех»"
+cacheRemoteSensitiveFilesDescription: "Если отключено, файлы «не для всех» загружаются непосредственно с удалённых серверов, не кэшируясь."
 flagAsBot: "Аккаунт бота"
 flagAsBotDescription: "Включите, если этот аккаунт управляется программой. Это позволит системе Misskey учитывать это, а также поможет разработчикам других ботов предотвратить бесконечные циклы взаимодействия."
 flagAsCat: "Аккаунт кота"
@@ -261,6 +261,7 @@ removed: "Удалено"
 removeAreYouSure: "Хотите удалить «{x}»?"
 deleteAreYouSure: "Хотите удалить «{x}»?"
 resetAreYouSure: "На самом деле сбросить?"
+areYouSure: "Вы уверены?"
 saved: "Сохранено"
 messaging: "Сообщения"
 upload: "Загрузить"
@@ -278,7 +279,7 @@ noMoreHistory: "История закончилась"
 startMessaging: "Начать общение"
 nUsersRead: "Прочитали {n}"
 agreeTo: "Я соглашаюсь с {0}"
-agree: "Согласиться"
+agree: "Согласен"
 agreeBelow: "Согласен со следующими"
 basicNotesBeforeCreateAccount: "Записи, перед созданием аккаунта"
 termsOfService: "Условия использования"
@@ -324,7 +325,7 @@ copyUrl: "Копировать ссылку"
 rename: "Переименовать"
 avatar: "Аватар"
 banner: "Шапка"
-displayOfSensitiveMedia: "Определение деликатного контента"
+displayOfSensitiveMedia: "Отображение содержимого не для всех"
 whenServerDisconnected: "Когда соединение с сервером потеряно"
 disconnectedFromServer: "Разорвано соединение с сервером"
 reload: "Перезагрузить"
@@ -372,6 +373,8 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "Включить hCaptcha"
 hcaptchaSiteKey: "Ключ сайта"
 hcaptchaSecretKey: "Секретный ключ"
+mcaptchaSiteKey: "Ключ сайта"
+mcaptchaSecretKey: "Секретный ключ"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Включить reCAPTCHA"
 recaptchaSiteKey: "Ключ сайта"
@@ -413,7 +416,7 @@ about: "Описание"
 aboutMisskey: "О Misskey"
 administrator: "Администратор"
 token: "Токен"
-2fa: "2-х факторная аутентификация"
+2fa: "Двухфакторная аутентификация"
 setupOf2fa: "Настроить двухфакторную аутентификацию"
 totp: "Приложение-аутентификатор"
 totpDescription: "Описание приложения-аутентификатора"
@@ -477,7 +480,7 @@ aboutX: "Описание {x}"
 emojiStyle: "Стиль эмодзи"
 native: "Системные"
 disableDrawer: "Не использовать выдвижные меню"
-showNoteActionsOnlyHover: "Показывать кнопки управления заметкой только при наведении"
+showNoteActionsOnlyHover: "Показывать кнопки у заметок только при наведении"
 noHistory: "История пока пуста"
 signinHistory: "Журнал посещений"
 enableAdvancedMfm: "Включить расширенный MFM"
@@ -490,8 +493,8 @@ createAccount: "Новая учётная запись"
 existingAccount: "Существующая учётная запись"
 regenerate: "Создать повторно"
 fontSize: "Размер шрифта"
-mediaListWithOneImageAppearance: "Показывать список медиа только одним изображением"
-limitTo: "Обрезать до {x}"
+mediaListWithOneImageAppearance: "Вид изображения, если оно единственное в списке"
+limitTo: "Ограничить до {x}"
 noFollowRequests: "Нерассмотренные запросы на подписку отсутствуют"
 openImageInNewTab: "Открыть изображение в новой вкладке"
 dashboard: "Панель управления"
@@ -525,7 +528,7 @@ objectStorageUseSSLDesc: "Отключите, если не собираетес
 objectStorageUseProxy: "Использовать прокси"
 objectStorageUseProxyDesc: "Отключите, если не будете испоьзовать прокси для соединений по протоколу ObjectStorage."
 objectStorageSetPublicRead: "Устанавливать public-read при загрузке на сервер"
-s3ForcePathStyleDesc: "Включение s3ForcePathStyle принудительно указывает имя корзины как часть пути в URL-адресе вместо имени хоста. Может потребоваться активация при использовании таких вещей, как локальный Minio."
+s3ForcePathStyleDesc: "Включение s3ForcePathStyle приводит к тому, что имя корзины указывается как часть пути в URL, а не в имени хоста. Может потребоваться включить при использовании локального Minio или чего-то подобного."
 serverLogs: "Журнал сервера"
 deleteAll: "Удалить всё"
 showFixedPostForm: "Показывать поле для ввода новой заметки наверху ленты"
@@ -569,7 +572,7 @@ yourAccountSuspendedTitle: "Эта учетная запись заблокир
 yourAccountSuspendedDescription: "Эта учетная запись была заблокирована из-за нарушения условий предоставления услуг сервера. Свяжитесь с администратором, если вы хотите узнать более подробную причину. Пожалуйста, не создавайте новую учетную запись."
 tokenRevoked: "Токен недействителен"
 tokenRevokedDescription: "Срок действия вашего токена входа истек. Пожалуйста, войдите снова."
-accountDeleted: "Эта учетная запись удалена"
+accountDeleted: "Учетная запись удалена"
 accountDeletedDescription: "Эта учетная запись удалена"
 menu: "Меню"
 divider: "Линия-разделитель"
@@ -651,6 +654,7 @@ useGlobalSettingDesc: "Если включено, будут использов
 other: "Другие"
 regenerateLoginToken: "Создать новый токен для входа"
 regenerateLoginTokenDescription: "Создаёт новый токен, используемый внутри программы во время входа. Обычно в этом нет необходимости. При создании все устройства будут отключены."
+theKeywordWhenSearchingForCustomEmoji: "Это ключевое слово будет использовано при поиске эмодзи."
 setMultipleBySeparatingWithSpace: "Можно написать несколько через пробел"
 fileIdOrUrl: "Идентификатор файла или ссылка"
 behavior: "Поведение"
@@ -721,7 +725,7 @@ useSystemFont: "Использовать шрифт, предлагаемый с
 clips: "Подборки"
 experimentalFeatures: "Экспериментальные функции"
 experimental: "Экспериментальные"
-thisIsExperimentalFeature: "Это экспериментальная функция. Технические характеристики могут измениться или он может работать неправильно."
+thisIsExperimentalFeature: "Это экспериментальная функция. Её поведение, вероятно, поменяется в следующей версии, а ещё она может работать не так, как задумано."
 developer: "Разработчик"
 makeExplorable: "Опубликовать профиль в «Обзоре»."
 makeExplorableDescription: "Если выключить, ваш профиль не будет показан в разделе «Обзор»."
@@ -806,7 +810,7 @@ noMaintainerInformationWarning: "Не заполнены сведения об 
 noBotProtectionWarning: "Ботозащита не настроена"
 configure: "Настроить"
 postToGallery: "Опубликовать в галерею"
-postToHashtag: "Опубликовать пост с этим хештегом"
+postToHashtag: "Написать заметку с этим хэштегом"
 gallery: "Галерея"
 recentPosts: "Недавние публикации"
 popularPosts: "Популярные публикации"
@@ -835,7 +839,7 @@ useBlurEffect: "Размытие в интерфейсе"
 learnMore: "Подробнее"
 misskeyUpdated: "Misskey обновился!"
 whatIsNew: "Что новенького?"
-translate: "Перевод"
+translate: "Перевести"
 translatedFrom: "Перевод. Язык оригинала — {x}"
 accountDeletionInProgress: "В настоящее время выполняется удаление учетной записи"
 usernameInfo: "Имя, которое отличает вашу учетную запись от других на этом сервере. Вы можете использовать алфавит (a~z, A~Z), цифры (0~9) или символы подчеркивания (_). Имена пользователей не могут быть изменены позже."
@@ -847,11 +851,11 @@ lastCommunication: "Последнее сообщение"
 resolved: "Решено"
 unresolved: "Без решения"
 breakFollow: "Отписка"
-breakFollowConfirm: "Удалить из подписок пользователя ?"
+breakFollowConfirm: "Действительно удалить этого подписчика?"
 itsOn: "Включено"
 itsOff: "Выключено"
-on: "Вкл"
-off: "Выкл"
+on: "Вкл."
+off: "Выкл."
 emailRequiredForSignup: "Для регистрации учётной записи нужен адрес электронной почты"
 unread: "Непрочитанное"
 filter: "Фильтры"
@@ -880,7 +884,7 @@ numberOfColumn: "Количество столбцов"
 searchByGoogle: "Поиск"
 instanceDefaultLightTheme: "Светлая тема по умолчанию"
 instanceDefaultDarkTheme: "Темная тема по умолчанию"
-instanceDefaultThemeDescription: "Описание темы по умолчанию для инстанса"
+instanceDefaultThemeDescription: "Введите код темы в формате объекта."
 mutePeriod: "Продолжительность скрытия"
 period: "Опрос длится"
 indefinitely: "вечно"
@@ -904,7 +908,7 @@ thereIsUnresolvedAbuseReportWarning: "Остались нерешённые жа
 recommended: "Рекомендуем"
 check: "Проверить"
 driveCapOverrideLabel: "Изменение лимита дискового пространства для этого пользователя"
-driveCapOverrideCaption: "Укажите меньше или равное нулю для отмены"
+driveCapOverrideCaption: "Введите нуль или меньше, чтобы использовать значение по умолчанию."
 requireAdminForView: "Для просмотра необходимо иметь аккаунт администратора"
 isSystemAccount: "Данная учётная запись создана автоматически и управляется системой"
 typeToConfirm: "Введите {x} для продолжения"
@@ -924,7 +928,7 @@ type: "Тип"
 speed: "Скорость"
 slow: "Медленная"
 fast: "Быстрая"
-sensitiveMediaDetection: "Определение содержимого деликатного характера"
+sensitiveMediaDetection: "Распознание содержимого не для всех"
 localOnly: "Локально"
 remoteOnly: "Только удалённо"
 failedToUpload: "Сбой выгрузки"
@@ -1001,10 +1005,11 @@ invitationRequiredToRegister: "Этот сервер в настоящее вр
 emailNotSupported: "Доставка почты не поддерживается на этом сервере"
 postToTheChannel: "Отправить в канал"
 cannotBeChangedLater: "Это нельзя изменить позже"
-reactionAcceptance: "Принятие реакций"
-likeOnly: "Только лайки"
-likeOnlyForRemote: "Только лайки с удалённых серверов"
-nonSensitiveOnly: "Безопасный серфинг"
+reactionAcceptance: "Допустимые реакции"
+likeOnly: "Только «нравится!»"
+likeOnlyForRemote: "Всё (с других серверов только «нравится!»)"
+nonSensitiveOnly: "Только безопасные"
+nonSensitiveOnlyForLocalLikeOnlyForRemote: "Только безопасные (с других серверов только «нравится!»)"
 rolesAssignedToMe: "Мои роли"
 resetPasswordConfirm: "Сбросить пароль?"
 sensitiveWords: "Чувствительные слова"
@@ -1024,20 +1029,20 @@ noteIdOrUrl: "ID или ссылка на заметку"
 video: "Видео"
 videos: "Видео"
 dataSaver: "Экономия трафика"
-accountMigration: "Перенести учётную запись"
-accountMoved: "Учетная запись перенесена"
+accountMigration: "Перенос учётной записи"
+accountMoved: "Учётная запись перенесена"
 accountMovedShort: "Эта учётная запись перемещена"
-operationForbidden: "Эта операция невозможна."
+operationForbidden: "Это действие запрещено"
 forceShowAds: "Всегда отображать рекламу"
-addMemo: "Добавить заметку"
-editMemo: "Редактировать заметку"
-reactionsList: "Реакции"
+addMemo: "Добавить памятку"
+editMemo: "Изменить памятку"
+reactionsList: "Список реакций"
 renotesList: "Репосты"
-notificationDisplay: "Отображение уведомления"
-leftTop: "Верхний левый угол"
-rightTop: "Сверху справа"
-leftBottom: "Снизу слева"
-rightBottom: "Снизу справа"
+notificationDisplay: "Отображение уведомлений"
+leftTop: "Влево вверх"
+rightTop: "Вправо вверх"
+leftBottom: "Влево вниз"
+rightBottom: "Вправо вниз"
 vertical: "Вертикальная"
 horizontal: "Сбоку"
 position: "Позиция"
@@ -1077,6 +1082,7 @@ replies: "Ответы"
 renotes: "Репост"
 loadReplies: "Показать ответы"
 flip: "Переворот"
+lastNDays: "Последние {n} сут"
 _initialAccountSetting:
   accountCreated: "Аккаунт успешно создан!"
   letsStartAccountSetup: "Давайте настроим вашу учётную запись."
@@ -1693,7 +1699,7 @@ _weekday:
 _widgets:
   profile: "Профиль"
   instanceInfo: "Информация об инстансе"
-  memo: "Напоминания"
+  memo: "Памятки"
   notifications: "Уведомления"
   timeline: "Лента"
   calendar: "Календарь"
@@ -1784,6 +1790,7 @@ _profile:
 _exportOrImport:
   allNotes: "Все заметки\n"
   favoritedNotes: "Избранное"
+  clips: "Подборка"
   followingList: "Подписки"
   muteList: "Скрытые"
   blockingList: "Заблокированные"
@@ -1959,4 +1966,9 @@ _webhookSettings:
   active: "Вкл."
 _moderationLogTypes:
   suspend: "Заморозить"
+  addCustomEmoji: "Добавлено эмодзи"
+  updateCustomEmoji: "Изменено эмодзи"
+  deleteCustomEmoji: "Удалено эмодзи"
   resetPassword: "Сброс пароля:"
+_reversi:
+  total: "Всего"
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index e8401af1cd..00d5f5ff84 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -349,6 +349,8 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "Zapnúť hCaptchu"
 hcaptchaSiteKey: "Site key"
 hcaptchaSecretKey: "Secret key"
+mcaptchaSiteKey: "Site key"
+mcaptchaSecretKey: "Secret key"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Zapnúť ReCAPTCHA"
 recaptchaSiteKey: "Site key"
@@ -918,6 +920,7 @@ icon: "Avatar"
 replies: "Odpovedať"
 renotes: "Preposlať"
 flip: "Preklopiť"
+lastNDays: "Posledných {n} dní"
 _role:
   priority: "Priorita"
   _priority:
@@ -1284,6 +1287,7 @@ _profile:
   changeBanner: "Zmeniť banner"
 _exportOrImport:
   allNotes: "Všetky poznámky"
+  clips: "Klip"
   followingList: "Sledujete"
   muteList: "Vypnúť zvuk"
   blockingList: "Zablokovať"
@@ -1441,3 +1445,5 @@ _webhookSettings:
 _moderationLogTypes:
   suspend: "Zmraziť"
   resetPassword: "Resetovať heslo"
+_reversi:
+  total: "Celkom"
diff --git a/locales/sv-SE.yml b/locales/sv-SE.yml
index e5816ba105..62bc71a13d 100644
--- a/locales/sv-SE.yml
+++ b/locales/sv-SE.yml
@@ -345,6 +345,8 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "Aktivera hCaptcha"
 hcaptchaSiteKey: "Webbplatsnyckel"
 hcaptchaSecretKey: "Hemlig nyckel"
+mcaptchaSiteKey: "Webbplatsnyckel"
+mcaptchaSecretKey: "Hemlig nyckel"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Aktivera reCAPTCHA"
 recaptchaSiteKey: "Webbplatsnyckel"
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index 7cb2d68321..e17f06d0eb 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "ภาษาไทย"
-headlineMisskey: "เชื่อมต่อระบบ Network ด้วย Note"
-introMisskey: "ยินดีต้อนรับทุกคนจ้า! Misskey คือ บริการไมโครบล็อกกิ้ง (MicroBlogging) แบบกระจายศูนย์อำนาจ (Decentralized) \n\nเขียน \"โน้ต (Note)\" เพื่อส่งต่อเรื่องราวของคุณให้ทั้งโลกได้รับรู้📡\nและอย่าลืมที่จะ \"React\" กับเรื่องราวของคนอื่น ๆ ด้วย! 👍\n\nมุ่งสู่โลกใบใหม่กันเถอะ🚀"
+headlineMisskey: "เชื่อมต่อเครือข่ายโดยโน้ต"
+introMisskey: "ยินดีต้อนรับทุกคนจ้า! Misskey คือ ซอฟต์แวร์โอเพนซอร์สสำหรับบริการไมโครบล็อกกิ้ง (MicroBlogging) แบบกระจายศูนย์อำนาจ (Decentralized) \n\nเขียน “โน้ต (Note)” เพื่อส่งต่อเรื่องราวของคุณให้ทั้งโลกได้รับรู้📡\nและอย่าลืมที่จะ “รีแอคชั่น” กับเรื่องราวของคนอื่น ๆ ด้วยนะ! 👍\n\nท่องสำรวจโลกใบใหม่กันเถอะ🚀"
 poweredByMisskeyDescription: "{name} เป็นส่วนหนึ่งในบริการที่ถูกขับเคลื่อนโดยแพลตฟอร์มโอเพ่นซอร์ส <b>Misskey</b> (เรียกว่า \"อินสแตนซ์ Misskey\")"
 monthAndDay: "{month}/{day}"
 search: "ค้นหา"
@@ -9,12 +9,12 @@ notifications: "การเเจ้งเตือน"
 username: "ชื่อผู้ใช้"
 password: "รหัสผ่าน"
 forgotPassword: "ลืมรหัสผ่านใช่ไหม"
-fetchingAsApObject: "กำลังดึงข้อมูล จาก เฟดิเวิร์ส..."
-ok: "โอเค"
+fetchingAsApObject: "กำลังดึงข้อมูลจากสหพันธ์..."
+ok: "ตกลง"
 gotIt: "เข้าใจแล้ว !"
 cancel: "ยกเลิก"
 noThankYou: "ไม่เป็นไร"
-enterUsername: "ใส่ชื่อผู้ใช้"
+enterUsername: "กรอกชื่อผู้ใช้"
 renotedBy: "รีโน้ตโดย {user}"
 noNotes: "ไม่มีโน้ต"
 noNotifications: "ไม่มีการแจ้งเตือน"
@@ -26,7 +26,7 @@ otherSettings: "การตั้งค่าอื่นๆ"
 openInWindow: "เปิดในหน้าต่าง"
 profile: "โปรไฟล์"
 timeline: "ไทม์ไลน์"
-noAccountDescription: "ผู้ใช้รายนี้ยังไม่ได้เขียนลงประวัติของพวกเขา"
+noAccountDescription: "ผู้ใช้รายนี้ยังไม่ได้เขียนคำแนะนำตัว"
 login: "เข้าสู่ระบบ"
 loggingIn: "กำลังเข้าสู่ระบบ"
 logout: "ออกจากระบบ"
@@ -41,15 +41,15 @@ unfavorite: "ลบออกจากรายการโปรด"
 favorited: "เพิ่มแล้วในรายการโปรด"
 alreadyFavorited: "เพิ่มในรายการโปรดอยู่แล้ว"
 cantFavorite: "ไม่สามารถเพิ่มในรายการโปรดได้"
-pin: "ปักหมุดไปยังโปรไฟล์"
-unpin: "เลิกปักหมุดจากโปรไฟล์"
+pin: "ปักหมุด"
+unpin: "เลิกปักหมุด"
 copyContent: "คัดลอกเนื้อหา"
 copyLink: "คัดลอกลิงก์"
 copyLinkRenote: "คัดลอกลิงก์รีโน้ต"
 delete: "ลบ"
 deleteAndEdit: "ลบและแก้ไข"
-deleteAndEditConfirm: "นายแน่ใจแล้วเหรอ? ว่าต้องการลบโน้ตนี้และแก้ไข คุณอาจจะสูญเสียการโต้ตอบ, โน้ต, และการตอบกลับทั้งหมดได้นะ"
-addToList: "เพิ่มในลิสต์"
+deleteAndEditConfirm: "คุณต้องการลบโน้ตนี้และแก้ไขใหม่ใช่ไหม? รีแอคชั่น รีโน้ต และการตอบกลับต่อโน้ตนี้ทั้งหมดจะถูกลบออกด้วย"
+addToList: "เพิ่มลงรายชื่อ"
 addToAntenna: "เพิ่มไปยังเสาอากาศ"
 sendMessage: "ส่งข้อความ"
 copyRSS: "คัดลอก RSS"
@@ -59,35 +59,35 @@ copyNoteId: "คัดลอก ID โน้ต "
 copyFileId: "คัดลอกไฟล์ ID"
 copyFolderId: "คัดลอกโฟลเดอร์ ID"
 copyProfileUrl: "คัดลอกโปรไฟล์ URL"
-searchUser: "ค้นหาผู้ใช้งาน"
+searchUser: "ค้นหาผู้ใช้"
 reply: "ตอบกลับ"
-loadMore: "โหลดเพิ่มเติม"
+loadMore: "แสดงเพิ่มเติม"
 showMore: "แสดงเพิ่มเติม"
 showLess: "ปิด"
 youGotNewFollower: "ได้ติดตามคุณ"
 receiveFollowRequest: "คำขอผู้ติดตามที่ได้รับ"
-followRequestAccepted: "ผู้ติดตามได้ตอบรับคำขอร้องของคุณแล้ว"
+followRequestAccepted: "อนุมัติการติดตามแล้ว"
 mention: "กล่าวถึง"
 mentions: "พูดถึง"
 directNotes: "ไดเร็คโน้ต"
 importAndExport: "นำเข้า / ส่งออก"
 import: "นำเข้า"
-export: "นำออก"
+export: "ส่งออก"
 files: "ไฟล์"
 download: "ดาวน์โหลด"
-driveFileDeleteConfirm: "คุณต้องการลบไฟล์ \"{name}\" ใช่หรือไม่? โน้ตย่อที่แนบมากับไฟล์นี้ก็จะถูกลบไปด้วย"
-unfollowConfirm: "นายแน่ใจแล้วหรอว่าต้องการเลิกติดตาม {name}?"
-exportRequested: "เมื่อคุณได้ร้องขอการส่งออก อาจจะต้องใช้เวลาสักครู่ และจะถูกเพิ่มในไดรฟ์ของคุณเมื่อเสร็จสิ้นแล้ว"
-importRequested: "เมื่อคุณได้ร้องขอการนำเข้า อาจจะต้องใช้เวลาสักครู่นะ"
-lists: "รายการ"
-noLists: "คุณไม่มีลิสต์ใด ๆ"
+driveFileDeleteConfirm: "ต้องการลบไฟล์ “{name}” ใช่หรือไม่? โน้ตที่แนบมากับไฟล์นี้ก็จะถูกลบไปด้วย"
+unfollowConfirm: "ต้องการเลิกติดตาม {name}?"
+exportRequested: "คุณได้ร้องขอการส่งออก อาจใช้เวลาสักครู่ และจะถูกเพิ่มในไดรฟ์ของคุณเมื่อเสร็จสิ้นแล้ว"
+importRequested: "คุณได้ร้องขอการนำเข้า การดำเนินการนี้อาจใช้เวลาสักครู่"
+lists: "รายชื่อ"
+noLists: "คุณไม่มีรายชื่อใดๆ"
 note: " โน้ต"
-notes: "ตัวโน้ต"
+notes: " โน้ต"
 following: "กำลังติดตาม"
 followers: "ผู้ติดตาม"
 followsYou: "ติดตามคุณ"
-createList: "สร้างลิสต์"
-manageLists: "จัดการลิสต์"
+createList: "สร้างรายชื่อ"
+manageLists: "จัดการรายชื่อ"
 error: "ผิดพลาด!"
 somethingHappened: "อุ๊ย ! มีอะไรบางอย่างผิดพลาด"
 retry: "ลองใหม่อีกครั้ง"
@@ -95,37 +95,44 @@ pageLoadError: "เกิดข้อผิดพลาดในการโห
 pageLoadErrorDescription: "โดยปกติแล้วมักจะเกิดจากข้อผิดพลาดของเครือข่ายหรือแคชของเบราว์เซอร์ ลองล้างแคชแล้วลองใหม่อีกครั้งหลังจากรอสักครู่ "
 serverIsDead: "เซิร์ฟเวอร์นี้ไม่มีการตอบสนอง โปรดกรุณารอสักครู่แล้วลองใหม่อีกครั้ง"
 youShouldUpgradeClient: "หากต้องการดูหน้านี้ กรุณาโหลดหน้าใหม่เพื่ออัปเดตไคลเอ็นต์ของคุณ"
-enterListName: "ใส่ชื่อสำหรับรายการลิสต์"
+enterListName: "ป้อนนามเรียกของรายชื่อชุดนี้"
 privacy: "ความเป็นส่วนตัว"
-makeFollowManuallyApprove: "ติดตามคำขอที่ต้องได้รับการอนุมัติ"
+makeFollowManuallyApprove: "อนุมัติคำขอติดตามด้วยตนเอง"
 defaultNoteVisibility: "การมองเห็นที่เป็นค่าเริ่มต้น"
 follow: "ติดตาม"
 followRequest: "ส่งคำขอติดตาม"
 followRequests: "ส่งคำขอติดตาม"
 unfollow: "เลิกติดตาม"
-followRequestPending: "กำลังรอดำเนินการร้องขอติดตาม"
-enterEmoji: "ใส่อีโมจิ"
+followRequestPending: "รออนุมัติคำขอติดตาม"
+enterEmoji: "พิมพ์เอโมจิ"
 renote: "รีโน้ต"
 unrenote: "เลิกรีโน้ต"
 renoted: "รีโน้ตแล้ว"
-cantRenote: "โพสต์นี้ไม่สามารถรีโน้ตไว้ใหม่ได้นะ"
-cantReRenote: "ไม่สามารถรีโน้ตเอาไว้ใหม่ได้นะ"
+cantRenote: "โพสต์นี้ไม่สามารถรีโน้ตใหม่ได้"
+cantReRenote: "รีโน้ตไม่สามารถรีโน้ตซ้ำได้"
 quote: "อ้างอิง"
-inChannelRenote: "รีโน้ตช่องแชลแนลเท่านั้น"
-inChannelQuote: "อ้างช่องเท่านั้น"
-pinnedNote: "โน้ตที่ปักหมุดเอาไว้"
-pinned: "ปักหมุดไปยังโปรไฟล์"
+inChannelRenote: "รีโน้ตในช่องเท่านั้น"
+inChannelQuote: "อ้างอิงในช่องเท่านั้น"
+pinnedNote: "โน้ตที่ปักหมุดไว้"
+pinned: "ปักหมุด"
 you: "คุณ"
 clickToShow: "คลิกเพื่อแสดง"
-sensitive: "เนื้อหาที่ละเอียดอ่อน NSFW"
+sensitive: "เนื้อหาที่ละเอียดอ่อน"
 add: "เพิ่ม"
 reaction: "รีแอคชั่น"
 reactions: "รีแอคชั่น"
-reactionSettingDescription2: "กดลากเพื่อจัดลำดับใหม่ กดคลิกเพื่อลบ กด \"+\" เพื่อเพิ่ม"
+emojiPicker: "ตัวจิ้มเอโมจิ"
+pinnedEmojisForReactionSettingDescription: "ตรึงเอโมจิไว้ด้านบนสำหรับรีแอคชั่นอย่างเร่งด่วน"
+pinnedEmojisSettingDescription: "ตรึงเอโมจิไว้ด้านบนสำหรับพิมพ์เอโมจิอย่างเร่งด่วน"
+emojiPickerDisplay: "แสดงตัวจิ้มเอโมจิ"
+overwriteFromPinnedEmojisForReaction: "เขียนทับการตั้งค่ารีแอคชั่น"
+overwriteFromPinnedEmojis: "เขียนทับการตั้งค่าทั่วไป"
+reactionSettingDescription2: "ลากเพื่อจัดลำดับใหม่ คลิกที่เอโมจินั้นเพื่อลบ กด “+” เพื่อเพิ่ม"
 rememberNoteVisibility: "จดจำการตั้งค่าการมองเห็นตัวโน้ต"
 attachCancel: "ลบไฟล์ออกที่แนบมา"
-markAsSensitive: "ทำเครื่องหมายว่าละเอียดอ่อน"
-unmarkAsSensitive: "ยกเลิกทำเครื่องหมายเป็น NSFW"
+deleteFile: "ลบไฟล์ออกแล้ว"
+markAsSensitive: "ทำเครื่องหมายว่ามีเนื้อหาละเอียดอ่อน"
+unmarkAsSensitive: "ยกเลิกทำเครื่องหมายว่ามีเนื้อหาละเอียดอ่อน"
 enterFileName: "พิมพ์ชื่อไฟล์"
 mute: "ปิดเสียง"
 unmute: "ยกเลิกการปิดเสียง"
@@ -135,34 +142,34 @@ block: "บล็อค"
 unblock: "เลิกปิดกั้น"
 suspend: "ถูกระงับ"
 unsuspend: "ยกเลิกระงับ"
-blockConfirm: "คุณแน่ใจแล้วเหรอ? ว่าต้องการบล็อกบัญชีนี้"
-unblockConfirm: "คุณแน่ใจแล้วเหรอ? ว่าต้องการปลดบล็อคบัญชีนี้"
-suspendConfirm: "แน่ใจว่าคุณต้องการระงับบัญชีนี้?"
-unsuspendConfirm: "นายแน่ใจแล้วหรอ? ว่าต้องการยกเลิกการระงับบัญชีนี้"
-selectList: "เลือกรายการ"
-editList: "แก้ไขรายการ"
-selectChannel: "เลือกแชนแนล"
+blockConfirm: "ต้องการบล็อกบัญชีนี้?"
+unblockConfirm: "ต้องการปลดบล็อคบัญชีนี้?"
+suspendConfirm: "ต้องการระงับบัญชีนี้?"
+unsuspendConfirm: "ต้องการยกเลิกการระงับบัญชีนี้?"
+selectList: "เลือกรายชื่อ"
+editList: "แก้ไขรายชื่อ"
+selectChannel: "เลือกช่อง"
 selectAntenna: "เลือกเสาอากาศ"
 editAntenna: "แก้ไขเสาอากาศ"
 selectWidget: "เลือกวิดเจ็ต"
 editWidgets: "แก้ไขวิดเจ็ต"
 editWidgetsExit: "เรียบร้อย"
-customEmojis: "กำหนดอีโมจิเอง"
-emoji: "อีโมจิ"
+customEmojis: "เอโมจิที่กำหนดเอง"
+emoji: "เอโมจิ"
 emojis: "อีโมจิ"
-emojiName: "ชื่ออิโมจิ"
-emojiUrl: "อิโมจิ URL"
-addEmoji: "แทรกอีโมจิ"
+emojiName: "ชื่อเอโมจิ"
+emojiUrl: "URL ของเอโมจิ"
+addEmoji: "แทรกเอโมจิ"
 settingGuide: "การตั้งค่าที่แนะนำ"
 cacheRemoteFiles: "แคชไฟล์ระยะไกล"
 cacheRemoteFilesDescription: "เมื่อปิดใช้งานการตั้งค่านี้ ไฟล์ระยะไกลนั้นจะถูกโหลดโดยตรงจากอินสแตนซ์ระยะไกล แต่กรณีการปิดใช้งานนี้จะช่วยลดปริมาณการใช้พื้นที่จัดเก็บข้อมูล แต่เพิ่มปริมาณการใช้งาน เพราะเนื่องจากจะไม่มีการสร้างภาพขนาดย่อ"
 youCanCleanRemoteFilesCache: "คุณสามารถล้างแคชได้โดยคลิกที่ปุ่ม 🗑️ ในมุมมองการจัดการไฟล์"
-cacheRemoteSensitiveFiles: "ไฟล์ระยะไกลที่มีความละเอียดอ่อนแคช"
-cacheRemoteSensitiveFilesDescription: "เมื่อปิดการใช้งานแล้วการตั้งค่านี้ ไฟล์รีโมตที่มีความละเอียดอ่อนนั้นจะถูกโหลดโดยตรงจากอินสแตนซ์ระยะไกลโดยที่ไม่มีการแคช"
+cacheRemoteSensitiveFiles: "แคชไฟล์ระยะไกลที่มีเครื่องหมายว่ามีเนื้อหาละเอียดอ่อน"
+cacheRemoteSensitiveFilesDescription: "เมื่อปิดการใช้งานการตั้งค่านี้ ไฟล์ระยะไกลที่มีเครื่องหมายว่ามีเนื้อหาละเอียดอ่อนนั้นจะถูกโหลดโดยตรงจากอินสแตนซ์ระยะไกลโดยที่ไม่มีการแคช"
 flagAsBot: "ทำเครื่องหมายบอกว่าบัญชีนี้เป็นบอท"
 flagAsBotDescription: "การเปิดใช้งานตัวเลือกนี้หากบัญชีนี้ถูกควบคุมโดยนักเขียนโปรแกรม หรือ ถ้าหากเปิดใช้งาน มันจะทำหน้าที่เป็นแฟล็กสำหรับนักพัฒนารายอื่นๆ และเพื่อป้องกันการโต้ตอบแบบไม่มีที่สิ้นสุดกับบอทตัวอื่นๆ และยังสามารถปรับเปลี่ยนระบบภายในของ Misskey เพื่อปฏิบัติต่อบัญชีนี้เป็นบอท"
-flagAsCat: "ทำเครื่องหมายบอกว่าบัญชีนี้เป็นแมว"
-flagAsCatDescription: "การเปิดใช้งานตัวเลือกนี้เพื่อทำเครื่องหมายบอกว่าบัญชีนี้เป็นแมว"
+flagAsCat: "เมี้ยววววววว!!!!!!!!!!! (ทำเครื่องหมายว่าบัญชีนี้เป็นแมว)"
+flagAsCatDescription: "เหมียวเหมียวเมี้ยว??"
 flagShowTimelineReplies: "แสดงตอบกลับ ในไทม์ไลน์"
 flagShowTimelineRepliesDescription: "แสดงการตอบกลับของผู้ใช้งานไปยังโน้ตของผู้ใช้งานรายอื่นๆในไทม์ไลน์หากได้เปิดเอาไว้"
 autoAcceptFollowed: "อนุมัติคำขอติดตามโดยอัตโนมัติทันที จากผู้ใช้งานที่คุณกำลังติดตาม"
@@ -171,20 +178,20 @@ reloadAccountsList: "รีโหลดรายการบัญชีให
 loginFailed: "การเข้าสู่ระบบไม่สำเร็จ"
 showOnRemote: "ดูบนอินสแตนซ์ระยะไกล"
 general: "ทั่วไป"
-wallpaper: "วอลล์เปเปอร์"
-setWallpaper: "ตั้งวอลเปเปอร์"
-removeWallpaper: "นำวอลเปเปอร์ออก"
+wallpaper: "ภาพพื้นหลัง"
+setWallpaper: "ตั้งค่าภาพพื้นหลัง"
+removeWallpaper: "น้ำภาพพื้นหลังออก"
 searchWith: "ค้นหา: {q}"
-youHaveNoLists: "คุณไม่มีลิสต์ใด ๆ "
-followConfirm: "คุณแน่ใจแล้วหรอว่าต้องการที่จะติดตาม {name}?"
-proxyAccount: "บัญชี พร็อกซี่"
+youHaveNoLists: "คุณไม่มีรายชื่อใดๆ "
+followConfirm: "ต้องการติดตาม {name} ใช่ไหม?"
+proxyAccount: "บัญชีพร็อกซี่"
 proxyAccountDescription: "บัญชีพร็อกซี่ คือ บัญชีที่จะทำหน้าที่เป็นผู้ติดตามระยะไกลสำหรับผู้ใช้งานที่อยู่ภายใต้ด้วยเงื่อนไขบางอย่าง ยกตัวอย่าง เช่น เมื่อมีผู้ใช้งานนั้นได้เพิ่มผู้ใช้งานจากระยะไกลลงในรายการ แต่กิจกรรมของผู้ใช้ในระยะไกลนั้นจะไม่ถูกส่งไปยังอินสแตนซ์หากไม่มีผู้ใช้งานในพื้นที่ติดตามผู้ใช้รายนั้น ดังนั้นบัญชีพร็อกซีนี้จะติดตามแทน"
 host: "โฮสต์"
 selectUser: "เลือกผู้ใช้งาน"
 recipient: "ผู้รับ"
 annotation: "ความคิดเห็น"
-federation: "เฟดิเวิร์ส"
-instances: "Server"
+federation: "สหพันธ์"
+instances: "อินสแตนซ์"
 registeredAt: "จดทะเบียนที่"
 latestRequestReceivedAt: "ได้รับคำขอล่าสุดไปแล้ว"
 latestStatus: "สถานะล่าสุด"
@@ -194,33 +201,34 @@ perHour: "ทุกชั่วโมง"
 perDay: "ต่อวัน"
 stopActivityDelivery: "หยุดส่งกิจกรรม"
 blockThisInstance: "บล็อกอินสแตนซ์นี้"
-silenceThisInstance: "ปกปิดอินสแตนซ์นี้"
+silenceThisInstance: "ปิดปากอินสแตนซ์นี้"
 operations: "ดำเนินการ"
 software: "ซอฟต์แวร์"
 version: "เวอร์ชั่น"
 metadata: "Metadata"
-withNFiles: "{n} ไฟล์(s)"
+withNFiles: "{n} ไฟล์"
 monitor: "มอนิเตอร์"
 jobQueue: "คิวงาน"
 cpuAndMemory: "ซีพียู และ หน่วยความจำ"
-network: "เน็ตเวิร์ก"
+network: "เครือข่าย"
 disk: "ดิสก์"
-instanceInfo: "ข้อมูล อินสแตนซ์"
+instanceInfo: "ข้อมูลอินสแตนซ์"
 statistics: "สถิติการใช้งาน"
 clearQueue: "ล้างคิว"
 clearQueueConfirmTitle: "คุณแน่ใจแล้วหรอว่าต้องการที่จะล้างคิว?"
-clearQueueConfirmText: "บันทึกย่อที่ยังไม่ได้ส่งที่เหลืออยู่ในคิวนั้นมักจะ ไม่ถูกรวมเข้าด้วยกัน โดยปกติแล้วไม่จำเป็นต้องดำเนินการนี้"
+clearQueueConfirmText: "โพสต์ที่ยังค้างในคิวจะไม่ถูกจัดส่งอีกต่อไป โดยปกติแล้วการดำเนินการนี้ไม่จำเป็น"
 clearCachedFiles: "ล้างแคช"
-clearCachedFilesConfirm: "นายแน่ใจแล้วหรอว่าต้องการที่จะลบไฟล์ระยะไกลที่แคชไว้ทั้งหมด?"
-blockedInstances: "อินสแตนซ์ที่ ถูกบล็อก"
+clearCachedFilesConfirm: "ต้องการลบไฟล์ระยะไกลที่แคชไว้ทั้งหมด?"
+blockedInstances: "อินสแตนซ์ที่ถูกบล็อก"
 blockedInstancesDescription: "ระบุชื่อโฮสต์ของอินสแตนซ์ที่คุณต้องการบล็อก อินสแตนซ์ที่อยู่ในรายการนั้นจะไม่สามารถพูดคุยกับอินสแตนซ์นี้ได้อีกต่อไป"
-silencedInstances: "ปกปิดอินสแตนซ์นี้แล้ว"
+silencedInstances: "ปิดปากอินสแตนซ์นี้แล้ว"
+silencedInstancesDescription: "ตั้งค่ารายชื่อโฮสต์ของอินสแตนซ์ที่คุณต้องการปิดปาก บัญชีทั้งหมดของอินสแตนซ์ที่อยู่ในรายชื่อนั้นๆ จะถือว่าถูกปิดปากเช่นกัน ทำได้เฉพาะคำขอติดตามเท่านั้น และไม่สามารถกล่าวถึงบัญชีในพื้นที่ได้หากไม่ได้ติดตาม | สิ่งนี้ไม่มีผลต่ออินสแตนซ์ที่ถูกบล็อก"
 muteAndBlock: "ปิดเสียงและบล็อก"
 mutedUsers: "ผู้ใช้ที่ถูกปิดเสียง"
 blockedUsers: "ผู้ใช้ที่ถูกบล็อก"
 noUsers: "ไม่พบผู้ใช้งาน"
 editProfile: "แก้ไขโปรไฟล์"
-noteDeleteConfirm: "นายแน่ใจแล้วหรอว่าต้องการลบโน้ตนี้นะ?"
+noteDeleteConfirm: "ต้องการลบโน้ตนี้?"
 pinLimitExceeded: "คุณไม่สามารถปักหมุดโน้ตเพิ่มเติมใดๆได้อีก"
 intro: "การติดตั้ง Misskey เสร็จสิ้นแล้วนะ! โปรดสร้างผู้ใช้งานที่เป็นผู้ดูแลระบบ"
 done: "เสร็จสิ้น"
@@ -228,7 +236,7 @@ processing: "กำลังประมวลผล..."
 preview: "แสดงตัวอย่าง"
 default: "ค่าเริ่มต้น"
 defaultValueIs: "ค่าเริ่มต้น: {value}"
-noCustomEmojis: "ไม่มีอีโมจิ"
+noCustomEmojis: "ไม่มีเอโมจิ"
 noJobs: "ไม่มีชิ้นงาน"
 federating: "สหพันธ์"
 blocked: "ถูกบล็อก"
@@ -237,17 +245,17 @@ all: "ทั้งหมด"
 subscribing: "สมัครแล้ว"
 publishing: "กำลังเผยแพร่"
 notResponding: "ไม่มีการตอบสนอง"
-instanceFollowing: "กำลังติดตาม บน อินสแตนซ์"
+instanceFollowing: "กำลังติดตามบนอินสแตนซ์"
 instanceFollowers: "ผู้ติดตามของอินสแตนซ์"
 instanceUsers: "ผู้ใช้งานของอินสแตนซ์นี้"
 changePassword: "เปลี่ยนรหัสผ่าน"
 security: "ความปลอดภัย"
-retypedNotMatch: "อินพุตไม่ตรงกันนะ"
+retypedNotMatch: "ทั้งสองป้อนข้อมูลไม่สอดคล้องกัน"
 currentPassword: "รหัสผ่านปัจจุบัน"
 newPassword: "รหัสผ่านใหม่"
 newPasswordRetype: "ใส่รหัสผ่านใหม่อีกครั้ง"
 attachFile: "แนบไฟล์"
-more: "เพิ่มเติม"
+more: "เพิ่มเติม!"
 featured: "ไฮไลท์"
 usernameOrUserId: "ชื่อผู้ใช้หรือรหัสผู้ใช้งาน"
 noSuchUser: "ไม่พบผู้ใช้"
@@ -256,23 +264,24 @@ announcements: "ประกาศ"
 imageUrl: "url รูปภาพ"
 remove: "ลบ"
 removed: "ถูกลบไปแล้ว"
-removeAreYouSure: "นายแน่ใจจริงหรอว่าต้องการที่จะลบออก \"{x}\""
+removeAreYouSure: "ต้องการที่จะลบ “{x}” ออก?"
 deleteAreYouSure: "ต้องการลบ {x} หรือไม่คะ?"
-resetAreYouSure: "รีเซ็ตเลยไหม"
+resetAreYouSure: "รีเซ็ตเลยไหม?"
+areYouSure: "แน่ใจแล้วใช่ไหมคะ?"
 saved: "บันทึกแล้ว"
 messaging: "แชท"
-upload: "อัพโหลด"
+upload: "อัปโหลด"
 keepOriginalUploading: "เก็บภาพต้นฉบับ"
-keepOriginalUploadingDescription: "บันทึกรูปภาพที่อัพโหลดต้นฉบับตามที่เป็นอยู่ ถ้าหากปิดอยู่ ระบบจะสร้างเวอร์ชั่นที่จะแสดงบนเว็บเมื่ออัพโหลดนะ"
+keepOriginalUploadingDescription: "เก็บภาพต้นฉบับไว้เมื่ออัปโหลดภาพ หากปิด รูปภาพสำหรับการเผยแพร่ทางเว็บจะถูกสร้างขึ้นในเบราว์เซอร์เมื่อทำการอัปโหลด"
 fromDrive: "จากไดรฟ์"
 fromUrl: "จาก URL"
 uploadFromUrl: "อัพโหลดจาก URL"
 uploadFromUrlDescription: "URL ของไฟล์ที่คุณต้องการอัปโหลด"
-uploadFromUrlRequested: "อัพโหลดที่ร้องขอ"
-uploadFromUrlMayTakeTime: "มันอาจจะต้องใช้เวลาสักครู่จนกว่าการอัพโหลดจะเสร็จสมบูรณ์นะ"
+uploadFromUrlRequested: "ร้องขอการอัปโหลดแล้ว"
+uploadFromUrlMayTakeTime: "การอัปโหลดอาจใช้เวลาสักครู่จึงจะเสร็จสมบูรณ์"
 explore: "สำรวจ"
 messageRead: "อ่านแล้ว"
-noMoreHistory: "ในนั้นไม่มีประวัติอีกต่อไปแล้วนะ"
+noMoreHistory: "ไม่มีประวัติเพิ่มเติม"
 startMessaging: "เริ่มการสนทนา"
 nUsersRead: "อ่านโดย {n}"
 agreeTo: "ฉันยอมรับที่จะ {0}"
@@ -282,7 +291,7 @@ basicNotesBeforeCreateAccount: "หมายเหตุสำคัญ"
 termsOfService: "เงื่อนไขการให้บริการ"
 start: "เริ่มต้น​ใช้งาน​"
 home: "หน้าแรก"
-remoteUserCaution: "เนื่องจากผู้ใช้งานรายนี้นั้น มาจากอินสแตนซ์ระยะไกล ข้อมูลที่แสดงดังกล่าวนั้นอาจจะไม่สมบูรณ์ก็ได้นะ"
+remoteUserCaution: "ข้อมูลอาจไม่สมบูรณ์เนื่องจากผู้ใช้รายนี้มาจากอินสแตนซ์ระยะไกล"
 activity: "กิจกรรม"
 images: "รูปภาพ"
 image: "รูปภาพ"
@@ -291,13 +300,13 @@ yearsOld: "{age} ปี"
 registeredDate: "วันที่สมัครสมาชิก"
 location: "ตำแหน่งที่ตั้ง"
 theme: "ธีม"
-themeForLightMode: "ธีมที่จะใช้ในโหมดแสง"
+themeForLightMode: "ธีมที่จะใช้ในโหมดสว่าง"
 themeForDarkMode: "ธีมที่จะใช้ในโหมดมืด"
 light: "สว่าง"
 dark: "มืด"
 lightThemes: "ธีมสว่าง"
 darkThemes: "ธีมมืด"
-syncDeviceDarkMode: "ซิงค์โหมดมืดด้วยการตั้งค่ากับอุปกรณ์"
+syncDeviceDarkMode: "ซิงค์โหมดมืดกับการตั้งค่าอุปกรณ์ของคุณ"
 drive: "ไดรฟ์"
 fileName: "ชื่อไฟล์"
 selectFile: "เลือกไฟล์"
@@ -305,24 +314,25 @@ selectFiles: "เลือกไฟล์"
 selectFolder: "เลือกโฟลเดอร์"
 selectFolders: "เลือกโฟลเดอร์"
 renameFile: "เปลี่ยนชื่อไฟล์"
-folderName: "ชื่อแฟ้ม"
+folderName: "ชื่อโฟลเดอร์"
 createFolder: "สร้างโฟลเดอร์"
 renameFolder: "เปลี่ยนชื่อโฟลเดอร์"
 deleteFolder: "ลบโฟลเดอร์"
+folder: "โฟลเดอร์"
 addFile: "เพิ่มไฟล์"
 emptyDrive: "ไดรฟ์ของคุณว่างเปล่านะ"
 emptyFolder: "โฟลเดอร์นี้ว่างเปล่า"
 unableToDelete: "ไม่สามารถลบออกได้"
-inputNewFileName: "ป้อนชื่อไฟล์ใหม่นะ"
+inputNewFileName: "ป้อนชื่อไฟล์ใหม่"
 inputNewDescription: "กรุณาใส่แคปชั่นใหม่"
-inputNewFolderName: "กรุณาใส่ชื่อโฟลเดอร์ใหม่นะ\n"
-circularReferenceFolder: "โฟลเดอร์ปลายทาง คือ โฟลเดอร์ย่อยของโฟลเดอร์ที่คุณต้องการที่จะย้ายล่ะนะ"
-hasChildFilesOrFolders: "เนื่องจากโฟลเดอร์นี้ไม่ว่างเปล่า จึงไม่สามารถลบได้นะ"
+inputNewFolderName: "กรุณาใส่ชื่อโฟลเดอร์ใหม่"
+circularReferenceFolder: "โฟลเดอร์ปลายทางคือโฟลเดอร์ย่อยของโฟลเดอร์ที่คุณกำลังย้าย"
+hasChildFilesOrFolders: "เนื่องจากโฟลเดอร์นี้ไม่ว่างเปล่า จึงไม่สามารถลบ"
 copyUrl: "คัดลอก URL"
 rename: "เปลี่ยนชื่อ"
 avatar: "ไอคอน"
 banner: "แบนเนอร์"
-displayOfSensitiveMedia: "แสดงผลสื่อละเอียดอ่อน"
+displayOfSensitiveMedia: "แสดงสื่อที่มีเนื้อหาละเอียดอ่อน"
 whenServerDisconnected: "สูญเสียการเชื่อมต่อกับเซิร์ฟเวอร์"
 disconnectedFromServer: "ถูกตัดการเชื่อมต่อออกจากเซิร์ฟเวอร์"
 reload: "รีโหลด"
@@ -333,10 +343,10 @@ unwatch: "หยุดดู"
 accept: "ยอมรับ"
 reject: "ปฏิเสธ"
 normal: "ปกติ"
-instanceName: "ชื่อ อินสแตนซ์"
+instanceName: "ชื่ออินสแตนซ์"
 instanceDescription: "คำอธิบายอินสแตนซ์"
 maintainerName: "ผู้ดูแล"
-maintainerEmail: "อีเมล์แอดมิน"
+maintainerEmail: "อีเมลผู้ดูแลระบบ"
 tosUrl: "เงื่อนไขการให้บริการ URL"
 thisYear: "ปีนี้"
 thisMonth: "เดือนนี้"
@@ -344,7 +354,7 @@ today: "วันนี้"
 dayX: "{day}"
 monthX: "เดือน {month}"
 yearX: "{year}"
-pages: "หน้า"
+pages: "หน้าเพจ"
 integration: "รวบรวม"
 connectService: "เชื่อมต่อ"
 disconnectService: "ตัดการเชื่อมต่อ"
@@ -353,7 +363,7 @@ enableGlobalTimeline: "เปิดใช้งานไทม์ไลน์ท
 disablingTimelinesInfo: "ผู้ดูแลระบบและผู้ควบคุมจะสามารถเข้าถึงไทม์ไลน์ทั้งหมด ถึงแม้ว่าจะไม่ได้เปิดใช้งานก็ตาม"
 registration: "ลงทะเบียน"
 enableRegistration: "เปิดใช้งานการลงทะเบียนผู้ใช้ใหม่"
-invite: "เชิญชวน"
+invite: "คำเชิญ"
 driveCapacityPerLocalAccount: "ความจุของไดรฟ์ต่อผู้ใช้ภายในเครื่อง"
 driveCapacityPerRemoteAccount: "ความจุของไดรฟ์ต่อผู้ใช้ระยะไกล"
 inMb: "เป็นเมกะไบต์"
@@ -361,15 +371,20 @@ bannerUrl: "URL รูปภาพแบนเนอร์"
 backgroundImageUrl: "URL ภาพพื้นหลัง"
 basicInfo: "ข้อมูลเบื้องต้น"
 pinnedUsers: "ผู้ใช้งานที่ได้รับการปักหมุด"
-pinnedUsersDescription: "ลิสต์ชื่อผู้ใช้โดยคั่นด้วยการขึ้นบรรทัดใหม่เพื่อปักหมุดในแท็บ \"สำรวจ\""
-pinnedPages: "หน้าที่ปักหมุด"
-pinnedPagesDescription: "ป้อนเส้นทางของหน้าที่คุณต้องการตรึงไว้ที่หน้าแรกของอินสแตนซ์นี้ โดยคั่นด้วยตัวแบ่งบรรทัด"
+pinnedUsersDescription: "ป้อนชื่อผู้ใช้ที่คุณต้องการปักหมุดในหน้า “ค้นพบ” ฯลฯ คั่นด้วยการขึ้นบรรทัดใหม่"
+pinnedPages: "หน้าเพจที่ปักหมุด"
+pinnedPagesDescription: "ป้อนเส้นทางของหน้าเพจที่คุณต้องการปักหมุดไว้ที่หน้าแรกของอินสแตนซ์นี้ คั่นด้วยขึ้นบรรทัดใหม่"
 pinnedClipId: "ID ของคลิปที่จะปักหมุด"
 pinnedNotes: "โน้ตที่ปักหมุดไว้"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "เปิดใช้ hCaptcha"
 hcaptchaSiteKey: "คีย์ไซต์"
 hcaptchaSecretKey: "คีย์ลับ"
+mcaptcha: "mCaptcha"
+enableMcaptcha: "เปิดใช้ mCaptcha"
+mcaptchaSiteKey: "คีย์ไซต์"
+mcaptchaSecretKey: "คีย์ลับ"
+mcaptchaInstanceUrl: "URL ของอินสแตนซ์ของ mCaptcha"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "เปิดใช้ reCAPTCHA"
 recaptchaSiteKey: "คีย์ไซต์"
@@ -385,26 +400,26 @@ name: "ชื่อ"
 antennaSource: "แหล่งเสาอากาศ"
 antennaKeywords: "คีย์เวิร์ดที่ควรฟัง"
 antennaExcludeKeywords: "คีย์เวิร์ดที่จะยกเว้น"
-antennaKeywordsDescription: "คั่นด้วยช่องว่างสำหรับเงื่อนไข AND หรือด้วยการขึ้นบรรทัดใหม่สำหรับเงื่อนไข OR นะ"
+antennaKeywordsDescription: "คั่นด้วยช่องว่างสำหรับเงื่อนไข AND หรือด้วยการขึ้นบรรทัดใหม่สำหรับเงื่อนไข OR"
 notifyAntenna: "แจ้งเตือนเกี่ยวกับโน้ตใหม่"
 withFileAntenna: "เฉพาะโน้ตที่มีไฟล์"
-enableServiceworker: "เปิดใช้งาน การแจ้งเตือนแบบพุชสำหรับเบราว์เซอร์ของคุณ"
+enableServiceworker: "เปิดใช้งานการแจ้งเตือนแบบพุชไปยังเบราว์เซอร์ของคุณ"
 antennaUsersDescription: "ระบุหนึ่งชื่อผู้ใช้ต่อบรรทัด"
-caseSensitive: "กรณีที่สำคัญ"
+caseSensitive: "อักษรพิมพ์ใหญ่-พิมพ์เล็กความหมายต่างกัน"
 withReplies: "รวมตอบกลับ"
 connectedTo: "บัญชีดังต่อไปนี้มีการเชื่อมต่อกัน"
 notesAndReplies: "โพสต์และการตอบกลับ"
 withFiles: "รวบรวมไฟล์"
 silence: "ถูกปิดปาก"
-silenceConfirm: "นายแน่ใจแล้วหรอว่าต้องการที่จะ ปิดปาก ผู้ใช้งานรายนี้?"
+silenceConfirm: "ต้องการที่จะ ปิดปาก ผู้ใช้รายนี้?"
 unsilence: "ยกเลิกการปิดปาก"
-unsilenceConfirm: "นายแน่ใจแล้วหรอว่าต้องการที่จะยกเลิกปิดปากผู้ใช้งานรายนี้?"
+unsilenceConfirm: "ต้องการยกเลิกปิดปากผู้ใช้รายนี้?"
 popularUsers: "ผู้ใช้ที่เป็นที่นิยม"
 recentlyUpdatedUsers: "ผู้ใช้ที่เพิ่งใช้งานล่าสุด"
 recentlyRegisteredUsers: "ผู้ใช้ที่เข้าร่วมใหม่"
 recentlyDiscoveredUsers: "ผู้ใช้ที่เพิ่งค้นพบใหม่"
 exploreUsersCount: "มีผู้ใช้ {จำนวน} ราย"
-exploreFediverse: "สำรวจเฟดดิเวิร์ส"
+exploreFediverse: "สำรวจสหพันธ์"
 popularTags: "แท็กยอดนิยม"
 userList: "ลิสต์"
 about: "เกี่ยวกับ"
@@ -419,7 +434,7 @@ moderator: "ผู้ควบคุม"
 moderation: "การกลั่นกรอง"
 moderationNote: "โน้ตการกลั่นกรอง"
 addModerationNote: "เพิ่มโน้ตการกลั่นกรอง"
-moderationLogs: "บันทึกการกลั่นกรอง"
+moderationLogs: "ปูมการแก้ไข"
 nUsersMentioned: "กล่าวถึงโดยผู้ใช้ {n} รายนี้"
 securityKeyAndPasskey: "ความปลอดภัยและรหัสผ่าน"
 securityKey: "กุญแจความปลอดภัย"
@@ -429,11 +444,11 @@ unregister: "เลิกติดตาม"
 passwordLessLogin: "เข้าสู่ระบบแบบไม่ใช้รหัสผ่าน"
 passwordLessLoginDescription: "อนุญาตให้เข้าสู่ระบบโดยไม่ต้องใช้รหัสผ่านโดยใช้รหัสรักษาความปลอดภัยหรือรหัสผ่านเท่านั้น"
 resetPassword: "รีเซ็ตรหัสผ่าน"
-newPasswordIs: "รหัสผ่านใหม่คือ \"{password}\""
+newPasswordIs: "รหัสผ่านใหม่คือ “{password}”"
 reduceUiAnimation: "ลดภาพเคลื่อนไหว UI"
-share: "แชร์"
+share: "แบ่งปัน"
 notFound: "ไม่พบหน้าที่ต้องการ"
-notFoundDescription: "ไม่พบหน้าที่สอดคล้องตรงกันกับ URL นี้นะ"
+notFoundDescription: "ไม่พบหน้าตาม URL ที่ระบุ"
 uploadFolder: "โฟลเดอร์เริ่มต้นสำหรับอัพโหลด"
 markAsReadAllNotifications: "ทำเครื่องหมายการแจ้งเตือนทั้งหมดว่าอ่านแล้ว"
 markAsReadAllUnreadNotes: "ทำเครื่องหมายโน้ตทั้งหมดว่าอ่านแล้ว"
@@ -441,7 +456,7 @@ markAsReadAllTalkMessages: "ทำเครื่องหมายข้อค
 help: "ช่วยเหลือ"
 inputMessageHere: "พิมพ์ข้อความที่นี่"
 close: "ปิด"
-invites: "เชิญชวน"
+invites: "คำเชิญ"
 members: "สมาชิก"
 transfer: "ถ่ายโอน"
 title: "หัวข้อ"
@@ -451,12 +466,12 @@ next: "ถัด​ไป"
 retype: "พิมพ์รหัสอีกครั้ง"
 noteOf: "โน้ต โดย {user}"
 quoteAttached: "อ้างอิง"
-quoteQuestion: "นายต้องการที่จะอ้างอิงหรอ?"
-noMessagesYet: "ยังไม่มีข้อความนะ"
+quoteQuestion: "ต้องการที่จะแนบมันเพื่ออ้างอิงใช่ไหม?"
+noMessagesYet: "ยังไม่มีข้อความ"
 newMessageExists: "คุณมีข้อความใหม่"
-onlyOneFileCanBeAttached: "คุณสามารถแนบไฟล์กับข้อความได้เพียงไฟล์เดียวเท่านั้นนะ"
-signinRequired: "กรุณาลงทะเบียนหรือลงชื่อเข้าใช้ก่อนดำเนินการต่อนะ"
-invitations: "เชิญชวน"
+onlyOneFileCanBeAttached: "สามารถแนบไฟล์ได้เพียงไฟล์เดียวต่อ 1 ข้อความ"
+signinRequired: "กรุณาลงทะเบียนหรือลงชื่อเข้าใช้ก่อนดำเนินการต่อ"
+invitations: "คำเชิญ"
 invitationCode: "รหัสคำเชิญ"
 checking: "Checking"
 available: "พร้อมใช้งาน"
@@ -475,11 +490,11 @@ or: "หรือ"
 language: "ภาษา"
 uiLanguage: "ภาษาอินเทอร์เฟซผู้ใช้งาน"
 aboutX: "เกี่ยวกับ {x}"
-emojiStyle: "สไตล์อิโมจิ"
+emojiStyle: "สไตล์เอโมจิ"
 native: "ภาษาแม่"
 disableDrawer: "อย่าใช้ลิ้นชักสไตล์เมนู"
 showNoteActionsOnlyHover: "แสดงการดำเนินการเฉพาะโน้ตเมื่อโฮเวอร์"
-noHistory: "ไม่มีรายการ"
+noHistory: "ไม่มีประวัติ"
 signinHistory: "ประวัติการเข้าสู่ระบบ"
 enableAdvancedMfm: "เปิดใช้งาน MFM ขั้นสูง"
 enableAnimatedMfm: "เปิดการใช้งาน MFM ด้วยแอนิเมชั่น"
@@ -491,7 +506,7 @@ createAccount: "สร้างบัญชี"
 existingAccount: "บัญชีที่มีอยู่"
 regenerate: "สร้างอีกครั้ง"
 fontSize: "ขนาดตัวอักษร"
-mediaListWithOneImageAppearance: "ความสูงของลิสต์สื่อจะต้องมีรูปภาพเดียวเท่านั้น"
+mediaListWithOneImageAppearance: "ความสูงของรายการสื่อที่มีเพียงรูปเดียว"
 limitTo: "จำกัดไว้ที่ {x}"
 noFollowRequests: "คุณไม่มีคำขอติดตามที่รอดำเนินการ"
 openImageInNewTab: "เปิดรูปภาพในแท็บใหม่"
@@ -509,14 +524,14 @@ promote: "โปรโมท"
 numberOfDays: "จำนวนวัน"
 hideThisNote: "ซ่อนโน้ตนี้"
 showFeaturedNotesInTimeline: "แสดงโน้ตเด่นในไทม์ไลน์"
-objectStorage: "อ็อบเจ็กต์ ที่จัดเก็บ"
-useObjectStorage: "ใช้ อ็อบเจ็กต์ ที่จัดเก็บ"
-objectStorageBaseUrl: "URL ฐาน"
+objectStorage: "การจัดเก็บในรูปแบบอ็อบเจกต์"
+useObjectStorage: "ใช้การจัดเก็บในรูปแบบอ็อบเจกต์"
+objectStorageBaseUrl: "Base URL"
 objectStorageBaseUrlDesc: "URL ที่ใช้เป็นข้อมูลอ้างอิง ระบุ URL ของ CDN หรือ Proxy ถ้าหากคุณใช้อย่างใดอย่างหนึ่ง\n สำหรับการใช้งาน S3 'https://<bucket>.s3.amazonaws.com' และสำหรับ GCS หรือบริการที่เทียบเท่าใช้ 'https://storage.googleapis.com/<bucket>', เป็นต้น"
 objectStorageBucket: "Bucket"
 objectStorageBucketDesc: "โปรดระบุชื่อที่เก็บข้อมูลที่ใช้กับผู้ให้บริการของคุณ"
 objectStoragePrefix: "คำนำหน้า"
-objectStoragePrefixDesc: "ไฟล์ทั้งหมดจะถูกเก็บไว้ภายใต้ไดเร็กทอรีที่มีคำนำหน้านี้นะ"
+objectStoragePrefixDesc: "ไฟล์ทั้งหมดจะถูกเก็บไว้ภายใต้ไดเร็กทอรีที่มีคำนำหน้านี้"
 objectStorageEndpoint: "ปลายทาง"
 objectStorageEndpointDesc: "เว้นว่างไว้หากคุณใช้ AWS S3 หรือระบุปลายทางเป็น '<host>' หรือ '<host>:<port>' ทั้งนี้ขึ้นอยู่กับผู้ให้บริการที่คุณใช้อยู่ด้วย"
 objectStorageRegion: "ภูมิภาค"
@@ -525,12 +540,13 @@ objectStorageUseSSL: "ใช้ SSL"
 objectStorageUseSSLDesc: "ปิดการทำงานนี้ไว้ ถ้าหากคุณจะไม่ใช้ HTTPS สำหรับการเชื่อมต่อ API"
 objectStorageUseProxy: "เชื่อมต่อผ่านพร็อกซี"
 objectStorageUseProxyDesc: "ปิดสิ่งนี้ไว้ถ้าหากคุณจะไม่ใช้ Proxy สำหรับการเชื่อมต่อ API"
-objectStorageSetPublicRead: "ตั้งค่า \"public-read\" ในการอัปโหลด"
+objectStorageSetPublicRead: "ตั้งค่าเป็น “public-read” เมื่ออัปโหลด"
 s3ForcePathStyleDesc: "ถ้าหากเปิดใช้งาน s3ForcePathStyle ชื่อบัคเก็ตนั้นอาจจะต้องรวมอยู่ในเส้นทางของ URL ซึ่งตรงข้ามกับชื่อโฮสต์ของ URL คุณอาจจะต้องเปิดใช้งานการตั้งค่านี้เมื่อใช้บริการต่างๆ เช่น อินสแตนซ์ Minio ที่โฮสต์เองนะ"
-serverLogs: "บันทึกของเซิร์ฟเวอร์"
+serverLogs: "ปูมของเซิร์ฟเวอร์"
 deleteAll: "ลบทั้งหมด"
 showFixedPostForm: "แสดงแบบฟอร์มการโพสต์ที่ด้านบนสุดของไทม์ไลน์"
-showFixedPostFormInChannel: "แสดงแบบฟอร์มกำลังโพสต์ที่ด้านบนของไทม์ไลน์ (แชนแนล)"
+showFixedPostFormInChannel: "แสดงแบบฟอร์มการโพสต์ที่ด้านบนของไทม์ไลน์ (ช่อง)"
+withRepliesByDefaultForNewlyFollowed: "แสดงการตอบกลับจากผู้ใช้ที่คุณเพิ่งติดตามลงไทม์ไลน์ตามค่าเริ่มต้น"
 newNoteRecived: "มีโน้ตใหม่"
 sounds: "เสียง"
 sound: "เสียง"
@@ -538,10 +554,12 @@ listen: "ฟัง"
 none: "ไม่มี"
 showInPage: "แสดงในเพจ"
 popout: "ป๊อปเอาต์"
-volume: "ความดัง"
-masterVolume: "มาสเตอร์วอลุ่ม"
+volume: "ระดับเสียง"
+masterVolume: "ระดับเสียงหลัก"
+notUseSound: "ไม่ใช้เสียง"
+useSoundOnlyWhenActive: "มีเสียงออกเฉพาะเมื่อ Misskey ทำงานอยู่"
 details: "รายละเอียด"
-chooseEmoji: "เลือกโมจิของเธอ"
+chooseEmoji: "เลือกเอโมจิ"
 unableToProcess: "ไม่สามารถดำเนินการให้เสร็จสิ้นได้"
 recentUsed: "ใช้ล่าสุด"
 install: "ติดตั้ง"
@@ -554,20 +572,20 @@ state: "สถานะ"
 sort: "เรียงลำดับ"
 ascendingOrder: "เรียงจากน้อยไปมาก"
 descendingOrder: "เรียงจากมากไปน้อย"
-scratchpad: "กระดานทดลอง"
+scratchpad: "Scratchpad"
 scratchpadDescription: "Scratchpad เป็นการจัดเตรียมสภาพแวดล้อมสำหรับการทดลอง AiScript แต่คุณสามารถเขียน ดำเนินการ และตรวจสอบผลลัพธ์ของการโต้ตอบกับ Misskey มันได้ด้วยนะ"
 output: "เอาท์พุต"
 script: "สคริปต์"
 disablePagesScript: "ปิดการใช้งาน AiScript บนเพจ"
 updateRemoteUser: "อัปเดตข้อมูลผู้ใช้งานระยะไกล"
 unsetUserAvatar: "เลิกตั้งอวตาร"
-unsetUserAvatarConfirm: "คุณแน่ใจหรือไม่ว่าต้องการเลิกตั้งอวตาร?"
+unsetUserAvatarConfirm: "ต้องการเลิกตั้งอวตาร?"
 unsetUserBanner: "เลิกตั้งแบนเนอร์"
-unsetUserBannerConfirm: "คุณแน่ใจหรือไม่ว่าต้องการเลิกตั้งแบนเนอร์เลยมั้ย?"
+unsetUserBannerConfirm: "ต้องการเลิกตั้งแบนเนอร์?"
 deleteAllFiles: "ลบไฟล์ทั้งหมด"
-deleteAllFilesConfirm: "นายแน่ใจแล้วหรอว่าต้องการที่จะลบไฟล์ทั้งหมด?"
+deleteAllFilesConfirm: "ต้องการลบไฟล์ทั้งหมดหรือไม่?"
 removeAllFollowing: "เลิกติดตามผู้ใช้ที่ติดตามทั้งหมด"
-removeAllFollowingDescription: "การที่คุณดำเนินการนี้จะเลิกติดตามบัญชีทั้งหมดจาก {host} โปรดเรียกใช้คำสั่งสิ่งนี้หากต้องการยกเลิกอินสแตนซ์ เช่น ไม่มีอยู่แล้ว"
+removeAllFollowingDescription: "เลิกติดตามทั้งหมดจาก {host} โปรดเรียกใช้สิ่งนี้เมื่ออินสแตนซ์ดังกล่าวได้สูญหายตายจากไปแล้ว"
 userSuspended: "ผู้ใช้รายนี้ถูกระงับการใช้งาน"
 userSilenced: "ผู้ใช้รายนี้กำลังถูกปิดกั้น"
 yourAccountSuspendedTitle: "บัญชีนี้นั้นถูกระงับ"
@@ -606,7 +624,7 @@ preferencesBackups: "ตั้งค่าการสำรองข้อม
 deck: "เด็ค"
 undeck: "ออกจากเด็ค"
 useBlurEffectForModal: "ใช้เอฟเฟกต์เบลอสำหรับโมดอล"
-useFullReactionPicker: "ใช้เครื่องมือเลือกปฏิกิริยาขนาดเต็ม"
+useFullReactionPicker: "ใช้ตัวจิ้มรีแอคชั่นอย่างเต็มรูปแบบ"
 width: "ความกว้าง"
 height: "ความสูง"
 large: "ใหญ่"
@@ -614,17 +632,18 @@ medium: "ปานกลาง"
 small: "เล็ก"
 generateAccessToken: "สร้างการเข้าถึงโทเค็น"
 permission: "การอนุญาต"
+adminPermission: "สิทธิ์ของผู้ดูแลระบบ"
 enableAll: "เปิดใช้งานทั้งหมด"
 disableAll: "ปิดการใช้งานทั้งหมด"
 tokenRequested: "ให้สิทธิ์การเข้าถึงบัญชี"
 pluginTokenRequestedDescription: "ปลั๊กอินนี้จะสามารถใช้การอนุญาตที่ตั้งค่าไว้ที่นี่นะ"
 notificationType: "ประเภทการแจ้งเตือน"
 edit: "แก้ไข"
-emailServer: "อีเมล์เซิร์ฟเวอร์"
+emailServer: "อีเมลเซิร์ฟเวอร์"
 enableEmail: "เปิดใช้งานการกระจายอีเมล"
 emailConfigInfo: "ใช้เพื่อยืนยันอีเมลของคุณระหว่างการสมัครหรือถ้าหากคุณลืมรหัสผ่าน"
-email: "อีเมล์"
-emailAddress: "ที่อยู่อีเมล์"
+email: "อีเมล"
+emailAddress: "ที่อยู่อีเมล"
 smtpConfig: "กำหนดค่าเซิร์ฟเวอร์ SMTP"
 smtpHost: "โฮสต์"
 smtpPort: "พอร์ต"
@@ -648,7 +667,7 @@ overview: "ภาพรวม"
 logs: "บันทึกข้อมูลระบบ"
 delayed: "ดีเลย์"
 database: "ฐานข้อมูล"
-channel: "แชนแนล"
+channel: "ช่อง"
 create: "สร้าง"
 notificationSetting: "ตั้งค่าการแจ้งเตือน"
 notificationSettingDesc: "เลือกประเภทการแจ้งเตือนที่ต้องการจะแสดง"
@@ -657,6 +676,7 @@ useGlobalSettingDesc: "หากเปิดไว้ ระบบจะใช
 other: "อื่น ๆ"
 regenerateLoginToken: "สร้างโทเค็นการเข้าสู่ระบบอีกครั้ง"
 regenerateLoginTokenDescription: "สร้างโทเค็นใหม่ที่ใช้ภายในระหว่างการเข้าสู่ระบบ โดยตามหลักปกติแล้วการดำเนินการนี้ไม่จำเป็น หากสร้างใหม่ อุปกรณ์ทั้งหมดจะถูกออกจากระบบนะ"
+theKeywordWhenSearchingForCustomEmoji: "คีย์เวิร์ดสำหรับใช้ค้นหาอีโมจิที่กำหนดเอง"
 setMultipleBySeparatingWithSpace: "คั่นหลายรายการด้วยช่องว่าง"
 fileIdOrUrl: "ไฟล์ ID หรือ URL"
 behavior: "พฤติกรรม"
@@ -678,7 +698,7 @@ openInNewTab: "เปิดในแท็บใหม่"
 openInSideView: "เปิดในมุมมองด้านข้าง"
 defaultNavigationBehaviour: "พฤติกรรมการนำทางที่เป็นค่าเริ่มต้น"
 editTheseSettingsMayBreakAccount: "การแก้ไขการตั้งค่าเหล่านี้อาจทำให้บัญชีของคุณเสียหายนะ"
-instanceTicker: "ข้อมูลอินสแตนซ์ของบันทึกย่อ"
+instanceTicker: "ข้อมูลอินสแตนซ์ของโน้ต"
 waitingFor: "กำลังรอคอย {x}"
 random: "สุ่มค่า"
 system: "ระบบ"
@@ -702,8 +722,8 @@ repliedCount: "จำนวนของการตอบกลับที่
 renotedCount: "จำนวนรีโน้ตที่ได้รับแล้ว"
 followingCount: "จำนวนบัญชีที่ติดตาม"
 followersCount: "จำนวนผู้ติดตาม"
-sentReactionsCount: "จำนวนปฏิกิริยาที่ส่ง"
-receivedReactionsCount: "จำนวนปฏิกิริยาที่ได้รับ"
+sentReactionsCount: "จำนวนรีแอคชั่นที่ส่ง"
+receivedReactionsCount: "จำนวนรีแอคชั่นที่ได้รับ"
 pollVotesCount: "จำนวนโหวตที่ส่งไป"
 pollVotedCount: "จำนวนโหวตที่ได้รับ"
 yes: "ใช่"
@@ -711,17 +731,17 @@ no: "ไม่"
 driveFilesCount: "จำนวนไฟล์ไดรฟ์"
 driveUsage: "การใช้พื้นที่ไดรฟ์"
 noCrawle: "ปฏิเสธการจัดทำดัชนีของโปรแกรมรวบรวมข้อมูล"
-noCrawleDescription: "ขอให้เครื่องมือค้นหาไม่จัดทำดัชนีหน้าโปรไฟล์ บันทึกย่อ หน้า ฯลฯ"
+noCrawleDescription: "ขอให้เครื่องมือค้นหาไม่จัดทำดัชนีหน้าโปรไฟล์ โน้ต หน้าเพจ ฯลฯ"
 lockedAccountInfo: "เว้นแต่ว่าคุณจะต้องตั้งค่าการเปิดเผยโน้ตเป็น \"ผู้ติดตามเท่านั้น\" โน้ตย่อของคุณจะปรากฏแก่ทุกคน ถึงแม้ว่าคุณจะเป็นกำหนดให้ผู้ติดตามต้องได้รับการอนุมัติด้วยตนเองก็ตาม"
-alwaysMarkSensitive: "ทำเครื่องหมายเป็น NSFW เป็นค่าเริ่มต้น"
+alwaysMarkSensitive: "ทำเครื่องหมายว่ามีเนื้อหาละเอียดอ่อนเป็นค่าเริ่มต้น"
 loadRawImages: "โหลดภาพต้นฉบับแทนการแสดงภาพขนาดย่อ"
 disableShowingAnimatedImages: "ไม่ต้องเล่นภาพเคลื่อนไหว"
-highlightSensitiveMedia: "ไฮไลท์สื่อที่ละเอียดอ่อน"
+highlightSensitiveMedia: "ไฮไลท์สื่อที่มีเนื้อหาละเอียดอ่อน"
 verificationEmailSent: "ส่งอีเมลยืนยันแล้วนะ ได้โปรดกรุณาไปที่ลิงก์ที่รวมไว้เพื่อทำการตรวจสอบให้เสร็จสิ้น"
 notSet: "ไม่ได้ตั้งค่า"
 emailVerified: "อีเมลได้รับการยืนยันแล้ว"
 noteFavoritesCount: "จำนวนโน้ตที่ชื่นชอบ"
-pageLikesCount: "จำนวนเพจที่ชอบ"
+pageLikesCount: "จำนวนเพจที่ถูกใจ"
 pageLikedCount: "จำนวนการกดถูกใจเพจที่ได้รับแล้ว"
 contact: "ติดต่อ"
 useSystemFont: "ใช้ฟอนต์เริ่มต้นของระบบ"
@@ -730,15 +750,15 @@ experimentalFeatures: "ฟังก์ชั่นทดสอบ"
 experimental: "ทดลอง"
 thisIsExperimentalFeature: "นี่คือฟีเจอร์ทดลองนะค่ะ ฟังก์ชันการทำงานบางอย่างอาจเปลี่ยนแปลงได้ และอาจไม่ทำงานหรือไม่เสถียรตามที่ตั้งใจไว้นะ"
 developer: "สำหรับนักพัฒนา"
-makeExplorable: "ทำให้บัญชีมองเห็นใน \"สำรวจ\""
-makeExplorableDescription: "ถ้าหากคุณปิดการทำงานนี้ บัญชีของคุณนั้นจะไม่แสดงในส่วน \"สำรวจ\" นะ"
+makeExplorable: "ทำให้บัญชีมองเห็นใน “สำรวจ”"
+makeExplorableDescription: "ถ้าหากคุณปิดการทำงานนี้ บัญชีของคุณนั้นจะไม่แสดงในส่วน “สำรวจ”"
 showGapBetweenNotesInTimeline: "แสดงช่องว่างระหว่างโพสต์บนไทม์ไลน์"
 duplicate: "ทำซ้ำ"
 left: "ซ้าย"
-center: "ศูนย์กลาง"
+center: "กึ่งกลาง"
 wide: "กว้าง"
 narrow: "ชิด"
-reloadToApplySetting: "การตั้งค่านี้จะมีผลหลังจากโหลดหน้าซ้ำเท่านั้น ต้องการที่จะโหลดใหม่เลยมั้ย"
+reloadToApplySetting: "การตั้งค่านี้จะมีผลหลังจากโหลดหน้าซ้ำเท่านั้น ต้องการที่จะโหลดใหม่เลยไหม?"
 needReloadToApply: "จำเป็นต้องโหลดซ้ำถึงจะมีผลนะ"
 showTitlebar: "แสดงแถบชื่อ"
 clearCache: "ล้างแคช"
@@ -772,21 +792,21 @@ inUse: "ใช้แล้ว"
 editCode: "แก้ไขโค้ด"
 apply: "ตกลง"
 receiveAnnouncementFromInstance: "รับการแจ้งเตือนจากอินสแตนซ์นี้"
-emailNotification: "การแจ้งเตือนทางอีเมล์"
+emailNotification: "การแจ้งเตือนทางอีเมล"
 publish: "เผยแพร่"
 inChannelSearch: "ค้นหาในช่อง"
-useReactionPickerForContextMenu: "เปิดตัวเลือกปฏิกิริยาเมื่อคลิกขวา"
-typingUsers: "{users} กำลัง/กำลังพิมพ์..."
+useReactionPickerForContextMenu: "คลิกขวาเพื่อเปิดตัวจิ้มรีแอคชั่น"
+typingUsers: "{users} กำลังพิมพ์..."
 jumpToSpecifiedDate: "ข้ามไปยังวันที่เฉพาะเจาะจง"
 showingPastTimeline: "กำลังแสดงผลไทม์ไลน์เก่า"
 clear: "ล้าง"
 markAllAsRead: "ทำเครื่องหมายทั้งหมดว่าอ่านแล้ว"
 goBack: "ย้อนกลับ"
-unlikeConfirm: "ลบไลค์ของคุณออกจริงๆหรอ"
+unlikeConfirm: "เลิกถูกใจจริงๆ หรือ?"
 fullView: "มุมมองแบบเต็ม"
 quitFullView: "ออกจากมุมมองแบบเต็ม"
 addDescription: "เพิ่มคำอธิบาย"
-userPagePinTip: "คุณสามารถแสดงผลโน้ตย่อได้ที่นี่โดยเลือก \"ปักหมุดที่โปรไฟล์\" จากเมนูของโน้ตย่อแต่ละรายการนะ"
+userPagePinTip: "ปักหมุดโน้ตให้แสดงที่นี่ได้โดยเลือกเมนู “ปักหมุด” ของโน้ตนั้นๆ"
 notSpecifiedMentionWarning: "โน้ตนี้มีการกล่าวถึงผู้ใช้งานที่ไม่รวมอยู่ในผู้รับ"
 info: "เกี่ยวกับ"
 userInfo: "ข้อมูลผู้ใช้"
@@ -797,7 +817,7 @@ hideOnlineStatusDescription: "การซ่อนสถานะออนไ
 online: "ออนไลน์"
 active: "ใช้งานอยู่"
 offline: "ออฟไลน์"
-notRecommended: "ไม่ใช้งาน"
+notRecommended: "ไม่แนะนำ"
 botProtection: "การป้องกัน Bot (or AI)"
 instanceBlocking: "อินสแตนซ์ที่ถูกบล็อก"
 selectAccount: "เลือกบัญชี"
@@ -820,19 +840,19 @@ popularPosts: "โพสต์ติดอันดับ"
 shareWithNote: "แบ่งปันด้วยโน้ต"
 ads: "โฆษณา"
 expiration: "กำหนดเวลา"
-startingperiod: "เริ่ม"
-memo: "ข้อควรจำ"
+startingperiod: "เริ่มเมื่อ"
+memo: "เมโม"
 priority: "ลำดับความสำคัญ"
 high: "สูง"
 middle: "ปานกลาง"
 low: "ต่ำ"
-emailNotConfiguredWarning: "ไม่ได้ตั้งค่าที่อยู่อีเมลนะ"
+emailNotConfiguredWarning: "ยังไม่ได้ตั้งค่าที่อยู่อีเมล"
 ratio: "อัตราส่วน"
 previewNoteText: "แสดงตัวอย่าง"
 customCss: "CSS ที่กำหนดเอง"
-customCssWarn: "ควรใช้การตั้งค่านี้เฉพาะต่อเมื่อคุณรู้ว่าการตั้งค่านี้ใช้ทำอะไร การป้อนค่าที่ไม่เหมาะสมอาจทำให้ไคลเอ็นต์หยุดทำงานตามปกติได้นะ"
+customCssWarn: "ควรใช้การตั้งค่านี้เฉพาะต่อเมื่อคุณรู้มันใช้ทำอะไร การตั้งค่าที่ไม่เหมาะสมอาจทำให้ไคลเอ็นต์ไม่สามารถใช้งานได้อย่างถูกต้อง"
 global: "ทั่วโลก"
-squareAvatars: "แสดงผลอวตารสี่เหลี่ยม"
+squareAvatars: "แสดงผลอวตารเป็นสี่เหลี่ยม"
 sent: "ส่ง"
 received: "ได้รับแล้ว"
 searchResult: "ผลการค้นหา"
@@ -849,10 +869,10 @@ usernameInfo: "ชื่อที่ระบุบัญชีของคุ
 aiChanMode: "โหมด Ai "
 devMode: "โหมดนักพัฒนา"
 keepCw: "เก็บคำเตือนเนื้อหา"
-pubSub: "บัญชีผับ/ย่อย"
+pubSub: "บัญชี Pub/Sub"
 lastCommunication: "การสื่อสารครั้งสุดท้ายล่าสุด"
 resolved: "คลี่คลายแล้ว"
-unresolved: "รอการเฉลย"
+unresolved: "ยังไม่ได้รับการแก้ไข"
 breakFollow: "ลบผู้ติดตาม"
 breakFollowConfirm: "ลบผู้ติดตามนี้ออกจริงหรอ?"
 itsOn: "เปิดใช้งาน"
@@ -864,32 +884,34 @@ unread: "ไม่ได้อ่าน"
 filter: "กรอง"
 controlPanel: "แผงควบคุม"
 manageAccounts: "จัดการบัญชี"
-makeReactionsPublic: "ตั้งค่าประวัติปฏิกิริยาต่อสาธารณะ"
-makeReactionsPublicDescription: "การทำเช่นนี้จะทำให้รายการปฏิกิริยาที่ผ่านมาของคุณจะปรากฏต่อสาธารณะนะ"
+makeReactionsPublic: "ตั้งค่าประวัติการรีแอคชั่นเป็นสาธารณะ"
+makeReactionsPublicDescription: "การทำเช่นนี้จะทำให้รายการรีแอคชั่นของคุณที่ผ่านมาทั้งหมดปรากฏต่อสาธารณะ"
 classic: "คลาสสิค"
 muteThread: "ปิดเสียงเธรด"
 unmuteThread: "เปิดเสียงเธรด"
+followingVisibility: "การมองเห็นที่เรากำลังติดตาม"
+followersVisibility: "การมองเห็นผู้ที่กำลังติดตามเรา"
 continueThread: "ดูความต่อเนื่องเธรด"
 deleteAccountConfirm: "การดำเนินการนี้จะลบบัญชีของคุณอย่างถาวรเลยนะ แน่ใจหรอดำเนินการ?"
 incorrectPassword: "รหัสผ่านไม่ถูกต้อง"
-voteConfirm: "ยืนยันการโหวต \"{choice}\" มั้ย?"
+voteConfirm: "ยืนยันการโหวต “{choice}” ไหม?"
 hide: "ซ่อน"
-useDrawerReactionPickerForMobile: "แสดงผล ตัวเลือกปฏิกิริยาเป็นลิ้นชักบนมือถือ"
-welcomeBackWithName: "ยินดีต้อนรับการกลับมานะคะ, {name}"
-clickToFinishEmailVerification: "กรุณาคลิก [{ok}] เพื่อดำเนินการยืนยันอีเมลให้เสร็จสมบูรณ์นะ"
+useDrawerReactionPickerForMobile: "แสดง ตัวจิ้มรีแอคชั่น เป็นแบบลิ้นชัก เมื่อใช้บนมือถือ"
+welcomeBackWithName: "ยินดีต้อนรับการกลับมานะคะ, คุณ{name}"
+clickToFinishEmailVerification: "กรุณาคลิก [{ok}] เพื่อดำเนินการยืนยันอีเมลให้เสร็จสมบูรณ์"
 overridedDeviceKind: "ประเภทอุปกรณ์"
 smartphone: "สมาร์ทโฟน"
 tablet: "แท็บเล็ต"
 auto: "อัตโนมัติ"
-themeColor: "อินสแตนซ์ Ticker Color"
+themeColor: "สีธีม"
 size: "ขนาด"
 numberOfColumn: "จำนวนคอลัมน์"
 searchByGoogle: "ค้นหา"
-instanceDefaultLightTheme: "ธีมสว่างค่าเริ่มต้นสำหรับอินสแตนซ์"
-instanceDefaultDarkTheme: "ธีมมืดค่าเริ่มต้นอินสแตนซ์"
+instanceDefaultLightTheme: "ธีมสว่างตามค่าเริ่มต้นของอินสแตนซ์"
+instanceDefaultDarkTheme: "ธีมมืดตามค่าเริ่มต้นของอินสแตนซ์"
 instanceDefaultThemeDescription: "ป้อนรหัสธีมในรูปแบบออบเจ็กต์"
 mutePeriod: "ระยะเวลาปิดเสียง"
-period: "สิ้นสุดการสำรวจความคิดเห็น"
+period: "ระยะเวลา"
 indefinitely: "ตลอดไป"
 tenMinutes: "10 นาที"
 oneHour: "1 ชั่วโมง"
@@ -919,9 +941,9 @@ deleteAccount: "ลบบัญชี"
 document: "เอกสาร"
 numberOfPageCache: "จำนวนหน้าเพจที่แคช"
 numberOfPageCacheDescription: "การเพิ่มจำนวนนี้จะช่วยเพิ่มความสะดวกให้กับผู้ใช้งาน แต่จะทำให้เซิร์ฟเวอร์โหลดมากขึ้นและต้องใช้หน่วยความจำมากขึ้นอีกด้วย"
-logoutConfirm: "คุณแน่ใจว่าต้องการออกจากระบบ?"
+logoutConfirm: "ต้องการออกจากระบบ?"
 lastActiveDate: "ใช้งานล่าสุดที่"
-statusbar: "ไอคอนบนแถบสถานะ"
+statusbar: "แถบสถานะ"
 pleaseSelect: "ตัวเลือก"
 reverse: "ย้อนกลับ"
 colored: "สี"
@@ -931,16 +953,16 @@ type: "รูปแบบ"
 speed: "ความเร็ว"
 slow: "ช้า"
 fast: "เร็ว"
-sensitiveMediaDetection: "การตรวจจับของสื่อ NSFW"
+sensitiveMediaDetection: "การตรวจจับสื่อที่มีเนื้อหาละเอียดอ่อน"
 localOnly: "เฉพาะท้องถิ่น"
-remoteOnly: "รีโมทเท่านั้น"
+remoteOnly: "ระยะไกลเท่านั้น"
 failedToUpload: "การอัปโหลดล้มเหลว"
 cannotUploadBecauseInappropriate: "ไม่สามารถอัปโหลดไฟล์นี้ได้เนื่องจากระบบตรวจพบบางส่วนของไฟล์ว่านี้อาจจะเป็น NSFW"
-cannotUploadBecauseNoFreeSpace: "การอัปโหลดนั้นล้มเหลวเนื่องจากไม่มีความจุของไดรฟ์"
+cannotUploadBecauseNoFreeSpace: "ไม่สามารถอัปโหลดได้เนื่องจากไม่มีพื้นที่ว่างในไดรฟ์เหลือแล้ว"
 cannotUploadBecauseExceedsFileSizeLimit: "ไม่สามารถอัปโหลดไฟล์นี้ได้แล้วเนื่องจากเกินขีดจำกัดของขนาดไฟล์แล้ว"
 beta: "เบต้า"
-enableAutoSensitive: "ทำเครื่องหมาย NSFW อัตโนมัติ"
-enableAutoSensitiveDescription: "อนุญาตให้ตรวจหาและทำเครื่องหมายสื่อ NSFW โดยอัตโนมัติผ่านการเรียนรู้ของเครื่องหากเป็นไปได้ แม้ว่าตัวเลือกนี้จะถูกปิดใช้งาน แต่ก็สามารถเปิดใช้งานได้ทั้งอินสแตนซ์นี้"
+enableAutoSensitive: "ทำเครื่องหมายว่ามีเนื้อหาที่ละเอียดอ่อนโดยอัตโนมัติ"
+enableAutoSensitiveDescription: "อนุญาตให้ตรวจหาและทำเครื่องหมายสื่อว่ามีเนื้อหาโดยละเอียดอ่อนโดยอัตโนมัติ ผ่าน Machine Learning หากเป็นไปได้ แม้ว่าคุณจะปิดคุณสมบัตินี้ ก็อาจถูกตั้งค่าโดยอัตโนมัติ ทั้งนี้ขึ้นอยู่กับเซิร์ฟเวอร์"
 activeEmailValidationDescription: "เปิดใช้งานการตรวจสอบที่อยู่อีเมลให้มีความเข้มงวดยิ่งขึ้น ซึ่งอาจจะรวมไปถึงการตรวจสอบที่อยู่อีเมล์ที่ใช้แล้วทิ้งและโดยให้พิจารณาว่าสามารถสื่อสารด้วยได้หรือไม่ เมื่อไม่เลือกระบบจะตรวจสอบเฉพาะรูปแบบของอีเมลเท่านั้น"
 navbar: "แถบนำทาง"
 shuffle: "สลับ"
@@ -956,28 +978,28 @@ sendPushNotificationReadMessageCaption: "การแจ้งเตือนท
 windowMaximize: "ขยายใหญ่สุดแล้ว"
 windowMinimize: "ย่อเล็กที่สุด"
 windowRestore: "เลิกทำ"
-caption: "รายละเอียด"
+caption: "คำอธิบาย"
 loggedInAsBot: "ล็อกอินเป็นบอตอยู่ในขณะนี้"
 tools: "เครื่องมือ"
 cannotLoad: "ไม่สามารถโหลดได้"
 numberOfProfileView: "มุมมองโปรไฟล์"
-like: "ชื่นชอบ"
-unlike: "ไม่ชอบ"
-numberOfLikes: "จำนวนไลค์"
+like: "ถูกใจ!"
+unlike: "เลิกถูกใจ"
+numberOfLikes: "จำนวนยอดถูกใจ"
 show: "แสดงผล"
 neverShow: "ไม่ต้องแสดงข้อความนี้อีก"
 remindMeLater: "ไว้ครั้งหน้าแล้วกัน"
-didYouLikeMisskey: "คุณเคยชอบ Misskey ไหม?"
+didYouLikeMisskey: "คุณชอบ Misskey ไหม?"
 pleaseDonate: "Misskey เป็นซอฟต์แวร์ฟรีที่ใช้งานโดย {host} เราขอขอบคุณการสนับสนุนของคุณอย่างสูงเพื่อให้การพัฒนา Misskey สามารถดำเนินต่อไปได้!"
 roles: "บทบาท"
 role: "บทบาท"
 noRole: "ไม่พบบทบาท"
 normalUser: "ผู้ใช้มาตรฐาน"
 undefined: "ไม่ได้กำหนด"
-assign: "กำหนด"
-unassign: "ยังไม่มอบหมาย"
+assign: "มอบหมาย"
+unassign: "เลิกมอบหมาย"
 color: "สี"
-manageCustomEmojis: "จัดการอีโมจิแบบกำหนดเอง"
+manageCustomEmojis: "จัดการเอโมจิที่กำหนดเอง"
 manageAvatarDecorations: "จัดการตกแต่งอวตาร"
 youCannotCreateAnymore: "คุณถึงขีดจํากัดการสร้างแล้วนะ"
 cannotPerformTemporary: "ไม่สามารถใช้การได้ชั่วคราว"
@@ -992,33 +1014,35 @@ achievements: "ความสำเร็จ"
 gotInvalidResponseError: "การตอบสนองเซิร์ฟเวอร์ไม่ถูกต้อง"
 gotInvalidResponseErrorDescription: "เซิร์ฟเวอร์อาจไม่สามารถเข้าถึงได้หรืออาจจะกำลังอยู่ในระหว่างปรับปรุง กรุณาลองใหม่อีกครั้งในภายหลังนะคะ"
 thisPostMayBeAnnoying: "โน้ตนี้อาจจะเป็นการรบกวนผู้อื่นนะคะ"
-thisPostMayBeAnnoyingHome: "โพสต์ไปยังบ้านไทม์ไลน์"
+thisPostMayBeAnnoyingHome: "โพสต์ไปยังไทม์ไลน์หน้าแรก"
 thisPostMayBeAnnoyingCancel: "เลิก"
 thisPostMayBeAnnoyingIgnore: "โพสต์ยังไงก็แล้วแต่"
-collapseRenotes: "ยุบ renotes ที่คุณได้เห็นแล้ว"
+collapseRenotes: "ยุบรีโน้ตที่คุณเคยเห็นแล้ว"
 internalServerError: "เซิร์ฟเวอร์ภายในเกิดข้อผิดพลาด"
 internalServerErrorDescription: "เซิร์ฟเวอร์รันค้นพบข้อผิดพลาดที่ไม่คาดคิด"
 copyErrorInfo: "คัดลอกรายละเอียดข้อผิดพลาด"
 joinThisServer: "ลงชื่อสมัครใช้ในอินสแตนซ์นี้"
 exploreOtherServers: "มองหาอินสแตนซ์อื่น"
-letsLookAtTimeline: "ลองดูที่ไทม์ไลน์"
+letsLookAtTimeline: "มาดูไทม์ไลน์กัน"
 disableFederationConfirm: "ปิดใช้งานสหพันธ์จริงๆหรอแน่ใจแล้วนะ?"
 disableFederationConfirmWarn: "โพสต์จะยังคงเป็นสาธารณะต่อไป เว้นแต่จะตั้งค่าเป็นอย่างอื่น"
 disableFederationOk: "ปิดการใช้งาน"
-invitationRequiredToRegister: "อินสแตนซ์นี้เป็นแบบรับเชิญเท่านั้น คุณต้องป้อนรหัสเชิญ เพื่องลงทะเบียนเข้าใช้งาน"
+invitationRequiredToRegister: "อินสแตนซ์นี้เป็นแบบรับเชิญ เฉพาะผู้ที่มีรหัสเชิญเท่านั้นที่สามารถลงทะเบียนได้"
 emailNotSupported: "อินสแตนซ์นี้ไม่รองรับการส่งอีเมล"
 postToTheChannel: "โพสต์ลงช่อง"
 cannotBeChangedLater: "สิ่งนี้ไม่สามารถเปลี่ยนแปลงได้ในภายหลังนะ"
 reactionAcceptance: "การยอมรับรีแอคชั่น"
-likeOnly: "ที่ชอบเท่านั้น"
-likeOnlyForRemote: "ไลค์สำหรับอินสแตนซ์ระยะไกลเท่านั้น"
-nonSensitiveOnly: "ไม่มีความอ่อนไหวเท่านั้น"
-nonSensitiveOnlyForLocalLikeOnlyForRemote: "ไม่มีความอ่อนไหวเท่านั้น (เฉพาะไลค์จากระยะไกลเท่านั้น)"
+likeOnly: "ที่ถูกใจเท่านั้น"
+likeOnlyForRemote: "ทั้งหมด (เฉพาะการถูกใจจากอินสแตนซ์ระยะไกล)"
+nonSensitiveOnly: "เฉพาะไม่มีเนื้อหาละเอียดอ่อน"
+nonSensitiveOnlyForLocalLikeOnlyForRemote: "เฉพาะไม่มีเนื้อหาละเอียดอ่อน (เฉพาะการถูกใจจากระยะไกลเท่านั้น)"
 rolesAssignedToMe: "บทบาทที่ได้รับมอบหมายให้ฉัน"
 resetPasswordConfirm: "รีเซ็ตรหัสผ่านของคุณจริงๆหรอ?"
-sensitiveWords: "คำที่ละเอียดอ่อน"
+sensitiveWords: "คำที่มีเนื้อหาละเอียดอ่อน"
 sensitiveWordsDescription: "การเปิดเผยโน้ตทั้งหมดที่มีคำที่กำหนดค่าไว้จะถูกตั้งค่าเป็น \"หน้าแรก\" โดยอัตโนมัติ คุณยังสามารถแสดงหลายรายการได้โดยแยกรายการโดยใช้ตัวแบ่งบรรทัดได้นะ"
 sensitiveWordsDescription2: "การใช้ช่องว่างนั้นอาจจะสร้างนิพจน์ AND และคำหลักที่มีเครื่องหมายทับล้อมรอบจะเปลี่ยนเป็นนิพจน์ทั่วไปนะ"
+hiddenTags: "แฮชแท็กที่ซ่อนอยู่"
+hiddenTagsDescription: "เลือกแท็กที่จะไม่แสดงในรายการเทรนด์ สามารถลงทะเบียนหลายแท็กได้โดยขึ้นบรรทัดใหม่"
 notesSearchNotAvailable: "การค้นหาโน้ตไม่พร้อมใช้งาน"
 license: "ใบอนุญาต"
 unfavoriteConfirm: "ลบออกจากรายการโปรดแน่ใจหรอ?"
@@ -1029,21 +1053,24 @@ retryAllQueuesConfirmTitle: "ลองใหม่ทั้งหมดจริ
 retryAllQueuesConfirmText: "สิ่งนี้จะเพิ่มการโหลดเซิร์ฟเวอร์ชั่วคราวนะ"
 enableChartsForRemoteUser: "สร้างแผนภูมิข้อมูลผู้ใช้ระยะไกล"
 enableChartsForFederatedInstances: "สร้างแผนภูมิข้อมูลอินสแตนซ์ระยะไกล"
-showClipButtonInNoteFooter: "เพิ่ม \"คลิป\" เพื่อบันทึกเมนูการทำงาน"
-reactionsDisplaySize: "รีแอคชั่นแสดงผลขนาด"
+showClipButtonInNoteFooter: "เพิ่ม “คลิป” ไปยังเมนูสั่งการของโน้ต"
+reactionsDisplaySize: "ขนาดของรีแอคชั่น"
+limitWidthOfReaction: "จำกัดความกว้างสูงสุดของรีแอคชั่นและแสดงให้เล็กลง"
 noteIdOrUrl: "โน้ต ID หรือ URL"
 video: "วีดีโอ"
 videos: "วีดีโอ"
+audio: "เสียง"
+audioFiles: "เสียง"
 dataSaver: "ประหยัดข้อมูล"
-accountMigration: "การโยกย้ายบัญชี"
+accountMigration: "โยกย้ายบัญชี"
 accountMoved: "ผู้ใช้รายนี้ได้ย้ายไปยังบัญชีใหม่แล้ว:"
 accountMovedShort: "บัญชีนี้ถูกโอนย้ายไปแล้วค่ะ"
-operationForbidden: "ห้ามดำเนินการ"
+operationForbidden: "การดำเนินการถูกห้าม"
 forceShowAds: "แสดงโฆษณาเสมอ"
-addMemo: "เพิ่มมีโม"
-editMemo: "แก้ไขมีโม"
-reactionsList: "ปฏิกิริยา"
-renotesList: "Renotes รีโน้ต"
+addMemo: "เพิ่มเมโม"
+editMemo: "แก้ไขเมโม"
+reactionsList: "รายการรีแอคชั่น"
+renotesList: "รายการรีโน้ต"
 notificationDisplay: "การแจ้งเตือน"
 leftTop: "บนซ้าย"
 rightTop: "บนขวา"
@@ -1053,16 +1080,16 @@ stackAxis: "ทิศทางการซ้อน"
 vertical: "แนวตั้ง"
 horizontal: "ด้านข้าง"
 position: "ตำแหน่ง"
-serverRules: "กฎของเซิฟเวอร์"
+serverRules: "กฎของเซิร์ฟเวอร์"
 pleaseConfirmBelowBeforeSignup: "โปรดยืนยันที่ด้านล่างก่อนสมัครใช้งาน"
 pleaseAgreeAllToContinue: "คุณต้องยอมรับทุกช่องตรงด้านบนเพื่อดำเนินการต่อค่ะ"
 continue: "ดำเนินการต่อ"
 preservedUsernames: "ชื่อผู้ใช้ที่สงวนไว้"
-preservedUsernamesDescription: "ลิสต์ชื่อผู้ใช้ที่จะสำรองโดยคั่นด้วยการแบ่งบรรทัดนั้น เพราะสิ่งเหล่านี้จะไม่สามารถทำได้ในระหว่างการสร้างบัญชีตามปกติ บัญชีที่มีอยู่แล้วนั้นโดยใช้ชื่อผู้ใช้เหล่านี้จะไม่ได้รับผลกระทบอะไร"
+preservedUsernamesDescription: "ระบุชื่อผู้ใช้ที่จะสงวนชื่อไว้ คั่นด้วยการขึ้นบรรทัดใหม่ ชื่อผู้ใช้ที่ระบุที่นี่จะไม่สามารถใช้งานได้อีกต่อไปเมื่อสร้างบัญชีใหม่ ยกเว้นเมื่อผู้ดูแลระบบสร้างบัญชี นอกจากนี้ บัญชีที่มีอยู่แล้วจะไม่ได้รับผลกระทบ"
 createNoteFromTheFile: "เรียบเรียงโน้ตจากไฟล์นี้"
 archive: "เก็บถาวร"
-channelArchiveConfirmTitle: "เก็บถาวรจริงๆ {name} มั้ย?"
-channelArchiveConfirmDescription: "ช่องที่ถูกเก็บถาวรแล้วนั้นจะไม่ปรากฏในรายการช่องหรือผลการค้นหานั้นอีกต่อไปไม่สามารถเพิ่มโพสต์ใหม่ได้อีกต่อไปนะ"
+channelArchiveConfirmTitle: "ต้องการเก็บถาวรเจ้า {name} ใช่ไหม?"
+channelArchiveConfirmDescription: "เมื่อเก็บถาวรแล้ว จะไม่ปรากฏในรายการช่องหรือผลการค้นหาอีกต่อไป และจะไม่สามารถโพสต์ใหม่ได้อีกต่อไป"
 thisChannelArchived: "ช่องนี้ถูกเก็บถาวรแล้วนะ"
 displayOfNote: "การแสดงโน้ต"
 initialAccountSetting: "ตั้งค่าโปรไฟล์"
@@ -1073,14 +1100,14 @@ options: "ตัวเลือกบทบาท"
 specifyUser: "ผู้ใช้เฉพาะ"
 failedToPreviewUrl: "ไม่สามารถดูตัวอย่างได้"
 update: "อัปเดต"
-rolesThatCanBeUsedThisEmojiAsReaction: "บทบาทที่สามารถใช้อิโมจินี้เป็นรีแอคชั่นได้"
-rolesThatCanBeUsedThisEmojiAsReactionEmptyDescription: "ถ้าหากไม่ได้ระบุบทบาท ทุกคนนั้นก็สามารถใช้อิโมจินี้เป็นการแสดงความรู้สึกได้นะ"
+rolesThatCanBeUsedThisEmojiAsReaction: "บทบาทที่สามารถใช้เอโมจินี้เป็นรีแอคชั่นได้"
+rolesThatCanBeUsedThisEmojiAsReactionEmptyDescription: "ถ้าหากไม่ได้ระบุบทบาท ทุกคนนั้นก็สามารถใช้เอโมจินี้เพื่อรีแอคชั่นได้นะ"
 rolesThatCanBeUsedThisEmojiAsReactionPublicRoleWarn: "บทบาทเหล่านี้ต้องเป็นสาธารณะ"
 cancelReactionConfirm: "ต้องการลบรีแอคชั่นของคุณจริงๆหรอ?"
 changeReactionConfirm: "ต้องการเปลี่ยนรีแอคชั่นของคุณจริงๆหรอ?"
 later: "ไว้ทีหลัง"
 goToMisskey: "ถึง Misskey"
-additionalEmojiDictionary: "พจนานุกรมอีโมจิเพิ่มเติม"
+additionalEmojiDictionary: "พจนานุกรมเอโมจิเพิ่มเติม"
 installed: "ติดตั้งแล้ว"
 branding: "แบรนดิ้ง"
 enableServerMachineStats: "เผยแพร่สถานะฮาร์ดแวร์ของเซิร์ฟเวอร์"
@@ -1100,45 +1127,53 @@ registeredUserUsingInviteCode: "ใช้คำเชิญแล้วโดย
 waitingForMailAuth: "กำลังรอการยืนยันอีเมล"
 inviteCodeCreator: "สร้างการเชิญแล้วโดย"
 usedAt: "ใช้แล้วที่"
-unused: "ไม่ใช้แล้ว"
-used: "ใช้แล้ว"
+unused: "ยังไม่ได้ใช้"
+used: "ถูกใช้แล้ว"
 expired: "หมดอายุแล้ว"
-doYouAgree: "ยอมรับมั้ย?"
+doYouAgree: "ยอมรับไหม?"
 beSureToReadThisAsItIsImportant: "กรุณาอ่านข้อมูลที่สำคัญอันนี้"
-iHaveReadXCarefullyAndAgree: "ฉันได้อ่านข้อความ \"{x}\" และยินยอม"
+iHaveReadXCarefullyAndAgree: "ฉันได้อ่านและยินยอมเนื้อหาของ “{x}”"
 dialog: "ไดอะล็อก"
 icon: "ไอคอน"
 forYou: "สำหรับคุณ"
 currentAnnouncements: "ประกาศในปัจจุบัน"
 pastAnnouncements: "ประกาศที่ผ่านมา"
 youHaveUnreadAnnouncements: "มีการประกาศที่ยังไม่ได้อ่าน"
+useSecurityKey: "โปรดปฏิบัติตามคำแนะนำของเบราว์เซอร์หรืออุปกรณ์ของคุณเพื่อใช้ security key หรือ passkey"
 replies: "ตอบกลับ"
 renotes: "รีโน้ต"
 loadReplies: "แสดงการตอบกลับ"
 loadConversation: "แสดงบทสนทนา"
-pinnedList: "รายการที่ปักหมุดไว้แล้ว"
+pinnedList: "รายชื่อที่ปักหมุดไว้"
 keepScreenOn: "เปิดหน้าจอไว้"
+verifiedLink: "ความเป็นเจ้าของลิงก์ได้รับการยืนยันแล้ว"
 notifyNotes: "แจ้งเตือนเกี่ยวกับโพสต์ใหม่"
 unnotifyNotes: "หยุดการแจ้งเตือนเกี่ยวกับโน้ตใหม่"
 authentication: "การตรวจสอบสิทธิ์"
-authenticationRequiredToContinue: "กรุณาตรวจสอบการรับรองความถูกต้องเพื่อดำเนินการต่อ"
+authenticationRequiredToContinue: "กรุณายืนยันตัวตนทางอิเล็กทรอนิกส์เพื่อดำเนินการต่อ"
 dateAndTime: "เวลาประทับ"
 showRenotes: "แสดงรีโน้ต"
 edited: "แก้ไขแล้ว"
 notificationRecieveConfig: "การตั้งค่าการแจ้งเตือน"
 mutualFollow: "ติดตามซึ่งกันและกัน"
 fileAttachedOnly: "เฉพาะโน้ตที่มีไฟล์เท่านั้น"
-showRepliesToOthersInTimeline: "แสดงการตอบกลับไปยังอื่นๆในไทม์ไลน์"
-hideRepliesToOthersInTimeline: "ซ่อนการตอบกลับไปยังอื่นๆจากไทม์ไลน์"
+showRepliesToOthersInTimeline: "แสดงการตอบกลับผู้อื่นลงในไทม์ไลน์"
+hideRepliesToOthersInTimeline: "ไม่แสดงการตอบกลับผู้อื่นลงในไทม์ไลน์"
+showRepliesToOthersInTimelineAll: "รวมตอบกลับจากทุกคนที่คุณติดตามไว้ในไทม์ไลน์ของคุณ"
+hideRepliesToOthersInTimelineAll: "ซ่อนตอบกลับจากทุกคนที่คุณติดตามไปจากไทม์ไลน์ของคุณ"
+confirmShowRepliesAll: "การดำเนินการนี้ไม่สามารถย้อนกลับได้ คุณต้องการแสดงการตอบกลับผู้อื่นจากผู้ใช้ทุกคนที่คุณติดตามอยู่ในไทม์ไลน์ของคุณหรือไม่?"
+confirmHideRepliesAll: "การดำเนินการนี้ไม่สามารถย้อนกลับได้ คุณต้องการซ่อนการตอบกลับผู้อื่นจากผู้ใช้ทุกคนที่คุณติดตามอยู่ในไทม์ไลน์ของคุณหรือไม่?"
 externalServices: "บริการภายนอก"
 impressum: "อิมเพรสชั่น"
 impressumUrl: "URL อิมเพรสชั่น"
+impressumDescription: "การติดป้ายกำกับ (Impressum) มีผลบังคับใช้ในบางประเทศและภูมิภาค เช่น ประเทศเยอรมนี"
 privacyPolicy: "นโยบายความเป็นส่วนตัว"
 privacyPolicyUrl: "URL นโยบายความเป็นส่วนตัว"
 tosAndPrivacyPolicy: "เงื่อนไขในการให้บริการและนโยบายความเป็นส่วนตัว"
 avatarDecorations: "การตกแต่งอวตาร"
 attach: "แนบ"
 detach: "นำออก"
+detachAll: "เอาออกทั้งหมด"
 angle: "แองเกิล"
 flip: "ย้อนกลับ"
 showAvatarDecorations: "แสดงตกแต่งอวตาร"
@@ -1148,17 +1183,45 @@ pullDownToRefresh: "ดึงลงเพื่อรีเฟรช"
 disableStreamingTimeline: "ปิดใช้งานอัปเดตไทม์ไลน์แบบเรียลไทม์"
 useGroupedNotifications: "แสดงผลการแจ้งเตือนแบบกลุ่มแล้ว"
 signupPendingError: "มีปัญหาในการตรวจสอบที่อยู่อีเมลลิงก์อาจหมดอายุแล้ว"
+cwNotationRequired: "หากเปิดใช้งาน “ซ่อนเนื้อหา” จะต้องระบุคำอธิบาย"
 doReaction: "เพิ่มรีแอคชั่น"
+code: "โค้ด"
+reloadRequiredToApplySettings: "จำเป็นต้องมีการโหลดซ้ำเพื่อให้การตั้งค่ามีผล"
+remainingN: "เหลือ : {n}"
+overwriteContentConfirm: "แน่ใจหรือไม่ว่าต้องการเขียนทับเนื้อหาปัจจุบัน?"
+seasonalScreenEffect: "เอฟเฟกต์หน้าจอตามฤดูกาล"
+decorate: "ตกแต่ง"
+addMfmFunction: "เพิ่มการตกแต่ง"
+enableQuickAddMfmFunction: "แสดงตัวจิ้มเลือก MFM ขั้นสูง"
+bubbleGame: "เกมบับเบิ้ล"
+sfx: "เสียงเอฟเฟ็กต์"
+soundWillBePlayed: "จะมีการเล่นเอฟเฟกต์เสียง"
+showReplay: "ดูรีเพลย์"
+replay: "รีเพลย์"
+replaying: "กำลังรีเพลย์"
+ranking: "อันดับ"
+lastNDays: "ล่าสุด {n} วันที่แล้ว"
+backToTitle: "กลับไปหน้าไตเติ้ล"
+enableHorizontalSwipe: "ปัดเพื่อสลับแท็บ"
+_bubbleGame:
+  howToPlay: "วิธีเล่น"
+  _howToPlay:
+    section1: "ขยับตำแหน่งและวางวัตถุลงในกล่อง"
+    section2: "เมื่อวัตถุประเภทเดียวกันมารวมกัน พวกมันจะกลายเป็นวัตถุใหม่และคุณจะได้รับคะแนน"
+    section3: "หากวัตถุล้นออกมาจากกล่อง เกมก็จะจบลง ตั้งเป้าทำคะแนนให้สูงด้วยการหลอมวัตถุต่าง ๆ โดยไม่ทำให้ล้นกล่อง!"
 _announcement:
   forExistingUsers: "ผู้ใช้งานที่มีอยู่เท่านั้น"
   forExistingUsersDescription: "การประกาศนี้จะแสดงต่อผู้ใช้ที่มีอยู่ ณ จุดที่เผยแพร่นั้นๆถ้าหากเปิดใช้งาน ถ้าหากปิดใช้งานผู้ที่กำลังสมัครใหม่หลังจากโพสต์แล้วนั้นก็จะเห็นเช่นกัน"
   needConfirmationToRead: "จำเป็นต้องยืนยันเพื่อทำเครื่องหมายบอกว่าอ่านแล้ว"
   needConfirmationToReadDescription: "ข้อความแจ้งแยก ถ้าหากต้องการเพื่อยืนยันว่ากำลังทำเครื่องหมายประกาศนี้ว่าอ่านแล้วจะแสดงขึ้นถ้าหากเปิดใช้งาน การประกาศนั้นจะไม่รวมอยู่ในฟังก์ชั่นว่า \"ทำเครื่องหมายทั้งหมดว่าอ่านแล้ว\""
-  end: "ประกาศเก็บถาวร"
+  end: "เก็บประกาศ"
   tooManyActiveAnnouncementDescription: "การมีประกาศที่ใช้งานมากเกินไปนั้นอาจจะทำให้ประสบการณ์ของผู้ใช้งานนั้นดูแย่ลง โปรดกรุณาพิจารณาการเก็บประกาศที่ล้าสมัยด้วยนะค่ะ"
   readConfirmTitle: "ทำเครื่องหมายบอกว่าอ่านแล้วเลยมั้ย?"
   readConfirmText: "การดำเนินการนี้จะทำเครื่องหมายเนื้อหาของ \"{title}\" บอกว่าอ่านแล้วนะ"
+  shouldNotBeUsedToPresentPermanentInfo: "เราขอแนะนำให้ใช้ประกาศเพื่อโพสต์ข้อมูลแบบ flow มากกว่าข้อมูลแบบ stock เนื่องจากมีแนวโน้มที่จะส่งผลเสียต่อ UX โดยเฉพาะสำหรับผู้ใช้ใหม่"
+  dialogAnnouncementUxWarn: "เราขอแนะนำให้ใช้ด้วยความระมัดระวัง เนื่องจากการแจ้งเตือนแบบกล่องโต้ตอบตั้งแต่ 2 รายการขึ้นไปพร้อมกันอาจส่งผลเสียต่อ UX ได้อย่างมาก"
   silence: "ไม่มีการแจ้งเตือน"
+  silenceDescription: "หากเปิดใช้งาน จะไม่ได้แจ้งเตือนประกาศนี้  และผู้ใช้จะไม่จำเป็นต้องอ่าน"
 _initialAccountSetting:
   accountCreated: "คุณได้สร้างบัญชีของคุณสำเร็จเรียบร้อยแล้ว!"
   letsStartAccountSetup: "สำหรับผู้เริ่มต้นมาตั้งค่าโปรไฟล์ของคุณกันเถอะ"
@@ -1170,7 +1233,8 @@ _initialAccountSetting:
   followUsers: "ลองติดตามผู้ใช้บางคนที่คุณอาจจะสนใจเพื่อสร้างไทม์ไลน์ของคุณสิ !"
   pushNotificationDescription: "กำลังเปิดใช้งานการแจ้งเตือนแบบพุชจะช่วยให้คุณได้รับการแจ้งเตือนจาก {name} โดยตรงบนอุปกรณ์ของคุณนะ"
   initialAccountSettingCompleted: "ตั้งค่าโปรไฟล์เสร็จสมบูรณ์แล้ว!"
-  haveFun: "ขอให้สนุก {name}!"
+  haveFun: "ขอให้สนุกกับ {name}!"
+  youCanContinueTutorial: "คุณสามารถดำเนินการต่อด้วยบทช่วยสอนเกี่ยวกับวิธีใช้ {name} (Misskey) หรือออกจากบทช่วยสอนแล้วเริ่มใช้งานได้ทันที"
   startTutorial: "เริ่มการฝึกสอน"
   skipAreYouSure: "ต้องการข้ามการตั้งค่าโปรไฟล์จริงๆแบบนั้นหรอ?"
   laterAreYouSure: "ต้องการตั้งค่าโปรไฟล์ในภายหลังจริงๆอย่างงั้นหรอ?"
@@ -1181,29 +1245,80 @@ _initialTutorial:
   skipAreYouSure: "ต้องการออกจากบทช่วยสอนใช่ไหม?"
   _landing:
     title: "ยินดีต้อนรับสู่บทช่วยสอน"
+    description: "คุณสามารถตรวจสอบการใช้งานและฟังก์ชั่นพื้นฐานของ Misskey ได้ที่นี่"
   _note:
     title: "โน้ตคืออะไร?"
+    description: "โพสต์ใน Misskey เรียกว่า “โน้ต” ซึ่งจะจัดเรียงตามลำดับเวลาบนไทม์ไลน์และอัปเดตแบบเรียลไทม์"
+    reply: "คุณสามารถตอบกลับได้ และคุณยังสามารถตอบกลับใส่การตอบกลับเพื่อสนทนาต่อได้เสมือนดั่งเธรด"
+    renote: "คุณสามารถแชร์โน้ตไปยังไทม์ไลน์ของคุณเอง คุณยังสามารถเพิ่มข้อความและเครื่องหมายคำพูดได้"
+    reaction: "คุณสามารถเพิ่มรีแอคชั่นได้ รายละเอียดจะอธิบายอยู่ในหน้าถัดไป"
+    menu: "คุณสามารถดูรายละเอียดโน้ต คัดลอกลิงก์ และดำเนินการอื่นๆ ได้"
   _reaction:
     title: "รีแอคชั่นคืออะไร?"
+    description: "โน้ตสามารถ“รีแอคชั่น”ด้วยเอโมจิต่างๆ ซึ่งทำให้สามารถแสดงความแตกต่างเล็กๆ น้อยๆ ที่อาจไม่สามารถสื่อออกมาได้ด้วยการแค่การกด “ถูกใจ”"
+    letsTryReacting: "คุณสามารถเพิ่มรีแอคชั่นได้ด้วยการคลิกปุ่ม “+” บนโน้ต ลองรีแอคชั่นโน้ตตัวอย่างนี้ดูสิ!"
+    reactToContinue: "เพิ่มรีแอคชั่นเพื่อดำเนินการต่อ"
+    reactNotification: "คุณจะได้รับการแจ้งเตือนแบบเรียลไทม์เมื่อมีคนตอบรีแอคชั่นโน้ตของคุณ"
+    reactDone: "คุณสามารถยกเลิกรีแอคชั่นได้โดยการกดปุ่ม “-”"
   _timeline:
     title: "แนวคิดเรื่องของไทม์ไลน์"
+    description1: "Misskey มีหลายไทม์ไลน์ขึ้นอยู่กับวิธีการใช้งานของคุณ (บางไทม์ไลน์อาจไม่สามารถใช้ได้ขึ้นอยู่กับนโยบายของเซิร์ฟเวอร์)"
+    home: "คุณสามารถดูโพสต์จากบัญชีที่คุณติดตามได้"
+    local: "คุณสามารถดูโพสต์จากผู้ใช้ทั้งหมดบนเซิร์ฟเวอร์นี้"
+    social: "โพสต์จากทั้งไทม์ไลน์หน้าแรกและไทม์ไลน์ในพื้นที่ของคุณจะปรากฏขึ้น"
+    global: "คุณสามารถดูโพสต์จากเซิร์ฟเวอร์ที่เชื่อมต่ออื่นๆ ทั้งหมดได้"
+    description2: "คุณสามารถสลับระหว่างแต่ละไทม์ไลน์ได้ตลอดเวลาได้ที่บริเวณด้านบนของหน้าจอ"
+    description3: "นอกจากนี้ยังมีรายการไทม์ไลน์ ไทม์ไลน์ของช่อง ฯลฯ โปรดดู {link} สำหรับรายละเอียดเพิ่มเติม"
   _postNote:
-    title: "ตั้งค่ากำลังโพสต์โน้ต"
+    title: "ตั้งค่าการโพสต์โน้ต"
+    description1: "เมื่อโพสต์โน้ตบน Misskey คุณสามารถตั้งค่าตัวเลือกต่างๆ ได้ แบบฟอร์มการส่งมีลักษณะดังนี้"
     _visibility:
       description: "คุณสามารถจำกัดผู้ที่สามารถดูโน้ตของคุณได้นะ"
       public: "โน้ตของคุณนั้นจะปรากฏแก่ผู้ใช้งานทุกคน"
+      home: "เผยแพร่บนไทม์ไลน์หน้าแรกเท่านั้น ผู้คนที่เข้าชมโปรไฟล์ของคุณ ผ่านผู้ติดตาม และผ่านการรีโน้ตสามารถเห็นได้"
+      followers: "มองเห็นได้เฉพาะผู้ติดตามเท่านั้น ไม่มีใครอื่นนอกจากตัวคุณเองที่สามารถรีโน้ตได้ และมีเพียงผู้ติดตามของคุณเท่านั้นที่สามารถดูได้"
+      direct: "เปิดให้เห็นเฉพาะผู้ใช้ที่ระบุเท่านั้น และพวกเขาจะได้รับแจ้งเตือนด้วย คุณสามารถใช้มันแทนข้อความโดยตรง (dm)"
+      doNotSendConfidencialOnDirect1: "โปรดใช้ความระมัดระวังในการส่งข้อมูลที่ละเอียดอ่อน"
+      doNotSendConfidencialOnDirect2: "ผู้ดูแลระบบเซิร์ฟเวอร์ปลายทางสามารถดูเนื้อหาที่โพสต์ได้ ดังนั้นหากคุณส่งโพสต์โดยตรงไปยังผู้ใช้บนเซิร์ฟเวอร์ที่ไม่น่าเชื่อถือ คุณจะต้องใช้ความระมัดระวังในการจัดการข้อมูลที่เป็นความลับ"
+      localOnly: "การโพสต์ด้วย flag นี้จะไม่รวมโน้ตไปยังเซิร์ฟเวอร์อื่น ผู้ใช้บนเซิร์ฟเวอร์อื่นจะไม่สามารถดูโน้ตเหล่านี้ได้โดยตรง โดยไม่คำนึงถึงการตั้งค่าการแสดงผลข้างต้น"
     _cw:
       title: "คำเตือนเกี่ยวกับเนื้อหา"
+      description: "เนื้อหาที่เขียนด้วย “คำอธิบายประกอบ” จะแสดงแทนข้อความหลัก คลิก “ดูเพิ่มเติม” เพื่อแสดงข้อความเต็ม"
       _exampleNote:
         cw: "นี่อาจจะทำให้คุณหิวอย่างแน่นอน!"
+        note: "เพิ่งไปกินโดนัทเคลือบช็อคโกแลตมา 🍩😋"
+      useCases: "ใช้สิ่งนี้เพื่อระบุโน้ตที่ต้องตามแนวทางปฏิบัติของเซิร์ฟเวอร์ หรือเพื่อควบคุมการสปอยล์และข้อความที่ละเอียดอ่อนด้วยตนเอง"
+  _howToMakeAttachmentsSensitive:
+    title: "จะทำเครื่องหมายไฟล์แนบว่ามีเนื้อหาละเอียดอ่อนได้อย่างไร?"
+    description: "ทำเครื่องหมายไฟล์แนบว่า “มีเนื้อหาละเอียดอ่อน” เมื่อจำเป็นตามแนวทางของเซิร์ฟเวอร์ หรือเมื่อไฟล์แนบไม่ควรปรากฏให้เห็น"
+    tryThisFile: "ลองทำให้รูปภาพที่แนบมากับแบบฟอร์มนี้มีเนื้อหาละเอียดอ่อน!"
+    _exampleNote:
+      note: "อุ้ย นัตโตะ ฝาเปิดเละเทะ..."
+    method: "หากต้องการทำให้ไฟล์แนบมีเนื้อหาละเอียดอ่อน ให้คลิกไฟล์เพื่อเปิดเมนูแล้วคลิก “ทำเครื่องหมายว่ามีเนื้อหาละเอียดอ่อน”"
+    sensitiveSucceeded: "เมื่อแนบไฟล์ โปรดตั้งค่าเครื่องหมายว่ามีเนื้อหาละเอียดอ่อนตามแนวทางของเซิร์ฟเวอร์"
+    doItToContinue: "ทำเครื่องหมายกับรูปภาพว่ามีเนื้อหาละเอียดอ่อน เพื่อดำเนินการต่อ"
+  _done:
+    title: "บทเรียนจบลงแล้วจ้า เย่เย่เย่  🎉"
+    description: "คุณสมบัติที่แนะนำในที่นี่เป็นเพียงบางส่วนเท่านั้น หากต้องการเรียนรู้เพิ่มเติมเกี่ยวกับวิธีใช้ Misskey โปรดไปที่ {link}"
+_timelineDescription:
+  home: "บนไทม์ไลน์หน้าแรก คุณสามารถดูโพสต์จากบัญชีที่คุณติดตามได้"
+  local: "ไทม์ไลน์ในพื้นที่ช่วยให้คุณเห็นโพสต์จากผู้ใช้ทั้งหมดบนเซิร์ฟเวอร์นี้"
+  social: "ไทม์ไลน์โซเชียลจะแสดงโพสต์จากทั้งไทม์ไลน์หน้าแรกและไทม์ไลน์ในพื้นที่"
+  global: "ในไทม์ไลน์ทั่วโลก คุณสามารถดูโน้ตจากเซิร์ฟเวอร์ที่เชื่อมต่อทั้งหมดได้"
 _serverRules:
   description: "ชุดของกฎที่จะแสดงก่อนการลงทะเบียนเราขอแนะนำให้ตั้งค่าสรุปข้อกำหนดในการให้บริการ"
 _serverSettings:
   iconUrl: "ไอคอน URL"
+  appIconDescription: "ระบุไอคอนที่จะใช้เมื่อ {host} แสดงเป็นแอป"
   appIconUsageExample: "E.g. เป็น PWA หรือเมื่อแสดงผลเป็นบุ๊กมาร์กหน้าจอหลักบนโทรศัพท์"
+  appIconStyleRecommendation: "เนื่องจากไอคอนอาจถูกครอบตัดเป็นสี่เหลี่ยมจัตุรัสหรือวงกลม จึงแนะนำให้ใช้ไอคอนที่มีขอบสีรอบๆ เนื้อหา"
   appIconResolutionMustBe: "ความละเอียดขั้นต่ำไว้คือ {resolution}."
-  manifestJsonOverride: "manifest.json โอเวอร์ลาย"
+  manifestJsonOverride: "เขียนทับ manifest.json"
   shortName: "ชื่อย่อ"
+  shortNameDescription: "ตัวย่อหรือชื่อทั่วไปที่สามารถแสดงแทนชื่ออย่างเป็นทางการแบบยาวของเซิร์ฟเวอร์"
+  fanoutTimelineDescription: "เพิ่มประสิทธิภาพการดึงข้อมูลไทม์ไลน์อย่างมาก และลดภาระในฐานข้อมูลเมื่อเปิดใช้งาน ในทางกลับกัน การใช้หน่วยความจำของ Redis จะเพิ่มขึ้น ลองปิดการใช้งานนี้ในกรณีที่หน่วยความจำเซิร์ฟเวอร์เหลือน้อยหรือเซิร์ฟเวอร์ไม่เสถียร"
+  fanoutTimelineDbFallback: "ฟอลแบ๊กกลับฐานข้อมูล"
+  fanoutTimelineDbFallbackDescription: "เมื่อเปิดใช้งาน หากไม่ได้แคชไทม์ไลน์ ไทม์ไลน์จะฟอลแบ๊กไปยังฐานข้อมูลสำหรับการ query เพิ่มเติม การปิดใช้งานจะช่วยลดภาระของเซิร์ฟเวอร์ด้วยการกำจัดกระบวนฟอลแบ๊ก แต่มันก็จะจำกัดช่วงเวลาไทม์ไลน์ที่สามารถดึงข้อมูลได้"
 _accountMigration:
   moveFrom: "ย้ายข้อมูลบัญชีอื่นไปยังอีกบัญชีนี้หนึ่ง"
   moveFromSub: "สร้างนามแฝงไปยังบัญชีอื่น"
@@ -1212,7 +1327,7 @@ _accountMigration:
   moveTo: "ย้ายข้อมูลบัญชีนี้ไปยังบัญชีอีกหนึ่ง"
   moveToLabel: "บัญชีที่จะย้ายไปที่:"
   moveCannotBeUndone: "ไม่สามารถยกเลิกการโอนย้ายบัญชีได้"
-  moveAccountDescription: "การกระทำนี้ไม่สามารถย้อนกลับได้นะ ขั้นตอนแรก ต้องสร้างนามแฝงสำหรับบัญชีนี้ในบัญชีที่คุณต้องการย้ายไป หลังจากนั้นแล้ว ป้อนบัญชีที่จะย้ายไปในรูปแบบดังต่อไปนี้: @person@instance.com"
+  moveAccountDescription: "การดำเนินการนี้จะย้ายบัญชีของคุณไปยังบัญชีอื่น\n・ผู้ที่กำลังติดตามคุณจากบัญชีนี้จะถูกย้ายไปยังบัญชีใหม่โดยอัตโนมัติ\n・บัญชีนี้จะเลิกติดตามผู้ใช้ทั้งหมดที่กำลังติดตามอยู่\n・คุณจะไม่สามารถสร้างโน้ต ฯลฯ ในบัญชีนี้ได้\n\nแม้ว่าการย้ายผู้ที่ติดตามคุณจะเป็นไปโดยอัตโนมัติ แต่คุณต้องเตรียมขั้นตอนบางอย่างด้วยตนเอง เพื่อย้ายรายชื่อผู้ใช้ที่คุณกำลังติดตาม โดยดำเนินการส่งออกรายชื่อแล้วค่อยนำเข้ามาภายหลังในเมนูการตั้งค่าของบัญชีใหม่ ใช้ขั้นตอนเดียวกันนี้ใช้รายชื่อผู้ใช้ที่ถูกปิดเสียงและถูกบล็อก\n\n(คำอธิบายนี้ใช้กับ Misskey v13.12.0 ขึ้นไป, ซอฟต์แวร์ ActivityPub อื่นๆ เช่น Mastodon อาจทำงานแตกต่างออกไป)"
   moveAccountHowTo: "หากต้องการย้ายข้อมูลก่อนอื่นให้สร้างชื่อแทนสำหรับบัญชีนี้ ในบัญชีที่จะต้องการย้ายไป\nหลังจากที่คุณสร้างนามแฝงนั้นแล้ว ให้ป้อนบัญชีที่ต้องการจะย้ายไปในรูปแบบดังต่อไปนี้: @username@server.example.com"
   startMigration: "โอนย้าย"
   migrationConfirm: "ยืนยันการย้ายข้อมูลบัญชีนี้ไปที่ {account} เมื่อเริ่มแล้วจะไม่สามารถหยุดหรือนำกลับคืนมาได้ และคุณจะไม่สามารถใช้บัญชีนี้ในสถานะดั้งเดิมได้อีกต่อไป\n\nนอกจากนี้ คุณจำเป็นต้องสร้างบัญชีสำรองสำหรับการย้ายบัญชี"
@@ -1227,31 +1342,31 @@ _achievements:
       description: "โพสต์โน้ตแรกของคุณ"
       flavor: "ขอให้มีช่วงเวลาที่ดีกับ Misskey นะคะ!"
     _notes10:
-      title: "โน้ตบางอย่าง"
+      title: "โน้ตไม่กี่ชิ้น"
       description: "โพสต์ 10 โน้ต"
     _notes100:
-      title: "โน้ตจำนวนมาก"
+      title: "โน้ตเยอะอยู่"
       description: "โพสต์ 100 โน้ต"
     _notes500:
-      title: "ครอบคลุมในโน้ต"
+      title: "จมคากองโน้ต"
       description: "โพสต์ 500 โน้ต"
     _notes1000:
       title: "ภูเขาแห่งโน้ต"
       description: "โพสต์ 1,000 โน้ต"
     _notes5000:
-      title: "โน้ตล้น"
+      title: "โน้ตล้นไปแล้ว"
       description: "โพสต์ 5,000 โน้ต"
     _notes10000:
       title: "ซุปเปอร์โน้ต"
       description: "โพสต์ 10,000 โน้ต"
     _notes20000:
-      title: "ต้องการ... เพิ่มเติม... โน้ต..."
+      title: "ต้ อ ง ก า ร โ น้ ต เ พิ่ ม อี ก !"
       description: "โพสต์ 20,000 โน้ต"
     _notes30000:
       title: "โน้ต โน้ต โน้ต!"
       description: "โพสต์ 30,000 โน้ต"
     _notes40000:
-      title: "โน้ตโรงงาน"
+      title: "โรงงานผลิตโน้ต"
       description: "โพสต์ 40,000 โน้ต"
     _notes50000:
       title: "ดาวเคราะห์แห่งโน้ต"
@@ -1260,26 +1375,26 @@ _achievements:
       title: "โน้ตควอซาร์"
       description: "โพสต์ 60,000 โน้ต"
     _notes70000:
-      title: "โน้ตหลุมดำ"
+      title: "หลุม-โน้ต-ดำ"
       description: "โพสต์ 70,000 โน้ต"
     _notes80000:
-      title: "โน้ต กาแล็กซี่"
+      title: "ดาราจักรโน้ต"
       description: "โพสต์ 80,000 โน้ต"
     _notes90000:
-      title: "โน้ต จักรวาล"
+      title: "จักรวาลโน้ต"
       description: "โพสต์ 90,000 โน้ต"
     _notes100000:
       title: "ALL YOUR NOTE ARE BELONG TO US"
       description: "โพสต์ 100,000 โน้ต"
-      flavor: "นายแน่ใจล่ะก็ มีอะไรพูดมาได้นะ"
+      flavor: "มีเรื่องจะเขียนมากขนาดนั้นเลยเหรอนั่น?"
     _login3:
       title: "มือใหม่ I"
       description: "เข้าสู่ระบบเป็นเวลารวม 3 วัน"
-      flavor: "เริ่มตั้งแต่วันนี้ เรียกฉันว่ามิสคิสต์"
+      flavor: "ตั้งแต่วันนี้เป็นต้นไป ฉันคือมิสคิสต์"
     _login7:
       title: "มือใหม่ II"
       description: "เข้าสู่ระบบเป็นเวลารวม 7 วัน"
-      flavor: "รู้สึกเหมือนคุณได้แขวนของสิ่งต่างๆ หรือยังคะ?"
+      flavor: "ชินกับมันแล้วหรือยัง?"
     _login15:
       title: "มือใหม่ III"
       description: "เข้าสู่ระบบเป็นเวลารวม 15 วัน"
@@ -1292,7 +1407,7 @@ _achievements:
     _login100:
       title: "มิสคิสท์ III"
       description: "เข้าสู่ระบบเป็นเวลารวม 100 วัน"
-      flavor: "ความรุนแรง Misskist"
+      flavor: "มิสคิสต์หัวรุนแรง"
     _login200:
       title: "ลูกค้าประจำ I"
       description: "เข้าสู่ระบบเป็นเวลารวม 200 วัน"
@@ -1305,7 +1420,7 @@ _achievements:
     _login500:
       title: "ผู้เชี่ยวชาญ I"
       description: "เข้าสู่ระบบเป็นเวลารวม 500 วัน"
-      flavor: "เพื่อนของผมนะมักจะกล่าวว่าผมนะชอบจดโน้ต"
+      flavor: "ทุกท่าน ผมชอบโน้ต (กล่าวโดย เดอะ เ_เ_อร์)"
     _login600:
       title: "ผู้เชี่ยวชาญ II"
       description: "เข้าสู่ระบบเป็นเวลารวม 600 วัน"
@@ -1323,7 +1438,7 @@ _achievements:
       description: "เข้าสู่ระบบเป็นเวลารวม 1,000 วัน"
       flavor: "ขอบคุณที่ใช้ Misskey นะ !"
     _noteClipped1:
-      title: "จะต้อง... คลิป..."
+      title: "อดไม่ได้ที่จะต้องคลิปมันเอาไว้"
       description: "คลิปโน้ตตัวแรกของคุณ"
     _noteFavorited1:
       title: "สตาร์เกเซอร์"
@@ -1332,15 +1447,15 @@ _achievements:
       title: "แสวงหาดวงดาว"
       description: "มีคนอื่นๆที่ชื่นชอบหนึ่งในโน้ตของคุณ"
     _profileFilled:
-      title: "เตรียมไว้อย่างดี"
+      title: "เตรียมตัวอย่างดี"
       description: "ตั้งค่าโปรไฟล์ของคุณ"
     _markedAsCat:
       title: "ฉันเป็นแมว"
       description: "ทำเครื่องหมายบัญชีของคุณว่าเป็นแมว"
-      flavor: "ฉันจะให้ชื่อคุณภายหลังนะ"
+      flavor: "แมวน้อยไร้ชื่อ"
     _following1:
-      title: "กำลังติดตามผู้ใช้คนแรกของคุณ"
-      description: "ติดตามผู้ใช้"
+      title: "ก้าวแรกสู่...กดติดตาม"
+      description: "กดติดตามชาวบ้านครั้งแรก"
     _following10:
       title: "ทำต่อไป... ทำต่อไป..."
       description: "ติดตาม 10 บัญชีผู้ใช้"
@@ -1351,7 +1466,7 @@ _achievements:
       title: "เพื่อน 100 คน"
       description: "ติดตาม 100 บัญชี"
     _following300:
-      title: "เพื่อนโอเวอร์โหลด"
+      title: "มีเพื่อนมากเกินไปละ"
       description: "ติดตาม 300 บัญชี"
     _followers1:
       title: "ผู้ติดตามคนแรก"
@@ -1378,12 +1493,12 @@ _achievements:
       title: "นักสะสมความสำเร็จ"
       description: "ได้รับความสำเร็จ 30 ครั้ง"
     _viewAchievements3min:
-      title: "ชอบบรรลุผลสําเร็จ"
+      title: "ชอบบรรลุความสําเร็จ"
       description: "มองดูรายการความสำเร็จของคุณเป็นเวลาอย่างน้อย 3 นาที"
     _iLoveMisskey:
       title: "ฉันรัก Misskey"
-      description: "โพสต์ \"I ❤ #Misskey\""
-      flavor: "ขอบคุณที่ใช้ Misskey! by ทีมผู้พัฒนา"
+      description: "โพสต์ “I ❤ #Misskey”"
+      flavor: "ขอบคุณพระคุณเป็นอย่างสูงที่ท่านใช้ Misskey นะคะ ! by ทีมผู้พัฒนา"
     _foundTreasure:
       title: "ล่าสมบัติ"
       description: "คุณพบสมบัติที่ซ่อนอยู่"
@@ -1391,25 +1506,25 @@ _achievements:
       title: "พักผ่อนสักหน่อย"
       description: "ใช้เวลา 30 นาทีบน Misskey"
     _client60min:
-      title: "ไม่มี \"Miss\" ใน Misskey "
+      title: "Misskey ต้องไม่มีสิ่งใด “Miss”"
       description: "เปิด Misskey ค้างไว้แล้วอย่างน้อย 60 นาที"
     _noteDeletedWithin1min:
       title: "ไม่เป็นไร"
       description: "ลบโน้ตภายในหนึ่งนาทีหลังจากที่โพสต์"
     _postedAtLateNight:
-      title: "กลางคืน"
+      title: "ออกหากินยามดึกดื่น"
       description: "โพสต์โน้ตตอนดึกๆ"
       flavor: "ได้เวลาเข้านอนแล้วนะ"
     _postedAt0min0sec:
-      title: "นาฬิกาพูดได้"
-      description: "โพสต์บนโน้ตเมื่อเวลา 00:00 น."
-      flavor: "คลิก คลิก คลิก แกล๊งๆ"
+      title: "นาฬิกาเทียบเวลา"
+      description: "โพสต์โน้ตเมื่อเวลา 00:00 น."
+      flavor: "โป๊ะ โป๊ะ โป๊ะ ปิ้งงงงง"
     _selfQuote:
       title: "อ้างอิงตนเอง"
-      description: "อ้างโน้ตย่อของคุณเอง"
+      description: "อ้างโน้ตของคุณเอง"
     _htl20npm:
       title: "ไทม์ไลน์ไหล"
-      description: "มีการทำความเร็วของไทม์ไลน์ที่บ้านของคุณเกิน 20 npm (โน้ตต่อนาที)"
+      description: "มีการทำความเร็วของไทม์ไลน์หน้าแรกเกิน 20 npm (โน้ตต่อนาที)"
     _viewInstanceChart:
       title: "วิเคราะห์"
       description: "ดูแผนภูมิอินสแตนซ์ของคุณ"
@@ -1426,14 +1541,14 @@ _achievements:
       title: "คุณอ่านมันจริงๆหรือเปล่า?"
       description: "มีการโต้ตอบกับโน้ตที่มีความยาวมากกว่า 100 ตัวอักษรภายใน 3 วินาทีหลังจากที่โพสต์"
     _clickedClickHere:
-      title: "คลิ๊กที่นี่"
+      title: "คลิกที่นี่"
       description: "คุณได้คลิกที่นี่"
     _justPlainLucky:
       title: "แค่ลัคกี้ธรรมดา"
       description: "มีโอกาสที่จะได้รับด้วยความน่าจะเป็นไปได้ 0.005% ทุก ๆ 10 วินาที"
     _setNameToSyuilo:
-      title: "พระเจ้าคอมเพล็กซ์"
-      description: "ตั้งชื่อของคุณเป็น \"syuilo\""
+      title: "คอมเพล็กซ์ของพระเจ้า"
+      description: "ตั้งชื่อของคุณเป็น “syuilo”"
     _passedSinceAccountCreated1:
       title: "ครบรอบหนึ่งปี"
       description: "ผ่านไปหนึ่งปีแล้วนะตั้งแต่บัญชีของคุณถูกสร้างขึ้นมาน่ะ"
@@ -1453,7 +1568,7 @@ _achievements:
     _cookieClicked:
       title: "เกมที่คุณคลิกที่คุกกี้"
       description: "คลิกคุกกี้"
-      flavor: "เดี๋ยวก่อนนะ คุณอยู่ในเว็บไซต์ที่ถูกต้องแน่อย่างงั้นเหรอ?"
+      flavor: "ใช่หรอ? แน่ใจว่าซอฟต์แวร์ทำงานถูกต้องนะ?"
     _brainDiver:
       title: "Brain Diver"
       description: "โพสต์ลิงก์ไปยัง Brain Diver"
@@ -1461,35 +1576,47 @@ _achievements:
     _smashTestNotificationButton:
       title: "ทดสอบโอเวอร์โฟลว์"
       description: "ทดสอบการแจ้งเตือนทริกเกอร์ซ้ำๆ ภายในระยะเวลาอันสั้นๆ"
+    _tutorialCompleted:
+      title: "ใบรับรองการสำเร็จหลักสูตร Misskey มือใหม่"
+      description: "เสร็จสิ้นการสอนแล้ว"
+    _bubbleGameExplodingHead:
+      title: "🤯"
+      description: "สร้างวัตถุที่ใหญ่ที่สุดในเกมบับเบิ้ล"
+    _bubbleGameDoubleExplodingHead:
+      title: "ดับเบิ้ล"
+      description: "สร้างวัตถุที่ใหญ่ที่สุดในเกมบับเบิ้ลสองชิ้นในเวลาเดียวกัน"
+      flavor: "ปิ่นโตขนาดนี้ น่าจะเพิ่ม　🤯　🤯　เข้าไปนิดหน่อย"
 _role:
   new: "บทบาทใหม่"
   edit: "แก้ไขบทบาท"
   name: "ชื่อบทบาท"
   description: "คำอธิบายบทบาท"
   permission: "สิทธิ์ตามบทบาท"
-  descriptionOfPermission: "<b>ผู้ดูแลกลั่นกรองเนื้อหา</b> สามารถดำเนินการดูแลขั้นพื้นฐานได้นะ\n<b>ผู้ดูแลระบบ</b> สามารถเปลี่ยนการตั้งค่าทั้งหมดของอินสแตนซ์ได้นะ"
+  descriptionOfPermission: "<b>ผู้ควบคุม</b> สามารถดำเนินการดูแลขั้นพื้นฐานได้\n<b>ผู้ดูแลระบบ</b> สามารถเปลี่ยนการตั้งค่าทั้งหมดของอินสแตนซ์ได้"
   assignTarget: "มอบหมาย"
-  descriptionOfAssignTarget: "<b>แมนนวล</b> เพื่อเปลี่ยนผู้ที่เป็นส่วนหนึ่งของบทบาทนี้และใครที่ไม่ใช่ด้วยตนเอง\n<b>เงื่อนไข</b> เพื่อให้ผู้ใช้ได้รับการกำหนดและนำออกจากบทบาทนี้โดยอัตโนมัติตามเงื่อนไขชุดหนึ่ง"
+  descriptionOfAssignTarget: "แบบ<b>ปรับเอง</b> เพิ่มถอนบทบาทนี้แก่ผู้ใช้ด้วยตัวเอง\nแบบ<b>มีเงื่อนไข</b> เพิ่มถอนบทบาทนี้แก่ผู้ใช้โดยอัตโนมัติหากเข้าเงื่อนไขใดต่อไปนี้"
   manual: "ปรับเอง"
+  manualRoles: "บทบาทแบบทำเอง"
   conditional: "มีเงื่อนไข"
+  conditionalRoles: "บทบาทแบบมีเงื่อนไข"
   condition: "เงื่อนไข"
   isConditionalRole: "นี่คือบทบาทที่มีเงื่อนไข"
-  isPublic: "บทบาทสาธารณะ"
-  descriptionOfIsPublic: "ทุกคนสามารถดูได้ว่าผู้ใช้งานนั้นได้รับมอบหมายบทบาทด้วยหรือไม่ \n\nบทบาทจะแสดงในโปรไฟล์ของผู้ใช้ด้วย"
+  isPublic: "ทำให้บทบาทเปิดเผยต่อสาธารณะ"
+  descriptionOfIsPublic: "บทบาทจะปรากฏบนโปรไฟล์ของผู้ใช้และเปิดเผยต่อสาธารณะ (ทุกคนสามารถเห็นได้ว่าผู้ใช้รายนี้มีบทบาทนี้)"
   options: "ตัวเลือกบทบาท"
   policies: "นโยบาย"
-  baseRole: "บทบาทพื้นฐาน"
-  useBaseValue: "ใช้บทบาทพื้นฐานเริ่มต้น"
+  baseRole: "เทมเพลตบทบาท"
+  useBaseValue: "ใช้ตามเทมเพลตบทบาท"
   chooseRoleToAssign: "เลือกบทบาทที่ต้องการกำหนด"
   iconUrl: "ไอคอน URL"
   asBadge: "แสดงเป็นตรา"
-  descriptionOfAsBadge: "ไอคอนของบทบาทนี้จะปรากฏถัดจากชื่อผู้ใช้ของผู้ใช้งานด้วยบทบาทนี้ถ้าหากเปิดใช้งาน"
-  isExplorable: "บทบาทไทม์ไลน์เป็นแบบสาธารณะ"
-  descriptionOfIsExplorable: "ไทม์ไลน์ของบทบาทนี้จะสามารถเข้าถึงได้แบบสาธารณะถ้าหากเปิดใช้งาน เส้นเวลาของบทบาทนั้นจะไม่ถูกเปิดเผยต่อสาธารณะ ถึงแม้ว่าจะไม่เปิดเผยต่อสาธารณะแม้แต่ว่า...จะตั้งค่าไว้ยังไงก็ตาม"
+  descriptionOfAsBadge: "เมื่อเปิดใช้งาน ไอคอนบทบาทจะปรากฏถัดจากชื่อผู้ใช้"
+  isExplorable: "ค้นหาผู้ใช้ได้ง่ายขึ้นโดยดูจากบทบาท"
+  descriptionOfIsExplorable: "เมื่อเปิดใช้งาน ไทมไลน์บทบาทนี้และสมาชิกที่มีบทบาทนี้จะเปิดเผยเป็นสาธารณะ"
   displayOrder: "ตำแหน่ง"
   descriptionOfDisplayOrder: "ยิ่งตัวเลขสูง ตำแหน่ง UI ก็ยิ่งสูงขึ้นนะ"
-  canEditMembersByModerator: "อนุญาตให้ผู้ดูแลแก้ไขสมาชิก"
-  descriptionOfCanEditMembersByModerator: "เมื่อเปิดใช้ ผู้ดูแลนอกเหนือจากผู้ดูแลระบบแล้ว จะสามารถกำหนดและยกเลิกการมอบหมายบทบาทนี้ให้กับผู้ใช้ได้ เมื่อปิด เฉพาะผู้ดูแลระบบเท่านั้นที่จะสามารถกำหนดผู้ใช้ได้นะ"
+  canEditMembersByModerator: "อนุญาตให้ผู้ควบคุมแก้ไขสมาชิก"
+  descriptionOfCanEditMembersByModerator: "เมื่อเปิดใช้ นอกเหนือจากผู้ควบคุมและผู้ดูแลระบบแล้ว จะสามารถเพิ่มถอนบทบาทนี้แก่ผู้ใช้ได้ แต่เมื่อปิดใช้ จะมีเฉพาะผู้ดูแลระบบเท่านั้นที่จะสามารถดำเนินการได้"
   priority: "ลำดับความสำคัญ"
   _priority:
     low: "ต่ำ"
@@ -1498,12 +1625,12 @@ _role:
   _options:
     gtlAvailable: "การดูไทม์ไลน์ทั่วโลก"
     ltlAvailable: "การดูไทม์ไลน์ในท้องถิ่น"
-    canPublicNote: "สามารถส่งโน้ตสาธารณะ"
+    canPublicNote: "สามารถโพสต์แบบสาธารณะ"
     canInvite: "สร้างรหัสเชิญอินสแตนซ์"
     inviteLimit: "จำกัดการเชิญ"
-    inviteLimitCycle: "จำกัดการเชิญไว้คูลดาวน์"
+    inviteLimitCycle: "คูลดาวน์ในการเชิญ"
     inviteExpirationTime: "วันหมดอายุของรหัสการเชิญ"
-    canManageCustomEmojis: "จัดการอีโมจิแบบกำหนดเอง"
+    canManageCustomEmojis: "จัดการเอโมจิที่กำหนดเอง"
     canManageAvatarDecorations: "จัดการตกแต่งอวตาร"
     driveCapacity: "ความจุของไดรฟ์"
     alwaysMarkNsfw: "ทำเครื่องหมายไฟล์ว่าเป็น NSFW เสมอ"
@@ -1515,13 +1642,14 @@ _role:
     noteEachClipsMax: "จำนวนโน้ตสูงสุดภายในคลิป"
     userListMax: "จำนวนรายชื่อผู้ใช้สูงสุด"
     userEachUserListsMax: "จำนวนผู้ใช้สูงสุดภายในรายการผู้ใช้"
-    rateLimitFactor: "ขีดจำกัดอัตรา"
-    descriptionOfRateLimitFactor: "ขีดจํากัดอัตราที่ต่ำกว่ามีข้อจํากัดน้อยกว่าข้อจํากัดที่สูงกว่า"
+    rateLimitFactor: "อัตราการจำกัด"
+    descriptionOfRateLimitFactor: "ยิ่งตัวเลขน้อยก็ยิ่งจำกัดน้อย ยิ่งมากก็ยิ่งเข้มงวดมากขึ้น"
     canHideAds: "ซ่อนโฆษณา"
     canSearchNotes: "การใช้การค้นหาโน้ต"
     canUseTranslator: "การใช้งานแปล"
+    avatarDecorationLimit: "จำนวนการตกแต่งไอคอนสูงสุดที่สามารถติดตั้งได้"
   _condition:
-    isLocal: "ผู้ใช้ภายใน"
+    isLocal: "ผู้ใช้ในพื้นที่"
     isRemote: "ผู้ใช้ระยะไกล"
     createdLessThan: "สร้างน้อยกว่า"
     createdMoreThan: "สร้างมากกว่า"
@@ -1535,10 +1663,10 @@ _role:
     or: "หรือ"
     not: "ไม่"
 _sensitiveMediaDetection:
-  description: "ลดความพยายามในการดูแลเซิร์ฟเวอร์ผ่านการจดจำสื่อ NSFW โดยอัตโนมัติผ่านการเรียนรู้ของเครื่อง การทำสิ่งนี้อาจจะเพิ่มภาระบนเซิร์ฟเวอร์เล็กน้อย"
-  sensitivity: "การตรวจจับความไว"
-  sensitivityDescription: "การลดความไวนั้นจะนำไปสู่การตรวจจับที่ผิดพลาดน้อยลง (ผลบวกที่ผิดพลาด) แต่ในขณะที่การเพิ่มนั้นจะนำไปสู่การตรวจหาที่พลาดน้อยลง (ผลลบเท็จ)"
-  setSensitiveFlagAutomatically: "ทำเครื่องหมายว่าเป็น NSFW"
+  description: "ใช้ Machine Learning เพื่อตรวจจับสื่อที่มีเนื้อหาละเอียดอ่อนโดยอัตโนมัติและใช้เพื่อการกลั่นกรอง ภาระของเซิร์ฟเวอร์จะเพิ่มขึ้นเล็กน้อย"
+  sensitivity: "ความไวในการตรวจจับ"
+  sensitivityDescription: "เมื่อความไวต่ำ Misdetection (ผลบวกลวง) จะลดลง, เมื่อความไวสูง Missed detection (ผลลบลวง) จะลดลง"
+  setSensitiveFlagAutomatically: "ทำเครื่องหมายว่ามีเนื้อหาละเอียดอ่อน"
   setSensitiveFlagAutomaticallyDescription: "ผลลัพธ์ของการตรวจจับภายในนั้นจะยังคงอยู่ ถึงแม้ว่าจะปิดตัวเลือกนี้"
   analyzeVideos: "เปิดใช้งานวิเคราะห์ของวิดีโอ"
   analyzeVideosDescription: "การวิเคราะห์วิดีโอนอกเหนือจากรูปภาพนั้น การทำสิ่งนี้จะทำให้เพิ่มภาระบนเซิร์ฟเวอร์เล็กน้อย"
@@ -1548,18 +1676,19 @@ _emailUnavailable:
   disposable: "ไม่สามารถใช้อีเมลชั่วคราวได้"
   mx: "เซิร์ฟเวอร์อีเมลนี้ไม่ถูกต้อง"
   smtp: "เซิร์ฟเวอร์อีเมลนี้ไม่มีการตอบสนอง"
+  banned: "คุณไม่สามารถลงทะเบียนด้วยที่อยู่อีเมลนี้ได้"
 _ffVisibility:
   public: "เผยแพร่"
   followers: "ปรากฏให้แก่ผู้ติดตามเท่านั้น"
   private: "ส่วนตัว"
 _signup:
-  almostThere: "เกือบจะมี"
-  emailAddressInfo: "โปรดกรอกอีเมลของคุณ มันจะไม่เปิดเผยต่อสาธารณะ"
+  almostThere: "เกือบจะเสร็จแล้ว"
+  emailAddressInfo: "กรุณากรอกที่อยู่อีเมลที่คุณใช้ ที่อยู่อีเมลของคุณจะไม่ถูกเผยแพร่สู่สาธารณชน"
   emailSent: "เราได้ส่งอีเมลยืนยันไปยังที่อยู่อีเมลของคุณแล้วนะ ({email}) โปรดคลิกลิงก์ที่รวมไว้เพื่อสร้างบัญชีให้เสร็จสิ้น"
 _accountDelete:
   accountDelete: "ลบบัญชีผู้ใช้"
   mayTakeTime: "เนื่องจากการลบบัญชีนี้จะเป็นกระบวนการที่ต้องใช้ทรัพยากรมาก จึงอาจจะต้องใช้เวลาสักครู่ถึงจะเสร็จสมบูรณ์ ทั้งนี้ขึ้นอยู่กับจำนวนเนื้อหาที่คุณสร้างและจำนวนไฟล์ที่คุณอัปโหลดนะ"
-  sendEmail: "เมื่อการลบบัญชีนี้เสร็จสิ้น เราอาจจะส่งอีเมลไปยังที่อยู่อีเมลของคุณที่เคยลงทะเบียนไว้กับบัญชีนี้นะ"
+  sendEmail: "เมื่อการลบบัญชีเสร็จสิ้น การแจ้งเตือนจะถูกส่งไปยังที่อยู่อีเมลที่ลงทะเบียนไว้"
   requestAccountDelete: "ร้องขอให้ลบบัญชี"
   started: "การลบได้เริ่มต้นขึ้น"
   inProgress: "ปัจจุบันกำลังดำเนินการลบอยู่"
@@ -1569,7 +1698,9 @@ _ad:
   hide: "ไม่ต้องแสดง"
   timezoneinfo: "วันในสัปดาห์นี้จะถูกกำหนดจากโซนเวลาของเซิร์ฟเวอร์"
   adsSettings: "ตั้งค่าการโฆษณา"
+  notesPerOneAd: "อัปเดตช่วงเวลาตำแหน่งโฆษณาแบบเรียลไทม์ (จำนวนโน้ตต่อโฆษณา)"
   setZeroToDisable: "ตั้งค่านี้ให้เป็น 0 เพื่อปิดใช้งานโฆษณาอัปเดตแบบเรียลไทม์"
+  adsTooClose: "เนื่องจากช่วงเวลาการแสดงโฆษณาสั้นมาก ประสบการณ์ผู้ใช้จึงอาจลดลงอย่างมาก"
 _forgotPassword:
   enterEmail: "ป้อนที่อยู่อีเมลที่คุณเคยใช้ในการลงทะเบียนไว้ ลิงก์ที่คุณสามารถรีเซ็ตรหัสผ่านได้นั้นจะถูกส่งไปนะ"
   ifNoEmail: "ถ้าหากคุณไม่ได้ใช้อีเมลระหว่างการลงทะเบียน กรุณาติดต่อผู้ดูแลระบบอินสแตนซ์แทนนะ"
@@ -1577,8 +1708,8 @@ _forgotPassword:
 _gallery:
   my: "แกลลอรี่ของฉัน"
   liked: "โพสต์ที่ถูกใจ"
-  like: "ชื่นชอบ"
-  unlike: "ลบไลค์"
+  like: "ถูกใจ!"
+  unlike: "เลิกถูกใจ"
 _email:
   _follow:
     title: "ได้ติดตามคุณ"
@@ -1601,7 +1732,7 @@ _preferencesBackups:
   applyConfirm: "คุณต้องการใช้ข้อมูลสำรอง \"{name}\" กับอุปกรณ์นี้อย่างงั้นจริงหรอ การตั้งค่าที่มีอยู่ของอุปกรณ์นี้จะถูกเขียนทับนะ"
   saveConfirm: "บันทึกข้อมูลสำรองเป็น {name} มั้ย?"
   deleteConfirm: "ลบข้อมูลสำรอง {name} มั้ย?"
-  renameConfirm: "เปลี่ยนชื่อข้อมูลสำรองนี้จาก \"{old}\" เป็น \"{new}\" หรือป่าว"
+  renameConfirm: "เปลี่ยนชื่อข้อมูลสำรองนี้จาก \"{old}\" เป็น \"{new}\" หรือไม่?"
   noBackups: "ไม่มีข้อมูลสำรองนะ คุณสามารถสำรองข้อมูลการตั้งค่าไคลเอนต์ของคุณบนเซิร์ฟเวอร์นี้โดยใช้ \"สร้างการสำรองข้อมูลใหม่\"ได้นะ"
   createdAt: "สร้างเมื่อ: {date} {time}"
   updatedAt: "อัปเดตเมื่อ: {date} {time}"
@@ -1622,9 +1753,10 @@ _aboutMisskey:
   donate: "บริจาคให้กับ Misskey"
   morePatrons: " ขอบคุณทุกท่านที่ร่วมกันช่วยเหลือตลอดมานะคะ 🥰"
   patrons: "สมาชิกพันธมิตร"
+  projectMembers: "สมาชิกในโครงการ"
 _displayOfSensitiveMedia:
-  respect: "ซ่อนสื่อทำเครื่องหมายบอกว่าละเอียดอ่อน"
-  ignore: "แสดงผลสื่อทำเครื่องหมายบอกว่าละเอียดอ่อน"
+  respect: "ซ่อนสื่อที่ทำเครื่องหมายว่ามีเนื้อหาละเอียดอ่อน"
+  ignore: "แสดงสื่อที่ทำเครื่องหมายว่ามีเนื้อหาละเอียดอ่อน"
   force: "ซ่อนสื่อทั้งหมด"
 _instanceTicker:
   none: "ไม่ต้องแสดง"
@@ -1635,17 +1767,18 @@ _serverDisconnectedBehavior:
   dialog: "แสดงกล่องโต้ตอบคำเตือน"
   quiet: "แสดงคำเตือนที่ไม่เป็นการรบกวน"
 _channel:
-  create: "สร้างแชนแนลใหม่"
-  edit: "แก้ไขแชนแนล"
+  create: "สร้างช่องใหม่"
+  edit: "แก้ไขช่อง"
   setBanner: "เซตแบนเนอร์"
   removeBanner: "ลบแบนเนอร์"
   featured: "เทรนด์"
   owned: "เจ้าของ"
   following: "ติดตามแล้ว"
   usersCount: "{n} ผู้เข้าร่วม"
-  notesCount: "{n} โน้ต"
+  notesCount: "มี {n} โน้ต"
   nameAndDescription: "ชื่อและคำอธิบาย"
   nameOnly: "ชื่อเท่านั้น"
+  allowRenoteToExternal: "อนุญาตให้รีโน้ตและอ้างอิงนอกช่องได้"
 _menuDisplay:
   sideFull: "ด้านข้าง"
   sideIcon: "ด้านข้าง (ไอคอน)"
@@ -1658,7 +1791,7 @@ _wordMute:
 _instanceMute:
   instanceMuteDescription: "การดำเนินการนี้จะปิดเสียง\"โน้ต/รีโน้ต\"จากอินสแตนซ์ที่อยู่ในรายการ รวมถึงบันทึกของผู้ใช้ที่ตอบกลับผู้ใช้จากอินสแตนซ์ที่ปิดเสียง"
   instanceMuteDescription2: "คั่นด้วยการขึ้นบรรทัดใหม่"
-  title: "ซ่อนโน้ตจากอินสแตนซ์ที่มีอยู่ในรายการ"
+  title: "ซ่อนโน้ตจากอินสแตนซ์ที่มีอยู่ในรายชื่อ"
   heading: "รายชื่ออินสแตนซ์ที่ถูกปิดเสียง"
 _theme:
   explore: "สำรวจธีม"
@@ -1737,6 +1870,14 @@ _sfx:
   notification: "การเเจ้งเตือน"
   antenna: "เสาอากาศ"
   channel: "การแจ้งเตือนช่อง"
+  reaction: "เมื่อเลือกรีแอคชั่น"
+_soundSettings:
+  driveFile: "ใช้เสียงจากไดรฟ์"
+  driveFileWarn: "เลือกไฟล์ในไดรฟ์ของคุณ"
+  driveFileTypeWarn: "ไม่รองรับไฟล์นี้"
+  driveFileTypeWarnDescription: "กรุณาเลือกไฟล์เสียง"
+  driveFileDurationWarn: "เสียงยาวเกินไป"
+  driveFileDurationWarnDescription: "การใช้เสียงที่ยาวอาจรบกวนการใช้งาน Misskey, ต้องการดำเนินการต่อหรือไม่?"
 _ago:
   future: "อนาคต"
   justNow: "เมื่อกี๊นี้"
@@ -1748,6 +1889,14 @@ _ago:
   monthsAgo: "{n} เดือนที่แล้ว"
   yearsAgo: "{n} ปีที่ผ่านมา"
   invalid: "ไม่พบผลลัพธ์"
+_timeIn:
+  seconds: "ใน {n} วินาที"
+  minutes: "ใน {n} นาที"
+  hours: "ใน {n} ชั่วโมง"
+  days: "ใน {n} วัน"
+  weeks: "ใน {n} สัปดาห์"
+  months: "ใน {n} เดือน"
+  years: "ใน {n} ปี"
 _time:
   second: "วินาที"
   minute: "นาที"
@@ -1777,7 +1926,9 @@ _2fa:
   renewTOTPConfirm: "วิธีการแบบนี้จะทําให้รหัสยืนยันจากแอพก่อนหน้าของคุณหยุดทํางานเลยนะ"
   renewTOTPOk: "ตั้งค่าคอนฟิกใหม่"
   renewTOTPCancel: "ไม่เป็นไร"
+  checkBackupCodesBeforeCloseThisWizard: "โปรดตรวจสอบรหัสสำรองด้านล่างก่อนที่จะปิดวิซาร์ดนี้"
   backupCodes: "รหัสสำรองข้อมูล"
+  backupCodesDescription: "หากแอปยืนยันตัวตนของคุณไม่พร้อมใช้งาน คุณสามารถใช้รหัสสำรองด้านล่างเพื่อเข้าถึงบัญชีของคุณได้ อย่าลืมเก็บรหัสเหล่านี้ไว้ในที่ปลอดภัย แต่ละรหัสสามารถใช้ได้เพียงครั้งเดียวเท่านั้น"
   backupCodeUsedWarning: "มีการใช้รหัสสำรองแล้ว โปรดกรุณากำหนดค่าการตรวจสอบสิทธิ์แบบสองปัจจัยโดยเร็วที่สุดถ้าหากคุณยังไม่สามารถใช้งานได้อีก"
   backupCodesExhaustedWarning: "รหัสสำรองทั้งหมดถูกใช้แล้ว ถ้าหากคุณยังสูญเสียการเข้าถึงแอปการตรวจสอบสิทธิ์แบบสองปัจจัยคุณจะยังไม่สามารถเข้าถึงบัญชีนี้ได้ กรุณากำหนดค่าการรับรองความถูกต้องด้วยการยืนยันสองชั้น"
 _permissions:
@@ -1798,29 +1949,78 @@ _permissions:
   "write:notes": "เขียนหรือลบโน้ต"
   "read:notifications": "ดูการแจ้งเตือนของคุณ"
   "write:notifications": "จัดการแจ้งเตือนของคุณ"
-  "read:reactions": "ดูปฏิกิริยาของคุณ"
-  "write:reactions": "แก้ไขปฏิกิริยาของคุณ"
+  "read:reactions": "ดูรีแอคชั่นของคุณ"
+  "write:reactions": "แก้ไขรีแอคชั่นของคุณ"
   "write:votes": "โหวตบนสำรวจความคิดเห็น"
-  "read:pages": "ดูหน้า"
+  "read:pages": "ดหน้าเพจ"
   "write:pages": "แก้ไขหรือลบเพจของคุณ"
-  "read:page-likes": "ดูไลค์ของคุณบนเพจ"
-  "write:page-likes": "แก้ไขการถูกใจของคุณบนเพจ"
+  "read:page-likes": "ดูรายการเพจที่ถูกใจไว้"
+  "write:page-likes": "แก้ไขรายการเพจที่ถูกใจ"
   "read:user-groups": "ดูกลุ่มผู้ใช้ของคุณ"
   "write:user-groups": "แก้ไขหรือลบกลุ่มผู้ใช้ของคุณ"
   "read:channels": "ดูแชนแนลของคุณ"
   "write:channels": "แก้ไขแชนแนลของคุณ"
   "read:gallery": "ดูแกลเลอรี่"
   "write:gallery": "แก้ไขแกลเลอรี่ของคุณ"
-  "read:gallery-likes": "ดูรายการโพสต์ในแกลเลอรีที่ชอบของคุณ"
-  "write:gallery-likes": "แก้ไขรายการโพสต์ในแกลเลอรีที่ชอบของคุณ"
+  "read:gallery-likes": "ดูรายการโพสต์แกลเลอรีที่ถูกใจไว้"
+  "write:gallery-likes": "แก้ไขรายการโพสต์แกลเลอรีที่ถูกใจไว้"
   "read:flash": "วิว เพลย์"
   "write:flash": "แก้ไขเพลย์"
-  "read:flash-likes": "ดูรายชื่อของไลค์ เพลย์"
-  "write:flash-likes": "แก้ไขรายชื่อของไลค์ เพลย์"
+  "read:flash-likes": "ดูรายการ  play ที่ถูกใจไว้"
+  "write:flash-likes": "แก้ไขรายการ play ที่ถูกใจไว้"
+  "read:admin:abuse-user-reports": "ดูรายงานจากผู้ใช้"
+  "write:admin:delete-account": "ลบบัญชีผู้ใช้"
+  "write:admin:delete-all-files-of-a-user": "ลบไฟล์ทั้งหมดของผู้ใช้"
+  "read:admin:index-stats": "ดูข้อมูลเกี่ยวกับดัชนีฐานข้อมูล"
+  "read:admin:table-stats": "ดูข้อมูลเกี่ยวกับตารางฐานข้อมูล"
+  "read:admin:user-ips": "ดูที่อยู่ IP ของผู้ใช้"
+  "read:admin:meta": "ดูข้อมูลเมตาของอินสแตนซ์"
+  "write:admin:reset-password": "รีเซ็ตรหัสผ่านของผู้ใช้"
+  "write:admin:resolve-abuse-user-report": "แก้ไขรายงานจากผู้ใช้"
+  "write:admin:send-email": "ส่งอีเมล"
+  "read:admin:server-info": "ดูข้อมูลเซิร์ฟเวอร์"
+  "read:admin:show-moderation-log": "ดูปูมการแก้ไข"
+  "read:admin:show-user": "ดูข้อมูลส่วนตัวของผู้ใช้"
+  "read:admin:show-users": "ดูข้อมูลส่วนตัวของผู้ใช้"
+  "write:admin:suspend-user": "ระงับผู้ใช้"
+  "write:admin:unset-user-avatar": "ลบอวตารผู้ใช้"
+  "write:admin:unset-user-banner": "ลบแบนเนอร์ผู้ใช้"
+  "write:admin:unsuspend-user": "ยกเลิกการระงับผู้ใช้"
+  "write:admin:meta": "จัดการข้อมูลเมตาของอินสแตนซ์"
+  "write:admin:user-note": "จัดการโน้ตการกลั่นกรอง"
+  "write:admin:roles": "จัดการบทบาท"
+  "read:admin:roles": "ดูบทบาท"
+  "write:admin:relays": "จัดการรีเลย์"
+  "read:admin:relays": "ดูรีเลย์"
+  "write:admin:invite-codes": "จัดการคำเชิญ"
+  "read:admin:invite-codes": "ดูรหัสคำเชิญ"
+  "write:admin:announcements": "จัดการประกาศ"
+  "read:admin:announcements": "ดูประกาศ"
+  "write:admin:avatar-decorations": "จัดการการตกแต่งอวตาร"
+  "read:admin:avatar-decorations": "ดูการตกแต่งอวตาร"
+  "write:admin:federation": "จัดการข้อมูลเกี่ยวกับสหพันธ์"
+  "write:admin:account": "จัดการบัญชีผู้ใช้"
+  "read:admin:account": "ดูข้อมูลเกี่ยวกับผู้ใช้"
+  "write:admin:emoji": "จัดการเอโมจิ"
+  "read:admin:emoji": "ดูเอโมจิ"
+  "write:admin:queue": "จัดการคิวงาน"
+  "read:admin:queue": "ดูข้อมูลเกี่ยวกับคิวงาน"
+  "write:admin:promo": "จัดการโน้ตโปรโมชั่น"
+  "write:admin:drive": "จัดการไดรฟ์ของผู้ใช้"
+  "read:admin:drive": "ดูข้อมูลเกี่ยวกับไดรฟ์ของผู้ใช้"
+  "read:admin:stream": "ใช้ Websocket API สำหรับผู้ดูแลระบบ"
+  "write:admin:ad": "จัดการโฆษณา"
+  "read:admin:ad": "ดูโฆษณา"
+  "write:invite-codes": "สร้างรหัสคำเชิญ"
+  "read:invite-codes": "รับรหัสเชิญ"
+  "write:clip-favorite": "ควบคุมการถูกใจของคลิป"
+  "read:clip-favorite": "ดูการถูกใจของคลิป"
+  "read:federation": "รับข้อมูลเกี่ยวกับสหพันธ์"
+  "write:report-abuse": "รายงานการละเมิด"
 _auth:
   shareAccessTitle: "การให้สิทธิ์แอปพลิเคชัน"
   shareAccess: "คุณต้องการอนุญาตให้ \"{name}\" เข้าถึงบัญชีนี้เลยมั้ย?"
-  shareAccessAsk: "คุณแน่ใจแล้วจริงๆหรอว่าต้องการอนุญาตให้แอปพลิเคชันนี้เข้าถึงบัญชีของคุณแน่ใจแล้วหรอ?"
+  shareAccessAsk: "ต้องการอนุญาตให้แอปพลิเคชันนี้เข้าถึงบัญชีของคุณหรือไม่?"
   permission: "{name} ได้ขอสิทธิ์การเข้าถึงดังต่อไปนี้"
   permissionAsk: "แอปพลิเคชันนี้ขอสิทธิ์ดังต่อไปนี้"
   pleaseGoBack: "กรุณากลับไปที่แอปพลิเคชัน"
@@ -1856,7 +2056,7 @@ _widgets:
   photos: "รูปภาพ"
   digitalClock: "นาฬิกาดิจิตอล"
   unixClock: "นาฬิกา UNIX"
-  federation: "Fediration"
+  federation: "สหพันธ์"
   instanceCloud: "อินสแตนซ์คลาวด์"
   postForm: "แบบฟอร์มการโพสต์"
   slideshow: "แสดงภาพนิ่ง"
@@ -1869,8 +2069,9 @@ _widgets:
   aichan: "ไอ"
   userList: "รายชื่อผู้ใช้"
   _userList:
-    chooseList: "เลือกรายการ"
+    chooseList: "เลือกรายชื่อ"
   clicker: "คลิกเกอร์"
+  birthdayFollowings: "วันเกิดผู้ใช้ในวันนี้"
 _cw:
   hide: "ซ่อน"
   show: "โหลดเพิ่มเติม"
@@ -1894,7 +2095,7 @@ _poll:
   showResult: "ดูผลลัพธ์"
   voted: "โหวตแล้ว"
   closed: "สิ้นสุดแล้ว"
-  remainingDays: "{d} วัน(s) {h} ชั่วโมง(s) ที่เหลืออยู่"
+  remainingDays: "จะเสร็จสิ้นในอีก {d} วัน {h} ชั่วโมง"
   remainingHours: "{h} ชั่วโมง(s) {m} นาที(s) ที่เหลืออยู่"
   remainingMinutes: "{m} นาที(s) {s} วินาที(s) ที่เหลืออยู่"
   remainingSeconds: "{s} นาที(s) ที่เหลืออยู่"
@@ -1907,7 +2108,7 @@ _visibility:
   followersDescription: "ทำให้ผู้ติดตามนั้นมองเห็นแค่คุณเท่านั้น"
   specified: "ไดเร็ค"
   specifiedDescription: "ทำให้มองเห็นได้เฉพาะผู้ใช้ที่ระบุเท่านั้น"
-  disableFederation: "ไม่มีสหภาพ"
+  disableFederation: "ไม่มีสหพันธ์"
   disableFederationDescription: "อย่าส่งไปยังอินสแตนซ์อื่น"
 _postForm:
   replyPlaceholder: "ตอบกลับโน้ตนี้..."
@@ -1923,8 +2124,8 @@ _postForm:
 _profile:
   name: "ชื่อ"
   username: "ชื่อผู้ใช้"
-  description: "ประวัติ"
-  youCanIncludeHashtags: "คุณยังสามารถใส่แฮชแท็กในประวัติของคุณได้นะ"
+  description: "แนะนำตัว"
+  youCanIncludeHashtags: "คุณสามารถใส่แฮชแท็กในส่วนแนะนำตัวของคุณได้"
   metadata: "ข้อมูลเพิ่มเติม"
   metadataEdit: "แก้ไขข้อมูลเพิ่มเติม"
   metadataDescription: "ใช้สิ่งเหล่านี้ คุณสามารถแสดงฟิลด์ข้อมูลเพิ่มเติมในโปรไฟล์ของคุณ"
@@ -1933,13 +2134,15 @@ _profile:
   changeAvatar: "เปลี่ยนอวาตาร์"
   changeBanner: "เปลี่ยนแบนเนอร์"
   verifiedLinkDescription: "โดยการป้อน URL ที่มีลิงก์ไปยังโปรไฟล์ของคุณตรงนี้ ส่วนไอคอนการยืนยันความเป็นเจ้าของนั้นก็สามารถแสดงถัดจากฟิลด์ได้นะ"
+  avatarDecorationMax: "คุณสามารถเพิ่มการตกแต่งได้สูงสุด {max}"
 _exportOrImport:
   allNotes: "โน้ตทั้งหมด"
   favoritedNotes: "บันทึกที่ชื่นชอบ"
+  clips: "คลิป"
   followingList: "กำลังติดตาม"
   muteList: "ปิดเสียง"
   blockingList: "บล็อค"
-  userLists: "รายการ"
+  userLists: "รายชื่อ"
   excludeMutingUsers: "ยกเว้นผู้ใช้ที่ปิดเสียง"
   excludeInactiveUsers: "ยกเว้นผู้ใช้ที่ไม่ได้ใช้งาน"
   withReplies: "รวมการตอบกลับจากผู้ใช้ที่นำเข้าไว้ในไทม์ไลน์"
@@ -1975,16 +2178,16 @@ _timelines:
   social: "โซเชี่ยล"
   global: "ทั่วโลก"
 _play:
-  new: "สร้างการเล่น"
-  edit: "แก้ไขเล่น"
-  created: "สร้างการเล่นแล้ว"
-  updated: "แก้ไขการเล่นแล้ว"
-  deleted: "ลบการเล่นแล้ว"
-  pageSetting: "ตั้งค่าการเล่น"
+  new: "สร้าง Play"
+  edit: "แก้ไข Play"
+  created: "สร้าง Play แล้ว"
+  updated: "แก้ไข Play แล้ว"
+  deleted: "ลบ Play แล้ว"
+  pageSetting: "ตั้งค่า Play"
   editThisPage: "แก้ไข Play นี้"
   viewSource: "ดูต้นฉบับ"
-  my: "มาย เพลย์"
-  liked: "ไลค์ เพลย์"
+  my: "Play ของฉัน"
+  liked: "Play ที่ถูกใจไว้"
   featured: "เป็นที่นิยม"
   title: "หัวข้อ"
   script: "สคริปต์"
@@ -1996,15 +2199,15 @@ _pages:
   created: "สร้างหน้าเพจสำเร็จเรียบร้อยแล้ว"
   updated: "แก้ไขหน้าเพจสำเร็จเรียบร้อยแล้ว"
   deleted: "ลบหน้าเพจสำเร็จเรียบร้อยแล้ว"
-  pageSetting: "การตั้งค่าหน้า"
+  pageSetting: "การตั้งค่าหน้าเพจ"
   nameAlreadyExists: "URL ของหน้าที่ระบุนั้นมีอยู่แล้ว"
   invalidNameTitle: "URL ของหน้าที่ระบุนั้นไม่ถูกต้อง"
   invalidNameText: "ตรวจสอบให้แน่ใจนะว่าชื่อหน้าไม่ว่างเปล่า"
   editThisPage: "แก้ไขเพจนี้"
   viewSource: "ดูต้นฉบับ"
-  viewPage: "ดูหน้า"
+  viewPage: "ดูหน้าเพจ"
   like: "ถูกใจ"
-  unlike: "ลบไลค์"
+  unlike: "เลิกถูกใจ"
   my: "หน้าเพจของฉัน"
   liked: "หน้าเพจที่ถูกใจ"
   featured: "เป็นที่นิยม"
@@ -2025,7 +2228,7 @@ _pages:
   chooseBlock: "เพิ่มบล็อค"
   selectType: "เลือกชนิด"
   contentBlocks: "เนื้อหา"
-  inputBlocks: "อินพุต"
+  inputBlocks: "ป้อนข้อมูล"
   specialBlocks: "พิเศษ"
   blocks:
     text: "ข้อความ"
@@ -2054,12 +2257,16 @@ _notification:
   pollEnded: "โพลสำรวจความคิดเห็นผลลัพธ์มีพร้อมใช้งาน"
   newNote: "โพสต์ใหม่"
   unreadAntennaNote: "เสาอากาศ {name}"
+  roleAssigned: "ได้รับบทบาท"
   emptyPushNotificationMessage: "การแจ้งเตือนแบบพุชได้รับการอัพเดทแล้ว"
   achievementEarned: "รับความสำเร็จ"
   testNotification: "ทดสอบการแจ้งเตือน"
-  checkNotificationBehavior: "ตรวจสอบลักษณะที่ปรากฏการแจ้งเตือน"
+  checkNotificationBehavior: "กดเพื่อดูลักษณะการแจ้งเตือน"
   sendTestNotification: "ส่งทดสอบการแจ้งเตือน"
   notificationWillBeDisplayedLikeThis: "การแจ้งเตือนมีลักษณะแบบนี้"
+  reactedBySomeUsers: "ถูกรีแอคชั่นโดยผู้ใช้ {n} ราย"
+  renotedBySomeUsers: "Renote จากผู้ใช้จำนวน {n} ราย"
+  followedBySomeUsers: "มีผู้ติดตาม {n} ราย"
   _types:
     all: "ทั้งหมด"
     note: "โน้ตใหม่"
@@ -2072,6 +2279,7 @@ _notification:
     pollEnded: "โพลนี้สิ้นสุดลงแล้ว"
     receiveFollowRequest: "ได้รับคำขอติดตาม\n"
     followRequestAccepted: "ยอมรับคำขอติดตาม"
+    roleAssigned: "ให้บทบาท"
     achievementEarned: "ปลดล็อกความสำเร็จแล้ว"
     app: "การแจ้งเตือนจากแอปที่มีลิงก์"
   _actions:
@@ -2105,7 +2313,7 @@ _deck:
     tl: "ไทม์ไลน์"
     antenna: "เสาอากาศ"
     list: "รายการ"
-    channel: "แชนแนล"
+    channel: "ช่อง"
     mentions: "พูดถึง"
     direct: "ไดเร็ค"
     roleTimeline: "บทบาทไทม์ไลน์"
@@ -2140,9 +2348,9 @@ _moderationLogTypes:
   unassignRole: "ถอดออกจากบทบาทแล้ว"
   suspend: "ถูกระงับ"
   unsuspend: "เลิกถูกระงับ"
-  addCustomEmoji: "เพิ่มอีโมจิที่กำหนดเองแล้ว"
-  updateCustomEmoji: "อัปเดตอีโมจิที่กำหนดเองแล้ว"
-  deleteCustomEmoji: "ลบอีโมจิที่กำหนดเองออกแล้ว"
+  addCustomEmoji: "เพิ่มเอโมจิที่กำหนดเองแล้ว"
+  updateCustomEmoji: "อัปเดตเอโมจิที่กำหนดเองแล้ว"
+  deleteCustomEmoji: "ลบเอโมจิที่กำหนดเองออกแล้ว"
   updateServerSettings: "อัปเดตการตั้งค่าเซิร์ฟเวอร์แล้ว"
   updateUserNote: "อัปเดตโน้ตการกลั่นกรองแล้ว"
   deleteDriveFile: "ลบไฟล์ออกแล้ว"
@@ -2156,13 +2364,18 @@ _moderationLogTypes:
   resetPassword: "รีเซ็ตรหัสผ่าน"
   suspendRemoteInstance: "อินสแตนซ์ระยะไกลถูกระงับ"
   unsuspendRemoteInstance: "อินสแตนซ์ระยะไกลเลิกการระงับ"
-  markSensitiveDriveFile: "ทำเครื่องหมายไฟล์บอกว่าละเอียดอ่อน"
-  unmarkSensitiveDriveFile: "ยกเลิกทำเครื่องหมายไฟล์ว่าละเอียดอ่อน"
+  markSensitiveDriveFile: "ทำเครื่องหมายไฟล์ว่ามีเนื้อหาละเอียดอ่อน"
+  unmarkSensitiveDriveFile: "ยกเลิกทำเครื่องหมายไฟล์ว่ามีเนื้อหาละเอียดอ่อน"
   resolveAbuseReport: "รายงานได้รับการแก้ไขแล้ว"
   createInvitation: "สร้างคำเชิญ"
   createAd: "สร้างโฆษณาแล้ว"
   deleteAd: "ลบโฆษณาออกแล้ว"
   updateAd: "อัปเดตโฆษณาแล้ว"
+  createAvatarDecoration: "สร้างการตกแต่งไอคอนแล้ว"
+  updateAvatarDecoration: "อัปเดตการตกแต่งไอคอนแล้ว"
+  deleteAvatarDecoration: "ลบการตกแต่งไอคอนแล้ว"
+  unsetUserAvatar: "ลบไอคอนผู้ใช้"
+  unsetUserBanner: "ลบแบนเนอร์ผู้ใช้"
 _fileViewer:
   title: "รายละเอียดไฟล์"
   type: "ประเภทไฟล์"
@@ -2172,14 +2385,58 @@ _fileViewer:
   attachedNotes: "โน้ตที่แนบมาด้วย"
   thisPageCanBeSeenFromTheAuthor: "หน้าเพจนี้จะสามารถปรากฏได้โดยผู้ใช้ที่อัปโหลดไฟล์นี้เท่านั้น"
 _externalResourceInstaller:
+  title: "ติดตั้งจากไซต์ภายนอก"
+  checkVendorBeforeInstall: "โปรดตรวจสอบให้แน่ใจว่าแหล่งแจกหน่ายมีความน่าเชื่อถือก่อนทำการติดตั้ง"
   _plugin:
+    title: "ต้องการติดตั้งปลั๊กอินนี้หรือไม่?"
     metaTitle: "ข้อมูลส่วนเสริม"
   _theme:
+    title: "ต้องการติดตั้งธีมนี้หรือไม่?"
     metaTitle: "ข้อมูลธีม"
+  _meta:
+    base: "โทนสีพื้นฐาน"
   _vendorInfo:
     title: "ข้อมูลผู้จัดจำหน่าย"
+    endpoint: "จุดอ้างอิงปลายทาง (Referenced endpoint)"
+    hashVerify: "การตรวจสอบแฮช (ความสมบูรณ์ของไฟล์)"
   _errors:
+    _invalidParams:
+      title: "พารามิเตอร์ไม่ถูกต้อง"
+      description: "มีสารสนเทศไม่เพียงพอที่จะโหลดข้อมูลจากไซต์ภายนอก โปรดยืนยัน URL ที่ป้อน"
+    _resourceTypeNotSupported:
+      title: "ไม่รองรับทรัพยากรภายนอกนี้"
+      description: "ไม่รองรับประเภทของทรัพยากรภายนอกนี้ โปรดติดต่อผู้ดูแลเว็บไซต์"
+    _failedToFetch:
+      title: "รับข้อมูลล้มเหลว"
+      fetchErrorDescription: "เกิดข้อผิดพลาดในการสื่อสารกับไซต์ภายนอก หากการลองอีกครั้งไม่สามารถแก้ไขปัญหานี้ได้ โปรดติดต่อผู้ดูแลไซต์"
+      parseErrorDescription: "เกิดข้อผิดพลาดในการประมวลผลข้อมูลที่โหลดจากไซต์ภายนอก โปรดติดต่อผู้ดูแลเว็บไซต์"
+    _hashUnmatched:
+      title: "การยืนยัน/ตรวจสอบข้อมูลล้มเหลว"
+      description: "เกิดข้อผิดพลาดในการตรวจสอบความสมบูรณ์ของข้อมูลที่ดึงมา เพื่อเป็นมาตรการรักษาความปลอดภัย การติดตั้งไม่สามารถดำเนินการต่อได้ โปรดติดต่อผู้ดูแลเว็บไซต์"
     _pluginParseFailed:
       title: "ข้อผิดพลาด AiScript"
+      description: "ดึงข้อมูลที่ร้องขอสำเร็จแล้ว แต่มีข้อผิดพลาดเกิดขึ้นระหว่างการแยกวิเคราะห์ AiScript โปรดติดต่อผู้เขียนปลั๊กอิน รายละเอียดข้อผิดพลาดสามารถดูได้ในคอนโซล Javascript"
+    _pluginInstallFailed:
+      title: "ติดตั้งปลั๊กอินล้มเหลว"
+      description: "เกิดปัญหาขณะติดตั้งปลั๊กอิน กรุณาลองอีกครั้ง. โปรดดูคอนโซล Javascript สำหรับรายละเอียดข้อผิดพลาด"
     _themeParseFailed:
       title: "การแยกวิเคราะห์ธีมล้มเหลว"
+      description: "ดึงข้อมูลที่ร้องขอสำเร็จแล้ว แต่มีข้อผิดพลาดเกิดขึ้นระหว่างการแยกวิเคราะห์ธีม โปรดติดต่อผู้เขียนธีม รายละเอียดข้อผิดพลาดสามารถดูได้ในคอนโซล Javascript"
+    _themeInstallFailed:
+      title: "ติดตั้งธีมล้มเหลว"
+      description: "เกิดปัญหาระหว่างการติดตั้งธีม กรุณาลองอีกครั้ง. รายละเอียดข้อผิดพลาดสามารถดูได้ในคอนโซล Javascript"
+_dataSaver:
+  _media:
+    title: "โหลดมีเดีย"
+    description: "กันไม่ให้ภาพและวิดีโอโหลดโดยอัตโนมัติ แตะรูปภาพ/วิดีโอที่ซ่อนอยู่เพื่อโหลด"
+  _avatar:
+    title: "รูปไอคอน"
+    description: "ระงับการเคลื่อนไหวของภาพไอคอน ภาพเคลื่อนไหวอาจมีขนาดไฟล์ใหญ่กว่าภาพปกติ ดังนั้นจึงสามารถช่วยในการลดการใช้ข้อมูล"
+  _urlPreview:
+    title: "ธัมบ์เนลแสดงตัวอย่าง URL"
+    description: "ธัมบ์เนลแสดงตัวอย่าง URL จะไม่โหลดโดยอัตโนมัติ"
+  _code:
+    title: "ไฮไลต์โค้ด"
+    description: "หากใช้สัญลักษณ์ไฮไลต์โค้ดใน MFM ฯลฯ สัญลักษณ์เหล่านั้นจะไม่โหลดจนกว่าจะแตะ การไฮไลต์ไวยากรณ์(syntax)จำเป็นต้องดาวน์โหลดไฟล์คำจำกัดความของไฮไลต์สำหรับแต่ละภาษา ดังนั้นการปิดใช้งานการโหลดไฟล์เหล่านี้โดยอัตโนมัติจึงคาดว่าจะช่วยลดปริมาณข้อมูลการสื่อสารได้"
+_reversi:
+  total: "รวมทั้งหมด"
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index 9b609edebb..bc1dc419e9 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -352,6 +352,8 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "Увімкнути hCaptcha"
 hcaptchaSiteKey: "Ключ сайту"
 hcaptchaSecretKey: "Секретний ключ"
+mcaptchaSiteKey: "Ключ сайту"
+mcaptchaSecretKey: "Секретний ключ"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Увімкнути reCAPTCHA"
 recaptchaSiteKey: "Ключ сайту"
@@ -910,6 +912,7 @@ icon: "Аватар"
 replies: "Відповісти"
 renotes: "Поширити"
 flip: "Перевернути"
+lastNDays: "Останні {n} днів"
 _achievements:
   earnedAt: "Відкрито"
   _types:
@@ -1468,6 +1471,7 @@ _profile:
   changeBanner: "Змінити банер"
 _exportOrImport:
   allNotes: "Всі нотатки"
+  clips: "Добірка"
   followingList: "Підписки"
   muteList: "Ігнорувати"
   blockingList: "Заблокувати"
@@ -1616,3 +1620,5 @@ _webhookSettings:
 _moderationLogTypes:
   suspend: "Призупинити"
   resetPassword: "Скинути пароль"
+_reversi:
+  total: "Всього"
diff --git a/locales/uz-UZ.yml b/locales/uz-UZ.yml
index 54e20b001d..809e785492 100644
--- a/locales/uz-UZ.yml
+++ b/locales/uz-UZ.yml
@@ -366,6 +366,8 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "hCaptchani yoqish"
 hcaptchaSiteKey: "Sayt kaliti"
 hcaptchaSecretKey: "Mahfiy kalit"
+mcaptchaSiteKey: "Sayt kaliti"
+mcaptchaSecretKey: "Maxfiy kalit"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "reCAPTCHA ni yoqish"
 recaptchaSiteKey: "Sayt kaliti"
@@ -973,6 +975,7 @@ _profile:
   changeBanner: "Bannerni o'zgartirish"
 _exportOrImport:
   allNotes: "Barcha qaydlar"
+  clips: "Klip"
   followingList: "Obuna bo‘lish"
   muteList: "Ovozni o‘chirish"
   blockingList: "Bloklangan foydalanuvchilar"
@@ -1085,3 +1088,5 @@ _webhookSettings:
 _moderationLogTypes:
   suspend: "To'xtatish"
   resetPassword: "Parolni tiklash"
+_reversi:
+  total: "Jami"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index c2d68d8b27..43db0d246c 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -368,6 +368,8 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "Bật hCaptcha"
 hcaptchaSiteKey: "Khóa của trang"
 hcaptchaSecretKey: "Khóa bí mật"
+mcaptchaSiteKey: "Khóa của trang"
+mcaptchaSecretKey: "Khóa bí mật"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Bật reCAPTCHA"
 recaptchaSiteKey: "Khóa của trang"
@@ -1044,6 +1046,7 @@ pinnedList: "Các mục đã được ghim"
 keepScreenOn: "Giữ màn hình luôn bật"
 verifiedLink: "Chúng tôi đã xác nhận bạn là chủ sở hữu của đường dẫn này"
 flip: "Lật"
+lastNDays: "{n} ngày trước"
 _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ó."
@@ -1669,6 +1672,7 @@ _profile:
 _exportOrImport:
   allNotes: "Toàn bộ tút"
   favoritedNotes: "Bài viết đã thích"
+  clips: "Lưu bài viết"
   followingList: "Đang theo dõi"
   muteList: "Ẩn"
   blockingList: "Chặn"
@@ -1846,3 +1850,5 @@ _webhookSettings:
 _moderationLogTypes:
   suspend: "Vô hiệu hóa"
   resetPassword: "Đặt lại mật khẩu"
+_reversi:
+  total: "Tổng cộng"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index bfacc03e0a..2f04920556 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -121,14 +121,21 @@ sensitive: "敏感内容"
 add: "添加"
 reaction: "回应"
 reactions: "回应"
+emojiPicker: "表情符号选择器"
+pinnedEmojisForReactionSettingDescription: "可以设置发表回应时置顶显示的表情符号"
+pinnedEmojisSettingDescription: "可以设置输入表情符号时置顶显示的表情符号"
+emojiPickerDisplay: "选择器显示设置"
+overwriteFromPinnedEmojisForReaction: "从「置顶（回应）」设置覆盖"
+overwriteFromPinnedEmojis: "从全局设置覆盖"
 reactionSettingDescription2: "拖动重新排序，单击删除，点击 + 添加。"
 rememberNoteVisibility: "保存上次设置的可见性"
 attachCancel: "删除附件"
+deleteFile: "删除文件"
 markAsSensitive: "标记为敏感内容"
 unmarkAsSensitive: "取消标记为敏感内容"
 enterFileName: "输入文件名"
 mute: "屏蔽"
-unmute: "解除屏蔽"
+unmute: "解除静音"
 renoteMute: "屏蔽转帖"
 renoteUnmute: "解除屏蔽转帖"
 block: "拉黑"
@@ -209,15 +216,15 @@ instanceInfo: "服务器信息"
 statistics: "统计"
 clearQueue: "清除队列"
 clearQueueConfirmTitle: "确定清除队列？"
-clearQueueConfirmText: "未送达的帖子将不会投递。 通常，您不需要这样做。"
+clearQueueConfirmText: "未送达的帖子将不会被投递。 通常无需执行此操作。"
 clearCachedFiles: "清除缓存"
-clearCachedFilesConfirm: "确定要清除缓存文件？"
+clearCachedFilesConfirm: "确定要清除所有缓存的远程文件？"
 blockedInstances: "被封锁的服务器"
 blockedInstancesDescription: "设定要封锁的服务器，以换行来进行分割。被封锁的服务器将无法与本服务器进行交换通讯。子域名也同样会被封锁。"
-silencedInstances: "沉默的服务器"
-silencedInstancesDescription: "设置要静音的服务器的主机，以换行符分隔。属于静默服务器的所有帐户都将被视为“静默”，所有关注都将成为请求，并且您将无法提及非关注者的本地帐户。被阻止的实例不受影响。"
-muteAndBlock: "屏蔽/拉黑"
-mutedUsers: "已屏蔽用户"
+silencedInstances: "被静音的服务器"
+silencedInstancesDescription: "设置要静音的服务器，以换行符分隔。被静音的服务器内所有的账户将默认处于「静音」状态，仅能发送关注请求，并且在未关注状态下无法提及本地账户。被阻止的实例不受影响。"
+muteAndBlock: "静音/拉黑"
+mutedUsers: "已静音用户"
 blockedUsers: "已拉黑的用户"
 noUsers: "无用户"
 editProfile: "编辑资料"
@@ -260,6 +267,7 @@ removed: "已删除"
 removeAreYouSure: "要删掉「{x}」吗？"
 deleteAreYouSure: "要删掉「{x}」吗？"
 resetAreYouSure: "恢复默认设置？"
+areYouSure: "你确定吗？"
 saved: "已保存"
 messaging: "聊天"
 upload: "本地上传"
@@ -352,7 +360,7 @@ connectService: "连接"
 disconnectService: "断开连接"
 enableLocalTimeline: "启用本地时间线"
 enableGlobalTimeline: "启用全局时间线"
-disablingTimelinesInfo: "即使时间线功能被禁用，出于方便，管理员和协作者也可以继续使用。"
+disablingTimelinesInfo: "即使时间线功能被禁用，出于方便，管理员和监察员也可以继续使用。"
 registration: "注册"
 enableRegistration: "允许任何人注册"
 invite: "邀请"
@@ -372,15 +380,20 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "启用 hCaptcha"
 hcaptchaSiteKey: "网站密钥"
 hcaptchaSecretKey: "hCaptcha 密钥(SecretKey)"
+mcaptcha: "mCaptcha"
+enableMcaptcha: "启用 mCaptcha"
+mcaptchaSiteKey: "网站密钥"
+mcaptchaSecretKey: "mCaptcha 密钥(SecretKey)"
+mcaptchaInstanceUrl: "mCaptcha 实例地址"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "启用 reCAPTCHA\n(请注意, 此功能在中国大陆不可用. 如果启用, 可能导致无法正常使用登录或注册等功能)"
 recaptchaSiteKey: "网站密钥"
-recaptchaSecretKey: "reCAPTCHA 密钥(SecretKey)"
+recaptchaSecretKey: "mCaptcha 密钥(SecretKey)"
 turnstile: "Turnstile"
 enableTurnstile: "启用 Turnstile"
 turnstileSiteKey: "网站密钥"
 turnstileSecretKey: "Turnstile 密钥(SecretKey)"
-avoidMultiCaptchaConfirm: "使用多种验证方式可能会造成干扰，您要禁用其他验证方式吗？您可以按“取消”按钮，继续保持启用多种验证方式。"
+avoidMultiCaptchaConfirm: "使用多个 Captcha 可能会互相干扰，您要禁用其它 Captcha 吗？您可以按“取消”按钮，继续保持启用多种验证方式。"
 antennas: "天线"
 manageAntennas: "天线管理"
 name: "名称"
@@ -477,7 +490,7 @@ or: "或者"
 language: "语言"
 uiLanguage: "显示语言"
 aboutX: "关于 {x}"
-emojiStyle: "emoji 的样式"
+emojiStyle: "表情符号的样式"
 native: "原生"
 disableDrawer: "不显示抽屉菜单"
 showNoteActionsOnlyHover: "仅在悬停时显示帖子操作"
@@ -514,7 +527,7 @@ showFeaturedNotesInTimeline: "在时间线上显示热门推荐"
 objectStorage: "对象存储"
 useObjectStorage: "使用对象存储"
 objectStorageBaseUrl: "Base URL"
-objectStorageBaseUrlDesc: "这里是用于参考的 URL，如果您正在使用 CDN 或反向代理，请指定其 URL，例如 S3：“https://<bucket>.s3.amazonaws.com”，GCS：“https://storage.googleapis.com/<bucket>”"
+objectStorageBaseUrlDesc: "用于参考的 URL，如果您正在使用 CDN 或 Proxy，请填入服务商提供的 URL；S3：“https://<bucket>.s3.amazonaws.com”；GCS：“https://storage.googleapis.com/<bucket>”"
 objectStorageBucket: "存储桶"
 objectStorageBucketDesc: "请指定使用的对象存储服务的存储桶名称。"
 objectStoragePrefix: "前缀"
@@ -533,6 +546,7 @@ serverLogs: "服务器日志"
 deleteAll: "全部删除"
 showFixedPostForm: "在时间线顶部显示发帖框"
 showFixedPostFormInChannel: "在时间线顶部显示发帖对话框（频道）"
+withRepliesByDefaultForNewlyFollowed: "在时间线中默认包含新关注用户的回复"
 newNoteRecived: "有新的帖子"
 sounds: "提示音"
 sound: "提示音"
@@ -542,6 +556,8 @@ showInPage: "在页面中显示"
 popout: "弹窗"
 volume: "音量"
 masterVolume: "主音量"
+notUseSound: "静音"
+useSoundOnlyWhenActive: "仅在 Misskey 活跃时输出声音"
 details: "详情"
 chooseEmoji: "选择表情符号"
 unableToProcess: "操作无法完成"
@@ -562,10 +578,14 @@ output: "输出"
 script: "脚本"
 disablePagesScript: "禁用页面脚本"
 updateRemoteUser: "更新远程用户信息"
+unsetUserAvatar: "清除头像"
+unsetUserAvatarConfirm: "要清除头像吗？"
+unsetUserBanner: "清除横幅"
+unsetUserBannerConfirm: "要清除横幅吗？"
 deleteAllFiles: "删除所有文件"
 deleteAllFilesConfirm: "要删除所有文件吗？"
 removeAllFollowing: "取消所有关注"
-removeAllFollowingDescription: "取消 {host} 的所有关注者。当服务器不再存在时执行。"
+removeAllFollowingDescription: "取消来自 {host} 的所有关注者。当服务器不再存在时执行。"
 userSuspended: "该用户已被冻结。"
 userSilenced: "该用户已被禁言。"
 yourAccountSuspendedTitle: "账户已被冻结"
@@ -612,6 +632,7 @@ medium: "中"
 small: "小"
 generateAccessToken: "生成访问令牌"
 permission: "权限"
+adminPermission: "管理员权限"
 enableAll: "启用全部"
 disableAll: "禁用全部"
 tokenRequested: "允许访问账户"
@@ -633,6 +654,7 @@ smtpSecure: "在 SMTP 连接中使用隐式 SSL / TLS"
 smtpSecureInfo: "使用 STARTTLS 时关闭。"
 testEmail: "邮件发送测试"
 wordMute: "文字屏蔽"
+hardWordMute: "屏蔽关键词"
 regexpError: "正则表达式错误"
 regexpErrorDescription: "{tab} 屏蔽文字的第 {line} 行的正则表达式有错误："
 instanceMute: "被屏蔽的服务器"
@@ -654,6 +676,7 @@ useGlobalSettingDesc: "启用时，将使用账户通知设置。关闭时，则
 other: "其他"
 regenerateLoginToken: "重新生成登录令牌"
 regenerateLoginTokenDescription: "重新生成用于登录的内部令牌。通常您不需要这样做。重新生成后，您将在所有设备上登出。"
+theKeywordWhenSearchingForCustomEmoji: "这将是搜素自定义表情符号时的关键词。"
 setMultipleBySeparatingWithSpace: "您可以使用空格分隔多个项目。"
 fileIdOrUrl: "文件 ID 或者 URL"
 behavior: "行为"
@@ -866,6 +889,8 @@ makeReactionsPublicDescription: "将您发表过的回应设置成公开可见
 classic: "经典"
 muteThread: "屏蔽帖子列表"
 unmuteThread: "取消屏蔽帖子列表"
+followingVisibility: "关注的人的公开范围"
+followersVisibility: "关注者的公开范围"
 continueThread: "查看更多帖子"
 deleteAccountConfirm: "将要删除账户。是否确认？"
 incorrectPassword: "密码错误"
@@ -949,7 +974,7 @@ unsubscribePushNotification: "停用推送通知消息"
 pushNotificationAlreadySubscribed: "推送通知消息已启用"
 pushNotificationNotSupported: "浏览器或服务器不支持推送通知消息"
 sendPushNotificationReadMessage: "删除已读推送通知消息"
-sendPushNotificationReadMessageCaption: "“{emptyPushNotificationMessage}”的通知消息将会显示。您终端设备的电池消耗可能会增加。"
+sendPushNotificationReadMessageCaption: "您终端设备的电池消耗可能会增加。"
 windowMaximize: "最大化"
 windowMinimize: "最小化"
 windowRestore: "还原"
@@ -975,6 +1000,7 @@ assign: "分配"
 unassign: "取消分配"
 color: "颜色"
 manageCustomEmojis: "管理自定义表情符号"
+manageAvatarDecorations: "管理头像挂件"
 youCannotCreateAnymore: "抱歉，您无法再创建更多了。"
 cannotPerformTemporary: "暂时不可用"
 cannotPerformTemporaryDescription: "因操作过于频繁，暂时不可用，请稍后再试。"
@@ -1015,6 +1041,8 @@ resetPasswordConfirm: "确定重置密码？"
 sensitiveWords: "敏感词"
 sensitiveWordsDescription: "将包含设置词的帖子的可见范围设置为首页。可以通过用换行符分隔来设置多个。"
 sensitiveWordsDescription2: "AND 条件用空格分隔，正则表达式用斜线包裹。"
+hiddenTags: "隐藏标签"
+hiddenTagsDescription: "设定的标签将不会在时间线上显示。可使用换行来设置多个标签。"
 notesSearchNotAvailable: "帖子检索不可用"
 license: "许可信息"
 unfavoriteConfirm: "确定要取消收藏吗？"
@@ -1027,9 +1055,12 @@ enableChartsForRemoteUser: "生成远程用户的图表"
 enableChartsForFederatedInstances: "生成远程服务器的图表"
 showClipButtonInNoteFooter: "在贴文下方显示便签按钮"
 reactionsDisplaySize: "回应显示大小"
+limitWidthOfReaction: "限制回应的最大宽度，并将其缩小显示"
 noteIdOrUrl: "帖子 ID 或 URL"
 video: "视频"
 videos: "视频"
+audio: "音频"
+audioFiles: "音频"
 dataSaver: "省流量模式"
 accountMigration: "账户迁移"
 accountMoved: "此用户已迁移账户"
@@ -1126,19 +1157,65 @@ edited: "已编辑"
 notificationRecieveConfig: "通知接收设置"
 mutualFollow: "互相关注"
 fileAttachedOnly: "仅限媒体"
-showRepliesToOthersInTimeline: "在时间线上显示给其他人的回复"
-hideRepliesToOthersInTimeline: "在时间线上隐藏给其他人的回复"
+showRepliesToOthersInTimeline: "在时间线中包含给别人的回复"
+hideRepliesToOthersInTimeline: "在时间线中隐藏给别人的回复"
+showRepliesToOthersInTimelineAll: "在时间线中包含现在关注的所有人的回复"
+hideRepliesToOthersInTimelineAll: "在时间线中隐藏现在关注的所有人的回复"
+confirmShowRepliesAll: "此操作不可撤销。确认要在时间线中包含现在关注的所有人的回复吗？"
+confirmHideRepliesAll: "此操作不可撤销。确认要在时间线中隐藏现在关注的所有人的回复吗？"
+externalServices: "外部服务"
+impressum: "运营商信息"
+impressumUrl: "运营商信息地址"
+impressumDescription: "德国等国家和地区有义务展示此类信息（Impressum）。"
+privacyPolicy: "隐私政策"
+privacyPolicyUrl: "隐私政策地址"
+tosAndPrivacyPolicy: "服务条款及隐私政策"
 avatarDecorations: "头像挂件"
+attach: "佩戴"
+detach: "卸下"
+detachAll: "全部卸下"
+angle: "角度"
 flip: "翻转"
+showAvatarDecorations: "显示头像挂件"
+releaseToRefresh: "松开以刷新"
+refreshing: "刷新中"
+pullDownToRefresh: "下拉以刷新"
+disableStreamingTimeline: "禁止实时更新时间线"
+useGroupedNotifications: "分组显示通知"
+signupPendingError: "确认电子邮件时出现错误。链接可能已过期。"
+cwNotationRequired: "在启用「隐藏内容」时必须输入注释"
+doReaction: "回应"
+reloadRequiredToApplySettings: "需要重新载入来使设置生效"
+remainingN: "剩余：{n}"
+overwriteContentConfirm: "将覆盖现有内容。确定吗？"
+seasonalScreenEffect: "应景的画面效果"
+decorate: "装饰"
+addMfmFunction: "添加装饰"
+enableQuickAddMfmFunction: "显示高级 MFM 选择器"
+sfx: "音效"
+soundWillBePlayed: "声音将会播放"
+showReplay: "查看重播"
+replay: "重播"
+replaying: "重播中"
+ranking: "排行榜"
+lastNDays: "最近 {n} 天"
+backToTitle: "返回标题"
+enableHorizontalSwipe: "滑动切换标签页"
+_bubbleGame:
+  howToPlay: "游戏说明"
 _announcement:
   forExistingUsers: "仅限现有用户"
   forExistingUsersDescription: "若启用，该公告将仅对创建此公告时存在的用户可见。 如果禁用，则在创建此公告后注册的用户也可以看到该公告。"
   needConfirmationToRead: "需要确认才能标记为已读"
   needConfirmationToReadDescription: "若启用，则会在标记已读时会显示确认对话框。此外，它也会不受批量已读操作的影响。"
   end: "结束公告"
-  tooManyActiveAnnouncementDescription: "若有大量活动公告，可能会造成用户体验可能下降。请考虑归档已完成的公告。"
+  tooManyActiveAnnouncementDescription: "若有大量活动公告，可能会造成用户体验下降。请考虑归档已完成的公告。"
   readConfirmTitle: "标记为已读？"
   readConfirmText: "阅读“{title}”的内容并将其标记为已读。"
+  shouldNotBeUsedToPresentPermanentInfo: "我们建议使用公告来发布临时性的流动信息而不是固定的常规信息，因为这可能损害用户体验，尤其是对于新用户而言。"
+  dialogAnnouncementUxWarn: "同时存在 2 个或以上的对话框公告极有可能对用户体验产生负面的影响，建议谨慎使用。"
+  silence: "不发送通知"
+  silenceDescription: "开启后，此条公告将不会发送通知，也不强制用户阅读。"
 _initialAccountSetting:
   accountCreated: "账户创建完成了！"
   letsStartAccountSetup: "来进行帐户的初始设置吧。"
@@ -1151,19 +1228,91 @@ _initialAccountSetting:
   pushNotificationDescription: "启用推送通知的话，就可以在设备上接收来自 {name} 的通知了。"
   initialAccountSettingCompleted: "初始设定已经完成了！"
   haveFun: "希望 {name} 在这里玩得开心！"
+  youCanContinueTutorial: "您可以继续了解 {name}(Misskey) 的使用教程，也可以在此停止教程并立即开始使用它。\n"
+  startTutorial: "开始教学"
   skipAreYouSure: "要跳过初始设置吗？"
   laterAreYouSure: "要稍后再进行初始设定吗？"
+_initialTutorial:
+  launchTutorial: "观看教学"
+  title: "教学"
+  wellDone: "做得好"
+  skipAreYouSure: "是否退出教学？"
+  _landing:
+    title: "欢迎来到教学"
+    description: "在这里，您可以查看 Misskey 的基本使用方法和功能。"
+  _note:
+    title: "什么是帖子？"
+    description: "在 Misskey 上发表的文章称为「帖子」。帖子在时间线上按照时间顺序排列，并实时更新。"
+    reply: "用来回复帖子。可以对回复进行回复，从而形成一串对话。"
+    renote: "用来将帖子共享到自己的时间线上。也可以加上自己的文字然后引用它。"
+    reaction: "用来添加回应。详细信息将在下一页进行说明。"
+    menu: "用来进行例如显示帖子详情、复制链接等各种各样的操作。"
+  _reaction:
+    title: "什么是回应？"
+    description: "您可以在帖子中添加“回应”。 您可以使用反应轻松地表达点“赞”所无法传达的细微差别。"
+    letsTryReacting: "回应可以通过点击帖子中的「+」按钮来添加。试着给这个示例帖子添加一个回应！"
+    reactToContinue: "添加一个回应来继续"
+    reactNotification: "当您的帖子被某人添加了回应时，将实时收到通知。"
+    reactDone: "通过按下「ー」按钮，可以取消已经添加的回应"
+  _timeline:
+    title: "时间线的运作方式"
+    description1: "Misskey 根据使用方式提供了多个时间线（根据服务器的设定，可能有一些被禁用）。"
+    home: "可以查看您关注的账户的帖子。"
+    local: "可以查看这个服务器上所有用户发表的帖子。"
+    social: "将同时显示首页时间线和本地时间线的内容。"
+    global: "可以查看所有已联合的服务器上的帖子。"
+    description2: "可以随时在屏幕顶部在每个时间线之间切换。"
+    description3: "另外，还有列表时间线和频道时间线。请参阅{link}了解更多详细信息。"
+  _postNote:
+    title: "帖子发布设置"
+    description1: "在 Misskey 发布帖子时，您可以设置各种选项。发帖窗口看起来是这样的。\n"
+    _visibility:
+      description: "您可以限制谁可以看到您的帖子。"
+      public: "向所有用户公开。\n"
+      home: "仅在首页时间线上发布。 关注者、从个人资料页查看过来的用户、以及通过转帖也能被别的用户看见。"
+      followers: "仅对关注者可见。 除了您自己之外，没有人可以转贴，并且只有您的关注者可以查看它。\n"
+      direct: "它将仅向指定用户公开，并且他们也会收到通知。 您可以使用它来代替私信。\n"
+      doNotSendConfidencialOnDirect1: "发送敏感信息时请注意。\n"
+      doNotSendConfidencialOnDirect2: "目标服务器的管理员可以看到发布的内容，因此如果您向不受信任的服务器上的用户发送私信，则在处理敏感信息时需要小心。"
+      localOnly: "不将帖子推送到其它服务器。 无论上述公开范围如何，其它服务器的用户将无法看到附加了此设定的帖子。\n"
+    _cw:
+      title: "隐藏内容 (CW)\n"
+      description: "显示「注解」里的内容而不是正文。点击「查看更多」将会把正文显示出来。"
+      _exampleNote:
+        cw: "深夜报复社会"
+        note: "茨了带巧克力的甜甜圈🍩😋"
+      useCases: "用于服务器条款所规定的帖子，或对剧透内容和敏感内容进行自主规制。"
+  _howToMakeAttachmentsSensitive:
+    title: "如何将附件标注为敏感内容？"
+    description: "对于服务器方针所要求要求的，又或者不适合直接展示的附件，请添加「敏感」标记。\n"
+    tryThisFile: "试试看，将附加到此窗口的图像标注为敏感！"
+    _exampleNote:
+      note: "不该打开纳豆的盖子的……"
+    method: "要标注附件为敏感内容，请单击该文件以打开菜单，然后单击“设置为敏感”。"
+    sensitiveSucceeded: "附加文件时，请遵循服务器的条款来设置正确敏感设定。\n"
+    doItToContinue: "将图像标记为敏感后才能够继续"
+  _done:
+    title: "恭喜您，已经完成了教程🎉\n"
+    description: "这里介绍的只是其中一小部分的功能。 要了解更多有关如何使用 Misskey 的更多信息，请访问 {link}。"
+_timelineDescription:
+  home: "首页时间线可以查看您关注的账户的帖子。"
+  local: "本地时间线可以查看这个服务器上所有用户发表的帖子。"
+  social: "社交时间线将同时显示首页时间线和本地时间线的内容。"
+  global: "全局时间线可以查看所有已联合的服务器上的帖子。"
 _serverRules:
   description: "在新用户注册前显示服务器的简单规则。推荐显示服务条款的主要内容。"
 _serverSettings:
   iconUrl: "图标 URL"
   appIconDescription: "指定当 {host} 显示为 app 时的图标。"
-  appIconUsageExample: "例如：作为书签添加到 PWA 或手机主屏幕的时候"
+  appIconUsageExample: "如作为书签添加到 PWA 或手机主屏幕时"
   appIconStyleRecommendation: "因为有可能会被裁切为圆形或者圆角矩形，建议使用边缘带有留白背景的图标。"
   appIconResolutionMustBe: "分辨率必须为 {resolution}。"
   manifestJsonOverride: "覆盖 manifest.json"
   shortName: "简称"
   shortNameDescription: "如果服务器的正式名称很长，可以用简称或者別名来替代。"
+  fanoutTimelineDescription: "当启用时，可显著提高获取各种时间线时的性能，并减轻数据库的负荷。但是相对的 Redis 的内存使用量将会增加。如果服务器的内存不是很大，又或者运行不稳定的话可以把它关掉。"
+  fanoutTimelineDbFallback: "回退到数据库"
+  fanoutTimelineDbFallbackDescription: "当启用时，若时间线未被缓存，则将额外查询数据库。禁用该功能可通过不执行回退处理进一步减少服务器负载，但会限制可检索的时间线范围。"
 _accountMigration:
   moveFrom: "从别的账号迁移到此账户"
   moveFromSub: "为另一个账户建立别名"
@@ -1390,7 +1539,7 @@ _achievements:
       description: "点了这里"
     _justPlainLucky:
       title: "超高校级的幸运"
-      description: "每 10 秒有 0.01 的概率自动获得"
+      description: "每 10 秒有 0.005% 的概率自动获得"
     _setNameToSyuilo:
       title: "像神一样呐"
       description: "将名称设定为 syuilo"
@@ -1421,6 +1570,11 @@ _achievements:
     _smashTestNotificationButton:
       title: "过度测试"
       description: "短时间内连续测试通知"
+    _tutorialCompleted:
+      title: "Misskey 初学者课程 结业证书"
+      description: "完成了教学"
+    _bubbleGameExplodingHead:
+      title: "🤯"
 _role:
   new: "创建角色"
   edit: "编辑角色"
@@ -1431,7 +1585,9 @@ _role:
   assignTarget: "授权对象"
   descriptionOfAssignTarget: "<b>手动</b>指手动选择谁被包括在这个角色中。\n<b>符合条件</b>指设置条件以自动包括符合条件的用户。"
   manual: "手动"
+  manualRoles: "手动角色"
   conditional: "符合条件"
+  conditionalRoles: "条件角色"
   condition: "条件"
   isConditionalRole: "这是一个条件控制的角色。"
   isPublic: "角色公开"
@@ -1464,6 +1620,7 @@ _role:
     inviteLimitCycle: "邀请码的发行间隔"
     inviteExpirationTime: "邀请码的有效日期"
     canManageCustomEmojis: "管理自定义表情符号"
+    canManageAvatarDecorations: "管理头像挂件"
     driveCapacity: "网盘容量"
     alwaysMarkNsfw: "总是将文件标记为 NSFW"
     pinMax: "帖子置顶数量限制"
@@ -1478,6 +1635,8 @@ _role:
     descriptionOfRateLimitFactor: "值越小限制越少，值越大限制越多。"
     canHideAds: "可以隐藏广告"
     canSearchNotes: "是否可以搜索帖子"
+    canUseTranslator: "使用翻译功能"
+    avatarDecorationLimit: "可添加头像挂件的最大个数"
   _condition:
     isLocal: "是本地用户"
     isRemote: "是远程用户"
@@ -1506,6 +1665,7 @@ _emailUnavailable:
   disposable: "不是永久可用的地址"
   mx: "邮件服务器不正确"
   smtp: "邮件服务器没有响应"
+  banned: "无法使用此邮件地址注册"
 _ffVisibility:
   public: "公开"
   followers: "只有关注你的用户能看到"
@@ -1526,6 +1686,10 @@ _ad:
   reduceFrequencyOfThisAd: "减少此广告的频率"
   hide: "不显示"
   timezoneinfo: "星期几是由服务器的时区所指定的。"
+  adsSettings: "广告设置"
+  notesPerOneAd: "在实时更新时间线中插入广告的间隔（帖子个数）"
+  setZeroToDisable: "设为 0 将不在实时更新时间线中投放广告"
+  adsTooClose: "广告投放时间间隔过短将可能显著损害用户体验。"
 _forgotPassword:
   enterEmail: "请输入您设置的电子邮箱地址，密码重置链接将发送至该邮箱上。"
   ifNoEmail: "如果您没有设置电子邮件地址，请联系管理员。"
@@ -1565,8 +1729,8 @@ _preferencesBackups:
   invalidFile: "无效的的文件格式。"
 _registry:
   scope: "范围"
-  key: "主要"
-  keys: "主要"
+  key: "键"
+  keys: "键"
   domain: "域"
   createKey: "创建键"
 _aboutMisskey:
@@ -1578,6 +1742,7 @@ _aboutMisskey:
   donate: "赞助 Misskey"
   morePatrons: "还有很多其它的人也在支持我们，非常感谢🥰"
   patrons: "支持者"
+  projectMembers: "项目成员"
 _displayOfSensitiveMedia:
   respect: "隐藏敏感媒体"
   ignore: "显示敏感媒体"
@@ -1602,6 +1767,7 @@ _channel:
   notesCount: "有 {n} 个帖子"
   nameAndDescription: "名称与描述"
   nameOnly: "仅名称"
+  allowRenoteToExternal: "允许在频道外转帖及引用"
 _menuDisplay:
   sideFull: "横向"
   sideIcon: "横向(图标)"
@@ -1693,6 +1859,14 @@ _sfx:
   notification: "通知"
   antenna: "天线接收"
   channel: "频道通知"
+  reaction: "选择回应时"
+_soundSettings:
+  driveFile: "使用网盘内的音频"
+  driveFileWarn: "选择网盘上的文件"
+  driveFileTypeWarn: "不支持此文件"
+  driveFileTypeWarnDescription: "请选择音频文件"
+  driveFileDurationWarn: "音频过长"
+  driveFileDurationWarnDescription: "使用长音频可能会影响 Misskey 的使用。即使这样也要继续吗？"
 _ago:
   future: "未来"
   justNow: "最近"
@@ -1706,7 +1880,12 @@ _ago:
   invalid: "没有"
 _timeIn:
   seconds: "{n}秒后"
+  minutes: "{n} 分后"
+  hours: "{n} 小时后"
   days: "{n}天后"
+  weeks: "{n} 周后"
+  months: "{n} 月后"
+  years: "{n} 年后"
 _time:
   second: "秒"
   minute: "分"
@@ -1778,6 +1957,55 @@ _permissions:
   "write:flash": "编辑 Play"
   "read:flash-likes": "查看 Play 的点赞"
   "write:flash-likes": "编辑 Play 的点赞列表"
+  "read:admin:abuse-user-reports": "查看来自用户的举报"
+  "write:admin:delete-account": "删除用户账户"
+  "write:admin:delete-all-files-of-a-user": "删除用户所有的文件"
+  "read:admin:index-stats": "查看数据库索引相关的信息"
+  "read:admin:table-stats": "查看数据库表相关的信息"
+  "read:admin:user-ips": "查看用户 IP 地址"
+  "read:admin:meta": "查看实例的元数据"
+  "write:admin:reset-password": "重置用户密码"
+  "write:admin:resolve-abuse-user-report": "将来自用户的报告标记为「已解决」"
+  "write:admin:send-email": "发送邮件"
+  "read:admin:server-info": "查看服务器信息"
+  "read:admin:show-moderation-log": "查看管理日志"
+  "read:admin:show-user": "查看用户的非公开信息"
+  "read:admin:show-users": "查看用户的非公开信息"
+  "write:admin:suspend-user": "冻结用户"
+  "write:admin:unset-user-avatar": "删除用户头像"
+  "write:admin:unset-user-banner": "删除用户横幅"
+  "write:admin:unsuspend-user": "解除用户冻结"
+  "write:admin:meta": "编辑实例元数据"
+  "write:admin:user-note": "编辑管理笔记"
+  "write:admin:roles": "编辑角色"
+  "read:admin:roles": "查看角色"
+  "write:admin:relays": "编辑中继"
+  "read:admin:relays": "查看中继"
+  "write:admin:invite-codes": "编辑邀请码"
+  "read:admin:invite-codes": "查看邀请码"
+  "write:admin:announcements": "编辑公告"
+  "read:admin:announcements": "查看公告"
+  "write:admin:avatar-decorations": "编辑头像挂件"
+  "read:admin:avatar-decorations": "查看头像挂件"
+  "write:admin:federation": "编辑联合相关信息"
+  "write:admin:account": "编辑用户账户"
+  "read:admin:account": "查看用户相关情报"
+  "write:admin:emoji": "编辑表情文字"
+  "read:admin:emoji": "查看表情文字"
+  "write:admin:queue": "编辑作业队列"
+  "read:admin:queue": "查看作业队列相关情报"
+  "write:admin:promo": "运营推广说明"
+  "write:admin:drive": "编辑用户网盘"
+  "read:admin:drive": "查看用户网盘相关情报"
+  "read:admin:stream": "使用管理员用的 Websocket API"
+  "write:admin:ad": "编辑广告"
+  "read:admin:ad": "查看广告"
+  "write:invite-codes": "发行邀请码"
+  "read:invite-codes": "获取已发行的邀请码"
+  "write:clip-favorite": "编辑便签的点赞"
+  "read:clip-favorite": "查看便签的点赞"
+  "read:federation": "查看联合相关信息"
+  "write:report-abuse": "举报用户"
 _auth:
   shareAccessTitle: "应用程序授权许可"
   shareAccess: "您要授权允许 “{name}” 访问您的帐户吗？"
@@ -1832,6 +2060,7 @@ _widgets:
   _userList:
     chooseList: "选择列表"
   clicker: "点击器"
+  birthdayFollowings: "今天是他们的生日"
 _cw:
   hide: "隐藏"
   show: "查看更多"
@@ -1894,15 +2123,18 @@ _profile:
   changeAvatar: "修改头像"
   changeBanner: "修改横幅"
   verifiedLinkDescription: "如果将内容设置为 URL，当链接所指向的网页内包含自己的个人资料链接时，可以显示一个已验证图标。"
+  avatarDecorationMax: "最多可添加 {max} 个挂件"
 _exportOrImport:
   allNotes: "所有帖子"
   favoritedNotes: "收藏的帖子"
+  clips: "便签"
   followingList: "关注中"
   muteList: "屏蔽"
   blockingList: "拉黑"
   userLists: "列表"
   excludeMutingUsers: "排除屏蔽用户"
   excludeInactiveUsers: "排除不活跃用户"
+  withReplies: "在时间线中包含导入用户的回复"
 _charts:
   federation: "联合"
   apRequest: "请求"
@@ -2014,12 +2246,16 @@ _notification:
   pollEnded: "问卷调查结果已生成。"
   newNote: "新的帖子"
   unreadAntennaNote: "天线 {name}"
+  roleAssigned: "授予的角色"
   emptyPushNotificationMessage: "推送通知已更新"
   achievementEarned: "获得成就"
   testNotification: "测试通知"
   checkNotificationBehavior: "检查通知显示"
   sendTestNotification: "发送测试通知"
   notificationWillBeDisplayedLikeThis: "通知将会这样表示"
+  reactedBySomeUsers: "{n} 人回应了"
+  renotedBySomeUsers: "{n} 人转发了"
+  followedBySomeUsers: "被 {n} 人关注"
   _types:
     all: "全部"
     note: "用户的新帖子"
@@ -2032,6 +2268,7 @@ _notification:
     pollEnded: "问卷调查结束"
     receiveFollowRequest: "收到关注请求"
     followRequestAccepted: "关注请求已通过"
+    roleAssigned: "授予的角色"
     achievementEarned: "取得的成就"
     app: "关联应用的通知"
   _actions:
@@ -2114,6 +2351,8 @@ _moderationLogTypes:
   deleteGlobalAnnouncement: "删除全体通知"
   deleteUserAnnouncement: "删除用户通知"
   resetPassword: "重置密码"
+  suspendRemoteInstance: "停止远程服务器"
+  unsuspendRemoteInstance: "恢复远程服务器"
   markSensitiveDriveFile: "标记网盘文件为敏感媒体"
   unmarkSensitiveDriveFile: "取消标记网盘文件为敏感媒体"
   resolveAbuseReport: "处理举报"
@@ -2121,10 +2360,76 @@ _moderationLogTypes:
   createAd: "创建了广告"
   deleteAd: "删除了广告"
   updateAd: "更新了广告"
+  createAvatarDecoration: "新建头像挂件"
+  updateAvatarDecoration: "更新头像挂件"
+  deleteAvatarDecoration: "删除头像挂件"
+  unsetUserAvatar: "清除用户头像"
+  unsetUserBanner: "清除用户横幅"
 _fileViewer:
+  title: "文件信息"
+  type: "文件类型"
+  size: "文件大小"
   url: "URL"
   uploadedAt: "添加日期"
+  attachedNotes: "附加到的帖子"
+  thisPageCanBeSeenFromTheAuthor: "此页只能被该文件的上传者查看。"
 _externalResourceInstaller:
+  title: "从外部站点安装"
+  checkVendorBeforeInstall: "请在安装前确保来源可靠"
+  _plugin:
+    title: "要安装此插件吗？"
+    metaTitle: "插件信息"
+  _theme:
+    title: "要安装此主题吗？"
+    metaTitle: "主题信息"
+  _meta:
+    base: "基本配色方案"
+  _vendorInfo:
+    title: "来源信息"
+    endpoint: "参考端点"
+    hashVerify: "确认文件完整性"
   _errors:
+    _invalidParams:
+      title: "缺少参数"
+      description: "缺少从外部站点获取数据所需的信息。请检查 URL。"
+    _resourceTypeNotSupported:
+      title: "不支持此外部资源"
+      description: "不支持从此外部站点获取的资源类型。请联系站点管理员。"
+    _failedToFetch:
+      title: "获取数据失败"
+      fetchErrorDescription: "与外部站点的通信失败。 如果重试后问题仍然存在，请联系站点管理员。"
+      parseErrorDescription: "无法读取从外部站点取得的数据。请联系站点管理员。"
+    _hashUnmatched:
+      title: "无法获取正确数据"
+      description: "无法验证数据的完整性。安全起见，无法继续安装。请联系站点管理员。"
     _pluginParseFailed:
       title: "AiScript 错误"
+      description: "虽然取得了数据，但是由于 AiScript 解析时出现错误，无法读取数据。请联系插件的作者。可在 Javascript 控制台查看错误详情。"
+    _pluginInstallFailed:
+      title: "插件安装失败"
+      description: "安装插件时出现错误。请再试一次。可在 Javascript 控制台查看错误详情。"
+    _themeParseFailed:
+      title: "主题解析错误"
+      description: "虽然取得了主题文件，但是由于解析时出现错误，无法加载主题。请联系主题的作者。可在 Javascript 控制台查看错误详情。"
+    _themeInstallFailed:
+      title: "安装主题失败"
+      description: "安装主题时出错。请再试一次。可在 Javascript 控制台查看错误详情。"
+_dataSaver:
+  _media:
+    title: "加载媒体"
+    description: "防止自动加载图像和视频。 点击隐藏的图像/视频即可加载它们。\n"
+  _avatar:
+    title: "头像"
+    description: "停止播放头像的动画。 由于动画图片的文件大小可能比普通图像大，这可以进一步减少数据流量。"
+  _urlPreview:
+    title: "URL预览缩略图\n"
+    description: "将不再加载 URL 预览缩略图。"
+  _code:
+    title: "代码高亮"
+    description: "如果使用了代码高亮标记，例如在 MFM 中，则在点击之前不会加载。 代码高亮要求加载每种高亮语言的定义文件，由于这些文件不再自动加载，因此有望减少数据传输量。"
+_reversi:
+  reversi: "黑白棋"
+  total: "总计"
+_offlineScreen:
+  title: "离线——无法连接到服务器"
+  header: "无法连接到服务器"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 36b6e77e9b..e4ac043eb5 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -91,7 +91,7 @@ manageLists: "管理清單"
 error: "錯誤"
 somethingHappened: "發生錯誤"
 retry: "重試"
-pageLoadError: "載入頁面失敗"
+pageLoadError: "無法載入頁面。"
 pageLoadErrorDescription: "這通常是網路錯誤或瀏覽器快取殘留而引起的。請先清除瀏覽器快取，稍後再重試。"
 serverIsDead: "伺服器沒有回應。請稍等片刻再試。"
 youShouldUpgradeClient: "請重新載入以使用新版客戶端顯示此頁面。"
@@ -130,6 +130,7 @@ overwriteFromPinnedEmojis: "從一般複寫設定"
 reactionSettingDescription2: "拖動以交換，點擊以刪除，按下「+」以新增。"
 rememberNoteVisibility: "記住貼文可見性"
 attachCancel: "移除附件"
+deleteFile: "刪除檔案"
 markAsSensitive: "標記為敏感內容"
 unmarkAsSensitive: "取消標記為敏感內容"
 enterFileName: "請輸入檔案名稱"
@@ -379,6 +380,11 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "啟用 hCaptcha"
 hcaptchaSiteKey: "網站金鑰"
 hcaptchaSecretKey: "金鑰"
+mcaptcha: "mCaptcha"
+enableMcaptcha: "啟用 mCaptcha"
+mcaptchaSiteKey: "網站金鑰"
+mcaptchaSecretKey: "金鑰"
+mcaptchaInstanceUrl: "mCaptcha 的實例網址"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "啟用 reCAPTCHA"
 recaptchaSiteKey: "網站金鑰"
@@ -592,10 +598,10 @@ menu: "選單"
 divider: "分隔線"
 addItem: "新增項目"
 rearrange: "排序方式"
-relays: "中繼"
-addRelay: "新增中繼"
+relays: "中繼器"
+addRelay: "新增中繼器"
 inboxUrl: "收件夾URL"
-addedRelays: "已加入的中繼"
+addedRelays: "已加入的中繼器"
 serviceworkerInfo: "如要使用推播通知，需要啟用此選項並設定金鑰。"
 deletedNote: "已刪除的貼文"
 invisibleNote: "私密的貼文"
@@ -626,6 +632,7 @@ medium: "中"
 small: "小"
 generateAccessToken: "發行存取權杖"
 permission: "權限"
+adminPermission: "管理員權限"
 enableAll: "啟用全部"
 disableAll: "停用全部"
 tokenRequested: "允許存取帳戶"
@@ -669,6 +676,7 @@ useGlobalSettingDesc: "啟用時，將使用帳戶通知設定。停用時，則
 other: "其他"
 regenerateLoginToken: "重新產生登入權杖"
 regenerateLoginTokenDescription: "重新產生用於登入的內部權杖。一般情況下是不需要這樣做的。重新產生後，所有裝置將會被登出。"
+theKeywordWhenSearchingForCustomEmoji: "這是搜尋自訂表情符號時的關鍵字"
 setMultipleBySeparatingWithSpace: "您可以使用空格分隔多個項目。"
 fileIdOrUrl: "檔案 ID 或 URL"
 behavior: "行為"
@@ -682,7 +690,7 @@ abuseReported: "檢舉完成。感謝您的報告。"
 reporter: "檢舉者"
 reporteeOrigin: "檢舉來源"
 reporterOrigin: "檢舉者來源"
-forwardReport: "將報告轉送給遠端實例"
+forwardReport: "將報告轉送給遠端伺服器"
 forwardReportIsAnonymous: "在遠端實例上看不到您的資訊，顯示的報告者是匿名的系统帳戶。"
 send: "發送"
 abuseMarkAsResolved: "處理完畢"
@@ -690,7 +698,7 @@ openInNewTab: "在新分頁中開啟"
 openInSideView: "在側欄中開啟"
 defaultNavigationBehaviour: "預設導航"
 editTheseSettingsMayBreakAccount: "修改這些設定可能會毀損您的帳戶"
-instanceTicker: "貼文的實例來源"
+instanceTicker: "貼文的伺服器資訊"
 waitingFor: "等待{x}"
 random: "隨機"
 system: "系統"
@@ -811,7 +819,7 @@ active: "最近活躍"
 offline: "離線"
 notRecommended: "不推薦"
 botProtection: "Bot 防護"
-instanceBlocking: "已封鎖的實例"
+instanceBlocking: "已封鎖或禁言的伺服器"
 selectAccount: "選擇帳戶"
 switchAccount: "切換帳戶"
 enabled: "已啟用"
@@ -954,7 +962,7 @@ cannotUploadBecauseNoFreeSpace: "由於雲端硬碟沒有可用空間，因此
 cannotUploadBecauseExceedsFileSizeLimit: "由於超過了檔案大小的限制，無法上傳。"
 beta: "測試版"
 enableAutoSensitive: "自動 NSFW 判定"
-enableAutoSensitiveDescription: "如果可用，它將使用機器學習技術判斷檔案是否需要標記為敏感。即使關閉此功能，也可能會依實例規則而自動啟用。"
+enableAutoSensitiveDescription: "如果可行，它將使用機器學習技術判斷檔案是否需要標記為敏感。即使關閉此功能，也可能會依伺服器規則而自動啟用。"
 activeEmailValidationDescription: "主動地驗證使用者的電子郵件地址，以確定是否是一次性地址以及是否可以真正與其進行通訊。關閉時，僅檢查格式是否正確。"
 navbar: "導覽列"
 shuffle: "隨機"
@@ -964,7 +972,7 @@ pushNotification: "推播通知"
 subscribePushNotification: "啟用推播通知"
 unsubscribePushNotification: "停用推播通知"
 pushNotificationAlreadySubscribed: "推播通知啟用中"
-pushNotificationNotSupported: "瀏覽器或實例不支援推播通知"
+pushNotificationNotSupported: "瀏覽器或伺服器不支援推播通知"
 sendPushNotificationReadMessage: "如果已閱讀通知與訊息，就刪除推播通知"
 sendPushNotificationReadMessageCaption: "「{emptyPushNotificationMessage}」通知將立刻顯示。可能會更消耗裝置電池。"
 windowMaximize: "最大化"
@@ -1051,6 +1059,8 @@ limitWidthOfReaction: "限制反應的最大寬度，並縮小顯示尺寸。"
 noteIdOrUrl: "貼文ID或URL"
 video: "影片"
 videos: "影片"
+audio: "音效"
+audioFiles: "音效檔案"
 dataSaver: "數據節省模式"
 accountMigration: "遷移帳戶"
 accountMoved: "這個使用者已遷移至新的帳戶："
@@ -1183,6 +1193,22 @@ seasonalScreenEffect: "隨季節變換畫面的呈現"
 decorate: "設置頭像裝飾"
 addMfmFunction: "插入MFM功能語法"
 enableQuickAddMfmFunction: "顯示高級MFM選擇器"
+bubbleGame: "氣泡遊戲"
+sfx: "音效"
+soundWillBePlayed: "將播放音效"
+showReplay: "觀看重播"
+replay: "重播"
+replaying: "重播中"
+ranking: "排行榜"
+lastNDays: "過去 {n} 天"
+backToTitle: "回到遊戲標題頁"
+enableHorizontalSwipe: "滑動切換時間軸"
+_bubbleGame:
+  howToPlay: "玩法說明"
+  _howToPlay:
+    section1: "調整位置並將物體放入盒子中。"
+    section2: "當相同類型的物體黏在一起時，它們會變成不同的物體，您就會得到分數。"
+    section3: "如果物體從盒子裡溢出，遊戲就結束了。透過融合物體而不溢出盒子來獲得高分！"
 _announcement:
   forExistingUsers: "僅限既有的使用者"
   forExistingUsersDescription: "啟用代表僅向現存使用者顯示；停用代表張貼後註冊的新使用者也會看到。"
@@ -1501,7 +1527,7 @@ _achievements:
       description: "首頁時間軸在一分鐘內出現超過二十篇貼文"
     _viewInstanceChart:
       title: "分析師"
-      description: "顯示了實例的圖表"
+      description: "顯示了伺服器的圖表"
     _outputHelloWorldOnScratchpad:
       title: "Hello, world!"
       description: "在 AiScript 控制臺輸出了「hello world」"
@@ -1553,13 +1579,20 @@ _achievements:
     _tutorialCompleted:
       title: "Misskey新手講座 結業證書"
       description: "已完成教學課程"
+    _bubbleGameExplodingHead:
+      title: "🤯"
+      description: "氣泡遊戲中最大的物體出現了"
+    _bubbleGameDoubleExplodingHead:
+      title: "雙重🤯"
+      description: "氣泡遊戲中最大的物體同時出現了兩個"
+      flavor: "這樣大小的便當盒，用　🤯　🤯　稍微裝滿一些吧"
 _role:
   new: "建立角色"
   edit: "編輯角色"
   name: "角色名稱"
   description: "角色描述 "
   permission: "角色的權限"
-  descriptionOfPermission: "<b>審查員</b>執行與審查相關的基本操作。\n<b>管理員</b>能變更實例的全部設定"
+  descriptionOfPermission: "<b>審查員</b>執行與審查相關的基本操作。\n<b>管理員</b>能變更伺服器的全部設定。"
   assignTarget: "指派目標"
   descriptionOfAssignTarget: "<b>手動</b>是以手動管理這個角色包含的人員。\n<b>符合條件</b>是設定條件以自動包含符合條件的使用者。"
   manual: "手動"
@@ -1593,7 +1626,7 @@ _role:
     gtlAvailable: "瀏覽全域時間軸"
     ltlAvailable: "瀏覽本地時間軸"
     canPublicNote: "允許公開貼文"
-    canInvite: "發行實例邀請碼"
+    canInvite: "發行伺服器邀請碼"
     inviteLimit: "可建立邀請碼的數量"
     inviteLimitCycle: "邀請碼的發放間隔"
     inviteExpirationTime: "邀請碼的有效日期"
@@ -1671,7 +1704,7 @@ _ad:
 _forgotPassword:
   enterEmail: "請輸入您的帳戶註冊的電子郵件地址。 密碼重置連結將被發送到該電子郵件地址。"
   ifNoEmail: "如果您還沒有註冊您的電子郵件地址，請聯繫管理員。 "
-  contactAdmin: "此實例不支持電子郵件，請聯繫您的管理員重置您的密碼。 "
+  contactAdmin: "本伺服器不支援電子郵件，請聯繫您的管理員重置您的密碼。 "
 _gallery:
   my: "我的貼文"
   liked: "喜歡的貼文"
@@ -1758,8 +1791,8 @@ _wordMute:
 _instanceMute:
   instanceMuteDescription: "包括對被靜音伺服器上的使用者的回覆，被設定的伺服器上所有貼文及轉發都會被靜音。"
   instanceMuteDescription2: "設定時以換行進行分隔"
-  title: "將隱藏被設定的實例貼文。"
-  heading: "將實例靜音"
+  title: "將隱藏被設定的伺服器貼文。"
+  heading: "將伺服器靜音"
 _theme:
   explore: "探索佈景主題"
   install: "安裝佈景主題"
@@ -1927,14 +1960,63 @@ _permissions:
   "write:user-groups": "編輯使用者群組"
   "read:channels": "已查看的頻道"
   "write:channels": "編輯頻道"
-  "read:gallery": "瀏覽圖庫"
-  "write:gallery": "操作圖庫"
-  "read:gallery-likes": "讀取喜歡的圖片"
-  "write:gallery-likes": "操作喜歡的圖片"
+  "read:gallery": "瀏覽相簿"
+  "write:gallery": "編輯相簿"
+  "read:gallery-likes": "瀏覽相簿的讚"
+  "write:gallery-likes": "編輯相簿的讚"
   "read:flash": "檢視 Play"
   "write:flash": "編輯 Play"
   "read:flash-likes": "檢視 Play 的讚"
   "write:flash-likes": "編輯 Play 的讚"
+  "read:admin:abuse-user-reports": "查看來自使用者的檢舉"
+  "write:admin:delete-account": "刪除使用者帳戶"
+  "write:admin:delete-all-files-of-a-user": "刪除使用者的所有檔案"
+  "read:admin:index-stats": "查看資料庫索引的相關資訊"
+  "read:admin:table-stats": "查看資料庫表格的相關資訊"
+  "read:admin:user-ips": "查看使用者的 IP 位址"
+  "read:admin:meta": "查看實例的元資料"
+  "write:admin:reset-password": "重設使用者的密碼"
+  "write:admin:resolve-abuse-user-report": "解決來自使用者的檢舉"
+  "write:admin:send-email": "發送郵件"
+  "read:admin:server-info": "查看伺服器的資訊"
+  "read:admin:show-moderation-log": "查看審查紀錄"
+  "read:admin:show-user": "查看使用者的私密資訊"
+  "read:admin:show-users": "查看使用者的私密資訊"
+  "write:admin:suspend-user": "凍結使用者"
+  "write:admin:unset-user-avatar": "刪除使用者的頭像"
+  "write:admin:unset-user-banner": "刪除使用者的橫幅"
+  "write:admin:unsuspend-user": "解除凍結使用者"
+  "write:admin:meta": "編輯實例的元資料"
+  "write:admin:user-note": "編輯審查筆記"
+  "write:admin:roles": "編輯角色"
+  "read:admin:roles": "查看角色"
+  "write:admin:relays": "編輯中繼器"
+  "read:admin:relays": "查看中繼器"
+  "write:admin:invite-codes": "編輯邀請碼"
+  "read:admin:invite-codes": "查看邀請碼"
+  "write:admin:announcements": "編輯公告"
+  "read:admin:announcements": "查看公告"
+  "write:admin:avatar-decorations": "編輯頭像裝飾"
+  "read:admin:avatar-decorations": "查看頭像裝飾"
+  "write:admin:federation": "編輯站台聯邦的相關資訊"
+  "write:admin:account": "編輯使用者帳戶"
+  "read:admin:account": "查看使用者的相關資訊"
+  "write:admin:emoji": "編輯表情符號"
+  "read:admin:emoji": "查看表情符號"
+  "write:admin:queue": "編輯工作佇列"
+  "read:admin:queue": "查看工作佇列的相關資訊"
+  "write:admin:promo": "編輯推廣貼文"
+  "write:admin:drive": "編輯使用者的雲端硬碟"
+  "read:admin:drive": "查看使用者雲端硬碟的相關資訊"
+  "read:admin:stream": "使用管理員的 Websocket API"
+  "write:admin:ad": "編輯廣告"
+  "read:admin:ad": "查看廣告"
+  "write:invite-codes": "建立邀請碼"
+  "read:invite-codes": "取得邀請碼"
+  "write:clip-favorite": "編輯摘錄的讚"
+  "read:clip-favorite": "查看摘錄的讚"
+  "read:federation": "查看站台聯邦的相關資訊"
+  "write:report-abuse": "檢舉違規行為"
 _auth:
   shareAccessTitle: "應用程式的存取權限"
   shareAccess: "要授權「“{name}”」存取您的帳戶嗎？"
@@ -1961,7 +2043,7 @@ _weekday:
   saturday: "週六"
 _widgets:
   profile: "個人檔案"
-  instanceInfo: "實例資訊"
+  instanceInfo: "伺服器資訊"
   memo: "備忘錄"
   notifications: "通知"
   timeline: "時間軸"
@@ -1975,7 +2057,7 @@ _widgets:
   digitalClock: "電子時鐘"
   unixClock: "UNIX 時間"
   federation: "聯邦宇宙"
-  instanceCloud: "實例雲"
+  instanceCloud: "伺服器雲"
   postForm: "發文視窗"
   slideshow: "幻燈片"
   button: "按鈕"
@@ -2027,7 +2109,7 @@ _visibility:
   specified: "指定使用者"
   specifiedDescription: "僅發布至指定使用者"
   disableFederation: "停用聯邦"
-  disableFederationDescription: "不要傳遞給其他實例"
+  disableFederationDescription: "不發送到其他伺服器"
 _postForm:
   replyPlaceholder: "回覆此貼文..."
   quotePlaceholder: "引用此貼文..."
@@ -2056,6 +2138,7 @@ _profile:
 _exportOrImport:
   allNotes: "所有貼文"
   favoritedNotes: "「我的最愛」貼文"
+  clips: "摘錄"
   followingList: "追隨中"
   muteList: "靜音"
   blockingList: "封鎖"
@@ -2355,3 +2438,5 @@ _dataSaver:
   _code:
     title: "程式碼突出顯示"
     description: "如果使用了 MFM 的程式碼突顯標記，則在點擊之前不會載入。程式碼突顯要求加載每種程式語言的突顯定義檔案，但由於這些檔案不再自動載入，因此有望減少資料流量。"
+_reversi:
+  total: "合計"
-- 
cgit v1.2.3-freya


From 676ee87963d3c6f6d432a379db2a66b585ac1f5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Jan 2024 19:05:02 +0900
Subject: chore(deps-dev): bump vite in /scripts/changelog-checker (#13040)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.0.11 to 5.0.12.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.0.12/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.0.12/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 scripts/changelog-checker/package-lock.json | 8 ++++----
 scripts/changelog-checker/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/changelog-checker/package-lock.json b/scripts/changelog-checker/package-lock.json
index ba51d94647..6ad3273e60 100644
--- a/scripts/changelog-checker/package-lock.json
+++ b/scripts/changelog-checker/package-lock.json
@@ -16,7 +16,7 @@
         "remark-parse": "11.0.0",
         "typescript": "5.3.3",
         "unified": "11.0.4",
-        "vite": "5.0.11",
+        "vite": "5.0.12",
         "vite-node": "1.1.3",
         "vitest": "1.1.3"
       }
@@ -2558,9 +2558,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.0.11",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.11.tgz",
-      "integrity": "sha512-XBMnDjZcNAw/G1gEiskiM1v6yzM4GE5aMGvhWTlHAYYhxb7S3/V1s3m2LDHa8Vh6yIWYYB0iJwsEaS523c4oYA==",
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz",
+      "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.19.3",
diff --git a/scripts/changelog-checker/package.json b/scripts/changelog-checker/package.json
index 8c9a49def1..8b3c9843b7 100644
--- a/scripts/changelog-checker/package.json
+++ b/scripts/changelog-checker/package.json
@@ -17,7 +17,7 @@
     "remark-parse": "11.0.0",
     "typescript": "5.3.3",
     "unified": "11.0.4",
-    "vite": "5.0.11",
+    "vite": "5.0.12",
     "vite-node": "1.1.3",
     "vitest": "1.1.3"
   }
-- 
cgit v1.2.3-freya


From 3784b39a5fffedde6599c1a3fa51af3672107e2a Mon Sep 17 00:00:00 2001
From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 21 Jan 2024 19:08:07 +0900
Subject: enhance(frontend): 季節に応じた画面の演出を南半球に対応させる
 (#12838)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* (enhance) 季節に応じた画面の演出を南半球に対応させる

* Update Changelog

* (add) 半球の簡易自動判定

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---
 CHANGELOG.md                                     |  1 +
 locales/index.d.ts                               |  6 ++++++
 locales/ja-JP.yml                                |  7 +++++++
 packages/frontend/src/boot/main-boot.ts          | 15 ++++++++++++---
 packages/frontend/src/pages/settings/general.vue |  9 +++++++++
 packages/frontend/src/scripts/intl-const.ts      |  4 ++++
 packages/frontend/src/store.ts                   |  5 +++++
 7 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f669c0366e..cff0fc07cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@
 - Enhance: 絵文字ピッカー・オートコンプリートで、完全一致した絵文字を優先的に表示するように
 - Enhance: Playの説明欄にMFMを使えるように
 - Enhance: チャンネルノートの場合は詳細ページからその前後のノートを見れるように
+- Enhance: 季節に応じた画面の演出を南半球でも利用できるように
 - Enhance: タイムラインフィルターの設定をすべて保持できるように
 	- 今までの「TLに他の人への返信を含める」設定は一旦リセットされます
 - Enhance: タイムラインフィルターに「センシティブなファイルを含むノートを表示」を追加
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 5d345b88e6..ae27bd110b 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -4824,6 +4824,7 @@ export interface Locale extends ILocale {
      * タイトルへ
      */
     "backToTitle": string;
+    "hemisphere": string;
     /**
      * センシティブなファイルを含むノートを表示
      */
@@ -9420,6 +9421,11 @@ export interface Locale extends ILocale {
             "description": string;
         };
     };
+    "_hemisphere": {
+        "N": string;
+        "S": string;
+        "caption": string;
+    };
     "_reversi": {
         /**
          * リバーシ
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 180f7f5732..913e677488 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1202,6 +1202,7 @@ replaying: "リプレイ中"
 ranking: "ランキング"
 lastNDays: "直近{n}日"
 backToTitle: "タイトルへ"
+hemisphere: "お住まいの地域"
 withSensitive: "センシティブなファイルを含むノートを表示"
 userSaysSomethingSensitive: "{name}のセンシティブなファイルを含む投稿"
 enableHorizontalSwipe: "スワイプしてタブを切り替える"
@@ -2510,6 +2511,11 @@ _dataSaver:
     title: "コードハイライト"
     description: "MFMなどでコードハイライト記法が使われている場合、タップするまで読み込まれなくなります。コードハイライトではハイライトする言語ごとにその定義ファイルを読み込む必要がありますが、それらが自動で読み込まれなくなるため、通信量の削減が見込めます。"
 
+_hemisphere:
+  N: "北半球"
+  S: "南半球"
+  caption: "一部のクライアント設定で、季節を判定するために使用します。"
+
 _reversi:
   reversi: "リバーシ"
   gameSettings: "対局の設定"
@@ -2551,3 +2557,4 @@ _reversi:
 _offlineScreen:
   title: "オフライン - サーバーに接続できません"
   header: "サーバーに接続できません"
+
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index c99118f9b2..eb0ac43da7 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -77,9 +77,18 @@ export async function mainBoot() {
 
 	if (defaultStore.state.enableSeasonalScreenEffect) {
 		const month = new Date().getMonth() + 1;
-		if (month === 12 || month === 1) {
-			const SnowfallEffect = (await import('@/scripts/snowfall-effect.js')).SnowfallEffect;
-			new SnowfallEffect().render();
+		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();
+			}
 		}
 	}
 
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index bbc910a32a..8b489c7a11 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -17,6 +17,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</template>
 	</MkSelect>
 
+	<MkRadios v-model="hemisphere">
+		<template #label>{{ i18n.ts.hemisphere }}</template>
+		<option value="N">{{ i18n.ts._hemisphere.N }}</option>
+		<option value="S">{{ i18n.ts._hemisphere.S }}</option>
+		<template #caption>{{ i18n.ts._hemisphere.caption }}</template>
+	</MkRadios>
+
 	<MkRadios v-model="overridedDeviceKind">
 		<template #label>{{ i18n.ts.overridedDeviceKind }}</template>
 		<option :value="null">{{ i18n.ts.auto }}</option>
@@ -260,6 +267,7 @@ async function reloadAsk() {
 	unisonReload();
 }
 
+const hemisphere = computed(defaultStore.makeGetterSetter('hemisphere'));
 const overridedDeviceKind = computed(defaultStore.makeGetterSetter('overridedDeviceKind'));
 const serverDisconnectedBehavior = computed(defaultStore.makeGetterSetter('serverDisconnectedBehavior'));
 const showNoteActionsOnlyHover = computed(defaultStore.makeGetterSetter('showNoteActionsOnlyHover'));
@@ -322,6 +330,7 @@ watch(useSystemFont, () => {
 });
 
 watch([
+	hemisphere,
 	lang,
 	fontSize,
 	useSystemFont,
diff --git a/packages/frontend/src/scripts/intl-const.ts b/packages/frontend/src/scripts/intl-const.ts
index ea16c9c2ae..d2d939af1f 100644
--- a/packages/frontend/src/scripts/intl-const.ts
+++ b/packages/frontend/src/scripts/intl-const.ts
@@ -33,6 +33,10 @@ try {
 }
 export const dateTimeFormat = _dateTimeFormat;
 
+export const timeZone = dateTimeFormat.resolvedOptions().timeZone;
+
+export const hemisphere = /^(australia|pacific|antarctica|indian)\//i.test(timeZone) ? 'S' : 'N';
+
 let _numberFormat: Intl.NumberFormat;
 try {
 	_numberFormat = new Intl.NumberFormat(versatileLang);
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 5635e99650..afc35bb825 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -8,6 +8,7 @@ import * as Misskey from 'misskey-js';
 import { miLocalStorage } from './local-storage.js';
 import type { SoundType } from '@/scripts/sound.js';
 import { Storage } from '@/pizzax.js';
+import { hemisphere } from '@/scripts/intl-const.js';
 
 interface PostFormAction {
 	title: string,
@@ -429,6 +430,10 @@ export const defaultStore = markRaw(new Storage('base', {
 			sfxVolume: 1,
 		},
 	},
+  hemisphere: {
+		where: 'device',
+		default: hemisphere as 'N' | 'S',
+  },
 	enableHorizontalSwipe: {
 		where: 'device',
 		default: true,
-- 
cgit v1.2.3-freya