From d429f810a9ea3fda9efed2ff51483d25a288ecc9 Mon Sep 17 00:00:00 2001
From: Ebise Lutica <7106976+EbiseLutica@users.noreply.github.com>
Date: Thu, 13 Apr 2023 00:31:22 +0900
Subject: [PATCH 001/221] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41353c346b..df2265727d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,9 @@
 
 ## 13.11.2
 
+### Note
+- 13.11.0または13.11.1から13.11.2以降にアップデートする場合、Redisのカスタム絵文字のキャッシュを削除する必要があります(https://github.com/misskey-dev/misskey/issues/10502#issuecomment-1502790755 参照)
+
 ### General
 - チャンネルの検索用ページの追加
 

From b95a0457a94b135df9b9511ef77558d1a81962f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 23 Jun 2024 19:04:01 +0900
Subject: [PATCH 002/221] fix(frontend): run `pnpm build-assets` (#14077)

---
 locales/index.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index acdc1fc421..ebd980ed85 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -9761,7 +9761,7 @@ export interface Locale extends ILocale {
     "_dataSaver": {
         "_media": {
             /**
-             * メディアの読み込み
+             * メディアの読み込みを無効化
              */
             "title": string;
             /**
@@ -9771,7 +9771,7 @@ export interface Locale extends ILocale {
         };
         "_avatar": {
             /**
-             * アイコン画像
+             * アイコン画像のアニメーションを無効化
              */
             "title": string;
             /**
@@ -9781,7 +9781,7 @@ export interface Locale extends ILocale {
         };
         "_urlPreview": {
             /**
-             * URLプレビューのサムネイル
+             * URLプレビューのサムネイルを非表示
              */
             "title": string;
             /**
@@ -9791,7 +9791,7 @@ export interface Locale extends ILocale {
         };
         "_code": {
             /**
-             * コードハイライト
+             * コードハイライトを非表示
              */
             "title": string;
             /**

From 634764e1a6e06ea9c117b720d58685fe99cae81a Mon Sep 17 00:00:00 2001
From: woxtu <woxtup@gmail.com>
Date: Mon, 24 Jun 2024 21:32:12 +0900
Subject: [PATCH 003/221] refactor(frontend): Remove unused directives (#14085)

---
 packages/frontend/src/components/MkCaptcha.vue | 1 -
 packages/frontend/src/i18n.ts                  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/frontend/src/components/MkCaptcha.vue b/packages/frontend/src/components/MkCaptcha.vue
index c64bb47e77..c5b6e0caed 100644
--- a/packages/frontend/src/components/MkCaptcha.vue
+++ b/packages/frontend/src/components/MkCaptcha.vue
@@ -104,7 +104,6 @@ async function requestRender() {
 		});
 	} else if (props.provider === 'mcaptcha' && props.instanceUrl && props.sitekey) {
 		const { default: Widget } = await import('@mcaptcha/vanilla-glue');
-		// @ts-expect-error avoid typecheck error
 		new Widget({
 			siteKey: {
 				instanceUrl: new URL(props.instanceUrl),
diff --git a/packages/frontend/src/i18n.ts b/packages/frontend/src/i18n.ts
index cc9faddb20..10d6adbcd0 100644
--- a/packages/frontend/src/i18n.ts
+++ b/packages/frontend/src/i18n.ts
@@ -11,6 +11,5 @@ import { I18n } from '@/scripts/i18n.js';
 export const i18n = markRaw(new I18n<Locale>(locale));
 
 export function updateI18n(newLocale: Locale) {
-	// @ts-expect-error -- private field
 	i18n.locale = newLocale;
 }

From 1c5d0cf5364ed841bd181b75682503a648a90bd6 Mon Sep 17 00:00:00 2001
From: yupix <yupi0982@outlook.jp>
Date: Wed, 26 Jun 2024 10:25:18 +0900
Subject: [PATCH 004/221] =?UTF-8?q?feat:=20=E3=82=A2=E3=83=B3=E3=83=86?=
 =?UTF-8?q?=E3=83=8A=E3=81=AE=E7=B7=A8=E9=9B=86=E7=94=BB=E9=9D=A2=E3=81=AE?=
 =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=ABgap=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=20(#14091)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                       | 1 +
 packages/frontend/src/pages/my-antennas/editor.vue | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 354bbd20fd..290b13ab36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Fix: ユーザーページの追加情報のラベルを投稿者のサーバーの絵文字で表示する (#13968)
 - Fix: リバーシの対局を正しく共有できないことがある問題を修正
 - Fix: コントロールパネルでベースロールのポリシーを編集してもUI上では変更が反映されない問題を修正 
+- Fix: アンテナの編集画面のボタンに隙間を追加
 
 ### Server
 - チャート生成時にinstance.suspentionStateに置き換えられたinstance.isSuspendedが参照されてしまう問題を修正
diff --git a/packages/frontend/src/pages/my-antennas/editor.vue b/packages/frontend/src/pages/my-antennas/editor.vue
index 2949bfc02c..02e8f98265 100644
--- a/packages/frontend/src/pages/my-antennas/editor.vue
+++ b/packages/frontend/src/pages/my-antennas/editor.vue
@@ -41,8 +41,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkSwitch v-model="withFile">{{ i18n.ts.withFileAntenna }}</MkSwitch>
 		</div>
 		<div :class="$style.actions">
-			<MkButton inline primary @click="saveAntenna()"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton>
-			<MkButton v-if="antenna.id != null" inline danger @click="deleteAntenna()"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
+			<div class="_buttons">
+				<MkButton inline primary @click="saveAntenna()"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton>
+				<MkButton v-if="antenna.id != null" inline danger @click="deleteAntenna()"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
+			</div>
 		</div>
 	</div>
 </MkSpacer>

From 77012f2f2925c93978a3a5844d1adddd330d777b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AC=E3=82=8B=E3=81=8D=E3=82=83=E3=81=A3=E3=81=A8?=
 <nullnyat@nca10.moe>
Date: Thu, 27 Jun 2024 10:40:46 +0900
Subject: [PATCH 005/221] =?UTF-8?q?fix(frontend):=20=E3=83=86=E3=83=BC?=
 =?UTF-8?q?=E3=83=9E=E3=83=97=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC=E3=81=8C?=
 =?UTF-8?q?=E8=A6=8B=E3=82=8C=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(#14097)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): テーマプレビューが見れない問題を修正

* fix: MkPreview.vue, preview.vue
---
 .../frontend/src/components/MkPreview.vue     | 150 ++++++++++++++++++
 packages/frontend/src/pages/preview.vue       |  26 +++
 packages/frontend/src/router/definition.ts    |   3 +
 3 files changed, 179 insertions(+)
 create mode 100644 packages/frontend/src/components/MkPreview.vue
 create mode 100644 packages/frontend/src/pages/preview.vue

diff --git a/packages/frontend/src/components/MkPreview.vue b/packages/frontend/src/components/MkPreview.vue
new file mode 100644
index 0000000000..d950d66c6e
--- /dev/null
+++ b/packages/frontend/src/components/MkPreview.vue
@@ -0,0 +1,150 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div :class="$style.preview">
+	<div :class="$style.preview__content1">
+		<MkInput v-model="text">
+			<template #label>Text</template>
+		</MkInput>
+		<MkSwitch v-model="flag" :class="$style.preview__content1__switch_button">
+			<span>Switch is now {{ flag ? 'on' : 'off' }}</span>
+		</MkSwitch>
+		<div :class="$style.preview__content1__input">
+			<MkRadio v-model="radio" value="misskey">Misskey</MkRadio>
+			<MkRadio v-model="radio" value="mastodon">Mastodon</MkRadio>
+			<MkRadio v-model="radio" value="pleroma">Pleroma</MkRadio>
+		</div>
+		<div :class="$style.preview__content1__button">
+		<MkButton inline>This is</MkButton>
+		<MkButton inline primary>the button</MkButton>
+		</div>
+	</div>
+	<div :class="$style.preview__content2" style="pointer-events: none;">
+		<Mfm :text="mfm"/>
+	</div>
+	<div :class="$style.preview__content3">
+		<MkButton inline primary @click="openMenu">Open menu</MkButton>
+		<MkButton inline primary @click="openDialog">Open dialog</MkButton>
+		<MkButton inline primary @click="openForm">Open form</MkButton>
+		<MkButton inline primary @click="openDrive">Open drive</MkButton>
+	</div>
+</div>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue';
+import MkButton from '@/components/MkButton.vue';
+import MkInput from '@/components/MkInput.vue';
+import MkSwitch from '@/components/MkSwitch.vue';
+import MkTextarea from '@/components/MkTextarea.vue';
+import MkRadio from '@/components/MkRadio.vue';
+import * as os from '@/os.js';
+import * as config from '@/config.js';
+import { $i } from '@/account.js';
+
+const text = ref('');
+const flag = ref(true);
+const radio = ref('misskey');
+const mfm = ref(`Hello world! This is an @example mention. BTW you are @${$i ? $i.username : 'guest'}.\nAlso, here is ${config.url} and [example link](${config.url}). for more details, see https://example.com.\nAs you know #misskey is open-source software.`);
+
+const openDialog = async () => {
+	await os.alert({
+		type: 'warning',
+		title: 'Oh my Aichan',
+		text: 'Lorem ipsum dolor sit amet, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+	});
+};
+
+const openForm = async () => {
+	await os.form('Example form', {
+		foo: {
+			type: 'boolean',
+			default: true,
+			label: 'This is a boolean property',
+		},
+		bar: {
+			type: 'number',
+			default: 300,
+			label: 'This is a number property',
+		},
+		baz: {
+			type: 'string',
+			default: 'Misskey makes you happy.',
+			label: 'This is a string property',
+		},
+	});
+};
+
+const openDrive = async () => {
+	await os.selectDriveFile(false);
+};
+
+const selectUser = async () => {
+	await os.selectUser();
+};
+
+const openMenu = async (ev: Event) => {
+	os.popupMenu([{
+		type: 'label',
+		text: 'Fruits',
+	}, {
+		text: 'Create some apples',
+		action: () => {},
+	}, {
+		text: 'Read some oranges',
+		action: () => {},
+	}, {
+		text: 'Update some melons',
+		action: () => {},
+	}, {
+		text: 'Delete some bananas',
+		danger: true,
+		action: () => {},
+	}], ev.currentTarget ?? ev.target);
+};
+</script>
+
+<style lang="scss" module>
+.preview {
+	padding: 16px;
+
+	&__content1 {
+
+		&__switch_button {
+			padding: 16px 0 8px 0;
+		}
+
+		&__input {
+			padding: 8px 0 8px 0;
+
+			div {
+				margin: 0 8px 8px 0;
+			}
+		}
+
+		&__button {
+			padding: 4px 0 8px 0;
+
+			button {
+				margin: 0 8px 8px 0;
+			}
+		}
+	}
+
+	&__content2 {
+		padding: 8px 0 8px 0;
+	}
+
+	&__content3 {
+		padding: 8px 0 8px 0;
+
+		button {
+			margin: 0 8px 8px 0;
+
+		}
+	}
+}
+</style>
diff --git a/packages/frontend/src/pages/preview.vue b/packages/frontend/src/pages/preview.vue
new file mode 100644
index 0000000000..8e07b190aa
--- /dev/null
+++ b/packages/frontend/src/pages/preview.vue
@@ -0,0 +1,26 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div>
+	<MkSample/>
+</div>
+</template>
+
+<script lang="ts" setup>
+import { computed } from 'vue';
+import MkSample from '@/components/MkPreview.vue';
+import { i18n } from '@/i18n.js';
+import { definePageMetadata } from '@/scripts/page-metadata.js';
+
+const headerActions = computed(() => []);
+
+const headerTabs = computed(() => []);
+
+definePageMetadata(computed(() => ({
+	title: i18n.ts.preview,
+	icon: 'ti ti-eye',
+})));
+</script>
diff --git a/packages/frontend/src/router/definition.ts b/packages/frontend/src/router/definition.ts
index 8a443f627b..12ab633af1 100644
--- a/packages/frontend/src/router/definition.ts
+++ b/packages/frontend/src/router/definition.ts
@@ -251,6 +251,9 @@ const routes: RouteDef[] = [{
 }, {
 	path: '/scratchpad',
 	component: page(() => import('@/pages/scratchpad.vue')),
+}, {
+	path: '/preview',
+	component: page(() => import('@/pages/preview.vue')),
 }, {
 	path: '/auth/:token',
 	component: page(() => import('@/pages/auth.vue')),

From 0e512d4ff6d2a7c56ac6295bf26d1101a3b6a317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AC=E3=82=8B=E3=81=8D=E3=82=83=E3=81=A3=E3=81=A8?=
 <nullnyat@nca10.moe>
Date: Thu, 27 Jun 2024 18:23:47 +0900
Subject: [PATCH 006/221] update: CHANGELOG.md for #14097 (#14099)

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 290b13ab36..3a28c9ef64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Fix: リバーシの対局を正しく共有できないことがある問題を修正
 - Fix: コントロールパネルでベースロールのポリシーを編集してもUI上では変更が反映されない問題を修正 
 - Fix: アンテナの編集画面のボタンに隙間を追加
+- Fix: テーマプレビューが見れない問題を修正
 
 ### Server
 - チャート生成時にinstance.suspentionStateに置き換えられたinstance.isSuspendedが参照されてしまう問題を修正

From 4096dabe1e4b6ebb43e47fbee19954fb92adbdc7 Mon Sep 17 00:00:00 2001
From: woxtu <woxtup@gmail.com>
Date: Thu, 27 Jun 2024 21:59:19 +0900
Subject: [PATCH 007/221] Add null checking (#14089)

---
 packages/frontend/src/components/MkFollowButton.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/frontend/src/components/MkFollowButton.vue b/packages/frontend/src/components/MkFollowButton.vue
index 636e61db8f..6a4081079c 100644
--- a/packages/frontend/src/components/MkFollowButton.vue
+++ b/packages/frontend/src/components/MkFollowButton.vue
@@ -121,6 +121,8 @@ async function onClick() {
 				});
 				hasPendingFollowRequestFromYou.value = true;
 
+				if ($i == null) return;
+
 				claimAchievement('following1');
 
 				if ($i.followingCount >= 10) {

From a6edd50a5d292e29e6292754a7be95205ac7dbc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AC=E3=82=8B=E3=81=8D=E3=82=83=E3=81=A3=E3=81=A8?=
 <nullnyat@nca10.moe>
Date: Fri, 28 Jun 2024 11:16:12 +0900
Subject: [PATCH 008/221] =?UTF-8?q?chore(docker-compose):=20=E6=8E=A8?=
 =?UTF-8?q?=E5=A5=A8=E3=81=AE=E5=90=8D=E5=89=8D=E3=81=AB=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=20(#14096)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(docker-compose): 推奨の名前にする

https://github.com/compose-spec/compose-spec/blob/5c18e329d5a15a15e4b636ed093b256b96615e33/spec.md#compose-file

* yaml to yml

* fix

* fix
---
 .devcontainer/{docker-compose.yml => compose.yml}         | 2 --
 .devcontainer/devcontainer.json                           | 2 +-
 .dockerignore                                             | 4 ++--
 .github/workflows/dockle.yml                              | 2 +-
 .gitignore                                                | 4 ++--
 CONTRIBUTING.md                                           | 2 +-
 docker-compose.local-db.yml => compose.local-db.yml       | 2 --
 docker-compose_example.yml => compose_example.yml         | 2 --
 packages/backend/test/{docker-compose.yml => compose.yml} | 2 --
 9 files changed, 7 insertions(+), 15 deletions(-)
 rename .devcontainer/{docker-compose.yml => compose.yml} (98%)
 rename docker-compose.local-db.yml => compose.local-db.yml (98%)
 rename docker-compose_example.yml => compose_example.yml (99%)
 rename packages/backend/test/{docker-compose.yml => compose.yml} (94%)

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/compose.yml
similarity index 98%
rename from .devcontainer/docker-compose.yml
rename to .devcontainer/compose.yml
index a52d086fb6..d02d2a8f4a 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   app:
     build:
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 344edbd65d..7ea23e314e 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
 	"name": "Misskey",
-	"dockerComposeFile": "docker-compose.yml",
+	"dockerComposeFile": "compose.yml",
 	"service": "app",
 	"workspaceFolder": "/workspace",
 	"features": {
diff --git a/.dockerignore b/.dockerignore
index 1de0c7982b..7dbb06e1d0 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,7 +7,7 @@ Dockerfile
 build/
 built/
 db/
-docker-compose.yml
+.devcontainer/compose.yml
 node_modules/
 packages/*/node_modules
 redis/
@@ -28,4 +28,4 @@ fluent-emojis/
 
 .idea/
 packages/*/.vscode/
-packages/backend/test/docker-compose.yml
+packages/backend/test/compose.yml
diff --git a/.github/workflows/dockle.yml b/.github/workflows/dockle.yml
index 968971dd8d..c3dba4213d 100644
--- a/.github/workflows/dockle.yml
+++ b/.github/workflows/dockle.yml
@@ -22,7 +22,7 @@ jobs:
           sudo dpkg -i dockle.deb
       - run: |
           cp .config/docker_example.env .config/docker.env
-          cp ./docker-compose_example.yml ./docker-compose.yml
+          cp ./compose_example.yml ./compose.yml
       - run: |
           docker compose up -d web
           docker tag "$(docker compose images web | awk 'OFS=":" {print $4}' | tail -n +2)" misskey-web:latest
diff --git a/.gitignore b/.gitignore
index bdc14fea0a..3466984cf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,8 +35,8 @@ coverage
 !/.config/example.yml
 !/.config/docker_example.yml
 !/.config/docker_example.env
-docker-compose.yml
-!/.devcontainer/docker-compose.yml
+.devcontainer/compose.yml
+!/.devcontainer/compose.yml
 
 # misskey
 /build
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index dcb625626d..06c2d2f21d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -165,7 +165,7 @@ cp .github/misskey/test.yml .config/
 ```
 Prepare DB/Redis for testing.
 ```
-docker compose -f packages/backend/test/docker-compose.yml up
+docker compose -f packages/backend/test/compose.yaml up
 ```
 Alternatively, prepare an empty (data can be erased) DB and edit `.config/test.yml`.
 
diff --git a/docker-compose.local-db.yml b/compose.local-db.yml
similarity index 98%
rename from docker-compose.local-db.yml
rename to compose.local-db.yml
index 16ba4b49e1..3835cb23db 100644
--- a/docker-compose.local-db.yml
+++ b/compose.local-db.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 # このconfigは、 dockerでMisskey本体を起動せず、 redisとpostgresql などだけを起動します
 
 services:
diff --git a/docker-compose_example.yml b/compose_example.yml
similarity index 99%
rename from docker-compose_example.yml
rename to compose_example.yml
index 5cebbe4164..75d0d3a59c 100644
--- a/docker-compose_example.yml
+++ b/compose_example.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   web:
     build: .
diff --git a/packages/backend/test/docker-compose.yml b/packages/backend/test/compose.yml
similarity index 94%
rename from packages/backend/test/docker-compose.yml
rename to packages/backend/test/compose.yml
index f2d8990758..6593fc33dd 100644
--- a/packages/backend/test/docker-compose.yml
+++ b/packages/backend/test/compose.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   redistest:
     image: redis:7

From f1b1e2a7cca3d69eb6162d4c16746968d855ea40 Mon Sep 17 00:00:00 2001
From: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
Date: Tue, 2 Jul 2024 10:57:20 +0900
Subject: [PATCH 009/221] fix(storybook): prevent infinite remount of component
 (#14101)

* fix(storybook): prevent infinite remount of component

* fix: disable flaky `.toMatch()` test
---
 packages/frontend/.storybook/preview.ts       |  6 +-
 .../MkChannelFollowButton.stories.impl.ts     |  6 --
 .../components/MkClickerGame.stories.impl.ts  | 12 ++-
 .../src/components/MkCwButton.stories.impl.ts | 10 ---
 .../src/components/global/MkA.stories.impl.ts |  2 -
 .../components/global/MkAd.stories.impl.ts    | 87 +++++++------------
 packages/frontend/src/scripts/test-utils.ts   | 10 ---
 7 files changed, 41 insertions(+), 92 deletions(-)

diff --git a/packages/frontend/.storybook/preview.ts b/packages/frontend/.storybook/preview.ts
index 73ee007fb8..d000a28232 100644
--- a/packages/frontend/.storybook/preview.ts
+++ b/packages/frontend/.storybook/preview.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { FORCE_REMOUNT } from '@storybook/core-events';
+import { FORCE_RE_RENDER, FORCE_REMOUNT } from '@storybook/core-events';
 import { addons } from '@storybook/preview-api';
 import { type Preview, setup } from '@storybook/vue3';
 import isChromatic from 'chromatic/isChromatic';
@@ -16,7 +16,7 @@ import '../src/style.scss';
 
 const appInitialized = Symbol();
 
-let lastStory = null;
+let lastStory: string | null = null;
 let moduleInitialized = false;
 let unobserve = () => {};
 let misskeyOS = null;
@@ -110,7 +110,7 @@ const preview = {
 				}).catch(() => {});
 				Promise.all([resetIndexedDBPromise, resetDefaultStorePromise]).then(() => {
 					initLocalStorage();
-					channel.emit(FORCE_REMOUNT, { storyId: context.id });
+					channel.emit(FORCE_RE_RENDER, { storyId: context.id });
 				});
 			}
 			const story = Story();
diff --git a/packages/frontend/src/components/MkChannelFollowButton.stories.impl.ts b/packages/frontend/src/components/MkChannelFollowButton.stories.impl.ts
index b99620da22..b9770670dc 100644
--- a/packages/frontend/src/components/MkChannelFollowButton.stories.impl.ts
+++ b/packages/frontend/src/components/MkChannelFollowButton.stories.impl.ts
@@ -12,14 +12,12 @@ import { expect, userEvent, within } from '@storybook/test';
 import { channel } from '../../.storybook/fakes.js';
 import { commonHandlers } from '../../.storybook/mocks.js';
 import MkChannelFollowButton from './MkChannelFollowButton.vue';
-import { semaphore } from '@/scripts/test-utils.js';
 import { i18n } from '@/i18n.js';
 
 function sleep(ms: number) {
 	return new Promise(resolve => setTimeout(resolve, ms));
 }
 
-const s = semaphore();
 export const Default = {
 	render(args) {
 		return {
@@ -46,17 +44,13 @@ export const Default = {
 		full: true,
 	},
 	async play({ canvasElement }) {
-		await s.acquire();
-		await sleep(1000);
 		const canvas = within(canvasElement);
 		const buttonElement = canvas.getByRole<HTMLButtonElement>('button');
 		await expect(buttonElement).toHaveTextContent(i18n.ts.follow);
 		await userEvent.click(buttonElement);
 		await sleep(1000);
 		await expect(buttonElement).toHaveTextContent(i18n.ts.unfollow);
-		await sleep(100);
 		await userEvent.click(buttonElement);
-		s.release();
 	},
 	parameters: {
 		layout: 'centered',
diff --git a/packages/frontend/src/components/MkClickerGame.stories.impl.ts b/packages/frontend/src/components/MkClickerGame.stories.impl.ts
index 8378010f8b..36313f965d 100644
--- a/packages/frontend/src/components/MkClickerGame.stories.impl.ts
+++ b/packages/frontend/src/components/MkClickerGame.stories.impl.ts
@@ -8,7 +8,7 @@
 import { StoryObj } from '@storybook/vue3';
 import { HttpResponse, http } from 'msw';
 import { action } from '@storybook/addon-actions';
-import { expect, within } from '@storybook/test';
+import { expect, userEvent, within } from '@storybook/test';
 import { commonHandlers } from '../../.storybook/mocks.js';
 import MkClickerGame from './MkClickerGame.vue';
 
@@ -41,12 +41,10 @@ export const Default = {
 		await sleep(1000);
 		const canvas = within(canvasElement);
 		const count = canvas.getByTestId('count');
-		// NOTE: flaky なので N/A も通しておく
-		await expect(count).toHaveTextContent(/^(0|N\/A)$/);
-		// FIXME: flaky
-		// const buttonElement = canvas.getByRole<HTMLButtonElement>('button');
-		// await userEvent.click(buttonElement);
-		// await expect(count).toHaveTextContent('1');
+		await expect(count).toHaveTextContent('0');
+		const buttonElement = canvas.getByRole<HTMLButtonElement>('button');
+		await userEvent.click(buttonElement);
+		await expect(count).toHaveTextContent('1');
 	},
 	parameters: {
 		layout: 'centered',
diff --git a/packages/frontend/src/components/MkCwButton.stories.impl.ts b/packages/frontend/src/components/MkCwButton.stories.impl.ts
index 05c6001552..5d6ea56da9 100644
--- a/packages/frontend/src/components/MkCwButton.stories.impl.ts
+++ b/packages/frontend/src/components/MkCwButton.stories.impl.ts
@@ -11,13 +11,6 @@ import { expect, userEvent, within } from '@storybook/test';
 import { file } from '../../.storybook/fakes.js';
 import MkCwButton from './MkCwButton.vue';
 import { i18n } from '@/i18n.js';
-import { semaphore } from '@/scripts/test-utils.js';
-
-function sleep(ms: number) {
-	return new Promise(resolve => setTimeout(resolve, ms));
-}
-
-const s = semaphore();
 
 export const Default = {
 	render(args) {
@@ -54,8 +47,6 @@ export const Default = {
 		text: 'Some CW content',
 	},
 	async play({ canvasElement }) {
-		await s.acquire();
-		await sleep(1000);
 		const canvas = within(canvasElement);
 		const buttonElement = canvas.getByRole<HTMLButtonElement>('button');
 		await expect(buttonElement).toHaveTextContent(i18n.ts._cw.show);
@@ -63,7 +54,6 @@ export const Default = {
 		await userEvent.click(buttonElement);
 		await expect(buttonElement).toHaveTextContent(i18n.ts._cw.hide);
 		await userEvent.click(buttonElement);
-		s.release();
 	},
 	parameters: {
 		chromatic: {
diff --git a/packages/frontend/src/components/global/MkA.stories.impl.ts b/packages/frontend/src/components/global/MkA.stories.impl.ts
index c1d8cf0ca6..02e5a7f98c 100644
--- a/packages/frontend/src/components/global/MkA.stories.impl.ts
+++ b/packages/frontend/src/components/global/MkA.stories.impl.ts
@@ -35,12 +35,10 @@ export const Default = {
 		// FIXME: 通るけどその後落ちるのでコメントアウト
 		// await expect(a.href).toMatch(/^https?:\/\/.*#test$/);
 		await userEvent.pointer({ keys: '[MouseRight]', target: a });
-		await tick();
 		const menu = canvas.getByRole('menu');
 		await expect(menu).toBeInTheDocument();
 		await userEvent.click(a);
 		a.blur();
-		await tick();
 		await expect(menu).not.toBeInTheDocument();
 	},
 	args: {
diff --git a/packages/frontend/src/components/global/MkAd.stories.impl.ts b/packages/frontend/src/components/global/MkAd.stories.impl.ts
index aef26ab92d..8c0b7ef52f 100644
--- a/packages/frontend/src/components/global/MkAd.stories.impl.ts
+++ b/packages/frontend/src/components/global/MkAd.stories.impl.ts
@@ -9,12 +9,6 @@ import { StoryObj } from '@storybook/vue3';
 import MkAd from './MkAd.vue';
 import { i18n } from '@/i18n.js';
 
-let lock: Promise<undefined> | undefined;
-
-function sleep(ms: number) {
-	return new Promise(resolve => setTimeout(resolve, ms));
-}
-
 const common = {
 	render(args) {
 		return {
@@ -37,56 +31,41 @@ const common = {
 		};
 	},
 	async play({ canvasElement, args }) {
-		if (lock) {
-			console.warn('This test is unexpectedly running twice in parallel, fix it!');
-			console.warn('See also: https://github.com/misskey-dev/misskey/issues/11267');
-			await lock;
+		const canvas = within(canvasElement);
+		const a = canvas.getByRole<HTMLAnchorElement>('link');
+		// FIXME: 通るけどその後落ちるのでコメントアウト
+		// await expect(a.href).toMatch(/^https?:\/\/.*#test$/);
+		const img = within(a).getByRole('img');
+		await expect(img).toBeInTheDocument();
+		let buttons = canvas.getAllByRole<HTMLButtonElement>('button');
+		await expect(buttons).toHaveLength(1);
+		const i = buttons[0];
+		await expect(i).toBeInTheDocument();
+		await userEvent.click(i);
+		await expect(canvasElement).toHaveTextContent(i18n.ts._ad.back);
+		await expect(a).not.toBeInTheDocument();
+		await expect(i).not.toBeInTheDocument();
+		buttons = canvas.getAllByRole<HTMLButtonElement>('button');
+		const hasReduceFrequency = args.specify?.ratio !== 0;
+		await expect(buttons).toHaveLength(hasReduceFrequency ? 2 : 1);
+		const reduce = hasReduceFrequency ? buttons[0] : null;
+		const back = buttons[hasReduceFrequency ? 1 : 0];
+		if (reduce) {
+			await expect(reduce).toBeInTheDocument();
+			await expect(reduce).toHaveTextContent(i18n.ts._ad.reduceFrequencyOfThisAd);
 		}
-
-		let resolve: (value?: any) => void;
-		lock = new Promise(r => resolve = r);
-
-		try {
-			// NOTE: sleep しないと何故か落ちる
-			await sleep(100);
-			const canvas = within(canvasElement);
-			const a = canvas.getByRole<HTMLAnchorElement>('link');
-			// await expect(a.href).toMatch(/^https?:\/\/.*#test$/);
-			const img = within(a).getByRole('img');
-			await expect(img).toBeInTheDocument();
-			let buttons = canvas.getAllByRole<HTMLButtonElement>('button');
-			await expect(buttons).toHaveLength(1);
-			const i = buttons[0];
-			await expect(i).toBeInTheDocument();
-			await userEvent.click(i);
-			await expect(canvasElement).toHaveTextContent(i18n.ts._ad.back);
-			await expect(a).not.toBeInTheDocument();
-			await expect(i).not.toBeInTheDocument();
-			buttons = canvas.getAllByRole<HTMLButtonElement>('button');
-			const hasReduceFrequency = args.specify?.ratio !== 0;
-			await expect(buttons).toHaveLength(hasReduceFrequency ? 2 : 1);
-			const reduce = hasReduceFrequency ? buttons[0] : null;
-			const back = buttons[hasReduceFrequency ? 1 : 0];
-			if (reduce) {
-				await expect(reduce).toBeInTheDocument();
-				await expect(reduce).toHaveTextContent(i18n.ts._ad.reduceFrequencyOfThisAd);
-			}
-			await expect(back).toBeInTheDocument();
-			await expect(back).toHaveTextContent(i18n.ts._ad.back);
-			await userEvent.click(back);
-			await waitFor(() => expect(canvas.queryByRole('img')).toBeTruthy());
-			if (reduce) {
-				await expect(reduce).not.toBeInTheDocument();
-			}
-			await expect(back).not.toBeInTheDocument();
-			const aAgain = canvas.getByRole<HTMLAnchorElement>('link');
-			await expect(aAgain).toBeInTheDocument();
-			const imgAgain = within(aAgain).getByRole('img');
-			await expect(imgAgain).toBeInTheDocument();
-		} finally {
-			resolve!();
-			lock = undefined;
+		await expect(back).toBeInTheDocument();
+		await expect(back).toHaveTextContent(i18n.ts._ad.back);
+		await userEvent.click(back);
+		await waitFor(() => expect(canvas.queryByRole('img')).toBeTruthy());
+		if (reduce) {
+			await expect(reduce).not.toBeInTheDocument();
 		}
+		await expect(back).not.toBeInTheDocument();
+		const aAgain = canvas.getByRole<HTMLAnchorElement>('link');
+		await expect(aAgain).toBeInTheDocument();
+		const imgAgain = within(aAgain).getByRole('img');
+		await expect(imgAgain).toBeInTheDocument();
 	},
 	args: {
 		prefer: [],
diff --git a/packages/frontend/src/scripts/test-utils.ts b/packages/frontend/src/scripts/test-utils.ts
index a32315f4df..52bb2d94e0 100644
--- a/packages/frontend/src/scripts/test-utils.ts
+++ b/packages/frontend/src/scripts/test-utils.ts
@@ -7,13 +7,3 @@ export async function tick(): Promise<void> {
 	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 	await new Promise((globalThis.requestIdleCallback ?? setTimeout) as never);
 }
-
-/**
- * @see https://github.com/misskey-dev/misskey/issues/11267
- */
-export function semaphore(counter = 0, waiting: (() => void)[] = []) {
-	return {
-		acquire: () => ++counter > 1 && new Promise<void>(resolve => waiting.push(resolve)),
-		release: () => --counter && waiting.pop()?.(),
-	};
-}

From 427648c4b8c5b7699c92afa95a14097bb9329ee8 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 2 Jul 2024 11:38:34 +0900
Subject: [PATCH 010/221] update deps (#14057)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* wip

* locales/index.jsのymlファイル取得ロジックを調節

* regenerate pnpm-lock.yaml

* fix(backend): typecheck fails

* chore(deps): bump ip-cidr from 4.0.0 to 4.0.1 in /packages/backend

* chore: migrate ESLint configs to flat config (#14094)

* chore: migrate ESLint configs to flat config

* fix: update paths

* fix: frontend lint fails

* refactor(misskey-js): lint build.js

* update deps

---------

Co-authored-by: samunohito <46447427+samunohito@users.noreply.github.com>
Co-authored-by: zyoshoka <root@zyoshoka.com>
Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
---
 .github/workflows/lint.yml                    |    4 +-
 locales/index.js                              |    6 +-
 package.json                                  |   20 +-
 packages/backend/.eslintignore                |    4 -
 packages/backend/.eslintrc.cjs                |   32 -
 packages/backend/eslint.config.js             |   46 +
 packages/backend/package.json                 |   98 +-
 packages/backend/test-server/.eslintrc.cjs    |   32 -
 packages/backend/test-server/eslint.config.js |   43 +
 packages/backend/test/.eslintrc.cjs           |   11 -
 packages/backend/test/eslint.config.js        |   22 +
 packages/frontend/.eslintrc.cjs               |   82 -
 packages/frontend/eslint.config.js            |   95 +
 packages/frontend/package.json                |  116 +-
 packages/frontend/tsconfig.json               |    1 -
 packages/misskey-bubble-game/.eslintignore    |    8 -
 packages/misskey-bubble-game/.eslintrc.cjs    |    9 -
 packages/misskey-bubble-game/eslint.config.js |   27 +
 packages/misskey-bubble-game/package.json     |    4 +-
 packages/misskey-js/.eslintignore             |    8 -
 packages/misskey-js/.eslintrc.cjs             |    9 -
 packages/misskey-js/build.js                  |   32 +-
 packages/misskey-js/eslint.config.js          |   28 +
 packages/misskey-js/generator/.eslintrc.cjs   |    9 -
 .../misskey-js/generator/eslint.config.js     |   17 +
 packages/misskey-js/generator/package.json    |    4 +-
 packages/misskey-js/package.json              |   24 +-
 packages/misskey-reversi/.eslintignore        |    8 -
 packages/misskey-reversi/.eslintrc.cjs        |   10 -
 packages/misskey-reversi/eslint.config.js     |   23 +
 packages/misskey-reversi/package.json         |    4 +-
 packages/shared/.eslintrc.js                  |    7 -
 packages/shared/eslint.config.js              |   28 +
 packages/shared/package.json                  |    3 +
 packages/sw/.eslintrc.cjs                     |   20 -
 packages/sw/eslint.config.js                  |   32 +
 packages/sw/package.json                      |   10 +-
 pnpm-lock.yaml                                | 9005 +++++++++--------
 scripts/changelog-checker/.eslintrc.cjs       |    9 -
 scripts/changelog-checker/eslint.config.js    |   17 +
 40 files changed, 5556 insertions(+), 4411 deletions(-)
 delete mode 100644 packages/backend/.eslintignore
 delete mode 100644 packages/backend/.eslintrc.cjs
 create mode 100644 packages/backend/eslint.config.js
 delete mode 100644 packages/backend/test-server/.eslintrc.cjs
 create mode 100644 packages/backend/test-server/eslint.config.js
 delete mode 100644 packages/backend/test/.eslintrc.cjs
 create mode 100644 packages/backend/test/eslint.config.js
 delete mode 100644 packages/frontend/.eslintrc.cjs
 create mode 100644 packages/frontend/eslint.config.js
 delete mode 100644 packages/misskey-bubble-game/.eslintignore
 delete mode 100644 packages/misskey-bubble-game/.eslintrc.cjs
 create mode 100644 packages/misskey-bubble-game/eslint.config.js
 delete mode 100644 packages/misskey-js/.eslintignore
 delete mode 100644 packages/misskey-js/.eslintrc.cjs
 create mode 100644 packages/misskey-js/eslint.config.js
 delete mode 100644 packages/misskey-js/generator/.eslintrc.cjs
 create mode 100644 packages/misskey-js/generator/eslint.config.js
 delete mode 100644 packages/misskey-reversi/.eslintignore
 delete mode 100644 packages/misskey-reversi/.eslintrc.cjs
 create mode 100644 packages/misskey-reversi/eslint.config.js
 delete mode 100644 packages/shared/.eslintrc.js
 create mode 100644 packages/shared/eslint.config.js
 create mode 100644 packages/shared/package.json
 delete mode 100644 packages/sw/.eslintrc.cjs
 create mode 100644 packages/sw/eslint.config.js
 delete mode 100644 scripts/changelog-checker/.eslintrc.cjs
 create mode 100644 scripts/changelog-checker/eslint.config.js

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 76616ec5a7..1a1b30168a 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -10,14 +10,14 @@ on:
       - packages/frontend/**
       - packages/sw/**
       - packages/misskey-js/**
-      - packages/shared/.eslintrc.js
+      - packages/shared/eslint.config.js
   pull_request:
     paths:
       - packages/backend/**
       - packages/frontend/**
       - packages/sw/**
       - packages/misskey-js/**
-      - packages/shared/.eslintrc.js
+      - packages/shared/eslint.config.js
 
 jobs:
   pnpm_install:
diff --git a/locales/index.js b/locales/index.js
index 650e552337..c2738884eb 100644
--- a/locales/index.js
+++ b/locales/index.js
@@ -52,7 +52,11 @@ const primaries = {
 const clean = (text) => text.replace(new RegExp(String.fromCodePoint(0x08), 'g'), '');
 
 export function build() {
-	const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(new URL(`${c}.yml`, import.meta.url), 'utf-8'))) || {}, a), {});
+	// vitestの挙動を調整するため、一度ローカル変数化する必要がある
+	// https://github.com/vitest-dev/vitest/issues/3988#issuecomment-1686599577
+	// https://github.com/misskey-dev/misskey/pull/14057#issuecomment-2192833785
+	const metaUrl = import.meta.url;
+	const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(new URL(`${c}.yml`, metaUrl), 'utf-8'))) || {}, a), {});
 
 	// 空文字列が入ることがあり、フォールバックが動作しなくなるのでプロパティごと消す
 	const removeEmpty = (obj) => {
diff --git a/package.json b/package.json
index 5adce65415..bf8415d212 100644
--- a/package.json
+++ b/package.json
@@ -55,20 +55,22 @@
 		"js-yaml": "4.1.0",
 		"postcss": "8.4.38",
 		"tar": "6.2.1",
-		"terser": "5.30.3",
-		"typescript": "5.5.2",
-		"esbuild": "0.20.2",
+		"terser": "5.31.1",
+		"typescript": "5.5.3",
+		"esbuild": "0.22.0",
 		"glob": "10.3.12"
 	},
 	"devDependencies": {
-		"@types/node": "20.12.7",
-		"@typescript-eslint/eslint-plugin": "7.7.1",
-		"@typescript-eslint/parser": "7.7.1",
+		"@misskey-dev/eslint-plugin": "2.0.2",
+		"@types/node": "20.14.9",
+		"@typescript-eslint/eslint-plugin": "7.15.0",
+		"@typescript-eslint/parser": "7.15.0",
 		"cross-env": "7.0.3",
-		"cypress": "13.7.3",
-		"eslint": "8.57.0",
+		"cypress": "13.13.0",
+		"eslint": "9.6.0",
+		"globals": "15.7.0",
 		"ncp": "2.0.0",
-		"start-server-and-test": "2.0.3"
+		"start-server-and-test": "2.0.4"
 	},
 	"optionalDependencies": {
 		"@tensorflow/tfjs-core": "4.4.0"
diff --git a/packages/backend/.eslintignore b/packages/backend/.eslintignore
deleted file mode 100644
index 790eb90145..0000000000
--- a/packages/backend/.eslintignore
+++ /dev/null
@@ -1,4 +0,0 @@
-node_modules
-/built
-/.eslintrc.js
-/@types/**/*
diff --git a/packages/backend/.eslintrc.cjs b/packages/backend/.eslintrc.cjs
deleted file mode 100644
index f9fe4814e6..0000000000
--- a/packages/backend/.eslintrc.cjs
+++ /dev/null
@@ -1,32 +0,0 @@
-module.exports = {
-	parserOptions: {
-		tsconfigRootDir: __dirname,
-		project: ['./tsconfig.json', './test/tsconfig.json'],
-	},
-	extends: [
-		'../shared/.eslintrc.js',
-	],
-	rules: {
-		'import/order': ['warn', {
-			'groups': ['builtin', 'external', 'internal', 'parent', 'sibling', 'index', 'object', 'type'],
-			'pathGroups': [
-				{
-					'pattern': '@/**',
-					'group': 'external',
-					'position': 'after'
-				}
-			],
-		}],
-		'no-restricted-globals': [
-			'error',
-			{
-				'name': '__dirname',
-				'message': 'Not in ESModule. Use `import.meta.url` instead.'
-			},
-			{
-				'name': '__filename',
-				'message': 'Not in ESModule. Use `import.meta.url` instead.'
-			}
-	]
-	},
-};
diff --git a/packages/backend/eslint.config.js b/packages/backend/eslint.config.js
new file mode 100644
index 0000000000..318b7fd340
--- /dev/null
+++ b/packages/backend/eslint.config.js
@@ -0,0 +1,46 @@
+import tsParser from '@typescript-eslint/parser';
+import sharedConfig from '../shared/eslint.config.js';
+
+export default [
+	...sharedConfig,
+	{
+		ignores: ['**/node_modules', 'built', '@types/**/*'],
+	},
+	{
+		files: ['**/*.ts', '**/*.tsx'],
+		languageOptions: {
+			parserOptions: {
+				parser: tsParser,
+				project: ['./tsconfig.json', './test/tsconfig.json'],
+				sourceType: 'module',
+				tsconfigRootDir: import.meta.dirname,
+			},
+		},
+		rules: {
+			'import/order': ['warn', {
+				groups: [
+					'builtin',
+					'external',
+					'internal',
+					'parent',
+					'sibling',
+					'index',
+					'object',
+					'type',
+				],
+				pathGroups: [{
+					pattern: '@/**',
+					group: 'external',
+					position: 'after',
+				}],
+			}],
+			'no-restricted-globals': ['error', {
+				name: '__dirname',
+				message: 'Not in ESModule. Use `import.meta.url` instead.',
+			}, {
+				name: '__filename',
+				message: 'Not in ESModule. Use `import.meta.url` instead.',
+			}],
+		},
+	},
+];
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 0467ab0bee..22fdc5cf16 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -65,43 +65,43 @@
 		"utf-8-validate": "6.0.3"
 	},
 	"dependencies": {
-		"@aws-sdk/client-s3": "3.412.0",
-		"@aws-sdk/lib-storage": "3.412.0",
-		"@bull-board/api": "5.17.0",
-		"@bull-board/fastify": "5.17.0",
-		"@bull-board/ui": "5.17.0",
+		"@aws-sdk/client-s3": "3.600.0",
+		"@aws-sdk/lib-storage": "3.600.0",
+		"@bull-board/api": "5.20.5",
+		"@bull-board/fastify": "5.20.5",
+		"@bull-board/ui": "5.20.5",
 		"@discordapp/twemoji": "15.0.3",
 		"@fastify/accepts": "4.3.0",
 		"@fastify/cookie": "9.3.1",
 		"@fastify/cors": "9.0.1",
 		"@fastify/express": "3.0.0",
 		"@fastify/http-proxy": "9.5.0",
-		"@fastify/multipart": "8.2.0",
-		"@fastify/static": "7.0.3",
+		"@fastify/multipart": "8.3.0",
+		"@fastify/static": "7.0.4",
 		"@fastify/view": "9.1.0",
 		"@misskey-dev/sharp-read-bmp": "1.2.0",
 		"@misskey-dev/summaly": "5.1.0",
-		"@napi-rs/canvas": "^0.1.52",
-		"@nestjs/common": "10.3.8",
-		"@nestjs/core": "10.3.8",
-		"@nestjs/testing": "10.3.8",
+		"@napi-rs/canvas": "^0.1.53",
+		"@nestjs/common": "10.3.10",
+		"@nestjs/core": "10.3.10",
+		"@nestjs/testing": "10.3.10",
 		"@peertube/http-signature": "1.7.0",
-		"@sentry/node": "^8.5.0",
-		"@sentry/profiling-node": "^8.5.0",
+		"@sentry/node": "8.13.0",
+		"@sentry/profiling-node": "8.13.0",
 		"@simplewebauthn/server": "10.0.0",
 		"@sinonjs/fake-timers": "11.2.2",
 		"@smithy/node-http-handler": "2.5.0",
 		"@swc/cli": "0.3.12",
-		"@swc/core": "1.4.17",
+		"@swc/core": "1.6.6",
 		"@twemoji/parser": "15.1.1",
 		"accepts": "1.3.8",
-		"ajv": "8.13.0",
+		"ajv": "8.16.0",
 		"archiver": "7.0.1",
 		"async-mutex": "0.5.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
 		"body-parser": "1.20.2",
-		"bullmq": "5.7.8",
+		"bullmq": "5.8.3",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "9.0.2",
 		"chalk": "5.3.0",
@@ -112,27 +112,27 @@
 		"content-disposition": "0.5.4",
 		"date-fns": "2.30.0",
 		"deep-email-validator": "0.1.21",
-		"fastify": "4.26.2",
+		"fastify": "4.28.1",
 		"fastify-raw-body": "4.3.0",
 		"feed": "4.2.2",
 		"file-type": "19.0.0",
-		"fluent-ffmpeg": "2.1.2",
+		"fluent-ffmpeg": "2.1.3",
 		"form-data": "4.0.0",
-		"got": "14.2.1",
+		"got": "14.4.1",
 		"happy-dom": "10.0.3",
 		"hpagent": "1.2.0",
 		"htmlescape": "1.1.1",
 		"http-link-header": "1.1.3",
 		"ioredis": "5.4.1",
-		"ip-cidr": "3.1.0",
+		"ip-cidr": "4.0.1",
 		"ipaddr.js": "2.2.0",
-		"is-svg": "5.0.0",
+		"is-svg": "5.0.1",
 		"js-yaml": "4.1.0",
-		"jsdom": "24.0.0",
+		"jsdom": "24.1.0",
 		"json5": "2.2.3",
 		"jsonld": "8.3.2",
 		"jsrsasign": "11.1.0",
-		"meilisearch": "0.38.0",
+		"meilisearch": "0.41.0",
 		"mfm-js": "0.24.0",
 		"microformats-parser": "2.0.2",
 		"mime-types": "2.1.35",
@@ -142,24 +142,24 @@
 		"nanoid": "5.0.7",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.2",
-		"nodemailer": "6.9.13",
+		"nodemailer": "6.9.14",
 		"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.3",
+		"otpauth": "9.3.1",
 		"parse5": "7.1.2",
-		"pg": "8.11.5",
+		"pg": "8.12.0",
 		"pkce-challenge": "4.1.0",
 		"probe-image-size": "7.2.3",
 		"promise-limit": "2.7.0",
-		"pug": "3.0.2",
+		"pug": "3.0.3",
 		"punycode": "2.3.1",
 		"qrcode": "1.5.3",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
-		"re2": "1.21.2",
+		"re2": "1.21.3",
 		"redis-lock": "0.1.4",
 		"reflect-metadata": "0.2.2",
 		"rename": "1.0.4",
@@ -167,27 +167,26 @@
 		"rxjs": "7.8.1",
 		"sanitize-html": "2.13.0",
 		"secure-json-parse": "2.7.0",
-		"sharp": "0.33.3",
+		"sharp": "0.33.4",
 		"slacc": "0.0.10",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
-		"systeminformation": "5.22.7",
+		"systeminformation": "5.22.11",
 		"tinycolor2": "1.6.0",
 		"tmp": "0.2.3",
-		"tsc-alias": "1.8.8",
+		"tsc-alias": "1.8.10",
 		"tsconfig-paths": "4.2.0",
 		"typeorm": "0.3.20",
-		"typescript": "5.5.2",
+		"typescript": "5.5.3",
 		"ulid": "2.3.0",
 		"vary": "1.1.2",
 		"web-push": "3.6.7",
-		"ws": "8.17.0",
+		"ws": "8.17.1",
 		"xev": "3.0.2"
 	},
 	"devDependencies": {
 		"@jest/globals": "29.7.0",
-		"@misskey-dev/eslint-plugin": "1.0.0",
-		"@nestjs/platform-express": "10.3.8",
+		"@nestjs/platform-express": "10.3.10",
 		"@simplewebauthn/types": "10.0.0",
 		"@swc/jest": "0.2.36",
 		"@types/accepts": "1.3.7",
@@ -197,21 +196,21 @@
 		"@types/color-convert": "2.0.3",
 		"@types/content-disposition": "0.5.8",
 		"@types/fluent-ffmpeg": "2.1.24",
-		"@types/htmlescape": "^1.1.3",
-		"@types/http-link-header": "1.0.5",
+		"@types/htmlescape": "1.1.3",
+		"@types/http-link-header": "1.0.7",
 		"@types/jest": "29.5.12",
 		"@types/js-yaml": "4.0.9",
-		"@types/jsdom": "21.1.6",
-		"@types/jsonld": "1.5.13",
+		"@types/jsdom": "21.1.7",
+		"@types/jsonld": "1.5.14",
 		"@types/jsrsasign": "10.5.14",
 		"@types/mime-types": "2.1.4",
 		"@types/ms": "0.7.34",
-		"@types/node": "20.12.7",
+		"@types/node": "20.14.9",
 		"@types/nodemailer": "6.4.15",
-		"@types/oauth": "0.9.4",
+		"@types/oauth": "0.9.5",
 		"@types/oauth2orize": "1.11.5",
 		"@types/oauth2orize-pkce": "0.1.2",
-		"@types/pg": "8.11.5",
+		"@types/pg": "8.11.6",
 		"@types/pug": "2.0.10",
 		"@types/punycode": "2.1.4",
 		"@types/qrcode": "1.5.5",
@@ -227,18 +226,17 @@
 		"@types/vary": "1.1.3",
 		"@types/web-push": "3.6.3",
 		"@types/ws": "8.5.10",
-		"@typescript-eslint/eslint-plugin": "7.7.1",
-		"@typescript-eslint/parser": "7.7.1",
-		"aws-sdk-client-mock": "3.0.1",
+		"@typescript-eslint/eslint-plugin": "7.15.0",
+		"@typescript-eslint/parser": "7.15.0",
+		"aws-sdk-client-mock": "4.0.1",
 		"cross-env": "7.0.3",
-		"eslint": "8.57.0",
 		"eslint-plugin-import": "2.29.1",
-		"execa": "8.0.1",
-		"fkill": "^9.0.0",
+		"execa": "9.2.0",
+		"fkill": "9.0.0",
 		"jest": "29.7.0",
 		"jest-mock": "29.7.0",
-		"nodemon": "3.1.0",
+		"nodemon": "3.1.4",
 		"pid-port": "1.0.0",
-		"simple-oauth2": "5.0.0"
+		"simple-oauth2": "5.0.1"
 	}
 }
diff --git a/packages/backend/test-server/.eslintrc.cjs b/packages/backend/test-server/.eslintrc.cjs
deleted file mode 100644
index c261741a36..0000000000
--- a/packages/backend/test-server/.eslintrc.cjs
+++ /dev/null
@@ -1,32 +0,0 @@
-module.exports = {
-	parserOptions: {
-		tsconfigRootDir: __dirname,
-		project: ['./tsconfig.json'],
-	},
-	extends: [
-		'../../shared/.eslintrc.js',
-	],
-	rules: {
-		'import/order': ['warn', {
-			'groups': ['builtin', 'external', 'internal', 'parent', 'sibling', 'index', 'object', 'type'],
-			'pathGroups': [
-				{
-					'pattern': '@/**',
-					'group': 'external',
-					'position': 'after'
-				}
-			],
-		}],
-		'no-restricted-globals': [
-			'error',
-			{
-				'name': '__dirname',
-				'message': 'Not in ESModule. Use `import.meta.url` instead.'
-			},
-			{
-				'name': '__filename',
-				'message': 'Not in ESModule. Use `import.meta.url` instead.'
-			}
-	]
-	},
-};
diff --git a/packages/backend/test-server/eslint.config.js b/packages/backend/test-server/eslint.config.js
new file mode 100644
index 0000000000..b9c16d469f
--- /dev/null
+++ b/packages/backend/test-server/eslint.config.js
@@ -0,0 +1,43 @@
+import tsParser from '@typescript-eslint/parser';
+import sharedConfig from '../../shared/eslint.config.js';
+
+export default [
+	...sharedConfig,
+	{
+		files: ['**/*.ts', '**/*.tsx'],
+		languageOptions: {
+			parserOptions: {
+				parser: tsParser,
+				project: ['./tsconfig.json'],
+				sourceType: 'module',
+				tsconfigRootDir: import.meta.dirname,
+			},
+		},
+		rules: {
+			'import/order': ['warn', {
+				groups: [
+					'builtin',
+					'external',
+					'internal',
+					'parent',
+					'sibling',
+					'index',
+					'object',
+					'type',
+				],
+				pathGroups: [{
+					pattern: '@/**',
+					group: 'external',
+					position: 'after',
+				}],
+			}],
+			'no-restricted-globals': ['error', {
+				name: '__dirname',
+				message: 'Not in ESModule. Use `import.meta.url` instead.',
+			}, {
+				name: '__filename',
+				message: 'Not in ESModule. Use `import.meta.url` instead.',
+			}],
+		},
+	},
+];
diff --git a/packages/backend/test/.eslintrc.cjs b/packages/backend/test/.eslintrc.cjs
deleted file mode 100644
index 41ecea0c3f..0000000000
--- a/packages/backend/test/.eslintrc.cjs
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = {
-	parserOptions: {
-		tsconfigRootDir: __dirname,
-		project: ['./tsconfig.json'],
-	},
-	extends: ['../.eslintrc.cjs'],
-	env: {
-		node: true,
-		jest: true,
-	},
-};
diff --git a/packages/backend/test/eslint.config.js b/packages/backend/test/eslint.config.js
new file mode 100644
index 0000000000..a0f43babad
--- /dev/null
+++ b/packages/backend/test/eslint.config.js
@@ -0,0 +1,22 @@
+import globals from 'globals';
+import tsParser from '@typescript-eslint/parser';
+import sharedConfig from '../../shared/eslint.config.js';
+
+export default [
+	...sharedConfig,
+	{
+		files: ['**/*.ts', '**/*.tsx'],
+		languageOptions: {
+			globals: {
+				...globals.node,
+				...globals.jest,
+			},
+			parserOptions: {
+				parser: tsParser,
+				project: ['./tsconfig.json'],
+				sourceType: 'module',
+				tsconfigRootDir: import.meta.dirname,
+			},
+		},
+	},
+];
diff --git a/packages/frontend/.eslintrc.cjs b/packages/frontend/.eslintrc.cjs
deleted file mode 100644
index fd562e1c40..0000000000
--- a/packages/frontend/.eslintrc.cjs
+++ /dev/null
@@ -1,82 +0,0 @@
-module.exports = {
-	root: true,
-	env: {
-		'node': false,
-	},
-	parser: 'vue-eslint-parser',
-	parserOptions: {
-		'parser': '@typescript-eslint/parser',
-		tsconfigRootDir: __dirname,
-		project: ['./tsconfig.json'],
-		extraFileExtensions: ['.vue'],
-	},
-	extends: [
-		'../shared/.eslintrc.js',
-		'plugin:vue/vue3-recommended',
-	],
-	rules: {
-		'@typescript-eslint/no-empty-interface': [
-			'error',
-			{
-				'allowSingleExtends': true,
-			},
-		],
-		// window の禁止理由: グローバルスコープと衝突し、予期せぬ結果を招くため
-		// e の禁止理由: error や event など、複数のキーワードの頭文字であり分かりにくいため
-		'id-denylist': ['error', 'window', 'e'],
-		'no-shadow': ['warn'],
-		'vue/attributes-order': ['error', {
-			'alphabetical': false,
-		}],
-		'vue/no-use-v-if-with-v-for': ['error', {
-			'allowUsingIterationVar': false,
-		}],
-		'vue/no-ref-as-operand': 'error',
-		'vue/no-multi-spaces': ['error', {
-			'ignoreProperties': false,
-		}],
-		'vue/no-v-html': 'warn',
-		'vue/order-in-components': 'error',
-		'vue/html-indent': ['warn', 'tab', {
-			'attribute': 1,
-			'baseIndent': 0,
-			'closeBracket': 0,
-			'alignAttributesVertically': true,
-			'ignores': [],
-		}],
-		'vue/html-closing-bracket-spacing': ['warn', {
-			'startTag': 'never',
-			'endTag': 'never',
-			'selfClosingTag': 'never',
-		}],
-		'vue/multi-word-component-names': 'warn',
-		'vue/require-v-for-key': 'warn',
-		'vue/no-unused-components': 'warn',
-		'vue/no-unused-vars': 'warn',
-		'vue/no-dupe-keys': 'warn',
-		'vue/valid-v-for': 'warn',
-		'vue/return-in-computed-property': 'warn',
-		'vue/no-setup-props-reactivity-loss': 'warn',
-		'vue/max-attributes-per-line': 'off',
-		'vue/html-self-closing': 'off',
-		'vue/singleline-html-element-content-newline': 'off',
-		'vue/v-on-event-hyphenation': ['error', 'never', { autofix: true }],
-		'vue/attribute-hyphenation': ['error', 'never'],
-	},
-	globals: {
-		// Node.js
-		'module': false,
-		'require': false,
-		'__dirname': false,
-
-		// Misskey
-		'_DEV_': false,
-		'_LANGS_': false,
-		'_VERSION_': false,
-		'_ENV_': false,
-		'_PERF_PREFIX_': false,
-		'_DATA_TRANSFER_DRIVE_FILE_': false,
-		'_DATA_TRANSFER_DRIVE_FOLDER_': false,
-		'_DATA_TRANSFER_DECK_COLUMN_': false,
-	},
-};
diff --git a/packages/frontend/eslint.config.js b/packages/frontend/eslint.config.js
new file mode 100644
index 0000000000..dd8f03dac5
--- /dev/null
+++ b/packages/frontend/eslint.config.js
@@ -0,0 +1,95 @@
+import globals from 'globals';
+import tsParser from '@typescript-eslint/parser';
+import parser from 'vue-eslint-parser';
+import pluginVue from 'eslint-plugin-vue';
+import pluginMisskey from '@misskey-dev/eslint-plugin';
+import sharedConfig from '../shared/eslint.config.js';
+
+export default [
+	...sharedConfig,
+	{
+		files: ['src/**/*.vue'],
+		...pluginMisskey.configs.typescript,
+	},
+	...pluginVue.configs['flat/recommended'],
+	{
+		files: ['src/**/*.{ts,vue}'],
+		languageOptions: {
+			globals: {
+				...Object.fromEntries(Object.entries(globals.node).map(([key]) => [key, 'off'])),
+				...globals.browser,
+
+				// Node.js
+				module: false,
+				require: false,
+				__dirname: false,
+
+				// Misskey
+				_DEV_: false,
+				_LANGS_: false,
+				_VERSION_: false,
+				_ENV_: false,
+				_PERF_PREFIX_: false,
+				_DATA_TRANSFER_DRIVE_FILE_: false,
+				_DATA_TRANSFER_DRIVE_FOLDER_: false,
+				_DATA_TRANSFER_DECK_COLUMN_: false,
+			},
+			parser,
+			parserOptions: {
+				extraFileExtensions: ['.vue'],
+				parser: tsParser,
+				project: ['./tsconfig.json'],
+				sourceType: 'module',
+				tsconfigRootDir: import.meta.dirname,
+			},
+		},
+		rules: {
+			'@typescript-eslint/no-empty-interface': ['error', {
+				allowSingleExtends: true,
+			}],
+			// window の禁止理由: グローバルスコープと衝突し、予期せぬ結果を招くため
+			// e の禁止理由: error や event など、複数のキーワードの頭文字であり分かりにくいため
+			'id-denylist': ['error', 'window', 'e'],
+			'no-shadow': ['warn'],
+			'vue/attributes-order': ['error', {
+				alphabetical: false,
+			}],
+			'vue/no-use-v-if-with-v-for': ['error', {
+				allowUsingIterationVar: false,
+			}],
+			'vue/no-ref-as-operand': 'error',
+			'vue/no-multi-spaces': ['error', {
+				ignoreProperties: false,
+			}],
+			'vue/no-v-html': 'warn',
+			'vue/order-in-components': 'error',
+			'vue/html-indent': ['warn', 'tab', {
+				attribute: 1,
+				baseIndent: 0,
+				closeBracket: 0,
+				alignAttributesVertically: true,
+				ignores: [],
+			}],
+			'vue/html-closing-bracket-spacing': ['warn', {
+				startTag: 'never',
+				endTag: 'never',
+				selfClosingTag: 'never',
+			}],
+			'vue/multi-word-component-names': 'warn',
+			'vue/require-v-for-key': 'warn',
+			'vue/no-unused-components': 'warn',
+			'vue/no-unused-vars': 'warn',
+			'vue/no-dupe-keys': 'warn',
+			'vue/valid-v-for': 'warn',
+			'vue/return-in-computed-property': 'warn',
+			'vue/no-setup-props-reactivity-loss': 'warn',
+			'vue/max-attributes-per-line': 'off',
+			'vue/html-self-closing': 'off',
+			'vue/singleline-html-element-content-newline': 'off',
+			'vue/v-on-event-hyphenation': ['error', 'never', {
+				autofix: true,
+			}],
+			'vue/attribute-hyphenation': ['error', 'never'],
+		},
+	},
+];
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index a63d97658b..743722c231 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -22,24 +22,24 @@
 		"@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
 		"@misskey-dev/browser-image-resizer": "2024.1.0",
 		"@rollup/plugin-json": "6.1.0",
-		"@rollup/plugin-replace": "5.0.5",
+		"@rollup/plugin-replace": "5.0.7",
 		"@rollup/pluginutils": "5.1.0",
 		"@syuilo/aiscript": "0.18.0",
 		"@tabler/icons-webfont": "3.3.0",
 		"@twemoji/parser": "15.1.1",
-		"@vitejs/plugin-vue": "5.0.4",
-		"@vue/compiler-sfc": "3.4.26",
+		"@vitejs/plugin-vue": "5.0.5",
+		"@vue/compiler-sfc": "3.4.31",
 		"aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.1.9",
 		"astring": "1.8.6",
 		"broadcast-channel": "7.0.0",
 		"buraha": "0.0.1",
 		"canvas-confetti": "1.9.3",
-		"chart.js": "4.4.2",
+		"chart.js": "4.4.3",
 		"chartjs-adapter-date-fns": "3.0.0",
 		"chartjs-chart-matrix": "2.0.1",
 		"chartjs-plugin-gradient": "0.6.1",
 		"chartjs-plugin-zoom": "2.0.1",
-		"chromatic": "11.3.0",
+		"chromatic": "11.5.4",
 		"compare-versions": "6.1.0",
 		"cropperjs": "2.0.0-beta.5",
 		"date-fns": "2.30.0",
@@ -55,89 +55,87 @@
 		"misskey-bubble-game": "workspace:*",
 		"misskey-js": "workspace:*",
 		"misskey-reversi": "workspace:*",
-		"photoswipe": "5.4.3",
+		"photoswipe": "5.4.4",
 		"punycode": "2.3.1",
-		"rollup": "4.17.2",
+		"rollup": "4.18.0",
 		"sanitize-html": "2.13.0",
-		"sass": "1.76.0",
-		"shiki": "1.4.0",
+		"sass": "1.77.6",
+		"shiki": "1.10.0",
 		"strict-event-emitter-types": "2.0.0",
 		"textarea-caret": "3.1.0",
-		"three": "0.164.1",
-		"throttle-debounce": "5.0.0",
+		"three": "0.165.0",
+		"throttle-debounce": "5.0.2",
 		"tinycolor2": "1.6.0",
-		"tsc-alias": "1.8.8",
+		"tsc-alias": "1.8.10",
 		"tsconfig-paths": "4.2.0",
-		"typescript": "5.5.2",
-		"uuid": "9.0.1",
-		"v-code-diff": "1.11.0",
-		"vite": "5.2.11",
-		"vue": "3.4.26",
+		"typescript": "5.5.3",
+		"uuid": "10.0.0",
+		"v-code-diff": "1.12.0",
+		"vite": "5.3.2",
+		"vue": "3.4.31",
 		"vuedraggable": "next"
 	},
 	"devDependencies": {
-		"@misskey-dev/eslint-plugin": "1.0.0",
 		"@misskey-dev/summaly": "5.1.0",
-		"@storybook/addon-actions": "8.0.9",
-		"@storybook/addon-essentials": "8.0.9",
-		"@storybook/addon-interactions": "8.0.9",
-		"@storybook/addon-links": "8.0.9",
-		"@storybook/addon-mdx-gfm": "8.0.9",
-		"@storybook/addon-storysource": "8.0.9",
-		"@storybook/blocks": "8.0.9",
-		"@storybook/components": "8.0.9",
-		"@storybook/core-events": "8.0.9",
-		"@storybook/manager-api": "8.0.9",
-		"@storybook/preview-api": "8.0.9",
-		"@storybook/react": "8.0.9",
-		"@storybook/react-vite": "8.0.9",
-		"@storybook/test": "8.0.9",
-		"@storybook/theming": "8.0.9",
-		"@storybook/types": "8.0.9",
-		"@storybook/vue3": "8.0.9",
-		"@storybook/vue3-vite": "8.0.9",
-		"@testing-library/vue": "8.0.3",
+		"@storybook/addon-actions": "8.1.11",
+		"@storybook/addon-essentials": "8.1.11",
+		"@storybook/addon-interactions": "8.1.11",
+		"@storybook/addon-links": "8.1.11",
+		"@storybook/addon-mdx-gfm": "8.1.11",
+		"@storybook/addon-storysource": "8.1.11",
+		"@storybook/blocks": "8.1.11",
+		"@storybook/components": "8.1.11",
+		"@storybook/core-events": "8.1.11",
+		"@storybook/manager-api": "8.1.11",
+		"@storybook/preview-api": "8.1.11",
+		"@storybook/react": "8.1.11",
+		"@storybook/react-vite": "8.1.11",
+		"@storybook/test": "8.1.11",
+		"@storybook/theming": "8.1.11",
+		"@storybook/types": "8.1.11",
+		"@storybook/vue3": "8.1.11",
+		"@storybook/vue3-vite": "8.1.11",
+		"@testing-library/vue": "8.1.0",
 		"@types/escape-regexp": "0.0.3",
 		"@types/estree": "1.0.5",
 		"@types/matter-js": "0.19.6",
-		"@types/micromatch": "4.0.7",
-		"@types/node": "20.12.7",
+		"@types/micromatch": "4.0.9",
+		"@types/node": "20.14.9",
 		"@types/punycode": "2.1.4",
 		"@types/sanitize-html": "2.11.0",
 		"@types/seedrandom": "3.0.8",
 		"@types/throttle-debounce": "5.0.2",
 		"@types/tinycolor2": "1.4.6",
-		"@types/uuid": "9.0.8",
+		"@types/uuid": "10.0.0",
 		"@types/ws": "8.5.10",
-		"@typescript-eslint/eslint-plugin": "7.7.1",
-		"@typescript-eslint/parser": "7.7.1",
-		"@vitest/coverage-v8": "0.34.6",
-		"@vue/runtime-core": "3.4.26",
-		"acorn": "8.11.3",
+		"@typescript-eslint/eslint-plugin": "7.15.0",
+		"@typescript-eslint/parser": "7.15.0",
+		"@vitest/coverage-v8": "1.6.0",
+		"@vue/runtime-core": "3.4.31",
+		"acorn": "8.12.0",
 		"cross-env": "7.0.3",
-		"cypress": "13.8.1",
-		"eslint": "8.57.0",
+		"cypress": "13.13.0",
 		"eslint-plugin-import": "2.29.1",
-		"eslint-plugin-vue": "9.25.0",
+		"eslint-plugin-vue": "9.26.0",
 		"fast-glob": "3.3.2",
 		"happy-dom": "10.0.3",
 		"intersection-observer": "0.12.2",
-		"micromatch": "4.0.5",
-		"msw": "2.2.14",
-		"msw-storybook-addon": "2.0.1",
-		"nodemon": "3.1.0",
-		"prettier": "3.2.5",
+		"micromatch": "4.0.7",
+		"msw": "2.3.1",
+		"msw-storybook-addon": "2.0.2",
+		"nodemon": "3.1.4",
+		"prettier": "3.3.2",
 		"react": "18.3.1",
 		"react-dom": "18.3.1",
 		"seedrandom": "3.0.5",
-		"start-server-and-test": "2.0.3",
-		"storybook": "8.0.9",
+		"start-server-and-test": "2.0.4",
+		"storybook": "8.1.11",
 		"storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme",
 		"vite-plugin-turbosnap": "1.0.3",
-		"vitest": "0.34.6",
+		"vitest": "1.6.0",
 		"vitest-fetch-mock": "0.2.2",
-		"vue-component-type-helpers": "2.0.16",
-		"vue-eslint-parser": "9.4.2",
-		"vue-tsc": "2.0.16"
+		"vue-component-type-helpers": "2.0.24",
+		"vue-eslint-parser": "9.4.3",
+		"vue-tsc": "2.0.24"
 	}
 }
diff --git a/packages/frontend/tsconfig.json b/packages/frontend/tsconfig.json
index 187a2473ba..fe4d202894 100644
--- a/packages/frontend/tsconfig.json
+++ b/packages/frontend/tsconfig.json
@@ -44,7 +44,6 @@
 	},
 	"compileOnSave": false,
 	"include": [
-		".eslintrc.js",
 		"./**/*.ts",
 		"./**/*.vue"
 	],
diff --git a/packages/misskey-bubble-game/.eslintignore b/packages/misskey-bubble-game/.eslintignore
deleted file mode 100644
index 52ea8b3362..0000000000
--- a/packages/misskey-bubble-game/.eslintignore
+++ /dev/null
@@ -1,8 +0,0 @@
-node_modules
-/built
-/coverage
-/.eslintrc.js
-/jest.config.ts
-/test
-/test-d
-build.js
diff --git a/packages/misskey-bubble-game/.eslintrc.cjs b/packages/misskey-bubble-game/.eslintrc.cjs
deleted file mode 100644
index e2e31e9e33..0000000000
--- a/packages/misskey-bubble-game/.eslintrc.cjs
+++ /dev/null
@@ -1,9 +0,0 @@
-module.exports = {
-	parserOptions: {
-		tsconfigRootDir: __dirname,
-		project: ['./tsconfig.json'],
-	},
-	extends: [
-		'../shared/.eslintrc.js',
-	],
-};
diff --git a/packages/misskey-bubble-game/eslint.config.js b/packages/misskey-bubble-game/eslint.config.js
new file mode 100644
index 0000000000..86c21a22a3
--- /dev/null
+++ b/packages/misskey-bubble-game/eslint.config.js
@@ -0,0 +1,27 @@
+import tsParser from '@typescript-eslint/parser';
+import sharedConfig from '../shared/eslint.config.js';
+
+export default [
+	...sharedConfig,
+	{
+		ignores: [
+			'**/node_modules',
+			'built',
+			'coverage',
+			'jest.config.ts',
+			'test',
+			'test-d',
+		],
+	},
+	{
+		files: ['**/*.ts', '**/*.tsx'],
+		languageOptions: {
+			parserOptions: {
+				parser: tsParser,
+				project: ['./tsconfig.json'],
+				sourceType: 'module',
+				tsconfigRootDir: import.meta.dirname,
+			},
+		},
+	},
+];
diff --git a/packages/misskey-bubble-game/package.json b/packages/misskey-bubble-game/package.json
index a3aad147a9..528eb00b74 100644
--- a/packages/misskey-bubble-game/package.json
+++ b/packages/misskey-bubble-game/package.json
@@ -17,18 +17,16 @@
 	"scripts": {
 		"build": "node ./build.js",
 		"watch": "nodemon -w package.json -e json --exec \"node ./build.js --watch\"",
-		"eslint": "eslint . --ext .js,.jsx,.ts,.tsx",
+		"eslint": "eslint './**/*.{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/seedrandom": "3.0.8",
 		"@types/node": "20.11.5",
 		"@typescript-eslint/eslint-plugin": "7.1.0",
 		"@typescript-eslint/parser": "7.1.0",
-		"eslint": "8.57.0",
 		"nodemon": "3.0.2",
 		"execa": "8.0.1",
 		"typescript": "5.3.3",
diff --git a/packages/misskey-js/.eslintignore b/packages/misskey-js/.eslintignore
deleted file mode 100644
index 52ea8b3362..0000000000
--- a/packages/misskey-js/.eslintignore
+++ /dev/null
@@ -1,8 +0,0 @@
-node_modules
-/built
-/coverage
-/.eslintrc.js
-/jest.config.ts
-/test
-/test-d
-build.js
diff --git a/packages/misskey-js/.eslintrc.cjs b/packages/misskey-js/.eslintrc.cjs
deleted file mode 100644
index e2e31e9e33..0000000000
--- a/packages/misskey-js/.eslintrc.cjs
+++ /dev/null
@@ -1,9 +0,0 @@
-module.exports = {
-	parserOptions: {
-		tsconfigRootDir: __dirname,
-		project: ['./tsconfig.json'],
-	},
-	extends: [
-		'../shared/.eslintrc.js',
-	],
-};
diff --git a/packages/misskey-js/build.js b/packages/misskey-js/build.js
index 0b79f4b915..a13d9c1186 100644
--- a/packages/misskey-js/build.js
+++ b/packages/misskey-js/build.js
@@ -1,32 +1,32 @@
-import * as esbuild from "esbuild";
-import { build } from "esbuild";
-import { globSync } from "glob";
-import { execa } from "execa";
-import fs from "node:fs";
-import { fileURLToPath } from "node:url";
-import { dirname } from "node:path";
+import fs from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { dirname } from 'node:path';
+import * as esbuild from 'esbuild';
+import { build } from 'esbuild';
+import { globSync } from 'glob';
+import { execa } from 'execa';
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
 const _package = JSON.parse(fs.readFileSync(_dirname + '/package.json', 'utf-8'));
 
-const entryPoints = globSync("./src/**/**.{ts,tsx}");
+const entryPoints = globSync('./src/**/**.{ts,tsx}');
 
 /** @type {import('esbuild').BuildOptions} */
 const options = {
 	entryPoints,
 	minify: process.env.NODE_ENV === 'production',
-	outdir: "./built",
-	target: "es2022",
-	platform: "browser",
-	format: "esm",
+	outdir: './built',
+	target: 'es2022',
+	platform: 'browser',
+	format: 'esm',
 	sourcemap: 'linked',
 };
 
 // built配下をすべて削除する
 fs.rmSync('./built', { recursive: true, force: true });
 
-if (process.argv.map(arg => arg.toLowerCase()).includes("--watch")) {
+if (process.argv.map(arg => arg.toLowerCase()).includes('--watch')) {
 	await watchSrc();
 } else {
 	await buildSrc();
@@ -36,7 +36,7 @@ async function buildSrc() {
 	console.log(`[${_package.name}] start building...`);
 
 	await build(options)
-		.then(it => {
+		.then(() => {
 			console.log(`[${_package.name}] build succeeded.`);
 		})
 		.catch((err) => {
@@ -65,7 +65,7 @@ function buildDts() {
 		{
 			stdout: process.stdout,
 			stderr: process.stderr,
-		}
+		},
 	);
 }
 
@@ -86,7 +86,7 @@ async function watchSrc() {
 		},
 	}];
 
-	console.log(`[${_package.name}] start watching...`)
+	console.log(`[${_package.name}] start watching...`);
 
 	const context = await esbuild.context({ ...options, plugins });
 	await context.watch();
diff --git a/packages/misskey-js/eslint.config.js b/packages/misskey-js/eslint.config.js
new file mode 100644
index 0000000000..e34e7510b2
--- /dev/null
+++ b/packages/misskey-js/eslint.config.js
@@ -0,0 +1,28 @@
+import tsParser from '@typescript-eslint/parser';
+import sharedConfig from '../shared/eslint.config.js';
+
+export default [
+	...sharedConfig,
+	{
+		ignores: [
+			'**/node_modules',
+			'built',
+			'coverage',
+			'jest.config.ts',
+			'test',
+			'test-d',
+			'generator',
+		],
+	},
+	{
+		files: ['**/*.ts', '**/*.tsx'],
+		languageOptions: {
+			parserOptions: {
+				parser: tsParser,
+				project: ['./tsconfig.json'],
+				sourceType: 'module',
+				tsconfigRootDir: import.meta.dirname,
+			},
+		},
+	},
+];
diff --git a/packages/misskey-js/generator/.eslintrc.cjs b/packages/misskey-js/generator/.eslintrc.cjs
deleted file mode 100644
index 6a8b31da9c..0000000000
--- a/packages/misskey-js/generator/.eslintrc.cjs
+++ /dev/null
@@ -1,9 +0,0 @@
-module.exports = {
-	parserOptions: {
-		tsconfigRootDir: __dirname,
-		project: ['./tsconfig.json'],
-	},
-	extends: [
-		'../../shared/.eslintrc.js',
-	],
-};
diff --git a/packages/misskey-js/generator/eslint.config.js b/packages/misskey-js/generator/eslint.config.js
new file mode 100644
index 0000000000..4bf78c3b91
--- /dev/null
+++ b/packages/misskey-js/generator/eslint.config.js
@@ -0,0 +1,17 @@
+import tsParser from '@typescript-eslint/parser';
+import sharedConfig from '../../shared/eslint.config.js';
+
+export default [
+	...sharedConfig,
+	{
+		files: ['**/*.ts', '**/*.tsx'],
+		languageOptions: {
+			parserOptions: {
+				parser: tsParser,
+				project: ['./tsconfig.json'],
+				sourceType: 'module',
+				tsconfigRootDir: import.meta.dirname,
+			},
+		},
+	},
+];
diff --git a/packages/misskey-js/generator/package.json b/packages/misskey-js/generator/package.json
index a1c0f41cb2..4a02bcd8ff 100644
--- a/packages/misskey-js/generator/package.json
+++ b/packages/misskey-js/generator/package.json
@@ -4,15 +4,13 @@
 	"description": "Misskey TypeGenerator",
 	"type": "module",
 	"scripts": {
-		"generate": "tsx src/generator.ts && eslint ./built/**/* --ext .ts --fix"
+		"generate": "tsx src/generator.ts && eslint ./built/**/*.ts --fix"
 	},
 	"devDependencies": {
-		"@misskey-dev/eslint-plugin": "^1.0.0",
 		"@readme/openapi-parser": "2.5.0",
 		"@types/node": "20.9.1",
 		"@typescript-eslint/eslint-plugin": "6.11.0",
 		"@typescript-eslint/parser": "6.11.0",
-		"eslint": "8.53.0",
 		"openapi-types": "12.1.3",
 		"openapi-typescript": "6.7.3",
 		"ts-case-convert": "2.0.2",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index b99d0dd260..00342d3dbc 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -22,7 +22,7 @@
 		"tsd": "tsd",
 		"api": "pnpm api-extractor run --local --verbose",
 		"api-prod": "pnpm api-extractor run --verbose",
-		"eslint": "eslint . --ext .js,.jsx,.ts,.tsx",
+		"eslint": "eslint './**/*.{js,jsx,ts,tsx}'",
 		"typecheck": "tsc --noEmit",
 		"lint": "pnpm typecheck && pnpm eslint",
 		"jest": "jest --coverage --detectOpenHandles",
@@ -35,25 +35,23 @@
 		"directory": "packages/misskey-js"
 	},
 	"devDependencies": {
-		"@microsoft/api-extractor": "7.43.1",
-		"@misskey-dev/eslint-plugin": "1.0.0",
+		"@microsoft/api-extractor": "7.47.0",
 		"@swc/jest": "0.2.36",
 		"@types/jest": "29.5.12",
-		"@types/node": "20.12.7",
-		"@typescript-eslint/eslint-plugin": "7.7.1",
-		"@typescript-eslint/parser": "7.7.1",
-		"eslint": "8.57.0",
+		"@types/node": "20.14.9",
+		"@typescript-eslint/eslint-plugin": "7.15.0",
+		"@typescript-eslint/parser": "7.15.0",
 		"jest": "29.7.0",
 		"jest-fetch-mock": "3.0.3",
 		"jest-websocket-mock": "2.5.0",
 		"mock-socket": "9.3.1",
 		"ncp": "2.0.0",
-		"nodemon": "3.1.0",
-		"execa": "8.0.1",
-		"tsd": "0.30.7",
-		"typescript": "5.5.2",
-		"esbuild": "0.19.11",
-		"glob": "10.3.12"
+		"nodemon": "3.1.4",
+		"execa": "9.2.0",
+		"tsd": "0.31.1",
+		"typescript": "5.5.3",
+		"esbuild": "0.22.0",
+		"glob": "10.4.2"
 	},
 	"files": [
 		"built"
diff --git a/packages/misskey-reversi/.eslintignore b/packages/misskey-reversi/.eslintignore
deleted file mode 100644
index 52ea8b3362..0000000000
--- a/packages/misskey-reversi/.eslintignore
+++ /dev/null
@@ -1,8 +0,0 @@
-node_modules
-/built
-/coverage
-/.eslintrc.js
-/jest.config.ts
-/test
-/test-d
-build.js
diff --git a/packages/misskey-reversi/.eslintrc.cjs b/packages/misskey-reversi/.eslintrc.cjs
deleted file mode 100644
index db37a01098..0000000000
--- a/packages/misskey-reversi/.eslintrc.cjs
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
-	root: true,
-	parserOptions: {
-		tsconfigRootDir: __dirname,
-		project: ['./tsconfig.json'],
-	},
-	extends: [
-		'../shared/.eslintrc.js',
-	],
-};
diff --git a/packages/misskey-reversi/eslint.config.js b/packages/misskey-reversi/eslint.config.js
new file mode 100644
index 0000000000..3f81df7145
--- /dev/null
+++ b/packages/misskey-reversi/eslint.config.js
@@ -0,0 +1,23 @@
+import tsParser from '@typescript-eslint/parser';
+import sharedConfig from '../shared/eslint.config.js';
+
+export default [
+	...sharedConfig,
+	{
+		ignores: [
+			'**/node_modules',
+			'built',
+		],
+	},
+	{
+		files: ['**/*.ts', '**/*.tsx'],
+		languageOptions: {
+			parserOptions: {
+				parser: tsParser,
+				project: ['./tsconfig.json'],
+				sourceType: 'module',
+				tsconfigRootDir: import.meta.dirname,
+			},
+		},
+	},
+];
diff --git a/packages/misskey-reversi/package.json b/packages/misskey-reversi/package.json
index 45a6120861..c6db6e6221 100644
--- a/packages/misskey-reversi/package.json
+++ b/packages/misskey-reversi/package.json
@@ -17,16 +17,14 @@
 	"scripts": {
 		"build": "node ./build.js",
 		"watch": "nodemon -w package.json -e json --exec \"node ./build.js --watch\"",
-		"eslint": "eslint . --ext .js,.jsx,.ts,.tsx",
+		"eslint": "eslint './**/*.{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": "7.1.0",
 		"@typescript-eslint/parser": "7.1.0",
-		"eslint": "8.57.0",
 		"execa": "8.0.1",
 		"nodemon": "3.0.2",
 		"typescript": "5.3.3",
diff --git a/packages/shared/.eslintrc.js b/packages/shared/.eslintrc.js
deleted file mode 100644
index 58247877ae..0000000000
--- a/packages/shared/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = {
-	root: true,
-	ignorePatterns: ['**/.eslintrc.cjs'],
-	extends: [
-		'plugin:@misskey-dev/recommended',
-	],
-};
diff --git a/packages/shared/eslint.config.js b/packages/shared/eslint.config.js
new file mode 100644
index 0000000000..e9d27c4a72
--- /dev/null
+++ b/packages/shared/eslint.config.js
@@ -0,0 +1,28 @@
+import globals from 'globals';
+import pluginMisskey from '@misskey-dev/eslint-plugin';
+
+export default [
+	...pluginMisskey.configs['recommended'],
+	{
+		files: ['**/*.cjs'],
+		languageOptions: {
+			parserOptions: {
+				sourceType: 'commonjs',
+			},
+		},
+	},
+	{
+		files: ['**/*.js', '**/*.jsx'],
+		languageOptions: {
+			parserOptions: {
+				sourceType: 'module',
+			},
+		},
+	},
+	{
+		files: ['build.js'],
+		languageOptions: {
+			globals: globals.node,
+		},
+	},
+];
diff --git a/packages/shared/package.json b/packages/shared/package.json
new file mode 100644
index 0000000000..bedb411a91
--- /dev/null
+++ b/packages/shared/package.json
@@ -0,0 +1,3 @@
+{
+	"type": "module"
+}
diff --git a/packages/sw/.eslintrc.cjs b/packages/sw/.eslintrc.cjs
deleted file mode 100644
index b1fd6b5edc..0000000000
--- a/packages/sw/.eslintrc.cjs
+++ /dev/null
@@ -1,20 +0,0 @@
-module.exports = {
-	root: true,
-	env: {
-		node: false,
-	},
-	parserOptions: {
-		parser: '@typescript-eslint/parser',
-		tsconfigRootDir: __dirname,
-		project: ['./tsconfig.json'],
-	},
-	extends: ['../shared/.eslintrc.js'],
-	globals: {
-		require: false,
-		_DEV_: false,
-		_LANGS_: false,
-		_VERSION_: false,
-		_ENV_: false,
-		_PERF_PREFIX_: false,
-	},
-};
diff --git a/packages/sw/eslint.config.js b/packages/sw/eslint.config.js
new file mode 100644
index 0000000000..c62a2eadc6
--- /dev/null
+++ b/packages/sw/eslint.config.js
@@ -0,0 +1,32 @@
+import globals from 'globals';
+import tsParser from '@typescript-eslint/parser';
+import sharedConfig from '../shared/eslint.config.js';
+
+export default [
+	...sharedConfig,
+	{
+		ignores: ['build.js'],
+		languageOptions: {
+			globals: {
+				...Object.fromEntries(Object.entries(globals.node).map(([key]) => [key, 'off'])),
+				require: false,
+				_DEV_: false,
+				_LANGS_: false,
+				_VERSION_: false,
+				_ENV_: false,
+				_PERF_PREFIX_: false,
+			},
+		},
+	},
+	{
+		files: ['**/*.ts', '**/*.tsx'],
+		languageOptions: {
+			parserOptions: {
+				parser: tsParser,
+				project: ['./tsconfig.json'],
+				sourceType: 'module',
+				tsconfigRootDir: import.meta.dirname,
+			},
+		},
+	},
+];
diff --git a/packages/sw/package.json b/packages/sw/package.json
index 2deda47369..bcd642ffc4 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -9,18 +9,16 @@
 		"lint": "pnpm typecheck && pnpm eslint"
 	},
 	"dependencies": {
-		"esbuild": "0.20.2",
+		"esbuild": "0.22.0",
 		"idb-keyval": "6.2.1",
 		"misskey-js": "workspace:*"
 	},
 	"devDependencies": {
-		"@misskey-dev/eslint-plugin": "1.0.0",
-		"@typescript-eslint/parser": "7.7.1",
+		"@typescript-eslint/parser": "7.15.0",
 		"@typescript/lib-webworker": "npm:@types/serviceworker@0.0.67",
-		"eslint": "8.57.0",
 		"eslint-plugin-import": "2.29.1",
-		"nodemon": "3.1.0",
-		"typescript": "5.5.2"
+		"nodemon": "3.1.4",
+		"typescript": "5.5.3"
 	},
 	"type": "module"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09df15853b..10968f3e82 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -16,8 +16,8 @@ importers:
         specifier: 6.1.2
         version: 6.1.2(postcss@8.4.38)
       esbuild:
-        specifier: 0.20.2
-        version: 0.20.2
+        specifier: 0.22.0
+        version: 0.22.0
       execa:
         specifier: 8.0.1
         version: 8.0.1
@@ -40,58 +40,64 @@ importers:
         specifier: 6.2.1
         version: 6.2.1
       terser:
-        specifier: 5.30.3
-        version: 5.30.3
+        specifier: 5.31.1
+        version: 5.31.1
       typescript:
-        specifier: 5.5.2
-        version: 5.5.2
+        specifier: 5.5.3
+        version: 5.5.3
     optionalDependencies:
       '@tensorflow/tfjs-core':
         specifier: 4.4.0
         version: 4.4.0(encoding@0.1.13)
     devDependencies:
+      '@misskey-dev/eslint-plugin':
+        specifier: 2.0.2
+        version: 2.0.2(@eslint/compat@1.1.0)(@typescript-eslint/eslint-plugin@7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3))(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0))(eslint@9.6.0)(globals@15.7.0)
       '@types/node':
-        specifier: 20.12.7
-        version: 20.12.7
+        specifier: 20.14.9
+        version: 20.14.9
       '@typescript-eslint/eslint-plugin':
-        specifier: 7.7.1
-        version: 7.7.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2)
+        specifier: 7.15.0
+        version: 7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3)
       '@typescript-eslint/parser':
-        specifier: 7.7.1
-        version: 7.7.1(eslint@8.57.0)(typescript@5.5.2)
+        specifier: 7.15.0
+        version: 7.15.0(eslint@9.6.0)(typescript@5.5.3)
       cross-env:
         specifier: 7.0.3
         version: 7.0.3
       cypress:
-        specifier: 13.7.3
-        version: 13.7.3
+        specifier: 13.13.0
+        version: 13.13.0
       eslint:
-        specifier: 8.57.0
-        version: 8.57.0
+        specifier: 9.6.0
+        version: 9.6.0
+      globals:
+        specifier: 15.7.0
+        version: 15.7.0
       ncp:
         specifier: 2.0.0
         version: 2.0.0
       start-server-and-test:
-        specifier: 2.0.3
-        version: 2.0.3
+        specifier: 2.0.4
+        version: 2.0.4
 
   packages/backend:
     dependencies:
       '@aws-sdk/client-s3':
-        specifier: 3.412.0
-        version: 3.412.0
+        specifier: 3.600.0
+        version: 3.600.0
       '@aws-sdk/lib-storage':
-        specifier: 3.412.0
-        version: 3.412.0(@aws-sdk/client-s3@3.412.0)
+        specifier: 3.600.0
+        version: 3.600.0(@aws-sdk/client-s3@3.600.0)
       '@bull-board/api':
-        specifier: 5.17.0
-        version: 5.17.0(@bull-board/ui@5.17.0)
+        specifier: 5.20.5
+        version: 5.20.5(@bull-board/ui@5.20.5)
       '@bull-board/fastify':
-        specifier: 5.17.0
-        version: 5.17.0
+        specifier: 5.20.5
+        version: 5.20.5
       '@bull-board/ui':
-        specifier: 5.17.0
-        version: 5.17.0
+        specifier: 5.20.5
+        version: 5.20.5
       '@discordapp/twemoji':
         specifier: 15.0.3
         version: 15.0.3
@@ -111,11 +117,11 @@ importers:
         specifier: 9.5.0
         version: 9.5.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
       '@fastify/multipart':
-        specifier: 8.2.0
-        version: 8.2.0
+        specifier: 8.3.0
+        version: 8.3.0
       '@fastify/static':
-        specifier: 7.0.3
-        version: 7.0.3
+        specifier: 7.0.4
+        version: 7.0.4
       '@fastify/view':
         specifier: 9.1.0
         version: 9.1.0
@@ -126,26 +132,26 @@ importers:
         specifier: 5.1.0
         version: 5.1.0
       '@napi-rs/canvas':
-        specifier: ^0.1.52
-        version: 0.1.52
+        specifier: ^0.1.53
+        version: 0.1.53
       '@nestjs/common':
-        specifier: 10.3.8
-        version: 10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1)
+        specifier: 10.3.10
+        version: 10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1)
       '@nestjs/core':
-        specifier: 10.3.8
-        version: 10.3.8(@nestjs/common@10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.8)(encoding@0.1.13)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+        specifier: 10.3.10
+        version: 10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.10)(encoding@0.1.13)(reflect-metadata@0.2.2)(rxjs@7.8.1)
       '@nestjs/testing':
-        specifier: 10.3.8
-        version: 10.3.8(@nestjs/common@10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.8(@nestjs/common@10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.8)(encoding@0.1.13)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.8(@nestjs/common@10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.8))
+        specifier: 10.3.10
+        version: 10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.10)(encoding@0.1.13)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.10))
       '@peertube/http-signature':
         specifier: 1.7.0
         version: 1.7.0
       '@sentry/node':
-        specifier: ^8.5.0
-        version: 8.5.0
+        specifier: 8.13.0
+        version: 8.13.0
       '@sentry/profiling-node':
-        specifier: ^8.5.0
-        version: 8.5.0
+        specifier: 8.13.0
+        version: 8.13.0
       '@simplewebauthn/server':
         specifier: 10.0.0
         version: 10.0.0(encoding@0.1.13)
@@ -157,10 +163,10 @@ importers:
         version: 2.5.0
       '@swc/cli':
         specifier: 0.3.12
-        version: 0.3.12(@swc/core@1.4.17)(chokidar@3.5.3)
+        version: 0.3.12(@swc/core@1.6.6)(chokidar@3.5.3)
       '@swc/core':
-        specifier: 1.4.17
-        version: 1.4.17
+        specifier: 1.6.6
+        version: 1.6.6
       '@twemoji/parser':
         specifier: 15.1.1
         version: 15.1.1
@@ -168,8 +174,8 @@ importers:
         specifier: 1.3.8
         version: 1.3.8
       ajv:
-        specifier: 8.13.0
-        version: 8.13.0
+        specifier: 8.16.0
+        version: 8.16.0
       archiver:
         specifier: 7.0.1
         version: 7.0.1
@@ -186,8 +192,8 @@ importers:
         specifier: 1.20.2
         version: 1.20.2
       bullmq:
-        specifier: 5.7.8
-        version: 5.7.8
+        specifier: 5.8.3
+        version: 5.8.3
       cacheable-lookup:
         specifier: 7.0.0
         version: 7.0.0
@@ -219,8 +225,8 @@ importers:
         specifier: 0.1.21
         version: 0.1.21
       fastify:
-        specifier: 4.26.2
-        version: 4.26.2
+        specifier: 4.28.1
+        version: 4.28.1
       fastify-raw-body:
         specifier: 4.3.0
         version: 4.3.0
@@ -231,14 +237,14 @@ importers:
         specifier: 19.0.0
         version: 19.0.0
       fluent-ffmpeg:
-        specifier: 2.1.2
-        version: 2.1.2
+        specifier: 2.1.3
+        version: 2.1.3
       form-data:
         specifier: 4.0.0
         version: 4.0.0
       got:
-        specifier: 14.2.1
-        version: 14.2.1
+        specifier: 14.4.1
+        version: 14.4.1
       happy-dom:
         specifier: 10.0.3
         version: 10.0.3
@@ -255,20 +261,20 @@ importers:
         specifier: 5.4.1
         version: 5.4.1
       ip-cidr:
-        specifier: 3.1.0
-        version: 3.1.0
+        specifier: 4.0.1
+        version: 4.0.1
       ipaddr.js:
         specifier: 2.2.0
         version: 2.2.0
       is-svg:
-        specifier: 5.0.0
-        version: 5.0.0
+        specifier: 5.0.1
+        version: 5.0.1
       js-yaml:
         specifier: 4.1.0
         version: 4.1.0
       jsdom:
-        specifier: 24.0.0
-        version: 24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
+        specifier: 24.1.0
+        version: 24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
       json5:
         specifier: 2.2.3
         version: 2.2.3
@@ -279,8 +285,8 @@ importers:
         specifier: 11.1.0
         version: 11.1.0
       meilisearch:
-        specifier: 0.38.0
-        version: 0.38.0(encoding@0.1.13)
+        specifier: 0.41.0
+        version: 0.41.0(encoding@0.1.13)
       mfm-js:
         specifier: 0.24.0
         version: 0.24.0
@@ -309,8 +315,8 @@ importers:
         specifier: 3.3.2
         version: 3.3.2
       nodemailer:
-        specifier: 6.9.13
-        version: 6.9.13
+        specifier: 6.9.14
+        version: 6.9.14
       nsfwjs:
         specifier: 2.4.2
         version: 2.4.2(@tensorflow/tfjs@4.4.0(encoding@0.1.13)(seedrandom@3.0.5))
@@ -327,14 +333,14 @@ importers:
         specifier: 0.0.14
         version: 0.0.14
       otpauth:
-        specifier: 9.2.3
-        version: 9.2.3
+        specifier: 9.3.1
+        version: 9.3.1
       parse5:
         specifier: 7.1.2
         version: 7.1.2
       pg:
-        specifier: 8.11.5
-        version: 8.11.5
+        specifier: 8.12.0
+        version: 8.12.0
       pkce-challenge:
         specifier: 4.1.0
         version: 4.1.0
@@ -345,8 +351,8 @@ importers:
         specifier: 2.7.0
         version: 2.7.0
       pug:
-        specifier: 3.0.2
-        version: 3.0.2
+        specifier: 3.0.3
+        version: 3.0.3
       punycode:
         specifier: 2.3.1
         version: 2.3.1
@@ -360,8 +366,8 @@ importers:
         specifier: 3.4.1
         version: 3.4.1
       re2:
-        specifier: 1.21.2
-        version: 1.21.2
+        specifier: 1.21.3
+        version: 1.21.3
       redis-lock:
         specifier: 0.1.4
         version: 0.1.4
@@ -384,8 +390,8 @@ importers:
         specifier: 2.7.0
         version: 2.7.0
       sharp:
-        specifier: 0.33.3
-        version: 0.33.3
+        specifier: 0.33.4
+        version: 0.33.4
       slacc:
         specifier: 0.0.10
         version: 0.0.10
@@ -396,8 +402,8 @@ importers:
         specifier: 2.1.0
         version: 2.1.0
       systeminformation:
-        specifier: 5.22.7
-        version: 5.22.7
+        specifier: 5.22.11
+        version: 5.22.11
       tinycolor2:
         specifier: 1.6.0
         version: 1.6.0
@@ -405,17 +411,17 @@ importers:
         specifier: 0.2.3
         version: 0.2.3
       tsc-alias:
-        specifier: 1.8.8
-        version: 1.8.8
+        specifier: 1.8.10
+        version: 1.8.10
       tsconfig-paths:
         specifier: 4.2.0
         version: 4.2.0
       typeorm:
         specifier: 0.3.20
-        version: 0.3.20(ioredis@5.4.1)(pg@8.11.5)
+        version: 0.3.20(ioredis@5.4.1)(pg@8.12.0)
       typescript:
-        specifier: 5.5.2
-        version: 5.5.2
+        specifier: 5.5.3
+        version: 5.5.3
       ulid:
         specifier: 2.3.0
         version: 2.3.0
@@ -426,8 +432,8 @@ importers:
         specifier: 3.6.7
         version: 3.6.7
       ws:
-        specifier: 8.17.0
-        version: 8.17.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
+        specifier: 8.17.1
+        version: 8.17.1(bufferutil@4.0.7)(utf-8-validate@6.0.3)
       xev:
         specifier: 3.0.2
         version: 3.0.2
@@ -523,18 +529,15 @@ importers:
       '@jest/globals':
         specifier: 29.7.0
         version: 29.7.0
-      '@misskey-dev/eslint-plugin':
-        specifier: 1.0.0
-        version: 1.0.0(@typescript-eslint/eslint-plugin@7.7.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2))(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0))(eslint@8.57.0)
       '@nestjs/platform-express':
-        specifier: 10.3.8
-        version: 10.3.8(@nestjs/common@10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.8)
+        specifier: 10.3.10
+        version: 10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.10)
       '@simplewebauthn/types':
         specifier: 10.0.0
         version: 10.0.0
       '@swc/jest':
         specifier: 0.2.36
-        version: 0.2.36(@swc/core@1.4.17)
+        version: 0.2.36(@swc/core@1.6.6)
       '@types/accepts':
         specifier: 1.3.7
         version: 1.3.7
@@ -557,11 +560,11 @@ importers:
         specifier: 2.1.24
         version: 2.1.24
       '@types/htmlescape':
-        specifier: ^1.1.3
+        specifier: 1.1.3
         version: 1.1.3
       '@types/http-link-header':
-        specifier: 1.0.5
-        version: 1.0.5
+        specifier: 1.0.7
+        version: 1.0.7
       '@types/jest':
         specifier: 29.5.12
         version: 29.5.12
@@ -569,11 +572,11 @@ importers:
         specifier: 4.0.9
         version: 4.0.9
       '@types/jsdom':
-        specifier: 21.1.6
-        version: 21.1.6
+        specifier: 21.1.7
+        version: 21.1.7
       '@types/jsonld':
-        specifier: 1.5.13
-        version: 1.5.13
+        specifier: 1.5.14
+        version: 1.5.14
       '@types/jsrsasign':
         specifier: 10.5.14
         version: 10.5.14
@@ -584,14 +587,14 @@ importers:
         specifier: 0.7.34
         version: 0.7.34
       '@types/node':
-        specifier: 20.12.7
-        version: 20.12.7
+        specifier: 20.14.9
+        version: 20.14.9
       '@types/nodemailer':
         specifier: 6.4.15
         version: 6.4.15
       '@types/oauth':
-        specifier: 0.9.4
-        version: 0.9.4
+        specifier: 0.9.5
+        version: 0.9.5
       '@types/oauth2orize':
         specifier: 1.11.5
         version: 1.11.5
@@ -599,8 +602,8 @@ importers:
         specifier: 0.1.2
         version: 0.1.2
       '@types/pg':
-        specifier: 8.11.5
-        version: 8.11.5
+        specifier: 8.11.6
+        version: 8.11.6
       '@types/pug':
         specifier: 2.0.10
         version: 2.0.10
@@ -647,44 +650,41 @@ importers:
         specifier: 8.5.10
         version: 8.5.10
       '@typescript-eslint/eslint-plugin':
-        specifier: 7.7.1
-        version: 7.7.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2)
+        specifier: 7.15.0
+        version: 7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3)
       '@typescript-eslint/parser':
-        specifier: 7.7.1
-        version: 7.7.1(eslint@8.57.0)(typescript@5.5.2)
+        specifier: 7.15.0
+        version: 7.15.0(eslint@9.6.0)(typescript@5.5.3)
       aws-sdk-client-mock:
-        specifier: 3.0.1
-        version: 3.0.1
+        specifier: 4.0.1
+        version: 4.0.1
       cross-env:
         specifier: 7.0.3
         version: 7.0.3
-      eslint:
-        specifier: 8.57.0
-        version: 8.57.0
       eslint-plugin-import:
         specifier: 2.29.1
-        version: 2.29.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)
+        version: 2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)
       execa:
-        specifier: 8.0.1
-        version: 8.0.1
+        specifier: 9.2.0
+        version: 9.2.0
       fkill:
-        specifier: ^9.0.0
+        specifier: 9.0.0
         version: 9.0.0
       jest:
         specifier: 29.7.0
-        version: 29.7.0(@types/node@20.12.7)
+        version: 29.7.0(@types/node@20.14.9)
       jest-mock:
         specifier: 29.7.0
         version: 29.7.0
       nodemon:
-        specifier: 3.1.0
-        version: 3.1.0
+        specifier: 3.1.4
+        version: 3.1.4
       pid-port:
         specifier: 1.0.0
         version: 1.0.0
       simple-oauth2:
-        specifier: 5.0.0
-        version: 5.0.0
+        specifier: 5.0.1
+        version: 5.0.1
 
   packages/frontend:
     dependencies:
@@ -702,13 +702,13 @@ importers:
         version: 2024.1.0
       '@rollup/plugin-json':
         specifier: 6.1.0
-        version: 6.1.0(rollup@4.17.2)
+        version: 6.1.0(rollup@4.18.0)
       '@rollup/plugin-replace':
-        specifier: 5.0.5
-        version: 5.0.5(rollup@4.17.2)
+        specifier: 5.0.7
+        version: 5.0.7(rollup@4.18.0)
       '@rollup/pluginutils':
         specifier: 5.1.0
-        version: 5.1.0(rollup@4.17.2)
+        version: 5.1.0(rollup@4.18.0)
       '@syuilo/aiscript':
         specifier: 0.18.0
         version: 0.18.0
@@ -719,11 +719,11 @@ importers:
         specifier: 15.1.1
         version: 15.1.1
       '@vitejs/plugin-vue':
-        specifier: 5.0.4
-        version: 5.0.4(vite@5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3))(vue@3.4.26(typescript@5.5.2))
+        specifier: 5.0.5
+        version: 5.0.5(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.5.3))
       '@vue/compiler-sfc':
-        specifier: 3.4.26
-        version: 3.4.26
+        specifier: 3.4.31
+        version: 3.4.31
       aiscript-vscode:
         specifier: github:aiscript-dev/aiscript-vscode#v0.1.9
         version: https://codeload.github.com/aiscript-dev/aiscript-vscode/tar.gz/34bf4e1530efcf1efa855bd04e2dab39735e1b02
@@ -740,23 +740,23 @@ importers:
         specifier: 1.9.3
         version: 1.9.3
       chart.js:
-        specifier: 4.4.2
-        version: 4.4.2
+        specifier: 4.4.3
+        version: 4.4.3
       chartjs-adapter-date-fns:
         specifier: 3.0.0
-        version: 3.0.0(chart.js@4.4.2)(date-fns@2.30.0)
+        version: 3.0.0(chart.js@4.4.3)(date-fns@2.30.0)
       chartjs-chart-matrix:
         specifier: 2.0.1
-        version: 2.0.1(chart.js@4.4.2)
+        version: 2.0.1(chart.js@4.4.3)
       chartjs-plugin-gradient:
         specifier: 0.6.1
-        version: 0.6.1(chart.js@4.4.2)
+        version: 0.6.1(chart.js@4.4.3)
       chartjs-plugin-zoom:
         specifier: 2.0.1
-        version: 2.0.1(chart.js@4.4.2)
+        version: 2.0.1(chart.js@4.4.3)
       chromatic:
-        specifier: 11.3.0
-        version: 11.3.0
+        specifier: 11.5.4
+        version: 11.5.4
       compare-versions:
         specifier: 6.1.0
         version: 6.1.0
@@ -803,23 +803,23 @@ importers:
         specifier: workspace:*
         version: link:../misskey-reversi
       photoswipe:
-        specifier: 5.4.3
-        version: 5.4.3
+        specifier: 5.4.4
+        version: 5.4.4
       punycode:
         specifier: 2.3.1
         version: 2.3.1
       rollup:
-        specifier: 4.17.2
-        version: 4.17.2
+        specifier: 4.18.0
+        version: 4.18.0
       sanitize-html:
         specifier: 2.13.0
         version: 2.13.0
       sass:
-        specifier: 1.76.0
-        version: 1.76.0
+        specifier: 1.77.6
+        version: 1.77.6
       shiki:
-        specifier: 1.4.0
-        version: 1.4.0
+        specifier: 1.10.0
+        version: 1.10.0
       strict-event-emitter-types:
         specifier: 2.0.0
         version: 2.0.0
@@ -827,102 +827,99 @@ importers:
         specifier: 3.1.0
         version: 3.1.0
       three:
-        specifier: 0.164.1
-        version: 0.164.1
+        specifier: 0.165.0
+        version: 0.165.0
       throttle-debounce:
-        specifier: 5.0.0
-        version: 5.0.0
+        specifier: 5.0.2
+        version: 5.0.2
       tinycolor2:
         specifier: 1.6.0
         version: 1.6.0
       tsc-alias:
-        specifier: 1.8.8
-        version: 1.8.8
+        specifier: 1.8.10
+        version: 1.8.10
       tsconfig-paths:
         specifier: 4.2.0
         version: 4.2.0
       typescript:
-        specifier: 5.5.2
-        version: 5.5.2
+        specifier: 5.5.3
+        version: 5.5.3
       uuid:
-        specifier: 9.0.1
-        version: 9.0.1
+        specifier: 10.0.0
+        version: 10.0.0
       v-code-diff:
-        specifier: 1.11.0
-        version: 1.11.0(vue@3.4.26(typescript@5.5.2))
+        specifier: 1.12.0
+        version: 1.12.0(vue@3.4.31(typescript@5.5.3))
       vite:
-        specifier: 5.2.11
-        version: 5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3)
+        specifier: 5.3.2
+        version: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)
       vue:
-        specifier: 3.4.26
-        version: 3.4.26(typescript@5.5.2)
+        specifier: 3.4.31
+        version: 3.4.31(typescript@5.5.3)
       vuedraggable:
         specifier: next
-        version: 4.1.0(vue@3.4.26(typescript@5.5.2))
+        version: 4.1.0(vue@3.4.31(typescript@5.5.3))
     devDependencies:
-      '@misskey-dev/eslint-plugin':
-        specifier: 1.0.0
-        version: 1.0.0(@typescript-eslint/eslint-plugin@7.7.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2))(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0))(eslint@8.57.0)
       '@misskey-dev/summaly':
         specifier: 5.1.0
         version: 5.1.0
       '@storybook/addon-actions':
-        specifier: 8.0.9
-        version: 8.0.9
+        specifier: 8.1.11
+        version: 8.1.11
       '@storybook/addon-essentials':
-        specifier: 8.0.9
-        version: 8.0.9(@types/react@18.0.28)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: 8.1.11
+        version: 8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@storybook/addon-interactions':
-        specifier: 8.0.9
-        version: 8.0.9(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.12.7))(vitest@0.34.6(happy-dom@10.0.3)(jsdom@24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.76.0)(terser@5.30.3))
+        specifier: 8.1.11
+        version: 8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))
       '@storybook/addon-links':
-        specifier: 8.0.9
-        version: 8.0.9(react@18.3.1)
+        specifier: 8.1.11
+        version: 8.1.11(react@18.3.1)
       '@storybook/addon-mdx-gfm':
-        specifier: 8.0.9
-        version: 8.0.9
+        specifier: 8.1.11
+        version: 8.1.11
       '@storybook/addon-storysource':
-        specifier: 8.0.9
-        version: 8.0.9
+        specifier: 8.1.11
+        version: 8.1.11
       '@storybook/blocks':
-        specifier: 8.0.9
-        version: 8.0.9(@types/react@18.0.28)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: 8.1.11
+        version: 8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@storybook/components':
-        specifier: 8.0.9
-        version: 8.0.9(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: 8.1.11
+        version: 8.1.11(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@storybook/core-events':
-        specifier: 8.0.9
-        version: 8.0.9
+        specifier: 8.1.11
+        version: 8.1.11
       '@storybook/manager-api':
-        specifier: 8.0.9
-        version: 8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: 8.1.11
+        version: 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@storybook/preview-api':
-        specifier: 8.0.9
-        version: 8.0.9
+        specifier: 8.1.11
+        version: 8.1.11
       '@storybook/react':
-        specifier: 8.0.9
-        version: 8.0.9(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.2)
+        specifier: 8.1.11
+        version: 8.1.11(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.3)
       '@storybook/react-vite':
-        specifier: 8.0.9
-        version: 8.0.9(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.17.2)(typescript@5.5.2)(vite@5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3))
+        specifier: 8.1.11
+        version: 8.1.11(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.18.0)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))
       '@storybook/test':
-        specifier: 8.0.9
-        version: 8.0.9(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.12.7))(vitest@0.34.6(happy-dom@10.0.3)(jsdom@24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.76.0)(terser@5.30.3))
+        specifier: 8.1.11
+        version: 8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))
       '@storybook/theming':
-        specifier: 8.0.9
-        version: 8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: 8.1.11
+        version: 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@storybook/types':
-        specifier: 8.0.9
-        version: 8.0.9
+        specifier: 8.1.11
+        version: 8.1.11
       '@storybook/vue3':
-        specifier: 8.0.9
-        version: 8.0.9(encoding@0.1.13)(vue@3.4.26(typescript@5.5.2))
+        specifier: 8.1.11
+        version: 8.1.11(encoding@0.1.13)(prettier@3.3.2)(vue@3.4.31(typescript@5.5.3))
       '@storybook/vue3-vite':
-        specifier: 8.0.9
-        version: 8.0.9(bufferutil@4.0.7)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)(vite@5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3))(vue@3.4.26(typescript@5.5.2))
+        specifier: 8.1.11
+        version: 8.1.11(bufferutil@4.0.7)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.5.3))
       '@testing-library/vue':
-        specifier: 8.0.3
-        version: 8.0.3(@vue/compiler-sfc@3.4.26)(@vue/server-renderer@3.4.26(vue@3.4.26(typescript@5.5.2)))(vue@3.4.26(typescript@5.5.2))
+        specifier: 8.1.0
+        version: 8.1.0(@vue/compiler-sfc@3.4.31)(@vue/server-renderer@3.4.29(vue@3.4.31(typescript@5.5.3)))(vue@3.4.31(typescript@5.5.3))
       '@types/escape-regexp':
         specifier: 0.0.3
         version: 0.0.3
@@ -933,11 +930,11 @@ importers:
         specifier: 0.19.6
         version: 0.19.6
       '@types/micromatch':
-        specifier: 4.0.7
-        version: 4.0.7
+        specifier: 4.0.9
+        version: 4.0.9
       '@types/node':
-        specifier: 20.12.7
-        version: 20.12.7
+        specifier: 20.14.9
+        version: 20.14.9
       '@types/punycode':
         specifier: 2.1.4
         version: 2.1.4
@@ -954,41 +951,38 @@ importers:
         specifier: 1.4.6
         version: 1.4.6
       '@types/uuid':
-        specifier: 9.0.8
-        version: 9.0.8
+        specifier: 10.0.0
+        version: 10.0.0
       '@types/ws':
         specifier: 8.5.10
         version: 8.5.10
       '@typescript-eslint/eslint-plugin':
-        specifier: 7.7.1
-        version: 7.7.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2)
+        specifier: 7.15.0
+        version: 7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3)
       '@typescript-eslint/parser':
-        specifier: 7.7.1
-        version: 7.7.1(eslint@8.57.0)(typescript@5.5.2)
+        specifier: 7.15.0
+        version: 7.15.0(eslint@9.6.0)(typescript@5.5.3)
       '@vitest/coverage-v8':
-        specifier: 0.34.6
-        version: 0.34.6(vitest@0.34.6(happy-dom@10.0.3)(jsdom@24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.76.0)(terser@5.30.3))
+        specifier: 1.6.0
+        version: 1.6.0(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))
       '@vue/runtime-core':
-        specifier: 3.4.26
-        version: 3.4.26
+        specifier: 3.4.31
+        version: 3.4.31
       acorn:
-        specifier: 8.11.3
-        version: 8.11.3
+        specifier: 8.12.0
+        version: 8.12.0
       cross-env:
         specifier: 7.0.3
         version: 7.0.3
       cypress:
-        specifier: 13.8.1
-        version: 13.8.1
-      eslint:
-        specifier: 8.57.0
-        version: 8.57.0
+        specifier: 13.13.0
+        version: 13.13.0
       eslint-plugin-import:
         specifier: 2.29.1
-        version: 2.29.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)
+        version: 2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)
       eslint-plugin-vue:
-        specifier: 9.25.0
-        version: 9.25.0(eslint@8.57.0)
+        specifier: 9.26.0
+        version: 9.26.0(eslint@9.6.0)
       fast-glob:
         specifier: 3.3.2
         version: 3.3.2
@@ -999,20 +993,20 @@ importers:
         specifier: 0.12.2
         version: 0.12.2
       micromatch:
-        specifier: 4.0.5
-        version: 4.0.5
+        specifier: 4.0.7
+        version: 4.0.7
       msw:
-        specifier: 2.2.14
-        version: 2.2.14(typescript@5.5.2)
+        specifier: 2.3.1
+        version: 2.3.1(typescript@5.5.3)
       msw-storybook-addon:
-        specifier: 2.0.1
-        version: 2.0.1(msw@2.2.14(typescript@5.5.2))
+        specifier: 2.0.2
+        version: 2.0.2(msw@2.3.1(typescript@5.5.3))
       nodemon:
-        specifier: 3.1.0
-        version: 3.1.0
+        specifier: 3.1.4
+        version: 3.1.4
       prettier:
-        specifier: 3.2.5
-        version: 3.2.5
+        specifier: 3.3.2
+        version: 3.3.2
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -1023,32 +1017,32 @@ importers:
         specifier: 3.0.5
         version: 3.0.5
       start-server-and-test:
-        specifier: 2.0.3
-        version: 2.0.3
+        specifier: 2.0.4
+        version: 2.0.4
       storybook:
-        specifier: 8.0.9
-        version: 8.0.9(@babel/preset-env@7.23.5(@babel/core@7.24.0))(bufferutil@4.0.7)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)
+        specifier: 8.1.11
+        version: 8.1.11(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)
       storybook-addon-misskey-theme:
         specifier: github:misskey-dev/storybook-addon-misskey-theme
-        version: https://codeload.github.com/misskey-dev/storybook-addon-misskey-theme/tar.gz/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@8.0.9(@types/react@18.0.28)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/components@8.0.9(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/core-events@8.0.9)(@storybook/manager-api@8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/preview-api@8.0.9)(@storybook/theming@8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/types@8.0.9)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: https://codeload.github.com/misskey-dev/storybook-addon-misskey-theme/tar.gz/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/components@8.1.11(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/core-events@8.1.11)(@storybook/manager-api@8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/preview-api@8.1.11)(@storybook/theming@8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/types@8.1.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       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)(jsdom@24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.76.0)(terser@5.30.3)
+        specifier: 1.6.0
+        version: 1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1)
       vitest-fetch-mock:
         specifier: 0.2.2
-        version: 0.2.2(encoding@0.1.13)(vitest@0.34.6(happy-dom@10.0.3)(jsdom@24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.76.0)(terser@5.30.3))
+        version: 0.2.2(encoding@0.1.13)(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))
       vue-component-type-helpers:
-        specifier: 2.0.16
-        version: 2.0.16
+        specifier: 2.0.24
+        version: 2.0.24
       vue-eslint-parser:
-        specifier: 9.4.2
-        version: 9.4.2(eslint@8.57.0)
+        specifier: 9.4.3
+        version: 9.4.3(eslint@9.6.0)
       vue-tsc:
-        specifier: 2.0.16
-        version: 2.0.16(typescript@5.5.2)
+        specifier: 2.0.24
+        version: 2.0.24(typescript@5.5.3)
 
   packages/misskey-bubble-game:
     dependencies:
@@ -1062,9 +1056,6 @@ importers:
         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@7.1.0(@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3))(@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0))(eslint@8.57.0)
       '@types/matter-js':
         specifier: 0.19.6
         version: 0.19.6
@@ -1076,16 +1067,13 @@ importers:
         version: 3.0.8
       '@typescript-eslint/eslint-plugin':
         specifier: 7.1.0
-        version: 7.1.0(@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3)
+        version: 7.1.0(@typescript-eslint/parser@7.1.0(eslint@9.6.0)(typescript@5.3.3))(eslint@9.6.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
         specifier: 7.1.0
-        version: 7.1.0(eslint@8.57.0)(typescript@5.3.3)
+        version: 7.1.0(eslint@9.6.0)(typescript@5.3.3)
       esbuild:
         specifier: 0.19.11
         version: 0.19.11
-      eslint:
-        specifier: 8.57.0
-        version: 8.57.0
       execa:
         specifier: 8.0.1
         version: 8.0.1
@@ -1109,41 +1097,35 @@ importers:
         version: 4.4.0
     devDependencies:
       '@microsoft/api-extractor':
-        specifier: 7.43.1
-        version: 7.43.1(@types/node@20.12.7)
-      '@misskey-dev/eslint-plugin':
-        specifier: 1.0.0
-        version: 1.0.0(@typescript-eslint/eslint-plugin@7.7.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2))(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0))(eslint@8.57.0)
+        specifier: 7.47.0
+        version: 7.47.0(@types/node@20.14.9)
       '@swc/jest':
         specifier: 0.2.36
-        version: 0.2.36(@swc/core@1.4.17)
+        version: 0.2.36(@swc/core@1.6.6)
       '@types/jest':
         specifier: 29.5.12
         version: 29.5.12
       '@types/node':
-        specifier: 20.12.7
-        version: 20.12.7
+        specifier: 20.14.9
+        version: 20.14.9
       '@typescript-eslint/eslint-plugin':
-        specifier: 7.7.1
-        version: 7.7.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2)
+        specifier: 7.15.0
+        version: 7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3)
       '@typescript-eslint/parser':
-        specifier: 7.7.1
-        version: 7.7.1(eslint@8.57.0)(typescript@5.5.2)
+        specifier: 7.15.0
+        version: 7.15.0(eslint@9.6.0)(typescript@5.5.3)
       esbuild:
-        specifier: 0.19.11
-        version: 0.19.11
-      eslint:
-        specifier: 8.57.0
-        version: 8.57.0
+        specifier: 0.22.0
+        version: 0.22.0
       execa:
-        specifier: 8.0.1
-        version: 8.0.1
+        specifier: 9.2.0
+        version: 9.2.0
       glob:
-        specifier: 10.3.12
-        version: 10.3.12
+        specifier: 10.4.2
+        version: 10.4.2
       jest:
         specifier: 29.7.0
-        version: 29.7.0(@types/node@20.12.7)
+        version: 29.7.0(@types/node@20.14.9)
       jest-fetch-mock:
         specifier: 3.0.3
         version: 3.0.3(encoding@0.1.13)
@@ -1157,20 +1139,17 @@ importers:
         specifier: 2.0.0
         version: 2.0.0
       nodemon:
-        specifier: 3.1.0
-        version: 3.1.0
+        specifier: 3.1.4
+        version: 3.1.4
       tsd:
-        specifier: 0.30.7
-        version: 0.30.7
+        specifier: 0.31.1
+        version: 0.31.1
       typescript:
-        specifier: 5.5.2
-        version: 5.5.2
+        specifier: 5.5.3
+        version: 5.5.3
 
   packages/misskey-js/generator:
     devDependencies:
-      '@misskey-dev/eslint-plugin':
-        specifier: ^1.0.0
-        version: 1.0.0(@typescript-eslint/eslint-plugin@6.11.0(@typescript-eslint/parser@6.11.0(eslint@8.53.0)(typescript@5.3.3))(eslint@8.53.0)(typescript@5.3.3))(@typescript-eslint/parser@6.11.0(eslint@8.53.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.11.0(eslint@8.53.0)(typescript@5.3.3))(eslint@8.53.0))(eslint@8.53.0)
       '@readme/openapi-parser':
         specifier: 2.5.0
         version: 2.5.0(openapi-types@12.1.3)
@@ -1179,13 +1158,10 @@ importers:
         version: 20.9.1
       '@typescript-eslint/eslint-plugin':
         specifier: 6.11.0
-        version: 6.11.0(@typescript-eslint/parser@6.11.0(eslint@8.53.0)(typescript@5.3.3))(eslint@8.53.0)(typescript@5.3.3)
+        version: 6.11.0(@typescript-eslint/parser@6.11.0(eslint@9.6.0)(typescript@5.3.3))(eslint@9.6.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
         specifier: 6.11.0
-        version: 6.11.0(eslint@8.53.0)(typescript@5.3.3)
-      eslint:
-        specifier: 8.53.0
-        version: 8.53.0
+        version: 6.11.0(eslint@9.6.0)(typescript@5.3.3)
       openapi-types:
         specifier: 12.1.3
         version: 12.1.3
@@ -1208,24 +1184,18 @@ importers:
         specifier: 1.2.2
         version: 1.2.2
     devDependencies:
-      '@misskey-dev/eslint-plugin':
-        specifier: 1.0.0
-        version: 1.0.0(@typescript-eslint/eslint-plugin@7.1.0(@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3))(@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0))(eslint@8.57.0)
       '@types/node':
         specifier: 20.11.5
         version: 20.11.5
       '@typescript-eslint/eslint-plugin':
         specifier: 7.1.0
-        version: 7.1.0(@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3)
+        version: 7.1.0(@typescript-eslint/parser@7.1.0(eslint@9.6.0)(typescript@5.3.3))(eslint@9.6.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
         specifier: 7.1.0
-        version: 7.1.0(eslint@8.57.0)(typescript@5.3.3)
+        version: 7.1.0(eslint@9.6.0)(typescript@5.3.3)
       esbuild:
         specifier: 0.19.11
         version: 0.19.11
-      eslint:
-        specifier: 8.57.0
-        version: 8.57.0
       execa:
         specifier: 8.0.1
         version: 8.0.1
@@ -1242,8 +1212,8 @@ importers:
   packages/sw:
     dependencies:
       esbuild:
-        specifier: 0.20.2
-        version: 0.20.2
+        specifier: 0.22.0
+        version: 0.22.0
       idb-keyval:
         specifier: 6.2.1
         version: 6.2.1
@@ -1251,27 +1221,21 @@ importers:
         specifier: workspace:*
         version: link:../misskey-js
     devDependencies:
-      '@misskey-dev/eslint-plugin':
-        specifier: 1.0.0
-        version: 1.0.0(@typescript-eslint/eslint-plugin@7.7.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2))(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0))(eslint@8.57.0)
       '@typescript-eslint/parser':
-        specifier: 7.7.1
-        version: 7.7.1(eslint@8.57.0)(typescript@5.5.2)
+        specifier: 7.15.0
+        version: 7.15.0(eslint@9.6.0)(typescript@5.5.3)
       '@typescript/lib-webworker':
         specifier: npm:@types/serviceworker@0.0.67
         version: '@types/serviceworker@0.0.67'
-      eslint:
-        specifier: 8.57.0
-        version: 8.57.0
       eslint-plugin-import:
         specifier: 2.29.1
-        version: 2.29.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)
+        version: 2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)
       nodemon:
-        specifier: 3.1.0
-        version: 3.1.0
+        specifier: 3.1.4
+        version: 3.1.4
       typescript:
-        specifier: 5.5.2
-        version: 5.5.2
+        specifier: 5.5.3
+        version: 5.5.3
 
 packages:
 
@@ -1302,221 +1266,239 @@ packages:
     resolution: {integrity: sha512-Xk1sIhyNC/esHGGVjL/niHLowM0csl/kFO5uawBy4IrWwy0o1G8LGt3jP6nmWGz+USxeeqbihAmp/oVZju6wug==}
     hasBin: true
 
-  '@aws-crypto/crc32@3.0.0':
-    resolution: {integrity: sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==}
+  '@aws-crypto/crc32@5.2.0':
+    resolution: {integrity: sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-crypto/crc32c@3.0.0':
-    resolution: {integrity: sha512-ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w==}
+  '@aws-crypto/crc32c@5.2.0':
+    resolution: {integrity: sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==}
 
-  '@aws-crypto/ie11-detection@3.0.0':
-    resolution: {integrity: sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==}
+  '@aws-crypto/sha1-browser@5.2.0':
+    resolution: {integrity: sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==}
 
-  '@aws-crypto/sha1-browser@3.0.0':
-    resolution: {integrity: sha512-NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw==}
+  '@aws-crypto/sha256-browser@5.2.0':
+    resolution: {integrity: sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==}
 
-  '@aws-crypto/sha256-browser@3.0.0':
-    resolution: {integrity: sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==}
+  '@aws-crypto/sha256-js@5.2.0':
+    resolution: {integrity: sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-crypto/sha256-js@3.0.0':
-    resolution: {integrity: sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==}
+  '@aws-crypto/supports-web-crypto@5.2.0':
+    resolution: {integrity: sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==}
 
-  '@aws-crypto/supports-web-crypto@3.0.0':
-    resolution: {integrity: sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==}
+  '@aws-crypto/util@5.2.0':
+    resolution: {integrity: sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==}
 
-  '@aws-crypto/util@3.0.0':
-    resolution: {integrity: sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==}
+  '@aws-sdk/client-s3@3.600.0':
+    resolution: {integrity: sha512-iYoKbJTputbf+ubkX6gSK/y/4uJEBRaXZ18jykLdBQ8UJuGrk2gqvV8h7OlGAhToCeysmmMqM0vDWyLt6lP8nw==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/client-s3@3.412.0':
-    resolution: {integrity: sha512-sNrlx9sSBmFUCqMgTznwk9Fee3PJat0nZ3RIDR5Crhsld/eexxrqb6TYKsxzFfBfXTL/oPh+/S5driRV2xsB8A==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/client-sso-oidc@3.600.0':
+    resolution: {integrity: sha512-7+I8RWURGfzvChyNQSyj5/tKrqRbzRl7H+BnTOf/4Vsw1nFOi5ROhlhD4X/Y0QCTacxnaoNcIrqnY7uGGvVRzw==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/client-sso@3.410.0':
-    resolution: {integrity: sha512-MC9GrgwtlOuSL2WS3DRM3dQ/5y+49KSMMJRH6JiEcU5vE0dX/OtEcX+VfEwpi73x5pSfIjm7xnzjzOFx+sQBIg==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/client-sso@3.598.0':
+    resolution: {integrity: sha512-nOI5lqPYa+YZlrrzwAJywJSw3MKVjvu6Ge2fCqQUNYMfxFB0NAaDFnl0EPjXi+sEbtCuz/uWE77poHbqiZ+7Iw==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/client-sts@3.410.0':
-    resolution: {integrity: sha512-e6VMrBJtnTxxUXwDmkADGIvyppmDMFf4+cGGA68tVCUm1cFNlCI6M/67bVSIPN/WVKAAfhEL5O2vVXCM7aatYg==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/client-sts@3.600.0':
+    resolution: {integrity: sha512-KQG97B7LvTtTiGmjlrG1LRAY8wUvCQzrmZVV5bjrJ/1oXAU7DITYwVbSJeX9NWg6hDuSk0VE3MFwIXS2SvfLIA==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/credential-provider-env@3.410.0':
-    resolution: {integrity: sha512-c7TB9LbN0PkFOsXI0lcRJnqPNOmc4VBvrHf8jP/BkTDg4YUoKQKOFd4d0SqzODmlZiAyoMQVZTR4ISZo95Zj4Q==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/core@3.598.0':
+    resolution: {integrity: sha512-HaSjt7puO5Cc7cOlrXFCW0rtA0BM9lvzjl56x0A20Pt+0wxXGeTOZZOkXQIepbrFkV2e/HYukuT9e99vXDm59g==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/credential-provider-ini@3.410.0':
-    resolution: {integrity: sha512-D8rcr5bRCFD0f42MPQ7K6TWZq5d3pfqrKINL1/bpfkK5BJbvq1BGYmR88UC6CLpTRtZ1LHY2HgYG0fp/2zjjww==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/credential-provider-env@3.598.0':
+    resolution: {integrity: sha512-vi1khgn7yXzLCcgSIzQrrtd2ilUM0dWodxj3PQ6BLfP0O+q1imO3hG1nq7DVyJtq7rFHs6+9N8G4mYvTkxby2w==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/credential-provider-node@3.410.0':
-    resolution: {integrity: sha512-0wmVm33T/j1FS7MZ/j+WsPlgSc0YnCXnpbWSov1Mn6R86SHI2b2JhdIPRRE4XbGfyW2QGNUl2CwoZVaqhXeF5g==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/credential-provider-http@3.598.0':
+    resolution: {integrity: sha512-N7cIafi4HVlQvEgvZSo1G4T9qb/JMLGMdBsDCT5XkeJrF0aptQWzTFH0jIdZcLrMYvzPcuEyO3yCBe6cy/ba0g==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/credential-provider-process@3.410.0':
-    resolution: {integrity: sha512-BMju1hlDCDNkkSZpKF5SQ8G0WCLRj6/Jvw9QmudLHJuVwYJXEW1r2AsVMg98OZ3hB9G+MAvHruHZIbMiNmUMXQ==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/credential-provider-sso@3.410.0':
-    resolution: {integrity: sha512-zEaoY/sY+KYTlQUkp9dvveAHf175b8RIt0DsQkDrRPtrg/RBHR00r5rFvz9+nrwsR8546RaBU7h/zzTaQGhmcA==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/credential-provider-web-identity@3.410.0':
-    resolution: {integrity: sha512-cE0l8LmEHdWbDkdPNgrfdYSgp4/cIVXrjUKI1QCATA729CrHZ/OQjB/maOBOrMHO9YTiggko887NkslVvwVB7w==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/lib-storage@3.412.0':
-    resolution: {integrity: sha512-uAdVtNuip06rJOs28zVrYXLNeHfKraxvJRTzTA+DW1dXkzh70GTKqDKHWH9IJkW/xMTE6wGSM+fDs8jsMOn/yA==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/credential-provider-ini@3.598.0':
+    resolution: {integrity: sha512-/ppcIVUbRwDIwJDoYfp90X3+AuJo2mvE52Y1t2VSrvUovYn6N4v95/vXj6LS8CNDhz2jvEJYmu+0cTMHdhI6eA==}
+    engines: {node: '>=16.0.0'}
     peerDependencies:
-      '@aws-sdk/client-s3': ^3.0.0
+      '@aws-sdk/client-sts': ^3.598.0
 
-  '@aws-sdk/middleware-bucket-endpoint@3.410.0':
-    resolution: {integrity: sha512-pUGrpFgCKf9fDHu01JJhhw+MUImheS0HFlZwNG37OMubkxUAbCdmYGewGxfTCUvWyZJtx9bVjrSu6gG7w+RARg==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/credential-provider-node@3.600.0':
+    resolution: {integrity: sha512-1pC7MPMYD45J7yFjA90SxpR0yaSvy+yZiq23aXhAPZLYgJBAxHLu0s0mDCk/piWGPh8+UGur5K0bVdx4B1D5hw==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-expect-continue@3.410.0':
-    resolution: {integrity: sha512-e5YqGCNmW99GZjEPPujJ02RlEZql19U40oORysBhVF7mKz8BBvF3s8l37tvu37oxebDEkh1u/2cm2+ggOXxLjQ==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/credential-provider-process@3.598.0':
+    resolution: {integrity: sha512-rM707XbLW8huMk722AgjVyxu2tMZee++fNA8TJVNgs1Ma02Wx6bBrfIvlyK0rCcIRb0WdQYP6fe3Xhiu4e8IBA==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-flexible-checksums@3.410.0':
-    resolution: {integrity: sha512-IK7KlvEKtrQVBfmAp/MmGd0wbWLuN2GZwwfAmsU0qFb0f5vOVUbKDsu6tudtDKCBG9uXyTEsx3/QGvoK2zDy+g==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/credential-provider-sso@3.598.0':
+    resolution: {integrity: sha512-5InwUmrAuqQdOOgxTccRayMMkSmekdLk6s+az9tmikq0QFAHUCtofI+/fllMXSR9iL6JbGYi1940+EUmS4pHJA==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-host-header@3.410.0':
-    resolution: {integrity: sha512-ED/OVcyITln5rrxnajZP+V0PN1nug+gSDHJDqdDo/oLy7eiDr/ZWn3nlWW7WcMplQ1/Jnb+hK0UetBp/25XooA==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/credential-provider-web-identity@3.598.0':
+    resolution: {integrity: sha512-GV5GdiMbz5Tz9JO4NJtRoFXjW0GPEujA0j+5J/B723rTN+REHthJu48HdBKouHGhdzkDWkkh1bu52V02Wprw8w==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      '@aws-sdk/client-sts': ^3.598.0
 
-  '@aws-sdk/middleware-location-constraint@3.410.0':
-    resolution: {integrity: sha512-jAftSpOpw/5AdpOJ/cGiXCb+Vv22KXR5QZmxmllUDsnlm18672tpRaI2plmu/1d98CVvqhY61eSklFMrIf2c4w==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/lib-storage@3.600.0':
+    resolution: {integrity: sha512-jjgGMmFykXBAs8YO3ghgnVSjM/uf99jvVQqKJfDjwXUCLPrsZqk14v2WcDCWAXzeAroDvIOVQO1V/RR8fK18Pw==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      '@aws-sdk/client-s3': ^3.600.0
 
-  '@aws-sdk/middleware-logger@3.410.0':
-    resolution: {integrity: sha512-YtmKYCVtBfScq3/UFJk+aSZOktKJBNZL9DaSc2aPcy/goCVsYDOkGwtHk0jIkC1JRSNCkVTqL7ya60sSr8zaQQ==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/middleware-bucket-endpoint@3.598.0':
+    resolution: {integrity: sha512-PM7BcFfGUSkmkT6+LU9TyJiB4S8yI7dfuKQDwK5ZR3P7MKaK4Uj4yyDiv0oe5xvkF6+O2+rShj+eh8YuWkOZ/Q==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-recursion-detection@3.410.0':
-    resolution: {integrity: sha512-KWaes5FLzRqj28vaIEE4Bimpga2E596WdPF2HaH6zsVMJddoRDsc3ZX9ZhLOGrXzIO1RqBd0QxbLrM0S/B2aOQ==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/middleware-expect-continue@3.598.0':
+    resolution: {integrity: sha512-ZuHW18kaeHR8TQyhEOYMr8VwiIh0bMvF7J1OTqXHxDteQIavJWA3CbfZ9sgS4XGtrBZDyHJhjZKeCfLhN2rq3w==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-sdk-s3@3.410.0':
-    resolution: {integrity: sha512-K2sG2V1ZkezYMCIy3uMt0MwtflcfIwLptwm0iFLaYitiINZQ1tcslk9ggAjyTHg0rslDSI4/zjkhy8VHFOV7HA==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/middleware-flexible-checksums@3.598.0':
+    resolution: {integrity: sha512-xukAzds0GQXvMEY9G6qt+CzwVzTx8NyKKh04O2Q+nOch6QQ8Rs+2kTRy3Z4wQmXq2pK9hlOWb5nXA7HWpmz6Ng==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-sdk-sts@3.410.0':
-    resolution: {integrity: sha512-YfBpctDocRR4CcROoDueJA7D+aMLBV8nTFfmVNdLLLgyuLZ/AUR11VQSu1lf9gQZKl8IpKE/BLf2fRE/qV1ZuA==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/middleware-host-header@3.598.0':
+    resolution: {integrity: sha512-WiaG059YBQwQraNejLIi0gMNkX7dfPZ8hDIhvMr5aVPRbaHH8AYF3iNSsXYCHvA2Cfa1O9haYXsuMF9flXnCmA==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-signing@3.410.0':
-    resolution: {integrity: sha512-KBAZ/eoAJUSJv5us2HsKwK2OszG2s9FEyKpEhgnHLcbbKzW873zHBH5GcOGEQu4AWArTy2ndzJu3FF+9/J9hJQ==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/middleware-location-constraint@3.598.0':
+    resolution: {integrity: sha512-8oybQxN3F1ISOMULk7JKJz5DuAm5hCUcxMW9noWShbxTJuStNvuHf/WLUzXrf8oSITyYzIHPtf8VPlKR7I3orQ==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-ssec@3.410.0':
-    resolution: {integrity: sha512-DNsjVTXoxIh+PuW9o45CFaMiconbuZRm19MC3NA1yNCaCj3ZxD5OdXAutq6UjQdrx8UG4EjUlCJEEvBKmboITw==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/middleware-logger@3.598.0':
+    resolution: {integrity: sha512-bxBjf/VYiu3zfu8SYM2S9dQQc3tz5uBAOcPz/Bt8DyyK3GgOpjhschH/2XuUErsoUO1gDJqZSdGOmuHGZQn00Q==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-user-agent@3.410.0':
-    resolution: {integrity: sha512-ZayDtLfvCZUohSxQc/49BfoU/y6bDHLfLdyyUJbJ54Sv8zQcrmdyKvCBFUZwE6tHQgAmv9/ZT18xECMl+xiONA==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/middleware-recursion-detection@3.598.0':
+    resolution: {integrity: sha512-vjT9BeFY9FeN0f8hm2l6F53tI0N5bUq6RcDkQXKNabXBnQxKptJRad6oP2X5y3FoVfBLOuDkQgiC2940GIPxtQ==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/signature-v4-multi-region@3.412.0':
-    resolution: {integrity: sha512-ijxOeYpNDuk2T940S9HYcZ1C+wTP9vqp1Cw37zw9whVY2mKV3Vr7i+44D4FQ5HhWULgdwhjD7IctbNxPIPzUZQ==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/middleware-sdk-s3@3.598.0':
+    resolution: {integrity: sha512-5AGtLAh9wyK6ANPYfaKTqJY1IFJyePIxsEbxa7zS6REheAqyVmgJFaGu3oQ5XlxfGr5Uq59tFTRkyx26G1HkHA==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/token-providers@3.410.0':
-    resolution: {integrity: sha512-d5Nc0xydkH/X0LA1HDyhGY5sEv4LuADFk+QpDtT8ogLilcre+b1jpdY8Sih/gd1KoGS1H+d1tz2hSGwUHAbUbw==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/middleware-signing@3.598.0':
+    resolution: {integrity: sha512-XKb05DYx/aBPqz6iCapsCbIl8aD8EihTuPCs51p75QsVfbQoVr4TlFfIl5AooMSITzojdAQqxt021YtvxjtxIQ==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/types@3.410.0':
-    resolution: {integrity: sha512-D7iaUCszv/v04NDaZUmCmekamy6VD/lKozm/3gS9+dkfU6cC2CsNoUfPV8BlV6dPdw0oWgF91am3I1stdvfVrQ==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/middleware-ssec@3.598.0':
+    resolution: {integrity: sha512-f0p2xP8IC1uJ5e/tND1l81QxRtRFywEdnbtKCE0H6RSn4UIt2W3Dohe1qQDbnh27okF0PkNW6BJGdSAz3p7qbA==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/types@3.413.0':
-    resolution: {integrity: sha512-j1xib0f/TazIFc5ySIKOlT1ujntRbaoG4LJFeEezz4ji03/wSJMI8Vi4KjzpBp8J1tTu0oRDnsxRIGixsUBeYQ==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/middleware-user-agent@3.598.0':
+    resolution: {integrity: sha512-4tjESlHG5B5MdjUaLK7tQs/miUtHbb6deauQx8ryqSBYOhfHVgb1ZnzvQR0bTrhpqUg0WlybSkDaZAICf9xctg==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/util-arn-parser@3.310.0':
-    resolution: {integrity: sha512-jL8509owp/xB9+Or0pvn3Fe+b94qfklc2yPowZZIFAkFcCSIdkIglz18cPDWnYAcy9JGewpMS1COXKIUhZkJsA==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/region-config-resolver@3.598.0':
+    resolution: {integrity: sha512-oYXhmTokSav4ytmWleCr3rs/1nyvZW/S0tdi6X7u+dLNL5Jee+uMxWGzgOrWK6wrQOzucLVjS4E/wA11Kv2GTw==}
+    engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/util-endpoints@3.410.0':
-    resolution: {integrity: sha512-iNiqJyC7N3+8zFwnXUqcWSxrZecVZLToo1iTQQdeYL2af1IcOtRgb7n8jpAI/hmXhBSx2+3RI+Y7pxyFo1vu+w==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/signature-v4-multi-region@3.598.0':
+    resolution: {integrity: sha512-1r/EyTrO1gSa1FirnR8V7mabr7gk+l+HkyTI0fcTSr8ucB7gmYyW6WjkY8JCz13VYHFK62usCEDS7yoJoJOzTA==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/token-providers@3.598.0':
+    resolution: {integrity: sha512-TKY1EVdHVBnZqpyxyTHdpZpa1tUpb6nxVeRNn1zWG8QB5MvH4ALLd/jR+gtmWDNQbIG4cVuBOZFVL8hIYicKTA==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      '@aws-sdk/client-sso-oidc': ^3.598.0
+
+  '@aws-sdk/types@3.598.0':
+    resolution: {integrity: sha512-742uRl6z7u0LFmZwDrFP6r1wlZcgVPw+/TilluDJmCAR8BgRw3IR+743kUXKBGd8QZDRW2n6v/PYsi/AWCDDMQ==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/util-arn-parser@3.568.0':
+    resolution: {integrity: sha512-XUKJWWo+KOB7fbnPP0+g/o5Ulku/X53t7i/h+sPHr5xxYTJJ9CYnbToo95mzxe7xWvkLrsNtJ8L+MnNn9INs2w==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/util-endpoints@3.598.0':
+    resolution: {integrity: sha512-Qo9UoiVVZxcOEdiOMZg3xb1mzkTxrhd4qSlg5QQrfWPJVx/QOg+Iy0NtGxPtHtVZNHZxohYwDwV/tfsnDSE2gQ==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-sdk/util-locate-window@3.208.0':
     resolution: {integrity: sha512-iua1A2+P7JJEDHVgvXrRJSvsnzG7stYSGQnBVphIUlemwl6nN5D+QrgbjECtrbxRz8asYFHSzhdhECqN+tFiBg==}
     engines: {node: '>=14.0.0'}
 
-  '@aws-sdk/util-user-agent-browser@3.410.0':
-    resolution: {integrity: sha512-i1G/XGpXGMRT2zEiAhi1xucJsfCWk8nNYjk/LbC0sA+7B9Huri96YAzVib12wkHPsJQvZxZC6CpQDIHWm4lXMA==}
+  '@aws-sdk/util-user-agent-browser@3.598.0':
+    resolution: {integrity: sha512-36Sxo6F+ykElaL1mWzWjlg+1epMpSe8obwhCN1yGE7Js9ywy5U6k6l+A3q3YM9YRbm740sNxncbwLklMvuhTKw==}
 
-  '@aws-sdk/util-user-agent-node@3.410.0':
-    resolution: {integrity: sha512-bK70t1jHRl8HrJXd4hEIwc5PBZ7U0w+81AKFnanIVKZwZedd6nLibUXDTK14z/Jp2GFcBqd4zkt2YLGkRt/U4A==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/util-user-agent-node@3.598.0':
+    resolution: {integrity: sha512-oyWGcOlfTdzkC6SVplyr0AGh54IMrDxbhg5RxJ5P+V4BKfcDoDcZV9xenUk9NsOi9MuUjxMumb9UJGkDhM1m0A==}
+    engines: {node: '>=16.0.0'}
     peerDependencies:
       aws-crt: '>=1.0.0'
     peerDependenciesMeta:
       aws-crt:
         optional: true
 
-  '@aws-sdk/util-utf8-browser@3.259.0':
-    resolution: {integrity: sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==}
-
-  '@aws-sdk/xml-builder@3.310.0':
-    resolution: {integrity: sha512-TqELu4mOuSIKQCqj63fGVs86Yh+vBx5nHRpWKNUNhB2nPTpfbziTs5c1X358be3peVWA4wPxW7Nt53KIg1tnNw==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/xml-builder@3.598.0':
+    resolution: {integrity: sha512-ZIa2RK7CHFTZ4gwK77WRtsZ6vF7xwRXxJ8KQIxK2duhoTVcn0xYxpFLdW9WZZZvdP9GIF3Loqvf8DRdeU5Jc7Q==}
+    engines: {node: '>=16.0.0'}
 
   '@babel/code-frame@7.23.5':
     resolution: {integrity: sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/code-frame@7.24.7':
+    resolution: {integrity: sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/compat-data@7.23.5':
     resolution: {integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/compat-data@7.24.7':
+    resolution: {integrity: sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/core@7.23.5':
     resolution: {integrity: sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/core@7.24.0':
-    resolution: {integrity: sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==}
+  '@babel/core@7.24.7':
+    resolution: {integrity: sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==}
     engines: {node: '>=6.9.0'}
 
   '@babel/generator@7.23.5':
     resolution: {integrity: sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/generator@7.23.6':
-    resolution: {integrity: sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==}
+  '@babel/generator@7.24.7':
+    resolution: {integrity: sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-annotate-as-pure@7.22.5':
-    resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==}
+  '@babel/helper-annotate-as-pure@7.24.7':
+    resolution: {integrity: sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-builder-binary-assignment-operator-visitor@7.22.15':
-    resolution: {integrity: sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==}
+  '@babel/helper-builder-binary-assignment-operator-visitor@7.24.7':
+    resolution: {integrity: sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==}
     engines: {node: '>=6.9.0'}
 
   '@babel/helper-compilation-targets@7.22.15':
     resolution: {integrity: sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-compilation-targets@7.23.6':
-    resolution: {integrity: sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==}
+  '@babel/helper-compilation-targets@7.24.7':
+    resolution: {integrity: sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-create-class-features-plugin@7.23.5':
-    resolution: {integrity: sha512-QELlRWxSpgdwdJzSJn4WAhKC+hvw/AtHbbrIoncKHkhKKR/luAlKkgBDcri1EzWAo8f8VvYVryEHN4tax/V67A==}
+  '@babel/helper-create-class-features-plugin@7.24.7':
+    resolution: {integrity: sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/helper-create-regexp-features-plugin@7.22.15':
-    resolution: {integrity: sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==}
+  '@babel/helper-create-regexp-features-plugin@7.24.7':
+    resolution: {integrity: sha512-03TCmXy2FtXJEZfbXDTSqq1fRJArk7lX9DOFC/47VthYcxyIOx+eXQmdo6DOQvrbpIix+KfXwvuXdFDZHxt+rA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/helper-define-polyfill-provider@0.4.3':
-    resolution: {integrity: sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==}
+  '@babel/helper-define-polyfill-provider@0.6.2':
+    resolution: {integrity: sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==}
     peerDependencies:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
 
@@ -1524,44 +1506,70 @@ packages:
     resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-environment-visitor@7.24.7':
+    resolution: {integrity: sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-function-name@7.23.0':
     resolution: {integrity: sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-function-name@7.24.7':
+    resolution: {integrity: sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-hoist-variables@7.22.5':
     resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-member-expression-to-functions@7.23.0':
-    resolution: {integrity: sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==}
+  '@babel/helper-hoist-variables@7.24.7':
+    resolution: {integrity: sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-member-expression-to-functions@7.24.7':
+    resolution: {integrity: sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w==}
     engines: {node: '>=6.9.0'}
 
   '@babel/helper-module-imports@7.22.15':
     resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-module-imports@7.24.7':
+    resolution: {integrity: sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-module-transforms@7.23.3':
     resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/helper-optimise-call-expression@7.22.5':
-    resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==}
+  '@babel/helper-module-transforms@7.24.7':
+    resolution: {integrity: sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-optimise-call-expression@7.24.7':
+    resolution: {integrity: sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==}
     engines: {node: '>=6.9.0'}
 
   '@babel/helper-plugin-utils@7.22.5':
     resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-remap-async-to-generator@7.22.20':
-    resolution: {integrity: sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==}
+  '@babel/helper-plugin-utils@7.24.7':
+    resolution: {integrity: sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-remap-async-to-generator@7.24.7':
+    resolution: {integrity: sha512-9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/helper-replace-supers@7.22.20':
-    resolution: {integrity: sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==}
+  '@babel/helper-replace-supers@7.24.7':
+    resolution: {integrity: sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -1570,71 +1578,101 @@ packages:
     resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-skip-transparent-expression-wrappers@7.22.5':
-    resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==}
+  '@babel/helper-simple-access@7.24.7':
+    resolution: {integrity: sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-skip-transparent-expression-wrappers@7.24.7':
+    resolution: {integrity: sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==}
     engines: {node: '>=6.9.0'}
 
   '@babel/helper-split-export-declaration@7.22.6':
     resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-split-export-declaration@7.24.7':
+    resolution: {integrity: sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-string-parser@7.23.4':
     resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-string-parser@7.24.7':
+    resolution: {integrity: sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-validator-identifier@7.22.20':
     resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-validator-identifier@7.24.7':
+    resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-validator-option@7.23.5':
     resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-wrap-function@7.22.20':
-    resolution: {integrity: sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==}
+  '@babel/helper-validator-option@7.24.7':
+    resolution: {integrity: sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-wrap-function@7.24.7':
+    resolution: {integrity: sha512-N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw==}
     engines: {node: '>=6.9.0'}
 
   '@babel/helpers@7.23.5':
     resolution: {integrity: sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helpers@7.24.0':
-    resolution: {integrity: sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==}
+  '@babel/helpers@7.24.7':
+    resolution: {integrity: sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==}
     engines: {node: '>=6.9.0'}
 
   '@babel/highlight@7.23.4':
     resolution: {integrity: sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/highlight@7.24.7':
+    resolution: {integrity: sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/parser@7.23.9':
     resolution: {integrity: sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
-  '@babel/parser@7.24.0':
-    resolution: {integrity: sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-
   '@babel/parser@7.24.5':
     resolution: {integrity: sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
-  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.23.3':
-    resolution: {integrity: sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==}
+  '@babel/parser@7.24.7':
+    resolution: {integrity: sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.24.7':
+    resolution: {integrity: sha512-TiT1ss81W80eQsN+722OaeQMY/G4yTb4G9JrqeiDADs3N8lbPMGldWi9x8tyqCW5NLx1Jh2AvkE6r6QvEltMMQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.23.3':
-    resolution: {integrity: sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==}
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.24.7':
+    resolution: {integrity: sha512-unaQgZ/iRu/By6tsjMZzpeBZjChYfLYry6HrEXPoz3KmfF0sVBQ1l8zKMQ4xRGLWVsjuvB8nQfjNP/DcfEOCsg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.24.7':
+    resolution: {integrity: sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.13.0
 
-  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.23.3':
-    resolution: {integrity: sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w==}
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.24.7':
+    resolution: {integrity: sha512-utA4HuR6F4Vvcr+o4DnjL8fCOlgRFGbeeBEGNg3ZTrLFw6VWG5XmUrvcQ0FjIYMU2ST4XcR2Wsp7t9qOAPnxMg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -1682,14 +1720,14 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-syntax-import-assertions@7.23.3':
-    resolution: {integrity: sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==}
+  '@babel/plugin-syntax-import-assertions@7.24.7':
+    resolution: {integrity: sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-syntax-import-attributes@7.23.3':
-    resolution: {integrity: sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==}
+  '@babel/plugin-syntax-import-attributes@7.24.7':
+    resolution: {integrity: sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1764,92 +1802,92 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/plugin-transform-arrow-functions@7.23.3':
-    resolution: {integrity: sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==}
+  '@babel/plugin-transform-arrow-functions@7.24.7':
+    resolution: {integrity: sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-async-generator-functions@7.23.4':
-    resolution: {integrity: sha512-efdkfPhHYTtn0G6n2ddrESE91fgXxjlqLsnUtPWnJs4a4mZIbUaK7ffqKIIUKXSHwcDvaCVX6GXkaJJFqtX7jw==}
+  '@babel/plugin-transform-async-generator-functions@7.24.7':
+    resolution: {integrity: sha512-o+iF77e3u7ZS4AoAuJvapz9Fm001PuD2V3Lp6OSE4FYQke+cSewYtnek+THqGRWyQloRCyvWL1OkyfNEl9vr/g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-async-to-generator@7.23.3':
-    resolution: {integrity: sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==}
+  '@babel/plugin-transform-async-to-generator@7.24.7':
+    resolution: {integrity: sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-block-scoped-functions@7.23.3':
-    resolution: {integrity: sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==}
+  '@babel/plugin-transform-block-scoped-functions@7.24.7':
+    resolution: {integrity: sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-block-scoping@7.23.4':
-    resolution: {integrity: sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==}
+  '@babel/plugin-transform-block-scoping@7.24.7':
+    resolution: {integrity: sha512-Nd5CvgMbWc+oWzBsuaMcbwjJWAcp5qzrbg69SZdHSP7AMY0AbWFqFO0WTFCA1jxhMCwodRwvRec8k0QUbZk7RQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-class-properties@7.23.3':
-    resolution: {integrity: sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==}
+  '@babel/plugin-transform-class-properties@7.24.7':
+    resolution: {integrity: sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-class-static-block@7.23.4':
-    resolution: {integrity: sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==}
+  '@babel/plugin-transform-class-static-block@7.24.7':
+    resolution: {integrity: sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.12.0
 
-  '@babel/plugin-transform-classes@7.23.5':
-    resolution: {integrity: sha512-jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg==}
+  '@babel/plugin-transform-classes@7.24.7':
+    resolution: {integrity: sha512-CFbbBigp8ln4FU6Bpy6g7sE8B/WmCmzvivzUC6xDAdWVsjYTXijpuuGJmYkAaoWAzcItGKT3IOAbxRItZ5HTjw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-computed-properties@7.23.3':
-    resolution: {integrity: sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==}
+  '@babel/plugin-transform-computed-properties@7.24.7':
+    resolution: {integrity: sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-destructuring@7.23.3':
-    resolution: {integrity: sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==}
+  '@babel/plugin-transform-destructuring@7.24.7':
+    resolution: {integrity: sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-dotall-regex@7.23.3':
-    resolution: {integrity: sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==}
+  '@babel/plugin-transform-dotall-regex@7.24.7':
+    resolution: {integrity: sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-duplicate-keys@7.23.3':
-    resolution: {integrity: sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==}
+  '@babel/plugin-transform-duplicate-keys@7.24.7':
+    resolution: {integrity: sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-dynamic-import@7.23.4':
-    resolution: {integrity: sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==}
+  '@babel/plugin-transform-dynamic-import@7.24.7':
+    resolution: {integrity: sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-exponentiation-operator@7.23.3':
-    resolution: {integrity: sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==}
+  '@babel/plugin-transform-exponentiation-operator@7.24.7':
+    resolution: {integrity: sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-export-namespace-from@7.23.4':
-    resolution: {integrity: sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==}
+  '@babel/plugin-transform-export-namespace-from@7.24.7':
+    resolution: {integrity: sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1860,176 +1898,176 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-for-of@7.23.3':
-    resolution: {integrity: sha512-X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw==}
+  '@babel/plugin-transform-for-of@7.24.7':
+    resolution: {integrity: sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-function-name@7.23.3':
-    resolution: {integrity: sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==}
+  '@babel/plugin-transform-function-name@7.24.7':
+    resolution: {integrity: sha512-U9FcnA821YoILngSmYkW6FjyQe2TyZD5pHt4EVIhmcTkrJw/3KqcrRSxuOo5tFZJi7TE19iDyI1u+weTI7bn2w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-json-strings@7.23.4':
-    resolution: {integrity: sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==}
+  '@babel/plugin-transform-json-strings@7.24.7':
+    resolution: {integrity: sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-literals@7.23.3':
-    resolution: {integrity: sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==}
+  '@babel/plugin-transform-literals@7.24.7':
+    resolution: {integrity: sha512-vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-logical-assignment-operators@7.23.4':
-    resolution: {integrity: sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==}
+  '@babel/plugin-transform-logical-assignment-operators@7.24.7':
+    resolution: {integrity: sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-member-expression-literals@7.23.3':
-    resolution: {integrity: sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==}
+  '@babel/plugin-transform-member-expression-literals@7.24.7':
+    resolution: {integrity: sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-modules-amd@7.23.3':
-    resolution: {integrity: sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==}
+  '@babel/plugin-transform-modules-amd@7.24.7':
+    resolution: {integrity: sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-modules-commonjs@7.23.3':
-    resolution: {integrity: sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==}
+  '@babel/plugin-transform-modules-commonjs@7.24.7':
+    resolution: {integrity: sha512-iFI8GDxtevHJ/Z22J5xQpVqFLlMNstcLXh994xifFwxxGslr2ZXXLWgtBeLctOD63UFDArdvN6Tg8RFw+aEmjQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-modules-systemjs@7.23.3':
-    resolution: {integrity: sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==}
+  '@babel/plugin-transform-modules-systemjs@7.24.7':
+    resolution: {integrity: sha512-GYQE0tW7YoaN13qFh3O1NCY4MPkUiAH3fiF7UcV/I3ajmDKEdG3l+UOcbAm4zUE3gnvUU+Eni7XrVKo9eO9auw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-modules-umd@7.23.3':
-    resolution: {integrity: sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==}
+  '@babel/plugin-transform-modules-umd@7.24.7':
+    resolution: {integrity: sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-named-capturing-groups-regex@7.22.5':
-    resolution: {integrity: sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==}
+  '@babel/plugin-transform-named-capturing-groups-regex@7.24.7':
+    resolution: {integrity: sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/plugin-transform-new-target@7.23.3':
-    resolution: {integrity: sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==}
+  '@babel/plugin-transform-new-target@7.24.7':
+    resolution: {integrity: sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-nullish-coalescing-operator@7.23.4':
-    resolution: {integrity: sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==}
+  '@babel/plugin-transform-nullish-coalescing-operator@7.24.7':
+    resolution: {integrity: sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-numeric-separator@7.23.4':
-    resolution: {integrity: sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==}
+  '@babel/plugin-transform-numeric-separator@7.24.7':
+    resolution: {integrity: sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-object-rest-spread@7.23.4':
-    resolution: {integrity: sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==}
+  '@babel/plugin-transform-object-rest-spread@7.24.7':
+    resolution: {integrity: sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-object-super@7.23.3':
-    resolution: {integrity: sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==}
+  '@babel/plugin-transform-object-super@7.24.7':
+    resolution: {integrity: sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-optional-catch-binding@7.23.4':
-    resolution: {integrity: sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==}
+  '@babel/plugin-transform-optional-catch-binding@7.24.7':
+    resolution: {integrity: sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-optional-chaining@7.23.4':
-    resolution: {integrity: sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==}
+  '@babel/plugin-transform-optional-chaining@7.24.7':
+    resolution: {integrity: sha512-tK+0N9yd4j+x/4hxF3F0e0fu/VdcxU18y5SevtyM/PCFlQvXbR0Zmlo2eBrKtVipGNFzpq56o8WsIIKcJFUCRQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-parameters@7.23.3':
-    resolution: {integrity: sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==}
+  '@babel/plugin-transform-parameters@7.24.7':
+    resolution: {integrity: sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-private-methods@7.23.3':
-    resolution: {integrity: sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==}
+  '@babel/plugin-transform-private-methods@7.24.7':
+    resolution: {integrity: sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-private-property-in-object@7.23.4':
-    resolution: {integrity: sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==}
+  '@babel/plugin-transform-private-property-in-object@7.24.7':
+    resolution: {integrity: sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-property-literals@7.23.3':
-    resolution: {integrity: sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==}
+  '@babel/plugin-transform-property-literals@7.24.7':
+    resolution: {integrity: sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-regenerator@7.23.3':
-    resolution: {integrity: sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==}
+  '@babel/plugin-transform-regenerator@7.24.7':
+    resolution: {integrity: sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-reserved-words@7.23.3':
-    resolution: {integrity: sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==}
+  '@babel/plugin-transform-reserved-words@7.24.7':
+    resolution: {integrity: sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-shorthand-properties@7.23.3':
-    resolution: {integrity: sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==}
+  '@babel/plugin-transform-shorthand-properties@7.24.7':
+    resolution: {integrity: sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-spread@7.23.3':
-    resolution: {integrity: sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==}
+  '@babel/plugin-transform-spread@7.24.7':
+    resolution: {integrity: sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-sticky-regex@7.23.3':
-    resolution: {integrity: sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==}
+  '@babel/plugin-transform-sticky-regex@7.24.7':
+    resolution: {integrity: sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-template-literals@7.23.3':
-    resolution: {integrity: sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==}
+  '@babel/plugin-transform-template-literals@7.24.7':
+    resolution: {integrity: sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-typeof-symbol@7.23.3':
-    resolution: {integrity: sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==}
+  '@babel/plugin-transform-typeof-symbol@7.24.7':
+    resolution: {integrity: sha512-VtR8hDy7YLB7+Pet9IarXjg/zgCMSF+1mNS/EQEiEaUPoFXCVsHG64SIxcaaI2zJgRiv+YmgaQESUfWAdbjzgg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -2040,32 +2078,32 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-unicode-escapes@7.23.3':
-    resolution: {integrity: sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==}
+  '@babel/plugin-transform-unicode-escapes@7.24.7':
+    resolution: {integrity: sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-unicode-property-regex@7.23.3':
-    resolution: {integrity: sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==}
+  '@babel/plugin-transform-unicode-property-regex@7.24.7':
+    resolution: {integrity: sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-unicode-regex@7.23.3':
-    resolution: {integrity: sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==}
+  '@babel/plugin-transform-unicode-regex@7.24.7':
+    resolution: {integrity: sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-unicode-sets-regex@7.23.3':
-    resolution: {integrity: sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==}
+  '@babel/plugin-transform-unicode-sets-regex@7.24.7':
+    resolution: {integrity: sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/preset-env@7.23.5':
-    resolution: {integrity: sha512-0d/uxVD6tFGWXGDSfyMD1p2otoaKmu6+GD+NfAx0tMaH+dxORnp7T9TaVQ6mKyya7iBtCIVxHjWT7MuzzM9z+A==}
+  '@babel/preset-env@7.24.7':
+    resolution: {integrity: sha512-1YZNsc+y6cTvWlDHidMBsQZrZfEFjRIo/BZCT906PMdzOyXtSLTgqGdrpcuTDCXyd11Am5uQULtDIcCfnTc8fQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -2108,12 +2146,16 @@ packages:
     resolution: {integrity: sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/template@7.24.7':
+    resolution: {integrity: sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/traverse@7.23.5':
     resolution: {integrity: sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/traverse@7.24.0':
-    resolution: {integrity: sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==}
+  '@babel/traverse@7.24.7':
+    resolution: {integrity: sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==}
     engines: {node: '>=6.9.0'}
 
   '@babel/types@7.23.5':
@@ -2124,22 +2166,26 @@ packages:
     resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/types@7.24.7':
+    resolution: {integrity: sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==}
+    engines: {node: '>=6.9.0'}
+
   '@base2/pretty-print-object@1.0.1':
     resolution: {integrity: sha512-4iri8i1AqYHJE2DstZYkyEprg6Pq6sKx3xn5FpySk9sNhH7qN2LLlHJCfDTZRILNwQNPD7mATWM0TBui7uC1pA==}
 
   '@bcoe/v8-coverage@0.2.3':
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
 
-  '@bull-board/api@5.17.0':
-    resolution: {integrity: sha512-qU+AiZIaYa//rkt1x7jDowtYa8u7/dLsDfEWgenZMkgvUszZ1kxJszdCtGapsDTVyPmnXgTRxpOWcR6sAYwSNQ==}
+  '@bull-board/api@5.20.5':
+    resolution: {integrity: sha512-YI95JK5A4/K4KB5VWbQn/CYNB+AO5cZ/BnZ77LxAhsaJ3ssHBN3Au0n3Z4wD7O+78+W3ON9uqGjKnHV6rXBGcQ==}
     peerDependencies:
-      '@bull-board/ui': 5.17.0
+      '@bull-board/ui': 5.20.5
 
-  '@bull-board/fastify@5.17.0':
-    resolution: {integrity: sha512-73YrPc7ERTWSOQRgBP6a7BPscWfcHd8U+Zq0auMdL/KkjPhG9GxapbfnovGZDDahJL/p/4YQb6ULu03zdtOrEA==}
+  '@bull-board/fastify@5.20.5':
+    resolution: {integrity: sha512-tdMR97xbzEzBbMJiJQreJHGdhfOocQn61K/WqM9I038Dk1dBHM5phQJxRJhspvwEJV4jwAayNOZbzuETI7QKwA==}
 
-  '@bull-board/ui@5.17.0':
-    resolution: {integrity: sha512-Vj+yWPjrjx3Iqh2N/ZBDhK2d2yJD44dfvIxm+SnXQb4ne312j117TpViInceysxGtbbAOlAW6hq6JvsDoRl7KQ==}
+  '@bull-board/ui@5.20.5':
+    resolution: {integrity: sha512-RV9VlW4qVL1A0Dewpsor4z7ZL9D56OW9LcRYjvXrIU5FSzvTvYKofmrUYoVrNQDs6jGMwJic+dMiW9K8GUU15A==}
 
   '@bundled-es-modules/cookie@2.0.0':
     resolution: {integrity: sha512-Or6YHg/kamKHpxULAdSqhGqnWFneIXu1NKvvfBBzKGwpVsYuFIQ5aBPHDnnoR3ghW1nvSkALd+EF9iMtY7Vjxw==}
@@ -2219,12 +2265,18 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/aix-ppc64@0.20.2':
-    resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==}
+  '@esbuild/aix-ppc64@0.21.5':
+    resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [aix]
 
+  '@esbuild/aix-ppc64@0.22.0':
+    resolution: {integrity: sha512-uvQR2crZ/zgzSHDvdygHyNI+ze9zwS8mqz0YtGXotSqvEE0UkYE9s+FZKQNTt1VtT719mfP3vHrUdCpxBNQZhQ==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
   '@esbuild/android-arm64@0.18.20':
     resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==}
     engines: {node: '>=12'}
@@ -2237,12 +2289,18 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm64@0.20.2':
-    resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==}
+  '@esbuild/android-arm64@0.21.5':
+    resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
 
+  '@esbuild/android-arm64@0.22.0':
+    resolution: {integrity: sha512-UKhPb3o2gAB/bfXcl58ZXTn1q2oVu1rEu/bKrCtmm+Nj5MKUbrOwR5WAixE2v+lk0amWuwPvhnPpBRLIGiq7ig==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
   '@esbuild/android-arm@0.18.20':
     resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==}
     engines: {node: '>=12'}
@@ -2255,12 +2313,18 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-arm@0.20.2':
-    resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==}
+  '@esbuild/android-arm@0.21.5':
+    resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
 
+  '@esbuild/android-arm@0.22.0':
+    resolution: {integrity: sha512-PBnyP+r8vJE4ifxsWys9l+Mc2UY/yYZOpX82eoyGISXXb3dRr0M21v+s4fgRKWMFPMSf/iyowqPW/u7ScSUkjQ==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
   '@esbuild/android-x64@0.18.20':
     resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==}
     engines: {node: '>=12'}
@@ -2273,12 +2337,18 @@ packages:
     cpu: [x64]
     os: [android]
 
-  '@esbuild/android-x64@0.20.2':
-    resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==}
+  '@esbuild/android-x64@0.21.5':
+    resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
 
+  '@esbuild/android-x64@0.22.0':
+    resolution: {integrity: sha512-IjTYtvIrjhR41Ijy2dDPgYjQHWG/x/A4KXYbs1fiU3efpRdoxMChK3oEZV6GPzVEzJqxFgcuBaiX1kwEvWUxSw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
   '@esbuild/darwin-arm64@0.18.20':
     resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==}
     engines: {node: '>=12'}
@@ -2291,12 +2361,18 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-arm64@0.20.2':
-    resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==}
+  '@esbuild/darwin-arm64@0.21.5':
+    resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
 
+  '@esbuild/darwin-arm64@0.22.0':
+    resolution: {integrity: sha512-mqt+Go4y9wRvEz81bhKd9RpHsQR1LwU8Xm6jZRUV/xpM7cIQFbFH6wBCLPTNsdELBvfoHeumud7X78jQQJv2TA==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
   '@esbuild/darwin-x64@0.18.20':
     resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==}
     engines: {node: '>=12'}
@@ -2309,12 +2385,18 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.20.2':
-    resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==}
+  '@esbuild/darwin-x64@0.21.5':
+    resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
 
+  '@esbuild/darwin-x64@0.22.0':
+    resolution: {integrity: sha512-vTaTQ9OgYc3VTaWtOE5pSuDT6H3d/qSRFRfSBbnxFfzAvYoB3pqKXA0LEbi/oT8GUOEAutspfRMqPj2ezdFaMw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
   '@esbuild/freebsd-arm64@0.18.20':
     resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==}
     engines: {node: '>=12'}
@@ -2327,12 +2409,18 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-arm64@0.20.2':
-    resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==}
+  '@esbuild/freebsd-arm64@0.21.5':
+    resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
 
+  '@esbuild/freebsd-arm64@0.22.0':
+    resolution: {integrity: sha512-0e1ZgoobJzaGnR4reD7I9rYZ7ttqdh1KPvJWnquUoDJhL0rYwdneeLailBzd2/4g/U5p4e5TIHEWa68NF2hFpQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
   '@esbuild/freebsd-x64@0.18.20':
     resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==}
     engines: {node: '>=12'}
@@ -2345,12 +2433,18 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.20.2':
-    resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==}
+  '@esbuild/freebsd-x64@0.21.5':
+    resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
 
+  '@esbuild/freebsd-x64@0.22.0':
+    resolution: {integrity: sha512-BFgyYwlCwRWyPQJtkzqq2p6pJbiiWgp0P9PNf7a5FQ1itKY4czPuOMAlFVItirSmEpRPCeImuwePNScZS0pL5Q==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
   '@esbuild/linux-arm64@0.18.20':
     resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==}
     engines: {node: '>=12'}
@@ -2363,12 +2457,18 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm64@0.20.2':
-    resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==}
+  '@esbuild/linux-arm64@0.21.5':
+    resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
 
+  '@esbuild/linux-arm64@0.22.0':
+    resolution: {integrity: sha512-V/K2rctCUgC0PCXpN7AqT4hoazXKgIYugFGu/myk2+pfe6jTW2guz/TBwq4cZ7ESqusR/IzkcQaBkcjquuBWsw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
   '@esbuild/linux-arm@0.18.20':
     resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==}
     engines: {node: '>=12'}
@@ -2381,12 +2481,18 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-arm@0.20.2':
-    resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==}
+  '@esbuild/linux-arm@0.21.5':
+    resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
 
+  '@esbuild/linux-arm@0.22.0':
+    resolution: {integrity: sha512-KEMWiA9aGuPUD4BH5yjlhElLgaRXe+Eri6gKBoDazoPBTo1BXc/e6IW5FcJO9DoL19FBeCxgONyh95hLDNepIg==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
   '@esbuild/linux-ia32@0.18.20':
     resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==}
     engines: {node: '>=12'}
@@ -2399,12 +2505,18 @@ packages:
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.20.2':
-    resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==}
+  '@esbuild/linux-ia32@0.21.5':
+    resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
 
+  '@esbuild/linux-ia32@0.22.0':
+    resolution: {integrity: sha512-r2ZZqkOMOrpUhzNwxI7uLAHIDwkfeqmTnrv1cjpL/rjllPWszgqmprd/om9oviKXUBpMqHbXmppvjAYgISb26Q==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
   '@esbuild/linux-loong64@0.18.20':
     resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==}
     engines: {node: '>=12'}
@@ -2417,12 +2529,18 @@ packages:
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.20.2':
-    resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==}
+  '@esbuild/linux-loong64@0.21.5':
+    resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
 
+  '@esbuild/linux-loong64@0.22.0':
+    resolution: {integrity: sha512-qaowLrV/YOMAL2RfKQ4C/VaDzAuLDuylM2sd/LH+4OFirMl6CuDpRlCq4u49ZBaVV8pkI/Y+hTdiibvQRhojCA==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
   '@esbuild/linux-mips64el@0.18.20':
     resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==}
     engines: {node: '>=12'}
@@ -2435,12 +2553,18 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.20.2':
-    resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==}
+  '@esbuild/linux-mips64el@0.21.5':
+    resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
 
+  '@esbuild/linux-mips64el@0.22.0':
+    resolution: {integrity: sha512-hgrezzjQTRxjkQ5k08J6rtZN5PNnkWx/Rz6Kmj9gnsdCAX1I4Dn4ZPqvFRkXo55Q3pnVQJBwbdtrTO7tMGtyVA==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
   '@esbuild/linux-ppc64@0.18.20':
     resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==}
     engines: {node: '>=12'}
@@ -2453,12 +2577,18 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.20.2':
-    resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==}
+  '@esbuild/linux-ppc64@0.21.5':
+    resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
 
+  '@esbuild/linux-ppc64@0.22.0':
+    resolution: {integrity: sha512-ewxg6FLLUio883XgSjfULEmDl3VPv/TYNnRprVAS3QeGFLdCYdx1tIudBcd7n9jIdk82v1Ajov4jx87qW7h9+g==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
   '@esbuild/linux-riscv64@0.18.20':
     resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==}
     engines: {node: '>=12'}
@@ -2471,12 +2601,18 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.20.2':
-    resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==}
+  '@esbuild/linux-riscv64@0.21.5':
+    resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
 
+  '@esbuild/linux-riscv64@0.22.0':
+    resolution: {integrity: sha512-Az5XbgSJC2lE8XK8pdcutsf9RgdafWdTpUK/+6uaDdfkviw/B4JCwAfh1qVeRWwOohwdsl4ywZrWBNWxwrPLFg==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
   '@esbuild/linux-s390x@0.18.20':
     resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==}
     engines: {node: '>=12'}
@@ -2489,12 +2625,18 @@ packages:
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.20.2':
-    resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==}
+  '@esbuild/linux-s390x@0.21.5':
+    resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
 
+  '@esbuild/linux-s390x@0.22.0':
+    resolution: {integrity: sha512-8j4a2ChT9+V34NNNY9c/gMldutaJFmfMacTPq4KfNKwv2fitBCLYjee7c+Vxaha2nUhPK7cXcZpJtJ3+Y7ZdVQ==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
   '@esbuild/linux-x64@0.18.20':
     resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==}
     engines: {node: '>=12'}
@@ -2507,12 +2649,18 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/linux-x64@0.20.2':
-    resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==}
+  '@esbuild/linux-x64@0.21.5':
+    resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
 
+  '@esbuild/linux-x64@0.22.0':
+    resolution: {integrity: sha512-JUQyOnpbAkkRFOk/AhsEemz5TfWN4FJZxVObUlnlNCbe7QBl61ZNfM4cwBXayQA6laMJMUcqLHaYQHAB6YQ95Q==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
   '@esbuild/netbsd-x64@0.18.20':
     resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==}
     engines: {node: '>=12'}
@@ -2525,12 +2673,24 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.20.2':
-    resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==}
+  '@esbuild/netbsd-x64@0.21.5':
+    resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
 
+  '@esbuild/netbsd-x64@0.22.0':
+    resolution: {integrity: sha512-11PoCoHXo4HFNbLsXuMB6bpMPWGDiw7xETji6COdJss4SQZLvcgNoeSqWtATRm10Jj1uEHiaIk4N0PiN6x4Fcg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/openbsd-arm64@0.22.0':
+    resolution: {integrity: sha512-Ezlhu/YyITmXwKSB+Zu/QqD7cxrjrpiw85cc0Rbd3AWr2wsgp+dWbWOE8MqHaLW9NKMZvuL0DhbJbvzR7F6Zvg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
   '@esbuild/openbsd-x64@0.18.20':
     resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==}
     engines: {node: '>=12'}
@@ -2543,12 +2703,18 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.20.2':
-    resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==}
+  '@esbuild/openbsd-x64@0.21.5':
+    resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
 
+  '@esbuild/openbsd-x64@0.22.0':
+    resolution: {integrity: sha512-ufjdW5tFJGUjlH9j/5cCE9lrwRffyZh+T4vYvoDKoYsC6IXbwaFeV/ENxeNXcxotF0P8CDzoICXVSbJaGBhkrw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
   '@esbuild/sunos-x64@0.18.20':
     resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==}
     engines: {node: '>=12'}
@@ -2561,12 +2727,18 @@ packages:
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/sunos-x64@0.20.2':
-    resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==}
+  '@esbuild/sunos-x64@0.21.5':
+    resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
 
+  '@esbuild/sunos-x64@0.22.0':
+    resolution: {integrity: sha512-zY6ly/AoSmKnmNTowDJsK5ehra153/5ZhqxNLfq9NRsTTltetr+yHHcQ4RW7QDqw4JC8A1uC1YmeSfK9NRcK1w==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
   '@esbuild/win32-arm64@0.18.20':
     resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==}
     engines: {node: '>=12'}
@@ -2579,12 +2751,18 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-arm64@0.20.2':
-    resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==}
+  '@esbuild/win32-arm64@0.21.5':
+    resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
 
+  '@esbuild/win32-arm64@0.22.0':
+    resolution: {integrity: sha512-Kml5F7tv/1Maam0pbbCrvkk9vj046dPej30kFzlhXnhuCtYYBP6FGy/cLbc5yUT1lkZznGLf2OvuvmLjscO5rw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
   '@esbuild/win32-ia32@0.18.20':
     resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==}
     engines: {node: '>=12'}
@@ -2597,12 +2775,18 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.20.2':
-    resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==}
+  '@esbuild/win32-ia32@0.21.5':
+    resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
 
+  '@esbuild/win32-ia32@0.22.0':
+    resolution: {integrity: sha512-IOgwn+mYTM3RrcydP4Og5IpXh+ftN8oF+HELTXSmbWBlujuci4Qa3DTeO+LEErceisI7KUSfEIiX+WOUlpELkw==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
   '@esbuild/win32-x64@0.18.20':
     resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==}
     engines: {node: '>=12'}
@@ -2615,12 +2799,18 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@esbuild/win32-x64@0.20.2':
-    resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==}
+  '@esbuild/win32-x64@0.21.5':
+    resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
 
+  '@esbuild/win32-x64@0.22.0':
+    resolution: {integrity: sha512-4bDHJrk2WHBXJPhy1y80X7/5b5iZTZP3LGcKIlAP1J+KqZ4zQAPMLEzftGyjjfcKbA4JDlPt/+2R/F1ZTeRgrw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
   '@eslint-community/eslint-utils@4.4.0':
     resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -2635,17 +2825,25 @@ packages:
     resolution: {integrity: sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
 
-  '@eslint/eslintrc@2.1.4':
-    resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  '@eslint/compat@1.1.0':
+    resolution: {integrity: sha512-s9Wi/p25+KbzxKlDm3VshQdImhWk+cbdblhwGNnyCU5lpSwtWa4v7VQCxSki0FAUrGA3s8nCWgYzAH41mwQVKQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/js@8.53.0':
-    resolution: {integrity: sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  '@eslint/config-array@0.17.0':
+    resolution: {integrity: sha512-A68TBu6/1mHHuc5YJL0U0VVeGNiklLAL6rRmhTCP2B5XjWLMnrX+HkO+IAXyHvks5cyyY1jjK5ITPQ1HGS2EVA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/js@8.57.0':
-    resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  '@eslint/eslintrc@3.1.0':
+    resolution: {integrity: sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/js@9.6.0':
+    resolution: {integrity: sha512-D9B0/3vNg44ZeWbYMpBoXqNP4j6eQD5vNwIlGAuFRRzK/WtT/jvDQW3Bi9kkf3PMDMlM7Yi+73VLUsn5bJcl8A==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/object-schema@2.1.4':
+    resolution: {integrity: sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@fal-works/esbuild-plugin-global-externals@2.1.2':
     resolution: {integrity: sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ==}
@@ -2685,8 +2883,8 @@ packages:
   '@fastify/http-proxy@9.5.0':
     resolution: {integrity: sha512-1iqIdV10d5k9YtfHq9ylX5zt1NiM50fG+rIX40qt00R694sqWso3ukyTFZVk33SDoSiBW8roB7n11RUVUoN+Ag==}
 
-  '@fastify/multipart@8.2.0':
-    resolution: {integrity: sha512-OZ8nsyyoS2TV7Yeu3ZdrdDGsKUTAbfjrKC9jSxGgT2qdgek+BxpWX31ZubTrWMNZyU5xwk4ox6AvTjAbYWjrWg==}
+  '@fastify/multipart@8.3.0':
+    resolution: {integrity: sha512-A8h80TTyqUzaMVH0Cr9Qcm6RxSkVqmhK/MVBYHYeRRSUbUYv08WecjWKSlG2aSnD4aGI841pVxAjC+G1GafUeQ==}
 
   '@fastify/reply-from@9.0.1':
     resolution: {integrity: sha512-q9vFNUiXZTY1x8omDPe59os2MYq+3y7KgO/kZoXpZlnud+45Nd8Ot/svEvrUATzjkizIggfS4K8LR9zXDyZZKg==}
@@ -2697,8 +2895,8 @@ packages:
   '@fastify/static@6.12.0':
     resolution: {integrity: sha512-KK1B84E6QD/FcQWxDI2aiUCwHxMJBI1KeCUzm1BwYpPY1b742+jeKruGHP2uOluuM6OkBPI8CIANrXcCRtC2oQ==}
 
-  '@fastify/static@7.0.3':
-    resolution: {integrity: sha512-2tmTdF+uFCykasutaO6k4/wOt7eXyi7m3dGuCPo5micXzv0qt6ttb/nWnDYL/BlXjYGfp1JI4a1gyluTIylvQA==}
+  '@fastify/static@7.0.4':
+    resolution: {integrity: sha512-p2uKtaf8BMOZWLs6wu+Ihg7bWNBdjNgCwDza4MJtTqg+5ovKmcbgbR9Xs5/smZ1YISfzKOCNYmZV8LaCj+eJ1Q==}
 
   '@fastify/view@8.2.0':
     resolution: {integrity: sha512-hBSiBofCnJNlPHEMZWpO1SL84eqOaqujJ1hR3jntFyZZCkweH5jMs12DKYyGesjVll7SJFRRxPUBB8kmUmneRQ==}
@@ -2716,11 +2914,8 @@ packages:
   '@hapi/bourne@3.0.0':
     resolution: {integrity: sha512-Waj1cwPXJDucOib4a3bAISsKJVb15MKi9IvmTI/7ssVEm6sywXGjVJDhl6/umt1pK1ZS7PacXU3A1PmFKHEZ2w==}
 
-  '@hapi/hoek@10.0.1':
-    resolution: {integrity: sha512-CvlW7jmOhWzuqOqiJQ3rQVLMcREh0eel4IBnxDx2FAcK8g7qoJRQK4L1CPBASoCY6y8e6zuCy3f2g+HWdkzcMw==}
-
-  '@hapi/hoek@11.0.2':
-    resolution: {integrity: sha512-aKmlCO57XFZ26wso4rJsW4oTUnrgTFw2jh3io7CAtO9w4UltBNwRXvXIVzzyfkaaLRo3nluP/19msA8vDUUuKw==}
+  '@hapi/hoek@11.0.4':
+    resolution: {integrity: sha512-PnsP5d4q7289pS2T2EgGz147BFJ2Jpb4yrEdkpz2IhgEUzos1S7HTl7ezWh1yfYzYlj89KzLdCRkqsP6SIryeQ==}
 
   '@hapi/hoek@9.3.0':
     resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==}
@@ -2734,14 +2929,6 @@ packages:
   '@hexagon/base64@1.1.27':
     resolution: {integrity: sha512-PdUmzpvcUM3Rh39kvz9RdbPVYhMjBjdV7Suw7ZduP7urRLsZR8l5tzgSWKm7TExwBYDFwTnYrZbnE0rQ3N5NLQ==}
 
-  '@humanwhocodes/config-array@0.11.13':
-    resolution: {integrity: sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==}
-    engines: {node: '>=10.10.0'}
-
-  '@humanwhocodes/config-array@0.11.14':
-    resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==}
-    engines: {node: '>=10.10.0'}
-
   '@humanwhocodes/module-importer@1.0.1':
     resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
     engines: {node: '>=12.22'}
@@ -2750,20 +2937,18 @@ packages:
     resolution: {integrity: sha512-RE815I4arJFtt+FVeU1Tgp9/Xvecacji8w/V6XtXsWWH/wz/eNkNbhb+ny/+PlVZjV0rxQpRSQKNKE3lcktHEA==}
     engines: {node: '>=10.10.0'}
 
-  '@humanwhocodes/object-schema@2.0.1':
-    resolution: {integrity: sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==}
+  '@humanwhocodes/retry@0.3.0':
+    resolution: {integrity: sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==}
+    engines: {node: '>=18.18'}
 
-  '@humanwhocodes/object-schema@2.0.2':
-    resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==}
-
-  '@img/sharp-darwin-arm64@0.33.3':
-    resolution: {integrity: sha512-FaNiGX1MrOuJ3hxuNzWgsT/mg5OHG/Izh59WW2mk1UwYHUwtfbhk5QNKYZgxf0pLOhx9ctGiGa2OykD71vOnSw==}
+  '@img/sharp-darwin-arm64@0.33.4':
+    resolution: {integrity: sha512-p0suNqXufJs9t3RqLBO6vvrgr5OhgbWp76s5gTRvdmxmuv9E1rcaqGUsl3l4mKVmXPkTkTErXediAui4x+8PSA==}
     engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
     cpu: [arm64]
     os: [darwin]
 
-  '@img/sharp-darwin-x64@0.33.3':
-    resolution: {integrity: sha512-2QeSl7QDK9ru//YBT4sQkoq7L0EAJZA3rtV+v9p8xTKl4U1bUqTIaCnoC7Ctx2kCjQgwFXDasOtPTCT8eCTXvw==}
+  '@img/sharp-darwin-x64@0.33.4':
+    resolution: {integrity: sha512-0l7yRObwtTi82Z6ebVI2PnHT8EB2NxBgpK2MiKJZJ7cz32R4lxd001ecMhzzsZig3Yv9oclvqqdV93jo9hy+Dw==}
     engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
     cpu: [x64]
     os: [darwin]
@@ -2816,55 +3001,55 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@img/sharp-linux-arm64@0.33.3':
-    resolution: {integrity: sha512-Zf+sF1jHZJKA6Gor9hoYG2ljr4wo9cY4twaxgFDvlG0Xz9V7sinsPp8pFd1XtlhTzYo0IhDbl3rK7P6MzHpnYA==}
+  '@img/sharp-linux-arm64@0.33.4':
+    resolution: {integrity: sha512-2800clwVg1ZQtxwSoTlHvtm9ObgAax7V6MTAB/hDT945Tfyy3hVkmiHpeLPCKYqYR1Gcmv1uDZ3a4OFwkdBL7Q==}
     engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
     cpu: [arm64]
     os: [linux]
 
-  '@img/sharp-linux-arm@0.33.3':
-    resolution: {integrity: sha512-Q7Ee3fFSC9P7vUSqVEF0zccJsZ8GiiCJYGWDdhEjdlOeS9/jdkyJ6sUSPj+bL8VuOYFSbofrW0t/86ceVhx32w==}
+  '@img/sharp-linux-arm@0.33.4':
+    resolution: {integrity: sha512-RUgBD1c0+gCYZGCCe6mMdTiOFS0Zc/XrN0fYd6hISIKcDUbAW5NtSQW9g/powkrXYm6Vzwd6y+fqmExDuCdHNQ==}
     engines: {glibc: '>=2.28', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
     cpu: [arm]
     os: [linux]
 
-  '@img/sharp-linux-s390x@0.33.3':
-    resolution: {integrity: sha512-vFk441DKRFepjhTEH20oBlFrHcLjPfI8B0pMIxGm3+yilKyYeHEVvrZhYFdqIseSclIqbQ3SnZMwEMWonY5XFA==}
-    engines: {glibc: '>=2.28', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
+  '@img/sharp-linux-s390x@0.33.4':
+    resolution: {integrity: sha512-h3RAL3siQoyzSoH36tUeS0PDmb5wINKGYzcLB5C6DIiAn2F3udeFAum+gj8IbA/82+8RGCTn7XW8WTFnqag4tQ==}
+    engines: {glibc: '>=2.31', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
     cpu: [s390x]
     os: [linux]
 
-  '@img/sharp-linux-x64@0.33.3':
-    resolution: {integrity: sha512-Q4I++herIJxJi+qmbySd072oDPRkCg/SClLEIDh5IL9h1zjhqjv82H0Seupd+q2m0yOfD+/fJnjSoDFtKiHu2g==}
+  '@img/sharp-linux-x64@0.33.4':
+    resolution: {integrity: sha512-GoR++s0XW9DGVi8SUGQ/U4AeIzLdNjHka6jidVwapQ/JebGVQIpi52OdyxCNVRE++n1FCLzjDovJNozif7w/Aw==}
     engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
     cpu: [x64]
     os: [linux]
 
-  '@img/sharp-linuxmusl-arm64@0.33.3':
-    resolution: {integrity: sha512-qnDccehRDXadhM9PM5hLvcPRYqyFCBN31kq+ErBSZtZlsAc1U4Z85xf/RXv1qolkdu+ibw64fUDaRdktxTNP9A==}
+  '@img/sharp-linuxmusl-arm64@0.33.4':
+    resolution: {integrity: sha512-nhr1yC3BlVrKDTl6cO12gTpXMl4ITBUZieehFvMntlCXFzH2bvKG76tBL2Y/OqhupZt81pR7R+Q5YhJxW0rGgQ==}
     engines: {musl: '>=1.2.2', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
     cpu: [arm64]
     os: [linux]
 
-  '@img/sharp-linuxmusl-x64@0.33.3':
-    resolution: {integrity: sha512-Jhchim8kHWIU/GZ+9poHMWRcefeaxFIs9EBqf9KtcC14Ojk6qua7ghKiPs0sbeLbLj/2IGBtDcxHyjCdYWkk2w==}
+  '@img/sharp-linuxmusl-x64@0.33.4':
+    resolution: {integrity: sha512-uCPTku0zwqDmZEOi4ILyGdmW76tH7dm8kKlOIV1XC5cLyJ71ENAAqarOHQh0RLfpIpbV5KOpXzdU6XkJtS0daw==}
     engines: {musl: '>=1.2.2', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
     cpu: [x64]
     os: [linux]
 
-  '@img/sharp-wasm32@0.33.3':
-    resolution: {integrity: sha512-68zivsdJ0koE96stdUfM+gmyaK/NcoSZK5dV5CAjES0FUXS9lchYt8LAB5rTbM7nlWtxaU/2GON0HVN6/ZYJAQ==}
+  '@img/sharp-wasm32@0.33.4':
+    resolution: {integrity: sha512-Bmmauh4sXUsUqkleQahpdNXKvo+wa1V9KhT2pDA4VJGKwnKMJXiSTGphn0gnJrlooda0QxCtXc6RX1XAU6hMnQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
     cpu: [wasm32]
 
-  '@img/sharp-win32-ia32@0.33.3':
-    resolution: {integrity: sha512-CyimAduT2whQD8ER4Ux7exKrtfoaUiVr7HG0zZvO0XTFn2idUWljjxv58GxNTkFb8/J9Ub9AqITGkJD6ZginxQ==}
+  '@img/sharp-win32-ia32@0.33.4':
+    resolution: {integrity: sha512-99SJ91XzUhYHbx7uhK3+9Lf7+LjwMGQZMDlO/E/YVJ7Nc3lyDFZPGhjwiYdctoH2BOzW9+TnfqcaMKt0jHLdqw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
     cpu: [ia32]
     os: [win32]
 
-  '@img/sharp-win32-x64@0.33.3':
-    resolution: {integrity: sha512-viT4fUIDKnli3IfOephGnolMzhz5VaTvDRkYqtZxOMIoMQ4MrAziO7pT1nVnOt2FAm7qW5aa+CCc13aEY6Le0g==}
+  '@img/sharp-win32-x64@0.33.4':
+    resolution: {integrity: sha512-3QLocdTRVIrFNye5YocZl+KKpYKP+fksi1QhmOArgx7GyhIbQp/WrJRu176jm8IxromS7RIkzMiMINVdBtC8Aw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'}
     cpu: [x64]
     os: [win32]
@@ -2982,8 +3167,8 @@ packages:
     resolution: {integrity: sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  '@joshwooding/vite-plugin-react-docgen-typescript@0.3.0':
-    resolution: {integrity: sha512-2D6y7fNvFmsLmRt6UCOFJPvFoPMJGT0Uh1Wg0RaigUp7kdQPs6yYn8Dmx6GZkOH/NW0yMTwRz/p0SRMMRo50vA==}
+  '@joshwooding/vite-plugin-react-docgen-typescript@0.3.1':
+    resolution: {integrity: sha512-pdoMZ9QaPnVlSM+SdU/wgg0nyD/8wQ7y90ttO2CMCyrrm7RxveYIJ5eNfjPaoMFqW41LZra7QO9j+xV4Y18Glw==}
     peerDependencies:
       typescript: '>= 4.3.x'
       vite: ^3.0.0 || ^4.0.0 || ^5.0.0
@@ -2995,6 +3180,10 @@ packages:
     resolution: {integrity: sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==}
     engines: {node: '>=6.0.0'}
 
+  '@jridgewell/gen-mapping@0.3.5':
+    resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==}
+    engines: {node: '>=6.0.0'}
+
   '@jridgewell/resolve-uri@3.1.0':
     resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==}
     engines: {node: '>=6.0.0'}
@@ -3003,6 +3192,10 @@ packages:
     resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==}
     engines: {node: '>=6.0.0'}
 
+  '@jridgewell/set-array@1.2.1':
+    resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==}
+    engines: {node: '>=6.0.0'}
+
   '@jridgewell/source-map@0.3.5':
     resolution: {integrity: sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==}
 
@@ -3015,6 +3208,9 @@ packages:
   '@jridgewell/trace-mapping@0.3.18':
     resolution: {integrity: sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==}
 
+  '@jridgewell/trace-mapping@0.3.25':
+    resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
+
   '@jsdevtools/ono@7.1.3':
     resolution: {integrity: sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==}
 
@@ -3048,29 +3244,31 @@ packages:
       '@types/react': '>=16'
       react: '>=16'
 
-  '@microsoft/api-extractor-model@7.28.14':
-    resolution: {integrity: sha512-Bery/c8A8SsKPSvA82cTTuy/+OcxZbLRmKhPkk91/AJOQzxZsShcrmHFAGeiEqSIrv1nPZ3tKq9kfMLdCHmsqg==}
+  '@microsoft/api-extractor-model@7.29.2':
+    resolution: {integrity: sha512-hAYajOjQan3uslhKJRwvvHIdLJ+ZByKqdSsJ/dgHFxPtEbdKpzMDO8zuW4K5gkSMYl5D0LbNwxkhxr51P2zsmw==}
 
-  '@microsoft/api-extractor@7.43.1':
-    resolution: {integrity: sha512-ohg40SsvFFgzHFAtYq5wKJc8ZDyY46bphjtnSvhSSlXpPTG7GHwyyXkn48UZiUCBwr2WC7TRC1Jfwz7nreuiyQ==}
+  '@microsoft/api-extractor@7.47.0':
+    resolution: {integrity: sha512-LT8yvcWNf76EpDC+8/ArTVSYePvuDQ+YbAUrsTcpg3ptiZ93HIcMCozP/JOxDt+rrsFfFHcpfoselKfPyRI0GQ==}
     hasBin: true
 
-  '@microsoft/tsdoc-config@0.16.2':
-    resolution: {integrity: sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw==}
+  '@microsoft/tsdoc-config@0.17.0':
+    resolution: {integrity: sha512-v/EYRXnCAIHxOHW+Plb6OWuUoMotxTN0GLatnpOb1xq0KuTNw/WI3pamJx/UbsoJP5k9MCw1QxvvhPcF9pH3Zg==}
 
-  '@microsoft/tsdoc@0.14.2':
-    resolution: {integrity: sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==}
+  '@microsoft/tsdoc@0.15.0':
+    resolution: {integrity: sha512-HZpPoABogPvjeJOdzCOSJsXeL/SMCBgBZMVC3X3d7YYp2gf31MfxhUoYUNwf1ERPJOnQc0wkFn9trqI6ZEdZuA==}
 
   '@misskey-dev/browser-image-resizer@2024.1.0':
     resolution: {integrity: sha512-4EnO0zLW5NDtng3Gaz5MuT761uiuoOuplwX18wBqgj8w56LTU5BjLn/vbHwDIIe0j2gwqDYhMb7bDjmr1/Fomg==}
 
-  '@misskey-dev/eslint-plugin@1.0.0':
-    resolution: {integrity: sha512-dh6UbcrNDVg5DD8k8Qh4ab30OPpuEYIlJCqaBV/lkIV8wNN/AfCJ2V7iTP8V8KjryM4t+sf5IqzQLQnT0mWI4A==}
+  '@misskey-dev/eslint-plugin@2.0.2':
+    resolution: {integrity: sha512-bnTqxCSP0CIN0xSpIGib13bz+K8/3e4h8OlQjuCPlhZF7oFwtn339EZM8yJkHg6gdfciV8KOr3gzlLyG3jiVEQ==}
     peerDependencies:
-      '@typescript-eslint/eslint-plugin': '>= 6'
-      '@typescript-eslint/parser': '>= 6'
-      eslint: '>= 3'
+      '@eslint/compat': '>= 1'
+      '@typescript-eslint/eslint-plugin': '>= 7'
+      '@typescript-eslint/parser': '>= 7'
+      eslint: '>= 8'
       eslint-plugin-import: '>= 2'
+      globals: '>= 15'
 
   '@misskey-dev/sharp-read-bmp@1.2.0':
     resolution: {integrity: sha512-er4pRakXzHYfEgOFAFfQagqDouG+wLm+kwNq1I30oSdIHDa0wM3KjFpfIGQ25Fks4GcmOl1s7Zh6xoQu5dNjTw==}
@@ -3116,73 +3314,73 @@ packages:
     resolution: {integrity: sha512-0ZcCVQxifZmhwNBoQIrystCb+2sWBY2Zw8lpfJBPCHGCA/HWqehITeCRVIv4VMy8MPlaHo2w2pTHFV2pFfqKPw==}
     engines: {node: '>=18'}
 
-  '@mswjs/interceptors@0.26.15':
-    resolution: {integrity: sha512-HM47Lu1YFmnYHKMBynFfjCp0U/yRskHj/8QEJW0CBEPOlw8Gkmjfll+S9b8M7V5CNDw2/ciRxjjnWeaCiblSIQ==}
+  '@mswjs/interceptors@0.29.1':
+    resolution: {integrity: sha512-3rDakgJZ77+RiQUuSK69t1F0m8BQKA8Vh5DCS5V0DWvNY67zob2JhhQrhCO0AKLGINTRSFd1tBaHcJTkhefoSw==}
     engines: {node: '>=18'}
 
-  '@napi-rs/canvas-android-arm64@0.1.52':
-    resolution: {integrity: sha512-x/K471KbASPVh5mfBUxokza66J0FNIlOgMNANWAf5C8HiATb487KecEhSkUQvvTS3WLYC9uSqIPHFgwF+tir3w==}
+  '@napi-rs/canvas-android-arm64@0.1.53':
+    resolution: {integrity: sha512-2YhxfVsZguATlRWE0fZdTx35SE9+r5D7HV5GPNDataZOKmHf+zZ5//dspuuBSbOriQdoicaFrgXKCUqI0pK3WQ==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [android]
 
-  '@napi-rs/canvas-darwin-arm64@0.1.52':
-    resolution: {integrity: sha512-4OgVRD7TW02q5Q7lWLLjT+pYJ9ZHkQUTBOuXbPQ5wB0Wnh3RIq/aMY6thoXDZDzdR5vV3a5TUtbZUJ0aqLq3NA==}
+  '@napi-rs/canvas-darwin-arm64@0.1.53':
+    resolution: {integrity: sha512-ls+CWLMusf4RAGo5BvIIzA6dNcc0elwVp6LKjHfQECHA8KKmvdB58YuE5BQcTlb2rzk0SEKtBC/Th3NI2oNdfg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
 
-  '@napi-rs/canvas-darwin-x64@0.1.52':
-    resolution: {integrity: sha512-3fgeGJ3j2X6Mtmn0QYf3iA+A6y1ePnsayakc2emEokzf03ErrPczONw3vjnTQo53JLPMzEnfPGAffdktU/ssPA==}
+  '@napi-rs/canvas-darwin-x64@0.1.53':
+    resolution: {integrity: sha512-ZAgcoCH5+5OKS2P8Lxx+jbkAPKkyLD2x6OvSrHg1U6ppdxmLA+CkJlRl8w45HCXwuyIiP7OeymECRtiNYTwznQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
 
-  '@napi-rs/canvas-linux-arm-gnueabihf@0.1.52':
-    resolution: {integrity: sha512-aaDEEK5XwHUrPt0q4SR8l7Va0vtn50KmSs+itxP+o7RNk3Nuch8fINHOXyhMyhwNYgv1tfiJVyHsJhD0E6lXGA==}
+  '@napi-rs/canvas-linux-arm-gnueabihf@0.1.53':
+    resolution: {integrity: sha512-p9km/3C/loDxu3AvA8/vtpIS1BGMd/Ehkl2Iu/v/Gw8N/KUIt3HUvTS7AKApyVE28bxTfq96wJQjtcT8jzDncw==}
     engines: {node: '>= 10'}
     cpu: [arm]
     os: [linux]
 
-  '@napi-rs/canvas-linux-arm64-gnu@0.1.52':
-    resolution: {integrity: sha512-tzuwM7Amt5mkrp4csQjYWkFzwFdiCm7RNdJ5usX8syzKSXmozqWzLHjzo/2ozdSQNUy6wyzRrxkG4Rh6g0OpOA==}
+  '@napi-rs/canvas-linux-arm64-gnu@0.1.53':
+    resolution: {integrity: sha512-QKK+sykEiYwjwd+ogyLcpcnH38DNZ8KViBlnfEpoGA2Wa+21/cWQKfMxnbgb/rbvm5tazJinZcihFvH577WQ5g==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
 
-  '@napi-rs/canvas-linux-arm64-musl@0.1.52':
-    resolution: {integrity: sha512-HQCtJlDT0dFp3uUZVzZOZ1VLMO7lbLRc548MjMxPpojit2ZdGopFzJ8jDSr4iszHrTO1SM1AxPaCM3pRvCAtjw==}
+  '@napi-rs/canvas-linux-arm64-musl@0.1.53':
+    resolution: {integrity: sha512-2N41U0X8RnrTKzpTtPv1ozlYkJtPsUdbfF3uP/KEd/BsULGd8Y8ghkGMS6CM+821au4ex0dPrWOOdT9wC1rSqQ==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
 
-  '@napi-rs/canvas-linux-x64-gnu@0.1.52':
-    resolution: {integrity: sha512-z5sBEw0PVWPH/MIQL8hOR8C3YYVlu8lqtRUcYajigMfXAhbMiNqDWTjuIWGMz3nIydDjZmn8KTxw/D4a0HFPqQ==}
+  '@napi-rs/canvas-linux-x64-gnu@0.1.53':
+    resolution: {integrity: sha512-7XjuTvDKCODtf/vMwF43VGDrjfgwYKgS91ggdcX3UrJaBYWyWu/+eqNvNj+zdXSe/0x+YOjf5jG4m8xIXdBMQA==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
 
-  '@napi-rs/canvas-linux-x64-musl@0.1.52':
-    resolution: {integrity: sha512-G1+JdWFhHLyHhULJS51xTEhB7EL0ZiAUQwQaRi4/w75OOYDQ91O+o4miaxDHiV0hZuxBhHtZU6ftV2Zl3RMguw==}
+  '@napi-rs/canvas-linux-x64-musl@0.1.53':
+    resolution: {integrity: sha512-970WEvB8vmj+uxvgdBZ+AGFV7uq9GJhXrqG5PGQ5lWciHX0P0d/OhS2F7TITgFR0LsKDQZ7XQgzMxsYOfwZ0FQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
 
-  '@napi-rs/canvas-win32-x64-msvc@0.1.52':
-    resolution: {integrity: sha512-hMI626VsCC/wv29qHF78N7TSG+auatOp08DHln0Zdif5y1NJ14NU/rNUhzlTW8Zc6ssw+AMDJ3KKYYWYYg1aoA==}
+  '@napi-rs/canvas-win32-x64-msvc@0.1.53':
+    resolution: {integrity: sha512-rLFQCSJaWg/sv54Aap9nAhaodi4Vyb4un50EgW+PNkk8icMziU6KLRKirGBdQr9ZdxnshAPeQXD1g2ArStujKA==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
 
-  '@napi-rs/canvas@0.1.52':
-    resolution: {integrity: sha512-xeW9EghZLDPZuqWJ4l1+eG3ld0i9J7SpV2zlgi34MPt/FE9K2XWGCfnLr0gHGOBkcI3YOVhI13I0HqRAkMPdVw==}
+  '@napi-rs/canvas@0.1.53':
+    resolution: {integrity: sha512-XsEZi97+kKykmAiPpY+IpZoHxJY1srqFZp8jDt1/RySzC0kB0iZYt/VMIFqQKpLCARZjD7SOAz2AULtwYlesCA==}
     engines: {node: '>= 10'}
 
   '@ndelangen/get-tarball@3.0.7':
     resolution: {integrity: sha512-NqGfTZIZpRFef1GoVaShSSRwDC3vde3ThtTeqFdcYd6ipKqnfEVhjK2hUeHjCQUcptyZr2TONqcloFXM+5QBrQ==}
 
-  '@nestjs/common@10.3.8':
-    resolution: {integrity: sha512-P+vPEIvqx2e+fonsYVlFXKvoChyJ8Tq+lfpqdVFqblovHbFr3kZ/nYX0cPs+XuW6bnRT8tz0SSR9XBGU43kJhw==}
+  '@nestjs/common@10.3.10':
+    resolution: {integrity: sha512-H8k0jZtxk1IdtErGDmxFRy0PfcOAUg41Prrqpx76DQusGGJjsaovs1zjXVD1rZWaVYchfT1uczJ6L4Kio10VNg==}
     peerDependencies:
       class-transformer: '*'
       class-validator: '*'
@@ -3194,8 +3392,8 @@ packages:
       class-validator:
         optional: true
 
-  '@nestjs/core@10.3.8':
-    resolution: {integrity: sha512-AxF4tpYLDNn5Wfb3C4bNaaHJ4pREH5FJrSisR2A5zkYpQFORFs0Tc36lOFPMwBTy8Iv2wUwWLUVc5ftBnxEv4w==}
+  '@nestjs/core@10.3.10':
+    resolution: {integrity: sha512-ZbQ4jovQyzHtCGCrzK5NdtW1SYO2fHSsgSY1+/9WdruYCUra+JDkWEXgZ4M3Hv480Dl3OXehAmY1wCOojeMyMQ==}
     peerDependencies:
       '@nestjs/common': ^10.0.0
       '@nestjs/microservices': ^10.0.0
@@ -3211,14 +3409,14 @@ packages:
       '@nestjs/websockets':
         optional: true
 
-  '@nestjs/platform-express@10.3.8':
-    resolution: {integrity: sha512-sifLoxgEJvAgbim1UuW6wyScMfkS9SVQRH+lN33N/9ZvZSjO6NSDLOe+wxqsnZkia+QrjFC0qy0ITRAsggfqbg==}
+  '@nestjs/platform-express@10.3.10':
+    resolution: {integrity: sha512-wK2ow3CZI2KFqWeEpPmoR300OB6BcBLxARV1EiClJLCj4S1mZsoCmS0YWgpk3j1j6mo0SI8vNLi/cC2iZPEPQA==}
     peerDependencies:
       '@nestjs/common': ^10.0.0
       '@nestjs/core': ^10.0.0
 
-  '@nestjs/testing@10.3.8':
-    resolution: {integrity: sha512-hpX9das2TdFTKQ4/2ojhjI6YgXtCfXRKui3A4Qaj54VVzc5+mtK502Jj18Vzji98o9MVS6skmYu+S/UvW3U6Fw==}
+  '@nestjs/testing@10.3.10':
+    resolution: {integrity: sha512-i3HAtVQJijxNxJq1k39aelyJlyEIBRONys7IipH/4r8W0J+M1V+y5EKDOyi4j1SdNSb/vmNyWpZ2/ewZjl3kRA==}
     peerDependencies:
       '@nestjs/common': ^10.0.0
       '@nestjs/core': ^10.0.0
@@ -3230,6 +3428,10 @@ packages:
       '@nestjs/platform-express':
         optional: true
 
+  '@noble/hashes@1.4.0':
+    resolution: {integrity: sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==}
+    engines: {node: '>= 16'}
+
   '@nodelib/fs.scandir@2.1.5':
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
@@ -3273,19 +3475,19 @@ packages:
   '@open-draft/until@2.1.0':
     resolution: {integrity: sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==}
 
-  '@opentelemetry/api-logs@0.51.1':
-    resolution: {integrity: sha512-E3skn949Pk1z2XtXu/lxf6QAZpawuTM/IUEXcAzpiUkTd73Hmvw26FiN3cJuTmkpM5hZzHwkomVdtrh/n/zzwA==}
+  '@opentelemetry/api-logs@0.52.1':
+    resolution: {integrity: sha512-qnSqB2DQ9TPP96dl8cDubDvrUyWc0/sK81xHTK8eSUspzDM3bsewX903qclQFvVhgStjRWdC5bLb3kQqMkfV5A==}
     engines: {node: '>=14'}
 
-  '@opentelemetry/api@1.8.0':
-    resolution: {integrity: sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==}
+  '@opentelemetry/api@1.9.0':
+    resolution: {integrity: sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==}
     engines: {node: '>=8.0.0'}
 
-  '@opentelemetry/context-async-hooks@1.24.1':
-    resolution: {integrity: sha512-R5r6DO4kgEOVBxFXhXjwospLQkv+sYxwCfjvoZBe7Zm6KKXAV9kDSJhi/D1BweowdZmO+sdbENLs374gER8hpQ==}
+  '@opentelemetry/context-async-hooks@1.25.1':
+    resolution: {integrity: sha512-UW/ge9zjvAEmRWVapOP0qyCvPulWU6cQxGxDbWEFfGOj1VBBZAuOqTo3X6yWmDTD3Xe15ysCZChHncr2xFMIfQ==}
     engines: {node: '>=14'}
     peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.9.0'
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
 
   '@opentelemetry/core@1.24.1':
     resolution: {integrity: sha512-wMSGfsdmibI88K9wB498zXY04yThPexo8jvwNNlm542HZB7XrrMRBbAyKJqG8qDRJwIBdBrPMi4V9ZPW/sqrcg==}
@@ -3293,86 +3495,98 @@ packages:
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.9.0'
 
-  '@opentelemetry/instrumentation-connect@0.36.0':
-    resolution: {integrity: sha512-k9++bmJZ9zDEs3u3DnKTn2l7QTiNFg3gPx7G9rW0TPnP+xZoBSBTrEcGYBaqflQlrFG23Q58+X1sM2ayWPv5Fg==}
+  '@opentelemetry/core@1.25.1':
+    resolution: {integrity: sha512-GeT/l6rBYWVQ4XArluLVB6WWQ8flHbdb6r2FCHC3smtdOAbrJBIv35tpV/yp9bmYUJf+xmZpu9DRTIeJVhFbEQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/instrumentation-connect@0.37.0':
+    resolution: {integrity: sha512-SeQktDIH5rNzjiEiazWiJAIXkmnLOnNV7wwHpahrqE0Ph+Z3heqMfxRtoMtbdJSIYLfcNZYO51AjxZ00IXufdw==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-express@0.39.0':
-    resolution: {integrity: sha512-AG8U7z7D0JcBu/7dDcwb47UMEzj9/FMiJV2iQZqrsZnxR3FjB9J9oIH2iszJYci2eUdp2WbdvtpD9RV/zmME5A==}
+  '@opentelemetry/instrumentation-express@0.40.1':
+    resolution: {integrity: sha512-+RKMvVe2zw3kIXRup9c1jFu3T4d0fs5aKy015TpiMyoCKX1UMu3Z0lfgYtuyiSTANvg5hZnDbWmQmqSPj9VTvg==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-fastify@0.36.1':
-    resolution: {integrity: sha512-3Nfm43PI0I+3EX+1YbSy6xbDu276R1Dh1tqAk68yd4yirnIh52Kd5B+nJ8CgHA7o3UKakpBjj6vSzi5vNCzJIA==}
+  '@opentelemetry/instrumentation-fastify@0.37.0':
+    resolution: {integrity: sha512-WRjwzNZgupSzbEYvo9s+QuHJRqZJjVdNxSEpGBwWK8RKLlHGwGVAu0gcc2gPamJWUJsGqPGvahAPWM18ZkWj6A==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-graphql@0.40.0':
-    resolution: {integrity: sha512-LVRdEHWACWOczv2imD+mhUrLMxsEjPPi32vIZJT57zygR5aUiA4em8X3aiGOCycgbMWkIu8xOSGSxdx3JmzN+w==}
+  '@opentelemetry/instrumentation-graphql@0.41.0':
+    resolution: {integrity: sha512-R/gXeljgIhaRDKquVkKYT5QHPnFouM8ooyePZEP0kqyaVAedtR1V7NfAUJbxfTG5fBQa5wdmLjvu63+tzRXZCA==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-hapi@0.38.0':
-    resolution: {integrity: sha512-ZcOqEuwuutTDYIjhDIStix22ECblG/i9pHje23QGs4Q4YS4RMaZ5hKCoQJxW88Z4K7T53rQkdISmoXFKDV8xMg==}
+  '@opentelemetry/instrumentation-hapi@0.39.0':
+    resolution: {integrity: sha512-ik2nA9Yj2s2ay+aNY+tJsKCsEx6Tsc2g/MK0iWBW5tibwrWKTy1pdVt5sB3kd5Gkimqj23UV5+FH2JFcQLeKug==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-http@0.51.1':
-    resolution: {integrity: sha512-6b3nZnFFEz/3xZ6w8bVxctPUWIPWiXuPQ725530JgxnN1cvYFd8CJ75PrHZNjynmzSSnqBkN3ef4R9N+RpMh8Q==}
+  '@opentelemetry/instrumentation-http@0.52.1':
+    resolution: {integrity: sha512-dG/aevWhaP+7OLv4BQQSEKMJv8GyeOp3Wxl31NHqE8xo9/fYMfEljiZphUHIfyg4gnZ9swMyWjfOQs5GUQe54Q==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-ioredis@0.40.0':
-    resolution: {integrity: sha512-Jv/fH7KhpWe4KBirsiqeUJIYrsdR2iu2l4nWhfOlRvaZ+zYIiLEzTQR6QhBbyRoAbU4OuYJzjWusOmmpGBnwng==}
+  '@opentelemetry/instrumentation-ioredis@0.41.0':
+    resolution: {integrity: sha512-rxiLloU8VyeJGm5j2fZS8ShVdB82n7VNP8wTwfUQqDwRfHCnkzGr+buKoxuhGD91gtwJ91RHkjHA1Eg6RqsUTg==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-koa@0.40.0':
-    resolution: {integrity: sha512-dJc3H/bKMcgUYcQpLF+1IbmUKus0e5Fnn/+ru/3voIRHwMADT3rFSUcGLWSczkg68BCgz0vFWGDTvPtcWIFr7A==}
+  '@opentelemetry/instrumentation-koa@0.41.0':
+    resolution: {integrity: sha512-mbPnDt7ELvpM2S0vixYUsde7122lgegLOJQxx8iJQbB8YHal/xnTh9v7IfArSVzIDo+E+080hxZyUZD4boOWkw==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-mongodb@0.43.0':
-    resolution: {integrity: sha512-bMKej7Y76QVUD3l55Q9YqizXybHUzF3pujsBFjqbZrRn2WYqtsDtTUlbCK7fvXNPwFInqZ2KhnTqd0gwo8MzaQ==}
+  '@opentelemetry/instrumentation-mongodb@0.45.0':
+    resolution: {integrity: sha512-xnZP9+ayeB1JJyNE9cIiwhOJTzNEsRhXVdLgfzmrs48Chhhk026mQdM5CITfyXSCfN73FGAIB8d91+pflJEfWQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-mongoose@0.38.1':
-    resolution: {integrity: sha512-zaeiasdnRjXe6VhYCBMdkmAVh1S5MmXC/0spet+yqoaViGnYst/DOxPvhwg3yT4Yag5crZNWsVXnA538UjP6Ow==}
+  '@opentelemetry/instrumentation-mongoose@0.39.0':
+    resolution: {integrity: sha512-J1r66A7zJklPPhMtrFOO7/Ud2p0Pv5u8+r23Cd1JUH6fYPmftNJVsLp2urAt6PHK4jVqpP/YegN8wzjJ2mZNPQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-mysql2@0.38.1':
-    resolution: {integrity: sha512-qkpHMgWSDTYVB1vlZ9sspf7l2wdS5DDq/rbIepDwX5BA0N0068JTQqh0CgAh34tdFqSCnWXIhcyOXC2TtRb0sg==}
+  '@opentelemetry/instrumentation-mysql2@0.39.0':
+    resolution: {integrity: sha512-Iypuq2z6TCfriAXCIZjRq8GTFCKhQv5SpXbmI+e60rYdXw8NHtMH4NXcGF0eKTuoCsC59IYSTUvDQYDKReaszA==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-mysql@0.38.1':
-    resolution: {integrity: sha512-+iBAawUaTfX/HAlvySwozx0C2B6LBfNPXX1W8Z2On1Uva33AGkw2UjL9XgIg1Pj4eLZ9R4EoJ/aFz+Xj4E/7Fw==}
+  '@opentelemetry/instrumentation-mysql@0.39.0':
+    resolution: {integrity: sha512-8snHPh83rhrDf31v9Kq0Nf+ts8hdr7NguuszRqZomZBHgE0+UyXZSkXHAAFZoBPPRMGyM68uaFE5hVtFl+wOcA==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-nestjs-core@0.37.1':
-    resolution: {integrity: sha512-ebYQjHZEmGHWEALwwDGhSQVLBaurFnuLIkZD5igPXrt7ohfF4lc5/4al1LO+vKc0NHk8SJWStuRueT86ISA8Vg==}
+  '@opentelemetry/instrumentation-nestjs-core@0.38.0':
+    resolution: {integrity: sha512-M381Df1dM8aqihZz2yK+ugvMFK5vlHG/835dc67Sx2hH4pQEQYDA2PpFPTgc9AYYOydQaj7ClFQunESimjXDgg==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-pg@0.41.0':
-    resolution: {integrity: sha512-BSlhpivzBD77meQNZY9fS4aKgydA8AJBzv2dqvxXFy/Hq64b7HURgw/ztbmwFeYwdF5raZZUifiiNSMLpOJoSA==}
+  '@opentelemetry/instrumentation-pg@0.42.0':
+    resolution: {integrity: sha512-sjgcM8CswYy8zxHgXv4RAZ09DlYhQ+9TdlourUs63Df/ek5RrB1ZbjznqW7PB6c3TyJJmX6AVtPTjAsROovEjA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-redis-4@0.40.0':
+    resolution: {integrity: sha512-0ieQYJb6yl35kXA75LQUPhHtGjtQU9L85KlWa7d4ohBbk/iQKZ3X3CFl5jC5vNMq/GGPB3+w3IxNvALlHtrp7A==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
@@ -3383,8 +3597,8 @@ packages:
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation@0.51.1':
-    resolution: {integrity: sha512-JIrvhpgqY6437QIqToyozrUG1h5UhwHkaGK/WAX+fkrpyPtc+RO5FkRtUd9BH0MibabHHvqsnBGKfKVijbmp8w==}
+  '@opentelemetry/instrumentation@0.52.1':
+    resolution: {integrity: sha512-uXJbYU/5/MBHjMp1FqrILLRuiJCs3Ofk0MeRDk8g1S1gD47U8X3JnSwcMO1rtRo1x1a7zKaQHaoYu49p/4eSKw==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
@@ -3399,22 +3613,32 @@ packages:
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.9.0'
 
+  '@opentelemetry/resources@1.25.1':
+    resolution: {integrity: sha512-pkZT+iFYIZsVn6+GzM0kSX+u3MSLCY9md+lIJOoKl/P+gJFfxJte/60Usdp8Ce4rOs8GduUpSPNe1ddGyDT1sQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
   '@opentelemetry/sdk-metrics@1.24.1':
     resolution: {integrity: sha512-FrAqCbbGao9iKI+Mgh+OsC9+U2YMoXnlDHe06yH7dvavCKzE3S892dGtX54+WhSFVxHR/TMRVJiK/CV93GR0TQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': '>=1.3.0 <1.9.0'
 
-  '@opentelemetry/sdk-trace-base@1.24.1':
-    resolution: {integrity: sha512-zz+N423IcySgjihl2NfjBf0qw1RWe11XIAWVrTNOSSI6dtSPJiVom2zipFB2AEEtJWpv0Iz6DY6+TjnyTV5pWg==}
+  '@opentelemetry/sdk-trace-base@1.25.1':
+    resolution: {integrity: sha512-C8k4hnEbc5FamuZQ92nTOp8X/diCY56XUTnMiv9UTuJitCzaNNHAVsdm5+HLCdI8SLQsLWIrG38tddMxLVoftw==}
     engines: {node: '>=14'}
     peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.9.0'
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
 
   '@opentelemetry/semantic-conventions@1.24.1':
     resolution: {integrity: sha512-VkliWlS4/+GHLLW7J/rVBA00uXus1SWvwFvcUDxDwmFxYfg/2VI6ekwdXS28cjI8Qz2ky2BzG8OUHo+WeYIWqw==}
     engines: {node: '>=14'}
 
+  '@opentelemetry/semantic-conventions@1.25.1':
+    resolution: {integrity: sha512-ZDjMJJQRlyk8A1KZFCc+bCbsyrn1wTwdNt56F7twdfUfnHUZUq77/WfONCj8p72NZOyP7pNTdUWSTYC3GTbuuQ==}
+    engines: {node: '>=14'}
+
   '@opentelemetry/sql-common@0.40.1':
     resolution: {integrity: sha512-nSDlnHSqzC3pXn/wZEZVLuAuJ1MYMXPBwtv2qAbCa3847SaHItdE7SzUq/Jtb0KZmh1zfAbNi3AAMjztTT4Ugg==}
     engines: {node: '>=14'}
@@ -3444,23 +3668,167 @@ packages:
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
 
-  '@prisma/instrumentation@5.14.0':
-    resolution: {integrity: sha512-DeybWvIZzu/mUsOYP9MVd6AyBj+MP7xIMrcuIn25MX8FiQX39QBnET5KhszTAip/ToctUuDwSJ46QkIoyo3RFA==}
+  '@prisma/instrumentation@5.16.0':
+    resolution: {integrity: sha512-MVzNRW2ikWvVNnMIEgQMcwWxpFD+XF2U2h0Qz7MjutRqJxrhWexWV2aSi2OXRaU8UL5wzWw7pnjdKUzYhWauLg==}
 
-  '@radix-ui/react-compose-refs@1.0.1':
-    resolution: {integrity: sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==}
+  '@radix-ui/primitive@1.1.0':
+    resolution: {integrity: sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==}
+
+  '@radix-ui/react-compose-refs@1.1.0':
+    resolution: {integrity: sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==}
     peerDependencies:
       '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
     peerDependenciesMeta:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-slot@1.0.2':
-    resolution: {integrity: sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==}
+  '@radix-ui/react-context@1.1.0':
+    resolution: {integrity: sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==}
     peerDependencies:
       '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-dialog@1.1.1':
+    resolution: {integrity: sha512-zysS+iU4YP3STKNS6USvFVqI4qqx8EpiwmT5TuCApVEBca+eRCbONi4EgzfNSuVnOXvC5UPHHMjs8RXO6DH9Bg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-dismissable-layer@1.1.0':
+    resolution: {integrity: sha512-/UovfmmXGptwGcBQawLzvn2jOfM0t4z3/uKffoBlj724+n3FvBbZ7M0aaBOmkp6pqFYpO4yx8tSVJjx3Fl2jig==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-focus-guards@1.1.0':
+    resolution: {integrity: sha512-w6XZNUPVv6xCpZUqb/yN9DL6auvpGX3C/ee6Hdi16v2UUy25HV2Q5bcflsiDyT/g5RwbPQ/GIT1vLkeRb+ITBw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-focus-scope@1.1.0':
+    resolution: {integrity: sha512-200UD8zylvEyL8Bx+z76RJnASR2gRMuxlgFCPAe/Q/679a/r0eK3MBVYMb7vZODZcffZBdob1EGnky78xmVvcA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-id@1.1.0':
+    resolution: {integrity: sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-portal@1.1.1':
+    resolution: {integrity: sha512-A3UtLk85UtqhzFqtoC8Q0KvR2GbXF3mtPgACSazajqq6A41mEQgo53iPzY4i6BwDxlIFqWIhiQ2G729n+2aw/g==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-presence@1.1.0':
+    resolution: {integrity: sha512-Gq6wuRN/asf9H/E/VzdKoUtT8GC9PQc9z40/vEr0VCJ4u5XvvhWIrSsCB6vD2/cH7ugTdSfYq9fLJCcM00acrQ==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-primitive@2.0.0':
+    resolution: {integrity: sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-slot@1.1.0':
+    resolution: {integrity: sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-use-callback-ref@1.1.0':
+    resolution: {integrity: sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-use-controllable-state@1.1.0':
+    resolution: {integrity: sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-use-escape-keydown@1.1.0':
+    resolution: {integrity: sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-use-layout-effect@1.1.0':
+    resolution: {integrity: sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
     peerDependenciesMeta:
       '@types/react':
         optional: true
@@ -3489,8 +3857,8 @@ packages:
       rollup:
         optional: true
 
-  '@rollup/plugin-replace@5.0.5':
-    resolution: {integrity: sha512-rYO4fOi8lMaTg/z5Jb+hKnrHHVn8j2lwkqwyS4kTRhKyWOLf2wST2sWXr4WzWiTcoHTp2sTjqUbqIj2E39slKQ==}
+  '@rollup/plugin-replace@5.0.7':
+    resolution: {integrity: sha512-PqxSfuorkHz/SPpyngLyg5GCEkOcee9M1bkxiVDr41Pd61mqP1PLOoDPbpl44SB2mQGKwV/In74gqQmGITOhEQ==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
@@ -3507,88 +3875,88 @@ packages:
       rollup:
         optional: true
 
-  '@rollup/rollup-android-arm-eabi@4.17.2':
-    resolution: {integrity: sha512-NM0jFxY8bB8QLkoKxIQeObCaDlJKewVlIEkuyYKm5An1tdVZ966w2+MPQ2l8LBZLjR+SgyV+nRkTIunzOYBMLQ==}
+  '@rollup/rollup-android-arm-eabi@4.18.0':
+    resolution: {integrity: sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==}
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.17.2':
-    resolution: {integrity: sha512-yeX/Usk7daNIVwkq2uGoq2BYJKZY1JfyLTaHO/jaiSwi/lsf8fTFoQW/n6IdAsx5tx+iotu2zCJwz8MxI6D/Bw==}
+  '@rollup/rollup-android-arm64@4.18.0':
+    resolution: {integrity: sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==}
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-darwin-arm64@4.17.2':
-    resolution: {integrity: sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==}
+  '@rollup/rollup-darwin-arm64@4.18.0':
+    resolution: {integrity: sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==}
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.17.2':
-    resolution: {integrity: sha512-AtKwD0VEx0zWkL0ZjixEkp5tbNLzX+FCqGG1SvOu993HnSz4qDI6S4kGzubrEJAljpVkhRSlg5bzpV//E6ysTQ==}
+  '@rollup/rollup-darwin-x64@4.18.0':
+    resolution: {integrity: sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==}
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.17.2':
-    resolution: {integrity: sha512-3reX2fUHqN7sffBNqmEyMQVj/CKhIHZd4y631duy0hZqI8Qoqf6lTtmAKvJFYa6bhU95B1D0WgzHkmTg33In0A==}
+  '@rollup/rollup-linux-arm-gnueabihf@4.18.0':
+    resolution: {integrity: sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.17.2':
-    resolution: {integrity: sha512-uSqpsp91mheRgw96xtyAGP9FW5ChctTFEoXP0r5FAzj/3ZRv3Uxjtc7taRQSaQM/q85KEKjKsZuiZM3GyUivRg==}
+  '@rollup/rollup-linux-arm-musleabihf@4.18.0':
+    resolution: {integrity: sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-gnu@4.17.2':
-    resolution: {integrity: sha512-EMMPHkiCRtE8Wdk3Qhtciq6BndLtstqZIroHiiGzB3C5LDJmIZcSzVtLRbwuXuUft1Cnv+9fxuDtDxz3k3EW2A==}
+  '@rollup/rollup-linux-arm64-gnu@4.18.0':
+    resolution: {integrity: sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-musl@4.17.2':
-    resolution: {integrity: sha512-NMPylUUZ1i0z/xJUIx6VUhISZDRT+uTWpBcjdv0/zkp7b/bQDF+NfnfdzuTiB1G6HTodgoFa93hp0O1xl+/UbA==}
+  '@rollup/rollup-linux-arm64-musl@4.18.0':
+    resolution: {integrity: sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.17.2':
-    resolution: {integrity: sha512-T19My13y8uYXPw/L/k0JYaX1fJKFT/PWdXiHr8mTbXWxjVF1t+8Xl31DgBBvEKclw+1b00Chg0hxE2O7bTG7GQ==}
+  '@rollup/rollup-linux-powerpc64le-gnu@4.18.0':
+    resolution: {integrity: sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==}
     cpu: [ppc64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.17.2':
-    resolution: {integrity: sha512-BOaNfthf3X3fOWAB+IJ9kxTgPmMqPPH5f5k2DcCsRrBIbWnaJCgX2ll77dV1TdSy9SaXTR5iDXRL8n7AnoP5cg==}
+  '@rollup/rollup-linux-riscv64-gnu@4.18.0':
+    resolution: {integrity: sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==}
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-s390x-gnu@4.17.2':
-    resolution: {integrity: sha512-W0UP/x7bnn3xN2eYMql2T/+wpASLE5SjObXILTMPUBDB/Fg/FxC+gX4nvCfPBCbNhz51C+HcqQp2qQ4u25ok6g==}
+  '@rollup/rollup-linux-s390x-gnu@4.18.0':
+    resolution: {integrity: sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==}
     cpu: [s390x]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-gnu@4.17.2':
-    resolution: {integrity: sha512-Hy7pLwByUOuyaFC6mAr7m+oMC+V7qyifzs/nW2OJfC8H4hbCzOX07Ov0VFk/zP3kBsELWNFi7rJtgbKYsav9QQ==}
+  '@rollup/rollup-linux-x64-gnu@4.18.0':
+    resolution: {integrity: sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-musl@4.17.2':
-    resolution: {integrity: sha512-h1+yTWeYbRdAyJ/jMiVw0l6fOOm/0D1vNLui9iPuqgRGnXA0u21gAqOyB5iHjlM9MMfNOm9RHCQ7zLIzT0x11Q==}
+  '@rollup/rollup-linux-x64-musl@4.18.0':
+    resolution: {integrity: sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-win32-arm64-msvc@4.17.2':
-    resolution: {integrity: sha512-tmdtXMfKAjy5+IQsVtDiCfqbynAQE/TQRpWdVataHmhMb9DCoJxp9vLcCBjEQWMiUYxO1QprH/HbY9ragCEFLA==}
+  '@rollup/rollup-win32-arm64-msvc@4.18.0':
+    resolution: {integrity: sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.17.2':
-    resolution: {integrity: sha512-7II/QCSTAHuE5vdZaQEwJq2ZACkBpQDOmQsE6D6XUbnBHW8IAhm4eTufL6msLJorzrHDFv3CF8oCA/hSIRuZeQ==}
+  '@rollup/rollup-win32-ia32-msvc@4.18.0':
+    resolution: {integrity: sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==}
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.17.2':
-    resolution: {integrity: sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==}
+  '@rollup/rollup-win32-x64-msvc@4.18.0':
+    resolution: {integrity: sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==}
     cpu: [x64]
     os: [win32]
 
-  '@rushstack/node-core-library@4.1.0':
-    resolution: {integrity: sha512-qz4JFBZJCf1YN5cAXa1dP6Mki/HrsQxc/oYGAGx29dF2cwF2YMxHoly0FBhMw3IEnxo5fMj0boVfoHVBkpkx/w==}
+  '@rushstack/node-core-library@5.4.1':
+    resolution: {integrity: sha512-WNnwdS8r9NZ/2K3u29tNoSRldscFa7SxU0RT+82B6Dy2I4Hl2MeCSKm4EXLXPKeNzLGvJ1cqbUhTLviSF8E6iA==}
     peerDependencies:
       '@types/node': '*'
     peerDependenciesMeta:
@@ -3598,50 +3966,53 @@ packages:
   '@rushstack/rig-package@0.5.2':
     resolution: {integrity: sha512-mUDecIJeH3yYGZs2a48k+pbhM6JYwWlgjs2Ca5f2n1G2/kgdgP9D/07oglEGf6mRyXEnazhEENeYTSNDRCwdqA==}
 
-  '@rushstack/terminal@0.10.1':
-    resolution: {integrity: sha512-C6Vi/m/84IYJTkfzmXr1+W8Wi3MmBjVF/q3za91Gb3VYjKbpALHVxY6FgH625AnDe5Z0Kh4MHKWA3Z7bqgAezA==}
+  '@rushstack/terminal@0.13.0':
+    resolution: {integrity: sha512-Ou44Q2s81BqJu3dpYedAX54am9vn245F0HzqVrfJCMQk5pGgoKKOBOjkbfZC9QKcGNaECh6pwH2s5noJt7X6ew==}
     peerDependencies:
       '@types/node': '*'
     peerDependenciesMeta:
       '@types/node':
         optional: true
 
-  '@rushstack/ts-command-line@4.19.2':
-    resolution: {integrity: sha512-cqmXXmBEBlzo9WtyUrHtF9e6kl0LvBY7aTSVX4jfnBfXWZQWnPq9JTFPlQZ+L/ZwjZ4HrNwQsOVvhe9oOucZkw==}
+  '@rushstack/ts-command-line@4.22.0':
+    resolution: {integrity: sha512-Qj28t6MO3HRgAZ72FDeFsrpdE6wBWxF3VENgvrXh7JF2qIT+CrXiOJIesW80VFZB9QwObSpkB1ilx794fGQg6g==}
 
-  '@sentry/core@8.5.0':
-    resolution: {integrity: sha512-SO3ddBzGdha+Oflp+IKwBxj+7ds1q69OAT3VsypTd+WUFQdI9DIhR92Bjf+QQZCIzUNOi79VWOh3aOi3f6hMnw==}
+  '@sec-ant/readable-stream@0.4.1':
+    resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==}
+
+  '@sentry/core@8.13.0':
+    resolution: {integrity: sha512-N9Qg4ZGxZWp8eb2eUUHVVKgjBLtFIjS805nG92s6yJmkvOpKm6mLtcUaT/iDf3Hta6nG+xRkhbE3r+Z4cbXG8w==}
     engines: {node: '>=14.18'}
 
-  '@sentry/node@8.5.0':
-    resolution: {integrity: sha512-t9cHAx/wLJYtdVf2XlzKlRJGvwdAp1wjzG0tC4E1Znx74OuUS1cFNo5WrGuOi0/YcWSxiJaxBvtUcsWK86fIgw==}
+  '@sentry/node@8.13.0':
+    resolution: {integrity: sha512-OeZ7K90RhyxfwfreerIi4cszzHrPRRH36STJno2+p3sIGbG5VScOccqXzYEOAqHpByxnti4KQN34BLAT2BFOEA==}
     engines: {node: '>=14.18'}
 
-  '@sentry/opentelemetry@8.5.0':
-    resolution: {integrity: sha512-AbxFUNjuTKQ9ugZrssmGtPxWkBr4USNoP7GjaaGCNwNzvIVYCa+i8dv7BROJiW2lsxNAremULEbh+nbVmhGxDA==}
+  '@sentry/opentelemetry@8.13.0':
+    resolution: {integrity: sha512-NYn/HNE/SxFXe8pfnxJknhrrRzYRMHNssCoi5M1CeR5G7F2BGxxVmaGsd8j0WyTCpUS4i97G4vhYtDGxHvWN6w==}
     engines: {node: '>=14.18'}
     peerDependencies:
-      '@opentelemetry/api': ^1.8.0
-      '@opentelemetry/core': ^1.24.1
-      '@opentelemetry/instrumentation': ^0.51.1
-      '@opentelemetry/sdk-trace-base': ^1.23.0
-      '@opentelemetry/semantic-conventions': ^1.23.0
+      '@opentelemetry/api': ^1.9.0
+      '@opentelemetry/core': ^1.25.1
+      '@opentelemetry/instrumentation': ^0.52.1
+      '@opentelemetry/sdk-trace-base': ^1.25.1
+      '@opentelemetry/semantic-conventions': ^1.25.1
 
-  '@sentry/profiling-node@8.5.0':
-    resolution: {integrity: sha512-nEXJqVNfZWYi4PakQXBZCJeH59UlnBv+zaYftDNUUXttCmzRXpL1ujNm5mJrJHlWjV7tgIFw02HW3nh2yyKOkw==}
+  '@sentry/profiling-node@8.13.0':
+    resolution: {integrity: sha512-6qirN71xlMahcm4m25XZLnjQdvs0EaFym/9MdLqcsAa3gAHZtw6h+IDapUzBWRXVOrU1OR5oQdh2tlFthsDtew==}
     engines: {node: '>=14.18'}
     hasBin: true
 
-  '@sentry/types@8.5.0':
-    resolution: {integrity: sha512-eDgkSmKI4+XL0QZm4H3j/n1RgnrbnjXZmjj+LsfccRZQwbPu9bWlc8q7Y7Ty1gOsoUpX+TecNLp2a8CRID4KHA==}
+  '@sentry/types@8.13.0':
+    resolution: {integrity: sha512-r63s/H5gvQnQM9tTGBXz2xErUbxZALh4e2Lg/1aHj4zIvGLBjA2z5qWsh6TEZYbpmgAyGShLDr6+rWeUVf9yBQ==}
     engines: {node: '>=14.18'}
 
-  '@sentry/utils@8.5.0':
-    resolution: {integrity: sha512-fdrCzo8SAYiw9JBhkJPqYqJkDXZ/wICzN7+zcXIuzKNhE1hdoFjeKcPnpUI3bKZCG6e3hT1PTYQXhVw7GIZV9w==}
+  '@sentry/utils@8.13.0':
+    resolution: {integrity: sha512-PxV0v9VbGWH9zP37P5w2msLUFDr287nYjoY2XVF+RSolyiTs1CQNI5ZMUO3o4MsSac/dpXxjyrZXQd72t/jRYA==}
     engines: {node: '>=14.18'}
 
-  '@shikijs/core@1.4.0':
-    resolution: {integrity: sha512-CxpKLntAi64h3j+TwWqVIQObPTED0FyXLHTTh3MKXtqiQNn2JGcMQQ362LftDbc9kYbDtrksNMNoVmVXzKFYUQ==}
+  '@shikijs/core@1.10.0':
+    resolution: {integrity: sha512-BZcr6FCmPfP6TXaekvujZcnkFmJHZ/Yglu97r/9VjzVndQA56/F4WjUKtJRQUnK59Wi7p/UTAOekMfCJv7jnYg==}
 
   '@sideway/address@4.1.4':
     resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==}
@@ -3670,10 +4041,18 @@ packages:
     resolution: {integrity: sha512-CX6t4SYQ37lzxicAqsBtxA3OseeoVrh9cSJ5PFYam0GksYlupRfy1A+Q4aYD3zvcfECLc0zO2u+ZnR2UYKvCrw==}
     engines: {node: '>=14.16'}
 
-  '@sindresorhus/is@6.1.0':
-    resolution: {integrity: sha512-BuvU07zq3tQ/2SIgBsEuxKYDyDjC0n7Zir52bpHy2xnBbW81+po43aLFPLbeV3HRAheFbGud1qgcqSYfhtHMAg==}
+  '@sindresorhus/is@6.3.1':
+    resolution: {integrity: sha512-FX4MfcifwJyFOI2lPoX7PQxCqx8BG1HCho7WdiXwpEQx1Ycij0JxkfYtGK7yqNScrZGSlt6RE6sw8QYoH7eKnQ==}
     engines: {node: '>=16'}
 
+  '@sindresorhus/merge-streams@2.3.0':
+    resolution: {integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==}
+    engines: {node: '>=18'}
+
+  '@sindresorhus/merge-streams@4.0.0':
+    resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==}
+    engines: {node: '>=18'}
+
   '@sinonjs/commons@2.0.0':
     resolution: {integrity: sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==}
 
@@ -3692,275 +4071,299 @@ packages:
   '@sinonjs/text-encoding@0.7.2':
     resolution: {integrity: sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==}
 
-  '@smithy/abort-controller@2.0.14':
-    resolution: {integrity: sha512-zXtteuYLWbSXnzI3O6xq3FYvigYZFW8mdytGibfarLL2lxHto9L3ILtGVnVGmFZa7SDh62l39EnU5hesLN87Fw==}
-    engines: {node: '>=14.0.0'}
-
   '@smithy/abort-controller@2.2.0':
     resolution: {integrity: sha512-wRlta7GuLWpTqtFfGo+nZyOO1vEvewdNR1R4rTxpC8XU6vG/NDyrFBhwLZsqg1NUoR1noVaXJPC/7ZK47QCySw==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/chunked-blob-reader-native@2.0.0':
-    resolution: {integrity: sha512-HM8V2Rp1y8+1343tkZUKZllFhEQPNmpNdgFAncbTsxkZ18/gqjk23XXv3qGyXWp412f3o43ZZ1UZHVcHrpRnCQ==}
+  '@smithy/abort-controller@3.1.1':
+    resolution: {integrity: sha512-MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/chunked-blob-reader@2.0.0':
-    resolution: {integrity: sha512-k+J4GHJsMSAIQPChGBrjEmGS+WbPonCXesoqP9fynIqjn7rdOThdH8FAeCmokP9mxTYKQAKoHCLPzNlm6gh7Wg==}
+  '@smithy/chunked-blob-reader-native@3.0.0':
+    resolution: {integrity: sha512-VDkpCYW+peSuM4zJip5WDfqvg2Mo/e8yxOv3VF1m11y7B8KKMKVFtmZWDe36Fvk8rGuWrPZHHXZ7rR7uM5yWyg==}
 
-  '@smithy/config-resolver@2.0.9':
-    resolution: {integrity: sha512-QBkGPLUqyPmis9Erz8v4q5lo/ErnF7+GD5WZHa6JZiXopUPfaaM+B21n8gzS5xCkIXZmnwzNQhObP9xQPu8oqQ==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/chunked-blob-reader@3.0.0':
+    resolution: {integrity: sha512-sbnURCwjF0gSToGlsBiAmd1lRCmSn72nu9axfJu5lIx6RUEgHu6GwTMbqCdhQSi0Pumcm5vFxsi9XWXb2mTaoA==}
 
-  '@smithy/credential-provider-imds@2.0.11':
-    resolution: {integrity: sha512-uJJs8dnM5iXkn8a2GaKvlKMhcOJ+oJPYqY9gY3CM/EieCVObIDjxUtR/g8lU/k/A+OauA78GzScAfulmFjPOYA==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/config-resolver@3.0.4':
+    resolution: {integrity: sha512-VwiOk7TwXoE7NlNguV/aPq1hFH72tqkHCw8eWXbr2xHspRyyv9DLpLXhq+Ieje+NwoqXrY0xyQjPXdOE6cGcHA==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/eventstream-codec@2.0.8':
-    resolution: {integrity: sha512-onO4to8ujCKn4m5XagReT9Nc6FlNG5vveuvjp1H7AtaG7njdet1LOl6/jmUOkskF2C/w+9jNw3r9Ak+ghOvN0A==}
+  '@smithy/core@2.2.4':
+    resolution: {integrity: sha512-qdY3LpMOUyLM/gfjjMQZui+UTNS7kBRDWlvyIhVOql5dn2J3isk9qUTBtQ1CbDH8MTugHis1zu3h4rH+Qmmh4g==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/eventstream-serde-browser@2.0.8':
-    resolution: {integrity: sha512-/RGlkKUnC0sd+xKBKH/2APSBRmVMZTeLOKZMhrZmrO+ONoU+DwyMr/RLJ6WnmBKN+2ebjffM4pcIJTKLNNDD8g==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/credential-provider-imds@3.1.3':
+    resolution: {integrity: sha512-U1Yrv6hx/mRK6k8AncuI6jLUx9rn0VVSd9NPEX6pyYFBfkSkChOc/n4zUb8alHUVg83TbI4OdZVo1X0Zfj3ijA==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/eventstream-serde-config-resolver@2.0.8':
-    resolution: {integrity: sha512-EyAEj258eMUv9zcMvBbqrInh2eHRYuiwQAjXDMxZFCyP+JePzQB6O++3wFwjQeRKMFFgZipNgnEXfReII4+NAw==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/eventstream-codec@3.1.2':
+    resolution: {integrity: sha512-0mBcu49JWt4MXhrhRAlxASNy0IjDRFU+aWNDRal9OtUJvJNiwDuyKMUONSOjLjSCeGwZaE0wOErdqULer8r7yw==}
 
-  '@smithy/eventstream-serde-node@2.0.8':
-    resolution: {integrity: sha512-FMBatSUSKwh6aguKVJokXfJaV8nqsuCkCZHb9MP9zah0ZF+ohbTLeeed7DQGeTVBueVIVWEzIsShPxtxBv7MMQ==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/eventstream-serde-browser@3.0.4':
+    resolution: {integrity: sha512-Eo4anLZX6ltGJTZ5yJMc80gZPYYwBn44g0h7oFq6et+TYr5dUsTpIcDbz2evsOKIZhZ7zBoFWHtBXQ4QQeb5xA==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/eventstream-serde-universal@2.0.8':
-    resolution: {integrity: sha512-6InMXH8BUKoEDa6CAuxR4Gn8Gf2vBfVtjA9A6zDKZClYHT+ANUJS+2EtOBc5wECJJGk4KLn5ajQyrt9MBv5lcw==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/eventstream-serde-config-resolver@3.0.3':
+    resolution: {integrity: sha512-NVTYjOuYpGfrN/VbRQgn31x73KDLfCXCsFdad8DiIc3IcdxL+dYA9zEQPyOP7Fy2QL8CPy2WE4WCUD+ZsLNfaQ==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/fetch-http-handler@2.1.4':
-    resolution: {integrity: sha512-SL24M9W5ERByoXaVicRx+bj9GJVujDnPn+QO7GY7adhY0mPGa6DSF58pVKsgIh4r5Tx/k3SWCPlH4BxxSxA/fQ==}
+  '@smithy/eventstream-serde-node@3.0.4':
+    resolution: {integrity: sha512-mjlG0OzGAYuUpdUpflfb9zyLrBGgmQmrobNT8b42ZTsGv/J03+t24uhhtVEKG/b2jFtPIHF74Bq+VUtbzEKOKg==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/hash-blob-browser@2.0.8':
-    resolution: {integrity: sha512-IgvRlBMfg/qLg321a59T1yTdEEbaizLrEVsU3DHj65DAO4lFRMF5f+l7vuV+je6m1G9wSD5GQXLturX8qlGb4g==}
+  '@smithy/eventstream-serde-universal@3.0.4':
+    resolution: {integrity: sha512-Od9dv8zh3PgOD7Vj4T3HSuox16n0VG8jJIM2gvKASL6aCtcS8CfHZDWe1Ik3ZXW6xBouU+45Q5wgoliWDZiJ0A==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/hash-node@2.0.8':
-    resolution: {integrity: sha512-yZL/nmxZzjZV5/QX5JWSgXlt0HxuMTwFO89CS++jOMMPiCMZngf6VYmtNdccs8IIIAMmfQeTzwu07XgUE/Zd3Q==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/fetch-http-handler@3.2.0':
+    resolution: {integrity: sha512-vFvDxMrc6sO5Atec8PaISckMcAwsCrRhYxwUylg97bRT2KZoumOF7qk5+6EVUtuM1IG9AJV5aqXnHln9ZdXHpg==}
 
-  '@smithy/hash-stream-node@2.0.8':
-    resolution: {integrity: sha512-82zC6I9ZJycbEZH8TVyXyBx9c2ZIPQDgBvM0x5AFPUl/i1AxwKKX+lwYRnzgkF//cYhIIoJaCfJ9mjSMPRGvCQ==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/hash-blob-browser@3.1.2':
+    resolution: {integrity: sha512-hAbfqN2UbISltakCC2TP0kx4LqXBttEv2MqSPE98gVuDFMf05lU+TpC41QtqGP3Ff5A3GwZMPfKnEy0VmEUpmg==}
 
-  '@smithy/invalid-dependency@2.0.8':
-    resolution: {integrity: sha512-88VOS7W3KzUz/bNRc+Sl/F/CDIasFspEE4G39YZRHIh9YmsXF7GUyVaAKURfMNulTie62ayk6BHC9O0nOBAVgQ==}
+  '@smithy/hash-node@3.0.3':
+    resolution: {integrity: sha512-2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw==}
+    engines: {node: '>=16.0.0'}
+
+  '@smithy/hash-stream-node@3.1.2':
+    resolution: {integrity: sha512-PBgDMeEdDzi6JxKwbfBtwQG9eT9cVwsf0dZzLXoJF4sHKHs5HEo/3lJWpn6jibfJwT34I1EBXpBnZE8AxAft6g==}
+    engines: {node: '>=16.0.0'}
+
+  '@smithy/invalid-dependency@3.0.3':
+    resolution: {integrity: sha512-ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw==}
 
   '@smithy/is-array-buffer@2.0.0':
     resolution: {integrity: sha512-z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/md5-js@2.0.8':
-    resolution: {integrity: sha512-1VVECXEiuJvjXv+mudiaUFKYwgDLOWz5MTTy8RzbrPiU3GiOb3/o5/urdkYpqmgoMfxdvxxOw/Adjv2dV2q2Yg==}
+  '@smithy/is-array-buffer@3.0.0':
+    resolution: {integrity: sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/middleware-content-length@2.0.10':
-    resolution: {integrity: sha512-EGSbysyA4jH0p3xI6G0jdXoj9Iz9GUnAta6aEaHtXm3wVWtenRf80y2TeVvNkVSr5jwKOdSCjKIRI2l1A/oZLA==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/md5-js@3.0.3':
+    resolution: {integrity: sha512-O/SAkGVwpWmelpj/8yDtsaVe6sINHLB1q8YE/+ZQbDxIw3SRLbTZuRaI10K12sVoENdnHqzPp5i3/H+BcZ3m3Q==}
 
-  '@smithy/middleware-endpoint@2.0.8':
-    resolution: {integrity: sha512-yOpogfG2d2V0cbJdAJ6GLAWkNOc9pVsL5hZUfXcxJu408N3CUCsXzIAFF6+70ZKSE+lCfG3GFErcSXv/UfUbjw==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/middleware-content-length@3.0.3':
+    resolution: {integrity: sha512-Dbz2bzexReYIQDWMr+gZhpwBetNXzbhnEMhYKA6urqmojO14CsXjnsoPYO8UL/xxcawn8ZsuVU61ElkLSltIUQ==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/middleware-retry@2.0.11':
-    resolution: {integrity: sha512-pknfokumZ+wvBERSuKAI2vVr+aK3ZgPiWRg6+0ZG4kKJogBRpPmDGWw+Jht0izS9ZaEbIobNzueIb4wD33JJVg==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/middleware-endpoint@3.0.4':
+    resolution: {integrity: sha512-whUJMEPwl3ANIbXjBXZVdJNgfV2ZU8ayln7xUM47rXL2txuenI7jQ/VFFwCzy5lCmXScjp6zYtptW5Evud8e9g==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/middleware-serde@2.0.8':
-    resolution: {integrity: sha512-Is0sm+LiNlgsc0QpstDzifugzL9ehno1wXp109GgBgpnKTK3j+KphiparBDI4hWTtH9/7OUsxuspNqai2yyhcg==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/middleware-retry@3.0.7':
+    resolution: {integrity: sha512-f5q7Y09G+2h5ivkSx5CHvlAT4qRR3jBFEsfXyQ9nFNiWQlr8c48blnu5cmbTQ+p1xmIO14UXzKoF8d7Tm0Gsjw==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/middleware-stack@2.0.1':
-    resolution: {integrity: sha512-UexsfY6/oQZRjTQL56s9AKtMcR60tBNibSgNYX1I2WXaUaXg97W9JCkFyth85TzBWKDBTyhLfenrukS/kyu54A==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/middleware-serde@3.0.3':
+    resolution: {integrity: sha512-puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/node-config-provider@2.0.11':
-    resolution: {integrity: sha512-CaR1dciSSGKttjhcefpytYjsfI/Yd5mqL8am4wfmyFCDxSiPsvnEWHl8UjM/RbcAjX0klt+CeIKPSHEc0wGvJA==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/middleware-stack@3.0.3':
+    resolution: {integrity: sha512-r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA==}
+    engines: {node: '>=16.0.0'}
+
+  '@smithy/node-config-provider@3.1.3':
+    resolution: {integrity: sha512-rxdpAZczzholz6CYZxtqDu/aKTxATD5DAUDVj7HoEulq+pDSQVWzbg0btZDlxeFfa6bb2b5tUvgdX5+k8jUqcg==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/node-http-handler@2.5.0':
     resolution: {integrity: sha512-mVGyPBzkkGQsPoxQUbxlEfRjrj6FPyA3u3u2VXGr9hT8wilsoQdZdvKpMBFMB8Crfhv5dNkKHIW0Yyuc7eABqA==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/property-provider@2.0.9':
-    resolution: {integrity: sha512-25pPZ8f8DeRwYI5wbPRZaoMoR+3vrw8DwbA0TjP+GsdiB2KxScndr4HQehiJ5+WJ0giOTWhLz0bd+7Djv1qpUQ==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/node-http-handler@3.1.1':
+    resolution: {integrity: sha512-L71NLyPeP450r2J/mfu1jMc//Z1YnqJt2eSNw7uhiItaONnBLDA68J5jgxq8+MBDsYnFwNAIc7dBG1ImiWBiwg==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/protocol-http@3.0.10':
-    resolution: {integrity: sha512-6+tjNk7rXW7YTeGo9qwxXj/2BFpJTe37kTj3EnZCoX/nH+NP/WLA7O83fz8XhkGqsaAhLUPo/bB12vvd47nsmg==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/property-provider@3.1.3':
+    resolution: {integrity: sha512-zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/protocol-http@3.3.0':
     resolution: {integrity: sha512-Xy5XK1AFWW2nlY/biWZXu6/krgbaf2dg0q492D8M5qthsnU2H+UgFeZLbM76FnH7s6RO/xhQRkj+T6KBO3JzgQ==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/querystring-builder@2.0.14':
-    resolution: {integrity: sha512-lQ4pm9vTv9nIhl5jt6uVMPludr6syE2FyJmHsIJJuOD7QPIJnrf9HhUGf1iHh9KJ4CUv21tpOU3X6s0rB6uJ0g==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/protocol-http@4.0.3':
+    resolution: {integrity: sha512-x5jmrCWwQlx+Zv4jAtc33ijJ+vqqYN+c/ZkrnpvEe/uDas7AT7A/4Rc2CdfxgWv4WFGmEqODIrrUToPN6DDkGw==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/querystring-builder@2.2.0':
     resolution: {integrity: sha512-L1kSeviUWL+emq3CUVSgdogoM/D9QMFaqxL/dd0X7PCNWmPXqt+ExtrBjqT0V7HLN03Vs9SuiLrG3zy3JGnE5A==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/querystring-parser@2.0.8':
-    resolution: {integrity: sha512-ArbanNuR7O/MmTd90ZqhDqGOPPDYmxx3huHxD+R3cuCnazcK/1tGQA+SnnR5307T7ZRb5WTpB6qBggERuibVSA==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/querystring-builder@3.0.3':
+    resolution: {integrity: sha512-vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/service-error-classification@2.0.1':
-    resolution: {integrity: sha512-QHa9+t+v4s0cMuDCcbjIJN67mNZ42/+fc3jKe8P6ZMPXZl5ksKk6a8vhZ/m494GZng5eFTc3OePv+NF9cG83yg==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/querystring-parser@3.0.3':
+    resolution: {integrity: sha512-zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/shared-ini-file-loader@2.0.10':
-    resolution: {integrity: sha512-jWASteSezRKohJ7GdA7pHDvmr7Q7tw3b5mu3xLHIkZy/ICftJ+O7aqNaF8wklhI7UNFoQ7flFRM3Rd0KA+1BbQ==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/service-error-classification@3.0.3':
+    resolution: {integrity: sha512-Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/signature-v4@2.0.5':
-    resolution: {integrity: sha512-ABIzXmUDXK4n2c9cXjQLELgH2RdtABpYKT+U131e2I6RbCypFZmxIHmIBufJzU2kdMCQ3+thBGDWorAITFW04A==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/shared-ini-file-loader@3.1.3':
+    resolution: {integrity: sha512-Z8Y3+08vgoDgl4HENqNnnzSISAaGrF2RoKupoC47u2wiMp+Z8P/8mDh1CL8+8ujfi2U5naNvopSBmP/BUj8b5w==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/smithy-client@2.1.5':
-    resolution: {integrity: sha512-7S865uKzsxApM8W8Q6zkij7tcUFgaG8PuADMFdMt1yL/ku3d0+s6Zwrg3N7iXCPM08Gu/mf0BIfTXIu/9i450Q==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/signature-v4@3.1.2':
+    resolution: {integrity: sha512-3BcPylEsYtD0esM4Hoyml/+s7WP2LFhcM3J2AGdcL2vx9O60TtfpDOL72gjb4lU8NeRPeKAwR77YNyyGvMbuEA==}
+    engines: {node: '>=16.0.0'}
+
+  '@smithy/smithy-client@3.1.5':
+    resolution: {integrity: sha512-x9bL9Mx2CT2P1OiUlHM+ZNpbVU6TgT32f9CmTRzqIHA7M4vYrROCWEoC3o4xHNJASoGd4Opos3cXYPgh+/m4Ww==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/types@2.12.0':
     resolution: {integrity: sha512-QwYgloJ0sVNBeBuBs65cIkTbfzV/Q6ZNPCJ99EICFEdJYG50nGIY/uYXp+TbsdJReIuPr0a0kXmCvren3MbRRw==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/types@2.6.0':
-    resolution: {integrity: sha512-PgqxJq2IcdMF9iAasxcqZqqoOXBHufEfmbEUdN1pmJrJltT42b0Sc8UiYSWWzKkciIp9/mZDpzYi4qYG1qqg6g==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/types@3.3.0':
+    resolution: {integrity: sha512-IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/url-parser@2.0.8':
-    resolution: {integrity: sha512-wQw7j004ScCrBRJ+oNPXlLE9mtofxyadSZ9D8ov/rHkyurS7z1HTNuyaGRj6OvKsEk0SVQsuY0C9+EfM75XTkw==}
+  '@smithy/url-parser@3.0.3':
+    resolution: {integrity: sha512-pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A==}
 
-  '@smithy/util-base64@2.0.0':
-    resolution: {integrity: sha512-Zb1E4xx+m5Lud8bbeYi5FkcMJMnn+1WUnJF3qD7rAdXpaL7UjkFQLdmW5fHadoKbdHpwH9vSR8EyTJFHJs++tA==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/util-base64@3.0.0':
+    resolution: {integrity: sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/util-body-length-browser@2.0.0':
-    resolution: {integrity: sha512-JdDuS4ircJt+FDnaQj88TzZY3+njZ6O+D3uakS32f2VNnDo3vyEuNdBOh/oFd8Df1zSZOuH1HEChk2AOYDezZg==}
+  '@smithy/util-body-length-browser@3.0.0':
+    resolution: {integrity: sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==}
 
-  '@smithy/util-body-length-node@2.1.0':
-    resolution: {integrity: sha512-/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/util-body-length-node@3.0.0':
+    resolution: {integrity: sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/util-buffer-from@2.0.0':
     resolution: {integrity: sha512-/YNnLoHsR+4W4Vf2wL5lGv0ksg8Bmk3GEGxn2vEQt52AQaPSCuaO5PM5VM7lP1K9qHRKHwrPGktqVoAHKWHxzw==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/util-config-provider@2.0.0':
-    resolution: {integrity: sha512-xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/util-buffer-from@3.0.0':
+    resolution: {integrity: sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/util-defaults-mode-browser@2.0.9':
-    resolution: {integrity: sha512-JONLJVQWT8165XoSV36ERn3SVlZLJJ4D6IeGsCSePv65Uxa93pzSLE0UMSR9Jwm4zix7rst9AS8W5QIypZWP8Q==}
+  '@smithy/util-config-provider@3.0.0':
+    resolution: {integrity: sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==}
+    engines: {node: '>=16.0.0'}
+
+  '@smithy/util-defaults-mode-browser@3.0.7':
+    resolution: {integrity: sha512-Q2txLyvQyGfmjsaDbVV7Sg8psefpFcrnlGapDzXGFRPFKRBeEg6OvFK8FljqjeHSaCZ6/UuzQExUPqBR/2qlDA==}
     engines: {node: '>= 10.0.0'}
 
-  '@smithy/util-defaults-mode-node@2.0.11':
-    resolution: {integrity: sha512-tmqjNsfj+bgZN6jXBe6efZnukzILA7BUytHkzqikuRLNtR+0VVchQHvawD0w6vManh76rO81ydhioe7i4oBzuA==}
+  '@smithy/util-defaults-mode-node@3.0.7':
+    resolution: {integrity: sha512-F4Qcj1fG6MGi2BSWCslfsMSwllws/WzYONBGtLybyY+halAcXdWhcew+mej8M5SKd5hqPYp4f7b+ABQEaeytgg==}
     engines: {node: '>= 10.0.0'}
 
-  '@smithy/util-hex-encoding@2.0.0':
-    resolution: {integrity: sha512-c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/util-endpoints@2.0.4':
+    resolution: {integrity: sha512-ZAtNf+vXAsgzgRutDDiklU09ZzZiiV/nATyqde4Um4priTmasDH+eLpp3tspL0hS2dEootyFMhu1Y6Y+tzpWBQ==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/util-middleware@2.0.1':
-    resolution: {integrity: sha512-LnsBMi0Mg3gfz/TpNGLv2Jjcz2ra1OX5HR/4IaCepIYmtPQzqMWDdhX/XTW1LS8OZ0xbQuyQPcHkQ+2XkhWOVQ==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/util-hex-encoding@3.0.0':
+    resolution: {integrity: sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/util-retry@2.0.1':
-    resolution: {integrity: sha512-naj4X0IafJ9yJnVJ58QgSMkCNLjyQOnyrnKh/T0f+0UOUxJiT8vuFn/hS7B/pNqbo2STY7PyJ4J4f+5YqxwNtA==}
-    engines: {node: '>= 14.0.0'}
+  '@smithy/util-middleware@3.0.3':
+    resolution: {integrity: sha512-l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/util-stream@2.0.11':
-    resolution: {integrity: sha512-2MeWfqSpZKdmEJ+tH8CJQSgzLWhH5cmdE24X7JB0hiamXrOmswWGGuPvyj/9sQCTclo57pNxLR2p7KrP8Ahiyg==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/util-retry@3.0.3':
+    resolution: {integrity: sha512-AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w==}
+    engines: {node: '>=16.0.0'}
 
-  '@smithy/util-uri-escape@2.0.0':
-    resolution: {integrity: sha512-ebkxsqinSdEooQduuk9CbKcI+wheijxEb3utGXkCoYQkJnwTnLbH1JXGimJtUkQwNQbsbuYwG2+aFVyZf5TLaw==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/util-stream@3.0.5':
+    resolution: {integrity: sha512-xC3L5PKMAT/Bh8fmHNXP9sdQ4+4aKVUU3EEJ2CF/lLk7R+wtMJM+v/1B4en7jO++Wa5spGzFDBCl0QxgbUc5Ug==}
+    engines: {node: '>=16.0.0'}
 
   '@smithy/util-uri-escape@2.2.0':
     resolution: {integrity: sha512-jtmJMyt1xMD/d8OtbVJ2gFZOSKc+ueYJZPW20ULW1GOp/q/YIM0wNh+u8ZFao9UaIGz4WoPW8hC64qlWLIfoDA==}
     engines: {node: '>=14.0.0'}
 
+  '@smithy/util-uri-escape@3.0.0':
+    resolution: {integrity: sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==}
+    engines: {node: '>=16.0.0'}
+
   '@smithy/util-utf8@2.0.0':
     resolution: {integrity: sha512-rctU1VkziY84n5OXe3bPNpKR001ZCME2JCaBBFgtiM2hfKbHFudc/BkMuPab8hRbLd0j3vbnBTTZ1igBf0wgiQ==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/util-waiter@2.0.8':
-    resolution: {integrity: sha512-t9yaoofNhdEhNlyDeV5al/JJEFJ62HIQBGktgCUE63MvKn6imnbkh1qISsYMyMYVLwhWCpZ3Xa3R1LA+SnWcng==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/util-utf8@3.0.0':
+    resolution: {integrity: sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==}
+    engines: {node: '>=16.0.0'}
+
+  '@smithy/util-waiter@3.1.2':
+    resolution: {integrity: sha512-4pP0EV3iTsexDx+8PPGAKCQpd/6hsQBaQhqWzU4hqKPHN5epPsxKbvUTIiYIHTxaKt6/kEaqPBpu/ufvfbrRzw==}
+    engines: {node: '>=16.0.0'}
 
   '@sqltools/formatter@1.2.5':
     resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
 
-  '@storybook/addon-actions@8.0.9':
-    resolution: {integrity: sha512-+I3VTvlKdj8puHeS2tyaOVv9syDiNLneVZbTfqN+UDOK2i42NwvZr8PVwjTzMlEj9eePJdCZgiipz55xwts5bw==}
+  '@storybook/addon-actions@8.1.11':
+    resolution: {integrity: sha512-jqYXgBgOVInStOCk//AA+dGkrfN8R7rDXA4lyu82zM59kvICtG9iqgmkSRDn0Z3zUkM+lIHZGoz0aLVQ8pxsgw==}
 
-  '@storybook/addon-backgrounds@8.0.9':
-    resolution: {integrity: sha512-pCDecACrVyxPaJKEWS0sHsRb8xw+IPCSxDM1TkjaAQ6zZ468A/dcUnqW+LVK8bSXgQwWzn23wqnqPFSy5yptuQ==}
+  '@storybook/addon-backgrounds@8.1.11':
+    resolution: {integrity: sha512-naGf1ovmsU2pSWb270yRO1IidnO+0YCZ5Tcb8I4rPhZ0vsdXNURYKS1LPSk1OZkvaUXdeB4Im9HhHfUBJOW9oQ==}
 
-  '@storybook/addon-controls@8.0.9':
-    resolution: {integrity: sha512-wWdmd62UP/sfPm8M7aJjEA+kEXTUIR/QsYi9PoYBhBZcXiikZ4kNan7oD7GfsnzGGKHrBVfwQhO+TqaENGYytA==}
+  '@storybook/addon-controls@8.1.11':
+    resolution: {integrity: sha512-q/Vt4meNVlFlBWIMCJhx6r+bqiiYocCta2RoUK5nyIZUiLzHncKHX6JnCU36EmJzRyah9zkwjfCb2G1r9cjnoQ==}
 
-  '@storybook/addon-docs@8.0.9':
-    resolution: {integrity: sha512-x7hX7UuzJtClu6XwU3SfpyFhuckVcgqgD6BU6Ihxl0zs+i4xp6iKVXYSnHFMRM1sgoeT8TjPxab35Ke8w8BVRw==}
+  '@storybook/addon-docs@8.1.11':
+    resolution: {integrity: sha512-69dv+CE4R5wFU7xnJmhuyEbLN2PEVDV3N/BbgJqeucIYPmm6zDV83Q66teCHKYtRln3BFUqPH5mxsjiHobxfJQ==}
 
-  '@storybook/addon-essentials@8.0.9':
-    resolution: {integrity: sha512-mwAgdfrOsTuTDcagvM7veBh+iayZIWmKOazzkhrIWbhYcrXOsweigD2UOVeHgAiAzJK49znr4FXTCKcE1hOWcw==}
+  '@storybook/addon-essentials@8.1.11':
+    resolution: {integrity: sha512-uRTpcIZQnflML8H+2onicUNIIssKfuviW8Lyrs/KFwSZ1rMcYzhwzCNbGlIbAv04tgHe5NqEyNhb+DVQcZQBzg==}
 
-  '@storybook/addon-highlight@8.0.9':
-    resolution: {integrity: sha512-vaRHGDbx7dpNpQECAHk5wczlZO3ntstprGlqnZt0o7ylz6xB5+pTQwTuIFty0hwKv+3TPcskzzifATUyEOEmyg==}
+  '@storybook/addon-highlight@8.1.11':
+    resolution: {integrity: sha512-Iu8FCAd4ETsB6QF4xDE/OLLZY3HOFopuLM5KE0f58jnccF5zAVGr1Rj/54p6TeK0PEou0tLRPFuZs+LPlEzrSw==}
 
-  '@storybook/addon-interactions@8.0.9':
-    resolution: {integrity: sha512-AMIdNcyM6DDAWvMitBJMqp1iPZND8AXB4QT4VZHGMKG2ngHNKktriEKpTfcRkfKPGTJs9T+71dWfm6/R4tticw==}
+  '@storybook/addon-interactions@8.1.11':
+    resolution: {integrity: sha512-nkc01z61mYM1kxf0ncBQLlFnnwW4RAVPfRSxK9BdbFN3AAvFiHCwVZdn71mi+C3L8oTqYR6o32e0RlXk+AjhHA==}
 
-  '@storybook/addon-links@8.0.9':
-    resolution: {integrity: sha512-FVt+AdW3JFSqbJzkKiqKsMRWqHXqEvCBqFs7lNfk3OW0w0jfv1iREtrxE0dVdJoUFQC9V/2Im/EpJ7UB3C2bNQ==}
+  '@storybook/addon-links@8.1.11':
+    resolution: {integrity: sha512-HlV2RQSrZyi+55W1B1a9eWNuJdNpWx0g3j7s2arNlNmbd6/kfWAp84axBstI1tL0nW4svut7bWlCsMSOIden+A==}
     peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
     peerDependenciesMeta:
       react:
         optional: true
 
-  '@storybook/addon-mdx-gfm@8.0.9':
-    resolution: {integrity: sha512-AoEx+OGKANtVZgKyWKrQhGpMpDuc2S7PnOlNLUiDYzmj8ABAGPmEJmqeb/VHVgqLQSjhOW1fMsQ4fYsecvMxTQ==}
+  '@storybook/addon-mdx-gfm@8.1.11':
+    resolution: {integrity: sha512-0/4Xaisvmoi26iK1ezTOB9dN2b0JbgWKzO2PO6att2Jh7lplLCf1QeoE8Y4SgCh0brage+mA8mKI8NrT7d18pg==}
 
-  '@storybook/addon-measure@8.0.9':
-    resolution: {integrity: sha512-91svOOGEXmGG4USglwXLE3wtlUVgtbKJVxTKX7xRI+AC5JEEaKByVzP17/X8Qn/8HilUL7AfSQ0kCoqtPSJ5cA==}
+  '@storybook/addon-measure@8.1.11':
+    resolution: {integrity: sha512-LkQD3SiLWaWt53aLB3EnmhD9Im8EOO+HKSUE+XGnIJRUcHHRqHfvDkN9KX7T1DCWbfRE5WzMHF5o23b3UiAANw==}
 
-  '@storybook/addon-outline@8.0.9':
-    resolution: {integrity: sha512-fQ+jm356TgUnz81IxsC99/aOesbLw3N5OQRJpo/A6kqbLMzlq3ybVzuXYCKC3f0ArgQRNh4NoMeJBMRFMtaWRw==}
+  '@storybook/addon-outline@8.1.11':
+    resolution: {integrity: sha512-vco3RLVjkcS25dNtj1lxmjq4fC0Nq08KNLMS5cbNPVJWNTuSUi/2EthSTQQCdpfMV/p6u+D5uF20A9Pl0xJFXw==}
 
-  '@storybook/addon-storysource@8.0.9':
-    resolution: {integrity: sha512-5m3K2Rs4fQtKtqwrq4CDS1jK2wzWOlnxhE2ArX5XTWytb1am65CEPxfYTEQkvZH9oPGwX3cXytPCziynqysFMQ==}
+  '@storybook/addon-storysource@8.1.11':
+    resolution: {integrity: sha512-b2K3+ZzfANDTTeN1jnqNgAQ5ZIhnhIAv89gC/36cOhSK5NLyKmyVKLGQmR3fVqX3URpnz9xccst2JNXopvtccw==}
 
-  '@storybook/addon-toolbars@8.0.9':
-    resolution: {integrity: sha512-nNSBnnBOhQ+EJwkrIkK4ZBYPcozNmEH770CZ/6NK85SUJ6WEBZapE6ru33jIUokFGEvlOlNCeai0GUc++cQP8w==}
+  '@storybook/addon-toolbars@8.1.11':
+    resolution: {integrity: sha512-reIKB0+JTiP+GNzynlDcRf4xmv9+j/DQ94qiXl2ZG5+ufKilH8DiRZpVA/i0x+4+TxdGdOJr1/pOf8tAmhNEoQ==}
 
-  '@storybook/addon-viewport@8.0.9':
-    resolution: {integrity: sha512-Ao4+D56cO7biaw+iTlMU1FBec1idX0cmdosDeCFZin06MSawcPkeBlRBeruaSQYdLes8TBMdZPFgfuqI5yIk6g==}
+  '@storybook/addon-viewport@8.1.11':
+    resolution: {integrity: sha512-qk4IcGnAgiAUQxt8l5PIQ293Za+w6wxlJQIpxr7+QM8OVkADPzXY0MmQfYWU9EQplrxAC2MSx3/C1gZeq+MDOQ==}
 
-  '@storybook/blocks@8.0.9':
-    resolution: {integrity: sha512-F2zSrfSwzTFN7qW3zB80tG+EXtmfmCDC6Ird0F7tolszb6tOqJcAcBOwQbE2O0wI63sLu21qxzXgaKBMkiWvJg==}
+  '@storybook/blocks@8.1.11':
+    resolution: {integrity: sha512-eMed7PpL/hAVM6tBS7h70bEAyzbiSU9I/kye4jZ7DkCbAsrX6OKmC7pcHSDn712WTcf3vVqxy5jOKUmOXpc0eg==}
     peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
     peerDependenciesMeta:
       react:
         optional: true
       react-dom:
         optional: true
 
-  '@storybook/builder-manager@8.0.9':
-    resolution: {integrity: sha512-/PxDwZIfMc/PSRZcasb6SIdGr3azIlenzx7dBF7Imt8i4jLHiAf1t00GvghlfJsvsrn4DNp95rbRbXTDyTj7tQ==}
+  '@storybook/builder-manager@8.1.11':
+    resolution: {integrity: sha512-U7bmed4Ayg+OlJ8HPmLeGxLTHzDY7rxmxM4aAs4YL01fufYfBcjkIP9kFhJm+GJOvGm+YJEUAPe5mbM1P/bn0Q==}
 
-  '@storybook/builder-vite@8.0.9':
-    resolution: {integrity: sha512-7hEQFZIIz7VvxdySDpPE96iMvZxQvRZcRdhaNGeE+8Y2pyc3DgYE4WY3sjr+LUoB0a6TYLpAIKqbXwtLz0R+PQ==}
+  '@storybook/builder-vite@8.1.11':
+    resolution: {integrity: sha512-hG4eoNMCPgjZ2Ai+zSmk69zjsyEihe75XbJXtYfGRqjMWtz2+SAUFO54fLc2BD5svcUiTeN+ukWcTrwApyPsKg==}
     peerDependencies:
       '@preact/preset-vite': '*'
       typescript: '>= 4.3.x'
@@ -3974,48 +4377,53 @@ packages:
       vite-plugin-glimmerx:
         optional: true
 
-  '@storybook/channels@8.0.9':
-    resolution: {integrity: sha512-7Lcfyy5CsLWWGhMPO9WG4jZ/Alzp0AjepFhEreYHRPtQrfttp6qMAjE/g1aHgun0qHCYWxwqIG4NLR/hqDNrXQ==}
+  '@storybook/channels@8.1.11':
+    resolution: {integrity: sha512-fu5FTqo6duOqtJFa6gFzKbiSLJoia+8Tibn3xFfB6BeifWrH81hc+AZq0lTmHo5qax2G5t8ZN8JooHjMw6k2RA==}
 
-  '@storybook/cli@8.0.9':
-    resolution: {integrity: sha512-lilYTKn8F5YOePijqfRYFa5v2mHVIJxPCIgTn+OXAmAFbcizZ6P8P6niU4J/NXulgx68Ln1M7hYhFtTP25hVTw==}
+  '@storybook/cli@8.1.11':
+    resolution: {integrity: sha512-4U48w9C7mVEKrykcPcfHwJkRyCqJ28XipbElACbjIIkQEqaHaOVtP3GeKIrgkoOXe/HK3O4zKWRP2SqlVS0r4A==}
     hasBin: true
 
-  '@storybook/client-logger@8.0.9':
-    resolution: {integrity: sha512-LzV/RHkbf07sRc1Jc0ff36RlapKf9Ul7/+9VMvVbI3hshH1CpmrZK4t/tsIdpX/EVOdJ1Gg5cES06PnleOAIPA==}
+  '@storybook/client-logger@8.1.11':
+    resolution: {integrity: sha512-DVMh2usz3yYmlqCLCiCKy5fT8/UR9aTh+gSqwyNFkGZrIM4otC5A8eMXajXifzotQLT5SaOEnM3WzHwmpvMIEA==}
 
-  '@storybook/codemod@8.0.9':
-    resolution: {integrity: sha512-VBeGpSZSQpL6iyLLqceJSNGhdCqcNwv+xC/aWdDFOkmuE1YfbmNNwpa9QYv4ZFJ2QjUsm4iTWG60qK+9NXeSKA==}
+  '@storybook/codemod@8.1.11':
+    resolution: {integrity: sha512-/LCozjH1IQ1TOs9UQV59BE0X6UZ9q+C0NEUz7qmJZPrwAii3FkW4l7D/fwxblpMExaoxv0oE8NQfUz49U/5Ymg==}
 
-  '@storybook/components@8.0.9':
-    resolution: {integrity: sha512-JcwBGADzIJs0PSzqykrrD2KHzNG9wtexUOKuidt+FSv9szpUhe3qBAXIHpdfBRl7mOJ9TRZ5rt+mukEnfncdzA==}
+  '@storybook/components@8.1.11':
+    resolution: {integrity: sha512-iXKsNu7VmrLBtjMfPj7S4yJ6T13GU6joKcVcrcw8wfrQJGlPFp4YaURPBUEDxvCt1XWi5JkaqJBvb48kIrROEQ==}
     peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
 
-  '@storybook/core-common@8.0.9':
-    resolution: {integrity: sha512-Jmue+sfHFb4GTYBzyWYw1MygoJiQSfISIrKmNIzAmZ+oR9EOr+jpu/i/bH+uetZ2Hqg1AGhj1VB7OtJp9HQyWw==}
+  '@storybook/core-common@8.1.11':
+    resolution: {integrity: sha512-Ix0nplD4I4DrV2t9B+62jaw1baKES9UbR/Jz9LVKFF9nsua3ON0aVe73dOjMxFWBngpzBYWe+zYBTZ7aQtDH4Q==}
+    peerDependencies:
+      prettier: ^2 || ^3
+    peerDependenciesMeta:
+      prettier:
+        optional: true
 
-  '@storybook/core-events@8.0.9':
-    resolution: {integrity: sha512-DxSUx7wG9Qe3OFUBnv3OrYq48J8UWNo2DUR5/JecJCtp3n++L4fAEW3J0IF5FfxpQDMQSp1yTNjZ2PaWCMd2ag==}
+  '@storybook/core-events@8.1.11':
+    resolution: {integrity: sha512-vXaNe2KEW9BGlLrg0lzmf5cJ0xt+suPjWmEODH5JqBbrdZ67X6ApA2nb6WcxDQhykesWCuFN5gp1l+JuDOBi7A==}
 
-  '@storybook/core-server@8.0.9':
-    resolution: {integrity: sha512-BIe1T5YUBl0GYxEjRoTQsvXD2pyuzL8rPTUD41zlzSQM0R8U6Iant9SzRms4u0+rKUm2mGxxKuODlUo5ewqaGA==}
+  '@storybook/core-server@8.1.11':
+    resolution: {integrity: sha512-L6dzQTmR0np/kagNONvvlm6lSvF1FNc9js3vxsEEPnEypLbhx8bDZaHmuhmBpYUzKyUMpRVQTE/WgjHLuBBuxA==}
 
-  '@storybook/csf-plugin@8.0.9':
-    resolution: {integrity: sha512-pXaNCNi++kxKsqSWwvx215fPx8cNqvepLVxQ7B69qXLHj80DHn0Q3DFBO3sLXNiQMJ2JK4OYcTxMfuOiyzszKw==}
+  '@storybook/csf-plugin@8.1.11':
+    resolution: {integrity: sha512-hkA8gjFtSN/tabG0cuvmEqanMXtxPr3qTkp4UNSt1R6jBEgFHRG2y/KYLl367kDwOSFTT987ZgRfJJruU66Fvw==}
 
-  '@storybook/csf-tools@8.0.9':
-    resolution: {integrity: sha512-PiNMhL97giLytTdQwuhsZ92buVk4gy9H/8DtrDhUc45/1OmF95gogm6T2Yap729SIFwgpOcuq/U3aVo6d6swVQ==}
+  '@storybook/csf-tools@8.1.11':
+    resolution: {integrity: sha512-6qMWAg/dBwCVIHzANM9lSHoirwqSS+wWmv+NwAs0t9S94M75IttHYxD3IyzwaSYCC5llp0EQFvtXXAuSfFbibg==}
 
-  '@storybook/csf@0.1.6':
-    resolution: {integrity: sha512-JjWnBptVhBYJ14yq+cHs66BXjykRUWQ5TlD1RhPxMOtavynYyV/Q+QR98/N+XB+mcPtFMm5I2DvNkpj0/Dk8Mw==}
+  '@storybook/csf@0.1.9':
+    resolution: {integrity: sha512-JlZ6v/iFn+iKohKGpYXnMeNeTiiAMeFoDhYnPLIC8GnyyIWqEI9wJYrOK9i9rxlJ8NZAH/ojGC/u/xVC41qSgQ==}
 
-  '@storybook/docs-mdx@3.0.0':
-    resolution: {integrity: sha512-NmiGXl2HU33zpwTv1XORe9XG9H+dRUC1Jl11u92L4xr062pZtrShLmD4VKIsOQujxhhOrbxpwhNOt+6TdhyIdQ==}
+  '@storybook/docs-mdx@3.1.0-next.0':
+    resolution: {integrity: sha512-t4syFIeSyufieNovZbLruPt2DmRKpbwL4fERCZ1MifWDRIORCKLc4NCEHy+IqvIqd71/SJV2k4B51nF7vlJfmQ==}
 
-  '@storybook/docs-tools@8.0.9':
-    resolution: {integrity: sha512-OzogAeOmeHea/MxSPKRBWtOQVNSpoq+OOpimO9YRA5h5GBRJ2TUOGT44Gny6QT4ll5AvQA8fIiq9KezKcLekAg==}
+  '@storybook/docs-tools@8.1.11':
+    resolution: {integrity: sha512-mEXtR9rS7Y+OdKtT/QG6JBGYR1L41mcDhIqhnk7RmYl9qJstVAegrCKWR53sPKFdTVOHU7dmu6k+BD+TqHpyyw==}
 
   '@storybook/global@5.0.0':
     resolution: {integrity: sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==}
@@ -4027,83 +4435,83 @@ packages:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
 
-  '@storybook/instrumenter@8.0.9':
-    resolution: {integrity: sha512-Gw74dgpTU/2p7FG0s7DuVdqCbJ2MEcSuRJjDo7HcXRYcvWp7I6Ly+C0v7N5VaoS+kbBVerAhLKIHZgG/LZf1og==}
+  '@storybook/instrumenter@8.1.11':
+    resolution: {integrity: sha512-r/U9hcqnodNMHuzRt1g56mWrVsDazR85Djz64M3KOwBhrTj5d46DF4/EE80w/5zR5JOrT7p8WmjJRowiVteOCQ==}
 
-  '@storybook/manager-api@8.0.9':
-    resolution: {integrity: sha512-99b3yKArDSvfabXL7QE3nA95e4DdW/5H/ZCcr6/E2qCQJayZ6G1v/WWamKXbiaTpkndulFmcb/+ZmnDXcweIIQ==}
+  '@storybook/manager-api@8.1.11':
+    resolution: {integrity: sha512-QSgwKfAw01K9YvvZj30iGBMgQ4YaCT3vojmttuqdH5ukyXkiO7pENLJj4Y+alwUeSi0g+SJeadCI3PXySBHOGg==}
 
-  '@storybook/manager@8.0.9':
-    resolution: {integrity: sha512-+NnRo+5JQFGNqveKrLtC0b+Z08Tae4m44iq292bPeZMpr9OkFsIkU0PBPsHTHPkrqC/zZXRNsCsTEgvu3p2OIA==}
+  '@storybook/manager@8.1.11':
+    resolution: {integrity: sha512-e02y9dmxowo7cTKYm9am7UO6NOHoHy6Xi7xZf/UA932qLwFZUtk5pnwIEFaZWI3OQsRUCGhP+FL5zizU7uVZeg==}
 
-  '@storybook/node-logger@8.0.9':
-    resolution: {integrity: sha512-5ajMdZFrYrjGLJOVDq7dlEQNFsgeLHymt4dCK9MulL/ciXykmXUZXE3Bye0wFy+I2qqDVvrvR8uzCvSFvm5MAQ==}
+  '@storybook/node-logger@8.1.11':
+    resolution: {integrity: sha512-wdzFo7B2naGhS52L3n1qBkt5BfvQjs8uax6B741yKRpiGgeAN8nz8+qelkD25MbSukxvbPgDot7WJvsMU/iCzg==}
 
-  '@storybook/preview-api@8.0.9':
-    resolution: {integrity: sha512-zHfX34bkAMzzmE7vbDzaqFwSW6ExiBD0HiO1L/IsHF55f0f7xV7IH8uJyFRrDTvAoW3ReSxZDMvvPpeydFPKGA==}
+  '@storybook/preview-api@8.1.11':
+    resolution: {integrity: sha512-8ZChmFV56GKppCJ0hnBd/kNTfGn2gWVq1242kuet13pbJtBpvOhyq4W01e/Yo14tAPXvgz8dSnMvWLbJx4QfhQ==}
 
-  '@storybook/preview@8.0.9':
-    resolution: {integrity: sha512-tFsR8xc8AYBZZrZw8enklFbSQt7ZAV+rv20BoxwDhd3q7fjXyK7O4moGPqUwBZ7rukTG13nPoISxr+VXAk/HYA==}
+  '@storybook/preview@8.1.11':
+    resolution: {integrity: sha512-K/9NZmjnL0D1BROkTNWNoPqgL2UaocALRSqCARmkBLgU2Rn/FuZgEclHkWlYo6pUrmLNK+bZ+XzpNMu12iTbpg==}
 
-  '@storybook/react-dom-shim@8.0.9':
-    resolution: {integrity: sha512-8011KlRuG3obr5pZZ7bcEyYYNWF3tR596YadoMd267NPoHKvwAbKL1L/DNgb6kiYjZDUf9QfaKSCWW31k0kcRQ==}
+  '@storybook/react-dom-shim@8.1.11':
+    resolution: {integrity: sha512-KVDSuipqkFjpGfldoRM5xR/N1/RNmbr+sVXqMmelr0zV2jGnexEZnoa7wRHk7IuXuivLWe8BxMxzvQWqjIa4GA==}
     peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
 
-  '@storybook/react-vite@8.0.9':
-    resolution: {integrity: sha512-FT5KeulUH6grfzOJOxJCxpv9+81UVDrT9UPcgiFhQT9rKtsgmltezThwbHknByZNw3WWnf+ieidMLEis9hd73A==}
+  '@storybook/react-vite@8.1.11':
+    resolution: {integrity: sha512-QqkE6QKsIDthXtps9+YSBQ39O4VvU7Uu3y6WSA3IPgKTtGnmIvhwXtapjf7WQ2cNb5KY1JksFxHXbDe0i5IL4g==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
       vite: ^4.0.0 || ^5.0.0
 
-  '@storybook/react@8.0.9':
-    resolution: {integrity: sha512-NeQ6suZG3HKikwe3Tx9cAIaRx7uP8FKCmlVvIiBg4LTTI5orCt94PPakvuZukZcbkqvcCnEBkebAzwUpn8PiJw==}
+  '@storybook/react@8.1.11':
+    resolution: {integrity: sha512-t+EYXOkgwg3ropLGS9y8gGvX5/Okffu/6JYL3YWksrBGAZSqVV4NkxCnVJZepS717SyhR0tN741gv/SxxFPJMg==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
       typescript: '>= 4.2.x'
     peerDependenciesMeta:
       typescript:
         optional: true
 
-  '@storybook/router@8.0.9':
-    resolution: {integrity: sha512-aAOWxbM9J4mt+cp4o88T2PB29mgBBTOzU37/pUsTHYnKnR9XI4npXEXdN8Gv+ryqM0kj0AbBpz/llFlnR2MNNA==}
+  '@storybook/router@8.1.11':
+    resolution: {integrity: sha512-nU5lsBvy0L8wBYOkjagh29ztZicDATpZNYrHuavlhQ2jznmmHdJvXKYk+VrMAbthjQ6ZBqfeeMNPR1UlnqR5Rw==}
 
-  '@storybook/source-loader@8.0.9':
-    resolution: {integrity: sha512-FDnpxIGE5nIYT15pvYe6rz95TSBrdLcDll7lOHNyZisWt19MI3wZU3YkVsFNRBuFrebo+FjVU3wHyoV81ur1Qw==}
+  '@storybook/source-loader@8.1.11':
+    resolution: {integrity: sha512-4cfJ7aPjtniIdDGiFjdFpO47byHOl4RKYCJEHf9t+j0xHmlXe4B9aAinxuFfv3GKAXfLvSbbwGO0cDZQRj+brw==}
 
-  '@storybook/telemetry@8.0.9':
-    resolution: {integrity: sha512-AGGfcup06t+wxhBIkHd0iybieOh9PDVZQJ9oPct5JGB39+ni9wvs0WOD+MYlHbsjp8id7+aGkh6mYuYOvfck+Q==}
+  '@storybook/telemetry@8.1.11':
+    resolution: {integrity: sha512-Jqvm7HcZismKzPuebhyLECO6KjGiSk4ycbca1WUM/TUvifxCXqgoUPlHHQEEfaRdHS63/MSqtMNjLsQRLC/vNQ==}
 
-  '@storybook/test@8.0.9':
-    resolution: {integrity: sha512-bRd5tBJnPzR6UKbDXONWnFWtdkNOY99HMLDUWe5fTRo50GwkrpFBVqPflhdkruEeof0kAbBUbnoN2CIYgtnAFw==}
+  '@storybook/test@8.1.11':
+    resolution: {integrity: sha512-k+V3HemF2/I8fkRxRqM8uH8ULrpBSAAdBOtWSHWLvHguVcb2YA4g4kKo6tXBB9256QfyDW4ZiaAj0/9TMxmJPQ==}
 
-  '@storybook/theming@8.0.9':
-    resolution: {integrity: sha512-jgfDuYoiNMMirQiASN3Eg0hGDXsEtpdAcMxyShqYGwu9elxgD9yUnYC2nSckYsM74a3ZQ3JaViZ9ZFSe2FHmeQ==}
+  '@storybook/theming@8.1.11':
+    resolution: {integrity: sha512-Chn/opjO6Rl1isNobutYqAH2PjKNkj09YBw/8noomk6gElSa3JbUTyaG/+JCHA6OG/9kUsqoKDb5cZmAKNq/jA==}
     peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
     peerDependenciesMeta:
       react:
         optional: true
       react-dom:
         optional: true
 
-  '@storybook/types@8.0.9':
-    resolution: {integrity: sha512-ew0EXzk9k4B557P1qIWYrnvUcgaE0WWA5qQS0AU8l+fRTp5nvl9O3SP/zNIB0SN1qDFO7dXr3idTNTyIikTcEQ==}
+  '@storybook/types@8.1.11':
+    resolution: {integrity: sha512-k9N5iRuY2+t7lVRL6xeu6diNsxO3YI3lS4Juv3RZ2K4QsE/b3yG5ElfJB8DjHDSHwRH4ORyrU71KkOCUVfvtnw==}
 
-  '@storybook/vue3-vite@8.0.9':
-    resolution: {integrity: sha512-IkzYsEyCo5HIvLWbJeGrBu/VIN4u+LvdIAz7vcFqVVXBtTUhy+9/8caLx8fdnM0FWgKcBRQs8HnjBB2V0lOFcg==}
+  '@storybook/vue3-vite@8.1.11':
+    resolution: {integrity: sha512-q0bqh8XEEunaTmp4YiDqM2+YZLwEIevTb5PnNe7G7f2qOiSCE1ncBDnBK717UlCd+iYr34NTztgV2/jIhz1i5w==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
       vite: ^4.0.0 || ^5.0.0
 
-  '@storybook/vue3@8.0.9':
-    resolution: {integrity: sha512-EqVdS62YbOCAE0wJrQKW0sHpM90be8N8Mvmj+HzB0QYhJNtFqP9ehwbcTfwEKtaVGudisHgGBOzNoSKDlxFaag==}
+  '@storybook/vue3@8.1.11':
+    resolution: {integrity: sha512-xJtvfLiCOY3UqwDMd0hZdsadPm1q8dwjfM1UN2Q2ssRWNfXzww1oi+Msj902wz9zFZMYVZypfTfgrdRgWmfEjA==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
       vue: ^3.0.0
@@ -4131,8 +4539,8 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@swc/core-darwin-arm64@1.4.17':
-    resolution: {integrity: sha512-HVl+W4LezoqHBAYg2JCqR+s9ife9yPfgWSj37iIawLWzOmuuJ7jVdIB7Ee2B75bEisSEKyxRlTl6Y1Oq3owBgw==}
+  '@swc/core-darwin-arm64@1.6.6':
+    resolution: {integrity: sha512-5DA8NUGECcbcK1YLKJwNDKqdtTYDVnkfDU1WvQSXq/rU+bjYCLtn5gCe8/yzL7ISXA6rwqPU1RDejhbNt4ARLQ==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [darwin]
@@ -4143,8 +4551,8 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@swc/core-darwin-x64@1.4.17':
-    resolution: {integrity: sha512-WYRO9Fdzq4S/he8zjW5I95G1zcvyd9yyD3Tgi4/ic84P5XDlSMpBDpBLbr/dCPjmSg7aUXxNQqKqGkl6dQxYlA==}
+  '@swc/core-darwin-x64@1.6.6':
+    resolution: {integrity: sha512-2nbh/RHpweNRsJiYDFk1KcX7UtaKgzzTNUjwtvK5cp0wWrpbXmPvdlWOx3yzwoiSASDFx78242JHHXCIOlEdsw==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [darwin]
@@ -4161,8 +4569,8 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@swc/core-linux-arm-gnueabihf@1.4.17':
-    resolution: {integrity: sha512-cgbvpWOvtMH0XFjvwppUCR+Y+nf6QPaGu6AQ5hqCP+5Lv2zO5PG0RfasC4zBIjF53xgwEaaWmGP5/361P30X8Q==}
+  '@swc/core-linux-arm-gnueabihf@1.6.6':
+    resolution: {integrity: sha512-YgytuyUfR7b0z0SRHKV+ylr83HmgnROgeT7xryEkth6JGpAEHooCspQ4RrWTU8+WKJ7aXiZlGXPgybQ4TiS+TA==}
     engines: {node: '>=10'}
     cpu: [arm]
     os: [linux]
@@ -4173,8 +4581,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@swc/core-linux-arm64-gnu@1.4.17':
-    resolution: {integrity: sha512-l7zHgaIY24cF9dyQ/FOWbmZDsEj2a9gRFbmgx2u19e3FzOPuOnaopFj0fRYXXKCmtdx+anD750iBIYnTR+pq/Q==}
+  '@swc/core-linux-arm64-gnu@1.6.6':
+    resolution: {integrity: sha512-yGwx9fddzEE0iURqRVwKBQ4IwRHE6hNhl15WliHpi/PcYhzmYkUIpcbRXjr0dssubXAVPVnx6+jZVDSbutvnfg==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
@@ -4185,8 +4593,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@swc/core-linux-arm64-musl@1.4.17':
-    resolution: {integrity: sha512-qhH4gr9gAlVk8MBtzXbzTP3BJyqbAfUOATGkyUtohh85fPXQYuzVlbExix3FZXTwFHNidGHY8C+ocscI7uDaYw==}
+  '@swc/core-linux-arm64-musl@1.6.6':
+    resolution: {integrity: sha512-a6fMbqzSAsS5KCxFJyg1mD5kwN3ZFO8qQLyJ75R/htZP/eCt05jrhmOI7h2n+1HjiG332jLnZ9S8lkVE5O8Nqw==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
@@ -4197,8 +4605,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@swc/core-linux-x64-gnu@1.4.17':
-    resolution: {integrity: sha512-vRDFATL1oN5oZMImkwbgSHEkp8xG1ofEASBypze01W1Tqto8t+yo6gsp69wzCZBlxldsvPpvFZW55Jq0Rn+UnA==}
+  '@swc/core-linux-x64-gnu@1.6.6':
+    resolution: {integrity: sha512-hRGsUKNzzZle28YF0dYIpN0bt9PceR9LaVBq7x8+l9TAaDLFbgksSxcnU/ubTtsy+WsYSYGn+A83w3xWC0O8CQ==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
@@ -4209,8 +4617,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@swc/core-linux-x64-musl@1.4.17':
-    resolution: {integrity: sha512-zQNPXAXn3nmPqv54JVEN8k2JMEcMTQ6veVuU0p5O+A7KscJq+AGle/7ZQXzpXSfUCXlLMX4wvd+rwfGhh3J4cw==}
+  '@swc/core-linux-x64-musl@1.6.6':
+    resolution: {integrity: sha512-NokIUtFxJDVv3LzGeEtYMTV3j2dnGKLac59luTeq36DQLZdJQawQIdTbzzWl2jE7lxxTZme+dhsVOH9LxE3ceg==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
@@ -4221,8 +4629,8 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@swc/core-win32-arm64-msvc@1.4.17':
-    resolution: {integrity: sha512-z86n7EhOwyzxwm+DLE5NoLkxCTme2lq7QZlDjbQyfCxOt6isWz8rkW5QowTX8w9Rdmk34ncrjSLvnHOeLY17+w==}
+  '@swc/core-win32-arm64-msvc@1.6.6':
+    resolution: {integrity: sha512-lzYdI4qb4k1dFG26yv+9Jaq/bUMAhgs/2JsrLncGjLof86+uj74wKYCQnbzKAsq2hDtS5DqnHnl+//J+miZfGA==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [win32]
@@ -4233,8 +4641,8 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@swc/core-win32-ia32-msvc@1.4.17':
-    resolution: {integrity: sha512-JBwuSTJIgiJJX6wtr4wmXbfvOswHFj223AumUrK544QV69k60FJ9q2adPW9Csk+a8wm1hLxq4HKa2K334UHJ/g==}
+  '@swc/core-win32-ia32-msvc@1.6.6':
+    resolution: {integrity: sha512-bvl7FMaXIJQ76WZU0ER4+RyfKIMGb6S2MgRkBhJOOp0i7VFx4WLOnrmMzaeoPJaJSkityVKAftfNh7NBzTIydQ==}
     engines: {node: '>=10'}
     cpu: [ia32]
     os: [win32]
@@ -4245,17 +4653,17 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@swc/core-win32-x64-msvc@1.4.17':
-    resolution: {integrity: sha512-jFkOnGQamtVDBm3MF5Kq1lgW8vx4Rm1UvJWRUfg+0gx7Uc3Jp3QMFeMNw/rDNQYRDYPG3yunCC+2463ycd5+dg==}
+  '@swc/core-win32-x64-msvc@1.6.6':
+    resolution: {integrity: sha512-WAP0JoCTfgeYKgOeYJoJV4ZS0sQUmU3OwvXa2dYYtMLF7zsNqOiW4niU7QlThBHgUv/qNZm2p6ITEgh3w1cltw==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [win32]
 
-  '@swc/core@1.4.17':
-    resolution: {integrity: sha512-tq+mdWvodMBNBBZbwFIMTVGYHe9N7zvEaycVVjfvAx20k1XozHbHhRv+9pEVFJjwRxLdXmtvFZd3QZHRAOpoNQ==}
+  '@swc/core@1.6.6':
+    resolution: {integrity: sha512-sHfmIUPUXNrQTwFMVCY5V5Ena2GTOeaWjS2GFUpjLhAgVfP90OP67DWow7+cYrfFtqBdILHuWnjkTcd0+uPKlg==}
     engines: {node: '>=10'}
     peerDependencies:
-      '@swc/helpers': ^0.5.0
+      '@swc/helpers': '*'
     peerDependenciesMeta:
       '@swc/helpers':
         optional: true
@@ -4269,8 +4677,8 @@ packages:
     peerDependencies:
       '@swc/core': '*'
 
-  '@swc/types@0.1.5':
-    resolution: {integrity: sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw==}
+  '@swc/types@0.1.9':
+    resolution: {integrity: sha512-qKnCno++jzcJ4lM4NTfYifm1EFSCeIfKiAHAfkENZAV5Kl9PjJIyd2yeeVv6c/2CckuLyv2NmRC5pv6pm2WQBg==}
 
   '@swc/wasm@1.2.130':
     resolution: {integrity: sha512-rNcJsBxS70+pv8YUWwf5fRlWX6JoY/HJc25HD/F8m6Kv7XhJdqPPMhyX6TKkUBPAG7TWlZYoxa+rHAjPy4Cj3Q==}
@@ -4332,16 +4740,16 @@ packages:
     resolution: {integrity: sha512-EmCsnzdvawyk4b+4JKaLLuicHcJQRZtL1zSy9AWJLiiHTbDDseYgLxfaCEfLk8v2bUe7SBXwl3n3B7OjgvH11Q==}
     hasBin: true
 
-  '@testing-library/dom@9.3.3':
-    resolution: {integrity: sha512-fB0R+fa3AUqbLHWyxXa2kGVtf1Fe1ZZFr0Zp6AIbIAzXb2mKbEXl+PCQNUOaq5lbTab5tfctfXRNsWXxa2f7Aw==}
-    engines: {node: '>=14'}
+  '@testing-library/dom@10.1.0':
+    resolution: {integrity: sha512-wdsYKy5zupPyLCW2Je5DLHSxSfbIp6h80WoHOQc+RPtmPGA52O9x5MJEkv92Sjonpq+poOAtUKhh1kBGAXBrNA==}
+    engines: {node: '>=18'}
 
   '@testing-library/dom@9.3.4':
     resolution: {integrity: sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==}
     engines: {node: '>=14'}
 
-  '@testing-library/jest-dom@6.4.2':
-    resolution: {integrity: sha512-CzqH0AFymEMG48CpzXFriYYkOjk6ZGPCLMhW9e9jg3KMCn5OfJecF8GtGW7yGfR/IgCe3SX8BSwjdzI6BBbZLw==}
+  '@testing-library/jest-dom@6.4.5':
+    resolution: {integrity: sha512-AguB9yvTXmCnySBP1lWjfNNUwpbElsaQ567lt2VdGqAdHtpieLgjmcVyv1q7PMIvLbgpDdkWV5Ydv3FEejyp2A==}
     engines: {node: '>=14', npm: '>=6', yarn: '>=1'}
     peerDependencies:
       '@jest/globals': '>= 28'
@@ -4367,8 +4775,8 @@ packages:
     peerDependencies:
       '@testing-library/dom': '>=7.21.4'
 
-  '@testing-library/vue@8.0.3':
-    resolution: {integrity: sha512-wSsbNlZ69ZFQgVlHMtc/ZC/g9BHO7MhyDrd4nHyfEubtMr3kToN/w4/BsSBknGIF8w9UmPbsgbIuq/CbdBHzCA==}
+  '@testing-library/vue@8.1.0':
+    resolution: {integrity: sha512-ls4RiHO1ta4mxqqajWRh8158uFObVrrtAPoxk7cIp4HrnQUj/ScKzqz53HxYpG3X6Zb7H2v+0eTGLSoy8HQ2nA==}
     engines: {node: '>=14'}
     peerDependencies:
       '@vue/compiler-sfc': '>= 3'
@@ -4384,8 +4792,8 @@ packages:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
 
-  '@tsd/typescript@5.3.3':
-    resolution: {integrity: sha512-CQlfzol0ldaU+ftWuG52vH29uRoKboLinLy84wS8TQOu+m+tWoaUfk4svL4ij2V8M5284KymJBlHUusKj6k34w==}
+  '@tsd/typescript@5.4.5':
+    resolution: {integrity: sha512-saiCxzHRhUrRxQV2JhH580aQUZiKQUXI38FcAcikcfOomAil4G4lxT0RfrrKywoAYP/rqAdYXYmNRLppcd+hQQ==}
     engines: {node: '>=14.17'}
 
   '@twemoji/parser@15.0.0':
@@ -4430,12 +4838,6 @@ packages:
   '@types/cacheable-request@6.0.3':
     resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==}
 
-  '@types/chai-subset@1.3.5':
-    resolution: {integrity: sha512-c2mPnw+xHtXDoHmdtcCXGwyLMiauiAyxWMzhGpqHC4nqI/Y5G2XhTampslK2rb59kpcuHon03UH8W6iYUzw88A==}
-
-  '@types/chai@4.3.11':
-    resolution: {integrity: sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==}
-
   '@types/color-convert@2.0.3':
     resolution: {integrity: sha512-2Q6wzrNiuEvYxVQqhh7sXM2mhIhvZR/Paq4FdsQkOMgWsCIkKvSGj8Le1/XalulrmgOzPMqNa0ix+ePY4hTrfg==}
 
@@ -4466,6 +4868,9 @@ packages:
   '@types/detect-port@1.3.2':
     resolution: {integrity: sha512-xxgAGA2SAU4111QefXPSp5eGbDm/hW6zhvYl9IeEPZEry9F4d66QAHm5qpUXjb6IsevZV/7emAEx5MhP6O192g==}
 
+  '@types/diff@5.2.1':
+    resolution: {integrity: sha512-uxpcuwWJGhe2AR1g8hD9F5OYGCqjqWnBUQFD8gMZsDbv8oPHzxJF6iMO6n8Tk0AdzlxoaaoQhOYlIg/PukVU8g==}
+
   '@types/disposable-email-domains@1.0.2':
     resolution: {integrity: sha512-SDKwyYTjk3y5aZBxxc38yRecpJPjsqn57STz1bNxYYlv4k11bBe7QB8w4llXDTmQXKT1mFvgGmJv+8Zdu3YmJw==}
 
@@ -4529,8 +4934,8 @@ packages:
   '@types/http-errors@2.0.4':
     resolution: {integrity: sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==}
 
-  '@types/http-link-header@1.0.5':
-    resolution: {integrity: sha512-AxhIKR8UbyoqCTNp9rRepkktHuUOw3DjfOfDCaO9kwI8AYzjhxyrvZq4+mRw/2daD3hYDknrtSeV6SsPwmc71w==}
+  '@types/http-link-header@1.0.7':
+    resolution: {integrity: sha512-snm5oLckop0K3cTDAiBnZDy6ncx9DJ3mCRDvs42C884MbVYPP74Tiq2hFsSDRTyjK6RyDYDIulPiW23ge+g5Lw==}
 
   '@types/istanbul-lib-coverage@2.0.4':
     resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==}
@@ -4547,8 +4952,8 @@ packages:
   '@types/js-yaml@4.0.9':
     resolution: {integrity: sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==}
 
-  '@types/jsdom@21.1.6':
-    resolution: {integrity: sha512-/7kkMsC+/kMs7gAYmmBR9P0vGTnOoLhQhyhQJSlXGI5bzTHp6xdo0TtKWQAsz6pmSAeVqKSbqeyP6hytqr9FDw==}
+  '@types/jsdom@21.1.7':
+    resolution: {integrity: sha512-yOriVnggzrnQ3a9OKOCxaVuSug3w3/SbOj5i7VwXWZEyUNl3bLF9V3MfxGbZKuwqJOQyRfqXyROBB1CoZLFWzA==}
 
   '@types/json-schema@7.0.12':
     resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==}
@@ -4559,8 +4964,8 @@ packages:
   '@types/json5@0.0.29':
     resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
 
-  '@types/jsonld@1.5.13':
-    resolution: {integrity: sha512-n7fUU6W4kSYK8VQlf/LsE9kddBHPKhODoVOjsZswmve+2qLwBy6naWxs/EiuSZN9NU0N06Ra01FR+j87C62T0A==}
+  '@types/jsonld@1.5.14':
+    resolution: {integrity: sha512-z4IRf5oRgjPTkazDDv94sjzI5iK3DrDEW7Y5Gk4VO4+ANymgtHtNaXWi93+BmiAoG3PB9QTv5DgSpKWGYVvysA==}
 
   '@types/jsrsasign@10.5.14':
     resolution: {integrity: sha512-lppSlfK6etu+cuKs40K4rg8As79PH6hzIB+v55zSqImbSH3SE6Fm8MBHCiI91cWlAP3Z4igtJK1VL3fSN09blQ==}
@@ -4595,8 +5000,8 @@ packages:
   '@types/mdx@2.0.3':
     resolution: {integrity: sha512-IgHxcT3RC8LzFLhKwP3gbMPeaK7BM9eBH46OdapPA7yvuIUJ8H6zHZV53J8hGZcTSnt95jANt+rTBNUUc22ACQ==}
 
-  '@types/micromatch@4.0.7':
-    resolution: {integrity: sha512-C/FMQ8HJAZhTsDpl4wDKZdMeeW5USjgzOczUwTGbRc1ZopPgOhIEnxY2ZgUrsuyy4DwK1JVOJZKFakv3TbCKiA==}
+  '@types/micromatch@4.0.9':
+    resolution: {integrity: sha512-7V+8ncr22h4UoYRLnLXSpTxjQrNUXtWHGeMPRJt1nULXI57G9bIcpyrHlmrQ7QK24EyyuXvYcSSWAM8GA9nqCg==}
 
   '@types/mime-types@2.1.4':
     resolution: {integrity: sha512-lfU4b34HOri+kAY5UheuFMWPDOI+OPceBSHZKp69gEyTL/mmJ4cnU6Y/rlme3UL3GyOn6Y42hyIEw0/q8sWx5w==}
@@ -4628,8 +5033,8 @@ packages:
   '@types/node@20.11.5':
     resolution: {integrity: sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==}
 
-  '@types/node@20.12.7':
-    resolution: {integrity: sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==}
+  '@types/node@20.14.9':
+    resolution: {integrity: sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==}
 
   '@types/node@20.9.1':
     resolution: {integrity: sha512-HhmzZh5LSJNS5O8jQKpJ/3ZcrrlG6L70hpGqMIAoM9YVD0YBRNWYsfwcXq8VnSjlNpCpgLzMXdiPo+dxcvSmiA==}
@@ -4646,8 +5051,8 @@ packages:
   '@types/oauth2orize@1.11.5':
     resolution: {integrity: sha512-C6hrRoh9hCnqis39OpeUZSwgw+TIzcV0CsxwJMGfQjTx4I1r+CLmuEPzoDJr5NRTfc7OMwHNLkQwrGFLKrJjMQ==}
 
-  '@types/oauth@0.9.4':
-    resolution: {integrity: sha512-qk9orhti499fq5XxKCCEbd0OzdPZuancneyse3KtR+vgMiHRbh+mn8M4G6t64ob/Fg+GZGpa565MF/2dKWY32A==}
+  '@types/oauth@0.9.5':
+    resolution: {integrity: sha512-+oQ3C2Zx6ambINOcdIARF5Z3Tu3x//HipE889/fqo3sgpQZbe9c6ExdQFtN6qlhpR7p83lTZfPJt0tCAW29dog==}
 
   '@types/offscreencanvas@2019.3.0':
     resolution: {integrity: sha512-esIJx9bQg+QYF0ra8GnvfianIY8qWB0GBx54PK5Eps6m+xTj86KLavHv6qDhzKcu5UUOgNfJ2pWaIIV7TRUd9Q==}
@@ -4658,8 +5063,8 @@ packages:
   '@types/pg-pool@2.0.4':
     resolution: {integrity: sha512-qZAvkv1K3QbmHHFYSNRYPkRjOWRLBYrL4B9c+wG0GSVGBw0NtJwPcgx/DSddeDJvRGMHCEQ4VMEVfuJ/0gZ3XQ==}
 
-  '@types/pg@8.11.5':
-    resolution: {integrity: sha512-2xMjVviMxneZHDHX5p5S6tsRRs7TpDHeeK7kTTMe/kAC/mRRNjWHjZg0rkiY+e17jXSZV3zJYDxXV8Cy72/Vuw==}
+  '@types/pg@8.11.6':
+    resolution: {integrity: sha512-/2WmmBXHLsfRqzfHW7BNZ8SbYzE8OSk7i3WjFYvfgRHj7S1xj+16Je5fUKv3lVdVzk/zn9TXOqf+avFCFIE0yQ==}
 
   '@types/pg@8.6.1':
     resolution: {integrity: sha512-1Kc4oAGzAl7uqUStZCDvaLFqZrW9qWSjXOmBfdgyBP5La7Us6Mg4GBvRlSoaZMhQF/zSj1C8CtKMBkoiT8eL8w==}
@@ -4766,6 +5171,9 @@ packages:
   '@types/unist@3.0.2':
     resolution: {integrity: sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==}
 
+  '@types/uuid@10.0.0':
+    resolution: {integrity: sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==}
+
   '@types/uuid@9.0.8':
     resolution: {integrity: sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==}
 
@@ -4815,8 +5223,8 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/eslint-plugin@7.7.1':
-    resolution: {integrity: sha512-KwfdWXJBOviaBVhxO3p5TJiLpNuh2iyXyjmWN0f1nU87pwyvfS0EmjC6ukQVYVFJd/K1+0NWGPDXiyEyQorn0Q==}
+  '@typescript-eslint/eslint-plugin@7.15.0':
+    resolution: {integrity: sha512-uiNHpyjZtFrLwLDpHnzaDlP3Tt6sGMqTCiqmxaN4n4RP0EfYZDODJyddiFDF44Hjwxr5xAcaYxVKm9QKQFJFLA==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       '@typescript-eslint/parser': ^7.0.0
@@ -4846,8 +5254,8 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/parser@7.7.1':
-    resolution: {integrity: sha512-vmPzBOOtz48F6JAGVS/kZYk4EkXao6iGrD838sp1w3NQQC0W8ry/q641KU4PrG7AKNAf56NOcR8GOpH8l9FPCw==}
+  '@typescript-eslint/parser@7.15.0':
+    resolution: {integrity: sha512-k9fYuQNnypLFcqORNClRykkGOMOj+pV6V91R4GO/l1FDGwpqmSwoOQrOHo3cGaH63e+D3ZiCAOsuS/D2c99j/A==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       eslint: ^8.56.0
@@ -4864,8 +5272,8 @@ packages:
     resolution: {integrity: sha512-6TmN4OJiohHfoOdGZ3huuLhpiUgOGTpgXNUPJgeZOZR3DnIpdSgtt83RS35OYNNXxM4TScVlpVKC9jyQSETR1A==}
     engines: {node: ^16.0.0 || >=18.0.0}
 
-  '@typescript-eslint/scope-manager@7.7.1':
-    resolution: {integrity: sha512-PytBif2SF+9SpEUKynYn5g1RHFddJUcyynGpztX3l/ik7KmZEv19WCMhUBkHXPU9es/VWGD3/zg3wg90+Dh2rA==}
+  '@typescript-eslint/scope-manager@7.15.0':
+    resolution: {integrity: sha512-Q/1yrF/XbxOTvttNVPihxh1b9fxamjEoz2Os/Pe38OHwxC24CyCqXxGTOdpb4lt6HYtqw9HetA/Rf6gDGaMPlw==}
     engines: {node: ^18.18.0 || >=20.0.0}
 
   '@typescript-eslint/type-utils@6.11.0':
@@ -4888,8 +5296,8 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/type-utils@7.7.1':
-    resolution: {integrity: sha512-ZksJLW3WF7o75zaBPScdW1Gbkwhd/lyeXGf1kQCxJaOeITscoSl0MjynVvCzuV5boUz/3fOI06Lz8La55mu29Q==}
+  '@typescript-eslint/type-utils@7.15.0':
+    resolution: {integrity: sha512-SkgriaeV6PDvpA6253PDVep0qCqgbO1IOBiycjnXsszNTVQe5flN5wR5jiczoEoDEnAqYFSFFc9al9BSGVltkg==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       eslint: ^8.56.0
@@ -4906,8 +5314,8 @@ packages:
     resolution: {integrity: sha512-qTWjWieJ1tRJkxgZYXx6WUYtWlBc48YRxgY2JN1aGeVpkhmnopq+SUC8UEVGNXIvWH7XyuTjwALfG6bFEgCkQA==}
     engines: {node: ^16.0.0 || >=18.0.0}
 
-  '@typescript-eslint/types@7.7.1':
-    resolution: {integrity: sha512-AmPmnGW1ZLTpWa+/2omPrPfR7BcbUU4oha5VIbSbS1a1Tv966bklvLNXxp3mrbc+P2j4MNOTfDffNsk4o0c6/w==}
+  '@typescript-eslint/types@7.15.0':
+    resolution: {integrity: sha512-aV1+B1+ySXbQH0pLK0rx66I3IkiZNidYobyfn0WFsdGhSXw+P3YOqeTq5GED458SfB24tg+ux3S+9g118hjlTw==}
     engines: {node: ^18.18.0 || >=20.0.0}
 
   '@typescript-eslint/typescript-estree@6.11.0':
@@ -4928,8 +5336,8 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/typescript-estree@7.7.1':
-    resolution: {integrity: sha512-CXe0JHCXru8Fa36dteXqmH2YxngKJjkQLjxzoj6LYwzZ7qZvgsLSc+eqItCrqIop8Vl2UKoAi0StVWu97FQZIQ==}
+  '@typescript-eslint/typescript-estree@7.15.0':
+    resolution: {integrity: sha512-gjyB/rHAopL/XxfmYThQbXbzRMGhZzGw6KpcMbfe8Q3nNQKStpxnUKeXb0KiN/fFDR42Z43szs6rY7eHk0zdGQ==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       typescript: '*'
@@ -4949,8 +5357,8 @@ packages:
     peerDependencies:
       eslint: ^8.56.0
 
-  '@typescript-eslint/utils@7.7.1':
-    resolution: {integrity: sha512-QUvBxPEaBXf41ZBbaidKICgVL8Hin0p6prQDu6bbetWo39BKbWJxRsErOzMNT1rXvTll+J7ChrbmMCXM9rsvOQ==}
+  '@typescript-eslint/utils@7.15.0':
+    resolution: {integrity: sha512-hfDMDqaqOqsUVGiEPSMLR/AjTSCsmJwjpKkYQRo1FNbmW4tBwBspYDwO9eh7sKSTwMQgBw9/T4DHudPaqshRWA==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       eslint: ^8.56.0
@@ -4963,87 +5371,78 @@ packages:
     resolution: {integrity: sha512-FhUqNWluiGNzlvnDZiXad4mZRhtghdoKW6e98GoEOYSu5cND+E39rG5KwJMUzeENwm1ztYBRqof8wMLP+wNPIA==}
     engines: {node: ^16.0.0 || >=18.0.0}
 
-  '@typescript-eslint/visitor-keys@7.7.1':
-    resolution: {integrity: sha512-gBL3Eq25uADw1LQ9kVpf3hRM+DWzs0uZknHYK3hq4jcTPqVCClHGDnB6UUUV2SFeBeA4KWHWbbLqmbGcZ4FYbw==}
+  '@typescript-eslint/visitor-keys@7.15.0':
+    resolution: {integrity: sha512-Hqgy/ETgpt2L5xueA/zHHIl4fJI2O4XUE9l4+OIfbJIRSnTJb/QscncdqqZzofQegIJugRIF57OJea1khw2SDw==}
     engines: {node: ^18.18.0 || >=20.0.0}
 
   '@ungap/structured-clone@1.2.0':
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
 
-  '@vitejs/plugin-vue@5.0.4':
-    resolution: {integrity: sha512-WS3hevEszI6CEVEx28F8RjTX97k3KsrcY6kvTg7+Whm5y3oYvcqzVeGCU3hxSAn4uY2CLCkeokkGKpoctccilQ==}
+  '@vitejs/plugin-vue@5.0.5':
+    resolution: {integrity: sha512-LOjm7XeIimLBZyzinBQ6OSm3UBCNVCpLkxGC0oWmm2YPzVZoxMsdvNVimLTBzpAnR9hl/yn1SHGuRfe6/Td9rQ==}
     engines: {node: ^18.0.0 || >=20.0.0}
     peerDependencies:
       vite: ^5.0.0
       vue: ^3.2.25
 
-  '@vitest/coverage-v8@0.34.6':
-    resolution: {integrity: sha512-fivy/OK2d/EsJFoEoxHFEnNGTg+MmdZBAVK9Ka4qhXR2K3J0DS08vcGVwzDtXSuUMabLv4KtPcpSKkcMXFDViw==}
+  '@vitest/coverage-v8@1.6.0':
+    resolution: {integrity: sha512-KvapcbMY/8GYIG0rlwwOKCVNRc0OL20rrhFkg/CHNzncV03TE2XWvO5w9uZYoxNiMEBacAJt3unSOiZ7svePew==}
     peerDependencies:
-      vitest: '>=0.32.0 <1'
+      vitest: 1.6.0
 
-  '@vitest/expect@0.34.6':
-    resolution: {integrity: sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==}
+  '@vitest/expect@1.6.0':
+    resolution: {integrity: sha512-ixEvFVQjycy/oNgHjqsL6AZCDduC+tflRluaHIzKIsdbzkLn2U/iBnVeJwB6HsIjQBdfMR8Z0tRxKUsvFJEeWQ==}
 
-  '@vitest/expect@1.3.1':
-    resolution: {integrity: sha512-xofQFwIzfdmLLlHa6ag0dPV8YsnKOCP1KdAeVVh34vSjN2dcUiXYCD9htu/9eM7t8Xln4v03U9HLxLpPlsXdZw==}
+  '@vitest/runner@1.6.0':
+    resolution: {integrity: sha512-P4xgwPjwesuBiHisAVz/LSSZtDjOTPYZVmNAnpHHSR6ONrf8eCJOFRvUwdHn30F5M1fxhqtl7QZQUk2dprIXAg==}
 
-  '@vitest/runner@0.34.6':
-    resolution: {integrity: sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==}
-
-  '@vitest/snapshot@0.34.6':
-    resolution: {integrity: sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==}
-
-  '@vitest/spy@0.34.6':
-    resolution: {integrity: sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==}
-
-  '@vitest/spy@1.3.1':
-    resolution: {integrity: sha512-xAcW+S099ylC9VLU7eZfdT9myV67Nor9w9zhf0mGCYJSO+zM2839tOeROTdikOi/8Qeusffvxb/MyBSOja1Uig==}
+  '@vitest/snapshot@1.6.0':
+    resolution: {integrity: sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==}
 
   '@vitest/spy@1.6.0':
     resolution: {integrity: sha512-leUTap6B/cqi/bQkXUu6bQV5TZPx7pmMBKBQiI0rJA8c3pB56ZsaTbREnF7CJfmvAS4V2cXIBAh/3rVwrrCYgw==}
 
-  '@vitest/utils@0.34.6':
-    resolution: {integrity: sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==}
-
-  '@vitest/utils@1.3.1':
-    resolution: {integrity: sha512-d3Waie/299qqRyHTm2DjADeTaNdNSVsnwHPWrs20JMpjh6eiVq7ggggweO8rc4arhf6rRkWuHKwvxGvejUXZZQ==}
-
   '@vitest/utils@1.6.0':
     resolution: {integrity: sha512-21cPiuGMoMZwiOHa2i4LXkMkMkCGzA+MVFV70jRwHo95dL4x/ts5GZhML1QWuy7yfp3WzK3lRvZi3JnXTYqrBw==}
 
   '@volar/language-core@2.2.0':
     resolution: {integrity: sha512-a8WG9+4OdeNDW4ywABZIM6S6UN7em8uIlM/BZ2pWQUYrVmX+m8sj/X+QadvO+Li/t/LjAqbWJQtVgxdpEWLALQ==}
 
+  '@volar/language-core@2.4.0-alpha.11':
+    resolution: {integrity: sha512-DtftH0DtpksK1y+de/kLnu8CHcFQ7huKXi7cyxH9R0PbOOTSGXd31kijBeKNzyoXRp8dqGpu/7WhOlCWXQR62w==}
+
   '@volar/source-map@2.2.0':
     resolution: {integrity: sha512-HQlPRlHOVqCCHK8wI76ZldHkEwKsjp7E6idUc36Ekni+KJDNrqgSqPvyHQixybXPHNU7CI9Uxd9/IkxO7LuNBw==}
 
+  '@volar/source-map@2.4.0-alpha.11':
+    resolution: {integrity: sha512-yyjmv8KUkTcxXzwme9qUMl6Szdji9JUQa8eadE4ib/spFXXZGq6QOX8cgSu5UQ0ooyBJFO1zdVH5otBJyZE3Ew==}
+
   '@volar/typescript@2.2.0':
     resolution: {integrity: sha512-wC6l4zLiiCLxF+FGaHCbWlQYf4vMsnRxYhcI6WgvaNppOD6r1g+Ef1RKRJUApALWU46Yy/JDU/TbdV6w/X6Liw==}
 
-  '@vue/compiler-core@3.4.21':
-    resolution: {integrity: sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==}
+  '@volar/typescript@2.4.0-alpha.11':
+    resolution: {integrity: sha512-N/v+wSddhtsNtfv2w0Bxj2QQWURN5budGzpyBTrlcXxz2dnvB0eAMqrEQbBi6rCOVHlRaXbh+wyTRdAcB/FHrg==}
 
-  '@vue/compiler-core@3.4.25':
-    resolution: {integrity: sha512-Y2pLLopaElgWnMNolgG8w3C5nNUVev80L7hdQ5iIKPtMJvhVpG0zhnBG/g3UajJmZdvW0fktyZTotEHD1Srhbg==}
+  '@vue/compiler-core@3.4.29':
+    resolution: {integrity: sha512-TFKiRkKKsRCKvg/jTSSKK7mYLJEQdUiUfykbG49rubC9SfDyvT2JrzTReopWlz2MxqeLyxh9UZhvxEIBgAhtrg==}
 
-  '@vue/compiler-core@3.4.26':
-    resolution: {integrity: sha512-N9Vil6Hvw7NaiyFUFBPXrAyETIGlQ8KcFMkyk6hW1Cl6NvoqvP+Y8p1Eqvx+UdqsnrnI9+HMUEJegzia3mhXmQ==}
+  '@vue/compiler-core@3.4.31':
+    resolution: {integrity: sha512-skOiodXWTV3DxfDhB4rOf3OGalpITLlgCeOwb+Y9GJpfQ8ErigdBUHomBzvG78JoVE8MJoQsb+qhZiHfKeNeEg==}
 
-  '@vue/compiler-dom@3.4.21':
-    resolution: {integrity: sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==}
+  '@vue/compiler-dom@3.4.29':
+    resolution: {integrity: sha512-A6+iZ2fKIEGnfPJejdB7b1FlJzgiD+Y/sxxKwJWg1EbJu6ZPgzaPQQ51ESGNv0CP6jm6Z7/pO6Ia8Ze6IKrX7w==}
 
-  '@vue/compiler-dom@3.4.25':
-    resolution: {integrity: sha512-Ugz5DusW57+HjllAugLci19NsDK+VyjGvmbB2TXaTcSlQxwL++2PETHx/+Qv6qFwNLzSt7HKepPe4DcTE3pBWg==}
+  '@vue/compiler-dom@3.4.31':
+    resolution: {integrity: sha512-wK424WMXsG1IGMyDGyLqB+TbmEBFM78hIsOJ9QwUVLGrcSk0ak6zYty7Pj8ftm7nEtdU/DGQxAXp0/lM/2cEpQ==}
 
-  '@vue/compiler-dom@3.4.26':
-    resolution: {integrity: sha512-4CWbR5vR9fMg23YqFOhr6t6WB1Fjt62d6xdFPyj8pxrYub7d+OgZaObMsoxaF9yBUHPMiPFK303v61PwAuGvZA==}
+  '@vue/compiler-sfc@3.4.31':
+    resolution: {integrity: sha512-einJxqEw8IIJxzmnxmJBuK2usI+lJonl53foq+9etB2HAzlPjAS/wa7r0uUpXw5ByX3/0uswVSrjNb17vJm1kQ==}
 
-  '@vue/compiler-sfc@3.4.26':
-    resolution: {integrity: sha512-It1dp+FAOCgluYSVYlDn5DtZBxk1NCiJJfu2mlQqa/b+k8GL6NG/3/zRbJnHdhV2VhxFghaDq5L4K+1dakW6cw==}
+  '@vue/compiler-ssr@3.4.29':
+    resolution: {integrity: sha512-rFbwCmxJ16tDp3N8XCx5xSQzjhidYjXllvEcqX/lopkoznlNPz3jyy0WGJCyhAaVQK677WWFt3YO/WUEkMMUFQ==}
 
-  '@vue/compiler-ssr@3.4.26':
-    resolution: {integrity: sha512-FNwLfk7LlEPRY/g+nw2VqiDKcnDTVdCfBREekF8X74cPLiWHUX6oldktf/Vx28yh4STNy7t+/yuLoMBBF7YDiQ==}
+  '@vue/compiler-ssr@3.4.31':
+    resolution: {integrity: sha512-RtefmITAje3fJ8FSg1gwgDhdKhZVntIVbwupdyZDSifZTRMiWxWehAOTCc8/KZDnBOcYQ4/9VWxsTbd3wT0hAA==}
 
   '@vue/devtools-api@6.6.1':
     resolution: {integrity: sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA==}
@@ -5056,28 +5455,38 @@ packages:
       typescript:
         optional: true
 
-  '@vue/reactivity@3.4.26':
-    resolution: {integrity: sha512-E/ynEAu/pw0yotJeLdvZEsp5Olmxt+9/WqzvKff0gE67tw73gmbx6tRkiagE/eH0UCubzSlGRebCbidB1CpqZQ==}
-
-  '@vue/runtime-core@3.4.26':
-    resolution: {integrity: sha512-AFJDLpZvhT4ujUgZSIL9pdNcO23qVFh7zWCsNdGQBw8ecLNxOOnPcK9wTTIYCmBJnuPHpukOwo62a2PPivihqw==}
-
-  '@vue/runtime-dom@3.4.26':
-    resolution: {integrity: sha512-UftYA2hUXR2UOZD/Fc3IndZuCOOJgFxJsWOxDkhfVcwLbsfh2CdXE2tG4jWxBZuDAs9J9PzRTUFt1PgydEtItw==}
-
-  '@vue/server-renderer@3.4.26':
-    resolution: {integrity: sha512-xoGAqSjYDPGAeRWxeoYwqJFD/gw7mpgzOvSxEmjWaFO2rE6qpbD1PC172YRpvKhrihkyHJkNDADFXTfCyVGhKw==}
+  '@vue/language-core@2.0.24':
+    resolution: {integrity: sha512-997YD6Lq/66LXr3ZOLNxDCmyn13z9NP8LU1UZn9hGCDWhzlbXAIP0hOgL3w3x4RKEaWTaaRtsHP9DzHvmduruQ==}
     peerDependencies:
-      vue: 3.4.26
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
 
-  '@vue/shared@3.4.21':
-    resolution: {integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==}
+  '@vue/reactivity@3.4.31':
+    resolution: {integrity: sha512-VGkTani8SOoVkZNds1PfJ/T1SlAIOf8E58PGAhIOUDYPC4GAmFA2u/E14TDAFcf3vVDKunc4QqCe/SHr8xC65Q==}
 
-  '@vue/shared@3.4.25':
-    resolution: {integrity: sha512-k0yappJ77g2+KNrIaF0FFnzwLvUBLUYr8VOwz+/6vLsmItFp51AcxLL7Ey3iPd7BIRyWPOcqUjMnm7OkahXllA==}
+  '@vue/runtime-core@3.4.31':
+    resolution: {integrity: sha512-LDkztxeUPazxG/p8c5JDDKPfkCDBkkiNLVNf7XZIUnJ+66GVGkP+TIh34+8LtPisZ+HMWl2zqhIw0xN5MwU1cw==}
 
-  '@vue/shared@3.4.26':
-    resolution: {integrity: sha512-Fg4zwR0GNnjzodMt3KRy2AWGMKQXByl56+4HjN87soxLNU9P5xcJkstAlIeEF3cU6UYOzmJl1tV0dVPGIljCnQ==}
+  '@vue/runtime-dom@3.4.31':
+    resolution: {integrity: sha512-2Auws3mB7+lHhTFCg8E9ZWopA6Q6L455EcU7bzcQ4x6Dn4cCPuqj6S2oBZgN2a8vJRS/LSYYxwFFq2Hlx3Fsaw==}
+
+  '@vue/server-renderer@3.4.29':
+    resolution: {integrity: sha512-HMLCmPI2j/k8PVkSBysrA2RxcxC5DgBiCdj7n7H2QtR8bQQPqKAe8qoaxLcInzouBmzwJ+J0x20ygN/B5mYBng==}
+    peerDependencies:
+      vue: 3.4.29
+
+  '@vue/server-renderer@3.4.31':
+    resolution: {integrity: sha512-D5BLbdvrlR9PE3by9GaUp1gQXlCNadIZytMIb8H2h3FMWJd4oUfkUTEH2wAr3qxoRz25uxbTcbqd3WKlm9EHQA==}
+    peerDependencies:
+      vue: 3.4.31
+
+  '@vue/shared@3.4.29':
+    resolution: {integrity: sha512-hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA==}
+
+  '@vue/shared@3.4.31':
+    resolution: {integrity: sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA==}
 
   '@vue/test-utils@2.4.1':
     resolution: {integrity: sha512-VO8nragneNzUZUah6kOjiFmD/gwRjUauG9DROh6oaOeFwX1cZRUNHhdeogE8635cISigXFTtGLUQWx5KCb0xeg==}
@@ -5151,8 +5560,8 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
-  acorn@8.11.3:
-    resolution: {integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==}
+  acorn@8.12.0:
+    resolution: {integrity: sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==}
     engines: {node: '>=0.4.0'}
     hasBin: true
 
@@ -5205,12 +5614,26 @@ packages:
       ajv:
         optional: true
 
+  ajv-formats@3.0.1:
+    resolution: {integrity: sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==}
+    peerDependencies:
+      ajv: ^8.0.0
+    peerDependenciesMeta:
+      ajv:
+        optional: true
+
   ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
 
+  ajv@8.12.0:
+    resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==}
+
   ajv@8.13.0:
     resolution: {integrity: sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==}
 
+  ajv@8.16.0:
+    resolution: {integrity: sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==}
+
   ansi-colors@4.1.3:
     resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
     engines: {node: '>=6'}
@@ -5290,9 +5713,16 @@ packages:
   argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
+  aria-hidden@1.2.4:
+    resolution: {integrity: sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==}
+    engines: {node: '>=10'}
+
   aria-query@5.1.3:
     resolution: {integrity: sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==}
 
+  aria-query@5.3.0:
+    resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==}
+
   array-buffer-byte-length@1.0.0:
     resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==}
 
@@ -5368,6 +5798,9 @@ packages:
   async-mutex@0.5.0:
     resolution: {integrity: sha512-1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA==}
 
+  async@0.2.10:
+    resolution: {integrity: sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==}
+
   async@3.2.4:
     resolution: {integrity: sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==}
 
@@ -5389,8 +5822,8 @@ packages:
   avvio@8.3.0:
     resolution: {integrity: sha512-VBVH0jubFr9LdFASy/vNtm5giTrnbVquWBhT0fyizuNK2rQ7e7ONU2plZQWUNqtE1EmxFEb+kbSkFRkstiaS9Q==}
 
-  aws-sdk-client-mock@3.0.1:
-    resolution: {integrity: sha512-9VAzJLl8mz99KP9HjOm/93d8vznRRUTpJooPBOunRdUAnVYopCe9xmMuu7eVemu8fQ+w6rP7o5bBK1kAFkB2KQ==}
+  aws-sdk-client-mock@4.0.1:
+    resolution: {integrity: sha512-yD2mmgy73Xce097G5hIpr1k7j50qzvJ49/+6osGZiCyk4m6cwhb+2x7kKFY1gEMwTzaS8+m8fXv9SB29SkRYyQ==}
 
   aws-sign2@0.7.0:
     resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==}
@@ -5426,18 +5859,18 @@ packages:
     resolution: {integrity: sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  babel-plugin-polyfill-corejs2@0.4.6:
-    resolution: {integrity: sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==}
+  babel-plugin-polyfill-corejs2@0.4.11:
+    resolution: {integrity: sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==}
     peerDependencies:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
 
-  babel-plugin-polyfill-corejs3@0.8.6:
-    resolution: {integrity: sha512-leDIc4l4tUgU7str5BWLS2h8q2N4Nf6lGZP6UrNDxdtfF2g69eJ5L0H7S8A5Ln/arfFAfHor5InAdZuIOwZdgQ==}
+  babel-plugin-polyfill-corejs3@0.10.4:
+    resolution: {integrity: sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg==}
     peerDependencies:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
 
-  babel-plugin-polyfill-regenerator@0.5.3:
-    resolution: {integrity: sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==}
+  babel-plugin-polyfill-regenerator@0.6.2:
+    resolution: {integrity: sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==}
     peerDependencies:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
 
@@ -5510,10 +5943,6 @@ packages:
   bn.js@4.12.0:
     resolution: {integrity: sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==}
 
-  body-parser@1.20.1:
-    resolution: {integrity: sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==}
-    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
-
   body-parser@1.20.2:
     resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==}
     engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
@@ -5538,6 +5967,10 @@ packages:
     resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
     engines: {node: '>=8'}
 
+  braces@3.0.3:
+    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
+    engines: {node: '>=8'}
+
   broadcast-channel@7.0.0:
     resolution: {integrity: sha512-a2tW0Ia1pajcPBOGUF2jXlDnvE9d5/dg6BG9h60OmRUcZVr/veUrU8vEQFwwQIhwG3KVzYwSk3v2nRRGFgQDXQ==}
 
@@ -5586,8 +6019,8 @@ packages:
     resolution: {integrity: sha512-kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw==}
     engines: {node: '>=6.14.2'}
 
-  bullmq@5.7.8:
-    resolution: {integrity: sha512-F/Haeu6AVHkFrfeaU/kLOjhfrH6x3CaKAZlQQ+76fa8l3kfI9oaUHeFMW+1mYVz0NtYPF7PNTWFq4ylAHYcCgA==}
+  bullmq@5.8.3:
+    resolution: {integrity: sha512-RJgQu/vgSZqjOYrZ7F1UJsSAzveNx7FFpR3Tp/1TxOMXXN9TtZMSly5MT+vjzOhQX//3+YWNRbMWpC1mkqBc9w==}
 
   buraha@0.0.1:
     resolution: {integrity: sha512-G563A0mTbzknm2jDaNxfZuNKIdeArs8T+XQN6t+KbmgnOoevXSXhKDkyf8Md/36Jrx99ikwbCag37VGe3myExQ==}
@@ -5624,6 +6057,10 @@ packages:
     resolution: {integrity: sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==}
     engines: {node: '>=14.16'}
 
+  cacheable-request@12.0.1:
+    resolution: {integrity: sha512-Yo9wGIQUaAfIbk+qY0X4cDQgCosecfBe3V9NSyeY4qPC2SAkbCS4Xj79VP8WOzitpJUZKc/wsRCYF5ariDIwkg==}
+    engines: {node: '>=18'}
+
   cacheable-request@7.0.2:
     resolution: {integrity: sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==}
     engines: {node: '>=8'}
@@ -5713,8 +6150,8 @@ packages:
   character-parser@2.2.0:
     resolution: {integrity: sha512-+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw==}
 
-  chart.js@4.4.2:
-    resolution: {integrity: sha512-6GD7iKwFpP5kbSD4MeRRRlTnQvxfQREy36uEtm1hzHzcOqwWx0YEHuspuoNlslu+nciLIB7fjjsHkUv/FzFcOg==}
+  chart.js@4.4.3:
+    resolution: {integrity: sha512-qK1gkGSRYcJzqrrzdR6a+I0vQ4/R+SoODXyAjscQ/4mzuNzySaMCd+hyVxitSY1+L2fjPD1Gbn+ibNqRmwQeLw==}
     engines: {pnpm: '>=8'}
 
   chartjs-adapter-date-fns@3.0.0:
@@ -5763,8 +6200,8 @@ packages:
     resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
     engines: {node: '>=10'}
 
-  chromatic@11.3.0:
-    resolution: {integrity: sha512-q1ZtJDJrjLGnz60ivpC16gmd7KFzcaA4eTb7gcytCqbaKqlHhCFr1xQmcUDsm14CK7JsqdkFU6S+JQdOd2ZNJg==}
+  chromatic@11.5.4:
+    resolution: {integrity: sha512-+J+CopeUSyGUIQJsU6X7CfvSmeVBs0j6LZ9AgF4+XTjI4pFmUiUXsTc00rH9x9W1jCppOaqDXv2kqJJXGDK3mA==}
     hasBin: true
     peerDependencies:
       '@chromatic-com/cypress': ^0.*.* || ^1.0.0
@@ -5799,10 +6236,6 @@ packages:
     engines: {node: '>=8.0.0', npm: '>=5.0.0'}
     hasBin: true
 
-  cli-spinners@2.7.0:
-    resolution: {integrity: sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==}
-    engines: {node: '>=6'}
-
   cli-spinners@2.9.2:
     resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
     engines: {node: '>=6'}
@@ -5982,8 +6415,8 @@ packages:
     resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==}
     engines: {node: '>= 0.6'}
 
-  core-js-compat@3.33.3:
-    resolution: {integrity: sha512-cNzGqFsh3Ot+529GIXacjTJ7kegdt5fPXxCBVS1G0iaZpuo/tBz399ymceLJveQhFFZ8qThHiP3fzuoQjKN2ow==}
+  core-js-compat@3.37.1:
+    resolution: {integrity: sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==}
 
   core-js@3.29.1:
     resolution: {integrity: sha512-+jwgnhg6cQxKYIIjGtAHq2nwUOolo9eoFZ4sHfUH09BLXBgxnH4gA0zEd+t+BO2cNB8idaBtZFcFTRjQJRJmAw==}
@@ -6037,9 +6470,9 @@ packages:
     resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
     engines: {node: '>= 8'}
 
-  crypto-random-string@2.0.0:
-    resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==}
-    engines: {node: '>=8'}
+  crypto-random-string@4.0.0:
+    resolution: {integrity: sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==}
+    engines: {node: '>=12'}
 
   css-declaration-sorter@7.2.0:
     resolution: {integrity: sha512-h70rUM+3PNFuaBDTLe8wF/cdWu+dOZmb7pJt8Z2sedYbAcQVQV/tEchueg3GWxwqS0cxtbxmaHEdkNACqcvsow==}
@@ -6102,13 +6535,8 @@ packages:
   cwise-compiler@1.1.3:
     resolution: {integrity: sha512-WXlK/m+Di8DMMcCjcWr4i+XzcQra9eCdXIJrgh4TUgh0pIS/yJduLxS9JgefsHJ/YVLdgPtXm9r62W92MvanEQ==}
 
-  cypress@13.7.3:
-    resolution: {integrity: sha512-uoecY6FTCAuIEqLUYkTrxamDBjMHTYak/1O7jtgwboHiTnS1NaMOoR08KcTrbRZFCBvYOiS4tEkQRmsV+xcrag==}
-    engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0}
-    hasBin: true
-
-  cypress@13.8.1:
-    resolution: {integrity: sha512-Uk6ovhRbTg6FmXjeZW/TkbRM07KPtvM5gah1BIMp4Y2s+i/NMxgaLw0+PbYTOdw1+egE0FP3mWRiGcRkjjmhzA==}
+  cypress@13.13.0:
+    resolution: {integrity: sha512-ou/MQUDq4tcDJI2FsPaod2FZpex4kpIK43JJlcBgWrX8WX7R/05ZxGTuxedOuZBfxjZxja+fbijZGyxiLP6CFA==}
     engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0}
     hasBin: true
 
@@ -6162,6 +6590,15 @@ packages:
       supports-color:
         optional: true
 
+  debug@4.3.5:
+    resolution: {integrity: sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
   decamelize-keys@1.1.1:
     resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
     engines: {node: '>=0.10.0'}
@@ -6235,10 +6672,6 @@ packages:
   defu@6.1.4:
     resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==}
 
-  del@6.1.1:
-    resolution: {integrity: sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==}
-    engines: {node: '>=10'}
-
   delayed-stream@1.0.0:
     resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
     engines: {node: '>=0.4.0'}
@@ -6278,6 +6711,9 @@ packages:
     resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
     engines: {node: '>=8'}
 
+  detect-node-es@1.1.0:
+    resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==}
+
   detect-package-manager@2.0.1:
     resolution: {integrity: sha512-j/lJHyoLlWi6G1LDdLgvUtz60Zo5GEj+sVYtTVXnYLDPuzgC3llMxonXym9zIwhhUII8vjdw0LXxavpLqTbl1A==}
     engines: {node: '>=12'}
@@ -6300,6 +6736,10 @@ packages:
     resolution: {integrity: sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==}
     engines: {node: '>=0.3.1'}
 
+  diff@5.2.0:
+    resolution: {integrity: sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==}
+    engines: {node: '>=0.3.1'}
+
   dijkstrajs@1.0.2:
     resolution: {integrity: sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg==}
 
@@ -6371,8 +6811,8 @@ packages:
   ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
-  ejs@3.1.9:
-    resolution: {integrity: sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==}
+  ejs@3.1.10:
+    resolution: {integrity: sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==}
     engines: {node: '>=0.10.0'}
     hasBin: true
 
@@ -6438,8 +6878,8 @@ packages:
   es-get-iterator@1.1.3:
     resolution: {integrity: sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==}
 
-  es-module-lexer@0.9.3:
-    resolution: {integrity: sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==}
+  es-module-lexer@1.5.4:
+    resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==}
 
   es-set-tostringtag@2.0.1:
     resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
@@ -6476,11 +6916,16 @@ packages:
     engines: {node: '>=12'}
     hasBin: true
 
-  esbuild@0.20.2:
-    resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==}
+  esbuild@0.21.5:
+    resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
     engines: {node: '>=12'}
     hasBin: true
 
+  esbuild@0.22.0:
+    resolution: {integrity: sha512-zNYA6bFZsVnsU481FnGAQjLDW0Pl/8BGG7EvAp15RzUvGC+ME7hf1q7LvIfStEQBz/iEHuBJCYcOwPmNCf1Tlw==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   escalade@3.1.1:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
     engines: {node: '>=6'}
@@ -6550,8 +6995,8 @@ packages:
       '@typescript-eslint/parser':
         optional: true
 
-  eslint-plugin-vue@9.25.0:
-    resolution: {integrity: sha512-tDWlx14bVe6Bs+Nnh3IGrD+hb11kf2nukfm6jLsmJIhmiRQ1SUaksvwY9U5MvPB0pcrg0QK0xapQkfITs3RKOA==}
+  eslint-plugin-vue@9.26.0:
+    resolution: {integrity: sha512-eTvlxXgd4ijE1cdur850G6KalZqk65k1JKoOI2d1kT3hr8sPD07j1q98FRFdNnpxBELGPWxZmInxeHGF/GxtqQ==}
     engines: {node: ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
@@ -6563,19 +7008,26 @@ packages:
     resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
+  eslint-scope@8.0.1:
+    resolution: {integrity: sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   eslint-visitor-keys@3.4.3:
     resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
-  eslint@8.53.0:
-    resolution: {integrity: sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  eslint-visitor-keys@4.0.0:
+    resolution: {integrity: sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  eslint@9.6.0:
+    resolution: {integrity: sha512-ElQkdLMEEqQNM9Njff+2Y4q2afHk7JpkPvrd7Xh7xefwgQynqPxwf55J7di9+MEibWUGdNjFF9ITG9Pck5M84w==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     hasBin: true
 
-  eslint@8.57.0:
-    resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    hasBin: true
+  espree@10.1.0:
+    resolution: {integrity: sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   espree@9.6.1:
     resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
@@ -6590,6 +7042,10 @@ packages:
     resolution: {integrity: sha512-JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng==}
     engines: {node: '>=0.10'}
 
+  esquery@1.5.0:
+    resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
+    engines: {node: '>=0.10'}
+
   esrecurse@4.3.0:
     resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
     engines: {node: '>=4.0'}
@@ -6652,6 +7108,10 @@ packages:
     resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}
     engines: {node: '>=16.17'}
 
+  execa@9.2.0:
+    resolution: {integrity: sha512-vpOyYg7UAVKLAWWtRS2gAdgkT7oJbCn0me3gmUmxZih4kd3MF/oo8kNTBTIbkO3yuuF5uB4ZCZfn8BOolITYhg==}
+    engines: {node: ^18.19.0 || >=20.5.0}
+
   executable@4.1.1:
     resolution: {integrity: sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==}
     engines: {node: '>=4'}
@@ -6667,10 +7127,6 @@ packages:
   exponential-backoff@3.1.1:
     resolution: {integrity: sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==}
 
-  express@4.18.2:
-    resolution: {integrity: sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==}
-    engines: {node: '>= 0.10.0'}
-
   express@4.19.2:
     resolution: {integrity: sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==}
     engines: {node: '>= 0.10.0'}
@@ -6744,11 +7200,8 @@ packages:
     resolution: {integrity: sha512-F4o8ZIMVx4YoxGfwrZys6wyjl40gF3Yv6AWWRy62ozFAyZBSS831/uyyCAqKYw3tR73g180ryG98yih6To1PUQ==}
     engines: {node: '>= 10'}
 
-  fastify@4.26.2:
-    resolution: {integrity: sha512-90pjTuPGrfVKtdpLeLzND5nyC4woXZN5VadiNQCicj/iJU4viNHKhsAnb7jmv1vu2IzkLXyBiCzdWuzeXgQ5Ug==}
-
-  fastq@1.15.0:
-    resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==}
+  fastify@4.28.1:
+    resolution: {integrity: sha512-kFWUtpNr4i7t5vY2EJPCN2KgMVpuqfU4NjnJNCgiNB900oiDeYqaNDRcAfeBbOF5hGixixxcKnOU4KN9z6QncQ==}
 
   fastq@1.17.1:
     resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==}
@@ -6774,9 +7227,13 @@ packages:
     resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
     engines: {node: '>=8'}
 
-  file-entry-cache@6.0.1:
-    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  figures@6.1.0:
+    resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==}
+    engines: {node: '>=18'}
+
+  file-entry-cache@8.0.0:
+    resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
+    engines: {node: '>=16.0.0'}
 
   file-system-cache@2.3.0:
     resolution: {integrity: sha512-l4DMNdsIPsVnKrgEXbJwDJsA5mB8rGwHYERMgqQx/xAUtChPJMre1bXBzDEqqVbWv9AIbFezXMxeEkZDSrXUOQ==}
@@ -6804,6 +7261,10 @@ packages:
     resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
     engines: {node: '>=8'}
 
+  fill-range@7.1.1:
+    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
+    engines: {node: '>=8'}
+
   finalhandler@1.2.0:
     resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==}
     engines: {node: '>= 0.8'}
@@ -6843,20 +7304,20 @@ packages:
     resolution: {integrity: sha512-MdYSsbdCaIRjzo5edthZtWmEZVMfr1qrtYZUHIdO3swCE+CoZA8S5l0s4jDsYlTa9ZiXv0pTgpzE7s4N8NeUOA==}
     engines: {node: '>=18'}
 
-  flat-cache@3.0.4:
-    resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  flat-cache@4.0.1:
+    resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
+    engines: {node: '>=16'}
 
-  flatted@3.2.7:
-    resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
+  flatted@3.3.1:
+    resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==}
 
   flow-parser@0.202.0:
     resolution: {integrity: sha512-ZiXxSIXK3zPmY3zrzCofFonM2T+/3Jz5QZKJyPVtUERQEJUnYkXBQ+0H3FzyqiyJs+VXqb/UNU6/K6sziVYdxw==}
     engines: {node: '>=0.4.0'}
 
-  fluent-ffmpeg@2.1.2:
-    resolution: {integrity: sha512-IZTB4kq5GK0DPp7sGQ0q/BWurGHffRtQQwVkiqDgeO6wYJLLV5ZhgNOQ65loZxxuPMKZKZcICCUnaGtlxBiR0Q==}
-    engines: {node: '>=0.8.0'}
+  fluent-ffmpeg@2.1.3:
+    resolution: {integrity: sha512-Be3narBNt2s6bsaqP6Jzq91heDgOEaDCJAXcE3qcma/EJBSy5FB4cvO31XBInuAuKBx8Kptf8dkhjK0IOru39Q==}
+    engines: {node: '>=18'}
 
   follow-redirects@1.15.2:
     resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
@@ -6978,6 +7439,10 @@ packages:
   get-intrinsic@1.2.1:
     resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==}
 
+  get-nonce@1.0.1:
+    resolution: {integrity: sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==}
+    engines: {node: '>=6'}
+
   get-npm-tarball-url@2.0.3:
     resolution: {integrity: sha512-R/PW6RqyaBQNWYaSyfrh54/qtcnOp22FHCCiRhSSZj0FP3KQWCsxxt0DzIdVTbwTqe9CtQfvl/FPD4UIPt4pqw==}
     engines: {node: '>=12.17'}
@@ -7005,6 +7470,10 @@ packages:
     resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}
     engines: {node: '>=16'}
 
+  get-stream@9.0.1:
+    resolution: {integrity: sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==}
+    engines: {node: '>=18'}
+
   get-symbol-description@1.0.0:
     resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
     engines: {node: '>= 0.4'}
@@ -7056,12 +7525,19 @@ packages:
     engines: {node: '>=16 || 14 >=14.17'}
     hasBin: true
 
+  glob@10.4.2:
+    resolution: {integrity: sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==}
+    engines: {node: '>=16 || 14 >=14.18'}
+    hasBin: true
+
   glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
+    deprecated: Glob versions prior to v9 are no longer supported
 
   glob@8.1.0:
     resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
     engines: {node: '>=12'}
+    deprecated: Glob versions prior to v9 are no longer supported
 
   global-dirs@3.0.1:
     resolution: {integrity: sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==}
@@ -7071,14 +7547,18 @@ packages:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
     engines: {node: '>=4'}
 
-  globals@13.19.0:
-    resolution: {integrity: sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==}
-    engines: {node: '>=8'}
-
   globals@13.24.0:
     resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}
     engines: {node: '>=8'}
 
+  globals@14.0.0:
+    resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==}
+    engines: {node: '>=18'}
+
+  globals@15.7.0:
+    resolution: {integrity: sha512-ivatRXWwKC6ImcdKO7dOwXuXR5XFrdwo45qFwD7D0qOkEPzzJdLXC3BHceBdyrPOD3p1suPaWi4Y4NMm2D++AQ==}
+    engines: {node: '>=18'}
+
   globalthis@1.0.3:
     resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
     engines: {node: '>= 0.4'}
@@ -7087,6 +7567,10 @@ packages:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
     engines: {node: '>=10'}
 
+  globby@14.0.1:
+    resolution: {integrity: sha512-jOMLD2Z7MAhyG8aJpNOpmziMOP4rPLcc95oQPKXBazW82z+CEgPFBQvEpRUa1KeIMUJo4Wsm+q6uzO/Q/4BksQ==}
+    engines: {node: '>=18'}
+
   google-protobuf@3.21.2:
     resolution: {integrity: sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==}
 
@@ -7101,8 +7585,8 @@ packages:
     resolution: {integrity: sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==}
     engines: {node: '>=14.16'}
 
-  got@14.2.1:
-    resolution: {integrity: sha512-KOaPMremmsvx6l9BLC04LYE6ZFW4x7e4HkTe3LwBmtuYYQwpeS4XKqzhubTIkaQ1Nr+eXxeori0zuwupXMovBQ==}
+  got@14.4.1:
+    resolution: {integrity: sha512-IvDJbJBUeexX74xNQuMIVgCRRuNOm5wuK+OC3Dc2pnSoh1AOmgc7JVj7WC+cJ4u0aPcO9KZ2frTXcqK4W/5qTQ==}
     engines: {node: '>=20'}
 
   graceful-fs@4.2.11:
@@ -7260,6 +7744,10 @@ packages:
     resolution: {integrity: sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==}
     engines: {node: '>= 14'}
 
+  http-proxy-agent@7.0.2:
+    resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
+    engines: {node: '>= 14'}
+
   http-signature@1.2.0:
     resolution: {integrity: sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==}
     engines: {node: '>=0.8', npm: '>=1.3.7'}
@@ -7292,6 +7780,10 @@ packages:
     resolution: {integrity: sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==}
     engines: {node: '>= 14'}
 
+  https-proxy-agent@7.0.4:
+    resolution: {integrity: sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==}
+    engines: {node: '>= 14'}
+
   human-signals@1.1.1:
     resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==}
     engines: {node: '>=8.12.0'}
@@ -7308,6 +7800,10 @@ packages:
     resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
     engines: {node: '>=16.17.0'}
 
+  human-signals@7.0.0:
+    resolution: {integrity: sha512-74kytxOUSvNbjrT9KisAbaTZ/eJwD/LrbM/kh5j0IhPuJzwuA19dWvniFGwBzN9rVjg+O/e+F310PjObDXS+9Q==}
+    engines: {node: '>=18.18.0'}
+
   iconv-lite@0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -7347,8 +7843,8 @@ packages:
   import-in-the-middle@1.4.2:
     resolution: {integrity: sha512-9WOz1Yh/cvO/p69sxRmhyQwrIGGSp7EIdcb+fFNVi7CzQGQB8U1/1XrKVSbEd/GNOAeM0peJtmi7+qphe7NvAw==}
 
-  import-in-the-middle@1.7.4:
-    resolution: {integrity: sha512-Lk+qzWmiQuRPPulGQeK5qq0v32k2bHnWrRPFgqyvhw7Kkov5L6MOLOIU3pcWeujc9W4q54Cp3Q2WV16eQkc7Bg==}
+  import-in-the-middle@1.8.1:
+    resolution: {integrity: sha512-yhRwoHtiLGvmSozNOALgjRPFI6uYsds60EoMqqnXyyv+JOIW/BrrLejuTGBt+bq0T5tLzOHrN0T7xYTm4Qt/ng==}
 
   import-lazy@4.0.0:
     resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
@@ -7398,6 +7894,9 @@ packages:
   intersection-observer@0.12.2:
     resolution: {integrity: sha512-7m1vEcPCxXYI8HqnL8CKI6siDyD+eIWSwgB3DZA+ZTogxk9I4CDnj4wilt9x/+/QbHI4YG5YZNmC6458/e9Ktg==}
 
+  invariant@2.2.4:
+    resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==}
+
   ioredis@5.4.1:
     resolution: {integrity: sha512-2YZsvl7jopIa1gaePkeMtd9rAcSjOOjPtpcLlOeusyO+XH2SK5ZcT+UCrElPP+WVIInh2TzeI4XW9ENaSLVVHA==}
     engines: {node: '>=12.22.0'}
@@ -7405,13 +7904,13 @@ packages:
   iota-array@1.0.0:
     resolution: {integrity: sha512-pZ2xT+LOHckCatGQ3DcG/a+QuEqvoxqkiL7tvE8nn3uuu+f6i1TtpB5/FtWFbxUuVr5PZCx8KskuGatbJDXOWA==}
 
-  ip-address@7.1.0:
-    resolution: {integrity: sha512-V9pWC/VJf2lsXqP7IWJ+pe3P1/HCYGBMZrrnT62niLGjAfCbeiwXMUxaeHvnVlz19O27pvXP4azs+Pj/A0x+SQ==}
-    engines: {node: '>= 10'}
+  ip-address@9.0.5:
+    resolution: {integrity: sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==}
+    engines: {node: '>= 12'}
 
-  ip-cidr@3.1.0:
-    resolution: {integrity: sha512-HUCn4snshEX1P8cja/IyU3qk8FVDW8T5zZcegDFbu4w7NojmAhk5NcOgj3M8+0fmumo1afJTPDtJlzsxLdOjtg==}
-    engines: {node: '>=10.0.0'}
+  ip-cidr@4.0.1:
+    resolution: {integrity: sha512-V5Nce94SVJ7NtyT/UKUeTM7sY3V7TEk48hURhtBgTiGduOa5t6p9Hd+zBOGvr4Gu7iWPxFVYNl017p0akQA84w==}
+    engines: {node: '>=16.14.0'}
 
   ip-regex@4.3.0:
     resolution: {integrity: sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==}
@@ -7553,10 +8052,6 @@ packages:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
 
-  is-path-cwd@2.2.0:
-    resolution: {integrity: sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==}
-    engines: {node: '>=6'}
-
   is-path-inside@3.0.3:
     resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
     engines: {node: '>=8'}
@@ -7605,12 +8100,16 @@ packages:
     resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
+  is-stream@4.0.1:
+    resolution: {integrity: sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==}
+    engines: {node: '>=18'}
+
   is-string@1.0.7:
     resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
     engines: {node: '>= 0.4'}
 
-  is-svg@5.0.0:
-    resolution: {integrity: sha512-sRl7J0oX9yUNamSdc8cwgzh9KBLnQXNzGmW0RVHwg/jEYjGNYHC6UvnYD8+hAeut9WwxRvhG9biK7g/wDGxcMw==}
+  is-svg@5.0.1:
+    resolution: {integrity: sha512-mLYxDsfisQWdS4+gSblAwhATDoNMS/tx8G7BKA+aBIf7F0m1iUwMvuKAo6mW4WMleQAEE50I1Zqef9yMMfHk3w==}
     engines: {node: '>=14.16'}
 
   is-symbol@1.0.4:
@@ -7628,6 +8127,10 @@ packages:
     resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
     engines: {node: '>=10'}
 
+  is-unicode-supported@2.0.0:
+    resolution: {integrity: sha512-FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q==}
+    engines: {node: '>=18'}
+
   is-weakmap@2.0.1:
     resolution: {integrity: sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==}
 
@@ -7684,6 +8187,10 @@ packages:
     resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
     engines: {node: '>=10'}
 
+  istanbul-lib-source-maps@5.0.4:
+    resolution: {integrity: sha512-wHOoEsNJTVltaJp8eVkm8w+GVkVNHT2YDYo53YdzQEL2gWm1hBX5cGFR9hQJtuGLebidVX7et3+dmDZrmclduw==}
+    engines: {node: '>=10'}
+
   istanbul-reports@3.1.6:
     resolution: {integrity: sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==}
     engines: {node: '>=8'}
@@ -7696,6 +8203,10 @@ packages:
     resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==}
     engines: {node: '>=14'}
 
+  jackspeak@3.4.0:
+    resolution: {integrity: sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==}
+    engines: {node: '>=14'}
+
   jake@10.8.5:
     resolution: {integrity: sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==}
     engines: {node: '>=10'}
@@ -7856,6 +8367,9 @@ packages:
   js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
+  js-tokens@9.0.0:
+    resolution: {integrity: sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==}
+
   js-yaml@3.14.1:
     resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
     hasBin: true
@@ -7883,8 +8397,8 @@ packages:
       '@babel/preset-env':
         optional: true
 
-  jsdom@24.0.0:
-    resolution: {integrity: sha512-UDS2NayCvmXSXVP6mpTj+73JnNQadZlr9N68189xib2tx5Mls7swlTNao26IoHv46BZJFvXygyRtyXd1feAk1A==}
+  jsdom@24.1.0:
+    resolution: {integrity: sha512-6gpM7pRXCwIOKxX47cgOyvyQDN/Eh0f1MeKySBV2xGdKtqJBLj8P25eY3EVCWo2mglDDzozR2r2MW4T+JiNUZA==}
     engines: {node: '>=18'}
     peerDependencies:
       canvas: ^2.11.2
@@ -7966,9 +8480,6 @@ packages:
   jsrsasign@11.1.0:
     resolution: {integrity: sha512-Ov74K9GihaK9/9WncTe1mPmvrO7Py665TUfUKvraXBpu+xcTWitrtuOwcjf4KMU9maPaYn0OuaWy0HOzy/GBXg==}
 
-  jssha@3.3.1:
-    resolution: {integrity: sha512-VCMZj12FCFMQYcFLPRm/0lOBbLi8uM2BhXPTqw3U4YAfs4AZfiApOoBLoN8cQE60Z50m1MYMTQVCfgF/KaCVhQ==}
-
   jstransformer@1.0.0:
     resolution: {integrity: sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==}
 
@@ -8045,8 +8556,8 @@ packages:
       enquirer:
         optional: 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'}
 
   locate-path@3.0.0:
@@ -8073,9 +8584,6 @@ packages:
   lodash.isarguments@3.1.0:
     resolution: {integrity: sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==}
 
-  lodash.isequal@4.5.0:
-    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
-
   lodash.memoize@4.1.2:
     resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
 
@@ -8157,9 +8665,8 @@ packages:
   magic-string@0.30.10:
     resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==}
 
-  magic-string@0.30.7:
-    resolution: {integrity: sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==}
-    engines: {node: '>=12'}
+  magicast@0.3.4:
+    resolution: {integrity: sha512-TyDF/Pn36bBji9rWKHlZe+PZb6Mx5V8IHCSxk7X4aljM4e/vyDvZZYwHewdVaqiA0nb3ghfHU/6AUpDxWoER2Q==}
 
   mailcheck@1.1.1:
     resolution: {integrity: sha512-3WjL8+ZDouZwKlyJBMp/4LeziLFXgleOdsYu87piGcMLqhBzCsy2QFdbtAwv757TFC/rtqd738fgJw1tFQCSgA==}
@@ -8252,8 +8759,8 @@ packages:
     resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
     engines: {node: '>= 0.6'}
 
-  meilisearch@0.38.0:
-    resolution: {integrity: sha512-bHaq8nYxSKw9/Qslq1Zes5g9tHgFkxy/I9o8942wv2PqlNOT0CzptIkh/x98N52GikoSZOXSQkgt6oMjtf5uZw==}
+  meilisearch@0.41.0:
+    resolution: {integrity: sha512-5KcGLxEXD7E+uNO7R68rCbGSHgCqeM3Q3RFFLSsN7ZrIgr8HPDXVAIlP4LHggAZfk0FkSzo8VSXifHCwa2k80g==}
 
   memoizerific@1.11.3:
     resolution: {integrity: sha512-/EuHYwAPdLtXwAwSZkh/Gutery6pD2KYd44oQLhAvQp/50mpyduZh8Q7PYHXTCJ+wuXxt7oij2LXyIJOOYFPog==}
@@ -8367,8 +8874,8 @@ packages:
   micromark@4.0.0:
     resolution: {integrity: sha512-o/sd0nMof8kYff+TqcDx3VSrgBTcZpSvYcAHIfHhv5VAuNmisCxjhx6YmxS8PFEpb9z5WKWKPdzf0jM23ro3RQ==}
 
-  micromatch@4.0.5:
-    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
+  micromatch@4.0.7:
+    resolution: {integrity: sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==}
     engines: {node: '>=8.6'}
 
   mime-db@1.52.0:
@@ -8480,6 +8987,10 @@ packages:
     resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==}
     engines: {node: '>=16 || 14 >=14.17'}
 
+  minipass@7.1.2:
+    resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
   minizlib@1.3.3:
     resolution: {integrity: sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==}
 
@@ -8541,13 +9052,13 @@ packages:
   msgpackr@1.10.1:
     resolution: {integrity: sha512-r5VRLv9qouXuLiIBrLpl2d5ZvPt8svdQTl5/vMvE4nzDMyEX4sgW5yWhuBBj5UmgwOTWj8CIdSXn5sAfsHAWIQ==}
 
-  msw-storybook-addon@2.0.1:
-    resolution: {integrity: sha512-pZ3JDQ9HkGQ3XDMIHvMcDSI4Vbp/LHmwHwiZu+pHLzimtI1vhAo1swjFEDAEJuBcozljYvREEC4sS7rQHPNtWg==}
+  msw-storybook-addon@2.0.2:
+    resolution: {integrity: sha512-sdw++X+AoUbaG2ku493ViVqCA/LfqnybXsKXyPUrF3ZS/x8BqGBnkBLmT/0SHCC5zIO3Vfm5zlclAxnhqOOikQ==}
     peerDependencies:
       msw: ^2.0.0
 
-  msw@2.2.14:
-    resolution: {integrity: sha512-64i8rNCa1xzDK8ZYsTrVMli05D687jty8+Th+PU5VTbJ2/4P7fkQFVyDQ6ZFT5FrNR8z2BHhbY47fKNvfHrumA==}
+  msw@2.3.1:
+    resolution: {integrity: sha512-ocgvBCLn/5l3jpl1lssIb3cniuACJLoOfZu01e3n5dbJrpA5PeeWn28jCLgQDNt6d7QT8tF2fYRzm9JoEHtiig==}
     engines: {node: '>=18'}
     hasBin: true
     peerDependencies:
@@ -8701,8 +9212,8 @@ packages:
   node-releases@2.0.14:
     resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==}
 
-  nodemailer@6.9.13:
-    resolution: {integrity: sha512-7o38Yogx6krdoBf3jCAqnIN4oSQFx+fMa0I7dK1D+me9kBxx12D+/33wSb+fhOCtIxvYJ+4x4IMEhmhCKfAiOA==}
+  nodemailer@6.9.14:
+    resolution: {integrity: sha512-Dobp/ebDKBvz91sbtRKhcznLThrKxKt97GI2FAlAyy+fk19j73Uz3sBXolVtmcXjaorivqsbbbjDY+Jkt4/bQA==}
     engines: {node: '>=6.0.0'}
 
   nodemon@3.0.2:
@@ -8710,8 +9221,8 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  nodemon@3.1.0:
-    resolution: {integrity: sha512-xqlktYlDMCepBJd43ZQhjWwMw2obW/JRvkrLxq5RCNcuDDX1DbcPT+qT1IlIIdf+DhnWs90JpTMe+Y5KxOchvA==}
+  nodemon@3.1.4:
+    resolution: {integrity: sha512-wjPBbFhtpJwmIeY2yP7QF+UKzPfltVGtfce1g/bB15/8vCGZj8uxD62b/b9M9/WVgme0NZudpownKN+c0plXlQ==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -8757,6 +9268,10 @@ packages:
     resolution: {integrity: sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==}
     engines: {node: '>=14.16'}
 
+  normalize-url@8.0.1:
+    resolution: {integrity: sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==}
+    engines: {node: '>=14.16'}
+
   npm-run-path@2.0.2:
     resolution: {integrity: sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==}
     engines: {node: '>=4'}
@@ -8769,6 +9284,10 @@ packages:
     resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
+  npm-run-path@5.3.0:
+    resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
   npmlog@5.0.1:
     resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==}
 
@@ -8780,8 +9299,8 @@ packages:
   nth-check@2.1.1:
     resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
 
-  nwsapi@2.2.9:
-    resolution: {integrity: sha512-2f3F0SEEer8bBu0dsNCFF50N0cTThV1nWFYcEYFZttdW0lDAoybv9cQoK7X7/68Z89S7FoRrVjP1LPX4XRf9vg==}
+  nwsapi@2.2.10:
+    resolution: {integrity: sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ==}
 
   oauth-sign@0.9.0:
     resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==}
@@ -8894,8 +9413,8 @@ packages:
   ospath@1.2.2:
     resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}
 
-  otpauth@9.2.3:
-    resolution: {integrity: sha512-oAG55Ch4MBL5Jdg+RXfKiRCZ2lCwa/UIQKsmSfYbGGLSI4dErY1HPZv0JGPPESIYGyDO3s9iJqM4HU/1IppMoQ==}
+  otpauth@9.3.1:
+    resolution: {integrity: sha512-E6d2tMxPofHNk4sRFp+kqW7vQ+WJGO9VLI2N/W00DnI+ThskU12Qa10kyNSGklrzhN5c+wRUsN4GijVgCU2N9w==}
 
   outvariant@1.4.2:
     resolution: {integrity: sha512-Ou3dJ6bA/UJ5GVHxah4LnqDwZRwAmWxrG3wtrHrbGnP4RnLCtA64A4F+ae7Y8ww660JaddSoArUR5HjipWSHAQ==}
@@ -8924,9 +9443,9 @@ packages:
     resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
     engines: {node: '>=10'}
 
-  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'}
 
   p-locate@3.0.0:
     resolution: {integrity: sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==}
@@ -8956,6 +9475,9 @@ packages:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
     engines: {node: '>=6'}
 
+  package-json-from-dist@1.0.0:
+    resolution: {integrity: sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==}
+
   pako@0.2.9:
     resolution: {integrity: sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==}
 
@@ -8970,6 +9492,10 @@ packages:
     resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
     engines: {node: '>=8'}
 
+  parse-ms@4.0.0:
+    resolution: {integrity: sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==}
+    engines: {node: '>=18'}
+
   parse-srcset@1.0.2:
     resolution: {integrity: sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==}
 
@@ -9030,6 +9556,10 @@ packages:
     resolution: {integrity: sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==}
     engines: {node: '>=16 || 14 >=14.17'}
 
+  path-scurry@1.11.1:
+    resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
+    engines: {node: '>=16 || 14 >=14.18'}
+
   path-to-regexp@0.1.7:
     resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==}
 
@@ -9046,6 +9576,10 @@ packages:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
     engines: {node: '>=8'}
 
+  path-type@5.0.0:
+    resolution: {integrity: sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==}
+    engines: {node: '>=12'}
+
   pathe@1.1.2:
     resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
 
@@ -9087,9 +9621,6 @@ packages:
     peerDependencies:
       pg: '>=8.0'
 
-  pg-protocol@1.6.0:
-    resolution: {integrity: sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q==}
-
   pg-protocol@1.6.1:
     resolution: {integrity: sha512-jPIlvgoD63hrEuihvIg+tJhoGjUsLPn6poJY9N5CnlPd91c2T18T/9zBtLxZSb1EhYxBRoZJtzScCaWlYLtktg==}
 
@@ -9101,8 +9632,8 @@ packages:
     resolution: {integrity: sha512-hRCSDuLII9/LE3smys1hRHcu5QGcLs9ggT7I/TCs0IE+2Eesxi9+9RWAAwZ0yaGjxoWICF/YHLOEjydGujoJ+g==}
     engines: {node: '>=10'}
 
-  pg@8.11.5:
-    resolution: {integrity: sha512-jqgNHSKL5cbDjFlHyYsCXmQDrfIX/3RsNwYqpd4N0Kt8niLuNoRNH+aazv6cOd43gPh9Y4DjQCtb+X0MH0Hvnw==}
+  pg@8.12.0:
+    resolution: {integrity: sha512-A+LHUSnwnxrnL/tZ+OLfqR1SxLN3c/pgDztZ47Rpbsd4jUytsTtwQo/TLPRzPJMp/1pbhYVhH9cuSZLAajNfjQ==}
     engines: {node: '>= 8.0.0'}
     peerDependencies:
       pg-native: '>=3.0.1'
@@ -9113,8 +9644,8 @@ packages:
   pgpass@1.0.5:
     resolution: {integrity: sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==}
 
-  photoswipe@5.4.3:
-    resolution: {integrity: sha512-9UC6oJBK4oXFZ5HcdlcvGkfEHsVrmE4csUdCQhEjHYb3PvPLO3PG7UhnPuOgjxwmhq5s17Un5NUdum01LgBDng==}
+  photoswipe@5.4.4:
+    resolution: {integrity: sha512-WNFHoKrkZNnvFFhbHL93WDkW3ifwVOXSW3w1UuZZelSmgXpIGiZSNlZJq37rR8YejqME2rHs9EhH9ZvlvFH2NA==}
     engines: {node: '>= 0.12.0'}
 
   picocolors@1.0.0:
@@ -9136,14 +9667,14 @@ packages:
     resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
     engines: {node: '>=6'}
 
-  pino-abstract-transport@1.1.0:
-    resolution: {integrity: sha512-lsleG3/2a/JIWUtf9Q5gUNErBqwIu1tUKTT3dUzaf5DySw9ra1wcqKjJjLX1VTY64Wk1eEOYsVGSaGfCK85ekA==}
+  pino-abstract-transport@1.2.0:
+    resolution: {integrity: sha512-Guhh8EZfPCfH+PMXAb6rKOjGQEoy0xlAIn+irODG5kgfYV+BQ0rGYYWTIel3P5mmyXqkYkPmdIkywsn6QKUR1Q==}
 
-  pino-std-serializers@6.1.0:
-    resolution: {integrity: sha512-KO0m2f1HkrPe9S0ldjx7za9BJjeHqBku5Ch8JyxETxT8dEFGz1PwgrHaOQupVYitpzbFSYm7nnljxD8dik2c+g==}
+  pino-std-serializers@7.0.0:
+    resolution: {integrity: sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==}
 
-  pino@8.17.0:
-    resolution: {integrity: sha512-ey+Mku+PVPhvxglLXMg1l1zQMwSHuNrKC3MD40EDZbkckJmmuY7DYZLIOwwjZ8ix/Nvhe9dZt5H99cgkot9bAw==}
+  pino@9.2.0:
+    resolution: {integrity: sha512-g3/hpwfujK5a4oVbaefoJxezLzsDgLcNJeITvC6yrfwYeT9la+edCK42j5QpEQSQCZgTKapXvnQIdgZwvRaZug==}
     hasBin: true
 
   pirates@4.0.5:
@@ -9411,8 +9942,8 @@ packages:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
 
-  prettier@3.2.5:
-    resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==}
+  prettier@3.3.2:
+    resolution: {integrity: sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -9432,6 +9963,10 @@ packages:
     resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==}
     engines: {node: '>= 0.8'}
 
+  pretty-ms@9.0.0:
+    resolution: {integrity: sha512-E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng==}
+    engines: {node: '>=18'}
+
   private-ip@2.3.3:
     resolution: {integrity: sha512-5zyFfekIVUOTVbL92hc8LJOtE/gyGHeREHkJ2yTyByP8Q2YZVoBqLg3EfYLeF0oVvGqtaEX2t2Qovja0/gStXw==}
 
@@ -9517,12 +10052,15 @@ packages:
   pug-attrs@3.0.0:
     resolution: {integrity: sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==}
 
-  pug-code-gen@3.0.2:
-    resolution: {integrity: sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg==}
+  pug-code-gen@3.0.3:
+    resolution: {integrity: sha512-cYQg0JW0w32Ux+XTeZnBEeuWrAY7/HNE6TWnhiHGnnRYlCgyAUPoyh9KzCMa9WhcJlJ1AtQqpEYHc+vbCzA+Aw==}
 
   pug-error@2.0.0:
     resolution: {integrity: sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==}
 
+  pug-error@2.1.0:
+    resolution: {integrity: sha512-lv7sU9e5Jk8IeUheHata6/UThZ7RK2jnaaNztxfPYUY+VxZyk/ePVaNZ/vwmH8WqGvDz3LrNYt/+gA55NDg6Pg==}
+
   pug-filters@4.0.0:
     resolution: {integrity: sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A==}
 
@@ -9547,8 +10085,8 @@ packages:
   pug-walk@2.0.0:
     resolution: {integrity: sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==}
 
-  pug@3.0.2:
-    resolution: {integrity: sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw==}
+  pug@3.0.3:
+    resolution: {integrity: sha512-uBi6kmc9f3SZ3PXxqcHiUZLmIXgfgWooKWXcwSGwQd2Zi5Rb0bT14+8CJjJgI8AB+nndLaNgHGrcc6bPIB665g==}
 
   pump@2.0.1:
     resolution: {integrity: sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==}
@@ -9631,10 +10169,6 @@ packages:
   ratelimiter@3.4.1:
     resolution: {integrity: sha512-5FJbRW/Jkkdk29ksedAfWFkQkhbUrMx3QJGwMKAypeIiQf4yrLW+gtPKZiaWt4zPrtw1uGufOjGO7UGM6VllsQ==}
 
-  raw-body@2.5.1:
-    resolution: {integrity: sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==}
-    engines: {node: '>= 0.8'}
-
   raw-body@2.5.2:
     resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==}
     engines: {node: '>= 0.8'}
@@ -9643,8 +10177,8 @@ packages:
     resolution: {integrity: sha512-fUeWjrkOO0t1rg7B2fdyDTvngj+9RlUyL92vOdiB7c0FPguWVsniIMjEtHH+meLBO9rzkUlUzBVXgWrjI8P9LA==}
     engines: {node: '>=12'}
 
-  re2@1.21.2:
-    resolution: {integrity: sha512-f8jqI0vCbwDhzY66Fgx1V2RoNDdmAupKkqRqR/AEF+2/MZNRbtEOjax6oHSht95MU40vx6+2ITsJr/9esukckg==}
+  re2@1.21.3:
+    resolution: {integrity: sha512-GI+KoGkHT4kxTaX+9p0FgNB1XUnCndO9slG5qqeEoZ7kbf6Dk6ohQVpmwKVeSp7LPLn+g6Q3BaCopz4oHuBDuQ==}
 
   react-colorful@5.6.1:
     resolution: {integrity: sha512-1exovf0uGTGyq5mXQT0zgQ80uvj2PCwvF8zY1RN9/vbJVSjSo3fsB/4L3ObbF7u70NduSiK4xu4Y6q1MHoUGEw==}
@@ -9684,6 +10218,36 @@ packages:
   react-is@18.2.0:
     resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==}
 
+  react-remove-scroll-bar@2.3.6:
+    resolution: {integrity: sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  react-remove-scroll@2.5.7:
+    resolution: {integrity: sha512-FnrTWO4L7/Bhhf3CYBNArEG/yROV0tKmTv7/3h9QCFvH6sndeFf1wPqOcbFVu5VAulS5dV1wGT3GZZ/1GawqiA==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  react-style-singleton@2.2.1:
+    resolution: {integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   react@18.3.1:
     resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==}
     engines: {node: '>=0.10.0'}
@@ -9725,10 +10289,6 @@ packages:
     resolution: {integrity: sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==}
     engines: {node: '>= 12.13.0'}
 
-  recast@0.23.4:
-    resolution: {integrity: sha512-qtEDqIZGVcSZCHniWwZWbRy79Dc6Wp3kT/UmDA2RJKBPg7+7k51aQBZirHmUGn5uvHf2rg8DkjizrN26k61ATw==}
-    engines: {node: '>= 4'}
-
   recast@0.23.6:
     resolution: {integrity: sha512-9FHoNjX1yjuesMwuthAmPKabxYQdOgihFYmT5ebXfYGBcnqXZf3WOVz+5foEZ8Y83P4ZY6yQD5GMmtV+pgCCAQ==}
     engines: {node: '>= 4'}
@@ -9852,9 +10412,6 @@ packages:
     resolution: {integrity: sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==}
     engines: {node: '>=10'}
 
-  resolve@1.19.0:
-    resolution: {integrity: sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==}
-
   resolve@1.22.8:
     resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}
     hasBin: true
@@ -9887,6 +10444,7 @@ packages:
 
   rimraf@2.6.3:
     resolution: {integrity: sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==}
+    deprecated: Rimraf versions prior to v4 are no longer supported
     hasBin: true
 
   rimraf@2.7.1:
@@ -9897,14 +10455,17 @@ packages:
     resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
     hasBin: true
 
-  rollup@4.17.2:
-    resolution: {integrity: sha512-/9ClTJPByC0U4zNLowV1tMBe8yMEAxewtR3cUNX5BoEpGH3dQEWpJLr6CLp0fPdYRF/fzVOgvDb1zXuakwF5kQ==}
+  rollup@4.18.0:
+    resolution: {integrity: sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
   rrweb-cssom@0.6.0:
     resolution: {integrity: sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==}
 
+  rrweb-cssom@0.7.1:
+    resolution: {integrity: sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==}
+
   rss-parser@3.13.0:
     resolution: {integrity: sha512-7jWUBV5yGN3rqMMj7CZufl/291QAhvrrGpDNE4k/02ZchL0npisiYYqULF71jCEKoIiHvK/Q2e6IkDwPziT7+w==}
 
@@ -9940,8 +10501,8 @@ packages:
   sanitize-html@2.13.0:
     resolution: {integrity: sha512-Xff91Z+4Mz5QiNSLdLWwjgBDm5b1RU6xBT0+12rapjiaR7SwfRdjw8f+6Rir2MXKLrDicRFHdb51hGOAxmsUIA==}
 
-  sass@1.76.0:
-    resolution: {integrity: sha512-nc3LeqvF2FNW5xGF1zxZifdW3ffIz5aBb7I7tSvOoNu7z1RQ6pFt9MBuiPtjgaI62YWrM/txjWlOCFiGtf2xpw==}
+  sass@1.77.6:
+    resolution: {integrity: sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==}
     engines: {node: '>=14.0.0'}
     hasBin: true
 
@@ -10015,8 +10576,8 @@ packages:
     resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==}
     engines: {node: '>=8'}
 
-  sharp@0.33.3:
-    resolution: {integrity: sha512-vHUeXJU1UvlO/BNwTpT0x/r53WkLUVxrmb5JTgW92fdFCFk0ispLMAeu/jPO2vjkXM1fYUi3K7/qcLF47pwM1A==}
+  sharp@0.33.4:
+    resolution: {integrity: sha512-7i/dt5kGl7qR4gwPRD2biwD2/SvBn3O04J77XKFgL2OnZtQw+AG9wnuS/csmu80nPRHLYE9E41fyEiG8nhH6/Q==}
     engines: {libvips: '>=8.15.2', node: ^18.17.0 || ^20.3.0 || >=21.0.0}
 
   shebang-command@1.2.0:
@@ -10035,8 +10596,8 @@ packages:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
 
-  shiki@1.4.0:
-    resolution: {integrity: sha512-5WIn0OL8PWm7JhnTwRWXniy6eEDY234mRrERVlFa646V2ErQqwIFd2UML7e0Pq9eqSKLoMa3Ke+xbsF+DAuy+Q==}
+  shiki@1.10.0:
+    resolution: {integrity: sha512-YD2sXQ+TMD/F9BimV9Jn0wj35pqOvywvOG/3PB6hGHyGKlM7TJ9tyJ02jOb2kF8F0HfJwKNYrh3sW7jEcuRlXA==}
 
   shimmer@1.2.1:
     resolution: {integrity: sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==}
@@ -10054,8 +10615,8 @@ packages:
     resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
     engines: {node: '>=14'}
 
-  simple-oauth2@5.0.0:
-    resolution: {integrity: sha512-8291lo/z5ZdpmiOFzOs1kF3cxn22bMj5FFH+DNUppLJrpoIlM1QnFiE7KpshHu3J3i21TVcx4yW+gXYjdCKDLQ==}
+  simple-oauth2@5.0.1:
+    resolution: {integrity: sha512-JcmGdzvbHKU3GegF3BK6zNi46DqFTxPMjwYddu2bgYqZuy7Gtm8U8wdedkVE4lI4LEqXocmPBLAvC4BIiiBc5w==}
 
   simple-swizzle@0.2.2:
     resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==}
@@ -10155,6 +10716,10 @@ packages:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
     engines: {node: '>=8'}
 
+  slash@5.1.0:
+    resolution: {integrity: sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==}
+    engines: {node: '>=14.16'}
+
   slice-ansi@3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -10175,8 +10740,8 @@ packages:
     resolution: {integrity: sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==}
     engines: {node: '>= 10.13.0', npm: '>= 3.0.0'}
 
-  sonic-boom@3.7.0:
-    resolution: {integrity: sha512-IudtNvSqA/ObjN97tfgNmOKyDOs4dNcg4cUUsHDebqsgb8wGBBwb31LIgShNO8fye0dFI52X1+tFoKKI6Rq1Gg==}
+  sonic-boom@4.0.1:
+    resolution: {integrity: sha512-hTSD/6JMLyT4r9zeof6UtuBDpjJ9sO08/nmS5djaA9eozT9oOlNdpXSnzcgj4FTqpk3nkLrs61l4gip9r1HCrQ==}
 
   sort-keys-length@1.0.1:
     resolution: {integrity: sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==}
@@ -10236,8 +10801,8 @@ packages:
   sprintf-js@1.0.3:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
 
-  sprintf-js@1.1.2:
-    resolution: {integrity: sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==}
+  sprintf-js@1.1.3:
+    resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==}
 
   sshpk@1.17.0:
     resolution: {integrity: sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==}
@@ -10258,8 +10823,8 @@ packages:
   standard-as-callback@2.1.0:
     resolution: {integrity: sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==}
 
-  start-server-and-test@2.0.3:
-    resolution: {integrity: sha512-QsVObjfjFZKJE6CS6bSKNwWZCKBG6975/jKRPPGFfFh+yOQglSeGXiNWjzgQNXdphcBI9nXbyso9tPfX4YAUhg==}
+  start-server-and-test@2.0.4:
+    resolution: {integrity: sha512-CKNeBTcP0hVqIlNismHMudb9q3lLdAjcVPO13/7gfI66fcJpeIb/o4NzQd1JK/CD+lfWVqr10ZH9Y14+OwlJuw==}
     engines: {node: '>=16'}
     hasBin: true
 
@@ -10296,8 +10861,8 @@ packages:
       react-dom:
         optional: true
 
-  storybook@8.0.9:
-    resolution: {integrity: sha512-/Mvij0Br5bUwJpCvqAUZMEDIWmdRxEyllvVj8Ukw5lIWJePxfpSsz4px5jg9+R6B9tO8sQSqjg4HJvQ/pZk8Tg==}
+  storybook@8.1.11:
+    resolution: {integrity: sha512-3KjIhF8lczXhKKHyHbOqV30dvuRYJSxc0d1as/C8kybuwE7cLaydhWGma7VBv5bTSPv0rDzucx7KcO+achArPg==}
     hasBin: true
 
   stream-browserify@3.0.0:
@@ -10395,6 +10960,10 @@ packages:
     resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
     engines: {node: '>=12'}
 
+  strip-final-newline@4.0.0:
+    resolution: {integrity: sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==}
+    engines: {node: '>=18'}
+
   strip-indent@3.0.0:
     resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
     engines: {node: '>=8'}
@@ -10407,8 +10976,8 @@ packages:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
 
-  strip-literal@1.3.0:
-    resolution: {integrity: sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==}
+  strip-literal@2.1.0:
+    resolution: {integrity: sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==}
 
   strip-outer@2.0.0:
     resolution: {integrity: sha512-A21Xsm1XzUkK0qK1ZrytDUvqsQWict2Cykhvi0fBQntGG5JSprESasEyV1EZ/4CiR5WB5KjzLTrP/bO37B0wPg==}
@@ -10459,8 +11028,8 @@ packages:
   symbol-tree@3.2.4:
     resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
 
-  systeminformation@5.22.7:
-    resolution: {integrity: sha512-AWxlP05KeHbpGdgvZkcudJpsmChc2Y5Eo/GvxG/iUA/Aws5LZKHAMSeAo+V+nD+nxWZaxrwpWcnx4SH3oxNL3A==}
+  systeminformation@5.22.11:
+    resolution: {integrity: sha512-aLws5yi4KCHTb0BVvbodQY5bY8eW4asMRDTxTW46hqw9lGjACX6TlLdJrkdoHYRB0qs+MekqEq1zG7WDnWE8Ug==}
     engines: {node: '>=8.0.0'}
     os: [darwin, linux, win32, freebsd, openbsd, netbsd, sunos, android]
     hasBin: true
@@ -10490,20 +11059,20 @@ packages:
   telejson@7.2.0:
     resolution: {integrity: sha512-1QTEcJkJEhc8OnStBx/ILRu5J2p0GjvWsBx56bmZRqnrkdBMUe+nX92jxV+p3dB4CP6PZCdJMQJwCggkNBMzkQ==}
 
-  temp-dir@2.0.0:
-    resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==}
-    engines: {node: '>=8'}
+  temp-dir@3.0.0:
+    resolution: {integrity: sha512-nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw==}
+    engines: {node: '>=14.16'}
 
   temp@0.8.4:
     resolution: {integrity: sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==}
     engines: {node: '>=6.0.0'}
 
-  tempy@1.0.1:
-    resolution: {integrity: sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w==}
-    engines: {node: '>=10'}
+  tempy@3.1.0:
+    resolution: {integrity: sha512-7jDLIdD2Zp0bDe5r3D2qtkd1QOCacylBuL7oa4udvN6v2pqr4+LcCr67C8DR1zkpaZ8XosF5m1yQSabKAW6f2g==}
+    engines: {node: '>=14.16'}
 
-  terser@5.30.3:
-    resolution: {integrity: sha512-STdUgOUx8rLbMGO9IOwHLpCqolkDITFFQSMYYwKE1N2lY6MVSaeoi10z/EhWxRc6ybqoVmKSkhKYH/XUpl7vSA==}
+  terser@5.31.1:
+    resolution: {integrity: sha512-37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -10524,14 +11093,14 @@ packages:
   thenify@3.3.1:
     resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
 
-  thread-stream@2.3.0:
-    resolution: {integrity: sha512-kaDqm1DET9pp3NXwR8382WHbnpXnRkN9xGN9dQt3B2+dmXiW8X1SOwmFOxAErEQ47ObhZ96J6yhZNXuyCOL7KA==}
+  thread-stream@3.1.0:
+    resolution: {integrity: sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==}
 
-  three@0.164.1:
-    resolution: {integrity: sha512-iC/hUBbl1vzFny7f5GtqzVXYjMJKaTPxiCxXfrvVdBi1Sf+jhd1CAkitiFwC7mIBFCo3MrDLJG97yisoaWig0w==}
+  three@0.165.0:
+    resolution: {integrity: sha512-cc96IlVYGydeceu0e5xq70H8/yoVT/tXBxV/W8A/U6uOq7DXc4/s1Mkmnu6SqoYGhSRWWYFOhVwvq6V0VtbplA==}
 
-  throttle-debounce@5.0.0:
-    resolution: {integrity: sha512-2iQTSgkkc1Zyk0MeVrt/3BvuOXYPl/R8Z0U2xxo9rjwNciaHDG3R+Lm6dh4EeUci49DanvBnuqI6jshoQQRGEg==}
+  throttle-debounce@5.0.2:
+    resolution: {integrity: sha512-B71/4oyj61iNH0KeCamLuE2rmKuTO5byTOSVwECM5FA7TiAiAW+UqTKZ9ERueC4qvgSttUhdmq1mXC3kJqGX7A==}
     engines: {node: '>=12.22'}
 
   throttleit@1.0.0:
@@ -10546,9 +11115,6 @@ packages:
   through@2.3.8:
     resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
 
-  tiny-invariant@1.3.1:
-    resolution: {integrity: sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==}
-
   tiny-invariant@1.3.3:
     resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
 
@@ -10562,8 +11128,8 @@ packages:
   tinycolor2@1.6.0:
     resolution: {integrity: sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==}
 
-  tinypool@0.7.0:
-    resolution: {integrity: sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==}
+  tinypool@0.8.4:
+    resolution: {integrity: sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==}
     engines: {node: '>=14.0.0'}
 
   tinyspy@2.2.0:
@@ -10588,10 +11154,6 @@ packages:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
 
-  toad-cache@3.3.0:
-    resolution: {integrity: sha512-3oDzcogWGHZdkwrHyvJVpPjA7oNzY6ENOV3PsWJY9XYPZ6INo94Yd47s5may1U+nleBPwDhrRiTPMIvKaa3MQg==}
-    engines: {node: '>=12'}
-
   toad-cache@3.7.0:
     resolution: {integrity: sha512-/m8M+2BJUpoJdgAHoG+baCwBT+tf2VraSfkBgl0Y00qIWt41DJ8R5B8nsEw0I58YwF5IZH6z24/2TobDKnqSWw==}
     engines: {node: '>=12'}
@@ -10618,8 +11180,8 @@ packages:
     resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==}
     engines: {node: '>=0.8'}
 
-  tough-cookie@4.1.3:
-    resolution: {integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==}
+  tough-cookie@4.1.4:
+    resolution: {integrity: sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==}
     engines: {node: '>=6'}
 
   tr46@0.0.3:
@@ -10666,8 +11228,8 @@ packages:
   ts-map@1.0.3:
     resolution: {integrity: sha512-vDWbsl26LIcPGmDpoVzjEP6+hvHZkBkLW7JpvwbCv/5IYPJlsbzCVXY3wsCeAxAUeTclNOUZxnLdGh3VBD/J6w==}
 
-  tsc-alias@1.8.8:
-    resolution: {integrity: sha512-OYUOd2wl0H858NvABWr/BoSKNERw3N9GTi3rHPK8Iv4O1UyUXIrTTOAZNHsjlVpXFOhpJBVARI1s+rzwLivN3Q==}
+  tsc-alias@1.8.10:
+    resolution: {integrity: sha512-Ibv4KAWfFkFdKJxnWfVtdOmB0Zi1RJVxcbPGiCDsFpCQSsmpWyuzHG3rQyI5YkobWwxFPEyQfu1hdo4qLG2zPw==}
     hasBin: true
 
   tsconfig-paths@3.15.0:
@@ -10677,8 +11239,8 @@ packages:
     resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==}
     engines: {node: '>=6'}
 
-  tsd@0.30.7:
-    resolution: {integrity: sha512-oTiJ28D6B/KXoU3ww/Eji+xqHJojiuPVMwA12g4KYX1O72N93Nb6P3P3h2OAhhf92Xl8NIhb/xFmBZd5zw/xUw==}
+  tsd@0.31.1:
+    resolution: {integrity: sha512-sSL84A0SFwx2xGMWrxlGaarKFSQszWjJS2vgNDDLwatytzg2aq6ShlwHsBYxRNmjzXISODwMva5ZOdAg/4AoOA==}
     engines: {node: '>=14.16'}
     hasBin: true
 
@@ -10688,6 +11250,9 @@ packages:
   tslib@2.6.2:
     resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
 
+  tslib@2.6.3:
+    resolution: {integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==}
+
   tsx@4.4.0:
     resolution: {integrity: sha512-4fwcEjRUxW20ciSaMB8zkpGwCPxuRGnadDuj/pBk5S9uT29zvWz15PK36GrKJo45mSJomDxVejZ73c6lr3811Q==}
     engines: {node: '>=18.0.0'}
@@ -10707,10 +11272,6 @@ packages:
     resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
     engines: {node: '>=4'}
 
-  type-fest@0.16.0:
-    resolution: {integrity: sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==}
-    engines: {node: '>=10'}
-
   type-fest@0.18.1:
     resolution: {integrity: sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==}
     engines: {node: '>=10'}
@@ -10731,10 +11292,18 @@ packages:
     resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
     engines: {node: '>=8'}
 
+  type-fest@1.4.0:
+    resolution: {integrity: sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==}
+    engines: {node: '>=10'}
+
   type-fest@2.19.0:
     resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}
     engines: {node: '>=12.20'}
 
+  type-fest@4.20.1:
+    resolution: {integrity: sha512-R6wDsVsoS9xYOpy8vgeBlqpdOyzJ12HNfQhC/aAKWM3YoCV9TtunJzh/QpkMgeDhkoynDcw5f1y+qF9yc/HHyg==}
+    engines: {node: '>=16'}
+
   type-fest@4.9.0:
     resolution: {integrity: sha512-KS/6lh/ynPGiHD/LnAobrEFq3Ad4pBzOlJ1wAnJx9N4EYoqFhMfLIBjUT2UEx4wg5ZE+cC1ob6DCSpppVo+rtg==}
     engines: {node: '>=16'}
@@ -10829,8 +11398,8 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
-  typescript@5.5.2:
-    resolution: {integrity: sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==}
+  typescript@5.5.3:
+    resolution: {integrity: sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -10882,6 +11451,10 @@ packages:
     resolution: {integrity: sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==}
     engines: {node: '>=4'}
 
+  unicorn-magic@0.1.0:
+    resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==}
+    engines: {node: '>=18'}
+
   unified@11.0.4:
     resolution: {integrity: sha512-apMPnyLjAX+ty4OrNap7yumyVAMlKx5IWU2wlzzUdYJO9A8f1p9m/gywF/GM2ZDFcjQPrx59Mc90KwmxsoklxQ==}
 
@@ -10896,9 +11469,9 @@ packages:
     resolution: {integrity: sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
 
-  unique-string@2.0.0:
-    resolution: {integrity: sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==}
-    engines: {node: '>=8'}
+  unique-string@3.0.0:
+    resolution: {integrity: sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==}
+    engines: {node: '>=12'}
 
   unist-util-is@6.0.0:
     resolution: {integrity: sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==}
@@ -10950,6 +11523,26 @@ packages:
   url-parse@1.5.10:
     resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
 
+  use-callback-ref@1.3.2:
+    resolution: {integrity: sha512-elOQwe6Q8gqZgDA8mrh44qRTQqpIHDcZ3hXTLjBe1i4ph8XpNJnO+aQf3NaG+lriLopI4HMx9VjQLfPQ6vhnoA==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  use-sidecar@1.1.2:
+    resolution: {integrity: sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': ^16.9.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   utf-8-validate@6.0.3:
     resolution: {integrity: sha512-uIuGf9TWQ/y+0Lp+KGZCMuJWc3N9BHA+l/UmHd/oUHwJJDeysyTRxNQVkbzsIWfGFbRe3OcgML/i0mvVRPOyDA==}
     engines: {node: '>=6.14.2'}
@@ -10964,6 +11557,10 @@ packages:
     resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
     engines: {node: '>= 0.4.0'}
 
+  uuid@10.0.0:
+    resolution: {integrity: sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==}
+    hasBin: true
+
   uuid@3.4.0:
     resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==}
     deprecated: Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.
@@ -10977,8 +11574,8 @@ packages:
     resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
     hasBin: true
 
-  v-code-diff@1.11.0:
-    resolution: {integrity: sha512-lBlO+FXw3I3qFKbnlorXZ4sb5cFnrdxlc6lj3Y1CWrbn2LC7PoVbGlwH0W+nvAVX1rdJhhc15rKIQdHyMkXe/w==}
+  v-code-diff@1.12.0:
+    resolution: {integrity: sha512-vvdCBG02mIIiW6Gx6jF119hzxELt+6TlJIwchglR1JYzboHePNxIkVBjR/aoAOVlsGa+5Vtb77cd/N84nrXWPA==}
     peerDependencies:
       '@vue/composition-api': ^1.4.9
       vue: ^2.6.0 || >=3.0.0
@@ -10993,10 +11590,6 @@ packages:
   validate-npm-package-license@3.0.4:
     resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
 
-  validator@13.9.0:
-    resolution: {integrity: sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA==}
-    engines: {node: '>= 0.10'}
-
   vary@1.1.2:
     resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
     engines: {node: '>= 0.8'}
@@ -11011,16 +11604,16 @@ packages:
   vfile@6.0.1:
     resolution: {integrity: sha512-1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==}
 
-  vite-node@0.34.6:
-    resolution: {integrity: sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==}
-    engines: {node: '>=v14.18.0'}
+  vite-node@1.6.0:
+    resolution: {integrity: sha512-de6HJgzC+TFzOu0NTC4RAIsyf/DY/ibWDYQUcuEA84EMHhcefTUGkjFHKKEJhQN4A+6I0u++kr3l36ZF2d7XRw==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
 
   vite-plugin-turbosnap@1.0.3:
     resolution: {integrity: sha512-p4D8CFVhZS412SyQX125qxyzOgIFouwOcvjZWk6bQbNPR1wtaEzFT6jZxAjf1dejlGqa6fqHcuCvQea6EWUkUA==}
 
-  vite@5.2.11:
-    resolution: {integrity: sha512-HndV31LWW05i1BLPMUCE1B9E9GFbOu1MbenhS58FuK6owSO5qHm7GiCotrNY1YE5rMeQSFBGmT5ZaLEjFizgiQ==}
+  vite@5.3.2:
+    resolution: {integrity: sha512-6lA7OBHBlXUxiJxbO5aAY2fsHHzDr1q7DvXYnyZycRs2Dz+dXBWuhpWHvmljTRTpQC2uvGmUFFkSHF2vGo90MA==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -11053,22 +11646,22 @@ packages:
     peerDependencies:
       vitest: '>=0.16.0'
 
-  vitest@0.34.6:
-    resolution: {integrity: sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==}
-    engines: {node: '>=v14.18.0'}
+  vitest@1.6.0:
+    resolution: {integrity: sha512-H5r/dN06swuFnzNFhq/dnz37bPXnq8xB2xB5JOVk8K09rUtoeNN+LHWkoQ0A/i3hvbUKKcCei9KpbxqHMLhLLA==}
+    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.6.0
+      '@vitest/ui': 1.6.0
       happy-dom: '*'
       jsdom: '*'
-      playwright: '*'
-      safaridriver: '*'
-      webdriverio: '*'
     peerDependenciesMeta:
       '@edge-runtime/vm':
         optional: true
+      '@types/node':
+        optional: true
       '@vitest/browser':
         optional: true
       '@vitest/ui':
@@ -11077,12 +11670,6 @@ packages:
         optional: true
       jsdom:
         optional: true
-      playwright:
-        optional: true
-      safaridriver:
-        optional: true
-      webdriverio:
-        optional: true
 
   void-elements@3.1.0:
     resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==}
@@ -11109,6 +11696,9 @@ packages:
     resolution: {integrity: sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==}
     hasBin: true
 
+  vscode-uri@3.0.8:
+    resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==}
+
   vue-component-meta@2.0.16:
     resolution: {integrity: sha512-IyIMClUMYcKxAL34GqdPbR4V45MUeHXqQiZlHxeYMV5Qcqp4M+CEmtGpF//XBSS138heDkYkceHAtJQjLUB1Lw==}
     peerDependencies:
@@ -11123,8 +11713,8 @@ packages:
   vue-component-type-helpers@2.0.16:
     resolution: {integrity: sha512-qisL/iAfdO++7w+SsfYQJVPj6QKvxp4i1MMxvsNO41z/8zu3KuAw9LkhKUfP/kcOWGDxESp+pQObWppXusejCA==}
 
-  vue-component-type-helpers@2.0.21:
-    resolution: {integrity: sha512-3NaicyZ7N4B6cft4bfb7dOnPbE9CjLcx+6wZWAg5zwszfO4qXRh+U52dN5r5ZZfc6iMaxKCEcoH9CmxxoFZHLg==}
+  vue-component-type-helpers@2.0.24:
+    resolution: {integrity: sha512-Jr5N8QVYEcbQuMN1LRgvg61758G8HTnzUlQsAFOxx6Y6X8kmhJ7C+jOvWsQruYxi3uHhhS6BghyRlyiwO99DBg==}
 
   vue-demi@0.14.7:
     resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==}
@@ -11142,8 +11732,8 @@ packages:
     peerDependencies:
       vue: '>=2'
 
-  vue-eslint-parser@9.4.2:
-    resolution: {integrity: sha512-Ry9oiGmCAK91HrKMtCrKFWmSFWvYkpGglCeFAIqDdr9zdXmMMpJOmUJS7WWsW7fX81h6mwHmUZCQQ1E0PkSwYQ==}
+  vue-eslint-parser@9.4.3:
+    resolution: {integrity: sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==}
     engines: {node: ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '>=6.0.0'
@@ -11162,14 +11752,14 @@ packages:
   vue-template-compiler@2.7.14:
     resolution: {integrity: sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==}
 
-  vue-tsc@2.0.16:
-    resolution: {integrity: sha512-/gHAWJa216PeEhfxtAToIbxdWgw01wuQzo48ZUqMYVEyNqDp+OYV9xMO5HaPS2P3Ls0+EsjguMZLY4cGobX4Ew==}
+  vue-tsc@2.0.24:
+    resolution: {integrity: sha512-1qi4P8L7yS78A7OJ7CDDxUIZPD6nVxoQEgX3DkRZNi1HI1qOfzOJwQlNpmwkogSVD6S/XcanbW9sktzpSxz6rA==}
     hasBin: true
     peerDependencies:
-      typescript: '*'
+      typescript: '>=5.0.0'
 
-  vue@3.4.26:
-    resolution: {integrity: sha512-bUIq/p+VB+0xrJubaemrfhk1/FiW9iX+pDV+62I/XJ6EkspAO9/DXEjbDFoe8pIfOZBqfk45i9BMc41ptP/uRg==}
+  vue@3.4.31:
+    resolution: {integrity: sha512-njqRrOy7W3YLAlVqSKpBebtZpDVg21FPoaq1I7f/+qqBThK9ChAIjkRWgeP6Eat+8C+iia4P3OYqpATP21BCoQ==}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
@@ -11310,8 +11900,8 @@ packages:
     resolution: {integrity: sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
 
-  ws@8.17.0:
-    resolution: {integrity: sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==}
+  ws@8.17.1:
+    resolution: {integrity: sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
       bufferutil: ^4.0.1
@@ -11403,10 +11993,9 @@ packages:
     resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==}
     engines: {node: '>=12.20'}
 
-  z-schema@5.0.5:
-    resolution: {integrity: sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==}
-    engines: {node: '>=8.0.0'}
-    hasBin: true
+  yoctocolors@2.0.2:
+    resolution: {integrity: sha512-Ct97huExsu7cWeEjmrXlofevF8CvzUglJ4iGUet5B8xn1oumtAZBpHU4GzYuoE6PVqcZ5hghtBrSlhwHuR1Jmw==}
+    engines: {node: '>=18'}
 
   zip-stream@6.0.1:
     resolution: {integrity: sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==}
@@ -11442,458 +12031,510 @@ snapshots:
     dependencies:
       default-browser-id: 3.0.0
 
-  '@aws-crypto/crc32@3.0.0':
+  '@aws-crypto/crc32@5.2.0':
     dependencies:
-      '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.413.0
-      tslib: 1.14.1
+      '@aws-crypto/util': 5.2.0
+      '@aws-sdk/types': 3.598.0
+      tslib: 2.6.2
 
-  '@aws-crypto/crc32c@3.0.0':
+  '@aws-crypto/crc32c@5.2.0':
     dependencies:
-      '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.413.0
-      tslib: 1.14.1
+      '@aws-crypto/util': 5.2.0
+      '@aws-sdk/types': 3.598.0
+      tslib: 2.6.2
 
-  '@aws-crypto/ie11-detection@3.0.0':
+  '@aws-crypto/sha1-browser@5.2.0':
     dependencies:
-      tslib: 1.14.1
-
-  '@aws-crypto/sha1-browser@3.0.0':
-    dependencies:
-      '@aws-crypto/ie11-detection': 3.0.0
-      '@aws-crypto/supports-web-crypto': 3.0.0
-      '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.413.0
+      '@aws-crypto/supports-web-crypto': 5.2.0
+      '@aws-crypto/util': 5.2.0
+      '@aws-sdk/types': 3.598.0
       '@aws-sdk/util-locate-window': 3.208.0
-      '@aws-sdk/util-utf8-browser': 3.259.0
-      tslib: 1.14.1
-
-  '@aws-crypto/sha256-browser@3.0.0':
-    dependencies:
-      '@aws-crypto/ie11-detection': 3.0.0
-      '@aws-crypto/sha256-js': 3.0.0
-      '@aws-crypto/supports-web-crypto': 3.0.0
-      '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.413.0
-      '@aws-sdk/util-locate-window': 3.208.0
-      '@aws-sdk/util-utf8-browser': 3.259.0
-      tslib: 1.14.1
-
-  '@aws-crypto/sha256-js@3.0.0':
-    dependencies:
-      '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.413.0
-      tslib: 1.14.1
-
-  '@aws-crypto/supports-web-crypto@3.0.0':
-    dependencies:
-      tslib: 1.14.1
-
-  '@aws-crypto/util@3.0.0':
-    dependencies:
-      '@aws-sdk/types': 3.413.0
-      '@aws-sdk/util-utf8-browser': 3.259.0
-      tslib: 1.14.1
-
-  '@aws-sdk/client-s3@3.412.0':
-    dependencies:
-      '@aws-crypto/sha1-browser': 3.0.0
-      '@aws-crypto/sha256-browser': 3.0.0
-      '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/client-sts': 3.410.0
-      '@aws-sdk/credential-provider-node': 3.410.0
-      '@aws-sdk/middleware-bucket-endpoint': 3.410.0
-      '@aws-sdk/middleware-expect-continue': 3.410.0
-      '@aws-sdk/middleware-flexible-checksums': 3.410.0
-      '@aws-sdk/middleware-host-header': 3.410.0
-      '@aws-sdk/middleware-location-constraint': 3.410.0
-      '@aws-sdk/middleware-logger': 3.410.0
-      '@aws-sdk/middleware-recursion-detection': 3.410.0
-      '@aws-sdk/middleware-sdk-s3': 3.410.0
-      '@aws-sdk/middleware-signing': 3.410.0
-      '@aws-sdk/middleware-ssec': 3.410.0
-      '@aws-sdk/middleware-user-agent': 3.410.0
-      '@aws-sdk/signature-v4-multi-region': 3.412.0
-      '@aws-sdk/types': 3.410.0
-      '@aws-sdk/util-endpoints': 3.410.0
-      '@aws-sdk/util-user-agent-browser': 3.410.0
-      '@aws-sdk/util-user-agent-node': 3.410.0
-      '@aws-sdk/xml-builder': 3.310.0
-      '@smithy/config-resolver': 2.0.9
-      '@smithy/eventstream-serde-browser': 2.0.8
-      '@smithy/eventstream-serde-config-resolver': 2.0.8
-      '@smithy/eventstream-serde-node': 2.0.8
-      '@smithy/fetch-http-handler': 2.1.4
-      '@smithy/hash-blob-browser': 2.0.8
-      '@smithy/hash-node': 2.0.8
-      '@smithy/hash-stream-node': 2.0.8
-      '@smithy/invalid-dependency': 2.0.8
-      '@smithy/md5-js': 2.0.8
-      '@smithy/middleware-content-length': 2.0.10
-      '@smithy/middleware-endpoint': 2.0.8
-      '@smithy/middleware-retry': 2.0.11
-      '@smithy/middleware-serde': 2.0.8
-      '@smithy/middleware-stack': 2.0.1
-      '@smithy/node-config-provider': 2.0.11
-      '@smithy/node-http-handler': 2.5.0
-      '@smithy/protocol-http': 3.0.10
-      '@smithy/smithy-client': 2.1.5
-      '@smithy/types': 2.6.0
-      '@smithy/url-parser': 2.0.8
-      '@smithy/util-base64': 2.0.0
-      '@smithy/util-body-length-browser': 2.0.0
-      '@smithy/util-body-length-node': 2.1.0
-      '@smithy/util-defaults-mode-browser': 2.0.9
-      '@smithy/util-defaults-mode-node': 2.0.11
-      '@smithy/util-retry': 2.0.1
-      '@smithy/util-stream': 2.0.11
       '@smithy/util-utf8': 2.0.0
-      '@smithy/util-waiter': 2.0.8
+      tslib: 2.6.2
+
+  '@aws-crypto/sha256-browser@5.2.0':
+    dependencies:
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-crypto/supports-web-crypto': 5.2.0
+      '@aws-crypto/util': 5.2.0
+      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/util-locate-window': 3.208.0
+      '@smithy/util-utf8': 2.0.0
+      tslib: 2.6.2
+
+  '@aws-crypto/sha256-js@5.2.0':
+    dependencies:
+      '@aws-crypto/util': 5.2.0
+      '@aws-sdk/types': 3.598.0
+      tslib: 2.6.2
+
+  '@aws-crypto/supports-web-crypto@5.2.0':
+    dependencies:
+      tslib: 2.6.2
+
+  '@aws-crypto/util@5.2.0':
+    dependencies:
+      '@aws-sdk/types': 3.598.0
+      '@smithy/util-utf8': 2.0.0
+      tslib: 2.6.2
+
+  '@aws-sdk/client-s3@3.600.0':
+    dependencies:
+      '@aws-crypto/sha1-browser': 5.2.0
+      '@aws-crypto/sha256-browser': 5.2.0
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-sdk/client-sso-oidc': 3.600.0(@aws-sdk/client-sts@3.600.0)
+      '@aws-sdk/client-sts': 3.600.0
+      '@aws-sdk/core': 3.598.0
+      '@aws-sdk/credential-provider-node': 3.600.0(@aws-sdk/client-sso-oidc@3.600.0)(@aws-sdk/client-sts@3.600.0)
+      '@aws-sdk/middleware-bucket-endpoint': 3.598.0
+      '@aws-sdk/middleware-expect-continue': 3.598.0
+      '@aws-sdk/middleware-flexible-checksums': 3.598.0
+      '@aws-sdk/middleware-host-header': 3.598.0
+      '@aws-sdk/middleware-location-constraint': 3.598.0
+      '@aws-sdk/middleware-logger': 3.598.0
+      '@aws-sdk/middleware-recursion-detection': 3.598.0
+      '@aws-sdk/middleware-sdk-s3': 3.598.0
+      '@aws-sdk/middleware-signing': 3.598.0
+      '@aws-sdk/middleware-ssec': 3.598.0
+      '@aws-sdk/middleware-user-agent': 3.598.0
+      '@aws-sdk/region-config-resolver': 3.598.0
+      '@aws-sdk/signature-v4-multi-region': 3.598.0
+      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/util-endpoints': 3.598.0
+      '@aws-sdk/util-user-agent-browser': 3.598.0
+      '@aws-sdk/util-user-agent-node': 3.598.0
+      '@aws-sdk/xml-builder': 3.598.0
+      '@smithy/config-resolver': 3.0.4
+      '@smithy/core': 2.2.4
+      '@smithy/eventstream-serde-browser': 3.0.4
+      '@smithy/eventstream-serde-config-resolver': 3.0.3
+      '@smithy/eventstream-serde-node': 3.0.4
+      '@smithy/fetch-http-handler': 3.2.0
+      '@smithy/hash-blob-browser': 3.1.2
+      '@smithy/hash-node': 3.0.3
+      '@smithy/hash-stream-node': 3.1.2
+      '@smithy/invalid-dependency': 3.0.3
+      '@smithy/md5-js': 3.0.3
+      '@smithy/middleware-content-length': 3.0.3
+      '@smithy/middleware-endpoint': 3.0.4
+      '@smithy/middleware-retry': 3.0.7
+      '@smithy/middleware-serde': 3.0.3
+      '@smithy/middleware-stack': 3.0.3
+      '@smithy/node-config-provider': 3.1.3
+      '@smithy/node-http-handler': 3.1.1
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/smithy-client': 3.1.5
+      '@smithy/types': 3.3.0
+      '@smithy/url-parser': 3.0.3
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.7
+      '@smithy/util-defaults-mode-node': 3.0.7
+      '@smithy/util-endpoints': 2.0.4
+      '@smithy/util-retry': 3.0.3
+      '@smithy/util-stream': 3.0.5
+      '@smithy/util-utf8': 3.0.0
+      '@smithy/util-waiter': 3.1.2
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - aws-crt
+
+  '@aws-sdk/client-sso-oidc@3.600.0(@aws-sdk/client-sts@3.600.0)':
+    dependencies:
+      '@aws-crypto/sha256-browser': 5.2.0
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-sdk/client-sts': 3.600.0
+      '@aws-sdk/core': 3.598.0
+      '@aws-sdk/credential-provider-node': 3.600.0(@aws-sdk/client-sso-oidc@3.600.0)(@aws-sdk/client-sts@3.600.0)
+      '@aws-sdk/middleware-host-header': 3.598.0
+      '@aws-sdk/middleware-logger': 3.598.0
+      '@aws-sdk/middleware-recursion-detection': 3.598.0
+      '@aws-sdk/middleware-user-agent': 3.598.0
+      '@aws-sdk/region-config-resolver': 3.598.0
+      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/util-endpoints': 3.598.0
+      '@aws-sdk/util-user-agent-browser': 3.598.0
+      '@aws-sdk/util-user-agent-node': 3.598.0
+      '@smithy/config-resolver': 3.0.4
+      '@smithy/core': 2.2.4
+      '@smithy/fetch-http-handler': 3.2.0
+      '@smithy/hash-node': 3.0.3
+      '@smithy/invalid-dependency': 3.0.3
+      '@smithy/middleware-content-length': 3.0.3
+      '@smithy/middleware-endpoint': 3.0.4
+      '@smithy/middleware-retry': 3.0.7
+      '@smithy/middleware-serde': 3.0.3
+      '@smithy/middleware-stack': 3.0.3
+      '@smithy/node-config-provider': 3.1.3
+      '@smithy/node-http-handler': 3.1.1
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/smithy-client': 3.1.5
+      '@smithy/types': 3.3.0
+      '@smithy/url-parser': 3.0.3
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.7
+      '@smithy/util-defaults-mode-node': 3.0.7
+      '@smithy/util-endpoints': 2.0.4
+      '@smithy/util-middleware': 3.0.3
+      '@smithy/util-retry': 3.0.3
+      '@smithy/util-utf8': 3.0.0
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - '@aws-sdk/client-sts'
+      - aws-crt
+
+  '@aws-sdk/client-sso@3.598.0':
+    dependencies:
+      '@aws-crypto/sha256-browser': 5.2.0
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-sdk/core': 3.598.0
+      '@aws-sdk/middleware-host-header': 3.598.0
+      '@aws-sdk/middleware-logger': 3.598.0
+      '@aws-sdk/middleware-recursion-detection': 3.598.0
+      '@aws-sdk/middleware-user-agent': 3.598.0
+      '@aws-sdk/region-config-resolver': 3.598.0
+      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/util-endpoints': 3.598.0
+      '@aws-sdk/util-user-agent-browser': 3.598.0
+      '@aws-sdk/util-user-agent-node': 3.598.0
+      '@smithy/config-resolver': 3.0.4
+      '@smithy/core': 2.2.4
+      '@smithy/fetch-http-handler': 3.2.0
+      '@smithy/hash-node': 3.0.3
+      '@smithy/invalid-dependency': 3.0.3
+      '@smithy/middleware-content-length': 3.0.3
+      '@smithy/middleware-endpoint': 3.0.4
+      '@smithy/middleware-retry': 3.0.7
+      '@smithy/middleware-serde': 3.0.3
+      '@smithy/middleware-stack': 3.0.3
+      '@smithy/node-config-provider': 3.1.3
+      '@smithy/node-http-handler': 3.1.1
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/smithy-client': 3.1.5
+      '@smithy/types': 3.3.0
+      '@smithy/url-parser': 3.0.3
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.7
+      '@smithy/util-defaults-mode-node': 3.0.7
+      '@smithy/util-endpoints': 2.0.4
+      '@smithy/util-middleware': 3.0.3
+      '@smithy/util-retry': 3.0.3
+      '@smithy/util-utf8': 3.0.0
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - aws-crt
+
+  '@aws-sdk/client-sts@3.600.0':
+    dependencies:
+      '@aws-crypto/sha256-browser': 5.2.0
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-sdk/client-sso-oidc': 3.600.0(@aws-sdk/client-sts@3.600.0)
+      '@aws-sdk/core': 3.598.0
+      '@aws-sdk/credential-provider-node': 3.600.0(@aws-sdk/client-sso-oidc@3.600.0)(@aws-sdk/client-sts@3.600.0)
+      '@aws-sdk/middleware-host-header': 3.598.0
+      '@aws-sdk/middleware-logger': 3.598.0
+      '@aws-sdk/middleware-recursion-detection': 3.598.0
+      '@aws-sdk/middleware-user-agent': 3.598.0
+      '@aws-sdk/region-config-resolver': 3.598.0
+      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/util-endpoints': 3.598.0
+      '@aws-sdk/util-user-agent-browser': 3.598.0
+      '@aws-sdk/util-user-agent-node': 3.598.0
+      '@smithy/config-resolver': 3.0.4
+      '@smithy/core': 2.2.4
+      '@smithy/fetch-http-handler': 3.2.0
+      '@smithy/hash-node': 3.0.3
+      '@smithy/invalid-dependency': 3.0.3
+      '@smithy/middleware-content-length': 3.0.3
+      '@smithy/middleware-endpoint': 3.0.4
+      '@smithy/middleware-retry': 3.0.7
+      '@smithy/middleware-serde': 3.0.3
+      '@smithy/middleware-stack': 3.0.3
+      '@smithy/node-config-provider': 3.1.3
+      '@smithy/node-http-handler': 3.1.1
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/smithy-client': 3.1.5
+      '@smithy/types': 3.3.0
+      '@smithy/url-parser': 3.0.3
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.7
+      '@smithy/util-defaults-mode-node': 3.0.7
+      '@smithy/util-endpoints': 2.0.4
+      '@smithy/util-middleware': 3.0.3
+      '@smithy/util-retry': 3.0.3
+      '@smithy/util-utf8': 3.0.0
+      tslib: 2.6.2
+    transitivePeerDependencies:
+      - aws-crt
+
+  '@aws-sdk/core@3.598.0':
+    dependencies:
+      '@smithy/core': 2.2.4
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/signature-v4': 3.1.2
+      '@smithy/smithy-client': 3.1.5
+      '@smithy/types': 3.3.0
       fast-xml-parser: 4.2.5
       tslib: 2.6.2
-    transitivePeerDependencies:
-      - aws-crt
 
-  '@aws-sdk/client-sso@3.410.0':
+  '@aws-sdk/credential-provider-env@3.598.0':
     dependencies:
-      '@aws-crypto/sha256-browser': 3.0.0
-      '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/middleware-host-header': 3.410.0
-      '@aws-sdk/middleware-logger': 3.410.0
-      '@aws-sdk/middleware-recursion-detection': 3.410.0
-      '@aws-sdk/middleware-user-agent': 3.410.0
-      '@aws-sdk/types': 3.410.0
-      '@aws-sdk/util-endpoints': 3.410.0
-      '@aws-sdk/util-user-agent-browser': 3.410.0
-      '@aws-sdk/util-user-agent-node': 3.410.0
-      '@smithy/config-resolver': 2.0.9
-      '@smithy/fetch-http-handler': 2.1.4
-      '@smithy/hash-node': 2.0.8
-      '@smithy/invalid-dependency': 2.0.8
-      '@smithy/middleware-content-length': 2.0.10
-      '@smithy/middleware-endpoint': 2.0.8
-      '@smithy/middleware-retry': 2.0.11
-      '@smithy/middleware-serde': 2.0.8
-      '@smithy/middleware-stack': 2.0.1
-      '@smithy/node-config-provider': 2.0.11
-      '@smithy/node-http-handler': 2.5.0
-      '@smithy/protocol-http': 3.0.10
-      '@smithy/smithy-client': 2.1.5
-      '@smithy/types': 2.6.0
-      '@smithy/url-parser': 2.0.8
-      '@smithy/util-base64': 2.0.0
-      '@smithy/util-body-length-browser': 2.0.0
-      '@smithy/util-body-length-node': 2.1.0
-      '@smithy/util-defaults-mode-browser': 2.0.9
-      '@smithy/util-defaults-mode-node': 2.0.11
-      '@smithy/util-retry': 2.0.1
-      '@smithy/util-utf8': 2.0.0
+      '@aws-sdk/types': 3.598.0
+      '@smithy/property-provider': 3.1.3
+      '@smithy/types': 3.3.0
+      tslib: 2.6.2
+
+  '@aws-sdk/credential-provider-http@3.598.0':
+    dependencies:
+      '@aws-sdk/types': 3.598.0
+      '@smithy/fetch-http-handler': 3.2.0
+      '@smithy/node-http-handler': 3.1.1
+      '@smithy/property-provider': 3.1.3
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/smithy-client': 3.1.5
+      '@smithy/types': 3.3.0
+      '@smithy/util-stream': 3.0.5
+      tslib: 2.6.2
+
+  '@aws-sdk/credential-provider-ini@3.598.0(@aws-sdk/client-sso-oidc@3.600.0)(@aws-sdk/client-sts@3.600.0)':
+    dependencies:
+      '@aws-sdk/client-sts': 3.600.0
+      '@aws-sdk/credential-provider-env': 3.598.0
+      '@aws-sdk/credential-provider-http': 3.598.0
+      '@aws-sdk/credential-provider-process': 3.598.0
+      '@aws-sdk/credential-provider-sso': 3.598.0(@aws-sdk/client-sso-oidc@3.600.0)
+      '@aws-sdk/credential-provider-web-identity': 3.598.0(@aws-sdk/client-sts@3.600.0)
+      '@aws-sdk/types': 3.598.0
+      '@smithy/credential-provider-imds': 3.1.3
+      '@smithy/property-provider': 3.1.3
+      '@smithy/shared-ini-file-loader': 3.1.3
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
     transitivePeerDependencies:
+      - '@aws-sdk/client-sso-oidc'
       - aws-crt
 
-  '@aws-sdk/client-sts@3.410.0':
+  '@aws-sdk/credential-provider-node@3.600.0(@aws-sdk/client-sso-oidc@3.600.0)(@aws-sdk/client-sts@3.600.0)':
     dependencies:
-      '@aws-crypto/sha256-browser': 3.0.0
-      '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/credential-provider-node': 3.410.0
-      '@aws-sdk/middleware-host-header': 3.410.0
-      '@aws-sdk/middleware-logger': 3.410.0
-      '@aws-sdk/middleware-recursion-detection': 3.410.0
-      '@aws-sdk/middleware-sdk-sts': 3.410.0
-      '@aws-sdk/middleware-signing': 3.410.0
-      '@aws-sdk/middleware-user-agent': 3.410.0
-      '@aws-sdk/types': 3.410.0
-      '@aws-sdk/util-endpoints': 3.410.0
-      '@aws-sdk/util-user-agent-browser': 3.410.0
-      '@aws-sdk/util-user-agent-node': 3.410.0
-      '@smithy/config-resolver': 2.0.9
-      '@smithy/fetch-http-handler': 2.1.4
-      '@smithy/hash-node': 2.0.8
-      '@smithy/invalid-dependency': 2.0.8
-      '@smithy/middleware-content-length': 2.0.10
-      '@smithy/middleware-endpoint': 2.0.8
-      '@smithy/middleware-retry': 2.0.11
-      '@smithy/middleware-serde': 2.0.8
-      '@smithy/middleware-stack': 2.0.1
-      '@smithy/node-config-provider': 2.0.11
-      '@smithy/node-http-handler': 2.5.0
-      '@smithy/protocol-http': 3.0.10
-      '@smithy/smithy-client': 2.1.5
-      '@smithy/types': 2.6.0
-      '@smithy/url-parser': 2.0.8
-      '@smithy/util-base64': 2.0.0
-      '@smithy/util-body-length-browser': 2.0.0
-      '@smithy/util-body-length-node': 2.1.0
-      '@smithy/util-defaults-mode-browser': 2.0.9
-      '@smithy/util-defaults-mode-node': 2.0.11
-      '@smithy/util-retry': 2.0.1
-      '@smithy/util-utf8': 2.0.0
-      fast-xml-parser: 4.2.5
+      '@aws-sdk/credential-provider-env': 3.598.0
+      '@aws-sdk/credential-provider-http': 3.598.0
+      '@aws-sdk/credential-provider-ini': 3.598.0(@aws-sdk/client-sso-oidc@3.600.0)(@aws-sdk/client-sts@3.600.0)
+      '@aws-sdk/credential-provider-process': 3.598.0
+      '@aws-sdk/credential-provider-sso': 3.598.0(@aws-sdk/client-sso-oidc@3.600.0)
+      '@aws-sdk/credential-provider-web-identity': 3.598.0(@aws-sdk/client-sts@3.600.0)
+      '@aws-sdk/types': 3.598.0
+      '@smithy/credential-provider-imds': 3.1.3
+      '@smithy/property-provider': 3.1.3
+      '@smithy/shared-ini-file-loader': 3.1.3
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
     transitivePeerDependencies:
+      - '@aws-sdk/client-sso-oidc'
+      - '@aws-sdk/client-sts'
       - aws-crt
 
-  '@aws-sdk/credential-provider-env@3.410.0':
+  '@aws-sdk/credential-provider-process@3.598.0':
     dependencies:
-      '@aws-sdk/types': 3.410.0
-      '@smithy/property-provider': 2.0.9
-      '@smithy/types': 2.6.0
+      '@aws-sdk/types': 3.598.0
+      '@smithy/property-provider': 3.1.3
+      '@smithy/shared-ini-file-loader': 3.1.3
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@aws-sdk/credential-provider-ini@3.410.0':
+  '@aws-sdk/credential-provider-sso@3.598.0(@aws-sdk/client-sso-oidc@3.600.0)':
     dependencies:
-      '@aws-sdk/credential-provider-env': 3.410.0
-      '@aws-sdk/credential-provider-process': 3.410.0
-      '@aws-sdk/credential-provider-sso': 3.410.0
-      '@aws-sdk/credential-provider-web-identity': 3.410.0
-      '@aws-sdk/types': 3.410.0
-      '@smithy/credential-provider-imds': 2.0.11
-      '@smithy/property-provider': 2.0.9
-      '@smithy/shared-ini-file-loader': 2.0.10
-      '@smithy/types': 2.6.0
+      '@aws-sdk/client-sso': 3.598.0
+      '@aws-sdk/token-providers': 3.598.0(@aws-sdk/client-sso-oidc@3.600.0)
+      '@aws-sdk/types': 3.598.0
+      '@smithy/property-provider': 3.1.3
+      '@smithy/shared-ini-file-loader': 3.1.3
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
     transitivePeerDependencies:
+      - '@aws-sdk/client-sso-oidc'
       - aws-crt
 
-  '@aws-sdk/credential-provider-node@3.410.0':
+  '@aws-sdk/credential-provider-web-identity@3.598.0(@aws-sdk/client-sts@3.600.0)':
     dependencies:
-      '@aws-sdk/credential-provider-env': 3.410.0
-      '@aws-sdk/credential-provider-ini': 3.410.0
-      '@aws-sdk/credential-provider-process': 3.410.0
-      '@aws-sdk/credential-provider-sso': 3.410.0
-      '@aws-sdk/credential-provider-web-identity': 3.410.0
-      '@aws-sdk/types': 3.410.0
-      '@smithy/credential-provider-imds': 2.0.11
-      '@smithy/property-provider': 2.0.9
-      '@smithy/shared-ini-file-loader': 2.0.10
-      '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - aws-crt
-
-  '@aws-sdk/credential-provider-process@3.410.0':
-    dependencies:
-      '@aws-sdk/types': 3.410.0
-      '@smithy/property-provider': 2.0.9
-      '@smithy/shared-ini-file-loader': 2.0.10
-      '@smithy/types': 2.6.0
+      '@aws-sdk/client-sts': 3.600.0
+      '@aws-sdk/types': 3.598.0
+      '@smithy/property-provider': 3.1.3
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@aws-sdk/credential-provider-sso@3.410.0':
+  '@aws-sdk/lib-storage@3.600.0(@aws-sdk/client-s3@3.600.0)':
     dependencies:
-      '@aws-sdk/client-sso': 3.410.0
-      '@aws-sdk/token-providers': 3.410.0
-      '@aws-sdk/types': 3.410.0
-      '@smithy/property-provider': 2.0.9
-      '@smithy/shared-ini-file-loader': 2.0.10
-      '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - aws-crt
-
-  '@aws-sdk/credential-provider-web-identity@3.410.0':
-    dependencies:
-      '@aws-sdk/types': 3.410.0
-      '@smithy/property-provider': 2.0.9
-      '@smithy/types': 2.6.0
-      tslib: 2.6.2
-
-  '@aws-sdk/lib-storage@3.412.0(@aws-sdk/client-s3@3.412.0)':
-    dependencies:
-      '@aws-sdk/client-s3': 3.412.0
-      '@smithy/abort-controller': 2.0.14
-      '@smithy/middleware-endpoint': 2.0.8
-      '@smithy/smithy-client': 2.1.5
+      '@aws-sdk/client-s3': 3.600.0
+      '@smithy/abort-controller': 3.1.1
+      '@smithy/middleware-endpoint': 3.0.4
+      '@smithy/smithy-client': 3.1.5
       buffer: 5.6.0
       events: 3.3.0
       stream-browserify: 3.0.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-bucket-endpoint@3.410.0':
+  '@aws-sdk/middleware-bucket-endpoint@3.598.0':
     dependencies:
-      '@aws-sdk/types': 3.410.0
-      '@aws-sdk/util-arn-parser': 3.310.0
-      '@smithy/node-config-provider': 2.0.11
-      '@smithy/protocol-http': 3.0.10
-      '@smithy/types': 2.6.0
-      '@smithy/util-config-provider': 2.0.0
+      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/util-arn-parser': 3.568.0
+      '@smithy/node-config-provider': 3.1.3
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/types': 3.3.0
+      '@smithy/util-config-provider': 3.0.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-expect-continue@3.410.0':
+  '@aws-sdk/middleware-expect-continue@3.598.0':
     dependencies:
-      '@aws-sdk/types': 3.410.0
-      '@smithy/protocol-http': 3.0.10
-      '@smithy/types': 2.6.0
+      '@aws-sdk/types': 3.598.0
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-flexible-checksums@3.410.0':
+  '@aws-sdk/middleware-flexible-checksums@3.598.0':
     dependencies:
-      '@aws-crypto/crc32': 3.0.0
-      '@aws-crypto/crc32c': 3.0.0
-      '@aws-sdk/types': 3.410.0
-      '@smithy/is-array-buffer': 2.0.0
-      '@smithy/protocol-http': 3.0.10
-      '@smithy/types': 2.6.0
-      '@smithy/util-utf8': 2.0.0
+      '@aws-crypto/crc32': 5.2.0
+      '@aws-crypto/crc32c': 5.2.0
+      '@aws-sdk/types': 3.598.0
+      '@smithy/is-array-buffer': 3.0.0
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/types': 3.3.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-host-header@3.410.0':
+  '@aws-sdk/middleware-host-header@3.598.0':
     dependencies:
-      '@aws-sdk/types': 3.410.0
-      '@smithy/protocol-http': 3.0.10
-      '@smithy/types': 2.6.0
+      '@aws-sdk/types': 3.598.0
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-location-constraint@3.410.0':
+  '@aws-sdk/middleware-location-constraint@3.598.0':
     dependencies:
-      '@aws-sdk/types': 3.410.0
-      '@smithy/types': 2.6.0
+      '@aws-sdk/types': 3.598.0
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-logger@3.410.0':
+  '@aws-sdk/middleware-logger@3.598.0':
     dependencies:
-      '@aws-sdk/types': 3.410.0
-      '@smithy/types': 2.6.0
+      '@aws-sdk/types': 3.598.0
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-recursion-detection@3.410.0':
+  '@aws-sdk/middleware-recursion-detection@3.598.0':
     dependencies:
-      '@aws-sdk/types': 3.410.0
-      '@smithy/protocol-http': 3.0.10
-      '@smithy/types': 2.6.0
+      '@aws-sdk/types': 3.598.0
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-sdk-s3@3.410.0':
+  '@aws-sdk/middleware-sdk-s3@3.598.0':
     dependencies:
-      '@aws-sdk/types': 3.410.0
-      '@aws-sdk/util-arn-parser': 3.310.0
-      '@smithy/protocol-http': 3.0.10
-      '@smithy/types': 2.6.0
+      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/util-arn-parser': 3.568.0
+      '@smithy/node-config-provider': 3.1.3
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/signature-v4': 3.1.2
+      '@smithy/smithy-client': 3.1.5
+      '@smithy/types': 3.3.0
+      '@smithy/util-config-provider': 3.0.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-sdk-sts@3.410.0':
+  '@aws-sdk/middleware-signing@3.598.0':
     dependencies:
-      '@aws-sdk/middleware-signing': 3.410.0
-      '@aws-sdk/types': 3.410.0
-      '@smithy/types': 2.6.0
+      '@aws-sdk/types': 3.598.0
+      '@smithy/property-provider': 3.1.3
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/signature-v4': 3.1.2
+      '@smithy/types': 3.3.0
+      '@smithy/util-middleware': 3.0.3
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-signing@3.410.0':
+  '@aws-sdk/middleware-ssec@3.598.0':
     dependencies:
-      '@aws-sdk/types': 3.410.0
-      '@smithy/property-provider': 2.0.9
-      '@smithy/protocol-http': 3.0.10
-      '@smithy/signature-v4': 2.0.5
-      '@smithy/types': 2.6.0
-      '@smithy/util-middleware': 2.0.1
+      '@aws-sdk/types': 3.598.0
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-ssec@3.410.0':
+  '@aws-sdk/middleware-user-agent@3.598.0':
     dependencies:
-      '@aws-sdk/types': 3.410.0
-      '@smithy/types': 2.6.0
+      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/util-endpoints': 3.598.0
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-user-agent@3.410.0':
+  '@aws-sdk/region-config-resolver@3.598.0':
     dependencies:
-      '@aws-sdk/types': 3.410.0
-      '@aws-sdk/util-endpoints': 3.410.0
-      '@smithy/protocol-http': 3.0.10
-      '@smithy/types': 2.6.0
+      '@aws-sdk/types': 3.598.0
+      '@smithy/node-config-provider': 3.1.3
+      '@smithy/types': 3.3.0
+      '@smithy/util-config-provider': 3.0.0
+      '@smithy/util-middleware': 3.0.3
       tslib: 2.6.2
 
-  '@aws-sdk/signature-v4-multi-region@3.412.0':
+  '@aws-sdk/signature-v4-multi-region@3.598.0':
     dependencies:
-      '@aws-sdk/types': 3.410.0
-      '@smithy/protocol-http': 3.0.10
-      '@smithy/signature-v4': 2.0.5
-      '@smithy/types': 2.6.0
+      '@aws-sdk/middleware-sdk-s3': 3.598.0
+      '@aws-sdk/types': 3.598.0
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/signature-v4': 3.1.2
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@aws-sdk/token-providers@3.410.0':
+  '@aws-sdk/token-providers@3.598.0(@aws-sdk/client-sso-oidc@3.600.0)':
     dependencies:
-      '@aws-crypto/sha256-browser': 3.0.0
-      '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/middleware-host-header': 3.410.0
-      '@aws-sdk/middleware-logger': 3.410.0
-      '@aws-sdk/middleware-recursion-detection': 3.410.0
-      '@aws-sdk/middleware-user-agent': 3.410.0
-      '@aws-sdk/types': 3.410.0
-      '@aws-sdk/util-endpoints': 3.410.0
-      '@aws-sdk/util-user-agent-browser': 3.410.0
-      '@aws-sdk/util-user-agent-node': 3.410.0
-      '@smithy/config-resolver': 2.0.9
-      '@smithy/fetch-http-handler': 2.1.4
-      '@smithy/hash-node': 2.0.8
-      '@smithy/invalid-dependency': 2.0.8
-      '@smithy/middleware-content-length': 2.0.10
-      '@smithy/middleware-endpoint': 2.0.8
-      '@smithy/middleware-retry': 2.0.11
-      '@smithy/middleware-serde': 2.0.8
-      '@smithy/middleware-stack': 2.0.1
-      '@smithy/node-config-provider': 2.0.11
-      '@smithy/node-http-handler': 2.5.0
-      '@smithy/property-provider': 2.0.9
-      '@smithy/protocol-http': 3.0.10
-      '@smithy/shared-ini-file-loader': 2.0.10
-      '@smithy/smithy-client': 2.1.5
-      '@smithy/types': 2.6.0
-      '@smithy/url-parser': 2.0.8
-      '@smithy/util-base64': 2.0.0
-      '@smithy/util-body-length-browser': 2.0.0
-      '@smithy/util-body-length-node': 2.1.0
-      '@smithy/util-defaults-mode-browser': 2.0.9
-      '@smithy/util-defaults-mode-node': 2.0.11
-      '@smithy/util-retry': 2.0.1
-      '@smithy/util-utf8': 2.0.0
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - aws-crt
-
-  '@aws-sdk/types@3.410.0':
-    dependencies:
-      '@smithy/types': 2.6.0
+      '@aws-sdk/client-sso-oidc': 3.600.0(@aws-sdk/client-sts@3.600.0)
+      '@aws-sdk/types': 3.598.0
+      '@smithy/property-provider': 3.1.3
+      '@smithy/shared-ini-file-loader': 3.1.3
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@aws-sdk/types@3.413.0':
+  '@aws-sdk/types@3.598.0':
     dependencies:
-      '@smithy/types': 2.6.0
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@aws-sdk/util-arn-parser@3.310.0':
+  '@aws-sdk/util-arn-parser@3.568.0':
     dependencies:
       tslib: 2.6.2
 
-  '@aws-sdk/util-endpoints@3.410.0':
+  '@aws-sdk/util-endpoints@3.598.0':
     dependencies:
-      '@aws-sdk/types': 3.410.0
+      '@aws-sdk/types': 3.598.0
+      '@smithy/types': 3.3.0
+      '@smithy/util-endpoints': 2.0.4
       tslib: 2.6.2
 
   '@aws-sdk/util-locate-window@3.208.0':
     dependencies:
       tslib: 2.6.2
 
-  '@aws-sdk/util-user-agent-browser@3.410.0':
+  '@aws-sdk/util-user-agent-browser@3.598.0':
     dependencies:
-      '@aws-sdk/types': 3.410.0
-      '@smithy/types': 2.6.0
+      '@aws-sdk/types': 3.598.0
+      '@smithy/types': 3.3.0
       bowser: 2.11.0
       tslib: 2.6.2
 
-  '@aws-sdk/util-user-agent-node@3.410.0':
+  '@aws-sdk/util-user-agent-node@3.598.0':
     dependencies:
-      '@aws-sdk/types': 3.410.0
-      '@smithy/node-config-provider': 2.0.11
-      '@smithy/types': 2.6.0
+      '@aws-sdk/types': 3.598.0
+      '@smithy/node-config-provider': 3.1.3
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@aws-sdk/util-utf8-browser@3.259.0':
-    dependencies:
-      tslib: 2.6.2
-
-  '@aws-sdk/xml-builder@3.310.0':
+  '@aws-sdk/xml-builder@3.598.0':
     dependencies:
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
   '@babel/code-frame@7.23.5':
@@ -11901,8 +12542,15 @@ snapshots:
       '@babel/highlight': 7.23.4
       chalk: 2.4.2
 
+  '@babel/code-frame@7.24.7':
+    dependencies:
+      '@babel/highlight': 7.24.7
+      picocolors: 1.0.0
+
   '@babel/compat-data@7.23.5': {}
 
+  '@babel/compat-data@7.24.7': {}
+
   '@babel/core@7.23.5':
     dependencies:
       '@ampproject/remapping': 2.2.1
@@ -11916,27 +12564,27 @@ snapshots:
       '@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.5(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/core@7.24.0':
+  '@babel/core@7.24.7':
     dependencies:
       '@ampproject/remapping': 2.2.1
-      '@babel/code-frame': 7.23.5
-      '@babel/generator': 7.23.6
-      '@babel/helper-compilation-targets': 7.23.6
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
-      '@babel/helpers': 7.24.0
-      '@babel/parser': 7.24.0
-      '@babel/template': 7.24.0
-      '@babel/traverse': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/code-frame': 7.24.7
+      '@babel/generator': 7.24.7
+      '@babel/helper-compilation-targets': 7.24.7
+      '@babel/helper-module-transforms': 7.24.7(@babel/core@7.24.7)
+      '@babel/helpers': 7.24.7
+      '@babel/parser': 7.24.7
+      '@babel/template': 7.24.7
+      '@babel/traverse': 7.24.7
+      '@babel/types': 7.24.7
       convert-source-map: 2.0.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -11950,20 +12598,23 @@ snapshots:
       '@jridgewell/trace-mapping': 0.3.18
       jsesc: 2.5.2
 
-  '@babel/generator@7.23.6':
+  '@babel/generator@7.24.7':
     dependencies:
-      '@babel/types': 7.24.0
-      '@jridgewell/gen-mapping': 0.3.2
-      '@jridgewell/trace-mapping': 0.3.18
+      '@babel/types': 7.24.7
+      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/trace-mapping': 0.3.25
       jsesc: 2.5.2
 
-  '@babel/helper-annotate-as-pure@7.22.5':
+  '@babel/helper-annotate-as-pure@7.24.7':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.7
 
-  '@babel/helper-builder-binary-assignment-operator-visitor@7.22.15':
+  '@babel/helper-builder-binary-assignment-operator-visitor@7.24.7':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/traverse': 7.24.7
+      '@babel/types': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
 
   '@babel/helper-compilation-targets@7.22.15':
     dependencies:
@@ -11973,40 +12624,42 @@ snapshots:
       lru-cache: 5.1.1
       semver: 6.3.1
 
-  '@babel/helper-compilation-targets@7.23.6':
+  '@babel/helper-compilation-targets@7.24.7':
     dependencies:
-      '@babel/compat-data': 7.23.5
-      '@babel/helper-validator-option': 7.23.5
+      '@babel/compat-data': 7.24.7
+      '@babel/helper-validator-option': 7.24.7
       browserslist: 4.23.0
       lru-cache: 5.1.1
       semver: 6.3.1
 
-  '@babel/helper-create-class-features-plugin@7.23.5(@babel/core@7.24.0)':
+  '@babel/helper-create-class-features-plugin@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-function-name': 7.23.0
-      '@babel/helper-member-expression-to-functions': 7.23.0
-      '@babel/helper-optimise-call-expression': 7.22.5
-      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.24.0)
-      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
+      '@babel/core': 7.24.7
+      '@babel/helper-annotate-as-pure': 7.24.7
+      '@babel/helper-environment-visitor': 7.24.7
+      '@babel/helper-function-name': 7.24.7
+      '@babel/helper-member-expression-to-functions': 7.24.7
+      '@babel/helper-optimise-call-expression': 7.24.7
+      '@babel/helper-replace-supers': 7.24.7(@babel/core@7.24.7)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.24.7
+      '@babel/helper-split-export-declaration': 7.24.7
       semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/helper-create-regexp-features-plugin@7.22.15(@babel/core@7.24.0)':
+  '@babel/helper-create-regexp-features-plugin@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-annotate-as-pure': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-annotate-as-pure': 7.24.7
       regexpu-core: 5.3.2
       semver: 6.3.1
 
-  '@babel/helper-define-polyfill-provider@0.4.3(@babel/core@7.24.0)':
+  '@babel/helper-define-polyfill-provider@0.6.2(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-compilation-targets': 7.23.6
-      '@babel/helper-plugin-utils': 7.22.5
-      debug: 4.3.4(supports-color@8.1.1)
+      '@babel/core': 7.24.7
+      '@babel/helper-compilation-targets': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      debug: 4.3.5(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -12014,23 +12667,46 @@ snapshots:
 
   '@babel/helper-environment-visitor@7.22.20': {}
 
+  '@babel/helper-environment-visitor@7.24.7':
+    dependencies:
+      '@babel/types': 7.24.7
+
   '@babel/helper-function-name@7.23.0':
     dependencies:
-      '@babel/template': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/template': 7.24.7
+      '@babel/types': 7.24.7
+
+  '@babel/helper-function-name@7.24.7':
+    dependencies:
+      '@babel/template': 7.24.7
+      '@babel/types': 7.24.7
 
   '@babel/helper-hoist-variables@7.22.5':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.7
 
-  '@babel/helper-member-expression-to-functions@7.23.0':
+  '@babel/helper-hoist-variables@7.24.7':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.7
+
+  '@babel/helper-member-expression-to-functions@7.24.7':
+    dependencies:
+      '@babel/traverse': 7.24.7
+      '@babel/types': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
 
   '@babel/helper-module-imports@7.22.15':
     dependencies:
       '@babel/types': 7.23.5
 
+  '@babel/helper-module-imports@7.24.7':
+    dependencies:
+      '@babel/traverse': 7.24.7
+      '@babel/types': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/helper-module-transforms@7.23.3(@babel/core@7.23.5)':
     dependencies:
       '@babel/core': 7.23.5
@@ -12040,58 +12716,89 @@ snapshots:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/helper-validator-identifier': 7.22.20
 
-  '@babel/helper-module-transforms@7.23.3(@babel/core@7.24.0)':
+  '@babel/helper-module-transforms@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-module-imports': 7.22.15
-      '@babel/helper-simple-access': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/helper-validator-identifier': 7.22.20
+      '@babel/core': 7.24.7
+      '@babel/helper-environment-visitor': 7.24.7
+      '@babel/helper-module-imports': 7.24.7
+      '@babel/helper-simple-access': 7.24.7
+      '@babel/helper-split-export-declaration': 7.24.7
+      '@babel/helper-validator-identifier': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/helper-optimise-call-expression@7.22.5':
+  '@babel/helper-optimise-call-expression@7.24.7':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.7
 
   '@babel/helper-plugin-utils@7.22.5': {}
 
-  '@babel/helper-remap-async-to-generator@7.22.20(@babel/core@7.24.0)':
-    dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-wrap-function': 7.22.20
+  '@babel/helper-plugin-utils@7.24.7': {}
 
-  '@babel/helper-replace-supers@7.22.20(@babel/core@7.24.0)':
+  '@babel/helper-remap-async-to-generator@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-member-expression-to-functions': 7.23.0
-      '@babel/helper-optimise-call-expression': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-annotate-as-pure': 7.24.7
+      '@babel/helper-environment-visitor': 7.24.7
+      '@babel/helper-wrap-function': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-replace-supers@7.24.7(@babel/core@7.24.7)':
+    dependencies:
+      '@babel/core': 7.24.7
+      '@babel/helper-environment-visitor': 7.24.7
+      '@babel/helper-member-expression-to-functions': 7.24.7
+      '@babel/helper-optimise-call-expression': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
 
   '@babel/helper-simple-access@7.22.5':
     dependencies:
       '@babel/types': 7.23.5
 
-  '@babel/helper-skip-transparent-expression-wrappers@7.22.5':
+  '@babel/helper-simple-access@7.24.7':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/traverse': 7.24.7
+      '@babel/types': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-skip-transparent-expression-wrappers@7.24.7':
+    dependencies:
+      '@babel/traverse': 7.24.7
+      '@babel/types': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
 
   '@babel/helper-split-export-declaration@7.22.6':
     dependencies:
       '@babel/types': 7.23.5
 
+  '@babel/helper-split-export-declaration@7.24.7':
+    dependencies:
+      '@babel/types': 7.24.7
+
   '@babel/helper-string-parser@7.23.4': {}
 
+  '@babel/helper-string-parser@7.24.7': {}
+
   '@babel/helper-validator-identifier@7.22.20': {}
 
+  '@babel/helper-validator-identifier@7.24.7': {}
+
   '@babel/helper-validator-option@7.23.5': {}
 
-  '@babel/helper-wrap-function@7.22.20':
+  '@babel/helper-validator-option@7.24.7': {}
+
+  '@babel/helper-wrap-function@7.24.7':
     dependencies:
-      '@babel/helper-function-name': 7.23.0
-      '@babel/template': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/helper-function-name': 7.24.7
+      '@babel/template': 7.24.7
+      '@babel/traverse': 7.24.7
+      '@babel/types': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
 
   '@babel/helpers@7.23.5':
     dependencies:
@@ -12101,13 +12808,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helpers@7.24.0':
+  '@babel/helpers@7.24.7':
     dependencies:
-      '@babel/template': 7.24.0
-      '@babel/traverse': 7.24.0
-      '@babel/types': 7.24.0
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/template': 7.24.7
+      '@babel/types': 7.24.7
 
   '@babel/highlight@7.23.4':
     dependencies:
@@ -12115,48 +12819,63 @@ snapshots:
       chalk: 2.4.2
       js-tokens: 4.0.0
 
+  '@babel/highlight@7.24.7':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.24.7
+      chalk: 2.4.2
+      js-tokens: 4.0.0
+      picocolors: 1.0.0
+
   '@babel/parser@7.23.9':
     dependencies:
       '@babel/types': 7.23.5
 
-  '@babel/parser@7.24.0':
-    dependencies:
-      '@babel/types': 7.24.0
-
   '@babel/parser@7.24.5':
     dependencies:
       '@babel/types': 7.24.0
 
-  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.23.3(@babel/core@7.24.0)':
+  '@babel/parser@7.24.7':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/types': 7.24.7
 
-  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-environment-visitor': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.0)':
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.24.7
+      '@babel/plugin-transform-optional-chaining': 7.24.7(@babel/core@7.24.7)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.24.7(@babel/core@7.24.7)':
+    dependencies:
+      '@babel/core': 7.24.7
+      '@babel/helper-environment-visitor': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+
+  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.7)':
+    dependencies:
+      '@babel/core': 7.24.7
 
   '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.23.5)':
     dependencies:
       '@babel/core': 7.23.5
       '@babel/helper-plugin-utils': 7.22.5
 
-  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.7
       '@babel/helper-plugin-utils': 7.22.5
 
   '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.23.5)':
@@ -12169,49 +12888,49 @@ snapshots:
       '@babel/core': 7.23.5
       '@babel/helper-plugin-utils': 7.22.5
 
-  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.7
       '@babel/helper-plugin-utils': 7.22.5
 
-  '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-syntax-flow@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-flow@7.23.3(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-syntax-import-assertions@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-import-assertions@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-syntax-import-attributes@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-import-attributes@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
   '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.23.5)':
     dependencies:
       '@babel/core': 7.23.5
       '@babel/helper-plugin-utils': 7.22.5
 
-  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.7
       '@babel/helper-plugin-utils': 7.22.5
 
   '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.23.5)':
@@ -12219,9 +12938,9 @@ snapshots:
       '@babel/core': 7.23.5
       '@babel/helper-plugin-utils': 7.22.5
 
-  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.7
       '@babel/helper-plugin-utils': 7.22.5
 
   '@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.23.5)':
@@ -12229,9 +12948,9 @@ snapshots:
       '@babel/core': 7.23.5
       '@babel/helper-plugin-utils': 7.22.5
 
-  '@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.7
       '@babel/helper-plugin-utils': 7.22.5
 
   '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.23.5)':
@@ -12239,9 +12958,9 @@ snapshots:
       '@babel/core': 7.23.5
       '@babel/helper-plugin-utils': 7.22.5
 
-  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.7
       '@babel/helper-plugin-utils': 7.22.5
 
   '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.23.5)':
@@ -12249,9 +12968,9 @@ snapshots:
       '@babel/core': 7.23.5
       '@babel/helper-plugin-utils': 7.22.5
 
-  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.7
       '@babel/helper-plugin-utils': 7.22.5
 
   '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.23.5)':
@@ -12259,9 +12978,9 @@ snapshots:
       '@babel/core': 7.23.5
       '@babel/helper-plugin-utils': 7.22.5
 
-  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.7
       '@babel/helper-plugin-utils': 7.22.5
 
   '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.23.5)':
@@ -12269,9 +12988,9 @@ snapshots:
       '@babel/core': 7.23.5
       '@babel/helper-plugin-utils': 7.22.5
 
-  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.7
       '@babel/helper-plugin-utils': 7.22.5
 
   '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.23.5)':
@@ -12279,9 +12998,9 @@ snapshots:
       '@babel/core': 7.23.5
       '@babel/helper-plugin-utils': 7.22.5
 
-  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.7
       '@babel/helper-plugin-utils': 7.22.5
 
   '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.23.5)':
@@ -12289,24 +13008,24 @@ snapshots:
       '@babel/core': 7.23.5
       '@babel/helper-plugin-utils': 7.22.5
 
-  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.7
       '@babel/helper-plugin-utils': 7.22.5
 
-  '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
   '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.23.5)':
     dependencies:
       '@babel/core': 7.23.5
       '@babel/helper-plugin-utils': 7.22.5
 
-  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.7
       '@babel/helper-plugin-utils': 7.22.5
 
   '@babel/plugin-syntax-typescript@7.23.3(@babel/core@7.23.5)':
@@ -12314,435 +13033,471 @@ snapshots:
       '@babel/core': 7.23.5
       '@babel/helper-plugin-utils': 7.22.5
 
-  '@babel/plugin-syntax-typescript@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-typescript@7.23.3(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.7
       '@babel/helper-plugin-utils': 7.22.5
 
-  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-create-regexp-features-plugin': 7.24.7(@babel/core@7.24.7)
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-arrow-functions@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-arrow-functions@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-async-generator-functions@7.23.4(@babel/core@7.24.0)':
+  '@babel/plugin-transform-async-generator-functions@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.24.0)
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-environment-visitor': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/helper-remap-async-to-generator': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.7)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-async-to-generator@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-async-to-generator@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-module-imports': 7.22.15
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-module-imports': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/helper-remap-async-to-generator': 7.24.7(@babel/core@7.24.7)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-block-scoped-functions@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-block-scoped-functions@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-block-scoping@7.23.4(@babel/core@7.24.0)':
+  '@babel/plugin-transform-block-scoping@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-class-properties@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-class-properties@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-class-features-plugin': 7.23.5(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-create-class-features-plugin': 7.24.7(@babel/core@7.24.7)
+      '@babel/helper-plugin-utils': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-class-static-block@7.23.4(@babel/core@7.24.0)':
+  '@babel/plugin-transform-class-static-block@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-class-features-plugin': 7.23.5(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-create-class-features-plugin': 7.24.7(@babel/core@7.24.7)
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.7)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-classes@7.23.5(@babel/core@7.24.0)':
+  '@babel/plugin-transform-classes@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-compilation-targets': 7.23.6
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-function-name': 7.23.0
-      '@babel/helper-optimise-call-expression': 7.22.5
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.24.0)
-      '@babel/helper-split-export-declaration': 7.22.6
+      '@babel/core': 7.24.7
+      '@babel/helper-annotate-as-pure': 7.24.7
+      '@babel/helper-compilation-targets': 7.24.7
+      '@babel/helper-environment-visitor': 7.24.7
+      '@babel/helper-function-name': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/helper-replace-supers': 7.24.7(@babel/core@7.24.7)
+      '@babel/helper-split-export-declaration': 7.24.7
       globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-computed-properties@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-computed-properties@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/template': 7.24.0
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/template': 7.24.7
 
-  '@babel/plugin-transform-destructuring@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-destructuring@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-dotall-regex@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-dotall-regex@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-create-regexp-features-plugin': 7.24.7(@babel/core@7.24.7)
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-duplicate-keys@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-duplicate-keys@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-dynamic-import@7.23.4(@babel/core@7.24.0)':
+  '@babel/plugin-transform-dynamic-import@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.7)
 
-  '@babel/plugin-transform-exponentiation-operator@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-exponentiation-operator@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.15
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-builder-binary-assignment-operator-visitor': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-export-namespace-from@7.23.4(@babel/core@7.24.0)':
+  '@babel/plugin-transform-export-namespace-from@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.7)
 
-  '@babel/plugin-transform-flow-strip-types@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-flow-strip-types@7.23.3(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-flow': 7.23.3(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/plugin-syntax-flow': 7.23.3(@babel/core@7.24.7)
 
-  '@babel/plugin-transform-for-of@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-for-of@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-function-name@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-function-name@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-compilation-targets': 7.23.6
-      '@babel/helper-function-name': 7.23.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-compilation-targets': 7.24.7
+      '@babel/helper-function-name': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-json-strings@7.23.4(@babel/core@7.24.0)':
+  '@babel/plugin-transform-json-strings@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.7)
 
-  '@babel/plugin-transform-literals@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-literals@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-logical-assignment-operators@7.23.4(@babel/core@7.24.0)':
+  '@babel/plugin-transform-logical-assignment-operators@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.7)
 
-  '@babel/plugin-transform-member-expression-literals@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-member-expression-literals@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-modules-amd@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-modules-amd@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-module-transforms': 7.24.7(@babel/core@7.24.7)
+      '@babel/helper-plugin-utils': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-modules-commonjs@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-modules-commonjs@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-simple-access': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-module-transforms': 7.24.7(@babel/core@7.24.7)
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/helper-simple-access': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-modules-systemjs@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-modules-systemjs@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-hoist-variables': 7.22.5
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-validator-identifier': 7.22.20
+      '@babel/core': 7.24.7
+      '@babel/helper-hoist-variables': 7.24.7
+      '@babel/helper-module-transforms': 7.24.7(@babel/core@7.24.7)
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/helper-validator-identifier': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-modules-umd@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-modules-umd@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-module-transforms': 7.24.7(@babel/core@7.24.7)
+      '@babel/helper-plugin-utils': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.24.0)':
+  '@babel/plugin-transform-named-capturing-groups-regex@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-create-regexp-features-plugin': 7.24.7(@babel/core@7.24.7)
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-new-target@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-new-target@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-nullish-coalescing-operator@7.23.4(@babel/core@7.24.0)':
+  '@babel/plugin-transform-nullish-coalescing-operator@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.7)
 
-  '@babel/plugin-transform-numeric-separator@7.23.4(@babel/core@7.24.0)':
+  '@babel/plugin-transform-numeric-separator@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.7)
 
-  '@babel/plugin-transform-object-rest-spread@7.23.4(@babel/core@7.24.0)':
+  '@babel/plugin-transform-object-rest-spread@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/compat-data': 7.23.5
-      '@babel/core': 7.24.0
-      '@babel/helper-compilation-targets': 7.23.6
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-compilation-targets': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.7)
+      '@babel/plugin-transform-parameters': 7.24.7(@babel/core@7.24.7)
 
-  '@babel/plugin-transform-object-super@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-object-super@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/helper-replace-supers': 7.24.7(@babel/core@7.24.7)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-optional-catch-binding@7.23.4(@babel/core@7.24.0)':
+  '@babel/plugin-transform-optional-catch-binding@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.7)
 
-  '@babel/plugin-transform-optional-chaining@7.23.4(@babel/core@7.24.0)':
+  '@babel/plugin-transform-optional-chaining@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.24.7
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.7)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-parameters@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-parameters@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-private-methods@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-private-methods@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-class-features-plugin': 7.23.5(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-create-class-features-plugin': 7.24.7(@babel/core@7.24.7)
+      '@babel/helper-plugin-utils': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-private-property-in-object@7.23.4(@babel/core@7.24.0)':
+  '@babel/plugin-transform-private-property-in-object@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-create-class-features-plugin': 7.23.5(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-annotate-as-pure': 7.24.7
+      '@babel/helper-create-class-features-plugin': 7.24.7(@babel/core@7.24.7)
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.7)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-property-literals@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-property-literals@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-regenerator@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-regenerator@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
       regenerator-transform: 0.15.2
 
-  '@babel/plugin-transform-reserved-words@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-reserved-words@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-shorthand-properties@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-shorthand-properties@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-spread@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-spread@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-sticky-regex@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-sticky-regex@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-template-literals@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-template-literals@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-typeof-symbol@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-typeof-symbol@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-typescript@7.23.5(@babel/core@7.24.0)':
+  '@babel/plugin-transform-typescript@7.23.5(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-create-class-features-plugin': 7.23.5(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-annotate-as-pure': 7.24.7
+      '@babel/helper-create-class-features-plugin': 7.24.7(@babel/core@7.24.7)
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.24.7)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-unicode-escapes@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-unicode-escapes@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-unicode-property-regex@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-unicode-property-regex@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-create-regexp-features-plugin': 7.24.7(@babel/core@7.24.7)
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-unicode-regex@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-unicode-regex@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-create-regexp-features-plugin': 7.24.7(@babel/core@7.24.7)
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/plugin-transform-unicode-sets-regex@7.23.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-unicode-sets-regex@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.24.7
+      '@babel/helper-create-regexp-features-plugin': 7.24.7(@babel/core@7.24.7)
+      '@babel/helper-plugin-utils': 7.24.7
 
-  '@babel/preset-env@7.23.5(@babel/core@7.24.0)':
+  '@babel/preset-env@7.24.7(@babel/core@7.24.7)':
     dependencies:
-      '@babel/compat-data': 7.23.5
-      '@babel/core': 7.24.0
-      '@babel/helper-compilation-targets': 7.23.6
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-validator-option': 7.23.5
-      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.0)
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.0)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.24.0)
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.0)
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-import-assertions': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-import-attributes': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.24.0)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.0)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.0)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.0)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.24.0)
-      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.24.0)
-      '@babel/plugin-transform-arrow-functions': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-async-generator-functions': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-async-to-generator': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-block-scoped-functions': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-class-properties': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-class-static-block': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-classes': 7.23.5(@babel/core@7.24.0)
-      '@babel/plugin-transform-computed-properties': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-destructuring': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-dotall-regex': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-duplicate-keys': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-dynamic-import': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-exponentiation-operator': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-export-namespace-from': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-for-of': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-function-name': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-json-strings': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-literals': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-logical-assignment-operators': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-member-expression-literals': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-modules-amd': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-modules-systemjs': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-modules-umd': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.24.0)
-      '@babel/plugin-transform-new-target': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-nullish-coalescing-operator': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-numeric-separator': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-object-rest-spread': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-object-super': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-optional-catch-binding': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-private-methods': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-private-property-in-object': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-property-literals': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-regenerator': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-reserved-words': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-shorthand-properties': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-spread': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-sticky-regex': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-template-literals': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-typeof-symbol': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-unicode-escapes': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-unicode-property-regex': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-unicode-regex': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-unicode-sets-regex': 7.23.3(@babel/core@7.24.0)
-      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.24.0)
-      babel-plugin-polyfill-corejs2: 0.4.6(@babel/core@7.24.0)
-      babel-plugin-polyfill-corejs3: 0.8.6(@babel/core@7.24.0)
-      babel-plugin-polyfill-regenerator: 0.5.3(@babel/core@7.24.0)
-      core-js-compat: 3.33.3
+      '@babel/compat-data': 7.24.7
+      '@babel/core': 7.24.7
+      '@babel/helper-compilation-targets': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/helper-validator-option': 7.24.7
+      '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.7)
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.7)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.24.7)
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.7)
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.7)
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.7)
+      '@babel/plugin-syntax-import-assertions': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-syntax-import-attributes': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.24.7)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.7)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.7)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.7)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.7)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.7)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.7)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.7)
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.7)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.24.7)
+      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.24.7)
+      '@babel/plugin-transform-arrow-functions': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-async-generator-functions': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-async-to-generator': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-block-scoped-functions': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-block-scoping': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-class-properties': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-class-static-block': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-classes': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-computed-properties': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-destructuring': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-dotall-regex': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-duplicate-keys': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-dynamic-import': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-exponentiation-operator': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-export-namespace-from': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-for-of': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-function-name': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-json-strings': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-literals': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-logical-assignment-operators': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-member-expression-literals': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-modules-amd': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-modules-commonjs': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-modules-systemjs': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-modules-umd': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-new-target': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-numeric-separator': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-object-rest-spread': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-object-super': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-optional-catch-binding': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-optional-chaining': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-parameters': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-private-methods': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-private-property-in-object': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-property-literals': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-regenerator': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-reserved-words': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-shorthand-properties': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-spread': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-sticky-regex': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-template-literals': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-typeof-symbol': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-unicode-escapes': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-unicode-property-regex': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-unicode-regex': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-unicode-sets-regex': 7.24.7(@babel/core@7.24.7)
+      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.24.7)
+      babel-plugin-polyfill-corejs2: 0.4.11(@babel/core@7.24.7)
+      babel-plugin-polyfill-corejs3: 0.10.4(@babel/core@7.24.7)
+      babel-plugin-polyfill-regenerator: 0.6.2(@babel/core@7.24.7)
+      core-js-compat: 3.37.1
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/preset-flow@7.23.3(@babel/core@7.24.0)':
+  '@babel/preset-flow@7.23.3(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-validator-option': 7.23.5
-      '@babel/plugin-transform-flow-strip-types': 7.23.3(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/helper-validator-option': 7.24.7
+      '@babel/plugin-transform-flow-strip-types': 7.23.3(@babel/core@7.24.7)
 
-  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.24.0)':
+  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/types': 7.24.0
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/types': 7.24.7
       esutils: 2.0.3
 
-  '@babel/preset-typescript@7.23.3(@babel/core@7.24.0)':
+  '@babel/preset-typescript@7.23.3(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-validator-option': 7.23.5
-      '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-typescript': 7.23.5(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.7
+      '@babel/helper-validator-option': 7.24.7
+      '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.24.7)
+      '@babel/plugin-transform-modules-commonjs': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-typescript': 7.23.5(@babel/core@7.24.7)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/register@7.22.15(@babel/core@7.24.0)':
+  '@babel/register@7.22.15(@babel/core@7.24.7)':
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.7
       clone-deep: 4.0.1
       find-cache-dir: 2.1.0
       make-dir: 2.1.0
@@ -12763,9 +13518,15 @@ snapshots:
 
   '@babel/template@7.24.0':
     dependencies:
-      '@babel/code-frame': 7.23.5
-      '@babel/parser': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/code-frame': 7.24.7
+      '@babel/parser': 7.24.7
+      '@babel/types': 7.24.7
+
+  '@babel/template@7.24.7':
+    dependencies:
+      '@babel/code-frame': 7.24.7
+      '@babel/parser': 7.24.7
+      '@babel/types': 7.24.7
 
   '@babel/traverse@7.23.5':
     dependencies:
@@ -12777,22 +13538,22 @@ snapshots:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/parser': 7.23.9
       '@babel/types': 7.23.5
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/traverse@7.24.0':
+  '@babel/traverse@7.24.7':
     dependencies:
-      '@babel/code-frame': 7.23.5
-      '@babel/generator': 7.23.6
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-function-name': 7.23.0
-      '@babel/helper-hoist-variables': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/parser': 7.24.0
-      '@babel/types': 7.24.0
-      debug: 4.3.4(supports-color@8.1.1)
+      '@babel/code-frame': 7.24.7
+      '@babel/generator': 7.24.7
+      '@babel/helper-environment-visitor': 7.24.7
+      '@babel/helper-function-name': 7.24.7
+      '@babel/helper-hoist-variables': 7.24.7
+      '@babel/helper-split-export-declaration': 7.24.7
+      '@babel/parser': 7.24.7
+      '@babel/types': 7.24.7
+      debug: 4.3.5(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -12809,26 +13570,32 @@ snapshots:
       '@babel/helper-validator-identifier': 7.22.20
       to-fast-properties: 2.0.0
 
+  '@babel/types@7.24.7':
+    dependencies:
+      '@babel/helper-string-parser': 7.24.7
+      '@babel/helper-validator-identifier': 7.24.7
+      to-fast-properties: 2.0.0
+
   '@base2/pretty-print-object@1.0.1': {}
 
   '@bcoe/v8-coverage@0.2.3': {}
 
-  '@bull-board/api@5.17.0(@bull-board/ui@5.17.0)':
+  '@bull-board/api@5.20.5(@bull-board/ui@5.20.5)':
     dependencies:
-      '@bull-board/ui': 5.17.0
+      '@bull-board/ui': 5.20.5
       redis-info: 3.1.0
 
-  '@bull-board/fastify@5.17.0':
+  '@bull-board/fastify@5.20.5':
     dependencies:
-      '@bull-board/api': 5.17.0(@bull-board/ui@5.17.0)
-      '@bull-board/ui': 5.17.0
+      '@bull-board/api': 5.20.5(@bull-board/ui@5.20.5)
+      '@bull-board/ui': 5.20.5
       '@fastify/static': 6.12.0
       '@fastify/view': 8.2.0
-      ejs: 3.1.9
+      ejs: 3.1.10
 
-  '@bull-board/ui@5.17.0':
+  '@bull-board/ui@5.20.5':
     dependencies:
-      '@bull-board/api': 5.17.0(@bull-board/ui@5.17.0)
+      '@bull-board/api': 5.20.5(@bull-board/ui@5.20.5)
 
   '@bundled-es-modules/cookie@2.0.0':
     dependencies:
@@ -12926,7 +13693,7 @@ snapshots:
       performance-now: 2.1.0
       qs: 6.10.4
       safe-buffer: 5.2.1
-      tough-cookie: 4.1.3
+      tough-cookie: 4.1.4
       tunnel-agent: 0.6.0
       uuid: 8.3.2
 
@@ -12966,7 +13733,10 @@ snapshots:
   '@esbuild/aix-ppc64@0.19.11':
     optional: true
 
-  '@esbuild/aix-ppc64@0.20.2':
+  '@esbuild/aix-ppc64@0.21.5':
+    optional: true
+
+  '@esbuild/aix-ppc64@0.22.0':
     optional: true
 
   '@esbuild/android-arm64@0.18.20':
@@ -12975,7 +13745,10 @@ snapshots:
   '@esbuild/android-arm64@0.19.11':
     optional: true
 
-  '@esbuild/android-arm64@0.20.2':
+  '@esbuild/android-arm64@0.21.5':
+    optional: true
+
+  '@esbuild/android-arm64@0.22.0':
     optional: true
 
   '@esbuild/android-arm@0.18.20':
@@ -12984,7 +13757,10 @@ snapshots:
   '@esbuild/android-arm@0.19.11':
     optional: true
 
-  '@esbuild/android-arm@0.20.2':
+  '@esbuild/android-arm@0.21.5':
+    optional: true
+
+  '@esbuild/android-arm@0.22.0':
     optional: true
 
   '@esbuild/android-x64@0.18.20':
@@ -12993,7 +13769,10 @@ snapshots:
   '@esbuild/android-x64@0.19.11':
     optional: true
 
-  '@esbuild/android-x64@0.20.2':
+  '@esbuild/android-x64@0.21.5':
+    optional: true
+
+  '@esbuild/android-x64@0.22.0':
     optional: true
 
   '@esbuild/darwin-arm64@0.18.20':
@@ -13002,7 +13781,10 @@ snapshots:
   '@esbuild/darwin-arm64@0.19.11':
     optional: true
 
-  '@esbuild/darwin-arm64@0.20.2':
+  '@esbuild/darwin-arm64@0.21.5':
+    optional: true
+
+  '@esbuild/darwin-arm64@0.22.0':
     optional: true
 
   '@esbuild/darwin-x64@0.18.20':
@@ -13011,7 +13793,10 @@ snapshots:
   '@esbuild/darwin-x64@0.19.11':
     optional: true
 
-  '@esbuild/darwin-x64@0.20.2':
+  '@esbuild/darwin-x64@0.21.5':
+    optional: true
+
+  '@esbuild/darwin-x64@0.22.0':
     optional: true
 
   '@esbuild/freebsd-arm64@0.18.20':
@@ -13020,7 +13805,10 @@ snapshots:
   '@esbuild/freebsd-arm64@0.19.11':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.20.2':
+  '@esbuild/freebsd-arm64@0.21.5':
+    optional: true
+
+  '@esbuild/freebsd-arm64@0.22.0':
     optional: true
 
   '@esbuild/freebsd-x64@0.18.20':
@@ -13029,7 +13817,10 @@ snapshots:
   '@esbuild/freebsd-x64@0.19.11':
     optional: true
 
-  '@esbuild/freebsd-x64@0.20.2':
+  '@esbuild/freebsd-x64@0.21.5':
+    optional: true
+
+  '@esbuild/freebsd-x64@0.22.0':
     optional: true
 
   '@esbuild/linux-arm64@0.18.20':
@@ -13038,7 +13829,10 @@ snapshots:
   '@esbuild/linux-arm64@0.19.11':
     optional: true
 
-  '@esbuild/linux-arm64@0.20.2':
+  '@esbuild/linux-arm64@0.21.5':
+    optional: true
+
+  '@esbuild/linux-arm64@0.22.0':
     optional: true
 
   '@esbuild/linux-arm@0.18.20':
@@ -13047,7 +13841,10 @@ snapshots:
   '@esbuild/linux-arm@0.19.11':
     optional: true
 
-  '@esbuild/linux-arm@0.20.2':
+  '@esbuild/linux-arm@0.21.5':
+    optional: true
+
+  '@esbuild/linux-arm@0.22.0':
     optional: true
 
   '@esbuild/linux-ia32@0.18.20':
@@ -13056,7 +13853,10 @@ snapshots:
   '@esbuild/linux-ia32@0.19.11':
     optional: true
 
-  '@esbuild/linux-ia32@0.20.2':
+  '@esbuild/linux-ia32@0.21.5':
+    optional: true
+
+  '@esbuild/linux-ia32@0.22.0':
     optional: true
 
   '@esbuild/linux-loong64@0.18.20':
@@ -13065,7 +13865,10 @@ snapshots:
   '@esbuild/linux-loong64@0.19.11':
     optional: true
 
-  '@esbuild/linux-loong64@0.20.2':
+  '@esbuild/linux-loong64@0.21.5':
+    optional: true
+
+  '@esbuild/linux-loong64@0.22.0':
     optional: true
 
   '@esbuild/linux-mips64el@0.18.20':
@@ -13074,7 +13877,10 @@ snapshots:
   '@esbuild/linux-mips64el@0.19.11':
     optional: true
 
-  '@esbuild/linux-mips64el@0.20.2':
+  '@esbuild/linux-mips64el@0.21.5':
+    optional: true
+
+  '@esbuild/linux-mips64el@0.22.0':
     optional: true
 
   '@esbuild/linux-ppc64@0.18.20':
@@ -13083,7 +13889,10 @@ snapshots:
   '@esbuild/linux-ppc64@0.19.11':
     optional: true
 
-  '@esbuild/linux-ppc64@0.20.2':
+  '@esbuild/linux-ppc64@0.21.5':
+    optional: true
+
+  '@esbuild/linux-ppc64@0.22.0':
     optional: true
 
   '@esbuild/linux-riscv64@0.18.20':
@@ -13092,7 +13901,10 @@ snapshots:
   '@esbuild/linux-riscv64@0.19.11':
     optional: true
 
-  '@esbuild/linux-riscv64@0.20.2':
+  '@esbuild/linux-riscv64@0.21.5':
+    optional: true
+
+  '@esbuild/linux-riscv64@0.22.0':
     optional: true
 
   '@esbuild/linux-s390x@0.18.20':
@@ -13101,7 +13913,10 @@ snapshots:
   '@esbuild/linux-s390x@0.19.11':
     optional: true
 
-  '@esbuild/linux-s390x@0.20.2':
+  '@esbuild/linux-s390x@0.21.5':
+    optional: true
+
+  '@esbuild/linux-s390x@0.22.0':
     optional: true
 
   '@esbuild/linux-x64@0.18.20':
@@ -13110,7 +13925,10 @@ snapshots:
   '@esbuild/linux-x64@0.19.11':
     optional: true
 
-  '@esbuild/linux-x64@0.20.2':
+  '@esbuild/linux-x64@0.21.5':
+    optional: true
+
+  '@esbuild/linux-x64@0.22.0':
     optional: true
 
   '@esbuild/netbsd-x64@0.18.20':
@@ -13119,7 +13937,13 @@ snapshots:
   '@esbuild/netbsd-x64@0.19.11':
     optional: true
 
-  '@esbuild/netbsd-x64@0.20.2':
+  '@esbuild/netbsd-x64@0.21.5':
+    optional: true
+
+  '@esbuild/netbsd-x64@0.22.0':
+    optional: true
+
+  '@esbuild/openbsd-arm64@0.22.0':
     optional: true
 
   '@esbuild/openbsd-x64@0.18.20':
@@ -13128,7 +13952,10 @@ snapshots:
   '@esbuild/openbsd-x64@0.19.11':
     optional: true
 
-  '@esbuild/openbsd-x64@0.20.2':
+  '@esbuild/openbsd-x64@0.21.5':
+    optional: true
+
+  '@esbuild/openbsd-x64@0.22.0':
     optional: true
 
   '@esbuild/sunos-x64@0.18.20':
@@ -13137,7 +13964,10 @@ snapshots:
   '@esbuild/sunos-x64@0.19.11':
     optional: true
 
-  '@esbuild/sunos-x64@0.20.2':
+  '@esbuild/sunos-x64@0.21.5':
+    optional: true
+
+  '@esbuild/sunos-x64@0.22.0':
     optional: true
 
   '@esbuild/win32-arm64@0.18.20':
@@ -13146,7 +13976,10 @@ snapshots:
   '@esbuild/win32-arm64@0.19.11':
     optional: true
 
-  '@esbuild/win32-arm64@0.20.2':
+  '@esbuild/win32-arm64@0.21.5':
+    optional: true
+
+  '@esbuild/win32-arm64@0.22.0':
     optional: true
 
   '@esbuild/win32-ia32@0.18.20':
@@ -13155,7 +13988,10 @@ snapshots:
   '@esbuild/win32-ia32@0.19.11':
     optional: true
 
-  '@esbuild/win32-ia32@0.20.2':
+  '@esbuild/win32-ia32@0.21.5':
+    optional: true
+
+  '@esbuild/win32-ia32@0.22.0':
     optional: true
 
   '@esbuild/win32-x64@0.18.20':
@@ -13164,30 +14000,38 @@ snapshots:
   '@esbuild/win32-x64@0.19.11':
     optional: true
 
-  '@esbuild/win32-x64@0.20.2':
+  '@esbuild/win32-x64@0.21.5':
     optional: true
 
-  '@eslint-community/eslint-utils@4.4.0(eslint@8.53.0)':
-    dependencies:
-      eslint: 8.53.0
-      eslint-visitor-keys: 3.4.3
+  '@esbuild/win32-x64@0.22.0':
+    optional: true
 
-  '@eslint-community/eslint-utils@4.4.0(eslint@8.57.0)':
+  '@eslint-community/eslint-utils@4.4.0(eslint@9.6.0)':
     dependencies:
-      eslint: 8.57.0
+      eslint: 9.6.0
       eslint-visitor-keys: 3.4.3
 
   '@eslint-community/regexpp@4.10.0': {}
 
   '@eslint-community/regexpp@4.6.2': {}
 
-  '@eslint/eslintrc@2.1.4':
+  '@eslint/compat@1.1.0': {}
+
+  '@eslint/config-array@0.17.0':
+    dependencies:
+      '@eslint/object-schema': 2.1.4
+      debug: 4.3.5(supports-color@8.1.1)
+      minimatch: 3.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint/eslintrc@3.1.0':
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.4(supports-color@8.1.1)
-      espree: 9.6.1
-      globals: 13.19.0
-      ignore: 5.2.4
+      debug: 4.3.5(supports-color@8.1.1)
+      espree: 10.1.0
+      globals: 14.0.0
+      ignore: 5.3.1
       import-fresh: 3.3.0
       js-yaml: 4.1.0
       minimatch: 3.1.2
@@ -13195,9 +14039,9 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint/js@8.53.0': {}
+  '@eslint/js@9.6.0': {}
 
-  '@eslint/js@8.57.0': {}
+  '@eslint/object-schema@2.1.4': {}
 
   '@fal-works/esbuild-plugin-global-externals@2.1.2': {}
 
@@ -13210,8 +14054,8 @@ snapshots:
 
   '@fastify/ajv-compiler@3.5.0':
     dependencies:
-      ajv: 8.13.0
-      ajv-formats: 2.1.1(ajv@8.13.0)
+      ajv: 8.16.0
+      ajv-formats: 2.1.1(ajv@8.16.0)
       fast-uri: 2.2.0
 
   '@fastify/busboy@2.1.0': {}
@@ -13246,12 +14090,12 @@ snapshots:
       '@fastify/reply-from': 9.0.1
       fast-querystring: 1.1.2
       fastify-plugin: 4.5.0
-      ws: 8.17.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
+      ws: 8.17.1(bufferutil@4.0.7)(utf-8-validate@6.0.3)
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
 
-  '@fastify/multipart@8.2.0':
+  '@fastify/multipart@8.3.0':
     dependencies:
       '@fastify/busboy': 2.1.0
       '@fastify/deepmerge': 1.3.0
@@ -13287,14 +14131,14 @@ snapshots:
       glob: 8.1.0
       p-limit: 3.1.0
 
-  '@fastify/static@7.0.3':
+  '@fastify/static@7.0.4':
     dependencies:
       '@fastify/accept-negotiator': 1.0.0
       '@fastify/send': 2.0.1
       content-disposition: 0.5.4
       fastify-plugin: 4.5.0
       fastq: 1.17.1
-      glob: 10.3.12
+      glob: 10.4.2
 
   '@fastify/view@8.2.0':
     dependencies:
@@ -13310,13 +14154,11 @@ snapshots:
 
   '@hapi/boom@10.0.1':
     dependencies:
-      '@hapi/hoek': 11.0.2
+      '@hapi/hoek': 11.0.4
 
   '@hapi/bourne@3.0.0': {}
 
-  '@hapi/hoek@10.0.1': {}
-
-  '@hapi/hoek@11.0.2': {}
+  '@hapi/hoek@11.0.4': {}
 
   '@hapi/hoek@9.3.0': {}
 
@@ -13328,40 +14170,22 @@ snapshots:
     dependencies:
       '@hapi/boom': 10.0.1
       '@hapi/bourne': 3.0.0
-      '@hapi/hoek': 11.0.2
+      '@hapi/hoek': 11.0.4
 
   '@hexagon/base64@1.1.27': {}
 
-  '@humanwhocodes/config-array@0.11.13':
-    dependencies:
-      '@humanwhocodes/object-schema': 2.0.1
-      debug: 4.3.4(supports-color@8.1.1)
-      minimatch: 3.1.2
-    transitivePeerDependencies:
-      - supports-color
-
-  '@humanwhocodes/config-array@0.11.14':
-    dependencies:
-      '@humanwhocodes/object-schema': 2.0.2
-      debug: 4.3.4(supports-color@8.1.1)
-      minimatch: 3.1.2
-    transitivePeerDependencies:
-      - supports-color
-
   '@humanwhocodes/module-importer@1.0.1': {}
 
   '@humanwhocodes/momoa@2.0.4': {}
 
-  '@humanwhocodes/object-schema@2.0.1': {}
+  '@humanwhocodes/retry@0.3.0': {}
 
-  '@humanwhocodes/object-schema@2.0.2': {}
-
-  '@img/sharp-darwin-arm64@0.33.3':
+  '@img/sharp-darwin-arm64@0.33.4':
     optionalDependencies:
       '@img/sharp-libvips-darwin-arm64': 1.0.2
     optional: true
 
-  '@img/sharp-darwin-x64@0.33.3':
+  '@img/sharp-darwin-x64@0.33.4':
     optionalDependencies:
       '@img/sharp-libvips-darwin-x64': 1.0.2
     optional: true
@@ -13390,45 +14214,45 @@ snapshots:
   '@img/sharp-libvips-linuxmusl-x64@1.0.2':
     optional: true
 
-  '@img/sharp-linux-arm64@0.33.3':
+  '@img/sharp-linux-arm64@0.33.4':
     optionalDependencies:
       '@img/sharp-libvips-linux-arm64': 1.0.2
     optional: true
 
-  '@img/sharp-linux-arm@0.33.3':
+  '@img/sharp-linux-arm@0.33.4':
     optionalDependencies:
       '@img/sharp-libvips-linux-arm': 1.0.2
     optional: true
 
-  '@img/sharp-linux-s390x@0.33.3':
+  '@img/sharp-linux-s390x@0.33.4':
     optionalDependencies:
       '@img/sharp-libvips-linux-s390x': 1.0.2
     optional: true
 
-  '@img/sharp-linux-x64@0.33.3':
+  '@img/sharp-linux-x64@0.33.4':
     optionalDependencies:
       '@img/sharp-libvips-linux-x64': 1.0.2
     optional: true
 
-  '@img/sharp-linuxmusl-arm64@0.33.3':
+  '@img/sharp-linuxmusl-arm64@0.33.4':
     optionalDependencies:
       '@img/sharp-libvips-linuxmusl-arm64': 1.0.2
     optional: true
 
-  '@img/sharp-linuxmusl-x64@0.33.3':
+  '@img/sharp-linuxmusl-x64@0.33.4':
     optionalDependencies:
       '@img/sharp-libvips-linuxmusl-x64': 1.0.2
     optional: true
 
-  '@img/sharp-wasm32@0.33.3':
+  '@img/sharp-wasm32@0.33.4':
     dependencies:
       '@emnapi/runtime': 1.1.1
     optional: true
 
-  '@img/sharp-win32-ia32@0.33.3':
+  '@img/sharp-win32-ia32@0.33.4':
     optional: true
 
-  '@img/sharp-win32-x64@0.33.3':
+  '@img/sharp-win32-x64@0.33.4':
     optional: true
 
   '@inquirer/confirm@3.1.6':
@@ -13441,7 +14265,7 @@ snapshots:
       '@inquirer/figures': 1.0.1
       '@inquirer/type': 1.3.1
       '@types/mute-stream': 0.0.4
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       '@types/wrap-ansi': 3.0.0
       ansi-escapes: 4.3.2
       chalk: 4.1.2
@@ -13464,7 +14288,7 @@ snapshots:
   '@intlify/message-compiler@9.13.1':
     dependencies:
       '@intlify/shared': 9.13.1
-      source-map-js: 1.0.2
+      source-map-js: 1.2.0
 
   '@intlify/shared@9.13.1': {}
 
@@ -13492,7 +14316,7 @@ snapshots:
   '@jest/console@29.7.0':
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       chalk: 4.1.2
       jest-message-util: 29.7.0
       jest-util: 29.7.0
@@ -13505,14 +14329,14 @@ snapshots:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       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.12.7)
+      jest-config: 29.7.0(@types/node@20.14.9)
       jest-haste-map: 29.7.0
       jest-message-util: 29.7.0
       jest-regex-util: 29.6.3
@@ -13524,7 +14348,7 @@ snapshots:
       jest-util: 29.7.0
       jest-validate: 29.7.0
       jest-watcher: 29.7.0
-      micromatch: 4.0.5
+      micromatch: 4.0.7
       pretty-format: 29.7.0
       slash: 3.0.0
       strip-ansi: 6.0.1
@@ -13541,7 +14365,7 @@ snapshots:
     dependencies:
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       jest-mock: 29.7.0
 
   '@jest/expect-utils@29.7.0':
@@ -13559,7 +14383,7 @@ snapshots:
     dependencies:
       '@jest/types': 29.6.3
       '@sinonjs/fake-timers': 10.3.0
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       jest-message-util: 29.7.0
       jest-mock: 29.7.0
       jest-util: 29.7.0
@@ -13581,7 +14405,7 @@ snapshots:
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
       '@jridgewell/trace-mapping': 0.3.18
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       chalk: 4.1.2
       collect-v8-coverage: 1.0.1
       exit: 0.1.2
@@ -13639,7 +14463,7 @@ snapshots:
       jest-haste-map: 29.7.0
       jest-regex-util: 29.6.3
       jest-util: 29.7.0
-      micromatch: 4.0.5
+      micromatch: 4.0.7
       pirates: 4.0.5
       slash: 3.0.0
       write-file-atomic: 4.0.2
@@ -13651,19 +14475,19 @@ snapshots:
       '@jest/schemas': 29.6.3
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       '@types/yargs': 17.0.19
       chalk: 4.1.2
 
-  '@joshwooding/vite-plugin-react-docgen-typescript@0.3.0(typescript@5.5.2)(vite@5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3))':
+  '@joshwooding/vite-plugin-react-docgen-typescript@0.3.1(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))':
     dependencies:
       glob: 7.2.3
       glob-promise: 4.2.2(glob@7.2.3)
       magic-string: 0.27.0
-      react-docgen-typescript: 2.2.2(typescript@5.5.2)
-      vite: 5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3)
+      react-docgen-typescript: 2.2.2(typescript@5.5.3)
+      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)
     optionalDependencies:
-      typescript: 5.5.2
+      typescript: 5.5.3
 
   '@jridgewell/gen-mapping@0.3.2':
     dependencies:
@@ -13671,14 +14495,22 @@ snapshots:
       '@jridgewell/sourcemap-codec': 1.4.15
       '@jridgewell/trace-mapping': 0.3.18
 
+  '@jridgewell/gen-mapping@0.3.5':
+    dependencies:
+      '@jridgewell/set-array': 1.2.1
+      '@jridgewell/sourcemap-codec': 1.4.15
+      '@jridgewell/trace-mapping': 0.3.25
+
   '@jridgewell/resolve-uri@3.1.0': {}
 
   '@jridgewell/set-array@1.1.2': {}
 
+  '@jridgewell/set-array@1.2.1': {}
+
   '@jridgewell/source-map@0.3.5':
     dependencies:
-      '@jridgewell/gen-mapping': 0.3.2
-      '@jridgewell/trace-mapping': 0.3.18
+      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/trace-mapping': 0.3.25
 
   '@jridgewell/sourcemap-codec@1.4.14': {}
 
@@ -13689,6 +14521,11 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.0
       '@jridgewell/sourcemap-codec': 1.4.14
 
+  '@jridgewell/trace-mapping@0.3.25':
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.0
+      '@jridgewell/sourcemap-codec': 1.4.15
+
   '@jsdevtools/ono@7.1.3': {}
 
   '@kurkle/color@0.3.2': {}
@@ -13727,23 +14564,23 @@ snapshots:
       '@types/react': 18.0.28
       react: 18.3.1
 
-  '@microsoft/api-extractor-model@7.28.14(@types/node@20.12.7)':
+  '@microsoft/api-extractor-model@7.29.2(@types/node@20.14.9)':
     dependencies:
-      '@microsoft/tsdoc': 0.14.2
-      '@microsoft/tsdoc-config': 0.16.2
-      '@rushstack/node-core-library': 4.1.0(@types/node@20.12.7)
+      '@microsoft/tsdoc': 0.15.0
+      '@microsoft/tsdoc-config': 0.17.0
+      '@rushstack/node-core-library': 5.4.1(@types/node@20.14.9)
     transitivePeerDependencies:
       - '@types/node'
 
-  '@microsoft/api-extractor@7.43.1(@types/node@20.12.7)':
+  '@microsoft/api-extractor@7.47.0(@types/node@20.14.9)':
     dependencies:
-      '@microsoft/api-extractor-model': 7.28.14(@types/node@20.12.7)
-      '@microsoft/tsdoc': 0.14.2
-      '@microsoft/tsdoc-config': 0.16.2
-      '@rushstack/node-core-library': 4.1.0(@types/node@20.12.7)
+      '@microsoft/api-extractor-model': 7.29.2(@types/node@20.14.9)
+      '@microsoft/tsdoc': 0.15.0
+      '@microsoft/tsdoc-config': 0.17.0
+      '@rushstack/node-core-library': 5.4.1(@types/node@20.14.9)
       '@rushstack/rig-package': 0.5.2
-      '@rushstack/terminal': 0.10.1(@types/node@20.12.7)
-      '@rushstack/ts-command-line': 4.19.2(@types/node@20.12.7)
+      '@rushstack/terminal': 0.13.0(@types/node@20.14.9)
+      '@rushstack/ts-command-line': 4.22.0(@types/node@20.14.9)
       lodash: 4.17.21
       minimatch: 3.0.8
       resolve: 1.22.8
@@ -13753,43 +14590,31 @@ snapshots:
     transitivePeerDependencies:
       - '@types/node'
 
-  '@microsoft/tsdoc-config@0.16.2':
+  '@microsoft/tsdoc-config@0.17.0':
     dependencies:
-      '@microsoft/tsdoc': 0.14.2
-      ajv: 6.12.6
+      '@microsoft/tsdoc': 0.15.0
+      ajv: 8.12.0
       jju: 1.4.0
-      resolve: 1.19.0
+      resolve: 1.22.8
 
-  '@microsoft/tsdoc@0.14.2': {}
+  '@microsoft/tsdoc@0.15.0': {}
 
   '@misskey-dev/browser-image-resizer@2024.1.0': {}
 
-  '@misskey-dev/eslint-plugin@1.0.0(@typescript-eslint/eslint-plugin@6.11.0(@typescript-eslint/parser@6.11.0(eslint@8.53.0)(typescript@5.3.3))(eslint@8.53.0)(typescript@5.3.3))(@typescript-eslint/parser@6.11.0(eslint@8.53.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.11.0(eslint@8.53.0)(typescript@5.3.3))(eslint@8.53.0))(eslint@8.53.0)':
+  '@misskey-dev/eslint-plugin@2.0.2(@eslint/compat@1.1.0)(@typescript-eslint/eslint-plugin@7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3))(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0))(eslint@9.6.0)(globals@15.7.0)':
     dependencies:
-      '@typescript-eslint/eslint-plugin': 6.11.0(@typescript-eslint/parser@6.11.0(eslint@8.53.0)(typescript@5.3.3))(eslint@8.53.0)(typescript@5.3.3)
-      '@typescript-eslint/parser': 6.11.0(eslint@8.53.0)(typescript@5.3.3)
-      eslint: 8.53.0
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.11.0(eslint@8.53.0)(typescript@5.3.3))(eslint@8.53.0)
-
-  '@misskey-dev/eslint-plugin@1.0.0(@typescript-eslint/eslint-plugin@7.1.0(@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3))(@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0))(eslint@8.57.0)':
-    dependencies:
-      '@typescript-eslint/eslint-plugin': 7.1.0(@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3)
-      '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
-      eslint: 8.57.0
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)
-
-  '@misskey-dev/eslint-plugin@1.0.0(@typescript-eslint/eslint-plugin@7.7.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2))(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0))(eslint@8.57.0)':
-    dependencies:
-      '@typescript-eslint/eslint-plugin': 7.7.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2)
-      '@typescript-eslint/parser': 7.7.1(eslint@8.57.0)(typescript@5.5.2)
-      eslint: 8.57.0
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)
+      '@eslint/compat': 1.1.0
+      '@typescript-eslint/eslint-plugin': 7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3)
+      '@typescript-eslint/parser': 7.15.0(eslint@9.6.0)(typescript@5.5.3)
+      eslint: 9.6.0
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)
+      globals: 15.7.0
 
   '@misskey-dev/sharp-read-bmp@1.2.0':
     dependencies:
       decode-bmp: 0.2.1
       decode-ico: 0.4.1
-      sharp: 0.33.3
+      sharp: 0.33.4
 
   '@misskey-dev/summaly@5.1.0':
     dependencies:
@@ -13833,7 +14658,7 @@ snapshots:
 
   '@mswjs/cookies@1.1.0': {}
 
-  '@mswjs/interceptors@0.26.15':
+  '@mswjs/interceptors@0.29.1':
     dependencies:
       '@open-draft/deferred-promise': 2.2.0
       '@open-draft/logger': 0.3.0
@@ -13842,44 +14667,44 @@ snapshots:
       outvariant: 1.4.2
       strict-event-emitter: 0.5.1
 
-  '@napi-rs/canvas-android-arm64@0.1.52':
+  '@napi-rs/canvas-android-arm64@0.1.53':
     optional: true
 
-  '@napi-rs/canvas-darwin-arm64@0.1.52':
+  '@napi-rs/canvas-darwin-arm64@0.1.53':
     optional: true
 
-  '@napi-rs/canvas-darwin-x64@0.1.52':
+  '@napi-rs/canvas-darwin-x64@0.1.53':
     optional: true
 
-  '@napi-rs/canvas-linux-arm-gnueabihf@0.1.52':
+  '@napi-rs/canvas-linux-arm-gnueabihf@0.1.53':
     optional: true
 
-  '@napi-rs/canvas-linux-arm64-gnu@0.1.52':
+  '@napi-rs/canvas-linux-arm64-gnu@0.1.53':
     optional: true
 
-  '@napi-rs/canvas-linux-arm64-musl@0.1.52':
+  '@napi-rs/canvas-linux-arm64-musl@0.1.53':
     optional: true
 
-  '@napi-rs/canvas-linux-x64-gnu@0.1.52':
+  '@napi-rs/canvas-linux-x64-gnu@0.1.53':
     optional: true
 
-  '@napi-rs/canvas-linux-x64-musl@0.1.52':
+  '@napi-rs/canvas-linux-x64-musl@0.1.53':
     optional: true
 
-  '@napi-rs/canvas-win32-x64-msvc@0.1.52':
+  '@napi-rs/canvas-win32-x64-msvc@0.1.53':
     optional: true
 
-  '@napi-rs/canvas@0.1.52':
+  '@napi-rs/canvas@0.1.53':
     optionalDependencies:
-      '@napi-rs/canvas-android-arm64': 0.1.52
-      '@napi-rs/canvas-darwin-arm64': 0.1.52
-      '@napi-rs/canvas-darwin-x64': 0.1.52
-      '@napi-rs/canvas-linux-arm-gnueabihf': 0.1.52
-      '@napi-rs/canvas-linux-arm64-gnu': 0.1.52
-      '@napi-rs/canvas-linux-arm64-musl': 0.1.52
-      '@napi-rs/canvas-linux-x64-gnu': 0.1.52
-      '@napi-rs/canvas-linux-x64-musl': 0.1.52
-      '@napi-rs/canvas-win32-x64-msvc': 0.1.52
+      '@napi-rs/canvas-android-arm64': 0.1.53
+      '@napi-rs/canvas-darwin-arm64': 0.1.53
+      '@napi-rs/canvas-darwin-x64': 0.1.53
+      '@napi-rs/canvas-linux-arm-gnueabihf': 0.1.53
+      '@napi-rs/canvas-linux-arm64-gnu': 0.1.53
+      '@napi-rs/canvas-linux-arm64-musl': 0.1.53
+      '@napi-rs/canvas-linux-x64-gnu': 0.1.53
+      '@napi-rs/canvas-linux-x64-musl': 0.1.53
+      '@napi-rs/canvas-win32-x64-msvc': 0.1.53
 
   '@ndelangen/get-tarball@3.0.7':
     dependencies:
@@ -13887,49 +14712,51 @@ snapshots:
       pump: 3.0.0
       tar-fs: 2.1.1
 
-  '@nestjs/common@10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1)':
+  '@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1)':
     dependencies:
       iterare: 1.2.1
       reflect-metadata: 0.2.2
       rxjs: 7.8.1
-      tslib: 2.6.2
+      tslib: 2.6.3
       uid: 2.0.2
 
-  '@nestjs/core@10.3.8(@nestjs/common@10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.8)(encoding@0.1.13)(reflect-metadata@0.2.2)(rxjs@7.8.1)':
+  '@nestjs/core@10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.10)(encoding@0.1.13)(reflect-metadata@0.2.2)(rxjs@7.8.1)':
     dependencies:
-      '@nestjs/common': 10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1)
+      '@nestjs/common': 10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1)
       '@nuxtjs/opencollective': 0.3.2(encoding@0.1.13)
       fast-safe-stringify: 2.1.1
       iterare: 1.2.1
       path-to-regexp: 3.2.0
       reflect-metadata: 0.2.2
       rxjs: 7.8.1
-      tslib: 2.6.2
+      tslib: 2.6.3
       uid: 2.0.2
     optionalDependencies:
-      '@nestjs/platform-express': 10.3.8(@nestjs/common@10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.8)
+      '@nestjs/platform-express': 10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.10)
     transitivePeerDependencies:
       - encoding
 
-  '@nestjs/platform-express@10.3.8(@nestjs/common@10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.8)':
+  '@nestjs/platform-express@10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.10)':
     dependencies:
-      '@nestjs/common': 10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1)
-      '@nestjs/core': 10.3.8(@nestjs/common@10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.8)(encoding@0.1.13)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+      '@nestjs/common': 10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1)
+      '@nestjs/core': 10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.10)(encoding@0.1.13)(reflect-metadata@0.2.2)(rxjs@7.8.1)
       body-parser: 1.20.2
       cors: 2.8.5
       express: 4.19.2
       multer: 1.4.4-lts.1
-      tslib: 2.6.2
+      tslib: 2.6.3
     transitivePeerDependencies:
       - supports-color
 
-  '@nestjs/testing@10.3.8(@nestjs/common@10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.8(@nestjs/common@10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.8)(encoding@0.1.13)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.8(@nestjs/common@10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.8))':
+  '@nestjs/testing@10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.10)(encoding@0.1.13)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.10))':
     dependencies:
-      '@nestjs/common': 10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1)
-      '@nestjs/core': 10.3.8(@nestjs/common@10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.8)(encoding@0.1.13)(reflect-metadata@0.2.2)(rxjs@7.8.1)
-      tslib: 2.6.2
+      '@nestjs/common': 10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1)
+      '@nestjs/core': 10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.10)(encoding@0.1.13)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+      tslib: 2.6.3
     optionalDependencies:
-      '@nestjs/platform-express': 10.3.8(@nestjs/common@10.3.8(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.8)
+      '@nestjs/platform-express': 10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.10)
+
+  '@noble/hashes@1.4.0': {}
 
   '@nodelib/fs.scandir@2.1.5':
     dependencies:
@@ -13941,7 +14768,7 @@ snapshots:
   '@nodelib/fs.walk@1.2.8':
     dependencies:
       '@nodelib/fs.scandir': 2.1.5
-      fastq: 1.15.0
+      fastq: 1.17.1
 
   '@npmcli/agent@2.2.0':
     dependencies:
@@ -13990,153 +14817,167 @@ snapshots:
 
   '@open-draft/until@2.1.0': {}
 
-  '@opentelemetry/api-logs@0.51.1':
+  '@opentelemetry/api-logs@0.52.1':
     dependencies:
-      '@opentelemetry/api': 1.8.0
+      '@opentelemetry/api': 1.9.0
 
-  '@opentelemetry/api@1.8.0': {}
+  '@opentelemetry/api@1.9.0': {}
 
-  '@opentelemetry/context-async-hooks@1.24.1(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/context-async-hooks@1.25.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
+      '@opentelemetry/api': 1.9.0
 
-  '@opentelemetry/core@1.24.1(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/core@1.24.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
+      '@opentelemetry/api': 1.9.0
       '@opentelemetry/semantic-conventions': 1.24.1
 
-  '@opentelemetry/instrumentation-connect@0.36.0(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/core@1.25.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/core': 1.24.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/semantic-conventions': 1.24.1
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/semantic-conventions': 1.25.1
+
+  '@opentelemetry/instrumentation-connect@0.37.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.25.1
       '@types/connect': 3.4.36
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-express@0.39.0(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/instrumentation-express@0.40.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/core': 1.24.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/semantic-conventions': 1.24.1
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.25.1
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-fastify@0.36.1(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/instrumentation-fastify@0.37.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/core': 1.24.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/semantic-conventions': 1.24.1
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.25.1
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-graphql@0.40.0(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/instrumentation-graphql@0.41.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/api@1.8.0)
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-hapi@0.38.0(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/instrumentation-hapi@0.39.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/core': 1.24.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/semantic-conventions': 1.24.1
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.25.1
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-http@0.51.1(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/instrumentation-http@0.52.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/core': 1.24.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/semantic-conventions': 1.24.1
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.25.1
       semver: 7.6.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-ioredis@0.40.0(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/instrumentation-ioredis@0.41.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/api@1.8.0)
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/redis-common': 0.36.2
-      '@opentelemetry/semantic-conventions': 1.24.1
+      '@opentelemetry/semantic-conventions': 1.25.1
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-koa@0.40.0(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/instrumentation-koa@0.41.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/core': 1.24.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/semantic-conventions': 1.24.1
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.25.1
       '@types/koa': 2.14.0
       '@types/koa__router': 12.0.3
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-mongodb@0.43.0(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/instrumentation-mongodb@0.45.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/sdk-metrics': 1.24.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/semantic-conventions': 1.24.1
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 1.24.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.25.1
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-mongoose@0.38.1(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/instrumentation-mongoose@0.39.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/core': 1.24.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/semantic-conventions': 1.24.1
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.25.1
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-mysql2@0.38.1(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/instrumentation-mysql2@0.39.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/semantic-conventions': 1.24.1
-      '@opentelemetry/sql-common': 0.40.1(@opentelemetry/api@1.8.0)
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.25.1
+      '@opentelemetry/sql-common': 0.40.1(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-mysql@0.38.1(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/instrumentation-mysql@0.39.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/semantic-conventions': 1.24.1
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.25.1
       '@types/mysql': 2.15.22
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-nestjs-core@0.37.1(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/instrumentation-nestjs-core@0.38.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/semantic-conventions': 1.24.1
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.25.1
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-pg@0.41.0(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/instrumentation-pg@0.42.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/semantic-conventions': 1.24.1
-      '@opentelemetry/sql-common': 0.40.1(@opentelemetry/api@1.8.0)
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.25.1
+      '@opentelemetry/sql-common': 0.40.1(@opentelemetry/api@1.9.0)
       '@types/pg': 8.6.1
       '@types/pg-pool': 2.0.4
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation@0.43.0(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/instrumentation-redis-4@0.40.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/redis-common': 0.36.2
+      '@opentelemetry/semantic-conventions': 1.25.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation@0.43.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
       '@types/shimmer': 1.0.5
       import-in-the-middle: 1.4.2
       require-in-the-middle: 7.3.0
@@ -14146,12 +14987,12 @@ snapshots:
       - supports-color
     optional: true
 
-  '@opentelemetry/instrumentation@0.51.1(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/api-logs': 0.51.1
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.52.1
       '@types/shimmer': 1.0.5
-      import-in-the-middle: 1.7.4
+      import-in-the-middle: 1.8.1
       require-in-the-middle: 7.3.0
       semver: 7.6.0
       shimmer: 1.2.1
@@ -14160,32 +15001,40 @@ snapshots:
 
   '@opentelemetry/redis-common@0.36.2': {}
 
-  '@opentelemetry/resources@1.24.1(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/resources@1.24.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/core': 1.24.1(@opentelemetry/api@1.8.0)
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.24.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.24.1
 
-  '@opentelemetry/sdk-metrics@1.24.1(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/resources@1.25.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/core': 1.24.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/resources': 1.24.1(@opentelemetry/api@1.8.0)
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.25.1
+
+  '@opentelemetry/sdk-metrics@1.24.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.24.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 1.24.1(@opentelemetry/api@1.9.0)
       lodash.merge: 4.6.2
 
-  '@opentelemetry/sdk-trace-base@1.24.1(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/core': 1.24.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/resources': 1.24.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/semantic-conventions': 1.24.1
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.25.1
 
   '@opentelemetry/semantic-conventions@1.24.1': {}
 
-  '@opentelemetry/sql-common@0.40.1(@opentelemetry/api@1.8.0)':
+  '@opentelemetry/semantic-conventions@1.25.1': {}
+
+  '@opentelemetry/sql-common@0.40.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/core': 1.24.1(@opentelemetry/api@1.8.0)
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
 
   '@peculiar/asn1-android@2.3.10':
     dependencies:
@@ -14230,35 +15079,149 @@ snapshots:
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
-  '@prisma/instrumentation@5.14.0':
+  '@prisma/instrumentation@5.16.0':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/sdk-trace-base': 1.24.1(@opentelemetry/api@1.8.0)
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@radix-ui/react-compose-refs@1.0.1(@types/react@18.0.28)(react@18.3.1)':
+  '@radix-ui/primitive@1.1.0': {}
+
+  '@radix-ui/react-compose-refs@1.1.0(@types/react@18.0.28)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.23.4
       react: 18.3.1
     optionalDependencies:
       '@types/react': 18.0.28
 
-  '@radix-ui/react-slot@1.0.2(@types/react@18.0.28)(react@18.3.1)':
+  '@radix-ui/react-context@1.1.0(@types/react@18.0.28)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.23.4
-      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.0.28)(react@18.3.1)
       react: 18.3.1
     optionalDependencies:
       '@types/react': 18.0.28
 
-  '@readme/better-ajv-errors@1.6.0(ajv@8.13.0)':
+  '@radix-ui/react-dialog@1.1.1(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.0
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      '@radix-ui/react-dismissable-layer': 1.1.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-focus-guards': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      '@radix-ui/react-focus-scope': 1.1.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-id': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      '@radix-ui/react-portal': 1.1.1(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-presence': 1.1.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-primitive': 2.0.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-slot': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      aria-hidden: 1.2.4
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+      react-remove-scroll: 2.5.7(@types/react@18.0.28)(react@18.3.1)
+    optionalDependencies:
+      '@types/react': 18.0.28
+
+  '@radix-ui/react-dismissable-layer@1.1.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.0
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      '@radix-ui/react-primitive': 2.0.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      '@radix-ui/react-use-escape-keydown': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+    optionalDependencies:
+      '@types/react': 18.0.28
+
+  '@radix-ui/react-focus-guards@1.1.0(@types/react@18.0.28)(react@18.3.1)':
+    dependencies:
+      react: 18.3.1
+    optionalDependencies:
+      '@types/react': 18.0.28
+
+  '@radix-ui/react-focus-scope@1.1.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      '@radix-ui/react-primitive': 2.0.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+    optionalDependencies:
+      '@types/react': 18.0.28
+
+  '@radix-ui/react-id@1.1.0(@types/react@18.0.28)(react@18.3.1)':
+    dependencies:
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      react: 18.3.1
+    optionalDependencies:
+      '@types/react': 18.0.28
+
+  '@radix-ui/react-portal@1.1.1(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@radix-ui/react-primitive': 2.0.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+    optionalDependencies:
+      '@types/react': 18.0.28
+
+  '@radix-ui/react-presence@1.1.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+    optionalDependencies:
+      '@types/react': 18.0.28
+
+  '@radix-ui/react-primitive@2.0.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@radix-ui/react-slot': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+    optionalDependencies:
+      '@types/react': 18.0.28
+
+  '@radix-ui/react-slot@1.1.0(@types/react@18.0.28)(react@18.3.1)':
+    dependencies:
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      react: 18.3.1
+    optionalDependencies:
+      '@types/react': 18.0.28
+
+  '@radix-ui/react-use-callback-ref@1.1.0(@types/react@18.0.28)(react@18.3.1)':
+    dependencies:
+      react: 18.3.1
+    optionalDependencies:
+      '@types/react': 18.0.28
+
+  '@radix-ui/react-use-controllable-state@1.1.0(@types/react@18.0.28)(react@18.3.1)':
+    dependencies:
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      react: 18.3.1
+    optionalDependencies:
+      '@types/react': 18.0.28
+
+  '@radix-ui/react-use-escape-keydown@1.1.0(@types/react@18.0.28)(react@18.3.1)':
+    dependencies:
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      react: 18.3.1
+    optionalDependencies:
+      '@types/react': 18.0.28
+
+  '@radix-ui/react-use-layout-effect@1.1.0(@types/react@18.0.28)(react@18.3.1)':
+    dependencies:
+      react: 18.3.1
+    optionalDependencies:
+      '@types/react': 18.0.28
+
+  '@readme/better-ajv-errors@1.6.0(ajv@8.16.0)':
     dependencies:
       '@babel/code-frame': 7.23.5
       '@babel/runtime': 7.23.4
       '@humanwhocodes/momoa': 2.0.4
-      ajv: 8.13.0
+      ajv: 8.16.0
       chalk: 4.1.2
       json-to-ast: 2.1.0
       jsonpointer: 5.0.1
@@ -14276,181 +15239,186 @@ snapshots:
       '@apidevtools/openapi-schemas': 2.1.0
       '@apidevtools/swagger-methods': 3.0.2
       '@jsdevtools/ono': 7.1.3
-      '@readme/better-ajv-errors': 1.6.0(ajv@8.13.0)
+      '@readme/better-ajv-errors': 1.6.0(ajv@8.16.0)
       '@readme/json-schema-ref-parser': 1.2.0
-      ajv: 8.13.0
-      ajv-draft-04: 1.0.0(ajv@8.13.0)
+      ajv: 8.16.0
+      ajv-draft-04: 1.0.0(ajv@8.16.0)
       call-me-maybe: 1.0.2
       openapi-types: 12.1.3
 
-  '@rollup/plugin-json@6.1.0(rollup@4.17.2)':
+  '@rollup/plugin-json@6.1.0(rollup@4.18.0)':
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.17.2)
+      '@rollup/pluginutils': 5.1.0(rollup@4.18.0)
     optionalDependencies:
-      rollup: 4.17.2
+      rollup: 4.18.0
 
-  '@rollup/plugin-replace@5.0.5(rollup@4.17.2)':
+  '@rollup/plugin-replace@5.0.7(rollup@4.18.0)':
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.17.2)
-      magic-string: 0.30.7
+      '@rollup/pluginutils': 5.1.0(rollup@4.18.0)
+      magic-string: 0.30.10
     optionalDependencies:
-      rollup: 4.17.2
+      rollup: 4.18.0
 
-  '@rollup/pluginutils@5.1.0(rollup@4.17.2)':
+  '@rollup/pluginutils@5.1.0(rollup@4.18.0)':
     dependencies:
       '@types/estree': 1.0.5
       estree-walker: 2.0.2
       picomatch: 2.3.1
     optionalDependencies:
-      rollup: 4.17.2
+      rollup: 4.18.0
 
-  '@rollup/rollup-android-arm-eabi@4.17.2':
+  '@rollup/rollup-android-arm-eabi@4.18.0':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.17.2':
+  '@rollup/rollup-android-arm64@4.18.0':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.17.2':
+  '@rollup/rollup-darwin-arm64@4.18.0':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.17.2':
+  '@rollup/rollup-darwin-x64@4.18.0':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.17.2':
+  '@rollup/rollup-linux-arm-gnueabihf@4.18.0':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.17.2':
+  '@rollup/rollup-linux-arm-musleabihf@4.18.0':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.17.2':
+  '@rollup/rollup-linux-arm64-gnu@4.18.0':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.17.2':
+  '@rollup/rollup-linux-arm64-musl@4.18.0':
     optional: true
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.17.2':
+  '@rollup/rollup-linux-powerpc64le-gnu@4.18.0':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.17.2':
+  '@rollup/rollup-linux-riscv64-gnu@4.18.0':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.17.2':
+  '@rollup/rollup-linux-s390x-gnu@4.18.0':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.17.2':
+  '@rollup/rollup-linux-x64-gnu@4.18.0':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.17.2':
+  '@rollup/rollup-linux-x64-musl@4.18.0':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.17.2':
+  '@rollup/rollup-win32-arm64-msvc@4.18.0':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.17.2':
+  '@rollup/rollup-win32-ia32-msvc@4.18.0':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.17.2':
+  '@rollup/rollup-win32-x64-msvc@4.18.0':
     optional: true
 
-  '@rushstack/node-core-library@4.1.0(@types/node@20.12.7)':
+  '@rushstack/node-core-library@5.4.1(@types/node@20.14.9)':
     dependencies:
+      ajv: 8.13.0
+      ajv-draft-04: 1.0.0(ajv@8.13.0)
+      ajv-formats: 3.0.1(ajv@8.13.0)
       fs-extra: 7.0.1
       import-lazy: 4.0.0
       jju: 1.4.0
       resolve: 1.22.8
       semver: 7.5.4
-      z-schema: 5.0.5
     optionalDependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@rushstack/rig-package@0.5.2':
     dependencies:
       resolve: 1.22.8
       strip-json-comments: 3.1.1
 
-  '@rushstack/terminal@0.10.1(@types/node@20.12.7)':
+  '@rushstack/terminal@0.13.0(@types/node@20.14.9)':
     dependencies:
-      '@rushstack/node-core-library': 4.1.0(@types/node@20.12.7)
+      '@rushstack/node-core-library': 5.4.1(@types/node@20.14.9)
       supports-color: 8.1.1
     optionalDependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
-  '@rushstack/ts-command-line@4.19.2(@types/node@20.12.7)':
+  '@rushstack/ts-command-line@4.22.0(@types/node@20.14.9)':
     dependencies:
-      '@rushstack/terminal': 0.10.1(@types/node@20.12.7)
+      '@rushstack/terminal': 0.13.0(@types/node@20.14.9)
       '@types/argparse': 1.0.38
       argparse: 1.0.10
       string-argv: 0.3.1
     transitivePeerDependencies:
       - '@types/node'
 
-  '@sentry/core@8.5.0':
-    dependencies:
-      '@sentry/types': 8.5.0
-      '@sentry/utils': 8.5.0
+  '@sec-ant/readable-stream@0.4.1': {}
 
-  '@sentry/node@8.5.0':
+  '@sentry/core@8.13.0':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/context-async-hooks': 1.24.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/core': 1.24.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation-connect': 0.36.0(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation-express': 0.39.0(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation-fastify': 0.36.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation-graphql': 0.40.0(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation-hapi': 0.38.0(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation-http': 0.51.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation-ioredis': 0.40.0(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation-koa': 0.40.0(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation-mongodb': 0.43.0(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation-mongoose': 0.38.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation-mysql': 0.38.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation-mysql2': 0.38.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation-nestjs-core': 0.37.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation-pg': 0.41.0(@opentelemetry/api@1.8.0)
-      '@opentelemetry/resources': 1.24.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/sdk-trace-base': 1.24.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/semantic-conventions': 1.24.1
-      '@prisma/instrumentation': 5.14.0
-      '@sentry/core': 8.5.0
-      '@sentry/opentelemetry': 8.5.0(@opentelemetry/api@1.8.0)(@opentelemetry/core@1.24.1(@opentelemetry/api@1.8.0))(@opentelemetry/instrumentation@0.51.1(@opentelemetry/api@1.8.0))(@opentelemetry/sdk-trace-base@1.24.1(@opentelemetry/api@1.8.0))(@opentelemetry/semantic-conventions@1.24.1)
-      '@sentry/types': 8.5.0
-      '@sentry/utils': 8.5.0
+      '@sentry/types': 8.13.0
+      '@sentry/utils': 8.13.0
+
+  '@sentry/node@8.13.0':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/context-async-hooks': 1.25.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-connect': 0.37.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-express': 0.40.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-fastify': 0.37.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-graphql': 0.41.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-hapi': 0.39.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-http': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-ioredis': 0.41.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-koa': 0.41.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mongodb': 0.45.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mongoose': 0.39.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mysql': 0.39.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mysql2': 0.39.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-nestjs-core': 0.38.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-pg': 0.42.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-redis-4': 0.40.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.25.1
+      '@prisma/instrumentation': 5.16.0
+      '@sentry/core': 8.13.0
+      '@sentry/opentelemetry': 8.13.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.25.1)
+      '@sentry/types': 8.13.0
+      '@sentry/utils': 8.13.0
     optionalDependencies:
       opentelemetry-instrumentation-fetch-node: 1.2.0
     transitivePeerDependencies:
       - supports-color
 
-  '@sentry/opentelemetry@8.5.0(@opentelemetry/api@1.8.0)(@opentelemetry/core@1.24.1(@opentelemetry/api@1.8.0))(@opentelemetry/instrumentation@0.51.1(@opentelemetry/api@1.8.0))(@opentelemetry/sdk-trace-base@1.24.1(@opentelemetry/api@1.8.0))(@opentelemetry/semantic-conventions@1.24.1)':
+  '@sentry/opentelemetry@8.13.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.25.1)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/core': 1.24.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/sdk-trace-base': 1.24.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/semantic-conventions': 1.24.1
-      '@sentry/core': 8.5.0
-      '@sentry/types': 8.5.0
-      '@sentry/utils': 8.5.0
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.25.1
+      '@sentry/core': 8.13.0
+      '@sentry/types': 8.13.0
+      '@sentry/utils': 8.13.0
 
-  '@sentry/profiling-node@8.5.0':
+  '@sentry/profiling-node@8.13.0':
     dependencies:
-      '@sentry/core': 8.5.0
-      '@sentry/node': 8.5.0
-      '@sentry/types': 8.5.0
-      '@sentry/utils': 8.5.0
+      '@sentry/core': 8.13.0
+      '@sentry/node': 8.13.0
+      '@sentry/types': 8.13.0
+      '@sentry/utils': 8.13.0
       detect-libc: 2.0.3
       node-abi: 3.62.0
     transitivePeerDependencies:
       - supports-color
 
-  '@sentry/types@8.5.0': {}
+  '@sentry/types@8.13.0': {}
 
-  '@sentry/utils@8.5.0':
+  '@sentry/utils@8.13.0':
     dependencies:
-      '@sentry/types': 8.5.0
+      '@sentry/types': 8.13.0
 
-  '@shikijs/core@1.4.0': {}
+  '@shikijs/core@1.10.0': {}
 
   '@sideway/address@4.1.4':
     dependencies:
@@ -14482,7 +15450,11 @@ snapshots:
 
   '@sindresorhus/is@5.3.0': {}
 
-  '@sindresorhus/is@6.1.0': {}
+  '@sindresorhus/is@6.3.1': {}
+
+  '@sindresorhus/merge-streams@2.3.0': {}
+
+  '@sindresorhus/merge-streams@4.0.0': {}
 
   '@sinonjs/commons@2.0.0':
     dependencies:
@@ -14508,154 +15480,172 @@ snapshots:
 
   '@sinonjs/text-encoding@0.7.2': {}
 
-  '@smithy/abort-controller@2.0.14':
-    dependencies:
-      '@smithy/types': 2.6.0
-      tslib: 2.6.2
-
   '@smithy/abort-controller@2.2.0':
     dependencies:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/chunked-blob-reader-native@2.0.0':
+  '@smithy/abort-controller@3.1.1':
     dependencies:
-      '@smithy/util-base64': 2.0.0
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@smithy/chunked-blob-reader@2.0.0':
+  '@smithy/chunked-blob-reader-native@3.0.0':
+    dependencies:
+      '@smithy/util-base64': 3.0.0
+      tslib: 2.6.2
+
+  '@smithy/chunked-blob-reader@3.0.0':
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/config-resolver@2.0.9':
+  '@smithy/config-resolver@3.0.4':
     dependencies:
-      '@smithy/node-config-provider': 2.0.11
-      '@smithy/types': 2.6.0
-      '@smithy/util-config-provider': 2.0.0
-      '@smithy/util-middleware': 2.0.1
+      '@smithy/node-config-provider': 3.1.3
+      '@smithy/types': 3.3.0
+      '@smithy/util-config-provider': 3.0.0
+      '@smithy/util-middleware': 3.0.3
       tslib: 2.6.2
 
-  '@smithy/credential-provider-imds@2.0.11':
+  '@smithy/core@2.2.4':
     dependencies:
-      '@smithy/node-config-provider': 2.0.11
-      '@smithy/property-provider': 2.0.9
-      '@smithy/types': 2.6.0
-      '@smithy/url-parser': 2.0.8
+      '@smithy/middleware-endpoint': 3.0.4
+      '@smithy/middleware-retry': 3.0.7
+      '@smithy/middleware-serde': 3.0.3
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/smithy-client': 3.1.5
+      '@smithy/types': 3.3.0
+      '@smithy/util-middleware': 3.0.3
       tslib: 2.6.2
 
-  '@smithy/eventstream-codec@2.0.8':
+  '@smithy/credential-provider-imds@3.1.3':
     dependencies:
-      '@aws-crypto/crc32': 3.0.0
-      '@smithy/types': 2.6.0
-      '@smithy/util-hex-encoding': 2.0.0
+      '@smithy/node-config-provider': 3.1.3
+      '@smithy/property-provider': 3.1.3
+      '@smithy/types': 3.3.0
+      '@smithy/url-parser': 3.0.3
       tslib: 2.6.2
 
-  '@smithy/eventstream-serde-browser@2.0.8':
+  '@smithy/eventstream-codec@3.1.2':
     dependencies:
-      '@smithy/eventstream-serde-universal': 2.0.8
-      '@smithy/types': 2.6.0
+      '@aws-crypto/crc32': 5.2.0
+      '@smithy/types': 3.3.0
+      '@smithy/util-hex-encoding': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/eventstream-serde-config-resolver@2.0.8':
+  '@smithy/eventstream-serde-browser@3.0.4':
     dependencies:
-      '@smithy/types': 2.6.0
+      '@smithy/eventstream-serde-universal': 3.0.4
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@smithy/eventstream-serde-node@2.0.8':
+  '@smithy/eventstream-serde-config-resolver@3.0.3':
     dependencies:
-      '@smithy/eventstream-serde-universal': 2.0.8
-      '@smithy/types': 2.6.0
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@smithy/eventstream-serde-universal@2.0.8':
+  '@smithy/eventstream-serde-node@3.0.4':
     dependencies:
-      '@smithy/eventstream-codec': 2.0.8
-      '@smithy/types': 2.6.0
+      '@smithy/eventstream-serde-universal': 3.0.4
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@smithy/fetch-http-handler@2.1.4':
+  '@smithy/eventstream-serde-universal@3.0.4':
     dependencies:
-      '@smithy/protocol-http': 3.0.10
-      '@smithy/querystring-builder': 2.0.14
-      '@smithy/types': 2.6.0
-      '@smithy/util-base64': 2.0.0
+      '@smithy/eventstream-codec': 3.1.2
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@smithy/hash-blob-browser@2.0.8':
+  '@smithy/fetch-http-handler@3.2.0':
     dependencies:
-      '@smithy/chunked-blob-reader': 2.0.0
-      '@smithy/chunked-blob-reader-native': 2.0.0
-      '@smithy/types': 2.6.0
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/querystring-builder': 3.0.3
+      '@smithy/types': 3.3.0
+      '@smithy/util-base64': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/hash-node@2.0.8':
+  '@smithy/hash-blob-browser@3.1.2':
     dependencies:
-      '@smithy/types': 2.6.0
-      '@smithy/util-buffer-from': 2.0.0
-      '@smithy/util-utf8': 2.0.0
+      '@smithy/chunked-blob-reader': 3.0.0
+      '@smithy/chunked-blob-reader-native': 3.0.0
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@smithy/hash-stream-node@2.0.8':
+  '@smithy/hash-node@3.0.3':
     dependencies:
-      '@smithy/types': 2.6.0
-      '@smithy/util-utf8': 2.0.0
+      '@smithy/types': 3.3.0
+      '@smithy/util-buffer-from': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/invalid-dependency@2.0.8':
+  '@smithy/hash-stream-node@3.1.2':
     dependencies:
-      '@smithy/types': 2.6.0
+      '@smithy/types': 3.3.0
+      '@smithy/util-utf8': 3.0.0
+      tslib: 2.6.2
+
+  '@smithy/invalid-dependency@3.0.3':
+    dependencies:
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
   '@smithy/is-array-buffer@2.0.0':
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/md5-js@2.0.8':
+  '@smithy/is-array-buffer@3.0.0':
     dependencies:
-      '@smithy/types': 2.6.0
-      '@smithy/util-utf8': 2.0.0
       tslib: 2.6.2
 
-  '@smithy/middleware-content-length@2.0.10':
+  '@smithy/md5-js@3.0.3':
     dependencies:
-      '@smithy/protocol-http': 3.0.10
-      '@smithy/types': 2.6.0
+      '@smithy/types': 3.3.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/middleware-endpoint@2.0.8':
+  '@smithy/middleware-content-length@3.0.3':
     dependencies:
-      '@smithy/middleware-serde': 2.0.8
-      '@smithy/types': 2.6.0
-      '@smithy/url-parser': 2.0.8
-      '@smithy/util-middleware': 2.0.1
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@smithy/middleware-retry@2.0.11':
+  '@smithy/middleware-endpoint@3.0.4':
     dependencies:
-      '@smithy/node-config-provider': 2.0.11
-      '@smithy/protocol-http': 3.0.10
-      '@smithy/service-error-classification': 2.0.1
-      '@smithy/types': 2.6.0
-      '@smithy/util-middleware': 2.0.1
-      '@smithy/util-retry': 2.0.1
-      tslib: 2.6.2
-      uuid: 8.3.2
-
-  '@smithy/middleware-serde@2.0.8':
-    dependencies:
-      '@smithy/types': 2.6.0
+      '@smithy/middleware-serde': 3.0.3
+      '@smithy/node-config-provider': 3.1.3
+      '@smithy/shared-ini-file-loader': 3.1.3
+      '@smithy/types': 3.3.0
+      '@smithy/url-parser': 3.0.3
+      '@smithy/util-middleware': 3.0.3
       tslib: 2.6.2
 
-  '@smithy/middleware-stack@2.0.1':
+  '@smithy/middleware-retry@3.0.7':
     dependencies:
-      '@smithy/types': 2.6.0
+      '@smithy/node-config-provider': 3.1.3
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/service-error-classification': 3.0.3
+      '@smithy/smithy-client': 3.1.5
+      '@smithy/types': 3.3.0
+      '@smithy/util-middleware': 3.0.3
+      '@smithy/util-retry': 3.0.3
+      tslib: 2.6.2
+      uuid: 9.0.1
+
+  '@smithy/middleware-serde@3.0.3':
+    dependencies:
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@smithy/node-config-provider@2.0.11':
+  '@smithy/middleware-stack@3.0.3':
     dependencies:
-      '@smithy/property-provider': 2.0.9
-      '@smithy/shared-ini-file-loader': 2.0.10
-      '@smithy/types': 2.6.0
+      '@smithy/types': 3.3.0
+      tslib: 2.6.2
+
+  '@smithy/node-config-provider@3.1.3':
+    dependencies:
+      '@smithy/property-provider': 3.1.3
+      '@smithy/shared-ini-file-loader': 3.1.3
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
   '@smithy/node-http-handler@2.5.0':
@@ -14666,14 +15656,17 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/property-provider@2.0.9':
+  '@smithy/node-http-handler@3.1.1':
     dependencies:
-      '@smithy/types': 2.6.0
+      '@smithy/abort-controller': 3.1.1
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/querystring-builder': 3.0.3
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@smithy/protocol-http@3.0.10':
+  '@smithy/property-provider@3.1.3':
     dependencies:
-      '@smithy/types': 2.6.0
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
   '@smithy/protocol-http@3.3.0':
@@ -14681,10 +15674,9 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/querystring-builder@2.0.14':
+  '@smithy/protocol-http@4.0.3':
     dependencies:
-      '@smithy/types': 2.6.0
-      '@smithy/util-uri-escape': 2.0.0
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
   '@smithy/querystring-builder@2.2.0':
@@ -14693,62 +15685,70 @@ snapshots:
       '@smithy/util-uri-escape': 2.2.0
       tslib: 2.6.2
 
-  '@smithy/querystring-parser@2.0.8':
+  '@smithy/querystring-builder@3.0.3':
     dependencies:
-      '@smithy/types': 2.6.0
+      '@smithy/types': 3.3.0
+      '@smithy/util-uri-escape': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/service-error-classification@2.0.1':
+  '@smithy/querystring-parser@3.0.3':
     dependencies:
-      '@smithy/types': 2.6.0
-
-  '@smithy/shared-ini-file-loader@2.0.10':
-    dependencies:
-      '@smithy/types': 2.6.0
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@smithy/signature-v4@2.0.5':
+  '@smithy/service-error-classification@3.0.3':
     dependencies:
-      '@smithy/eventstream-codec': 2.0.8
-      '@smithy/is-array-buffer': 2.0.0
-      '@smithy/types': 2.6.0
-      '@smithy/util-hex-encoding': 2.0.0
-      '@smithy/util-middleware': 2.0.1
-      '@smithy/util-uri-escape': 2.0.0
-      '@smithy/util-utf8': 2.0.0
+      '@smithy/types': 3.3.0
+
+  '@smithy/shared-ini-file-loader@3.1.3':
+    dependencies:
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@smithy/smithy-client@2.1.5':
+  '@smithy/signature-v4@3.1.2':
     dependencies:
-      '@smithy/middleware-stack': 2.0.1
-      '@smithy/types': 2.6.0
-      '@smithy/util-stream': 2.0.11
+      '@smithy/is-array-buffer': 3.0.0
+      '@smithy/types': 3.3.0
+      '@smithy/util-hex-encoding': 3.0.0
+      '@smithy/util-middleware': 3.0.3
+      '@smithy/util-uri-escape': 3.0.0
+      '@smithy/util-utf8': 3.0.0
+      tslib: 2.6.2
+
+  '@smithy/smithy-client@3.1.5':
+    dependencies:
+      '@smithy/middleware-endpoint': 3.0.4
+      '@smithy/middleware-stack': 3.0.3
+      '@smithy/protocol-http': 4.0.3
+      '@smithy/types': 3.3.0
+      '@smithy/util-stream': 3.0.5
       tslib: 2.6.2
 
   '@smithy/types@2.12.0':
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/types@2.6.0':
+  '@smithy/types@3.3.0':
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/url-parser@2.0.8':
+  '@smithy/url-parser@3.0.3':
     dependencies:
-      '@smithy/querystring-parser': 2.0.8
-      '@smithy/types': 2.6.0
+      '@smithy/querystring-parser': 3.0.3
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@smithy/util-base64@2.0.0':
+  '@smithy/util-base64@3.0.0':
     dependencies:
-      '@smithy/util-buffer-from': 2.0.0
+      '@smithy/util-buffer-from': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/util-body-length-browser@2.0.0':
+  '@smithy/util-body-length-browser@3.0.0':
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/util-body-length-node@2.1.0':
+  '@smithy/util-body-length-node@3.0.0':
     dependencies:
       tslib: 2.6.2
 
@@ -14757,117 +15757,136 @@ snapshots:
       '@smithy/is-array-buffer': 2.0.0
       tslib: 2.6.2
 
-  '@smithy/util-config-provider@2.0.0':
+  '@smithy/util-buffer-from@3.0.0':
+    dependencies:
+      '@smithy/is-array-buffer': 3.0.0
+      tslib: 2.6.2
+
+  '@smithy/util-config-provider@3.0.0':
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/util-defaults-mode-browser@2.0.9':
+  '@smithy/util-defaults-mode-browser@3.0.7':
     dependencies:
-      '@smithy/property-provider': 2.0.9
-      '@smithy/smithy-client': 2.1.5
-      '@smithy/types': 2.6.0
+      '@smithy/property-provider': 3.1.3
+      '@smithy/smithy-client': 3.1.5
+      '@smithy/types': 3.3.0
       bowser: 2.11.0
       tslib: 2.6.2
 
-  '@smithy/util-defaults-mode-node@2.0.11':
+  '@smithy/util-defaults-mode-node@3.0.7':
     dependencies:
-      '@smithy/config-resolver': 2.0.9
-      '@smithy/credential-provider-imds': 2.0.11
-      '@smithy/node-config-provider': 2.0.11
-      '@smithy/property-provider': 2.0.9
-      '@smithy/smithy-client': 2.1.5
-      '@smithy/types': 2.6.0
+      '@smithy/config-resolver': 3.0.4
+      '@smithy/credential-provider-imds': 3.1.3
+      '@smithy/node-config-provider': 3.1.3
+      '@smithy/property-provider': 3.1.3
+      '@smithy/smithy-client': 3.1.5
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@smithy/util-hex-encoding@2.0.0':
+  '@smithy/util-endpoints@2.0.4':
+    dependencies:
+      '@smithy/node-config-provider': 3.1.3
+      '@smithy/types': 3.3.0
+      tslib: 2.6.2
+
+  '@smithy/util-hex-encoding@3.0.0':
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/util-middleware@2.0.1':
+  '@smithy/util-middleware@3.0.3':
     dependencies:
-      '@smithy/types': 2.6.0
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@smithy/util-retry@2.0.1':
+  '@smithy/util-retry@3.0.3':
     dependencies:
-      '@smithy/service-error-classification': 2.0.1
-      '@smithy/types': 2.6.0
+      '@smithy/service-error-classification': 3.0.3
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
-  '@smithy/util-stream@2.0.11':
-    dependencies:
-      '@smithy/fetch-http-handler': 2.1.4
-      '@smithy/node-http-handler': 2.5.0
-      '@smithy/types': 2.6.0
-      '@smithy/util-base64': 2.0.0
-      '@smithy/util-buffer-from': 2.0.0
-      '@smithy/util-hex-encoding': 2.0.0
-      '@smithy/util-utf8': 2.0.0
-      tslib: 2.6.2
-
-  '@smithy/util-uri-escape@2.0.0':
+  '@smithy/util-stream@3.0.5':
     dependencies:
+      '@smithy/fetch-http-handler': 3.2.0
+      '@smithy/node-http-handler': 3.1.1
+      '@smithy/types': 3.3.0
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-buffer-from': 3.0.0
+      '@smithy/util-hex-encoding': 3.0.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
   '@smithy/util-uri-escape@2.2.0':
     dependencies:
       tslib: 2.6.2
 
+  '@smithy/util-uri-escape@3.0.0':
+    dependencies:
+      tslib: 2.6.2
+
   '@smithy/util-utf8@2.0.0':
     dependencies:
       '@smithy/util-buffer-from': 2.0.0
       tslib: 2.6.2
 
-  '@smithy/util-waiter@2.0.8':
+  '@smithy/util-utf8@3.0.0':
     dependencies:
-      '@smithy/abort-controller': 2.0.14
-      '@smithy/types': 2.6.0
+      '@smithy/util-buffer-from': 3.0.0
+      tslib: 2.6.2
+
+  '@smithy/util-waiter@3.1.2':
+    dependencies:
+      '@smithy/abort-controller': 3.1.1
+      '@smithy/types': 3.3.0
       tslib: 2.6.2
 
   '@sqltools/formatter@1.2.5': {}
 
-  '@storybook/addon-actions@8.0.9':
+  '@storybook/addon-actions@8.1.11':
     dependencies:
-      '@storybook/core-events': 8.0.9
+      '@storybook/core-events': 8.1.11
       '@storybook/global': 5.0.0
       '@types/uuid': 9.0.8
       dequal: 2.0.3
       polished: 4.2.2
       uuid: 9.0.1
 
-  '@storybook/addon-backgrounds@8.0.9':
+  '@storybook/addon-backgrounds@8.1.11':
     dependencies:
       '@storybook/global': 5.0.0
       memoizerific: 1.11.3
       ts-dedent: 2.2.0
 
-  '@storybook/addon-controls@8.0.9(@types/react@18.0.28)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@storybook/addon-controls@8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@storybook/blocks': 8.0.9(@types/react@18.0.28)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/blocks': 8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      dequal: 2.0.3
       lodash: 4.17.21
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - '@types/react'
+      - '@types/react-dom'
       - encoding
+      - prettier
       - react
       - react-dom
       - supports-color
 
-  '@storybook/addon-docs@8.0.9(encoding@0.1.13)':
+  '@storybook/addon-docs@8.1.11(encoding@0.1.13)(prettier@3.3.2)':
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.7
       '@mdx-js/react': 3.0.1(@types/react@18.0.28)(react@18.3.1)
-      '@storybook/blocks': 8.0.9(@types/react@18.0.28)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/client-logger': 8.0.9
-      '@storybook/components': 8.0.9(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/csf-plugin': 8.0.9
-      '@storybook/csf-tools': 8.0.9
+      '@storybook/blocks': 8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/client-logger': 8.1.11
+      '@storybook/components': 8.1.11(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/csf-plugin': 8.1.11
+      '@storybook/csf-tools': 8.1.11
       '@storybook/global': 5.0.0
-      '@storybook/node-logger': 8.0.9
-      '@storybook/preview-api': 8.0.9
-      '@storybook/react-dom-shim': 8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/theming': 8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/types': 8.0.9
+      '@storybook/node-logger': 8.1.11
+      '@storybook/preview-api': 8.1.11
+      '@storybook/react-dom-shim': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/theming': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/types': 8.1.11
       '@types/react': 18.0.28
       fs-extra: 11.1.1
       react: 18.3.1
@@ -14876,42 +15895,46 @@ snapshots:
       rehype-slug: 6.0.0
       ts-dedent: 2.2.0
     transitivePeerDependencies:
+      - '@types/react-dom'
       - encoding
+      - prettier
       - supports-color
 
-  '@storybook/addon-essentials@8.0.9(@types/react@18.0.28)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@storybook/addon-essentials@8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@storybook/addon-actions': 8.0.9
-      '@storybook/addon-backgrounds': 8.0.9
-      '@storybook/addon-controls': 8.0.9(@types/react@18.0.28)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/addon-docs': 8.0.9(encoding@0.1.13)
-      '@storybook/addon-highlight': 8.0.9
-      '@storybook/addon-measure': 8.0.9
-      '@storybook/addon-outline': 8.0.9
-      '@storybook/addon-toolbars': 8.0.9
-      '@storybook/addon-viewport': 8.0.9
-      '@storybook/core-common': 8.0.9(encoding@0.1.13)
-      '@storybook/manager-api': 8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/node-logger': 8.0.9
-      '@storybook/preview-api': 8.0.9
+      '@storybook/addon-actions': 8.1.11
+      '@storybook/addon-backgrounds': 8.1.11
+      '@storybook/addon-controls': 8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/addon-docs': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/addon-highlight': 8.1.11
+      '@storybook/addon-measure': 8.1.11
+      '@storybook/addon-outline': 8.1.11
+      '@storybook/addon-toolbars': 8.1.11
+      '@storybook/addon-viewport': 8.1.11
+      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/manager-api': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/node-logger': 8.1.11
+      '@storybook/preview-api': 8.1.11
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - '@types/react'
+      - '@types/react-dom'
       - encoding
+      - prettier
       - react
       - react-dom
       - supports-color
 
-  '@storybook/addon-highlight@8.0.9':
+  '@storybook/addon-highlight@8.1.11':
     dependencies:
       '@storybook/global': 5.0.0
 
-  '@storybook/addon-interactions@8.0.9(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.12.7))(vitest@0.34.6(happy-dom@10.0.3)(jsdom@24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.76.0)(terser@5.30.3))':
+  '@storybook/addon-interactions@8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))':
     dependencies:
       '@storybook/global': 5.0.0
-      '@storybook/instrumenter': 8.0.9
-      '@storybook/test': 8.0.9(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.12.7))(vitest@0.34.6(happy-dom@10.0.3)(jsdom@24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.76.0)(terser@5.30.3))
-      '@storybook/types': 8.0.9
+      '@storybook/instrumenter': 8.1.11
+      '@storybook/test': 8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))
+      '@storybook/types': 8.1.11
       polished: 4.2.2
       ts-dedent: 2.2.0
     transitivePeerDependencies:
@@ -14921,58 +15944,58 @@ snapshots:
       - jest
       - vitest
 
-  '@storybook/addon-links@8.0.9(react@18.3.1)':
+  '@storybook/addon-links@8.1.11(react@18.3.1)':
     dependencies:
-      '@storybook/csf': 0.1.6
+      '@storybook/csf': 0.1.9
       '@storybook/global': 5.0.0
       ts-dedent: 2.2.0
     optionalDependencies:
       react: 18.3.1
 
-  '@storybook/addon-mdx-gfm@8.0.9':
+  '@storybook/addon-mdx-gfm@8.1.11':
     dependencies:
-      '@storybook/node-logger': 8.0.9
+      '@storybook/node-logger': 8.1.11
       remark-gfm: 4.0.0
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - supports-color
 
-  '@storybook/addon-measure@8.0.9':
+  '@storybook/addon-measure@8.1.11':
     dependencies:
       '@storybook/global': 5.0.0
-      tiny-invariant: 1.3.1
+      tiny-invariant: 1.3.3
 
-  '@storybook/addon-outline@8.0.9':
+  '@storybook/addon-outline@8.1.11':
     dependencies:
       '@storybook/global': 5.0.0
       ts-dedent: 2.2.0
 
-  '@storybook/addon-storysource@8.0.9':
+  '@storybook/addon-storysource@8.1.11':
     dependencies:
-      '@storybook/source-loader': 8.0.9
+      '@storybook/source-loader': 8.1.11
       estraverse: 5.3.0
-      tiny-invariant: 1.3.1
+      tiny-invariant: 1.3.3
 
-  '@storybook/addon-toolbars@8.0.9': {}
+  '@storybook/addon-toolbars@8.1.11': {}
 
-  '@storybook/addon-viewport@8.0.9':
+  '@storybook/addon-viewport@8.1.11':
     dependencies:
       memoizerific: 1.11.3
 
-  '@storybook/blocks@8.0.9(@types/react@18.0.28)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@storybook/blocks@8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@storybook/channels': 8.0.9
-      '@storybook/client-logger': 8.0.9
-      '@storybook/components': 8.0.9(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/core-events': 8.0.9
-      '@storybook/csf': 0.1.6
-      '@storybook/docs-tools': 8.0.9(encoding@0.1.13)
+      '@storybook/channels': 8.1.11
+      '@storybook/client-logger': 8.1.11
+      '@storybook/components': 8.1.11(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/core-events': 8.1.11
+      '@storybook/csf': 0.1.9
+      '@storybook/docs-tools': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
       '@storybook/global': 5.0.0
       '@storybook/icons': 1.2.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/manager-api': 8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/preview-api': 8.0.9
-      '@storybook/theming': 8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/types': 8.0.9
+      '@storybook/manager-api': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/preview-api': 8.1.11
+      '@storybook/theming': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/types': 8.1.11
       '@types/lodash': 4.14.191
       color-convert: 2.0.1
       dequal: 2.0.3
@@ -14990,20 +16013,22 @@ snapshots:
       react-dom: 18.3.1(react@18.3.1)
     transitivePeerDependencies:
       - '@types/react'
+      - '@types/react-dom'
       - encoding
+      - prettier
       - supports-color
 
-  '@storybook/builder-manager@8.0.9(encoding@0.1.13)':
+  '@storybook/builder-manager@8.1.11(encoding@0.1.13)(prettier@3.3.2)':
     dependencies:
       '@fal-works/esbuild-plugin-global-externals': 2.1.2
-      '@storybook/core-common': 8.0.9(encoding@0.1.13)
-      '@storybook/manager': 8.0.9
-      '@storybook/node-logger': 8.0.9
+      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/manager': 8.1.11
+      '@storybook/node-logger': 8.1.11
       '@types/ejs': 3.1.2
-      '@yarnpkg/esbuild-plugin-pnp': 3.0.0-rc.15(esbuild@0.20.2)
+      '@yarnpkg/esbuild-plugin-pnp': 3.0.0-rc.15(esbuild@0.19.11)
       browser-assert: 1.2.1
-      ejs: 3.1.9
-      esbuild: 0.20.2
+      ejs: 3.1.10
+      esbuild: 0.19.11
       esbuild-plugin-alias: 0.2.1
       express: 4.19.2
       fs-extra: 11.1.1
@@ -15011,55 +16036,57 @@ snapshots:
       util: 0.12.5
     transitivePeerDependencies:
       - encoding
+      - prettier
       - supports-color
 
-  '@storybook/builder-vite@8.0.9(encoding@0.1.13)(typescript@5.5.2)(vite@5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3))':
+  '@storybook/builder-vite@8.1.11(encoding@0.1.13)(prettier@3.3.2)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))':
     dependencies:
-      '@storybook/channels': 8.0.9
-      '@storybook/client-logger': 8.0.9
-      '@storybook/core-common': 8.0.9(encoding@0.1.13)
-      '@storybook/core-events': 8.0.9
-      '@storybook/csf-plugin': 8.0.9
-      '@storybook/node-logger': 8.0.9
-      '@storybook/preview': 8.0.9
-      '@storybook/preview-api': 8.0.9
-      '@storybook/types': 8.0.9
+      '@storybook/channels': 8.1.11
+      '@storybook/client-logger': 8.1.11
+      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/core-events': 8.1.11
+      '@storybook/csf-plugin': 8.1.11
+      '@storybook/node-logger': 8.1.11
+      '@storybook/preview': 8.1.11
+      '@storybook/preview-api': 8.1.11
+      '@storybook/types': 8.1.11
       '@types/find-cache-dir': 3.2.1
       browser-assert: 1.2.1
-      es-module-lexer: 0.9.3
-      express: 4.18.2
+      es-module-lexer: 1.5.4
+      express: 4.19.2
       find-cache-dir: 3.3.2
       fs-extra: 11.1.1
-      magic-string: 0.30.7
+      magic-string: 0.30.10
       ts-dedent: 2.2.0
-      vite: 5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3)
+      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)
     optionalDependencies:
-      typescript: 5.5.2
+      typescript: 5.5.3
     transitivePeerDependencies:
       - encoding
+      - prettier
       - supports-color
 
-  '@storybook/channels@8.0.9':
+  '@storybook/channels@8.1.11':
     dependencies:
-      '@storybook/client-logger': 8.0.9
-      '@storybook/core-events': 8.0.9
+      '@storybook/client-logger': 8.1.11
+      '@storybook/core-events': 8.1.11
       '@storybook/global': 5.0.0
       telejson: 7.2.0
-      tiny-invariant: 1.3.1
+      tiny-invariant: 1.3.3
 
-  '@storybook/cli@8.0.9(@babel/preset-env@7.23.5(@babel/core@7.24.0))(bufferutil@4.0.7)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)':
+  '@storybook/cli@8.1.11(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/core': 7.24.7
+      '@babel/types': 7.24.7
       '@ndelangen/get-tarball': 3.0.7
-      '@storybook/codemod': 8.0.9
-      '@storybook/core-common': 8.0.9(encoding@0.1.13)
-      '@storybook/core-events': 8.0.9
-      '@storybook/core-server': 8.0.9(bufferutil@4.0.7)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)
-      '@storybook/csf-tools': 8.0.9
-      '@storybook/node-logger': 8.0.9
-      '@storybook/telemetry': 8.0.9(encoding@0.1.13)
-      '@storybook/types': 8.0.9
+      '@storybook/codemod': 8.1.11
+      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/core-events': 8.1.11
+      '@storybook/core-server': 8.1.11(bufferutil@4.0.7)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)
+      '@storybook/csf-tools': 8.1.11
+      '@storybook/node-logger': 8.1.11
+      '@storybook/telemetry': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/types': 8.1.11
       '@types/semver': 7.5.8
       '@yarnpkg/fslib': 2.10.3
       '@yarnpkg/libzip': 2.3.0
@@ -15073,17 +16100,17 @@ snapshots:
       fs-extra: 11.1.1
       get-npm-tarball-url: 2.0.3
       giget: 1.1.2
-      globby: 11.1.0
-      jscodeshift: 0.15.1(@babel/preset-env@7.23.5(@babel/core@7.24.0))
+      globby: 14.0.1
+      jscodeshift: 0.15.1(@babel/preset-env@7.24.7(@babel/core@7.24.7))
       leven: 3.1.0
       ora: 5.4.1
-      prettier: 3.2.5
+      prettier: 3.3.2
       prompts: 2.4.2
       read-pkg-up: 7.0.1
       semver: 7.6.0
       strip-json-comments: 3.1.1
-      tempy: 1.0.1
-      tiny-invariant: 1.3.1
+      tempy: 3.1.0
+      tiny-invariant: 1.3.3
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - '@babel/preset-env'
@@ -15094,104 +16121,112 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  '@storybook/client-logger@8.0.9':
+  '@storybook/client-logger@8.1.11':
     dependencies:
       '@storybook/global': 5.0.0
 
-  '@storybook/codemod@8.0.9':
+  '@storybook/codemod@8.1.11':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/preset-env': 7.23.5(@babel/core@7.24.0)
-      '@babel/types': 7.24.0
-      '@storybook/csf': 0.1.6
-      '@storybook/csf-tools': 8.0.9
-      '@storybook/node-logger': 8.0.9
-      '@storybook/types': 8.0.9
+      '@babel/core': 7.24.7
+      '@babel/preset-env': 7.24.7(@babel/core@7.24.7)
+      '@babel/types': 7.24.7
+      '@storybook/csf': 0.1.9
+      '@storybook/csf-tools': 8.1.11
+      '@storybook/node-logger': 8.1.11
+      '@storybook/types': 8.1.11
       '@types/cross-spawn': 6.0.2
       cross-spawn: 7.0.3
-      globby: 11.1.0
-      jscodeshift: 0.15.1(@babel/preset-env@7.23.5(@babel/core@7.24.0))
+      globby: 14.0.1
+      jscodeshift: 0.15.1(@babel/preset-env@7.24.7(@babel/core@7.24.7))
       lodash: 4.17.21
-      prettier: 3.2.5
+      prettier: 3.3.2
       recast: 0.23.6
-      tiny-invariant: 1.3.1
+      tiny-invariant: 1.3.3
     transitivePeerDependencies:
       - supports-color
 
-  '@storybook/components@8.0.9(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@storybook/components@8.1.11(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@radix-ui/react-slot': 1.0.2(@types/react@18.0.28)(react@18.3.1)
-      '@storybook/client-logger': 8.0.9
-      '@storybook/csf': 0.1.6
+      '@radix-ui/react-dialog': 1.1.1(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-slot': 1.1.0(@types/react@18.0.28)(react@18.3.1)
+      '@storybook/client-logger': 8.1.11
+      '@storybook/csf': 0.1.9
       '@storybook/global': 5.0.0
       '@storybook/icons': 1.2.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/theming': 8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/types': 8.0.9
+      '@storybook/theming': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/types': 8.1.11
       memoizerific: 1.11.3
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
       util-deprecate: 1.0.2
     transitivePeerDependencies:
       - '@types/react'
+      - '@types/react-dom'
 
-  '@storybook/core-common@8.0.9(encoding@0.1.13)':
+  '@storybook/core-common@8.1.11(encoding@0.1.13)(prettier@3.3.2)':
     dependencies:
-      '@storybook/core-events': 8.0.9
-      '@storybook/csf-tools': 8.0.9
-      '@storybook/node-logger': 8.0.9
-      '@storybook/types': 8.0.9
+      '@storybook/core-events': 8.1.11
+      '@storybook/csf-tools': 8.1.11
+      '@storybook/node-logger': 8.1.11
+      '@storybook/types': 8.1.11
       '@yarnpkg/fslib': 2.10.3
       '@yarnpkg/libzip': 2.3.0
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      esbuild: 0.20.2
-      esbuild-register: 3.5.0(esbuild@0.20.2)
+      esbuild: 0.19.11
+      esbuild-register: 3.5.0(esbuild@0.19.11)
       execa: 5.1.1
       file-system-cache: 2.3.0
       find-cache-dir: 3.3.2
       find-up: 5.0.0
       fs-extra: 11.1.1
-      glob: 10.3.12
+      glob: 10.4.2
       handlebars: 4.7.7
       lazy-universal-dotenv: 4.0.0
       node-fetch: 2.7.0(encoding@0.1.13)
       picomatch: 2.3.1
       pkg-dir: 5.0.0
+      prettier-fallback: prettier@3.3.2
       pretty-hrtime: 1.0.3
       resolve-from: 5.0.0
       semver: 7.6.0
-      tempy: 1.0.1
-      tiny-invariant: 1.3.1
+      tempy: 3.1.0
+      tiny-invariant: 1.3.3
       ts-dedent: 2.2.0
       util: 0.12.5
+    optionalDependencies:
+      prettier: 3.3.2
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  '@storybook/core-events@8.0.9':
+  '@storybook/core-events@8.1.11':
     dependencies:
+      '@storybook/csf': 0.1.9
       ts-dedent: 2.2.0
 
-  '@storybook/core-server@8.0.9(bufferutil@4.0.7)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)':
+  '@storybook/core-server@8.1.11(bufferutil@4.0.7)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)':
     dependencies:
       '@aw-web-design/x-default-browser': 1.4.126
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.7
+      '@babel/parser': 7.24.7
       '@discoveryjs/json-ext': 0.5.7
-      '@storybook/builder-manager': 8.0.9(encoding@0.1.13)
-      '@storybook/channels': 8.0.9
-      '@storybook/core-common': 8.0.9(encoding@0.1.13)
-      '@storybook/core-events': 8.0.9
-      '@storybook/csf': 0.1.6
-      '@storybook/csf-tools': 8.0.9
-      '@storybook/docs-mdx': 3.0.0
+      '@storybook/builder-manager': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/channels': 8.1.11
+      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/core-events': 8.1.11
+      '@storybook/csf': 0.1.9
+      '@storybook/csf-tools': 8.1.11
+      '@storybook/docs-mdx': 3.1.0-next.0
       '@storybook/global': 5.0.0
-      '@storybook/manager': 8.0.9
-      '@storybook/manager-api': 8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/node-logger': 8.0.9
-      '@storybook/preview-api': 8.0.9
-      '@storybook/telemetry': 8.0.9(encoding@0.1.13)
-      '@storybook/types': 8.0.9
+      '@storybook/manager': 8.1.11
+      '@storybook/manager-api': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/node-logger': 8.1.11
+      '@storybook/preview-api': 8.1.11
+      '@storybook/telemetry': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/types': 8.1.11
       '@types/detect-port': 1.3.2
+      '@types/diff': 5.2.1
       '@types/node': 18.17.15
       '@types/pretty-hrtime': 1.0.1
       '@types/semver': 7.5.8
@@ -15200,10 +16235,10 @@ snapshots:
       cli-table3: 0.6.3
       compression: 1.7.4
       detect-port: 1.5.1
-      express: 4.18.2
+      diff: 5.2.0
+      express: 4.19.2
       fs-extra: 11.1.1
-      globby: 11.1.0
-      ip: 2.0.1
+      globby: 14.0.1
       lodash: 4.17.21
       open: 8.4.2
       pretty-hrtime: 1.0.3
@@ -15211,59 +16246,61 @@ snapshots:
       read-pkg-up: 7.0.1
       semver: 7.6.0
       telejson: 7.2.0
-      tiny-invariant: 1.3.1
+      tiny-invariant: 1.3.3
       ts-dedent: 2.2.0
       util: 0.12.5
       util-deprecate: 1.0.2
       watchpack: 2.4.0
-      ws: 8.17.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
+      ws: 8.17.1(bufferutil@4.0.7)(utf-8-validate@6.0.3)
     transitivePeerDependencies:
       - bufferutil
       - encoding
+      - prettier
       - react
       - react-dom
       - supports-color
       - utf-8-validate
 
-  '@storybook/csf-plugin@8.0.9':
+  '@storybook/csf-plugin@8.1.11':
     dependencies:
-      '@storybook/csf-tools': 8.0.9
+      '@storybook/csf-tools': 8.1.11
       unplugin: 1.4.0
     transitivePeerDependencies:
       - supports-color
 
-  '@storybook/csf-tools@8.0.9':
+  '@storybook/csf-tools@8.1.11':
     dependencies:
-      '@babel/generator': 7.23.6
-      '@babel/parser': 7.24.0
-      '@babel/traverse': 7.24.0
-      '@babel/types': 7.24.0
-      '@storybook/csf': 0.1.6
-      '@storybook/types': 8.0.9
+      '@babel/generator': 7.24.7
+      '@babel/parser': 7.24.7
+      '@babel/traverse': 7.24.7
+      '@babel/types': 7.24.7
+      '@storybook/csf': 0.1.9
+      '@storybook/types': 8.1.11
       fs-extra: 11.1.1
       recast: 0.23.6
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - supports-color
 
-  '@storybook/csf@0.1.6':
+  '@storybook/csf@0.1.9':
     dependencies:
       type-fest: 2.19.0
 
-  '@storybook/docs-mdx@3.0.0': {}
+  '@storybook/docs-mdx@3.1.0-next.0': {}
 
-  '@storybook/docs-tools@8.0.9(encoding@0.1.13)':
+  '@storybook/docs-tools@8.1.11(encoding@0.1.13)(prettier@3.3.2)':
     dependencies:
-      '@storybook/core-common': 8.0.9(encoding@0.1.13)
-      '@storybook/core-events': 8.0.9
-      '@storybook/preview-api': 8.0.9
-      '@storybook/types': 8.0.9
+      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/core-events': 8.1.11
+      '@storybook/preview-api': 8.1.11
+      '@storybook/types': 8.1.11
       '@types/doctrine': 0.0.3
       assert: 2.1.0
       doctrine: 3.0.0
       lodash: 4.17.21
     transitivePeerDependencies:
       - encoding
+      - prettier
       - supports-color
 
   '@storybook/global@5.0.0': {}
@@ -15273,27 +16310,27 @@ snapshots:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
 
-  '@storybook/instrumenter@8.0.9':
+  '@storybook/instrumenter@8.1.11':
     dependencies:
-      '@storybook/channels': 8.0.9
-      '@storybook/client-logger': 8.0.9
-      '@storybook/core-events': 8.0.9
+      '@storybook/channels': 8.1.11
+      '@storybook/client-logger': 8.1.11
+      '@storybook/core-events': 8.1.11
       '@storybook/global': 5.0.0
-      '@storybook/preview-api': 8.0.9
+      '@storybook/preview-api': 8.1.11
       '@vitest/utils': 1.6.0
       util: 0.12.5
 
-  '@storybook/manager-api@8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@storybook/manager-api@8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@storybook/channels': 8.0.9
-      '@storybook/client-logger': 8.0.9
-      '@storybook/core-events': 8.0.9
-      '@storybook/csf': 0.1.6
+      '@storybook/channels': 8.1.11
+      '@storybook/client-logger': 8.1.11
+      '@storybook/core-events': 8.1.11
+      '@storybook/csf': 0.1.9
       '@storybook/global': 5.0.0
       '@storybook/icons': 1.2.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/router': 8.0.9
-      '@storybook/theming': 8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/types': 8.0.9
+      '@storybook/router': 8.1.11
+      '@storybook/theming': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/types': 8.1.11
       dequal: 2.0.3
       lodash: 4.17.21
       memoizerific: 1.11.3
@@ -15304,65 +16341,67 @@ snapshots:
       - react
       - react-dom
 
-  '@storybook/manager@8.0.9': {}
+  '@storybook/manager@8.1.11': {}
 
-  '@storybook/node-logger@8.0.9': {}
+  '@storybook/node-logger@8.1.11': {}
 
-  '@storybook/preview-api@8.0.9':
+  '@storybook/preview-api@8.1.11':
     dependencies:
-      '@storybook/channels': 8.0.9
-      '@storybook/client-logger': 8.0.9
-      '@storybook/core-events': 8.0.9
-      '@storybook/csf': 0.1.6
+      '@storybook/channels': 8.1.11
+      '@storybook/client-logger': 8.1.11
+      '@storybook/core-events': 8.1.11
+      '@storybook/csf': 0.1.9
       '@storybook/global': 5.0.0
-      '@storybook/types': 8.0.9
+      '@storybook/types': 8.1.11
       '@types/qs': 6.9.7
       dequal: 2.0.3
       lodash: 4.17.21
       memoizerific: 1.11.3
       qs: 6.11.1
-      tiny-invariant: 1.3.1
+      tiny-invariant: 1.3.3
       ts-dedent: 2.2.0
       util-deprecate: 1.0.2
 
-  '@storybook/preview@8.0.9': {}
+  '@storybook/preview@8.1.11': {}
 
-  '@storybook/react-dom-shim@8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@storybook/react-dom-shim@8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
 
-  '@storybook/react-vite@8.0.9(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.17.2)(typescript@5.5.2)(vite@5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3))':
+  '@storybook/react-vite@8.1.11(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.18.0)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))':
     dependencies:
-      '@joshwooding/vite-plugin-react-docgen-typescript': 0.3.0(typescript@5.5.2)(vite@5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3))
-      '@rollup/pluginutils': 5.1.0(rollup@4.17.2)
-      '@storybook/builder-vite': 8.0.9(encoding@0.1.13)(typescript@5.5.2)(vite@5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3))
-      '@storybook/node-logger': 8.0.9
-      '@storybook/react': 8.0.9(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.2)
+      '@joshwooding/vite-plugin-react-docgen-typescript': 0.3.1(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))
+      '@rollup/pluginutils': 5.1.0(rollup@4.18.0)
+      '@storybook/builder-vite': 8.1.11(encoding@0.1.13)(prettier@3.3.2)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))
+      '@storybook/node-logger': 8.1.11
+      '@storybook/react': 8.1.11(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.3)
+      '@storybook/types': 8.1.11
       find-up: 5.0.0
-      magic-string: 0.30.7
+      magic-string: 0.30.10
       react: 18.3.1
       react-docgen: 7.0.1
       react-dom: 18.3.1(react@18.3.1)
       resolve: 1.22.8
       tsconfig-paths: 4.2.0
-      vite: 5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3)
+      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)
     transitivePeerDependencies:
       - '@preact/preset-vite'
       - encoding
+      - prettier
       - rollup
       - supports-color
       - typescript
       - vite-plugin-glimmerx
 
-  '@storybook/react@8.0.9(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.2)':
+  '@storybook/react@8.1.11(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.3)':
     dependencies:
-      '@storybook/client-logger': 8.0.9
-      '@storybook/docs-tools': 8.0.9(encoding@0.1.13)
+      '@storybook/client-logger': 8.1.11
+      '@storybook/docs-tools': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
       '@storybook/global': 5.0.0
-      '@storybook/preview-api': 8.0.9
-      '@storybook/react-dom-shim': 8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/types': 8.0.9
+      '@storybook/preview-api': 8.1.11
+      '@storybook/react-dom-shim': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/types': 8.1.11
       '@types/escodegen': 0.0.6
       '@types/estree': 0.0.51
       '@types/node': 18.17.15
@@ -15381,30 +16420,31 @@ snapshots:
       type-fest: 2.19.0
       util-deprecate: 1.0.2
     optionalDependencies:
-      typescript: 5.5.2
+      typescript: 5.5.3
     transitivePeerDependencies:
       - encoding
+      - prettier
       - supports-color
 
-  '@storybook/router@8.0.9':
+  '@storybook/router@8.1.11':
     dependencies:
-      '@storybook/client-logger': 8.0.9
+      '@storybook/client-logger': 8.1.11
       memoizerific: 1.11.3
       qs: 6.11.1
 
-  '@storybook/source-loader@8.0.9':
+  '@storybook/source-loader@8.1.11':
     dependencies:
-      '@storybook/csf': 0.1.6
-      '@storybook/types': 8.0.9
+      '@storybook/csf': 0.1.9
+      '@storybook/types': 8.1.11
       estraverse: 5.3.0
       lodash: 4.17.21
-      prettier: 3.2.5
+      prettier: 3.3.2
 
-  '@storybook/telemetry@8.0.9(encoding@0.1.13)':
+  '@storybook/telemetry@8.1.11(encoding@0.1.13)(prettier@3.3.2)':
     dependencies:
-      '@storybook/client-logger': 8.0.9
-      '@storybook/core-common': 8.0.9(encoding@0.1.13)
-      '@storybook/csf-tools': 8.0.9
+      '@storybook/client-logger': 8.1.11
+      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/csf-tools': 8.1.11
       chalk: 4.1.2
       detect-package-manager: 2.0.1
       fetch-retry: 5.0.4
@@ -15412,18 +16452,19 @@ snapshots:
       read-pkg-up: 7.0.1
     transitivePeerDependencies:
       - encoding
+      - prettier
       - supports-color
 
-  '@storybook/test@8.0.9(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.12.7))(vitest@0.34.6(happy-dom@10.0.3)(jsdom@24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.76.0)(terser@5.30.3))':
+  '@storybook/test@8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))':
     dependencies:
-      '@storybook/client-logger': 8.0.9
-      '@storybook/core-events': 8.0.9
-      '@storybook/instrumenter': 8.0.9
-      '@storybook/preview-api': 8.0.9
-      '@testing-library/dom': 9.3.4
-      '@testing-library/jest-dom': 6.4.2(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.12.7))(vitest@0.34.6(happy-dom@10.0.3)(jsdom@24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.76.0)(terser@5.30.3))
-      '@testing-library/user-event': 14.5.2(@testing-library/dom@9.3.4)
-      '@vitest/expect': 1.3.1
+      '@storybook/client-logger': 8.1.11
+      '@storybook/core-events': 8.1.11
+      '@storybook/instrumenter': 8.1.11
+      '@storybook/preview-api': 8.1.11
+      '@testing-library/dom': 10.1.0
+      '@testing-library/jest-dom': 6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))
+      '@testing-library/user-event': 14.5.2(@testing-library/dom@10.1.0)
+      '@vitest/expect': 1.6.0
       '@vitest/spy': 1.6.0
       util: 0.12.5
     transitivePeerDependencies:
@@ -15433,37 +16474,39 @@ snapshots:
       - jest
       - vitest
 
-  '@storybook/theming@8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@storybook/theming@8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.3.1)
-      '@storybook/client-logger': 8.0.9
+      '@storybook/client-logger': 8.1.11
       '@storybook/global': 5.0.0
       memoizerific: 1.11.3
     optionalDependencies:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
 
-  '@storybook/types@8.0.9':
+  '@storybook/types@8.1.11':
     dependencies:
-      '@storybook/channels': 8.0.9
+      '@storybook/channels': 8.1.11
       '@types/express': 4.17.17
       file-system-cache: 2.3.0
 
-  '@storybook/vue3-vite@8.0.9(bufferutil@4.0.7)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)(vite@5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3))(vue@3.4.26(typescript@5.5.2))':
+  '@storybook/vue3-vite@8.1.11(bufferutil@4.0.7)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.5.3))':
     dependencies:
-      '@storybook/builder-vite': 8.0.9(encoding@0.1.13)(typescript@5.5.2)(vite@5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3))
-      '@storybook/core-server': 8.0.9(bufferutil@4.0.7)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)
-      '@storybook/vue3': 8.0.9(encoding@0.1.13)(vue@3.4.26(typescript@5.5.2))
+      '@storybook/builder-vite': 8.1.11(encoding@0.1.13)(prettier@3.3.2)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))
+      '@storybook/core-server': 8.1.11(bufferutil@4.0.7)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)
+      '@storybook/types': 8.1.11
+      '@storybook/vue3': 8.1.11(encoding@0.1.13)(prettier@3.3.2)(vue@3.4.31(typescript@5.5.3))
       find-package-json: 1.2.0
-      magic-string: 0.30.7
-      typescript: 5.5.2
-      vite: 5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3)
-      vue-component-meta: 2.0.16(typescript@5.5.2)
-      vue-docgen-api: 4.75.1(vue@3.4.26(typescript@5.5.2))
+      magic-string: 0.30.10
+      typescript: 5.5.3
+      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)
+      vue-component-meta: 2.0.16(typescript@5.5.3)
+      vue-docgen-api: 4.75.1(vue@3.4.31(typescript@5.5.3))
     transitivePeerDependencies:
       - '@preact/preset-vite'
       - bufferutil
       - encoding
+      - prettier
       - react
       - react-dom
       - supports-color
@@ -15471,26 +16514,27 @@ snapshots:
       - vite-plugin-glimmerx
       - vue
 
-  '@storybook/vue3@8.0.9(encoding@0.1.13)(vue@3.4.26(typescript@5.5.2))':
+  '@storybook/vue3@8.1.11(encoding@0.1.13)(prettier@3.3.2)(vue@3.4.31(typescript@5.5.3))':
     dependencies:
-      '@storybook/docs-tools': 8.0.9(encoding@0.1.13)
+      '@storybook/docs-tools': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
       '@storybook/global': 5.0.0
-      '@storybook/preview-api': 8.0.9
-      '@storybook/types': 8.0.9
-      '@vue/compiler-core': 3.4.21
+      '@storybook/preview-api': 8.1.11
+      '@storybook/types': 8.1.11
+      '@vue/compiler-core': 3.4.29
       lodash: 4.17.21
       ts-dedent: 2.2.0
       type-fest: 2.19.0
-      vue: 3.4.26(typescript@5.5.2)
-      vue-component-type-helpers: 2.0.21
+      vue: 3.4.31(typescript@5.5.3)
+      vue-component-type-helpers: 2.0.24
     transitivePeerDependencies:
       - encoding
+      - prettier
       - supports-color
 
-  '@swc/cli@0.3.12(@swc/core@1.4.17)(chokidar@3.5.3)':
+  '@swc/cli@0.3.12(@swc/core@1.6.6)(chokidar@3.5.3)':
     dependencies:
       '@mole-inc/bin-wrapper': 8.0.1
-      '@swc/core': 1.4.17
+      '@swc/core': 1.6.6
       '@swc/counter': 0.1.3
       commander: 8.3.0
       fast-glob: 3.3.2
@@ -15510,13 +16554,13 @@ snapshots:
   '@swc/core-darwin-arm64@1.3.56':
     optional: true
 
-  '@swc/core-darwin-arm64@1.4.17':
+  '@swc/core-darwin-arm64@1.6.6':
     optional: true
 
   '@swc/core-darwin-x64@1.3.56':
     optional: true
 
-  '@swc/core-darwin-x64@1.4.17':
+  '@swc/core-darwin-x64@1.6.6':
     optional: true
 
   '@swc/core-freebsd-x64@1.3.11':
@@ -15527,77 +16571,79 @@ snapshots:
   '@swc/core-linux-arm-gnueabihf@1.3.56':
     optional: true
 
-  '@swc/core-linux-arm-gnueabihf@1.4.17':
+  '@swc/core-linux-arm-gnueabihf@1.6.6':
     optional: true
 
   '@swc/core-linux-arm64-gnu@1.3.56':
     optional: true
 
-  '@swc/core-linux-arm64-gnu@1.4.17':
+  '@swc/core-linux-arm64-gnu@1.6.6':
     optional: true
 
   '@swc/core-linux-arm64-musl@1.3.56':
     optional: true
 
-  '@swc/core-linux-arm64-musl@1.4.17':
+  '@swc/core-linux-arm64-musl@1.6.6':
     optional: true
 
   '@swc/core-linux-x64-gnu@1.3.56':
     optional: true
 
-  '@swc/core-linux-x64-gnu@1.4.17':
+  '@swc/core-linux-x64-gnu@1.6.6':
     optional: true
 
   '@swc/core-linux-x64-musl@1.3.56':
     optional: true
 
-  '@swc/core-linux-x64-musl@1.4.17':
+  '@swc/core-linux-x64-musl@1.6.6':
     optional: true
 
   '@swc/core-win32-arm64-msvc@1.3.56':
     optional: true
 
-  '@swc/core-win32-arm64-msvc@1.4.17':
+  '@swc/core-win32-arm64-msvc@1.6.6':
     optional: true
 
   '@swc/core-win32-ia32-msvc@1.3.56':
     optional: true
 
-  '@swc/core-win32-ia32-msvc@1.4.17':
+  '@swc/core-win32-ia32-msvc@1.6.6':
     optional: true
 
   '@swc/core-win32-x64-msvc@1.3.56':
     optional: true
 
-  '@swc/core-win32-x64-msvc@1.4.17':
+  '@swc/core-win32-x64-msvc@1.6.6':
     optional: true
 
-  '@swc/core@1.4.17':
+  '@swc/core@1.6.6':
     dependencies:
       '@swc/counter': 0.1.3
-      '@swc/types': 0.1.5
+      '@swc/types': 0.1.9
     optionalDependencies:
-      '@swc/core-darwin-arm64': 1.4.17
-      '@swc/core-darwin-x64': 1.4.17
-      '@swc/core-linux-arm-gnueabihf': 1.4.17
-      '@swc/core-linux-arm64-gnu': 1.4.17
-      '@swc/core-linux-arm64-musl': 1.4.17
-      '@swc/core-linux-x64-gnu': 1.4.17
-      '@swc/core-linux-x64-musl': 1.4.17
-      '@swc/core-win32-arm64-msvc': 1.4.17
-      '@swc/core-win32-ia32-msvc': 1.4.17
-      '@swc/core-win32-x64-msvc': 1.4.17
+      '@swc/core-darwin-arm64': 1.6.6
+      '@swc/core-darwin-x64': 1.6.6
+      '@swc/core-linux-arm-gnueabihf': 1.6.6
+      '@swc/core-linux-arm64-gnu': 1.6.6
+      '@swc/core-linux-arm64-musl': 1.6.6
+      '@swc/core-linux-x64-gnu': 1.6.6
+      '@swc/core-linux-x64-musl': 1.6.6
+      '@swc/core-win32-arm64-msvc': 1.6.6
+      '@swc/core-win32-ia32-msvc': 1.6.6
+      '@swc/core-win32-x64-msvc': 1.6.6
 
   '@swc/counter@0.1.3': {}
 
-  '@swc/jest@0.2.36(@swc/core@1.4.17)':
+  '@swc/jest@0.2.36(@swc/core@1.6.6)':
     dependencies:
       '@jest/create-cache-key-function': 29.7.0
-      '@swc/core': 1.4.17
+      '@swc/core': 1.6.6
       '@swc/counter': 0.1.3
       jsonc-parser: 3.2.0
 
-  '@swc/types@0.1.5': {}
+  '@swc/types@0.1.9':
+    dependencies:
+      '@swc/counter': 0.1.3
 
   '@swc/wasm@1.2.130':
     optional: true
@@ -15701,12 +16747,12 @@ snapshots:
       - encoding
       - seedrandom
 
-  '@testing-library/dom@9.3.3':
+  '@testing-library/dom@10.1.0':
     dependencies:
-      '@babel/code-frame': 7.23.5
+      '@babel/code-frame': 7.24.7
       '@babel/runtime': 7.23.4
       '@types/aria-query': 5.0.1
-      aria-query: 5.1.3
+      aria-query: 5.3.0
       chalk: 4.1.2
       dom-accessibility-api: 0.5.16
       lz-string: 1.5.0
@@ -15723,7 +16769,7 @@ snapshots:
       lz-string: 1.5.0
       pretty-format: 27.5.1
 
-  '@testing-library/jest-dom@6.4.2(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.12.7))(vitest@0.34.6(happy-dom@10.0.3)(jsdom@24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.76.0)(terser@5.30.3))':
+  '@testing-library/jest-dom@6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))':
     dependencies:
       '@adobe/css-tools': 4.3.3
       '@babel/runtime': 7.23.4
@@ -15736,21 +16782,21 @@ snapshots:
     optionalDependencies:
       '@jest/globals': 29.7.0
       '@types/jest': 29.5.12
-      jest: 29.7.0(@types/node@20.12.7)
-      vitest: 0.34.6(happy-dom@10.0.3)(jsdom@24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.76.0)(terser@5.30.3)
+      jest: 29.7.0(@types/node@20.14.9)
+      vitest: 1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1)
 
-  '@testing-library/user-event@14.5.2(@testing-library/dom@9.3.4)':
+  '@testing-library/user-event@14.5.2(@testing-library/dom@10.1.0)':
     dependencies:
-      '@testing-library/dom': 9.3.4
+      '@testing-library/dom': 10.1.0
 
-  '@testing-library/vue@8.0.3(@vue/compiler-sfc@3.4.26)(@vue/server-renderer@3.4.26(vue@3.4.26(typescript@5.5.2)))(vue@3.4.26(typescript@5.5.2))':
+  '@testing-library/vue@8.1.0(@vue/compiler-sfc@3.4.31)(@vue/server-renderer@3.4.29(vue@3.4.31(typescript@5.5.3)))(vue@3.4.31(typescript@5.5.3))':
     dependencies:
       '@babel/runtime': 7.23.4
-      '@testing-library/dom': 9.3.3
-      '@vue/test-utils': 2.4.1(@vue/server-renderer@3.4.26(vue@3.4.26(typescript@5.5.2)))(vue@3.4.26(typescript@5.5.2))
-      vue: 3.4.26(typescript@5.5.2)
+      '@testing-library/dom': 9.3.4
+      '@vue/test-utils': 2.4.1(@vue/server-renderer@3.4.29(vue@3.4.31(typescript@5.5.3)))(vue@3.4.31(typescript@5.5.3))
+      vue: 3.4.31(typescript@5.5.3)
     optionalDependencies:
-      '@vue/compiler-sfc': 3.4.26
+      '@vue/compiler-sfc': 3.4.31
     transitivePeerDependencies:
       - '@vue/server-renderer'
 
@@ -15758,7 +16804,7 @@ snapshots:
 
   '@trysound/sax@0.2.0': {}
 
-  '@tsd/typescript@5.3.3': {}
+  '@tsd/typescript@5.4.5': {}
 
   '@twemoji/parser@15.0.0': {}
 
@@ -15766,7 +16812,7 @@ snapshots:
 
   '@types/accepts@1.3.7':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/archiver@6.0.2':
     dependencies:
@@ -15778,31 +16824,31 @@ snapshots:
 
   '@types/babel__core@7.20.0':
     dependencies:
-      '@babel/parser': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/parser': 7.24.7
+      '@babel/types': 7.24.7
       '@types/babel__generator': 7.6.4
       '@types/babel__template': 7.4.1
       '@types/babel__traverse': 7.20.0
 
   '@types/babel__generator@7.6.4':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.7
 
   '@types/babel__template@7.4.1':
     dependencies:
-      '@babel/parser': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/parser': 7.24.7
+      '@babel/types': 7.24.7
 
   '@types/babel__traverse@7.20.0':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.7
 
   '@types/bcryptjs@2.4.6': {}
 
   '@types/body-parser@1.19.5':
     dependencies:
       '@types/connect': 3.4.35
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/braces@3.0.1': {}
 
@@ -15810,15 +16856,9 @@ snapshots:
     dependencies:
       '@types/http-cache-semantics': 4.0.4
       '@types/keyv': 3.1.4
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       '@types/responselike': 1.0.0
 
-  '@types/chai-subset@1.3.5':
-    dependencies:
-      '@types/chai': 4.3.11
-
-  '@types/chai@4.3.11': {}
-
   '@types/color-convert@2.0.3':
     dependencies:
       '@types/color-name': 1.1.1
@@ -15827,11 +16867,11 @@ snapshots:
 
   '@types/connect@3.4.35':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/connect@3.4.36':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/content-disposition@0.5.8': {}
 
@@ -15839,14 +16879,14 @@ snapshots:
 
   '@types/cookies@0.9.0':
     dependencies:
-      '@types/connect': 3.4.35
+      '@types/connect': 3.4.36
       '@types/express': 4.17.17
       '@types/keygrip': 1.0.6
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/cross-spawn@6.0.2':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/debug@4.1.12':
     dependencies:
@@ -15854,6 +16894,8 @@ snapshots:
 
   '@types/detect-port@1.3.2': {}
 
+  '@types/diff@5.2.1': {}
+
   '@types/disposable-email-domains@1.0.2': {}
 
   '@types/doctrine@0.0.3': {}
@@ -15871,7 +16913,7 @@ snapshots:
   '@types/eslint@7.29.0':
     dependencies:
       '@types/estree': 1.0.5
-      '@types/json-schema': 7.0.12
+      '@types/json-schema': 7.0.15
 
   '@types/estree@0.0.51': {}
 
@@ -15879,7 +16921,7 @@ snapshots:
 
   '@types/express-serve-static-core@4.17.33':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       '@types/qs': 6.9.7
       '@types/range-parser': 1.2.4
 
@@ -15894,16 +16936,16 @@ snapshots:
 
   '@types/fluent-ffmpeg@2.1.24':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/glob@7.2.0':
     dependencies:
       '@types/minimatch': 5.1.2
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/graceful-fs@4.1.6':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/hast@3.0.4':
     dependencies:
@@ -15917,9 +16959,9 @@ snapshots:
 
   '@types/http-errors@2.0.4': {}
 
-  '@types/http-link-header@1.0.5':
+  '@types/http-link-header@1.0.7':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/istanbul-lib-coverage@2.0.4': {}
 
@@ -15938,9 +16980,9 @@ snapshots:
 
   '@types/js-yaml@4.0.9': {}
 
-  '@types/jsdom@21.1.6':
+  '@types/jsdom@21.1.7':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       '@types/tough-cookie': 4.0.2
       parse5: 7.1.2
 
@@ -15950,7 +16992,7 @@ snapshots:
 
   '@types/json5@0.0.29': {}
 
-  '@types/jsonld@1.5.13': {}
+  '@types/jsonld@1.5.14': {}
 
   '@types/jsrsasign@10.5.14': {}
 
@@ -15958,7 +17000,7 @@ snapshots:
 
   '@types/keyv@3.1.4':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/koa-compose@3.2.8':
     dependencies:
@@ -15973,7 +17015,7 @@ snapshots:
       '@types/http-errors': 2.0.4
       '@types/keygrip': 1.0.6
       '@types/koa-compose': 3.2.8
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/koa__router@12.0.3':
     dependencies:
@@ -15991,7 +17033,7 @@ snapshots:
 
   '@types/mdx@2.0.3': {}
 
-  '@types/micromatch@4.0.7':
+  '@types/micromatch@4.0.9':
     dependencies:
       '@types/braces': 3.0.1
 
@@ -16007,15 +17049,15 @@ snapshots:
 
   '@types/mute-stream@0.0.4':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/mysql@2.15.22':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/node-fetch@2.6.4':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       form-data: 3.0.1
 
   '@types/node@18.17.15': {}
@@ -16024,7 +17066,7 @@ snapshots:
     dependencies:
       undici-types: 5.26.5
 
-  '@types/node@20.12.7':
+  '@types/node@20.14.9':
     dependencies:
       undici-types: 5.26.5
 
@@ -16034,7 +17076,7 @@ snapshots:
 
   '@types/nodemailer@6.4.15':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/normalize-package-data@2.4.1': {}
 
@@ -16045,11 +17087,11 @@ snapshots:
   '@types/oauth2orize@1.11.5':
     dependencies:
       '@types/express': 4.17.17
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
-  '@types/oauth@0.9.4':
+  '@types/oauth@0.9.5':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/offscreencanvas@2019.3.0': {}
 
@@ -16057,17 +17099,17 @@ snapshots:
 
   '@types/pg-pool@2.0.4':
     dependencies:
-      '@types/pg': 8.11.5
+      '@types/pg': 8.11.6
 
-  '@types/pg@8.11.5':
+  '@types/pg@8.11.6':
     dependencies:
-      '@types/node': 20.12.7
-      pg-protocol: 1.6.0
+      '@types/node': 20.14.9
+      pg-protocol: 1.6.1
       pg-types: 4.0.1
 
   '@types/pg@8.6.1':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       pg-protocol: 1.6.1
       pg-types: 2.2.0
 
@@ -16081,7 +17123,7 @@ snapshots:
 
   '@types/qrcode@1.5.5':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/qs@6.9.7': {}
 
@@ -16099,7 +17141,7 @@ snapshots:
 
   '@types/readdir-glob@1.1.1':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/rename@1.0.7': {}
 
@@ -16107,7 +17149,7 @@ snapshots:
 
   '@types/responselike@1.0.0':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/sanitize-html@2.11.0':
     dependencies:
@@ -16124,7 +17166,7 @@ snapshots:
   '@types/serve-static@1.15.1':
     dependencies:
       '@types/mime': 3.0.1
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/serviceworker@0.0.67': {}
 
@@ -16156,15 +17198,17 @@ snapshots:
 
   '@types/unist@3.0.2': {}
 
+  '@types/uuid@10.0.0': {}
+
   '@types/uuid@9.0.8': {}
 
   '@types/vary@1.1.3':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/web-push@3.6.3':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/webgl-ext@0.0.30': {}
 
@@ -16172,7 +17216,7 @@ snapshots:
 
   '@types/ws@8.5.10':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
 
   '@types/yargs-parser@21.0.0': {}
 
@@ -16182,19 +17226,19 @@ snapshots:
 
   '@types/yauzl@2.10.0':
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
     optional: true
 
-  '@typescript-eslint/eslint-plugin@6.11.0(@typescript-eslint/parser@6.11.0(eslint@8.53.0)(typescript@5.3.3))(eslint@8.53.0)(typescript@5.3.3)':
+  '@typescript-eslint/eslint-plugin@6.11.0(@typescript-eslint/parser@6.11.0(eslint@9.6.0)(typescript@5.3.3))(eslint@9.6.0)(typescript@5.3.3)':
     dependencies:
       '@eslint-community/regexpp': 4.6.2
-      '@typescript-eslint/parser': 6.11.0(eslint@8.53.0)(typescript@5.3.3)
+      '@typescript-eslint/parser': 6.11.0(eslint@9.6.0)(typescript@5.3.3)
       '@typescript-eslint/scope-manager': 6.11.0
-      '@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/type-utils': 6.11.0(eslint@9.6.0)(typescript@5.3.3)
+      '@typescript-eslint/utils': 6.11.0(eslint@9.6.0)(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 6.11.0
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.53.0
+      debug: 4.3.4(supports-color@5.5.0)
+      eslint: 9.6.0
       graphemer: 1.4.0
       ignore: 5.2.4
       natural-compare: 1.4.0
@@ -16205,16 +17249,16 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/eslint-plugin@7.1.0(@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3)':
+  '@typescript-eslint/eslint-plugin@7.1.0(@typescript-eslint/parser@7.1.0(eslint@9.6.0)(typescript@5.3.3))(eslint@9.6.0)(typescript@5.3.3)':
     dependencies:
       '@eslint-community/regexpp': 4.6.2
-      '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
+      '@typescript-eslint/parser': 7.1.0(eslint@9.6.0)(typescript@5.3.3)
       '@typescript-eslint/scope-manager': 7.1.0
-      '@typescript-eslint/type-utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
-      '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
+      '@typescript-eslint/type-utils': 7.1.0(eslint@9.6.0)(typescript@5.3.3)
+      '@typescript-eslint/utils': 7.1.0(eslint@9.6.0)(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.57.0
+      debug: 4.3.4(supports-color@5.5.0)
+      eslint: 9.6.0
       graphemer: 1.4.0
       ignore: 5.2.4
       natural-compare: 1.4.0
@@ -16225,62 +17269,60 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/eslint-plugin@7.7.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2)':
+  '@typescript-eslint/eslint-plugin@7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3)':
     dependencies:
       '@eslint-community/regexpp': 4.10.0
-      '@typescript-eslint/parser': 7.7.1(eslint@8.57.0)(typescript@5.5.2)
-      '@typescript-eslint/scope-manager': 7.7.1
-      '@typescript-eslint/type-utils': 7.7.1(eslint@8.57.0)(typescript@5.5.2)
-      '@typescript-eslint/utils': 7.7.1(eslint@8.57.0)(typescript@5.5.2)
-      '@typescript-eslint/visitor-keys': 7.7.1
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.57.0
+      '@typescript-eslint/parser': 7.15.0(eslint@9.6.0)(typescript@5.5.3)
+      '@typescript-eslint/scope-manager': 7.15.0
+      '@typescript-eslint/type-utils': 7.15.0(eslint@9.6.0)(typescript@5.5.3)
+      '@typescript-eslint/utils': 7.15.0(eslint@9.6.0)(typescript@5.5.3)
+      '@typescript-eslint/visitor-keys': 7.15.0
+      eslint: 9.6.0
       graphemer: 1.4.0
       ignore: 5.3.1
       natural-compare: 1.4.0
-      semver: 7.6.0
-      ts-api-utils: 1.3.0(typescript@5.5.2)
+      ts-api-utils: 1.3.0(typescript@5.5.3)
     optionalDependencies:
-      typescript: 5.5.2
+      typescript: 5.5.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@6.11.0(eslint@8.53.0)(typescript@5.3.3)':
+  '@typescript-eslint/parser@6.11.0(eslint@9.6.0)(typescript@5.3.3)':
     dependencies:
       '@typescript-eslint/scope-manager': 6.11.0
       '@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)
-      eslint: 8.53.0
+      debug: 4.3.4(supports-color@5.5.0)
+      eslint: 9.6.0
     optionalDependencies:
       typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3)':
+  '@typescript-eslint/parser@7.1.0(eslint@9.6.0)(typescript@5.3.3)':
     dependencies:
       '@typescript-eslint/scope-manager': 7.1.0
       '@typescript-eslint/types': 7.1.0
       '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.57.0
+      debug: 4.3.4(supports-color@5.5.0)
+      eslint: 9.6.0
     optionalDependencies:
       typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2)':
+  '@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3)':
     dependencies:
-      '@typescript-eslint/scope-manager': 7.7.1
-      '@typescript-eslint/types': 7.7.1
-      '@typescript-eslint/typescript-estree': 7.7.1(typescript@5.5.2)
-      '@typescript-eslint/visitor-keys': 7.7.1
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.57.0
+      '@typescript-eslint/scope-manager': 7.15.0
+      '@typescript-eslint/types': 7.15.0
+      '@typescript-eslint/typescript-estree': 7.15.0(typescript@5.5.3)
+      '@typescript-eslint/visitor-keys': 7.15.0
+      debug: 4.3.5(supports-color@8.1.1)
+      eslint: 9.6.0
     optionalDependencies:
-      typescript: 5.5.2
+      typescript: 5.5.3
     transitivePeerDependencies:
       - supports-color
 
@@ -16294,44 +17336,44 @@ snapshots:
       '@typescript-eslint/types': 7.1.0
       '@typescript-eslint/visitor-keys': 7.1.0
 
-  '@typescript-eslint/scope-manager@7.7.1':
+  '@typescript-eslint/scope-manager@7.15.0':
     dependencies:
-      '@typescript-eslint/types': 7.7.1
-      '@typescript-eslint/visitor-keys': 7.7.1
+      '@typescript-eslint/types': 7.15.0
+      '@typescript-eslint/visitor-keys': 7.15.0
 
-  '@typescript-eslint/type-utils@6.11.0(eslint@8.53.0)(typescript@5.3.3)':
+  '@typescript-eslint/type-utils@6.11.0(eslint@9.6.0)(typescript@5.3.3)':
     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)
-      eslint: 8.53.0
+      '@typescript-eslint/utils': 6.11.0(eslint@9.6.0)(typescript@5.3.3)
+      debug: 4.3.5(supports-color@8.1.1)
+      eslint: 9.6.0
       ts-api-utils: 1.0.1(typescript@5.3.3)
     optionalDependencies:
       typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/type-utils@7.1.0(eslint@8.57.0)(typescript@5.3.3)':
+  '@typescript-eslint/type-utils@7.1.0(eslint@9.6.0)(typescript@5.3.3)':
     dependencies:
       '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
-      '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.57.0
+      '@typescript-eslint/utils': 7.1.0(eslint@9.6.0)(typescript@5.3.3)
+      debug: 4.3.4(supports-color@5.5.0)
+      eslint: 9.6.0
       ts-api-utils: 1.0.1(typescript@5.3.3)
     optionalDependencies:
       typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/type-utils@7.7.1(eslint@8.57.0)(typescript@5.5.2)':
+  '@typescript-eslint/type-utils@7.15.0(eslint@9.6.0)(typescript@5.5.3)':
     dependencies:
-      '@typescript-eslint/typescript-estree': 7.7.1(typescript@5.5.2)
-      '@typescript-eslint/utils': 7.7.1(eslint@8.57.0)(typescript@5.5.2)
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.57.0
-      ts-api-utils: 1.3.0(typescript@5.5.2)
+      '@typescript-eslint/typescript-estree': 7.15.0(typescript@5.5.3)
+      '@typescript-eslint/utils': 7.15.0(eslint@9.6.0)(typescript@5.5.3)
+      debug: 4.3.5(supports-color@8.1.1)
+      eslint: 9.6.0
+      ts-api-utils: 1.3.0(typescript@5.5.3)
     optionalDependencies:
-      typescript: 5.5.2
+      typescript: 5.5.3
     transitivePeerDependencies:
       - supports-color
 
@@ -16339,13 +17381,13 @@ snapshots:
 
   '@typescript-eslint/types@7.1.0': {}
 
-  '@typescript-eslint/types@7.7.1': {}
+  '@typescript-eslint/types@7.15.0': {}
 
   '@typescript-eslint/typescript-estree@6.11.0(typescript@5.3.3)':
     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.5(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.5.4
@@ -16359,7 +17401,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 7.1.0
       '@typescript-eslint/visitor-keys': 7.1.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
       minimatch: 9.0.3
@@ -16370,59 +17412,56 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@7.7.1(typescript@5.5.2)':
+  '@typescript-eslint/typescript-estree@7.15.0(typescript@5.5.3)':
     dependencies:
-      '@typescript-eslint/types': 7.7.1
-      '@typescript-eslint/visitor-keys': 7.7.1
-      debug: 4.3.4(supports-color@8.1.1)
+      '@typescript-eslint/types': 7.15.0
+      '@typescript-eslint/visitor-keys': 7.15.0
+      debug: 4.3.5(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.4
       semver: 7.6.0
-      ts-api-utils: 1.3.0(typescript@5.5.2)
+      ts-api-utils: 1.3.0(typescript@5.5.3)
     optionalDependencies:
-      typescript: 5.5.2
+      typescript: 5.5.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@6.11.0(eslint@8.53.0)(typescript@5.3.3)':
+  '@typescript-eslint/utils@6.11.0(eslint@9.6.0)(typescript@5.3.3)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.53.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.6.0)
       '@types/json-schema': 7.0.12
       '@types/semver': 7.5.8
       '@typescript-eslint/scope-manager': 6.11.0
       '@typescript-eslint/types': 6.11.0
       '@typescript-eslint/typescript-estree': 6.11.0(typescript@5.3.3)
-      eslint: 8.53.0
+      eslint: 9.6.0
       semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  '@typescript-eslint/utils@7.1.0(eslint@8.57.0)(typescript@5.3.3)':
+  '@typescript-eslint/utils@7.1.0(eslint@9.6.0)(typescript@5.3.3)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.6.0)
       '@types/json-schema': 7.0.12
       '@types/semver': 7.5.8
       '@typescript-eslint/scope-manager': 7.1.0
       '@typescript-eslint/types': 7.1.0
       '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
-      eslint: 8.57.0
+      eslint: 9.6.0
       semver: 7.6.0
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  '@typescript-eslint/utils@7.7.1(eslint@8.57.0)(typescript@5.5.2)':
+  '@typescript-eslint/utils@7.15.0(eslint@9.6.0)(typescript@5.5.3)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
-      '@types/json-schema': 7.0.15
-      '@types/semver': 7.5.8
-      '@typescript-eslint/scope-manager': 7.7.1
-      '@typescript-eslint/types': 7.7.1
-      '@typescript-eslint/typescript-estree': 7.7.1(typescript@5.5.2)
-      eslint: 8.57.0
-      semver: 7.6.0
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.6.0)
+      '@typescript-eslint/scope-manager': 7.15.0
+      '@typescript-eslint/types': 7.15.0
+      '@typescript-eslint/typescript-estree': 7.15.0(typescript@5.5.3)
+      eslint: 9.6.0
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -16437,84 +17476,59 @@ snapshots:
       '@typescript-eslint/types': 7.1.0
       eslint-visitor-keys: 3.4.3
 
-  '@typescript-eslint/visitor-keys@7.7.1':
+  '@typescript-eslint/visitor-keys@7.15.0':
     dependencies:
-      '@typescript-eslint/types': 7.7.1
+      '@typescript-eslint/types': 7.15.0
       eslint-visitor-keys: 3.4.3
 
   '@ungap/structured-clone@1.2.0': {}
 
-  '@vitejs/plugin-vue@5.0.4(vite@5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3))(vue@3.4.26(typescript@5.5.2))':
+  '@vitejs/plugin-vue@5.0.5(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.5.3))':
     dependencies:
-      vite: 5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3)
-      vue: 3.4.26(typescript@5.5.2)
+      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)
+      vue: 3.4.31(typescript@5.5.3)
 
-  '@vitest/coverage-v8@0.34.6(vitest@0.34.6(happy-dom@10.0.3)(jsdom@24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.76.0)(terser@5.30.3))':
+  '@vitest/coverage-v8@1.6.0(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))':
     dependencies:
       '@ampproject/remapping': 2.2.1
       '@bcoe/v8-coverage': 0.2.3
+      debug: 4.3.4(supports-color@5.5.0)
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
-      istanbul-lib-source-maps: 4.0.1
+      istanbul-lib-source-maps: 5.0.4
       istanbul-reports: 3.1.6
-      magic-string: 0.30.7
+      magic-string: 0.30.10
+      magicast: 0.3.4
       picocolors: 1.0.0
       std-env: 3.7.0
+      strip-literal: 2.1.0
       test-exclude: 6.0.0
-      v8-to-istanbul: 9.2.0
-      vitest: 0.34.6(happy-dom@10.0.3)(jsdom@24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.76.0)(terser@5.30.3)
+      vitest: 1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitest/expect@0.34.6':
+  '@vitest/expect@1.6.0':
     dependencies:
-      '@vitest/spy': 0.34.6
-      '@vitest/utils': 0.34.6
+      '@vitest/spy': 1.6.0
+      '@vitest/utils': 1.6.0
       chai: 4.3.10
 
-  '@vitest/expect@1.3.1':
+  '@vitest/runner@1.6.0':
     dependencies:
-      '@vitest/spy': 1.3.1
-      '@vitest/utils': 1.3.1
-      chai: 4.3.10
-
-  '@vitest/runner@0.34.6':
-    dependencies:
-      '@vitest/utils': 0.34.6
-      p-limit: 4.0.0
+      '@vitest/utils': 1.6.0
+      p-limit: 5.0.0
       pathe: 1.1.2
 
-  '@vitest/snapshot@0.34.6':
+  '@vitest/snapshot@1.6.0':
     dependencies:
-      magic-string: 0.30.7
+      magic-string: 0.30.10
       pathe: 1.1.2
       pretty-format: 29.7.0
 
-  '@vitest/spy@0.34.6':
-    dependencies:
-      tinyspy: 2.2.0
-
-  '@vitest/spy@1.3.1':
-    dependencies:
-      tinyspy: 2.2.0
-
   '@vitest/spy@1.6.0':
     dependencies:
       tinyspy: 2.2.0
 
-  '@vitest/utils@0.34.6':
-    dependencies:
-      diff-sequences: 29.6.3
-      loupe: 2.3.7
-      pretty-format: 29.7.0
-
-  '@vitest/utils@1.3.1':
-    dependencies:
-      diff-sequences: 29.6.3
-      estree-walker: 3.0.3
-      loupe: 2.3.7
-      pretty-format: 29.7.0
-
   '@vitest/utils@1.6.0':
     dependencies:
       diff-sequences: 29.6.3
@@ -16526,125 +17540,149 @@ snapshots:
     dependencies:
       '@volar/source-map': 2.2.0
 
+  '@volar/language-core@2.4.0-alpha.11':
+    dependencies:
+      '@volar/source-map': 2.4.0-alpha.11
+
   '@volar/source-map@2.2.0':
     dependencies:
       muggle-string: 0.4.1
 
+  '@volar/source-map@2.4.0-alpha.11': {}
+
   '@volar/typescript@2.2.0':
     dependencies:
       '@volar/language-core': 2.2.0
       path-browserify: 1.0.1
 
-  '@vue/compiler-core@3.4.21':
+  '@volar/typescript@2.4.0-alpha.11':
     dependencies:
-      '@babel/parser': 7.24.0
-      '@vue/shared': 3.4.21
-      entities: 4.5.0
-      estree-walker: 2.0.2
-      source-map-js: 1.0.2
+      '@volar/language-core': 2.4.0-alpha.11
+      path-browserify: 1.0.1
+      vscode-uri: 3.0.8
 
-  '@vue/compiler-core@3.4.25':
+  '@vue/compiler-core@3.4.29':
     dependencies:
-      '@babel/parser': 7.24.5
-      '@vue/shared': 3.4.25
+      '@babel/parser': 7.24.7
+      '@vue/shared': 3.4.29
       entities: 4.5.0
       estree-walker: 2.0.2
       source-map-js: 1.2.0
 
-  '@vue/compiler-core@3.4.26':
+  '@vue/compiler-core@3.4.31':
     dependencies:
-      '@babel/parser': 7.24.5
-      '@vue/shared': 3.4.26
+      '@babel/parser': 7.24.7
+      '@vue/shared': 3.4.31
       entities: 4.5.0
       estree-walker: 2.0.2
       source-map-js: 1.2.0
 
-  '@vue/compiler-dom@3.4.21':
+  '@vue/compiler-dom@3.4.29':
     dependencies:
-      '@vue/compiler-core': 3.4.21
-      '@vue/shared': 3.4.21
+      '@vue/compiler-core': 3.4.29
+      '@vue/shared': 3.4.29
 
-  '@vue/compiler-dom@3.4.25':
+  '@vue/compiler-dom@3.4.31':
     dependencies:
-      '@vue/compiler-core': 3.4.25
-      '@vue/shared': 3.4.25
+      '@vue/compiler-core': 3.4.31
+      '@vue/shared': 3.4.31
 
-  '@vue/compiler-dom@3.4.26':
+  '@vue/compiler-sfc@3.4.31':
     dependencies:
-      '@vue/compiler-core': 3.4.26
-      '@vue/shared': 3.4.26
-
-  '@vue/compiler-sfc@3.4.26':
-    dependencies:
-      '@babel/parser': 7.24.5
-      '@vue/compiler-core': 3.4.26
-      '@vue/compiler-dom': 3.4.26
-      '@vue/compiler-ssr': 3.4.26
-      '@vue/shared': 3.4.26
+      '@babel/parser': 7.24.7
+      '@vue/compiler-core': 3.4.31
+      '@vue/compiler-dom': 3.4.31
+      '@vue/compiler-ssr': 3.4.31
+      '@vue/shared': 3.4.31
       estree-walker: 2.0.2
       magic-string: 0.30.10
       postcss: 8.4.38
       source-map-js: 1.2.0
 
-  '@vue/compiler-ssr@3.4.26':
+  '@vue/compiler-ssr@3.4.29':
     dependencies:
-      '@vue/compiler-dom': 3.4.26
-      '@vue/shared': 3.4.26
+      '@vue/compiler-dom': 3.4.29
+      '@vue/shared': 3.4.29
+    optional: true
+
+  '@vue/compiler-ssr@3.4.31':
+    dependencies:
+      '@vue/compiler-dom': 3.4.31
+      '@vue/shared': 3.4.31
 
   '@vue/devtools-api@6.6.1': {}
 
-  '@vue/language-core@2.0.16(typescript@5.5.2)':
+  '@vue/language-core@2.0.16(typescript@5.5.3)':
     dependencies:
       '@volar/language-core': 2.2.0
-      '@vue/compiler-dom': 3.4.25
-      '@vue/shared': 3.4.25
+      '@vue/compiler-dom': 3.4.29
+      '@vue/shared': 3.4.29
       computeds: 0.0.1
       minimatch: 9.0.4
       path-browserify: 1.0.1
       vue-template-compiler: 2.7.14
     optionalDependencies:
-      typescript: 5.5.2
+      typescript: 5.5.3
 
-  '@vue/reactivity@3.4.26':
+  '@vue/language-core@2.0.24(typescript@5.5.3)':
     dependencies:
-      '@vue/shared': 3.4.26
+      '@volar/language-core': 2.4.0-alpha.11
+      '@vue/compiler-dom': 3.4.29
+      '@vue/shared': 3.4.29
+      computeds: 0.0.1
+      minimatch: 9.0.4
+      muggle-string: 0.4.1
+      path-browserify: 1.0.1
+      vue-template-compiler: 2.7.14
+    optionalDependencies:
+      typescript: 5.5.3
 
-  '@vue/runtime-core@3.4.26':
+  '@vue/reactivity@3.4.31':
     dependencies:
-      '@vue/reactivity': 3.4.26
-      '@vue/shared': 3.4.26
+      '@vue/shared': 3.4.31
 
-  '@vue/runtime-dom@3.4.26':
+  '@vue/runtime-core@3.4.31':
     dependencies:
-      '@vue/runtime-core': 3.4.26
-      '@vue/shared': 3.4.26
+      '@vue/reactivity': 3.4.31
+      '@vue/shared': 3.4.31
+
+  '@vue/runtime-dom@3.4.31':
+    dependencies:
+      '@vue/reactivity': 3.4.31
+      '@vue/runtime-core': 3.4.31
+      '@vue/shared': 3.4.31
       csstype: 3.1.3
 
-  '@vue/server-renderer@3.4.26(vue@3.4.26(typescript@5.5.2))':
+  '@vue/server-renderer@3.4.29(vue@3.4.31(typescript@5.5.3))':
     dependencies:
-      '@vue/compiler-ssr': 3.4.26
-      '@vue/shared': 3.4.26
-      vue: 3.4.26(typescript@5.5.2)
+      '@vue/compiler-ssr': 3.4.29
+      '@vue/shared': 3.4.29
+      vue: 3.4.31(typescript@5.5.3)
+    optional: true
 
-  '@vue/shared@3.4.21': {}
+  '@vue/server-renderer@3.4.31(vue@3.4.31(typescript@5.5.3))':
+    dependencies:
+      '@vue/compiler-ssr': 3.4.31
+      '@vue/shared': 3.4.31
+      vue: 3.4.31(typescript@5.5.3)
 
-  '@vue/shared@3.4.25': {}
+  '@vue/shared@3.4.29': {}
 
-  '@vue/shared@3.4.26': {}
+  '@vue/shared@3.4.31': {}
 
-  '@vue/test-utils@2.4.1(@vue/server-renderer@3.4.26(vue@3.4.26(typescript@5.5.2)))(vue@3.4.26(typescript@5.5.2))':
+  '@vue/test-utils@2.4.1(@vue/server-renderer@3.4.29(vue@3.4.31(typescript@5.5.3)))(vue@3.4.31(typescript@5.5.3))':
     dependencies:
       js-beautify: 1.14.9
-      vue: 3.4.26(typescript@5.5.2)
+      vue: 3.4.31(typescript@5.5.3)
       vue-component-type-helpers: 1.8.4
     optionalDependencies:
-      '@vue/server-renderer': 3.4.26(vue@3.4.26(typescript@5.5.2))
+      '@vue/server-renderer': 3.4.29(vue@3.4.31(typescript@5.5.3))
 
   '@webgpu/types@0.1.30': {}
 
-  '@yarnpkg/esbuild-plugin-pnp@3.0.0-rc.15(esbuild@0.20.2)':
+  '@yarnpkg/esbuild-plugin-pnp@3.0.0-rc.15(esbuild@0.19.11)':
     dependencies:
-      esbuild: 0.20.2
+      esbuild: 0.19.11
       tslib: 2.6.2
 
   '@yarnpkg/fslib@2.10.3':
@@ -16672,22 +17710,22 @@ snapshots:
       mime-types: 2.1.35
       negotiator: 0.6.3
 
-  acorn-import-assertions@1.9.0(acorn@8.11.3):
+  acorn-import-assertions@1.9.0(acorn@8.12.0):
     dependencies:
-      acorn: 8.11.3
+      acorn: 8.12.0
     optional: true
 
-  acorn-import-attributes@1.9.5(acorn@8.11.3):
+  acorn-import-attributes@1.9.5(acorn@8.12.0):
     dependencies:
-      acorn: 8.11.3
+      acorn: 8.12.0
 
   acorn-jsx@5.3.2(acorn@7.4.1):
     dependencies:
       acorn: 7.4.1
 
-  acorn-jsx@5.3.2(acorn@8.11.3):
+  acorn-jsx@5.3.2(acorn@8.12.0):
     dependencies:
-      acorn: 8.11.3
+      acorn: 8.12.0
 
   acorn-walk@7.2.0: {}
 
@@ -16695,7 +17733,7 @@ snapshots:
 
   acorn@7.4.1: {}
 
-  acorn@8.11.3: {}
+  acorn@8.12.0: {}
 
   address@1.2.2: {}
 
@@ -16709,13 +17747,13 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
   agent-base@7.1.0:
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -16738,7 +17776,15 @@ snapshots:
     optionalDependencies:
       ajv: 8.13.0
 
-  ajv-formats@2.1.1(ajv@8.13.0):
+  ajv-draft-04@1.0.0(ajv@8.16.0):
+    optionalDependencies:
+      ajv: 8.16.0
+
+  ajv-formats@2.1.1(ajv@8.16.0):
+    optionalDependencies:
+      ajv: 8.16.0
+
+  ajv-formats@3.0.1(ajv@8.13.0):
     optionalDependencies:
       ajv: 8.13.0
 
@@ -16749,6 +17795,13 @@ snapshots:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
+  ajv@8.12.0:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      json-schema-traverse: 1.0.0
+      require-from-string: 2.0.2
+      uri-js: 4.4.1
+
   ajv@8.13.0:
     dependencies:
       fast-deep-equal: 3.1.3
@@ -16756,6 +17809,13 @@ snapshots:
       require-from-string: 2.0.2
       uri-js: 4.4.1
 
+  ajv@8.16.0:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      json-schema-traverse: 1.0.0
+      require-from-string: 2.0.2
+      uri-js: 4.4.1
+
   ansi-colors@4.1.3: {}
 
   ansi-escapes@4.3.2:
@@ -16798,7 +17858,7 @@ snapshots:
 
   archiver-utils@5.0.2:
     dependencies:
-      glob: 10.3.12
+      glob: 10.4.2
       graceful-fs: 4.2.11
       is-stream: 2.0.1
       lazystream: 1.0.1
@@ -16832,10 +17892,18 @@ snapshots:
 
   argparse@2.0.1: {}
 
+  aria-hidden@1.2.4:
+    dependencies:
+      tslib: 2.6.2
+
   aria-query@5.1.3:
     dependencies:
       deep-equal: 2.2.0
 
+  aria-query@5.3.0:
+    dependencies:
+      dequal: 2.0.3
+
   array-buffer-byte-length@1.0.0:
     dependencies:
       call-bind: 1.0.2
@@ -16931,6 +17999,8 @@ snapshots:
     dependencies:
       tslib: 2.6.2
 
+  async@0.2.10: {}
+
   async@3.2.4: {}
 
   asynckit@0.4.0: {}
@@ -16945,12 +18015,12 @@ snapshots:
     dependencies:
       '@fastify/error': 3.4.0
       archy: 1.0.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       fastq: 1.17.1
     transitivePeerDependencies:
       - supports-color
 
-  aws-sdk-client-mock@3.0.1:
+  aws-sdk-client-mock@4.0.1:
     dependencies:
       '@types/sinon': 10.0.13
       sinon: 16.1.3
@@ -16962,13 +18032,13 @@ snapshots:
 
   axios@0.24.0:
     dependencies:
-      follow-redirects: 1.15.2(debug@4.3.4)
+      follow-redirects: 1.15.2(debug@4.3.5)
     transitivePeerDependencies:
       - debug
 
-  axios@1.6.2(debug@4.3.4):
+  axios@1.6.2(debug@4.3.5):
     dependencies:
-      follow-redirects: 1.15.2(debug@4.3.4)
+      follow-redirects: 1.15.2(debug@4.3.5)
       form-data: 4.0.0
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
@@ -16976,9 +18046,9 @@ snapshots:
 
   b4a@1.6.4: {}
 
-  babel-core@7.0.0-bridge.0(@babel/core@7.24.0):
+  babel-core@7.0.0-bridge.0(@babel/core@7.24.7):
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.7
 
   babel-jest@29.7.0(@babel/core@7.23.5):
     dependencies:
@@ -17006,31 +18076,31 @@ snapshots:
   babel-plugin-jest-hoist@29.6.3:
     dependencies:
       '@babel/template': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.7
       '@types/babel__core': 7.20.0
       '@types/babel__traverse': 7.20.0
 
-  babel-plugin-polyfill-corejs2@0.4.6(@babel/core@7.24.0):
+  babel-plugin-polyfill-corejs2@0.4.11(@babel/core@7.24.7):
     dependencies:
-      '@babel/compat-data': 7.23.5
-      '@babel/core': 7.24.0
-      '@babel/helper-define-polyfill-provider': 0.4.3(@babel/core@7.24.0)
+      '@babel/compat-data': 7.24.7
+      '@babel/core': 7.24.7
+      '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.24.7)
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  babel-plugin-polyfill-corejs3@0.8.6(@babel/core@7.24.0):
+  babel-plugin-polyfill-corejs3@0.10.4(@babel/core@7.24.7):
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-define-polyfill-provider': 0.4.3(@babel/core@7.24.0)
-      core-js-compat: 3.33.3
+      '@babel/core': 7.24.7
+      '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.24.7)
+      core-js-compat: 3.37.1
     transitivePeerDependencies:
       - supports-color
 
-  babel-plugin-polyfill-regenerator@0.5.3(@babel/core@7.24.0):
+  babel-plugin-polyfill-regenerator@0.6.2(@babel/core@7.24.7):
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-define-polyfill-provider': 0.4.3(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.24.7)
     transitivePeerDependencies:
       - supports-color
 
@@ -17058,7 +18128,7 @@ snapshots:
 
   babel-walk@3.0.0-canary-5:
     dependencies:
-      '@babel/types': 7.23.5
+      '@babel/types': 7.24.0
 
   bail@2.0.2: {}
 
@@ -17110,23 +18180,6 @@ snapshots:
 
   bn.js@4.12.0: {}
 
-  body-parser@1.20.1:
-    dependencies:
-      bytes: 3.1.2
-      content-type: 1.0.5
-      debug: 2.6.9
-      depd: 2.0.0
-      destroy: 1.2.0
-      http-errors: 2.0.0
-      iconv-lite: 0.4.24
-      on-finished: 2.4.1
-      qs: 6.11.0
-      raw-body: 2.5.1
-      type-is: 1.6.18
-      unpipe: 1.0.0
-    transitivePeerDependencies:
-      - supports-color
-
   body-parser@1.20.2:
     dependencies:
       bytes: 3.1.2
@@ -17165,6 +18218,10 @@ snapshots:
     dependencies:
       fill-range: 7.0.1
 
+  braces@3.0.3:
+    dependencies:
+      fill-range: 7.1.1
+
   broadcast-channel@7.0.0:
     dependencies:
       '@babel/runtime': 7.23.4
@@ -17224,7 +18281,7 @@ snapshots:
       node-gyp-build: 4.6.0
     optional: true
 
-  bullmq@5.7.8:
+  bullmq@5.8.3:
     dependencies:
       cron-parser: 4.8.1
       ioredis: 5.4.1
@@ -17252,7 +18309,7 @@ snapshots:
     dependencies:
       '@npmcli/fs': 3.1.0
       fs-minipass: 3.0.2
-      glob: 10.3.12
+      glob: 10.4.2
       lru-cache: 10.2.2
       minipass: 7.0.4
       minipass-collect: 1.0.2
@@ -17277,6 +18334,16 @@ snapshots:
       normalize-url: 8.0.0
       responselike: 3.0.0
 
+  cacheable-request@12.0.1:
+    dependencies:
+      '@types/http-cache-semantics': 4.0.4
+      get-stream: 9.0.1
+      http-cache-semantics: 4.1.1
+      keyv: 4.5.4
+      mimic-response: 4.0.0
+      normalize-url: 8.0.1
+      responselike: 3.0.0
+
   cacheable-request@7.0.2:
     dependencies:
       clone-response: 1.0.3
@@ -17371,26 +18438,26 @@ snapshots:
     dependencies:
       is-regex: 1.1.4
 
-  chart.js@4.4.2:
+  chart.js@4.4.3:
     dependencies:
       '@kurkle/color': 0.3.2
 
-  chartjs-adapter-date-fns@3.0.0(chart.js@4.4.2)(date-fns@2.30.0):
+  chartjs-adapter-date-fns@3.0.0(chart.js@4.4.3)(date-fns@2.30.0):
     dependencies:
-      chart.js: 4.4.2
+      chart.js: 4.4.3
       date-fns: 2.30.0
 
-  chartjs-chart-matrix@2.0.1(chart.js@4.4.2):
+  chartjs-chart-matrix@2.0.1(chart.js@4.4.3):
     dependencies:
-      chart.js: 4.4.2
+      chart.js: 4.4.3
 
-  chartjs-plugin-gradient@0.6.1(chart.js@4.4.2):
+  chartjs-plugin-gradient@0.6.1(chart.js@4.4.3):
     dependencies:
-      chart.js: 4.4.2
+      chart.js: 4.4.3
 
-  chartjs-plugin-zoom@2.0.1(chart.js@4.4.2):
+  chartjs-plugin-zoom@2.0.1(chart.js@4.4.3):
     dependencies:
-      chart.js: 4.4.2
+      chart.js: 4.4.3
       hammerjs: 2.0.8
 
   check-error@1.0.3:
@@ -17434,7 +18501,7 @@ snapshots:
 
   chownr@2.0.0: {}
 
-  chromatic@11.3.0: {}
+  chromatic@11.5.4: {}
 
   ci-info@3.7.1: {}
 
@@ -17459,8 +18526,6 @@ snapshots:
       parse5-htmlparser2-tree-adapter: 6.0.1
       yargs: 16.2.0
 
-  cli-spinners@2.7.0: {}
-
   cli-spinners@2.9.2: {}
 
   cli-table3@0.6.3:
@@ -17612,8 +18677,8 @@ snapshots:
 
   constantinople@4.0.1:
     dependencies:
-      '@babel/parser': 7.23.9
-      '@babel/types': 7.23.5
+      '@babel/parser': 7.24.5
+      '@babel/types': 7.24.0
 
   content-disposition@0.5.4:
     dependencies:
@@ -17631,7 +18696,7 @@ snapshots:
 
   cookie@0.6.0: {}
 
-  core-js-compat@3.33.3:
+  core-js-compat@3.37.1:
     dependencies:
       browserslist: 4.23.0
 
@@ -17653,13 +18718,13 @@ snapshots:
       crc-32: 1.2.2
       readable-stream: 4.3.0
 
-  create-jest@29.7.0(@types/node@20.12.7):
+  create-jest@29.7.0(@types/node@20.14.9):
     dependencies:
       '@jest/types': 29.6.3
       chalk: 4.1.2
       exit: 0.1.2
       graceful-fs: 4.2.11
-      jest-config: 29.7.0(@types/node@20.12.7)
+      jest-config: 29.7.0(@types/node@20.14.9)
       jest-util: 29.7.0
       prompts: 2.4.2
     transitivePeerDependencies:
@@ -17705,7 +18770,9 @@ snapshots:
       shebang-command: 2.0.0
       which: 2.0.2
 
-  crypto-random-string@2.0.0: {}
+  crypto-random-string@4.0.0:
+    dependencies:
+      type-fest: 1.4.0
 
   css-declaration-sorter@7.2.0(postcss@8.4.38):
     dependencies:
@@ -17793,7 +18860,7 @@ snapshots:
     dependencies:
       uniq: 1.0.1
 
-  cypress@13.7.3:
+  cypress@13.13.0:
     dependencies:
       '@cypress/request': 3.0.0
       '@cypress/xvfb': 1.2.4(supports-color@8.1.1)
@@ -17811,52 +18878,7 @@ snapshots:
       commander: 6.2.1
       common-tags: 1.8.2
       dayjs: 1.11.10
-      debug: 4.3.4(supports-color@8.1.1)
-      enquirer: 2.3.6
-      eventemitter2: 6.4.7
-      execa: 4.1.0
-      executable: 4.1.1
-      extract-zip: 2.0.1(supports-color@8.1.1)
-      figures: 3.2.0
-      fs-extra: 9.1.0
-      getos: 3.2.1
-      is-ci: 3.0.1
-      is-installed-globally: 0.4.0
-      lazy-ass: 1.6.0
-      listr2: 3.14.0(enquirer@2.3.6)
-      lodash: 4.17.21
-      log-symbols: 4.1.0
-      minimist: 1.2.8
-      ospath: 1.2.2
-      pretty-bytes: 5.6.0
-      process: 0.11.10
-      proxy-from-env: 1.0.0
-      request-progress: 3.0.0
-      semver: 7.6.0
-      supports-color: 8.1.1
-      tmp: 0.2.3
-      untildify: 4.0.0
-      yauzl: 2.10.0
-
-  cypress@13.8.1:
-    dependencies:
-      '@cypress/request': 3.0.0
-      '@cypress/xvfb': 1.2.4(supports-color@8.1.1)
-      '@types/sinonjs__fake-timers': 8.1.1
-      '@types/sizzle': 2.3.3
-      arch: 2.2.0
-      blob-util: 2.0.2
-      bluebird: 3.7.2
-      buffer: 5.7.1
-      cachedir: 2.3.0
-      chalk: 4.1.2
-      check-more-types: 2.24.0
-      cli-cursor: 3.1.0
-      cli-table3: 0.6.3
-      commander: 6.2.1
-      common-tags: 1.8.2
-      dayjs: 1.11.10
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       enquirer: 2.3.6
       eventemitter2: 6.4.7
       execa: 4.1.0
@@ -17920,7 +18942,7 @@ snapshots:
     optionalDependencies:
       supports-color: 5.5.0
 
-  debug@4.3.4(supports-color@8.1.1):
+  debug@4.3.5(supports-color@8.1.1):
     dependencies:
       ms: 2.1.2
     optionalDependencies:
@@ -18013,17 +19035,6 @@ snapshots:
 
   defu@6.1.4: {}
 
-  del@6.1.1:
-    dependencies:
-      globby: 11.1.0
-      graceful-fs: 4.2.11
-      is-glob: 4.0.3
-      is-path-cwd: 2.2.0
-      is-path-inside: 3.0.3
-      p-map: 4.0.0
-      rimraf: 3.0.2
-      slash: 3.0.0
-
   delayed-stream@1.0.0: {}
 
   delegates@1.0.0:
@@ -18046,6 +19057,8 @@ snapshots:
 
   detect-newline@3.1.0: {}
 
+  detect-node-es@1.1.0: {}
+
   detect-package-manager@2.0.1:
     dependencies:
       execa: 5.1.1
@@ -18053,7 +19066,7 @@ snapshots:
   detect-port@1.5.1:
     dependencies:
       address: 1.2.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -18067,6 +19080,8 @@ snapshots:
 
   diff@5.1.0: {}
 
+  diff@5.2.0: {}
+
   dijkstrajs@1.0.2: {}
 
   dir-glob@3.0.1:
@@ -18140,7 +19155,7 @@ snapshots:
 
   ee-first@1.1.1: {}
 
-  ejs@3.1.9:
+  ejs@3.1.10:
     dependencies:
       jake: 10.8.5
 
@@ -18239,7 +19254,7 @@ snapshots:
       isarray: 2.0.5
       stop-iteration-iterator: 1.0.0
 
-  es-module-lexer@0.9.3: {}
+  es-module-lexer@1.5.4: {}
 
   es-set-tostringtag@2.0.1:
     dependencies:
@@ -18267,10 +19282,10 @@ snapshots:
 
   esbuild-plugin-alias@0.2.1: {}
 
-  esbuild-register@3.5.0(esbuild@0.20.2):
+  esbuild-register@3.5.0(esbuild@0.19.11):
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
-      esbuild: 0.20.2
+      debug: 4.3.5(supports-color@8.1.1)
+      esbuild: 0.19.11
     transitivePeerDependencies:
       - supports-color
 
@@ -18325,31 +19340,58 @@ snapshots:
       '@esbuild/win32-ia32': 0.19.11
       '@esbuild/win32-x64': 0.19.11
 
-  esbuild@0.20.2:
+  esbuild@0.21.5:
     optionalDependencies:
-      '@esbuild/aix-ppc64': 0.20.2
-      '@esbuild/android-arm': 0.20.2
-      '@esbuild/android-arm64': 0.20.2
-      '@esbuild/android-x64': 0.20.2
-      '@esbuild/darwin-arm64': 0.20.2
-      '@esbuild/darwin-x64': 0.20.2
-      '@esbuild/freebsd-arm64': 0.20.2
-      '@esbuild/freebsd-x64': 0.20.2
-      '@esbuild/linux-arm': 0.20.2
-      '@esbuild/linux-arm64': 0.20.2
-      '@esbuild/linux-ia32': 0.20.2
-      '@esbuild/linux-loong64': 0.20.2
-      '@esbuild/linux-mips64el': 0.20.2
-      '@esbuild/linux-ppc64': 0.20.2
-      '@esbuild/linux-riscv64': 0.20.2
-      '@esbuild/linux-s390x': 0.20.2
-      '@esbuild/linux-x64': 0.20.2
-      '@esbuild/netbsd-x64': 0.20.2
-      '@esbuild/openbsd-x64': 0.20.2
-      '@esbuild/sunos-x64': 0.20.2
-      '@esbuild/win32-arm64': 0.20.2
-      '@esbuild/win32-ia32': 0.20.2
-      '@esbuild/win32-x64': 0.20.2
+      '@esbuild/aix-ppc64': 0.21.5
+      '@esbuild/android-arm': 0.21.5
+      '@esbuild/android-arm64': 0.21.5
+      '@esbuild/android-x64': 0.21.5
+      '@esbuild/darwin-arm64': 0.21.5
+      '@esbuild/darwin-x64': 0.21.5
+      '@esbuild/freebsd-arm64': 0.21.5
+      '@esbuild/freebsd-x64': 0.21.5
+      '@esbuild/linux-arm': 0.21.5
+      '@esbuild/linux-arm64': 0.21.5
+      '@esbuild/linux-ia32': 0.21.5
+      '@esbuild/linux-loong64': 0.21.5
+      '@esbuild/linux-mips64el': 0.21.5
+      '@esbuild/linux-ppc64': 0.21.5
+      '@esbuild/linux-riscv64': 0.21.5
+      '@esbuild/linux-s390x': 0.21.5
+      '@esbuild/linux-x64': 0.21.5
+      '@esbuild/netbsd-x64': 0.21.5
+      '@esbuild/openbsd-x64': 0.21.5
+      '@esbuild/sunos-x64': 0.21.5
+      '@esbuild/win32-arm64': 0.21.5
+      '@esbuild/win32-ia32': 0.21.5
+      '@esbuild/win32-x64': 0.21.5
+
+  esbuild@0.22.0:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.22.0
+      '@esbuild/android-arm': 0.22.0
+      '@esbuild/android-arm64': 0.22.0
+      '@esbuild/android-x64': 0.22.0
+      '@esbuild/darwin-arm64': 0.22.0
+      '@esbuild/darwin-x64': 0.22.0
+      '@esbuild/freebsd-arm64': 0.22.0
+      '@esbuild/freebsd-x64': 0.22.0
+      '@esbuild/linux-arm': 0.22.0
+      '@esbuild/linux-arm64': 0.22.0
+      '@esbuild/linux-ia32': 0.22.0
+      '@esbuild/linux-loong64': 0.22.0
+      '@esbuild/linux-mips64el': 0.22.0
+      '@esbuild/linux-ppc64': 0.22.0
+      '@esbuild/linux-riscv64': 0.22.0
+      '@esbuild/linux-s390x': 0.22.0
+      '@esbuild/linux-x64': 0.22.0
+      '@esbuild/netbsd-x64': 0.22.0
+      '@esbuild/openbsd-arm64': 0.22.0
+      '@esbuild/openbsd-x64': 0.22.0
+      '@esbuild/sunos-x64': 0.22.0
+      '@esbuild/win32-arm64': 0.22.0
+      '@esbuild/win32-ia32': 0.22.0
+      '@esbuild/win32-x64': 0.22.0
 
   escalade@3.1.1: {}
 
@@ -18392,37 +19434,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.8.0(@typescript-eslint/parser@6.11.0(eslint@8.53.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint@8.53.0):
+  eslint-module-utils@2.8.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint-import-resolver-node@0.3.9)(eslint@9.6.0):
     dependencies:
       debug: 3.2.7(supports-color@8.1.1)
     optionalDependencies:
-      '@typescript-eslint/parser': 6.11.0(eslint@8.53.0)(typescript@5.3.3)
-      eslint: 8.53.0
+      '@typescript-eslint/parser': 7.15.0(eslint@9.6.0)(typescript@5.5.3)
+      eslint: 9.6.0
       eslint-import-resolver-node: 0.3.9
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.8.0(@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0):
-    dependencies:
-      debug: 3.2.7(supports-color@8.1.1)
-    optionalDependencies:
-      '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
-      eslint: 8.57.0
-      eslint-import-resolver-node: 0.3.9
-    transitivePeerDependencies:
-      - supports-color
-
-  eslint-module-utils@2.8.0(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0):
-    dependencies:
-      debug: 3.2.7(supports-color@8.1.1)
-    optionalDependencies:
-      '@typescript-eslint/parser': 7.7.1(eslint@8.57.0)(typescript@5.5.2)
-      eslint: 8.57.0
-      eslint-import-resolver-node: 0.3.9
-    transitivePeerDependencies:
-      - supports-color
-
-  eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.11.0(eslint@8.53.0)(typescript@5.3.3))(eslint@8.53.0):
+  eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0):
     dependencies:
       array-includes: 3.1.7
       array.prototype.findlastindex: 1.2.3
@@ -18430,9 +19452,9 @@ snapshots:
       array.prototype.flatmap: 1.3.2
       debug: 3.2.7(supports-color@8.1.1)
       doctrine: 2.1.0
-      eslint: 8.53.0
+      eslint: 9.6.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.11.0(eslint@8.53.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint@8.53.0)
+      eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint-import-resolver-node@0.3.9)(eslint@9.6.0)
       hasown: 2.0.0
       is-core-module: 2.13.1
       is-glob: 4.0.3
@@ -18443,76 +19465,22 @@ snapshots:
       semver: 6.3.1
       tsconfig-paths: 3.15.0
     optionalDependencies:
-      '@typescript-eslint/parser': 6.11.0(eslint@8.53.0)(typescript@5.3.3)
+      '@typescript-eslint/parser': 7.15.0(eslint@9.6.0)(typescript@5.5.3)
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0):
+  eslint-plugin-vue@9.26.0(eslint@9.6.0):
     dependencies:
-      array-includes: 3.1.7
-      array.prototype.findlastindex: 1.2.3
-      array.prototype.flat: 1.3.2
-      array.prototype.flatmap: 1.3.2
-      debug: 3.2.7(supports-color@8.1.1)
-      doctrine: 2.1.0
-      eslint: 8.57.0
-      eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.1.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint@8.57.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
-    optionalDependencies:
-      '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
-    transitivePeerDependencies:
-      - eslint-import-resolver-typescript
-      - eslint-import-resolver-webpack
-      - supports-color
-
-  eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0):
-    dependencies:
-      array-includes: 3.1.7
-      array.prototype.findlastindex: 1.2.3
-      array.prototype.flat: 1.3.2
-      array.prototype.flatmap: 1.3.2
-      debug: 3.2.7(supports-color@8.1.1)
-      doctrine: 2.1.0
-      eslint: 8.57.0
-      eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.7.1(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.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
-    optionalDependencies:
-      '@typescript-eslint/parser': 7.7.1(eslint@8.57.0)(typescript@5.5.2)
-    transitivePeerDependencies:
-      - eslint-import-resolver-typescript
-      - eslint-import-resolver-webpack
-      - supports-color
-
-  eslint-plugin-vue@9.25.0(eslint@8.57.0):
-    dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
-      eslint: 8.57.0
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.6.0)
+      eslint: 9.6.0
       globals: 13.24.0
       natural-compare: 1.4.0
       nth-check: 2.1.1
-      postcss-selector-parser: 6.0.15
+      postcss-selector-parser: 6.0.16
       semver: 7.6.0
-      vue-eslint-parser: 9.4.2(eslint@8.57.0)
+      vue-eslint-parser: 9.4.3(eslint@9.6.0)
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
       - supports-color
@@ -18524,40 +19492,43 @@ snapshots:
       esrecurse: 4.3.0
       estraverse: 5.3.0
 
+  eslint-scope@8.0.1:
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
+
   eslint-visitor-keys@3.4.3: {}
 
-  eslint@8.53.0:
+  eslint-visitor-keys@4.0.0: {}
+
+  eslint@9.6.0:
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.53.0)
-      '@eslint-community/regexpp': 4.6.2
-      '@eslint/eslintrc': 2.1.4
-      '@eslint/js': 8.53.0
-      '@humanwhocodes/config-array': 0.11.13
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.6.0)
+      '@eslint-community/regexpp': 4.10.0
+      '@eslint/config-array': 0.17.0
+      '@eslint/eslintrc': 3.1.0
+      '@eslint/js': 9.6.0
       '@humanwhocodes/module-importer': 1.0.1
+      '@humanwhocodes/retry': 0.3.0
       '@nodelib/fs.walk': 1.2.8
-      '@ungap/structured-clone': 1.2.0
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.4(supports-color@8.1.1)
-      doctrine: 3.0.0
+      debug: 4.3.5(supports-color@8.1.1)
       escape-string-regexp: 4.0.0
-      eslint-scope: 7.2.2
-      eslint-visitor-keys: 3.4.3
-      espree: 9.6.1
-      esquery: 1.4.2
+      eslint-scope: 8.0.1
+      eslint-visitor-keys: 4.0.0
+      espree: 10.1.0
+      esquery: 1.5.0
       esutils: 2.0.3
       fast-deep-equal: 3.1.3
-      file-entry-cache: 6.0.1
+      file-entry-cache: 8.0.0
       find-up: 5.0.0
       glob-parent: 6.0.2
-      globals: 13.19.0
-      graphemer: 1.4.0
-      ignore: 5.2.4
+      ignore: 5.3.1
       imurmurhash: 0.1.4
       is-glob: 4.0.3
       is-path-inside: 3.0.3
-      js-yaml: 4.1.0
       json-stable-stringify-without-jsonify: 1.0.1
       levn: 0.4.1
       lodash.merge: 4.6.2
@@ -18569,53 +19540,16 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint@8.57.0:
+  espree@10.1.0:
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
-      '@eslint-community/regexpp': 4.6.2
-      '@eslint/eslintrc': 2.1.4
-      '@eslint/js': 8.57.0
-      '@humanwhocodes/config-array': 0.11.14
-      '@humanwhocodes/module-importer': 1.0.1
-      '@nodelib/fs.walk': 1.2.8
-      '@ungap/structured-clone': 1.2.0
-      ajv: 6.12.6
-      chalk: 4.1.2
-      cross-spawn: 7.0.3
-      debug: 4.3.4(supports-color@8.1.1)
-      doctrine: 3.0.0
-      escape-string-regexp: 4.0.0
-      eslint-scope: 7.2.2
-      eslint-visitor-keys: 3.4.3
-      espree: 9.6.1
-      esquery: 1.4.2
-      esutils: 2.0.3
-      fast-deep-equal: 3.1.3
-      file-entry-cache: 6.0.1
-      find-up: 5.0.0
-      glob-parent: 6.0.2
-      globals: 13.19.0
-      graphemer: 1.4.0
-      ignore: 5.2.4
-      imurmurhash: 0.1.4
-      is-glob: 4.0.3
-      is-path-inside: 3.0.3
-      js-yaml: 4.1.0
-      json-stable-stringify-without-jsonify: 1.0.1
-      levn: 0.4.1
-      lodash.merge: 4.6.2
-      minimatch: 3.1.2
-      natural-compare: 1.4.0
-      optionator: 0.9.3
-      strip-ansi: 6.0.1
-      text-table: 0.2.0
-    transitivePeerDependencies:
-      - supports-color
+      acorn: 8.12.0
+      acorn-jsx: 5.3.2(acorn@8.12.0)
+      eslint-visitor-keys: 4.0.0
 
   espree@9.6.1:
     dependencies:
-      acorn: 8.11.3
-      acorn-jsx: 5.3.2(acorn@8.11.3)
+      acorn: 8.12.0
+      acorn-jsx: 5.3.2(acorn@8.12.0)
       eslint-visitor-keys: 3.4.3
 
   esprima@4.0.1: {}
@@ -18624,6 +19558,10 @@ snapshots:
     dependencies:
       estraverse: 5.3.0
 
+  esquery@1.5.0:
+    dependencies:
+      estraverse: 5.3.0
+
   esrecurse@4.3.0:
     dependencies:
       estraverse: 5.3.0
@@ -18718,6 +19656,21 @@ snapshots:
       signal-exit: 4.1.0
       strip-final-newline: 3.0.0
 
+  execa@9.2.0:
+    dependencies:
+      '@sindresorhus/merge-streams': 4.0.0
+      cross-spawn: 7.0.3
+      figures: 6.1.0
+      get-stream: 9.0.1
+      human-signals: 7.0.0
+      is-plain-obj: 4.1.0
+      is-stream: 4.0.1
+      npm-run-path: 5.3.0
+      pretty-ms: 9.0.0
+      signal-exit: 4.1.0
+      strip-final-newline: 4.0.0
+      yoctocolors: 2.0.2
+
   executable@4.1.1:
     dependencies:
       pify: 2.3.0
@@ -18734,42 +19687,6 @@ snapshots:
 
   exponential-backoff@3.1.1: {}
 
-  express@4.18.2:
-    dependencies:
-      accepts: 1.3.8
-      array-flatten: 1.1.1
-      body-parser: 1.20.1
-      content-disposition: 0.5.4
-      content-type: 1.0.5
-      cookie: 0.5.0
-      cookie-signature: 1.0.6
-      debug: 2.6.9
-      depd: 2.0.0
-      encodeurl: 1.0.2
-      escape-html: 1.0.3
-      etag: 1.8.1
-      finalhandler: 1.2.0
-      fresh: 0.5.2
-      http-errors: 2.0.0
-      merge-descriptors: 1.0.1
-      methods: 1.1.2
-      on-finished: 2.4.1
-      parseurl: 1.3.3
-      path-to-regexp: 0.1.7
-      proxy-addr: 2.0.7
-      qs: 6.11.0
-      range-parser: 1.2.1
-      safe-buffer: 5.2.1
-      send: 0.18.0
-      serve-static: 1.15.0
-      setprototypeof: 1.2.0
-      statuses: 2.0.1
-      type-is: 1.6.18
-      utils-merge: 1.0.1
-      vary: 1.1.2
-    transitivePeerDependencies:
-      - supports-color
-
   express@4.19.2:
     dependencies:
       accepts: 1.3.8
@@ -18819,7 +19736,7 @@ snapshots:
 
   extract-zip@2.0.1(supports-color@8.1.1):
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       get-stream: 5.2.0
       yauzl: 2.10.0
     optionalDependencies:
@@ -18843,15 +19760,15 @@ snapshots:
       '@nodelib/fs.walk': 1.2.8
       glob-parent: 5.1.2
       merge2: 1.4.1
-      micromatch: 4.0.5
+      micromatch: 4.0.7
 
   fast-json-stable-stringify@2.1.0: {}
 
   fast-json-stringify@5.8.0:
     dependencies:
       '@fastify/deepmerge': 1.3.0
-      ajv: 8.13.0
-      ajv-formats: 2.1.1(ajv@8.13.0)
+      ajv: 8.16.0
+      ajv-formats: 2.1.1(ajv@8.16.0)
       fast-deep-equal: 3.1.3
       fast-uri: 2.2.0
       rfdc: 1.3.0
@@ -18880,7 +19797,7 @@ snapshots:
       raw-body: 2.5.2
       secure-json-parse: 2.7.0
 
-  fastify@4.26.2:
+  fastify@4.28.1:
     dependencies:
       '@fastify/ajv-compiler': 3.5.0
       '@fastify/error': 3.4.0
@@ -18891,20 +19808,16 @@ snapshots:
       fast-json-stringify: 5.8.0
       find-my-way: 8.2.0
       light-my-request: 5.11.0
-      pino: 8.17.0
+      pino: 9.2.0
       process-warning: 3.0.0
       proxy-addr: 2.0.7
       rfdc: 1.3.0
       secure-json-parse: 2.7.0
       semver: 7.6.0
-      toad-cache: 3.3.0
+      toad-cache: 3.7.0
     transitivePeerDependencies:
       - supports-color
 
-  fastq@1.15.0:
-    dependencies:
-      reusify: 1.0.4
-
   fastq@1.17.1:
     dependencies:
       reusify: 1.0.4
@@ -18932,9 +19845,13 @@ snapshots:
     dependencies:
       escape-string-regexp: 1.0.5
 
-  file-entry-cache@6.0.1:
+  figures@6.1.0:
     dependencies:
-      flat-cache: 3.0.4
+      is-unicode-supported: 2.0.0
+
+  file-entry-cache@8.0.0:
+    dependencies:
+      flat-cache: 4.0.1
 
   file-system-cache@2.3.0:
     dependencies:
@@ -18969,6 +19886,10 @@ snapshots:
     dependencies:
       to-regex-range: 5.0.1
 
+  fill-range@7.1.1:
+    dependencies:
+      to-regex-range: 5.0.1
+
   finalhandler@1.2.0:
     dependencies:
       debug: 2.6.9
@@ -19028,23 +19949,23 @@ snapshots:
       ps-list: 8.1.1
       taskkill: 5.0.0
 
-  flat-cache@3.0.4:
+  flat-cache@4.0.1:
     dependencies:
-      flatted: 3.2.7
-      rimraf: 3.0.2
+      flatted: 3.3.1
+      keyv: 4.5.4
 
-  flatted@3.2.7: {}
+  flatted@3.3.1: {}
 
   flow-parser@0.202.0: {}
 
-  fluent-ffmpeg@2.1.2:
+  fluent-ffmpeg@2.1.3:
     dependencies:
-      async: 3.2.4
+      async: 0.2.10
       which: 1.3.1
 
-  follow-redirects@1.15.2(debug@4.3.4):
+  follow-redirects@1.15.2(debug@4.3.5):
     optionalDependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
 
   for-each@0.3.3:
     dependencies:
@@ -19171,6 +20092,8 @@ snapshots:
       has-proto: 1.0.1
       has-symbols: 1.0.3
 
+  get-nonce@1.0.1: {}
+
   get-npm-tarball-url@2.0.3: {}
 
   get-package-type@0.1.0: {}
@@ -19199,6 +20122,11 @@ snapshots:
 
   get-stream@8.0.1: {}
 
+  get-stream@9.0.1:
+    dependencies:
+      '@sec-ant/readable-stream': 0.4.1
+      is-stream: 4.0.1
+
   get-symbol-description@1.0.0:
     dependencies:
       call-bind: 1.0.2
@@ -19265,6 +20193,15 @@ snapshots:
       minipass: 7.0.4
       path-scurry: 1.10.2
 
+  glob@10.4.2:
+    dependencies:
+      foreground-child: 3.1.1
+      jackspeak: 3.4.0
+      minimatch: 9.0.4
+      minipass: 7.1.2
+      package-json-from-dist: 1.0.0
+      path-scurry: 1.11.1
+
   glob@7.2.3:
     dependencies:
       fs.realpath: 1.0.0
@@ -19288,14 +20225,14 @@ snapshots:
 
   globals@11.12.0: {}
 
-  globals@13.19.0:
-    dependencies:
-      type-fest: 0.20.2
-
   globals@13.24.0:
     dependencies:
       type-fest: 0.20.2
 
+  globals@14.0.0: {}
+
+  globals@15.7.0: {}
+
   globalthis@1.0.3:
     dependencies:
       define-properties: 1.2.0
@@ -19309,6 +20246,15 @@ snapshots:
       merge2: 1.4.1
       slash: 3.0.0
 
+  globby@14.0.1:
+    dependencies:
+      '@sindresorhus/merge-streams': 2.3.0
+      fast-glob: 3.3.2
+      ignore: 5.3.1
+      path-type: 5.0.0
+      slash: 5.1.0
+      unicorn-magic: 0.1.0
+
   google-protobuf@3.21.2:
     optional: true
 
@@ -19344,12 +20290,12 @@ snapshots:
       p-cancelable: 3.0.0
       responselike: 3.0.0
 
-  got@14.2.1:
+  got@14.4.1:
     dependencies:
-      '@sindresorhus/is': 6.1.0
+      '@sindresorhus/is': 6.3.1
       '@szmarczak/http-timer': 5.0.1
       cacheable-lookup: 7.0.0
-      cacheable-request: 10.2.14
+      cacheable-request: 12.0.1
       decompress-response: 6.0.0
       form-data-encoder: 4.0.2
       get-stream: 8.0.1
@@ -19357,6 +20303,7 @@ snapshots:
       lowercase-keys: 3.0.0
       p-cancelable: 4.0.1
       responselike: 3.0.0
+      type-fest: 4.20.1
 
   graceful-fs@4.2.11: {}
 
@@ -19499,7 +20446,14 @@ snapshots:
   http-proxy-agent@7.0.0:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
+    transitivePeerDependencies:
+      - supports-color
+
+  http-proxy-agent@7.0.2:
+    dependencies:
+      agent-base: 7.1.0
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -19538,14 +20492,21 @@ snapshots:
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@7.0.2:
     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
+
+  https-proxy-agent@7.0.4:
+    dependencies:
+      agent-base: 7.1.0
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -19557,6 +20518,8 @@ snapshots:
 
   human-signals@5.0.0: {}
 
+  human-signals@7.0.0: {}
+
   iconv-lite@0.4.24:
     dependencies:
       safer-buffer: 2.1.2
@@ -19588,16 +20551,16 @@ snapshots:
 
   import-in-the-middle@1.4.2:
     dependencies:
-      acorn: 8.11.3
-      acorn-import-assertions: 1.9.0(acorn@8.11.3)
+      acorn: 8.12.0
+      acorn-import-assertions: 1.9.0(acorn@8.12.0)
       cjs-module-lexer: 1.2.2
       module-details-from-path: 1.0.3
     optional: true
 
-  import-in-the-middle@1.7.4:
+  import-in-the-middle@1.8.1:
     dependencies:
-      acorn: 8.11.3
-      acorn-import-attributes: 1.9.5(acorn@8.11.3)
+      acorn: 8.12.0
+      acorn-import-attributes: 1.9.5(acorn@8.12.0)
       cjs-module-lexer: 1.2.2
       module-details-from-path: 1.0.3
 
@@ -19637,11 +20600,15 @@ snapshots:
 
   intersection-observer@0.12.2: {}
 
+  invariant@2.2.4:
+    dependencies:
+      loose-envify: 1.4.0
+
   ioredis@5.4.1:
     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
@@ -19653,15 +20620,14 @@ snapshots:
 
   iota-array@1.0.0: {}
 
-  ip-address@7.1.0:
+  ip-address@9.0.5:
     dependencies:
       jsbn: 1.1.0
-      sprintf-js: 1.1.2
+      sprintf-js: 1.1.3
 
-  ip-cidr@3.1.0:
+  ip-cidr@4.0.1:
     dependencies:
-      ip-address: 7.1.0
-      jsbn: 1.1.0
+      ip-address: 9.0.5
 
   ip-regex@4.3.0: {}
 
@@ -19776,8 +20742,6 @@ snapshots:
 
   is-number@7.0.0: {}
 
-  is-path-cwd@2.2.0: {}
-
   is-path-inside@3.0.3: {}
 
   is-plain-obj@1.1.0: {}
@@ -19811,11 +20775,13 @@ snapshots:
 
   is-stream@3.0.0: {}
 
+  is-stream@4.0.1: {}
+
   is-string@1.0.7:
     dependencies:
       has-tostringtag: 1.0.0
 
-  is-svg@5.0.0:
+  is-svg@5.0.1:
     dependencies:
       fast-xml-parser: 4.2.5
 
@@ -19835,6 +20801,8 @@ snapshots:
 
   is-unicode-supported@0.1.0: {}
 
+  is-unicode-supported@2.0.0: {}
+
   is-weakmap@2.0.1: {}
 
   is-weakref@1.0.2:
@@ -19868,8 +20836,8 @@ snapshots:
 
   istanbul-lib-instrument@5.2.1:
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/parser': 7.24.0
+      '@babel/core': 7.24.7
+      '@babel/parser': 7.24.7
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.2
       semver: 6.3.1
@@ -19878,8 +20846,8 @@ snapshots:
 
   istanbul-lib-instrument@6.0.0:
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/parser': 7.24.0
+      '@babel/core': 7.24.7
+      '@babel/parser': 7.24.7
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.2
       semver: 7.6.0
@@ -19894,12 +20862,20 @@ snapshots:
 
   istanbul-lib-source-maps@4.0.1:
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       istanbul-lib-coverage: 3.2.2
       source-map: 0.6.1
     transitivePeerDependencies:
       - supports-color
 
+  istanbul-lib-source-maps@5.0.4:
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.25
+      debug: 4.3.5(supports-color@8.1.1)
+      istanbul-lib-coverage: 3.2.2
+    transitivePeerDependencies:
+      - supports-color
+
   istanbul-reports@3.1.6:
     dependencies:
       html-escaper: 2.0.2
@@ -19913,6 +20889,12 @@ snapshots:
     optionalDependencies:
       '@pkgjs/parseargs': 0.11.0
 
+  jackspeak@3.4.0:
+    dependencies:
+      '@isaacs/cliui': 8.0.2
+    optionalDependencies:
+      '@pkgjs/parseargs': 0.11.0
+
   jake@10.8.5:
     dependencies:
       async: 3.2.4
@@ -19932,7 +20914,7 @@ snapshots:
       '@jest/expect': 29.7.0
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       chalk: 4.1.2
       co: 4.6.0
       dedent: 1.3.0
@@ -19952,16 +20934,16 @@ snapshots:
       - babel-plugin-macros
       - supports-color
 
-  jest-cli@29.7.0(@types/node@20.12.7):
+  jest-cli@29.7.0(@types/node@20.14.9):
     dependencies:
       '@jest/core': 29.7.0
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
       chalk: 4.1.2
-      create-jest: 29.7.0(@types/node@20.12.7)
+      create-jest: 29.7.0(@types/node@20.14.9)
       exit: 0.1.2
       import-local: 3.1.0
-      jest-config: 29.7.0(@types/node@20.12.7)
+      jest-config: 29.7.0(@types/node@20.14.9)
       jest-util: 29.7.0
       jest-validate: 29.7.0
       yargs: 17.7.2
@@ -19971,7 +20953,7 @@ snapshots:
       - supports-color
       - ts-node
 
-  jest-config@29.7.0(@types/node@20.12.7):
+  jest-config@29.7.0(@types/node@20.14.9):
     dependencies:
       '@babel/core': 7.23.5
       '@jest/test-sequencer': 29.7.0
@@ -19990,13 +20972,13 @@ snapshots:
       jest-runner: 29.7.0
       jest-util: 29.7.0
       jest-validate: 29.7.0
-      micromatch: 4.0.5
+      micromatch: 4.0.7
       parse-json: 5.2.0
       pretty-format: 29.7.0
       slash: 3.0.0
       strip-json-comments: 3.1.1
     optionalDependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
     transitivePeerDependencies:
       - babel-plugin-macros
       - supports-color
@@ -20025,7 +21007,7 @@ snapshots:
       '@jest/environment': 29.7.0
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       jest-mock: 29.7.0
       jest-util: 29.7.0
 
@@ -20042,14 +21024,14 @@ snapshots:
     dependencies:
       '@jest/types': 29.6.3
       '@types/graceful-fs': 4.1.6
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.11
       jest-regex-util: 29.6.3
       jest-util: 29.7.0
       jest-worker: 29.7.0
-      micromatch: 4.0.5
+      micromatch: 4.0.7
       walker: 1.0.8
     optionalDependencies:
       fsevents: 2.3.3
@@ -20073,7 +21055,7 @@ snapshots:
       '@types/stack-utils': 2.0.1
       chalk: 4.1.2
       graceful-fs: 4.2.11
-      micromatch: 4.0.5
+      micromatch: 4.0.7
       pretty-format: 29.7.0
       slash: 3.0.0
       stack-utils: 2.0.6
@@ -20081,7 +21063,7 @@ snapshots:
   jest-mock@29.7.0:
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       jest-util: 29.7.0
 
   jest-pnp-resolver@1.2.3(jest-resolve@29.7.0):
@@ -20116,7 +21098,7 @@ snapshots:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       chalk: 4.1.2
       emittery: 0.13.1
       graceful-fs: 4.2.11
@@ -20144,7 +21126,7 @@ snapshots:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       chalk: 4.1.2
       cjs-module-lexer: 1.2.2
       collect-v8-coverage: 1.0.1
@@ -20190,7 +21172,7 @@ snapshots:
   jest-util@29.7.0:
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       chalk: 4.1.2
       ci-info: 3.7.1
       graceful-fs: 4.2.11
@@ -20209,7 +21191,7 @@ snapshots:
     dependencies:
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.13.1
@@ -20223,17 +21205,17 @@ snapshots:
 
   jest-worker@29.7.0:
     dependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       jest-util: 29.7.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
-  jest@29.7.0(@types/node@20.12.7):
+  jest@29.7.0(@types/node@20.14.9):
     dependencies:
       '@jest/core': 29.7.0
       '@jest/types': 29.6.3
       import-local: 3.1.0
-      jest-cli: 29.7.0(@types/node@20.12.7)
+      jest-cli: 29.7.0(@types/node@20.14.9)
     transitivePeerDependencies:
       - '@types/node'
       - babel-plugin-macros
@@ -20263,6 +21245,8 @@ snapshots:
 
   js-tokens@4.0.0: {}
 
+  js-tokens@9.0.0: {}
+
   js-yaml@3.14.1:
     dependencies:
       argparse: 1.0.10
@@ -20278,55 +21262,55 @@ snapshots:
 
   jschardet@3.0.0: {}
 
-  jscodeshift@0.15.1(@babel/preset-env@7.23.5(@babel/core@7.24.0)):
+  jscodeshift@0.15.1(@babel/preset-env@7.24.7(@babel/core@7.24.7)):
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/parser': 7.24.0
-      '@babel/plugin-transform-class-properties': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-nullish-coalescing-operator': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-private-methods': 7.23.3(@babel/core@7.24.0)
-      '@babel/preset-flow': 7.23.3(@babel/core@7.24.0)
-      '@babel/preset-typescript': 7.23.3(@babel/core@7.24.0)
-      '@babel/register': 7.22.15(@babel/core@7.24.0)
-      babel-core: 7.0.0-bridge.0(@babel/core@7.24.0)
+      '@babel/core': 7.24.7
+      '@babel/parser': 7.24.7
+      '@babel/plugin-transform-class-properties': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-modules-commonjs': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-optional-chaining': 7.24.7(@babel/core@7.24.7)
+      '@babel/plugin-transform-private-methods': 7.24.7(@babel/core@7.24.7)
+      '@babel/preset-flow': 7.23.3(@babel/core@7.24.7)
+      '@babel/preset-typescript': 7.23.3(@babel/core@7.24.7)
+      '@babel/register': 7.22.15(@babel/core@7.24.7)
+      babel-core: 7.0.0-bridge.0(@babel/core@7.24.7)
       chalk: 4.1.2
       flow-parser: 0.202.0
       graceful-fs: 4.2.11
-      micromatch: 4.0.5
+      micromatch: 4.0.7
       neo-async: 2.6.2
       node-dir: 0.1.17
-      recast: 0.23.4
+      recast: 0.23.6
       temp: 0.8.4
       write-file-atomic: 2.4.3
     optionalDependencies:
-      '@babel/preset-env': 7.23.5(@babel/core@7.24.0)
+      '@babel/preset-env': 7.24.7(@babel/core@7.24.7)
     transitivePeerDependencies:
       - supports-color
 
-  jsdom@24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3):
+  jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3):
     dependencies:
       cssstyle: 4.0.1
       data-urls: 5.0.0
       decimal.js: 10.4.3
       form-data: 4.0.0
       html-encoding-sniffer: 4.0.0
-      http-proxy-agent: 7.0.0
-      https-proxy-agent: 7.0.2
+      http-proxy-agent: 7.0.2
+      https-proxy-agent: 7.0.4
       is-potential-custom-element-name: 1.0.1
-      nwsapi: 2.2.9
+      nwsapi: 2.2.10
       parse5: 7.1.2
-      rrweb-cssom: 0.6.0
+      rrweb-cssom: 0.7.1
       saxes: 6.0.0
       symbol-tree: 3.2.4
-      tough-cookie: 4.1.3
+      tough-cookie: 4.1.4
       w3c-xmlserializer: 5.0.0
       webidl-conversions: 7.0.0
       whatwg-encoding: 3.1.1
       whatwg-mimetype: 4.0.0
       whatwg-url: 14.0.0
-      ws: 8.17.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
+      ws: 8.17.1(bufferutil@4.0.7)(utf-8-validate@6.0.3)
       xml-name-validator: 5.0.0
     transitivePeerDependencies:
       - bufferutil
@@ -20407,8 +21391,6 @@ snapshots:
 
   jsrsasign@11.1.0: {}
 
-  jssha@3.3.1: {}
-
   jstransformer@1.0.0:
     dependencies:
       is-promise: 2.2.2
@@ -20487,7 +21469,10 @@ snapshots:
     optionalDependencies:
       enquirer: 2.3.6
 
-  local-pkg@0.4.3: {}
+  local-pkg@0.5.0:
+    dependencies:
+      mlly: 1.5.0
+      pkg-types: 1.0.3
 
   locate-path@3.0.0:
     dependencies:
@@ -20510,8 +21495,6 @@ snapshots:
 
   lodash.isarguments@3.1.0: {}
 
-  lodash.isequal@4.5.0: {}
-
   lodash.memoize@4.1.2: {}
 
   lodash.merge@4.6.2: {}
@@ -20583,9 +21566,11 @@ snapshots:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.4.15
 
-  magic-string@0.30.7:
+  magicast@0.3.4:
     dependencies:
-      '@jridgewell/sourcemap-codec': 1.4.15
+      '@babel/parser': 7.24.5
+      '@babel/types': 7.24.0
+      source-map-js: 1.2.0
 
   mailcheck@1.1.1: {}
 
@@ -20745,7 +21730,7 @@ snapshots:
 
   media-typer@0.3.0: {}
 
-  meilisearch@0.38.0(encoding@0.1.13):
+  meilisearch@0.41.0(encoding@0.1.13):
     dependencies:
       cross-fetch: 3.1.6(encoding@0.1.13)
     transitivePeerDependencies:
@@ -20958,7 +21943,7 @@ snapshots:
   micromark@4.0.0:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       decode-named-character-reference: 1.0.2
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.0
@@ -20977,9 +21962,9 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  micromatch@4.0.5:
+  micromatch@4.0.7:
     dependencies:
-      braces: 3.0.2
+      braces: 3.0.3
       picomatch: 2.3.1
 
   mime-db@1.52.0: {}
@@ -21076,6 +22061,8 @@ snapshots:
 
   minipass@7.0.4: {}
 
+  minipass@7.1.2: {}
+
   minizlib@1.3.3:
     dependencies:
       minipass: 2.9.0
@@ -21098,7 +22085,7 @@ snapshots:
 
   mlly@1.5.0:
     dependencies:
-      acorn: 8.11.3
+      acorn: 8.12.0
       pathe: 1.1.2
       pkg-types: 1.0.3
       ufo: 1.3.2
@@ -21137,18 +22124,18 @@ snapshots:
     optionalDependencies:
       msgpackr-extract: 3.0.2
 
-  msw-storybook-addon@2.0.1(msw@2.2.14(typescript@5.5.2)):
+  msw-storybook-addon@2.0.2(msw@2.3.1(typescript@5.5.3)):
     dependencies:
       is-node-process: 1.2.0
-      msw: 2.2.14(typescript@5.5.2)
+      msw: 2.3.1(typescript@5.5.3)
 
-  msw@2.2.14(typescript@5.5.2):
+  msw@2.3.1(typescript@5.5.3):
     dependencies:
       '@bundled-es-modules/cookie': 2.0.0
       '@bundled-es-modules/statuses': 1.0.1
       '@inquirer/confirm': 3.1.6
       '@mswjs/cookies': 1.1.0
-      '@mswjs/interceptors': 0.26.15
+      '@mswjs/interceptors': 0.29.1
       '@open-draft/until': 2.1.0
       '@types/cookie': 0.6.0
       '@types/statuses': 2.0.4
@@ -21162,7 +22149,7 @@ snapshots:
       type-fest: 4.9.0
       yargs: 17.7.2
     optionalDependencies:
-      typescript: 5.5.2
+      typescript: 5.5.3
 
   muggle-string@0.4.1: {}
 
@@ -21294,7 +22281,7 @@ snapshots:
     dependencies:
       env-paths: 2.2.1
       exponential-backoff: 3.1.1
-      glob: 10.3.12
+      glob: 10.4.2
       graceful-fs: 4.2.11
       make-fetch-happen: 13.0.0
       nopt: 7.2.0
@@ -21309,7 +22296,7 @@ snapshots:
 
   node-releases@2.0.14: {}
 
-  nodemailer@6.9.13: {}
+  nodemailer@6.9.14: {}
 
   nodemon@3.0.2:
     dependencies:
@@ -21324,14 +22311,14 @@ snapshots:
       touch: 3.1.0
       undefsafe: 2.0.5
 
-  nodemon@3.1.0:
+  nodemon@3.1.4:
     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
+      semver: 7.6.0
       simple-update-notifier: 2.0.0
       supports-color: 5.5.0
       touch: 3.1.0
@@ -21376,6 +22363,8 @@ snapshots:
 
   normalize-url@8.0.0: {}
 
+  normalize-url@8.0.1: {}
+
   npm-run-path@2.0.2:
     dependencies:
       path-key: 2.0.1
@@ -21388,6 +22377,10 @@ snapshots:
     dependencies:
       path-key: 4.0.0
 
+  npm-run-path@5.3.0:
+    dependencies:
+      path-key: 4.0.0
+
   npmlog@5.0.1:
     dependencies:
       are-we-there-yet: 2.0.0
@@ -21405,7 +22398,7 @@ snapshots:
     dependencies:
       boolbase: 1.0.0
 
-  nwsapi@2.2.9: {}
+  nwsapi@2.2.10: {}
 
   oauth-sign@0.9.0: {}
 
@@ -21505,9 +22498,9 @@ snapshots:
 
   opentelemetry-instrumentation-fetch-node@1.2.0:
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/instrumentation': 0.43.0(@opentelemetry/api@1.8.0)
-      '@opentelemetry/semantic-conventions': 1.24.1
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.43.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.25.1
     transitivePeerDependencies:
       - supports-color
     optional: true
@@ -21526,7 +22519,7 @@ snapshots:
       bl: 4.1.0
       chalk: 4.1.2
       cli-cursor: 3.1.0
-      cli-spinners: 2.7.0
+      cli-spinners: 2.9.2
       is-interactive: 1.0.0
       is-unicode-supported: 0.1.0
       log-symbols: 4.1.0
@@ -21541,9 +22534,9 @@ snapshots:
 
   ospath@1.2.2: {}
 
-  otpauth@9.2.3:
+  otpauth@9.3.1:
     dependencies:
-      jssha: 3.3.1
+      '@noble/hashes': 1.4.0
 
   outvariant@1.4.2: {}
 
@@ -21563,7 +22556,7 @@ snapshots:
     dependencies:
       yocto-queue: 0.1.0
 
-  p-limit@4.0.0:
+  p-limit@5.0.0:
     dependencies:
       yocto-queue: 1.0.0
 
@@ -21594,6 +22587,8 @@ snapshots:
 
   p-try@2.2.0: {}
 
+  package-json-from-dist@1.0.0: {}
+
   pako@0.2.9: {}
 
   parent-module@1.0.1:
@@ -21611,6 +22606,8 @@ snapshots:
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
 
+  parse-ms@4.0.0: {}
+
   parse-srcset@1.0.2: {}
 
   parse5-htmlparser2-tree-adapter@6.0.1:
@@ -21658,6 +22655,11 @@ snapshots:
       lru-cache: 10.2.2
       minipass: 7.0.4
 
+  path-scurry@1.11.1:
+    dependencies:
+      lru-cache: 10.2.2
+      minipass: 7.1.2
+
   path-to-regexp@0.1.7: {}
 
   path-to-regexp@1.8.0:
@@ -21670,6 +22672,8 @@ snapshots:
 
   path-type@4.0.0: {}
 
+  path-type@5.0.0: {}
+
   pathe@1.1.2: {}
 
   pathval@1.1.1: {}
@@ -21699,11 +22703,9 @@ snapshots:
 
   pg-numeric@1.0.2: {}
 
-  pg-pool@3.6.2(pg@8.11.5):
+  pg-pool@3.6.2(pg@8.12.0):
     dependencies:
-      pg: 8.11.5
-
-  pg-protocol@1.6.0: {}
+      pg: 8.12.0
 
   pg-protocol@1.6.1: {}
 
@@ -21725,10 +22727,10 @@ snapshots:
       postgres-interval: 3.0.0
       postgres-range: 1.1.3
 
-  pg@8.11.5:
+  pg@8.12.0:
     dependencies:
       pg-connection-string: 2.6.4
-      pg-pool: 3.6.2(pg@8.11.5)
+      pg-pool: 3.6.2(pg@8.12.0)
       pg-protocol: 1.6.1
       pg-types: 2.2.0
       pgpass: 1.0.5
@@ -21739,7 +22741,7 @@ snapshots:
     dependencies:
       split2: 4.1.0
 
-  photoswipe@5.4.3: {}
+  photoswipe@5.4.4: {}
 
   picocolors@1.0.0: {}
 
@@ -21753,26 +22755,26 @@ snapshots:
 
   pify@4.0.1: {}
 
-  pino-abstract-transport@1.1.0:
+  pino-abstract-transport@1.2.0:
     dependencies:
       readable-stream: 4.3.0
       split2: 4.1.0
 
-  pino-std-serializers@6.1.0: {}
+  pino-std-serializers@7.0.0: {}
 
-  pino@8.17.0:
+  pino@9.2.0:
     dependencies:
       atomic-sleep: 1.0.0
       fast-redact: 3.1.2
       on-exit-leak-free: 2.1.0
-      pino-abstract-transport: 1.1.0
-      pino-std-serializers: 6.1.0
-      process-warning: 2.2.0
+      pino-abstract-transport: 1.2.0
+      pino-std-serializers: 7.0.0
+      process-warning: 3.0.0
       quick-format-unescaped: 4.0.4
       real-require: 0.2.0
       safe-stable-stringify: 2.4.2
-      sonic-boom: 3.7.0
-      thread-stream: 2.3.0
+      sonic-boom: 4.0.1
+      thread-stream: 3.1.0
 
   pirates@4.0.5: {}
 
@@ -22007,7 +23009,7 @@ snapshots:
 
   prelude-ls@1.2.1: {}
 
-  prettier@3.2.5: {}
+  prettier@3.3.2: {}
 
   pretty-bytes@5.6.0: {}
 
@@ -22025,6 +23027,10 @@ snapshots:
 
   pretty-hrtime@1.0.3: {}
 
+  pretty-ms@9.0.0:
+    dependencies:
+      parse-ms: 4.0.0
+
   private-ip@2.3.3:
     dependencies:
       ip-regex: 4.3.0
@@ -22110,19 +23116,21 @@ snapshots:
       js-stringify: 1.0.2
       pug-runtime: 3.0.1
 
-  pug-code-gen@3.0.2:
+  pug-code-gen@3.0.3:
     dependencies:
       constantinople: 4.0.1
       doctypes: 1.1.0
       js-stringify: 1.0.2
       pug-attrs: 3.0.0
-      pug-error: 2.0.0
+      pug-error: 2.1.0
       pug-runtime: 3.0.1
       void-elements: 3.1.0
       with: 7.0.2
 
   pug-error@2.0.0: {}
 
+  pug-error@2.1.0: {}
+
   pug-filters@4.0.0:
     dependencies:
       constantinople: 4.0.1
@@ -22160,9 +23168,9 @@ snapshots:
 
   pug-walk@2.0.0: {}
 
-  pug@3.0.2:
+  pug@3.0.3:
     dependencies:
-      pug-code-gen: 3.0.2
+      pug-code-gen: 3.0.3
       pug-filters: 4.0.0
       pug-lexer: 5.0.1
       pug-linker: 4.0.0
@@ -22242,13 +23250,6 @@ snapshots:
 
   ratelimiter@3.4.1: {}
 
-  raw-body@2.5.1:
-    dependencies:
-      bytes: 3.1.2
-      http-errors: 2.0.0
-      iconv-lite: 0.4.24
-      unpipe: 1.0.0
-
   raw-body@2.5.2:
     dependencies:
       bytes: 3.1.2
@@ -22260,7 +23261,7 @@ snapshots:
     dependencies:
       setimmediate: 1.0.5
 
-  re2@1.21.2:
+  re2@1.21.3:
     dependencies:
       install-artifact-from-github: 1.3.5
       nan: 2.20.0
@@ -22273,15 +23274,15 @@ snapshots:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
 
-  react-docgen-typescript@2.2.2(typescript@5.5.2):
+  react-docgen-typescript@2.2.2(typescript@5.5.3):
     dependencies:
-      typescript: 5.5.2
+      typescript: 5.5.3
 
   react-docgen@7.0.1:
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/traverse': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/core': 7.24.7
+      '@babel/traverse': 7.24.7
+      '@babel/types': 7.24.7
       '@types/babel__core': 7.20.0
       '@types/babel__traverse': 7.20.0
       '@types/doctrine': 0.0.9
@@ -22314,6 +23315,34 @@ snapshots:
 
   react-is@18.2.0: {}
 
+  react-remove-scroll-bar@2.3.6(@types/react@18.0.28)(react@18.3.1):
+    dependencies:
+      react: 18.3.1
+      react-style-singleton: 2.2.1(@types/react@18.0.28)(react@18.3.1)
+      tslib: 2.6.2
+    optionalDependencies:
+      '@types/react': 18.0.28
+
+  react-remove-scroll@2.5.7(@types/react@18.0.28)(react@18.3.1):
+    dependencies:
+      react: 18.3.1
+      react-remove-scroll-bar: 2.3.6(@types/react@18.0.28)(react@18.3.1)
+      react-style-singleton: 2.2.1(@types/react@18.0.28)(react@18.3.1)
+      tslib: 2.6.2
+      use-callback-ref: 1.3.2(@types/react@18.0.28)(react@18.3.1)
+      use-sidecar: 1.1.2(@types/react@18.0.28)(react@18.3.1)
+    optionalDependencies:
+      '@types/react': 18.0.28
+
+  react-style-singleton@2.2.1(@types/react@18.0.28)(react@18.3.1):
+    dependencies:
+      get-nonce: 1.0.1
+      invariant: 2.2.4
+      react: 18.3.1
+      tslib: 2.6.2
+    optionalDependencies:
+      '@types/react': 18.0.28
+
   react@18.3.1:
     dependencies:
       loose-envify: 1.4.0
@@ -22375,14 +23404,6 @@ snapshots:
 
   real-require@0.2.0: {}
 
-  recast@0.23.4:
-    dependencies:
-      assert: 2.1.0
-      ast-types: 0.16.1
-      esprima: 4.0.1
-      source-map: 0.6.1
-      tslib: 2.6.2
-
   recast@0.23.6:
     dependencies:
       ast-types: 0.16.1
@@ -22527,7 +23548,7 @@ snapshots:
 
   require-in-the-middle@7.3.0:
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       module-details-from-path: 1.0.3
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -22551,11 +23572,6 @@ snapshots:
 
   resolve.exports@2.0.0: {}
 
-  resolve@1.19.0:
-    dependencies:
-      is-core-module: 2.13.1
-      path-parse: 1.0.7
-
   resolve@1.22.8:
     dependencies:
       is-core-module: 2.13.1
@@ -22595,31 +23611,34 @@ snapshots:
   rimraf@3.0.2:
     dependencies:
       glob: 7.2.3
+    optional: true
 
-  rollup@4.17.2:
+  rollup@4.18.0:
     dependencies:
       '@types/estree': 1.0.5
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.17.2
-      '@rollup/rollup-android-arm64': 4.17.2
-      '@rollup/rollup-darwin-arm64': 4.17.2
-      '@rollup/rollup-darwin-x64': 4.17.2
-      '@rollup/rollup-linux-arm-gnueabihf': 4.17.2
-      '@rollup/rollup-linux-arm-musleabihf': 4.17.2
-      '@rollup/rollup-linux-arm64-gnu': 4.17.2
-      '@rollup/rollup-linux-arm64-musl': 4.17.2
-      '@rollup/rollup-linux-powerpc64le-gnu': 4.17.2
-      '@rollup/rollup-linux-riscv64-gnu': 4.17.2
-      '@rollup/rollup-linux-s390x-gnu': 4.17.2
-      '@rollup/rollup-linux-x64-gnu': 4.17.2
-      '@rollup/rollup-linux-x64-musl': 4.17.2
-      '@rollup/rollup-win32-arm64-msvc': 4.17.2
-      '@rollup/rollup-win32-ia32-msvc': 4.17.2
-      '@rollup/rollup-win32-x64-msvc': 4.17.2
+      '@rollup/rollup-android-arm-eabi': 4.18.0
+      '@rollup/rollup-android-arm64': 4.18.0
+      '@rollup/rollup-darwin-arm64': 4.18.0
+      '@rollup/rollup-darwin-x64': 4.18.0
+      '@rollup/rollup-linux-arm-gnueabihf': 4.18.0
+      '@rollup/rollup-linux-arm-musleabihf': 4.18.0
+      '@rollup/rollup-linux-arm64-gnu': 4.18.0
+      '@rollup/rollup-linux-arm64-musl': 4.18.0
+      '@rollup/rollup-linux-powerpc64le-gnu': 4.18.0
+      '@rollup/rollup-linux-riscv64-gnu': 4.18.0
+      '@rollup/rollup-linux-s390x-gnu': 4.18.0
+      '@rollup/rollup-linux-x64-gnu': 4.18.0
+      '@rollup/rollup-linux-x64-musl': 4.18.0
+      '@rollup/rollup-win32-arm64-msvc': 4.18.0
+      '@rollup/rollup-win32-ia32-msvc': 4.18.0
+      '@rollup/rollup-win32-x64-msvc': 4.18.0
       fsevents: 2.3.3
 
   rrweb-cssom@0.6.0: {}
 
+  rrweb-cssom@0.7.1: {}
+
   rss-parser@3.13.0:
     dependencies:
       entities: 2.2.0
@@ -22667,7 +23686,7 @@ snapshots:
       parse-srcset: 1.0.2
       postcss: 8.4.38
 
-  sass@1.76.0:
+  sass@1.77.6:
     dependencies:
       chokidar: 3.5.3
       immutable: 4.2.2
@@ -22749,14 +23768,14 @@ snapshots:
     dependencies:
       kind-of: 6.0.3
 
-  sharp@0.33.3:
+  sharp@0.33.4:
     dependencies:
       color: 4.2.3
       detect-libc: 2.0.3
       semver: 7.6.0
     optionalDependencies:
-      '@img/sharp-darwin-arm64': 0.33.3
-      '@img/sharp-darwin-x64': 0.33.3
+      '@img/sharp-darwin-arm64': 0.33.4
+      '@img/sharp-darwin-x64': 0.33.4
       '@img/sharp-libvips-darwin-arm64': 1.0.2
       '@img/sharp-libvips-darwin-x64': 1.0.2
       '@img/sharp-libvips-linux-arm': 1.0.2
@@ -22765,15 +23784,15 @@ snapshots:
       '@img/sharp-libvips-linux-x64': 1.0.2
       '@img/sharp-libvips-linuxmusl-arm64': 1.0.2
       '@img/sharp-libvips-linuxmusl-x64': 1.0.2
-      '@img/sharp-linux-arm': 0.33.3
-      '@img/sharp-linux-arm64': 0.33.3
-      '@img/sharp-linux-s390x': 0.33.3
-      '@img/sharp-linux-x64': 0.33.3
-      '@img/sharp-linuxmusl-arm64': 0.33.3
-      '@img/sharp-linuxmusl-x64': 0.33.3
-      '@img/sharp-wasm32': 0.33.3
-      '@img/sharp-win32-ia32': 0.33.3
-      '@img/sharp-win32-x64': 0.33.3
+      '@img/sharp-linux-arm': 0.33.4
+      '@img/sharp-linux-arm64': 0.33.4
+      '@img/sharp-linux-s390x': 0.33.4
+      '@img/sharp-linux-x64': 0.33.4
+      '@img/sharp-linuxmusl-arm64': 0.33.4
+      '@img/sharp-linuxmusl-x64': 0.33.4
+      '@img/sharp-wasm32': 0.33.4
+      '@img/sharp-win32-ia32': 0.33.4
+      '@img/sharp-win32-x64': 0.33.4
 
   shebang-command@1.2.0:
     dependencies:
@@ -22787,9 +23806,9 @@ snapshots:
 
   shebang-regex@3.0.0: {}
 
-  shiki@1.4.0:
+  shiki@1.10.0:
     dependencies:
-      '@shikijs/core': 1.4.0
+      '@shikijs/core': 1.10.0
 
   shimmer@1.2.1: {}
 
@@ -22805,11 +23824,11 @@ snapshots:
 
   signal-exit@4.1.0: {}
 
-  simple-oauth2@5.0.0:
+  simple-oauth2@5.0.1:
     dependencies:
-      '@hapi/hoek': 10.0.1
+      '@hapi/hoek': 11.0.4
       '@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.11.0
     transitivePeerDependencies:
       - supports-color
@@ -22890,6 +23909,8 @@ snapshots:
 
   slash@3.0.0: {}
 
+  slash@5.1.0: {}
+
   slice-ansi@3.0.0:
     dependencies:
       ansi-styles: 4.3.0
@@ -22907,7 +23928,7 @@ snapshots:
   socks-proxy-agent@8.0.2:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       socks: 2.7.1
     transitivePeerDependencies:
       - supports-color
@@ -22917,7 +23938,7 @@ snapshots:
       ip: 2.0.1
       smart-buffer: 4.2.0
 
-  sonic-boom@3.7.0:
+  sonic-boom@4.0.1:
     dependencies:
       atomic-sleep: 1.0.0
 
@@ -22973,7 +23994,7 @@ snapshots:
 
   sprintf-js@1.0.3: {}
 
-  sprintf-js@1.1.2: {}
+  sprintf-js@1.1.3: {}
 
   sshpk@1.17.0:
     dependencies:
@@ -22999,16 +24020,16 @@ snapshots:
 
   standard-as-callback@2.1.0: {}
 
-  start-server-and-test@2.0.3:
+  start-server-and-test@2.0.4:
     dependencies:
       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.5(supports-color@8.1.1)
       execa: 5.1.1
       lazy-ass: 1.6.0
       ps-tree: 1.2.0
-      wait-on: 7.2.0(debug@4.3.4)
+      wait-on: 7.2.0(debug@4.3.5)
     transitivePeerDependencies:
       - supports-color
 
@@ -23022,22 +24043,22 @@ snapshots:
 
   store2@2.14.2: {}
 
-  storybook-addon-misskey-theme@https://codeload.github.com/misskey-dev/storybook-addon-misskey-theme/tar.gz/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@8.0.9(@types/react@18.0.28)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/components@8.0.9(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/core-events@8.0.9)(@storybook/manager-api@8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/preview-api@8.0.9)(@storybook/theming@8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/types@8.0.9)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+  storybook-addon-misskey-theme@https://codeload.github.com/misskey-dev/storybook-addon-misskey-theme/tar.gz/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/components@8.1.11(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/core-events@8.1.11)(@storybook/manager-api@8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/preview-api@8.1.11)(@storybook/theming@8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/types@8.1.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
-      '@storybook/blocks': 8.0.9(@types/react@18.0.28)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/components': 8.0.9(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/core-events': 8.0.9
-      '@storybook/manager-api': 8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/preview-api': 8.0.9
-      '@storybook/theming': 8.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/types': 8.0.9
+      '@storybook/blocks': 8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/components': 8.1.11(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/core-events': 8.1.11
+      '@storybook/manager-api': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/preview-api': 8.1.11
+      '@storybook/theming': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/types': 8.1.11
     optionalDependencies:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
 
-  storybook@8.0.9(@babel/preset-env@7.23.5(@babel/core@7.24.0))(bufferutil@4.0.7)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3):
+  storybook@8.1.11(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3):
     dependencies:
-      '@storybook/cli': 8.0.9(@babel/preset-env@7.23.5(@babel/core@7.24.0))(bufferutil@4.0.7)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)
+      '@storybook/cli': 8.1.11(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)
     transitivePeerDependencies:
       - '@babel/preset-env'
       - bufferutil
@@ -23146,6 +24167,8 @@ snapshots:
 
   strip-final-newline@3.0.0: {}
 
+  strip-final-newline@4.0.0: {}
+
   strip-indent@3.0.0:
     dependencies:
       min-indent: 1.0.1
@@ -23156,9 +24179,9 @@ snapshots:
 
   strip-json-comments@3.1.1: {}
 
-  strip-literal@1.3.0:
+  strip-literal@2.1.0:
     dependencies:
-      acorn: 8.11.3
+      js-tokens: 9.0.0
 
   strip-outer@2.0.0: {}
 
@@ -23208,7 +24231,7 @@ snapshots:
 
   symbol-tree@3.2.4: {}
 
-  systeminformation@5.22.7: {}
+  systeminformation@5.22.11: {}
 
   tar-fs@2.1.1:
     dependencies:
@@ -23259,24 +24282,23 @@ snapshots:
     dependencies:
       memoizerific: 1.11.3
 
-  temp-dir@2.0.0: {}
+  temp-dir@3.0.0: {}
 
   temp@0.8.4:
     dependencies:
       rimraf: 2.6.3
 
-  tempy@1.0.1:
+  tempy@3.1.0:
     dependencies:
-      del: 6.1.1
-      is-stream: 2.0.1
-      temp-dir: 2.0.0
-      type-fest: 0.16.0
-      unique-string: 2.0.0
+      is-stream: 3.0.0
+      temp-dir: 3.0.0
+      type-fest: 2.19.0
+      unique-string: 3.0.0
 
-  terser@5.30.3:
+  terser@5.31.1:
     dependencies:
       '@jridgewell/source-map': 0.3.5
-      acorn: 8.11.3
+      acorn: 8.12.0
       commander: 2.20.3
       source-map-support: 0.5.21
 
@@ -23298,13 +24320,13 @@ snapshots:
     dependencies:
       any-promise: 1.3.0
 
-  thread-stream@2.3.0:
+  thread-stream@3.1.0:
     dependencies:
       real-require: 0.2.0
 
-  three@0.164.1: {}
+  three@0.165.0: {}
 
-  throttle-debounce@5.0.0: {}
+  throttle-debounce@5.0.2: {}
 
   throttleit@1.0.0: {}
 
@@ -23317,8 +24339,6 @@ snapshots:
 
   through@2.3.8: {}
 
-  tiny-invariant@1.3.1: {}
-
   tiny-invariant@1.3.3: {}
 
   tiny-lru@10.0.1: {}
@@ -23327,7 +24347,7 @@ snapshots:
 
   tinycolor2@1.6.0: {}
 
-  tinypool@0.7.0: {}
+  tinypool@0.8.4: {}
 
   tinyspy@2.2.0: {}
 
@@ -23343,8 +24363,6 @@ snapshots:
     dependencies:
       is-number: 7.0.0
 
-  toad-cache@3.3.0: {}
-
   toad-cache@3.7.0: {}
 
   tocbot@4.21.1: {}
@@ -23367,7 +24385,7 @@ snapshots:
       psl: 1.9.0
       punycode: 2.3.1
 
-  tough-cookie@4.1.3:
+  tough-cookie@4.1.4:
     dependencies:
       psl: 1.9.0
       punycode: 2.3.1
@@ -23394,9 +24412,9 @@ snapshots:
     dependencies:
       typescript: 5.3.3
 
-  ts-api-utils@1.3.0(typescript@5.5.2):
+  ts-api-utils@1.3.0(typescript@5.5.3):
     dependencies:
-      typescript: 5.5.2
+      typescript: 5.5.3
 
   ts-case-convert@2.0.2: {}
 
@@ -23404,7 +24422,7 @@ snapshots:
 
   ts-map@1.0.3: {}
 
-  tsc-alias@1.8.8:
+  tsc-alias@1.8.10:
     dependencies:
       chokidar: 3.5.3
       commander: 9.5.0
@@ -23426,9 +24444,9 @@ snapshots:
       minimist: 1.2.8
       strip-bom: 3.0.0
 
-  tsd@0.30.7:
+  tsd@0.31.1:
     dependencies:
-      '@tsd/typescript': 5.3.3
+      '@tsd/typescript': 5.4.5
       eslint-formatter-pretty: 4.1.0
       globby: 11.1.0
       jest-diff: 29.7.0
@@ -23440,6 +24458,8 @@ snapshots:
 
   tslib@2.6.2: {}
 
+  tslib@2.6.3: {}
+
   tsx@4.4.0:
     dependencies:
       esbuild: 0.18.20
@@ -23459,8 +24479,6 @@ snapshots:
 
   type-detect@4.0.8: {}
 
-  type-fest@0.16.0: {}
-
   type-fest@0.18.1: {}
 
   type-fest@0.20.2: {}
@@ -23471,8 +24489,12 @@ snapshots:
 
   type-fest@0.8.1: {}
 
+  type-fest@1.4.0: {}
+
   type-fest@2.19.0: {}
 
+  type-fest@4.20.1: {}
+
   type-fest@4.9.0: {}
 
   type-is@1.6.18:
@@ -23509,7 +24531,7 @@ snapshots:
 
   typedarray@0.0.6: {}
 
-  typeorm@0.3.20(ioredis@5.4.1)(pg@8.11.5):
+  typeorm@0.3.20(ioredis@5.4.1)(pg@8.12.0):
     dependencies:
       '@sqltools/formatter': 1.2.5
       app-root-path: 3.1.0
@@ -23517,7 +24539,7 @@ snapshots:
       chalk: 4.1.2
       cli-highlight: 2.1.11
       dayjs: 1.11.10
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       dotenv: 16.0.3
       glob: 10.3.10
       mkdirp: 2.1.6
@@ -23528,7 +24550,7 @@ snapshots:
       yargs: 17.7.2
     optionalDependencies:
       ioredis: 5.4.1
-      pg: 8.11.5
+      pg: 8.12.0
     transitivePeerDependencies:
       - supports-color
 
@@ -23536,7 +24558,7 @@ snapshots:
 
   typescript@5.4.2: {}
 
-  typescript@5.5.2: {}
+  typescript@5.5.3: {}
 
   ufo@1.3.2: {}
 
@@ -23577,6 +24599,8 @@ snapshots:
 
   unicode-property-aliases-ecmascript@2.1.0: {}
 
+  unicorn-magic@0.1.0: {}
+
   unified@11.0.4:
     dependencies:
       '@types/unist': 3.0.2
@@ -23597,9 +24621,9 @@ snapshots:
     dependencies:
       imurmurhash: 0.1.4
 
-  unique-string@2.0.0:
+  unique-string@3.0.0:
     dependencies:
-      crypto-random-string: 2.0.0
+      crypto-random-string: 4.0.0
 
   unist-util-is@6.0.0:
     dependencies:
@@ -23632,7 +24656,7 @@ snapshots:
 
   unplugin@1.4.0:
     dependencies:
-      acorn: 8.11.3
+      acorn: 8.12.0
       chokidar: 3.5.3
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.5.0
@@ -23660,6 +24684,21 @@ snapshots:
       querystringify: 2.2.0
       requires-port: 1.0.0
 
+  use-callback-ref@1.3.2(@types/react@18.0.28)(react@18.3.1):
+    dependencies:
+      react: 18.3.1
+      tslib: 2.6.2
+    optionalDependencies:
+      '@types/react': 18.0.28
+
+  use-sidecar@1.1.2(@types/react@18.0.28)(react@18.3.1):
+    dependencies:
+      detect-node-es: 1.1.0
+      react: 18.3.1
+      tslib: 2.6.2
+    optionalDependencies:
+      '@types/react': 18.0.28
+
   utf-8-validate@6.0.3:
     dependencies:
       node-gyp-build: 4.6.0
@@ -23677,20 +24716,22 @@ snapshots:
 
   utils-merge@1.0.1: {}
 
+  uuid@10.0.0: {}
+
   uuid@3.4.0: {}
 
   uuid@8.3.2: {}
 
   uuid@9.0.1: {}
 
-  v-code-diff@1.11.0(vue@3.4.26(typescript@5.5.2)):
+  v-code-diff@1.12.0(vue@3.4.31(typescript@5.5.3)):
     dependencies:
       diff: 5.1.0
       diff-match-patch: 1.0.5
       highlight.js: 11.9.0
-      vue: 3.4.26(typescript@5.5.2)
-      vue-demi: 0.14.7(vue@3.4.26(typescript@5.5.2))
-      vue-i18n: 9.13.1(vue@3.4.26(typescript@5.5.2))
+      vue: 3.4.31(typescript@5.5.3)
+      vue-demi: 0.14.7(vue@3.4.31(typescript@5.5.3))
+      vue-i18n: 9.13.1(vue@3.4.31(typescript@5.5.3))
 
   v8-to-istanbul@9.2.0:
     dependencies:
@@ -23703,8 +24744,6 @@ snapshots:
       spdx-correct: 3.1.1
       spdx-expression-parse: 3.0.1
 
-  validator@13.9.0: {}
-
   vary@1.1.2: {}
 
   verror@1.10.0:
@@ -23724,14 +24763,13 @@ snapshots:
       unist-util-stringify-position: 4.0.0
       vfile-message: 4.0.2
 
-  vite-node@0.34.6(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3):
+  vite-node@1.6.0(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1):
     dependencies:
       cac: 6.7.14
-      debug: 4.3.4(supports-color@8.1.1)
-      mlly: 1.5.0
+      debug: 4.3.5(supports-color@8.1.1)
       pathe: 1.1.2
       picocolors: 1.0.0
-      vite: 5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3)
+      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -23744,53 +24782,50 @@ snapshots:
 
   vite-plugin-turbosnap@1.0.3: {}
 
-  vite@5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3):
+  vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1):
     dependencies:
-      esbuild: 0.20.2
+      esbuild: 0.21.5
       postcss: 8.4.38
-      rollup: 4.17.2
+      rollup: 4.18.0
     optionalDependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.14.9
       fsevents: 2.3.3
-      sass: 1.76.0
-      terser: 5.30.3
+      sass: 1.77.6
+      terser: 5.31.1
 
-  vitest-fetch-mock@0.2.2(encoding@0.1.13)(vitest@0.34.6(happy-dom@10.0.3)(jsdom@24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.76.0)(terser@5.30.3)):
+  vitest-fetch-mock@0.2.2(encoding@0.1.13)(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1)):
     dependencies:
       cross-fetch: 3.1.6(encoding@0.1.13)
-      vitest: 0.34.6(happy-dom@10.0.3)(jsdom@24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.76.0)(terser@5.30.3)
+      vitest: 1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1)
     transitivePeerDependencies:
       - encoding
 
-  vitest@0.34.6(happy-dom@10.0.3)(jsdom@24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.76.0)(terser@5.30.3):
+  vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1):
     dependencies:
-      '@types/chai': 4.3.11
-      '@types/chai-subset': 1.3.5
-      '@types/node': 20.12.7
-      '@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.3
+      '@vitest/expect': 1.6.0
+      '@vitest/runner': 1.6.0
+      '@vitest/snapshot': 1.6.0
+      '@vitest/spy': 1.6.0
+      '@vitest/utils': 1.6.0
       acorn-walk: 8.3.2
-      cac: 6.7.14
       chai: 4.3.10
-      debug: 4.3.4(supports-color@8.1.1)
-      local-pkg: 0.4.3
-      magic-string: 0.30.7
+      debug: 4.3.4(supports-color@5.5.0)
+      execa: 8.0.1
+      local-pkg: 0.5.0
+      magic-string: 0.30.10
       pathe: 1.1.2
       picocolors: 1.0.0
       std-env: 3.7.0
-      strip-literal: 1.3.0
+      strip-literal: 2.1.0
       tinybench: 2.6.0
-      tinypool: 0.7.0
-      vite: 5.2.11(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3)
-      vite-node: 0.34.6(@types/node@20.12.7)(sass@1.76.0)(terser@5.30.3)
+      tinypool: 0.8.4
+      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)
+      vite-node: 1.6.0(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)
       why-is-node-running: 2.2.2
     optionalDependencies:
+      '@types/node': 20.14.9
       happy-dom: 10.0.3
-      jsdom: 24.0.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
+      jsdom: 24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
     transitivePeerDependencies:
       - less
       - lightningcss
@@ -23823,98 +24858,100 @@ snapshots:
     dependencies:
       vscode-languageserver-protocol: 3.17.5
 
-  vue-component-meta@2.0.16(typescript@5.5.2):
+  vscode-uri@3.0.8: {}
+
+  vue-component-meta@2.0.16(typescript@5.5.3):
     dependencies:
       '@volar/typescript': 2.2.0
-      '@vue/language-core': 2.0.16(typescript@5.5.2)
+      '@vue/language-core': 2.0.16(typescript@5.5.3)
       path-browserify: 1.0.1
       vue-component-type-helpers: 2.0.16
     optionalDependencies:
-      typescript: 5.5.2
+      typescript: 5.5.3
 
   vue-component-type-helpers@1.8.4: {}
 
   vue-component-type-helpers@2.0.16: {}
 
-  vue-component-type-helpers@2.0.21: {}
+  vue-component-type-helpers@2.0.24: {}
 
-  vue-demi@0.14.7(vue@3.4.26(typescript@5.5.2)):
+  vue-demi@0.14.7(vue@3.4.31(typescript@5.5.3)):
     dependencies:
-      vue: 3.4.26(typescript@5.5.2)
+      vue: 3.4.31(typescript@5.5.3)
 
-  vue-docgen-api@4.75.1(vue@3.4.26(typescript@5.5.2)):
+  vue-docgen-api@4.75.1(vue@3.4.31(typescript@5.5.3)):
     dependencies:
-      '@babel/parser': 7.24.0
-      '@babel/types': 7.24.0
-      '@vue/compiler-dom': 3.4.21
-      '@vue/compiler-sfc': 3.4.26
+      '@babel/parser': 7.24.7
+      '@babel/types': 7.24.7
+      '@vue/compiler-dom': 3.4.29
+      '@vue/compiler-sfc': 3.4.31
       ast-types: 0.16.1
       hash-sum: 2.0.0
       lru-cache: 8.0.4
-      pug: 3.0.2
-      recast: 0.23.4
+      pug: 3.0.3
+      recast: 0.23.6
       ts-map: 1.0.3
-      vue: 3.4.26(typescript@5.5.2)
-      vue-inbrowser-compiler-independent-utils: 4.71.1(vue@3.4.26(typescript@5.5.2))
+      vue: 3.4.31(typescript@5.5.3)
+      vue-inbrowser-compiler-independent-utils: 4.71.1(vue@3.4.31(typescript@5.5.3))
 
-  vue-eslint-parser@9.4.2(eslint@8.57.0):
+  vue-eslint-parser@9.4.3(eslint@9.6.0):
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.57.0
+      debug: 4.3.4(supports-color@5.5.0)
+      eslint: 9.6.0
       eslint-scope: 7.2.2
       eslint-visitor-keys: 3.4.3
       espree: 9.6.1
       esquery: 1.4.2
       lodash: 4.17.21
-      semver: 7.5.4
+      semver: 7.6.0
     transitivePeerDependencies:
       - supports-color
 
-  vue-i18n@9.13.1(vue@3.4.26(typescript@5.5.2)):
+  vue-i18n@9.13.1(vue@3.4.31(typescript@5.5.3)):
     dependencies:
       '@intlify/core-base': 9.13.1
       '@intlify/shared': 9.13.1
       '@vue/devtools-api': 6.6.1
-      vue: 3.4.26(typescript@5.5.2)
+      vue: 3.4.31(typescript@5.5.3)
 
-  vue-inbrowser-compiler-independent-utils@4.71.1(vue@3.4.26(typescript@5.5.2)):
+  vue-inbrowser-compiler-independent-utils@4.71.1(vue@3.4.31(typescript@5.5.3)):
     dependencies:
-      vue: 3.4.26(typescript@5.5.2)
+      vue: 3.4.31(typescript@5.5.3)
 
   vue-template-compiler@2.7.14:
     dependencies:
       de-indent: 1.0.2
       he: 1.2.0
 
-  vue-tsc@2.0.16(typescript@5.5.2):
+  vue-tsc@2.0.24(typescript@5.5.3):
     dependencies:
-      '@volar/typescript': 2.2.0
-      '@vue/language-core': 2.0.16(typescript@5.5.2)
+      '@volar/typescript': 2.4.0-alpha.11
+      '@vue/language-core': 2.0.24(typescript@5.5.3)
       semver: 7.6.0
-      typescript: 5.5.2
+      typescript: 5.5.3
 
-  vue@3.4.26(typescript@5.5.2):
+  vue@3.4.31(typescript@5.5.3):
     dependencies:
-      '@vue/compiler-dom': 3.4.26
-      '@vue/compiler-sfc': 3.4.26
-      '@vue/runtime-dom': 3.4.26
-      '@vue/server-renderer': 3.4.26(vue@3.4.26(typescript@5.5.2))
-      '@vue/shared': 3.4.26
+      '@vue/compiler-dom': 3.4.31
+      '@vue/compiler-sfc': 3.4.31
+      '@vue/runtime-dom': 3.4.31
+      '@vue/server-renderer': 3.4.31(vue@3.4.31(typescript@5.5.3))
+      '@vue/shared': 3.4.31
     optionalDependencies:
-      typescript: 5.5.2
+      typescript: 5.5.3
 
-  vuedraggable@4.1.0(vue@3.4.26(typescript@5.5.2)):
+  vuedraggable@4.1.0(vue@3.4.31(typescript@5.5.3)):
     dependencies:
       sortablejs: 1.14.0
-      vue: 3.4.26(typescript@5.5.2)
+      vue: 3.4.31(typescript@5.5.3)
 
   w3c-xmlserializer@5.0.0:
     dependencies:
       xml-name-validator: 5.0.0
 
-  wait-on@7.2.0(debug@4.3.4):
+  wait-on@7.2.0(debug@4.3.5):
     dependencies:
-      axios: 1.6.2(debug@4.3.4)
+      axios: 1.6.2(debug@4.3.5)
       joi: 17.11.0
       lodash: 4.17.21
       minimist: 1.2.8
@@ -24026,8 +25063,8 @@ snapshots:
 
   with@7.0.2:
     dependencies:
-      '@babel/parser': 7.23.9
-      '@babel/types': 7.23.5
+      '@babel/parser': 7.24.5
+      '@babel/types': 7.24.0
       assert-never: 1.2.1
       babel-walk: 3.0.0-canary-5
 
@@ -24064,7 +25101,7 @@ snapshots:
       imurmurhash: 0.1.4
       signal-exit: 3.0.7
 
-  ws@8.17.0(bufferutil@4.0.7)(utf-8-validate@6.0.3):
+  ws@8.17.1(bufferutil@4.0.7)(utf-8-validate@6.0.3):
     optionalDependencies:
       bufferutil: 4.0.7
       utf-8-validate: 6.0.3
@@ -24152,13 +25189,7 @@ snapshots:
 
   yocto-queue@1.0.0: {}
 
-  z-schema@5.0.5:
-    dependencies:
-      lodash.get: 4.4.2
-      lodash.isequal: 4.5.0
-      validator: 13.9.0
-    optionalDependencies:
-      commander: 9.5.0
+  yoctocolors@2.0.2: {}
 
   zip-stream@6.0.1:
     dependencies:
diff --git a/scripts/changelog-checker/.eslintrc.cjs b/scripts/changelog-checker/.eslintrc.cjs
deleted file mode 100644
index 6acf8b3e6e..0000000000
--- a/scripts/changelog-checker/.eslintrc.cjs
+++ /dev/null
@@ -1,9 +0,0 @@
-module.exports = {
-	parserOptions: {
-		tsconfigRootDir: __dirname,
-		project: ['./tsconfig.json'],
-	},
-	extends: [
-		'../../packages/shared/.eslintrc.js',
-	],
-};
diff --git a/scripts/changelog-checker/eslint.config.js b/scripts/changelog-checker/eslint.config.js
new file mode 100644
index 0000000000..813e96981a
--- /dev/null
+++ b/scripts/changelog-checker/eslint.config.js
@@ -0,0 +1,17 @@
+import tsParser from '@typescript-eslint/parser';
+import sharedConfig from '../../packages/shared/eslint.config.js';
+
+export default [
+	...sharedConfig,
+	{
+		files: ['src/**/*.ts', 'src/**/*.tsx'],
+		languageOptions: {
+			parserOptions: {
+				parser: tsParser,
+				project: ['./tsconfig.json'],
+				sourceType: 'module',
+				tsconfigRootDir: import.meta.dirname,
+			},
+		},
+	},
+];

From eafae79869204e6de4a3fd4835eda3eb23b53974 Mon Sep 17 00:00:00 2001
From: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>
Date: Tue, 2 Jul 2024 14:29:44 +0900
Subject: [PATCH 011/221] test(backend): goodbye, Lenna (#14111)

---
 .../src/models/json-schema/drive-file.ts       |   2 +-
 .../api/endpoints/admin/drive/show-file.ts     |   2 +-
 packages/backend/test/e2e/drive.ts             |   6 +++---
 packages/backend/test/e2e/endpoints.ts         |   2 +-
 packages/backend/test/e2e/note.ts              |   4 ++--
 packages/backend/test/e2e/user-notes.ts        |   4 ++--
 packages/backend/test/resources/192.jpg        | Bin 0 -> 5131 bytes
 packages/backend/test/resources/192.png        | Bin 0 -> 26568 bytes
 packages/backend/test/resources/Lenna.jpg      | Bin 25360 -> 0 bytes
 packages/backend/test/resources/Lenna.png      | Bin 473831 -> 0 bytes
 packages/backend/test/unit/FileInfoService.ts  |  10 +++++-----
 packages/backend/test/utils.ts                 |   2 +-
 packages/misskey-js/src/autogen/types.ts       |   4 ++--
 13 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 packages/backend/test/resources/192.jpg
 create mode 100644 packages/backend/test/resources/192.png
 delete mode 100644 packages/backend/test/resources/Lenna.jpg
 delete mode 100644 packages/backend/test/resources/Lenna.png

diff --git a/packages/backend/src/models/json-schema/drive-file.ts b/packages/backend/src/models/json-schema/drive-file.ts
index ca88cc0e39..5ee1561c50 100644
--- a/packages/backend/src/models/json-schema/drive-file.ts
+++ b/packages/backend/src/models/json-schema/drive-file.ts
@@ -20,7 +20,7 @@ export const packedDriveFileSchema = {
 		name: {
 			type: 'string',
 			optional: false, nullable: false,
-			example: 'lenna.jpg',
+			example: '192.jpg',
 		},
 		type: {
 			type: 'string',
diff --git a/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts b/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts
index 459d8880fa..a7136d8c8c 100644
--- a/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts
+++ b/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts
@@ -61,7 +61,7 @@ export const meta = {
 			name: {
 				type: 'string',
 				optional: false, nullable: false,
-				example: 'lenna.jpg',
+				example: '192.jpg',
 			},
 			type: {
 				type: 'string',
diff --git a/packages/backend/test/e2e/drive.ts b/packages/backend/test/e2e/drive.ts
index 828c5200ef..43a73163eb 100644
--- a/packages/backend/test/e2e/drive.ts
+++ b/packages/backend/test/e2e/drive.ts
@@ -23,7 +23,7 @@ describe('Drive', () => {
 
 		const marker = Math.random().toString();
 
-		const url = 'https://raw.githubusercontent.com/misskey-dev/misskey/develop/packages/backend/test/resources/Lenna.jpg';
+		const url = 'https://raw.githubusercontent.com/misskey-dev/misskey/develop/packages/backend/test/resources/192.jpg';
 
 		const catcher = makeStreamCatcher(
 			alice,
@@ -41,14 +41,14 @@ describe('Drive', () => {
 		const file = await catcher;
 
 		assert.strictEqual(res.status, 204);
-		assert.strictEqual(file.name, 'Lenna.jpg');
+		assert.strictEqual(file.name, '192.jpg');
 		assert.strictEqual(file.type, 'image/jpeg');
 	});
 
 	test('ローカルからアップロードできる', async () => {
 		// APIレスポンスを直接使用するので utils.js uploadFile が通過することで成功とする
 
-		const res = await uploadFile(alice, { path: 'Lenna.jpg', name: 'テスト画像' });
+		const res = await uploadFile(alice, { path: '192.jpg', name: 'テスト画像' });
 
 		assert.strictEqual(res.body?.name, 'テスト画像.jpg');
 		assert.strictEqual(res.body.type, 'image/jpeg');
diff --git a/packages/backend/test/e2e/endpoints.ts b/packages/backend/test/e2e/endpoints.ts
index de5e8ba95e..d5583ea8bb 100644
--- a/packages/backend/test/e2e/endpoints.ts
+++ b/packages/backend/test/e2e/endpoints.ts
@@ -584,7 +584,7 @@ describe('Endpoints', () => {
 
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
-			assert.strictEqual(res.body!.name, 'Lenna.jpg');
+			assert.strictEqual(res.body!.name, '192.jpg');
 		});
 
 		test('ファイルに名前を付けられる', async () => {
diff --git a/packages/backend/test/e2e/note.ts b/packages/backend/test/e2e/note.ts
index bda31d9640..7ce9f47bc3 100644
--- a/packages/backend/test/e2e/note.ts
+++ b/packages/backend/test/e2e/note.ts
@@ -41,7 +41,7 @@ describe('Note', () => {
 	});
 
 	test('ファイルを添付できる', async () => {
-		const file = await uploadUrl(alice, 'https://raw.githubusercontent.com/misskey-dev/misskey/develop/packages/backend/test/resources/Lenna.jpg');
+		const file = await uploadUrl(alice, 'https://raw.githubusercontent.com/misskey-dev/misskey/develop/packages/backend/test/resources/192.jpg');
 
 		const res = await api('notes/create', {
 			fileIds: [file.id],
@@ -53,7 +53,7 @@ describe('Note', () => {
 	}, 1000 * 10);
 
 	test('他人のファイルで怒られる', async () => {
-		const file = await uploadUrl(bob, 'https://raw.githubusercontent.com/misskey-dev/misskey/develop/packages/backend/test/resources/Lenna.jpg');
+		const file = await uploadUrl(bob, 'https://raw.githubusercontent.com/misskey-dev/misskey/develop/packages/backend/test/resources/192.jpg');
 
 		const res = await api('notes/create', {
 			text: 'test',
diff --git a/packages/backend/test/e2e/user-notes.ts b/packages/backend/test/e2e/user-notes.ts
index 331e053935..cc07c5ae71 100644
--- a/packages/backend/test/e2e/user-notes.ts
+++ b/packages/backend/test/e2e/user-notes.ts
@@ -17,8 +17,8 @@ describe('users/notes', () => {
 
 	beforeAll(async () => {
 		alice = await signup({ username: 'alice' });
-		const jpg = await uploadUrl(alice, 'https://raw.githubusercontent.com/misskey-dev/misskey/develop/packages/backend/test/resources/Lenna.jpg');
-		const png = await uploadUrl(alice, 'https://raw.githubusercontent.com/misskey-dev/misskey/develop/packages/backend/test/resources/Lenna.png');
+		const jpg = await uploadUrl(alice, 'https://raw.githubusercontent.com/misskey-dev/misskey/develop/packages/backend/test/resources/192.jpg');
+		const png = await uploadUrl(alice, 'https://raw.githubusercontent.com/misskey-dev/misskey/develop/packages/backend/test/resources/192.png');
 		jpgNote = await post(alice, {
 			fileIds: [jpg.id],
 		});
diff --git a/packages/backend/test/resources/192.jpg b/packages/backend/test/resources/192.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..76374628e0acf2e3b85152d55c11c9a763027810
GIT binary patch
literal 5131
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

literal 0
HcmV?d00001

diff --git a/packages/backend/test/resources/192.png b/packages/backend/test/resources/192.png
new file mode 100644
index 0000000000000000000000000000000000000000..15fd1e3731210ad53f3948c1551a5be1f5ab1396
GIT binary patch
literal 26568
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
E0Hgq>F#rGn

literal 0
HcmV?d00001

diff --git a/packages/backend/test/resources/Lenna.jpg b/packages/backend/test/resources/Lenna.jpg
deleted file mode 100644
index 6b5b32281c1ffd5893d23392169cc368d72e0823..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25360
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
O>~nN4ZJfRS|4jhJY`72r

diff --git a/packages/backend/test/resources/Lenna.png b/packages/backend/test/resources/Lenna.png
deleted file mode 100644
index 59ef68aabd033341028ccd2b1f6c5871c02b9d7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 473831
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%0ADm`};Qj
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

diff --git a/packages/backend/test/unit/FileInfoService.ts b/packages/backend/test/unit/FileInfoService.ts
index 40d187f5a8..aa9b34b706 100644
--- a/packages/backend/test/unit/FileInfoService.ts
+++ b/packages/backend/test/unit/FileInfoService.ts
@@ -83,21 +83,21 @@ describe('FileInfoService', () => {
 
 	describe('IMAGE', () => {
 		test('Generic JPEG', async () => {
-			const path = `${resources}/Lenna.jpg`;
+			const path = `${resources}/192.jpg`;
 			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
 			delete info.warnings;
 			delete info.blurhash;
 			delete info.sensitive;
 			delete info.porn;
 			assert.deepStrictEqual(info, {
-				size: 25360,
-				md5: '091b3f259662aa31e2ffef4519951168',
+				size: 5131,
+				md5: '8c9ed0677dd2b8f9f7472c3af247e5e3',
 				type: {
 					mime: 'image/jpeg',
 					ext: 'jpg',
 				},
-				width: 512,
-				height: 512,
+				width: 192,
+				height: 192,
 				orientation: undefined,
 			});
 		});
diff --git a/packages/backend/test/utils.ts b/packages/backend/test/utils.ts
index aad4ab37c9..bf14d05eca 100644
--- a/packages/backend/test/utils.ts
+++ b/packages/backend/test/utils.ts
@@ -297,7 +297,7 @@ export const uploadFile = async (user?: UserToken, { path, name, blob }: UploadO
 	body: misskey.entities.DriveFile | null
 }> => {
 	const absPath = path == null
-		? new URL('resources/Lenna.jpg', import.meta.url)
+		? new URL('resources/192.jpg', import.meta.url)
 		: isAbsolute(path.toString())
 			? new URL(path)
 			: new URL(path, new URL('resources/', import.meta.url));
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 72aca4dee2..b59f8dcbe3 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4299,7 +4299,7 @@ export type components = {
       id: string;
       /** Format: date-time */
       createdAt: string;
-      /** @example lenna.jpg */
+      /** @example 192.jpg */
       name: string;
       /** @example image/jpeg */
       type: string;
@@ -6799,7 +6799,7 @@ export type operations = {
              * @example 15eca7fba0480996e2245f5185bf39f2
              */
             md5: string;
-            /** @example lenna.jpg */
+            /** @example 192.jpg */
             name: string;
             /** @example image/jpeg */
             type: string;

From de1fe7cc5a22fed6c677a6b35365c667eece8ab8 Mon Sep 17 00:00:00 2001
From: woxtu <woxtup@gmail.com>
Date: Tue, 2 Jul 2024 14:47:07 +0900
Subject: [PATCH 012/221] Use built-in API (#14095)

---
 packages/backend/test/e2e/move.ts             |  7 +-
 packages/backend/test/e2e/renote-mute.ts      |  9 +-
 packages/backend/test/e2e/timelines.ts        | 93 ++++++++++---------
 packages/backend/test/unit/RoleService.ts     |  8 +-
 .../backend/test/unit/SystemWebhookService.ts | 17 ++--
 packages/backend/test/utils.ts                |  8 --
 6 files changed, 69 insertions(+), 73 deletions(-)

diff --git a/packages/backend/test/e2e/move.ts b/packages/backend/test/e2e/move.ts
index 74cf61a785..35240cd3c8 100644
--- a/packages/backend/test/e2e/move.ts
+++ b/packages/backend/test/e2e/move.ts
@@ -7,12 +7,13 @@ import { INestApplicationContext } from '@nestjs/common';
 
 process.env.NODE_ENV = 'test';
 
+import { setTimeout } from 'node:timers/promises';
 import * as assert from 'assert';
 import { loadConfig } from '@/config.js';
 import { MiRepository, MiUser, UsersRepository, miRepository } from '@/models/_.js';
 import { secureRndstr } from '@/misc/secure-rndstr.js';
 import { jobQueue } from '@/boot/common.js';
-import { api, initTestDb, signup, sleep, successfulApiCall, uploadFile } from '../utils.js';
+import { api, initTestDb, signup, successfulApiCall, uploadFile } from '../utils.js';
 import type * as misskey from 'misskey-js';
 
 describe('Account Move', () => {
@@ -271,7 +272,7 @@ describe('Account Move', () => {
 
 			assert.strictEqual(move.status, 200);
 
-			await sleep(1000 * 3); // wait for jobs to finish
+			await setTimeout(1000 * 3); // wait for jobs to finish
 
 			// Unfollow delayed?
 			const aliceFollowings = await api('users/following', {
@@ -330,7 +331,7 @@ describe('Account Move', () => {
 		});
 
 		test('Unfollowed after 10 sec (24 hours in production).', async () => {
-			await sleep(1000 * 8);
+			await setTimeout(1000 * 8);
 
 			const following = await api('users/following', {
 				userId: alice.id,
diff --git a/packages/backend/test/e2e/renote-mute.ts b/packages/backend/test/e2e/renote-mute.ts
index 1abbb4f044..f6895c43d8 100644
--- a/packages/backend/test/e2e/renote-mute.ts
+++ b/packages/backend/test/e2e/renote-mute.ts
@@ -6,7 +6,8 @@
 process.env.NODE_ENV = 'test';
 
 import * as assert from 'assert';
-import { api, post, signup, sleep, waitFire } from '../utils.js';
+import { setTimeout } from 'node:timers/promises';
+import { api, post, signup, waitFire } from '../utils.js';
 import type * as misskey from 'misskey-js';
 
 describe('Renote Mute', () => {
@@ -35,7 +36,7 @@ describe('Renote Mute', () => {
 		const carolNote = await post(carol, { text: 'hi' });
 
 		// redisに追加されるのを待つ
-		await sleep(100);
+		await setTimeout(100);
 
 		const res = await api('notes/local-timeline', {}, alice);
 
@@ -52,7 +53,7 @@ describe('Renote Mute', () => {
 		const carolNote = await post(carol, { text: 'hi' });
 
 		// redisに追加されるのを待つ
-		await sleep(100);
+		await setTimeout(100);
 
 		const res = await api('notes/local-timeline', {}, alice);
 
@@ -69,7 +70,7 @@ describe('Renote Mute', () => {
 		const bobRenote = await post(bob, { renoteId: carolNote.id });
 
 		// redisに追加されるのを待つ
-		await sleep(100);
+		await setTimeout(100);
 
 		const res = await api('notes/local-timeline', {}, alice);
 
diff --git a/packages/backend/test/e2e/timelines.ts b/packages/backend/test/e2e/timelines.ts
index f6cc2bac28..fccc052d99 100644
--- a/packages/backend/test/e2e/timelines.ts
+++ b/packages/backend/test/e2e/timelines.ts
@@ -7,16 +7,17 @@
 // pnpm jest -- e2e/timelines.ts
 
 import * as assert from 'assert';
+import { setTimeout } from 'node:timers/promises';
 import { Redis } from 'ioredis';
 import { loadConfig } from '@/config.js';
-import { api, post, randomString, sendEnvUpdateRequest, signup, sleep, uploadUrl } from '../utils.js';
+import { api, post, randomString, sendEnvUpdateRequest, signup, uploadUrl } from '../utils.js';
 
 function genHost() {
 	return randomString() + '.example.com';
 }
 
 function waitForPushToTl() {
-	return sleep(500);
+	return setTimeout(500);
 }
 
 let redisForTimelines: Redis;
@@ -44,7 +45,7 @@ describe('Timelines', () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
 			await api('following/create', { userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote = await post(bob, { text: 'hi' });
 			const carolNote = await post(carol, { text: 'hi' });
 
@@ -60,7 +61,7 @@ describe('Timelines', () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
 			await api('following/create', { userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'followers' });
 			const carolNote = await post(carol, { text: 'hi' });
 
@@ -77,7 +78,7 @@ describe('Timelines', () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
 			await api('following/create', { userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
 
@@ -94,7 +95,7 @@ describe('Timelines', () => {
 
 			await api('following/create', { userId: bob.id }, alice);
 			await api('following/update', { userId: bob.id, withReplies: true }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
 
@@ -111,7 +112,7 @@ describe('Timelines', () => {
 
 			await api('following/create', { userId: bob.id }, alice);
 			await api('following/update', { userId: bob.id, withReplies: true }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id, visibility: 'specified', visibleUserIds: [carolNote.id] });
 
@@ -128,7 +129,7 @@ describe('Timelines', () => {
 
 			await api('following/create', { userId: bob.id }, alice);
 			await api('following/update', { userId: bob.id, withReplies: true }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi', visibility: 'followers' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
 
@@ -147,7 +148,7 @@ describe('Timelines', () => {
 			await api('following/create', { userId: carol.id }, alice);
 			await api('following/create', { userId: carol.id }, bob);
 			await api('following/update', { userId: bob.id, withReplies: true }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi', visibility: 'followers' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
 
@@ -166,7 +167,7 @@ describe('Timelines', () => {
 			await api('following/create', { userId: bob.id }, alice);
 			await api('following/create', { userId: carol.id }, alice);
 			await api('following/update', { userId: bob.id, withReplies: true }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id, visibility: 'specified', visibleUserIds: [carolNote.id] });
 
@@ -182,7 +183,7 @@ describe('Timelines', () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
 			await api('following/create', { userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote1 = await post(bob, { text: 'hi' });
 			const bobNote2 = await post(bob, { text: 'hi', replyId: bobNote1.id });
 
@@ -198,7 +199,7 @@ describe('Timelines', () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
 			await api('following/create', { userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const aliceNote = await post(alice, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: aliceNote.id });
 
@@ -228,7 +229,7 @@ describe('Timelines', () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
 			await api('following/create', { userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { renoteId: carolNote.id });
 
@@ -244,7 +245,7 @@ describe('Timelines', () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
 			await api('following/create', { userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { renoteId: carolNote.id });
 
@@ -262,7 +263,7 @@ describe('Timelines', () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
 			await api('following/create', { userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', renoteId: carolNote.id });
 
@@ -280,7 +281,7 @@ describe('Timelines', () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
 			await api('following/create', { userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'specified', visibleUserIds: [carol.id] });
 
 			await waitForPushToTl();
@@ -295,7 +296,7 @@ describe('Timelines', () => {
 
 			await api('following/create', { userId: bob.id }, alice);
 			await api('mute/create', { userId: carol.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', renoteId: carolNote.id });
 
@@ -313,7 +314,7 @@ describe('Timelines', () => {
 			await api('following/create', { userId: bob.id }, alice);
 			await api('following/update', { userId: bob.id, withReplies: true }, alice);
 			await api('mute/create', { userId: carol.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
 
@@ -359,7 +360,7 @@ describe('Timelines', () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
 			await api('following/create', { userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const [bobFile, carolFile] = await Promise.all([
 				uploadUrl(bob, 'https://raw.githubusercontent.com/misskey-dev/assets/main/public/icon.png'),
 				uploadUrl(carol, 'https://raw.githubusercontent.com/misskey-dev/assets/main/public/icon.png'),
@@ -384,7 +385,7 @@ describe('Timelines', () => {
 
 			const channel = await api('channels/create', { name: 'channel' }, bob).then(x => x.body);
 			await api('following/create', { userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote = await post(bob, { text: 'hi', channelId: channel.id });
 
 			await waitForPushToTl();
@@ -411,7 +412,7 @@ describe('Timelines', () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
 			await api('following/create', { userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'specified', visibleUserIds: [alice.id] });
 
 			await waitForPushToTl();
@@ -438,7 +439,7 @@ describe('Timelines', () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
 			await api('following/create', { userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'specified', visibleUserIds: [carol.id] });
 
 			await waitForPushToTl();
@@ -566,7 +567,7 @@ describe('Timelines', () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
 			await api('following/create', { userId: carol.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi', visibility: 'home' });
 			const bobNote = await post(bob, { text: 'hi' });
 
@@ -582,7 +583,7 @@ describe('Timelines', () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
 			await api('mute/create', { userId: carol.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi' });
 
@@ -599,7 +600,7 @@ describe('Timelines', () => {
 
 			await api('following/create', { userId: bob.id }, alice);
 			await api('mute/create', { userId: carol.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', renoteId: carolNote.id });
 
@@ -617,7 +618,7 @@ describe('Timelines', () => {
 			await api('following/create', { userId: bob.id }, alice);
 			await api('following/update', { userId: bob.id, withReplies: true }, alice);
 			await api('mute/create', { userId: carol.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
 
@@ -633,7 +634,7 @@ describe('Timelines', () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
 			await api('following/create', { userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const aliceNote = await post(alice, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: aliceNote.id });
 
@@ -703,7 +704,7 @@ describe('Timelines', () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
 			await api('following/create', { userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'home' });
 
 			await waitForPushToTl();
@@ -717,7 +718,7 @@ describe('Timelines', () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
 			await api('following/create', { userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const aliceNote = await post(alice, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: aliceNote.id });
 
@@ -820,7 +821,7 @@ describe('Timelines', () => {
 
 			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
 			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote = await post(bob, { text: 'hi' });
 
 			await waitForPushToTl();
@@ -835,7 +836,7 @@ describe('Timelines', () => {
 
 			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
 			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'home' });
 
 			await waitForPushToTl();
@@ -850,7 +851,7 @@ describe('Timelines', () => {
 
 			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
 			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'followers' });
 
 			await waitForPushToTl();
@@ -865,7 +866,7 @@ describe('Timelines', () => {
 
 			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
 			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
 
@@ -881,7 +882,7 @@ describe('Timelines', () => {
 
 			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
 			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote1 = await post(bob, { text: 'hi' });
 			const bobNote2 = await post(bob, { text: 'hi', replyId: bobNote1.id });
 
@@ -899,7 +900,7 @@ describe('Timelines', () => {
 			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
 			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
 			await api('users/lists/update-membership', { listId: list.id, userId: bob.id, withReplies: false }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const aliceNote = await post(alice, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: aliceNote.id });
 
@@ -916,7 +917,7 @@ describe('Timelines', () => {
 			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
 			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
 			await api('users/lists/update-membership', { listId: list.id, userId: bob.id, withReplies: false }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
 
@@ -933,7 +934,7 @@ describe('Timelines', () => {
 			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
 			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
 			await api('users/lists/update-membership', { listId: list.id, userId: bob.id, withReplies: true }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
 
@@ -950,7 +951,7 @@ describe('Timelines', () => {
 			await api('following/create', { userId: bob.id }, alice);
 			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
 			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'home' });
 
 			await waitForPushToTl();
@@ -966,7 +967,7 @@ describe('Timelines', () => {
 			await api('following/create', { userId: bob.id }, alice);
 			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
 			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'followers' });
 
 			await waitForPushToTl();
@@ -982,7 +983,7 @@ describe('Timelines', () => {
 
 			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
 			await api('users/lists/push', { listId: list.id, userId: alice.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const aliceNote = await post(alice, { text: 'hi', visibility: 'followers' });
 
 			await waitForPushToTl();
@@ -999,7 +1000,7 @@ describe('Timelines', () => {
 			const channel = await api('channels/create', { name: 'channel' }, bob).then(x => x.body);
 			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
 			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote = await post(bob, { text: 'hi', channelId: channel.id });
 
 			await waitForPushToTl();
@@ -1031,7 +1032,7 @@ describe('Timelines', () => {
 
 			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
 			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'specified', visibleUserIds: [alice.id] });
 
 			await waitForPushToTl();
@@ -1048,7 +1049,7 @@ describe('Timelines', () => {
 			const list = await api('users/lists/create', { name: 'list' }, alice).then(res => res.body);
 			await api('users/lists/push', { listId: list.id, userId: bob.id }, alice);
 			await api('users/lists/push', { listId: list.id, userId: carol.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'specified', visibleUserIds: [carol.id] });
 
 			await waitForPushToTl();
@@ -1088,7 +1089,7 @@ describe('Timelines', () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
 			await api('following/create', { userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote = await post(bob, { text: 'hi', visibility: 'followers' });
 
 			await waitForPushToTl();
@@ -1228,7 +1229,7 @@ describe('Timelines', () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
 			await api('mute/create', { userId: carol.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const carolNote = await post(carol, { text: 'hi' });
 			const bobNote = await post(bob, { text: 'hi', renoteId: carolNote.id });
 
@@ -1243,7 +1244,7 @@ describe('Timelines', () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
 
 			await api('mute/create', { userId: bob.id }, alice);
-			await sleep(1000);
+			await setTimeout(1000);
 			const bobNote1 = await post(bob, { text: 'hi' });
 			const bobNote2 = await post(bob, { text: 'hi', replyId: bobNote1.id });
 			const bobNote3 = await post(bob, { text: 'hi', renoteId: bobNote1.id });
diff --git a/packages/backend/test/unit/RoleService.ts b/packages/backend/test/unit/RoleService.ts
index 69fa4162fb..b6cbe4c520 100644
--- a/packages/backend/test/unit/RoleService.ts
+++ b/packages/backend/test/unit/RoleService.ts
@@ -5,6 +5,7 @@
 
 process.env.NODE_ENV = 'test';
 
+import { setTimeout } from 'node:timers/promises';
 import { jest } from '@jest/globals';
 import { ModuleMocker } from 'jest-mock';
 import { Test } from '@nestjs/testing';
@@ -29,7 +30,6 @@ import { secureRndstr } from '@/misc/secure-rndstr.js';
 import { NotificationService } from '@/core/NotificationService.js';
 import { RoleCondFormulaValue } from '@/models/Role.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
-import { sleep } from '../utils.js';
 import type { TestingModule } from '@nestjs/testing';
 import type { MockFunctionMetadata } from 'jest-mock';
 
@@ -278,7 +278,7 @@ describe('RoleService', () => {
 
 			// ストリーミング経由で反映されるまでちょっと待つ
 			clock.uninstall();
-			await sleep(100);
+			await setTimeout(100);
 
 			const resultAfter25hAgain = await roleService.getUserPolicies(user.id);
 			expect(resultAfter25hAgain.canManageCustomEmojis).toBe(true);
@@ -807,7 +807,7 @@ describe('RoleService', () => {
 			await roleService.assign(user.id, role.id);
 
 			clock.uninstall();
-			await sleep(100);
+			await setTimeout(100);
 
 			const assignments = await roleAssignmentsRepository.find({
 				where: {
@@ -835,7 +835,7 @@ describe('RoleService', () => {
 			await roleService.assign(user.id, role.id);
 
 			clock.uninstall();
-			await sleep(100);
+			await setTimeout(100);
 
 			const assignments = await roleAssignmentsRepository.find({
 				where: {
diff --git a/packages/backend/test/unit/SystemWebhookService.ts b/packages/backend/test/unit/SystemWebhookService.ts
index 41b7f977ca..790cd1490e 100644
--- a/packages/backend/test/unit/SystemWebhookService.ts
+++ b/packages/backend/test/unit/SystemWebhookService.ts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import { setTimeout } from 'node:timers/promises';
 import { afterEach, beforeEach, describe, expect, jest } from '@jest/globals';
 import { Test, TestingModule } from '@nestjs/testing';
 import { MiUser } from '@/models/User.js';
@@ -16,7 +17,7 @@ import { DI } from '@/di-symbols.js';
 import { QueueService } from '@/core/QueueService.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import { SystemWebhookService } from '@/core/SystemWebhookService.js';
-import { randomString, sleep } from '../utils.js';
+import { randomString } from '../utils.js';
 
 describe('SystemWebhookService', () => {
 	let app: TestingModule;
@@ -358,7 +359,7 @@ describe('SystemWebhookService', () => {
 					);
 
 					// redisでの配信経由で更新されるのでちょっと待つ
-					await sleep(500);
+					await setTimeout(500);
 
 					const fetchedWebhooks = await service.fetchActiveSystemWebhooks();
 					expect(fetchedWebhooks).toEqual([webhook]);
@@ -377,7 +378,7 @@ describe('SystemWebhookService', () => {
 					);
 
 					// redisでの配信経由で更新されるのでちょっと待つ
-					await sleep(500);
+					await setTimeout(500);
 
 					const fetchedWebhooks = await service.fetchActiveSystemWebhooks();
 					expect(fetchedWebhooks).toEqual([]);
@@ -407,7 +408,7 @@ describe('SystemWebhookService', () => {
 					);
 
 					// redisでの配信経由で更新されるのでちょっと待つ
-					await sleep(500);
+					await setTimeout(500);
 
 					const fetchedWebhooks = await service.fetchActiveSystemWebhooks();
 					expect(fetchedWebhooks).toEqual([webhook2]);
@@ -434,7 +435,7 @@ describe('SystemWebhookService', () => {
 					);
 
 					// redisでの配信経由で更新されるのでちょっと待つ
-					await sleep(500);
+					await setTimeout(500);
 
 					const fetchedWebhooks = await service.fetchActiveSystemWebhooks();
 					expect(fetchedWebhooks.length).toEqual(0);
@@ -457,7 +458,7 @@ describe('SystemWebhookService', () => {
 					);
 
 					// redisでの配信経由で更新されるのでちょっと待つ
-					await sleep(500);
+					await setTimeout(500);
 
 					const fetchedWebhooks = await service.fetchActiveSystemWebhooks();
 					expect(fetchedWebhooks).toEqual([webhook2]);
@@ -481,7 +482,7 @@ describe('SystemWebhookService', () => {
 					);
 
 					// redisでの配信経由で更新されるのでちょっと待つ
-					await sleep(500);
+					await setTimeout(500);
 
 					const fetchedWebhooks = await service.fetchActiveSystemWebhooks();
 					expect(fetchedWebhooks.length).toEqual(0);
@@ -504,7 +505,7 @@ describe('SystemWebhookService', () => {
 					);
 
 					// redisでの配信経由で更新されるのでちょっと待つ
-					await sleep(500);
+					await setTimeout(500);
 
 					const fetchedWebhooks = await service.fetchActiveSystemWebhooks();
 					expect(fetchedWebhooks.length).toEqual(0);
diff --git a/packages/backend/test/utils.ts b/packages/backend/test/utils.ts
index bf14d05eca..06c3f82601 100644
--- a/packages/backend/test/utils.ts
+++ b/packages/backend/test/utils.ts
@@ -605,14 +605,6 @@ export async function initTestDb(justBorrow = false, initEntities?: any[]) {
 	return db;
 }
 
-export function sleep(msec: number) {
-	return new Promise<void>(res => {
-		setTimeout(() => {
-			res();
-		}, msec);
-	});
-}
-
 export async function sendEnvUpdateRequest(params: { key: string, value?: string }) {
 	const res = await fetch(
 		`http://localhost:${port + 1000}/env`,

From 5d03efa1bb230bf1f22cf4a86a20157cd8aca7c4 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Wed, 3 Jul 2024 06:40:31 +0900
Subject: [PATCH 013/221] dev: fix pnpm dev is broken (#14123)

* dev: pnpm dev is broken

* dev: fix crash pnpm dev because of unhandled promise
---
 packages/backend/scripts/dev.mjs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/backend/scripts/dev.mjs b/packages/backend/scripts/dev.mjs
index 2d0de0f916..a3e0558abd 100644
--- a/packages/backend/scripts/dev.mjs
+++ b/packages/backend/scripts/dev.mjs
@@ -30,6 +30,7 @@ function execStart() {
 
 async function killProc() {
 	if (backendProcess) {
+		backendProcess.catch(() => {}); // backendProcess.kill()によって発生する例外を無視するためにcatch()を呼び出す
 		backendProcess.kill();
 		await new Promise(resolve => backendProcess.on('exit', resolve));
 		backendProcess = undefined;
@@ -46,6 +47,7 @@ async function killProc() {
 		],
 		{
 			stdio: [process.stdin, process.stdout, process.stderr, 'ipc'],
+			serialization: "json",
 		})
 		.on('message', async (message) => {
 			if (message.type === 'exit') {

From fab7d5e484d86dc8c24850dd98ebc1ee3688910e Mon Sep 17 00:00:00 2001
From: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
Date: Thu, 4 Jul 2024 12:33:43 +0900
Subject: [PATCH 014/221] fix(storybook): build skipping even after updating
 impl story files (#14124)

---
 packages/frontend/.storybook/changes.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/frontend/.storybook/changes.ts b/packages/frontend/.storybook/changes.ts
index 7c70972e1e..bc7601441c 100644
--- a/packages/frontend/.storybook/changes.ts
+++ b/packages/frontend/.storybook/changes.ts
@@ -47,7 +47,6 @@ await fs.readFile(
 				)
 			)
 			.map((path) => path.replace(/(?:(?<=\.stories)\.(?:impl|meta)|\.msw)(?=\.ts$)/g, ''))
-			.map((path) => (path.startsWith('.') ? path : `./${path}`))
 	);
 	if (
 		micromatch(Array.from(modules), [

From 6dd2e9fc0b1eeea6b5f04ccac93ccfab658f976d Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Thu, 4 Jul 2024 13:14:49 +0900
Subject: [PATCH 015/221] refactor(frontend): refactor popup api and make sure
 call dispose callback

Close #14122
---
 packages/frontend/src/account.ts              |  16 ++-
 packages/frontend/src/boot/main-boot.ts       |  30 +++--
 .../frontend/src/components/MkClickerGame.vue |   4 +-
 .../src/components/MkDrive.folder.vue         |   5 +-
 .../frontend/src/components/MkEmojiPicker.vue |   4 +-
 packages/frontend/src/components/MkLink.vue   |   6 +-
 packages/frontend/src/components/MkNote.vue   |  16 ++-
 .../src/components/MkNoteDetailed.vue         |  16 ++-
 .../frontend/src/components/MkPostForm.vue    |  13 +-
 .../src/components/MkPostFormAttaches.vue     |   5 +-
 packages/frontend/src/components/MkRange.vue  |  10 +-
 .../src/components/MkReactionIcon.vue         |   6 +-
 .../components/MkReactionsViewer.reaction.vue |  14 +-
 packages/frontend/src/components/MkSignin.vue |   5 +-
 .../components/MkSystemWebhookEditor.impl.ts  |   6 +-
 .../frontend/src/components/MkUrlPreview.vue  |   8 +-
 .../src/components/MkUserSetupDialog.vue      |   6 +-
 .../src/components/MkVisitorDashboard.vue     |  12 +-
 .../src/components/global/MkCustomEmoji.vue   |   4 +-
 .../frontend/src/components/global/MkUrl.vue  |   6 +-
 packages/frontend/src/directives/ripple.ts    |   4 +-
 packages/frontend/src/directives/tooltip.ts   |   6 +-
 .../frontend/src/directives/user-preview.ts   |   5 +-
 packages/frontend/src/os.ts                   | 125 ++++++++++--------
 packages/frontend/src/pages/admin-user.vue    |  12 +-
 .../abuse-report/notification-recipient.vue   |   6 +-
 .../src/pages/custom-emojis-manager.vue       |  10 +-
 .../frontend/src/pages/drive.file.info.vue    |   5 +-
 .../src/pages/drop-and-fusion.game.vue        |  14 +-
 packages/frontend/src/pages/emojis.emoji.vue  |   8 +-
 .../frontend/src/pages/reset-password.vue     |   4 +-
 packages/frontend/src/pages/settings/2fa.vue  |   6 +-
 .../frontend/src/pages/settings/accounts.vue  |  10 +-
 packages/frontend/src/pages/settings/api.vue  |   5 +-
 .../src/pages/settings/avatar-decoration.vue  |   5 +-
 .../src/scripts/get-drive-file-menu.ts        |   5 +-
 .../frontend/src/scripts/get-note-menu.ts     |  18 ++-
 .../frontend/src/scripts/get-user-menu.ts     |   6 +-
 .../frontend/src/scripts/install-plugin.ts    |   5 +-
 packages/frontend/src/scripts/please-login.ts |   5 +-
 .../frontend/src/scripts/use-chart-tooltip.ts |  10 +-
 packages/frontend/src/ui/_common_/common.ts   |   4 +-
 .../src/ui/_common_/navbar-for-mobile.vue     |   5 +-
 packages/frontend/src/ui/_common_/navbar.vue  |   5 +-
 packages/frontend/src/ui/classic.header.vue   |   5 +-
 packages/frontend/src/ui/classic.sidebar.vue  |   6 +-
 .../src/ui/deck/notifications-column.vue      |   5 +-
 packages/frontend/src/ui/visitor.vue          |  12 +-
 .../src/widgets/WidgetNotifications.vue       |   5 +-
 49 files changed, 317 insertions(+), 196 deletions(-)

diff --git a/packages/frontend/src/account.ts b/packages/frontend/src/account.ts
index f99b550a83..4172016f89 100644
--- a/packages/frontend/src/account.ts
+++ b/packages/frontend/src/account.ts
@@ -184,10 +184,12 @@ export async function refreshAccount() {
 
 export async function login(token: Account['token'], redirect?: string) {
 	const showing = ref(true);
-	popup(defineAsyncComponent(() => import('@/components/MkWaitingDialog.vue')), {
+	const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkWaitingDialog.vue')), {
 		success: false,
 		showing: showing,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 	if (_DEV_) console.log('logging as token ', token);
 	const me = await fetchAccount(token, undefined, true)
 		.catch(reason => {
@@ -223,21 +225,23 @@ export async function openAccountMenu(opts: {
 	if (!$i) return;
 
 	function showSigninDialog() {
-		popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {}, {
+		const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {}, {
 			done: res => {
 				addAccount(res.id, res.i);
 				success();
 			},
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	}
 
 	function createAccount() {
-		popup(defineAsyncComponent(() => import('@/components/MkSignupDialog.vue')), {}, {
+		const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSignupDialog.vue')), {}, {
 			done: res => {
 				addAccount(res.id, res.i);
 				switchAccountWithToken(res.i);
 			},
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	}
 
 	async function switchAccount(account: Misskey.entities.UserDetailed) {
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index 5cb19f388a..faf230a1a2 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -35,7 +35,9 @@ export async function mainBoot() {
 	emojiPicker.init();
 
 	if (isClientUpdated && $i) {
-		popup(defineAsyncComponent(() => import('@/components/MkUpdated.vue')), {}, {}, 'closed');
+		const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkUpdated.vue')), {}, {
+			closed: () => dispose(),
+		});
 	}
 
 	const stream = useStream();
@@ -96,7 +98,7 @@ export async function mainBoot() {
 					}).render();
 				}
 			}
-		}	
+		}
 	} catch (error) {
 		// console.error(error);
 		console.error('Failed to initialise the seasonal screen effect canvas context:', error);
@@ -108,22 +110,28 @@ export async function mainBoot() {
 
 		defaultStore.loaded.then(() => {
 			if (defaultStore.state.accountSetupWizard !== -1) {
-				popup(defineAsyncComponent(() => import('@/components/MkUserSetupDialog.vue')), {}, {}, 'closed');
+				const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkUserSetupDialog.vue')), {}, {
+					closed: () => dispose(),
+				});
 			}
 		});
 
 		for (const announcement of ($i.unreadAnnouncements ?? []).filter(x => x.display === 'dialog')) {
-			popup(defineAsyncComponent(() => import('@/components/MkAnnouncementDialog.vue')), {
+			const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkAnnouncementDialog.vue')), {
 				announcement,
-			}, {}, 'closed');
+			}, {
+				closed: () => dispose(),
+			});
 		}
 
 		stream.on('announcementCreated', (ev) => {
 			const announcement = ev.announcement;
 			if (announcement.display === 'dialog') {
-				popup(defineAsyncComponent(() => import('@/components/MkAnnouncementDialog.vue')), {
+				const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkAnnouncementDialog.vue')), {
 					announcement,
-				}, {}, 'closed');
+				}, {
+					closed: () => dispose(),
+				});
 			}
 		});
 
@@ -247,13 +255,17 @@ export async function mainBoot() {
 		const neverShowDonationInfo = miLocalStorage.getItem('neverShowDonationInfo');
 		if (neverShowDonationInfo !== 'true' && (createdAt.getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 3))) && !location.pathname.startsWith('/miauth')) {
 			if (latestDonationInfoShownAt == null || (new Date(latestDonationInfoShownAt).getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 30)))) {
-				popup(defineAsyncComponent(() => import('@/components/MkDonation.vue')), {}, {}, 'closed');
+				const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkDonation.vue')), {}, {
+					closed: () => dispose(),
+				});
 			}
 		}
 
 		const modifiedVersionMustProminentlyOfferInAgplV3Section13Read = miLocalStorage.getItem('modifiedVersionMustProminentlyOfferInAgplV3Section13Read');
 		if (modifiedVersionMustProminentlyOfferInAgplV3Section13Read !== 'true' && instance.repositoryUrl !== 'https://github.com/misskey-dev/misskey') {
-			popup(defineAsyncComponent(() => import('@/components/MkSourceCodeAvailablePopup.vue')), {}, {}, 'closed');
+			const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSourceCodeAvailablePopup.vue')), {}, {
+				closed: () => dispose(),
+			});
 		}
 
 		if ('Notification' in window) {
diff --git a/packages/frontend/src/components/MkClickerGame.vue b/packages/frontend/src/components/MkClickerGame.vue
index b592609e18..00506fb735 100644
--- a/packages/frontend/src/components/MkClickerGame.vue
+++ b/packages/frontend/src/components/MkClickerGame.vue
@@ -35,7 +35,9 @@ const prevCookies = ref(0);
 function onClick(ev: MouseEvent) {
 	const x = ev.clientX;
 	const y = ev.clientY;
-	os.popup(MkPlusOneEffect, { x, y }, {}, 'end');
+	const { dispose } = os.popup(MkPlusOneEffect, { x, y }, {
+		end: () => dispose(),
+	});
 
 	saveData.value!.cookies++;
 	saveData.value!.totalCookies++;
diff --git a/packages/frontend/src/components/MkDrive.folder.vue b/packages/frontend/src/components/MkDrive.folder.vue
index 8da0d78f35..1cc8b15b73 100644
--- a/packages/frontend/src/components/MkDrive.folder.vue
+++ b/packages/frontend/src/components/MkDrive.folder.vue
@@ -257,10 +257,11 @@ function onContextmenu(ev: MouseEvent) {
 		text: i18n.ts.openInWindow,
 		icon: 'ti ti-app-window',
 		action: () => {
-			os.popup(defineAsyncComponent(() => import('@/components/MkDriveWindow.vue')), {
+			const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkDriveWindow.vue')), {
 				initialFolder: props.folder,
 			}, {
-			}, 'closed');
+				closed: () => dispose(),
+			});
 		},
 	}, { type: 'divider' }, {
 		text: i18n.ts.rename,
diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue
index 8a6bef54d8..4bd4bee1e5 100644
--- a/packages/frontend/src/components/MkEmojiPicker.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -402,7 +402,9 @@ function chosen(emoji: any, ev?: MouseEvent) {
 		const rect = el.getBoundingClientRect();
 		const x = rect.left + (el.offsetWidth / 2);
 		const y = rect.top + (el.offsetHeight / 2);
-		os.popup(MkRippleEffect, { x, y }, {}, 'end');
+		const { dispose } = os.popup(MkRippleEffect, { x, y }, {
+			end: () => dispose(),
+		});
 	}
 
 	const key = getKey(emoji);
diff --git a/packages/frontend/src/components/MkLink.vue b/packages/frontend/src/components/MkLink.vue
index 5d54a58e97..e842ec2d6e 100644
--- a/packages/frontend/src/components/MkLink.vue
+++ b/packages/frontend/src/components/MkLink.vue
@@ -37,11 +37,13 @@ const el = ref<HTMLElement | { $el: HTMLElement }>();
 
 if (isEnabledUrlPreview.value) {
 	useTooltip(el, (showing) => {
-		os.popup(defineAsyncComponent(() => import('@/components/MkUrlPreviewPopup.vue')), {
+		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkUrlPreviewPopup.vue')), {
 			showing,
 			url: props.url,
 			source: el.value instanceof HTMLElement ? el.value : el.value?.$el,
-		}, {}, 'closed');
+		}, {
+			closed: () => dispose(),
+		});
 	});
 }
 </script>
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 22b1691a86..1313e4c58e 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -335,12 +335,14 @@ if (!props.mock) {
 
 		if (users.length < 1) return;
 
-		os.popup(MkUsersTooltip, {
+		const { dispose } = os.popup(MkUsersTooltip, {
 			showing,
 			users,
 			count: appearNote.value.renoteCount,
 			targetElement: renoteButton.value,
-		}, {}, 'closed');
+		}, {
+			closed: () => dispose(),
+		});
 	});
 
 	if (appearNote.value.reactionAcceptance === 'likeOnly') {
@@ -355,13 +357,15 @@ if (!props.mock) {
 
 			if (users.length < 1) return;
 
-			os.popup(MkReactionsViewerDetails, {
+			const { dispose } = os.popup(MkReactionsViewerDetails, {
 				showing,
 				reaction: '❤️',
 				users,
 				count: appearNote.value.reactionCount,
 				targetElement: reactButton.value!,
-			}, {}, 'closed');
+			}, {
+				closed: () => dispose(),
+			});
 		});
 	}
 }
@@ -409,7 +413,9 @@ function react(viaKeyboard = false): void {
 			const rect = el.getBoundingClientRect();
 			const x = rect.left + (el.offsetWidth / 2);
 			const y = rect.top + (el.offsetHeight / 2);
-			os.popup(MkRippleEffect, { x, y }, {}, 'end');
+			const { dispose } = os.popup(MkRippleEffect, { x, y }, {
+				end: () => dispose(),
+			});
 		}
 	} else {
 		blur();
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index ed1c0a9e96..bc1f416373 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -346,12 +346,14 @@ useTooltip(renoteButton, async (showing) => {
 
 	if (users.length < 1) return;
 
-	os.popup(MkUsersTooltip, {
+	const { dispose } = os.popup(MkUsersTooltip, {
 		showing,
 		users,
 		count: appearNote.value.renoteCount,
 		targetElement: renoteButton.value,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 });
 
 if (appearNote.value.reactionAcceptance === 'likeOnly') {
@@ -366,13 +368,15 @@ if (appearNote.value.reactionAcceptance === 'likeOnly') {
 
 		if (users.length < 1) return;
 
-		os.popup(MkReactionsViewerDetails, {
+		const { dispose } = os.popup(MkReactionsViewerDetails, {
 			showing,
 			reaction: '❤️',
 			users,
 			count: appearNote.value.reactionCount,
 			targetElement: reactButton.value!,
-		}, {}, 'closed');
+		}, {
+			closed: () => dispose(),
+		});
 	});
 }
 
@@ -413,7 +417,9 @@ function react(viaKeyboard = false): void {
 			const rect = el.getBoundingClientRect();
 			const x = rect.left + (el.offsetWidth / 2);
 			const y = rect.top + (el.offsetHeight / 2);
-			os.popup(MkRippleEffect, { x, y }, {}, 'end');
+			const { dispose } = os.popup(MkRippleEffect, { x, y }, {
+				end: () => dispose(),
+			});
 		}
 	} else {
 		blur();
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 1df9007681..0dc1aa0891 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -463,7 +463,7 @@ function setVisibility() {
 		return;
 	}
 
-	os.popup(defineAsyncComponent(() => import('@/components/MkVisibilityPicker.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkVisibilityPicker.vue')), {
 		currentVisibility: visibility.value,
 		isSilenced: $i.isSilenced,
 		localOnly: localOnly.value,
@@ -476,7 +476,8 @@ function setVisibility() {
 				defaultStore.set('visibility', visibility.value);
 			}
 		},
-	}, 'closed');
+		closed: () => dispose(),
+	});
 }
 
 async function toggleLocalOnly() {
@@ -624,8 +625,8 @@ async function onPaste(ev: ClipboardEvent) {
 				return;
 			}
 
-			const fileName = formatTimeString(new Date(), defaultStore.state.pastedFileName).replace(/{{number}}/g, "0");
-			const file = new File([paste], `${fileName}.txt`, { type: "text/plain" });
+			const fileName = formatTimeString(new Date(), defaultStore.state.pastedFileName).replace(/{{number}}/g, '0');
+			const file = new File([paste], `${fileName}.txt`, { type: 'text/plain' });
 			upload(file, `${fileName}.txt`);
 		});
 	}
@@ -731,7 +732,9 @@ async function post(ev?: MouseEvent) {
 			const rect = el.getBoundingClientRect();
 			const x = rect.left + (el.offsetWidth / 2);
 			const y = rect.top + (el.offsetHeight / 2);
-			os.popup(MkRippleEffect, { x, y }, {}, 'end');
+			const { dispose } = os.popup(MkRippleEffect, { x, y }, {
+				end: () => dispose(),
+			});
 		}
 	}
 
diff --git a/packages/frontend/src/components/MkPostFormAttaches.vue b/packages/frontend/src/components/MkPostFormAttaches.vue
index 95eb367318..8854babb6b 100644
--- a/packages/frontend/src/components/MkPostFormAttaches.vue
+++ b/packages/frontend/src/components/MkPostFormAttaches.vue
@@ -108,7 +108,7 @@ async function rename(file) {
 async function describe(file) {
 	if (mock) return;
 
-	os.popup(defineAsyncComponent(() => import('@/components/MkFileCaptionEditWindow.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkFileCaptionEditWindow.vue')), {
 		default: file.comment !== null ? file.comment : '',
 		file: file,
 	}, {
@@ -121,7 +121,8 @@ async function describe(file) {
 				file.comment = comment;
 			});
 		},
-	}, 'closed');
+		closed: () => dispose(),
+	});
 }
 
 async function crop(file: Misskey.entities.DriveFile): Promise<void> {
diff --git a/packages/frontend/src/components/MkRange.vue b/packages/frontend/src/components/MkRange.vue
index 15f8128e98..1eae642937 100644
--- a/packages/frontend/src/components/MkRange.vue
+++ b/packages/frontend/src/components/MkRange.vue
@@ -101,17 +101,19 @@ const steps = computed(() => {
 	}
 });
 
-const onMousedown = (ev: MouseEvent | TouchEvent) => {
+function onMousedown(ev: MouseEvent | TouchEvent) {
 	ev.preventDefault();
 
 	const tooltipShowing = ref(true);
-	os.popup(defineAsyncComponent(() => import('@/components/MkTooltip.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkTooltip.vue')), {
 		showing: tooltipShowing,
 		text: computed(() => {
 			return props.textConverter(finalValue.value);
 		}),
 		targetElement: thumbEl,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 
 	const style = document.createElement('style');
 	style.appendChild(document.createTextNode('* { cursor: grabbing !important; } body * { pointer-events: none !important; }'));
@@ -152,7 +154,7 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => {
 	window.addEventListener('touchmove', onDrag);
 	window.addEventListener('mouseup', onMouseup, { once: true });
 	window.addEventListener('touchend', onMouseup, { once: true });
-};
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/frontend/src/components/MkReactionIcon.vue b/packages/frontend/src/components/MkReactionIcon.vue
index 068a2968db..c0cbd8a65d 100644
--- a/packages/frontend/src/components/MkReactionIcon.vue
+++ b/packages/frontend/src/components/MkReactionIcon.vue
@@ -24,11 +24,13 @@ const elRef = shallowRef();
 
 if (props.withTooltip) {
 	useTooltip(elRef, (showing) => {
-		os.popup(defineAsyncComponent(() => import('@/components/MkReactionTooltip.vue')), {
+		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkReactionTooltip.vue')), {
 			showing,
 			reaction: props.reaction.replace(/^:(\w+):$/, ':$1@.:'),
 			targetElement: elRef.value.$el,
-		}, {}, 'closed');
+		}, {
+			closed: () => dispose(),
+		});
 	});
 }
 </script>
diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index c41811febe..26223364ab 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -114,10 +114,12 @@ async function menu(ev) {
 		text: i18n.ts.info,
 		icon: 'ti ti-info-circle',
 		action: async () => {
-			os.popup(MkCustomEmojiDetailedDialog, {
+			const { dispose } = os.popup(MkCustomEmojiDetailedDialog, {
 				emoji: await misskeyApiGet('emoji', {
 					name: props.reaction.replace(/:/g, '').replace(/@\./, ''),
 				}),
+			}, {
+				closed: () => dispose(),
 			});
 		},
 	}], ev.currentTarget ?? ev.target);
@@ -129,7 +131,9 @@ function anime() {
 	const rect = buttonEl.value.getBoundingClientRect();
 	const x = rect.left + 16;
 	const y = rect.top + (buttonEl.value.offsetHeight / 2);
-	os.popup(MkReactionEffect, { reaction: props.reaction, x, y }, {}, 'end');
+	const { dispose } = os.popup(MkReactionEffect, { reaction: props.reaction, x, y }, {
+		end: () => dispose(),
+	});
 }
 
 watch(() => props.count, (newCount, oldCount) => {
@@ -151,13 +155,15 @@ if (!mock) {
 
 		const users = reactions.map(x => x.user);
 
-		os.popup(XDetails, {
+		const { dispose } = os.popup(XDetails, {
 			showing,
 			reaction: props.reaction,
 			users,
 			count: props.count,
 			targetElement: buttonEl.value,
-		}, {}, 'closed');
+		}, {
+			closed: () => dispose(),
+		});
 	}, 100);
 }
 </script>
diff --git a/packages/frontend/src/components/MkSignin.vue b/packages/frontend/src/components/MkSignin.vue
index 970aff825d..db32cdd6a1 100644
--- a/packages/frontend/src/components/MkSignin.vue
+++ b/packages/frontend/src/components/MkSignin.vue
@@ -218,8 +218,9 @@ function loginFailed(err: any): void {
 }
 
 function resetPassword(): void {
-	os.popup(defineAsyncComponent(() => import('@/components/MkForgotPassword.vue')), {}, {
-	}, 'closed');
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkForgotPassword.vue')), {}, {
+		closed: () => dispose(),
+	});
 }
 </script>
 
diff --git a/packages/frontend/src/components/MkSystemWebhookEditor.impl.ts b/packages/frontend/src/components/MkSystemWebhookEditor.impl.ts
index 1222d3261d..76f54e8d37 100644
--- a/packages/frontend/src/components/MkSystemWebhookEditor.impl.ts
+++ b/packages/frontend/src/components/MkSystemWebhookEditor.impl.ts
@@ -25,15 +25,15 @@ export type MkSystemWebhookResult = {
 
 export async function showSystemWebhookEditorDialog(props: MkSystemWebhookEditorProps): Promise<MkSystemWebhookResult | null> {
 	const { dispose, result } = await new Promise<{ dispose: () => void, result: MkSystemWebhookResult | null }>(async resolve => {
-		const res = await os.popup(
+		const { dispose: _dispose } = os.popup(
 			defineAsyncComponent(() => import('@/components/MkSystemWebhookEditor.vue')),
 			props,
 			{
 				submitted: (ev: MkSystemWebhookResult) => {
-					resolve({ dispose: res.dispose, result: ev });
+					resolve({ dispose: _dispose, result: ev });
 				},
 				closed: () => {
-					resolve({ dispose: res.dispose, result: null });
+					resolve({ dispose: _dispose, result: null });
 				},
 			},
 		);
diff --git a/packages/frontend/src/components/MkUrlPreview.vue b/packages/frontend/src/components/MkUrlPreview.vue
index 6954f1f6ff..8df5e0fe40 100644
--- a/packages/frontend/src/components/MkUrlPreview.vue
+++ b/packages/frontend/src/components/MkUrlPreview.vue
@@ -188,11 +188,13 @@ function adjustTweetHeight(message: any) {
 	if (height) tweetHeight.value = height;
 }
 
-const openPlayer = (): void => {
-	os.popup(defineAsyncComponent(() => import('@/components/MkYouTubePlayer.vue')), {
+function openPlayer(): void {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkYouTubePlayer.vue')), {
 		url: requestUrl.href,
+	}, {
+		// TODO
 	});
-};
+}
 
 (window as any).addEventListener('message', adjustTweetHeight);
 
diff --git a/packages/frontend/src/components/MkUserSetupDialog.vue b/packages/frontend/src/components/MkUserSetupDialog.vue
index cab0067813..514350c930 100644
--- a/packages/frontend/src/components/MkUserSetupDialog.vue
+++ b/packages/frontend/src/components/MkUserSetupDialog.vue
@@ -176,9 +176,11 @@ function setupComplete() {
 function launchTutorial() {
 	setupComplete();
 	nextTick(() => {
-		os.popup(defineAsyncComponent(() => import('@/components/MkTutorialDialog.vue')), {
+		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkTutorialDialog.vue')), {
 			initialPage: 1,
-		}, {}, 'closed');
+		}, {
+			closed: () => dispose(),
+		});
 	});
 }
 
diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue
index f7963f9938..4d81bd0283 100644
--- a/packages/frontend/src/components/MkVisitorDashboard.vue
+++ b/packages/frontend/src/components/MkVisitorDashboard.vue
@@ -74,15 +74,19 @@ misskeyApi('stats', {}).then((res) => {
 });
 
 function signin() {
-	os.popup(XSigninDialog, {
+	const { dispose } = os.popup(XSigninDialog, {
 		autoSet: true,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 }
 
 function signup() {
-	os.popup(XSignupDialog, {
+	const { dispose } = os.popup(XSignupDialog, {
 		autoSet: true,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 }
 
 function showMenu(ev) {
diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue
index 6123835340..4581908a8a 100644
--- a/packages/frontend/src/components/global/MkCustomEmoji.vue
+++ b/packages/frontend/src/components/global/MkCustomEmoji.vue
@@ -106,12 +106,12 @@ function onClick(ev: MouseEvent) {
 			text: i18n.ts.info,
 			icon: 'ti ti-info-circle',
 			action: async () => {
-				os.popup(MkCustomEmojiDetailedDialog, {
+				const { dispose } = os.popup(MkCustomEmojiDetailedDialog, {
 					emoji: await misskeyApiGet('emoji', {
 						name: customEmojiName.value,
 					}),
 				}, {
-					anchor: ev.target,
+					closed: () => dispose(),
 				});
 			},
 		}], ev.currentTarget ?? ev.target);
diff --git a/packages/frontend/src/components/global/MkUrl.vue b/packages/frontend/src/components/global/MkUrl.vue
index 9d4cd559d9..d2ddd4aa85 100644
--- a/packages/frontend/src/components/global/MkUrl.vue
+++ b/packages/frontend/src/components/global/MkUrl.vue
@@ -50,11 +50,13 @@ const el = ref();
 
 if (props.showUrlPreview && isEnabledUrlPreview.value) {
 	useTooltip(el, (showing) => {
-		os.popup(defineAsyncComponent(() => import('@/components/MkUrlPreviewPopup.vue')), {
+		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkUrlPreviewPopup.vue')), {
 			showing,
 			url: props.url,
 			source: el.value instanceof HTMLElement ? el.value : el.value?.$el,
-		}, {}, 'closed');
+		}, {
+			closed: () => dispose(),
+		});
 	});
 }
 
diff --git a/packages/frontend/src/directives/ripple.ts b/packages/frontend/src/directives/ripple.ts
index 2d724f771e..a043ff212d 100644
--- a/packages/frontend/src/directives/ripple.ts
+++ b/packages/frontend/src/directives/ripple.ts
@@ -17,7 +17,9 @@ export default {
 			const x = rect.left + (el.offsetWidth / 2);
 			const y = rect.top + (el.offsetHeight / 2);
 
-			popup(MkRippleEffect, { x, y }, {}, 'end');
+			const { dispose } = popup(MkRippleEffect, { x, y }, {
+				end: () => dispose(),
+			});
 		});
 	},
 };
diff --git a/packages/frontend/src/directives/tooltip.ts b/packages/frontend/src/directives/tooltip.ts
index b1c1b19907..251ce5675f 100644
--- a/packages/frontend/src/directives/tooltip.ts
+++ b/packages/frontend/src/directives/tooltip.ts
@@ -51,13 +51,15 @@ export default {
 			if (self.text == null) return;
 
 			const showing = ref(true);
-			popup(defineAsyncComponent(() => import('@/components/MkTooltip.vue')), {
+			const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkTooltip.vue')), {
 				showing,
 				text: self.text,
 				asMfm: binding.modifiers.mfm,
 				direction: binding.modifiers.left ? 'left' : binding.modifiers.right ? 'right' : binding.modifiers.top ? 'top' : binding.modifiers.bottom ? 'bottom' : 'top',
 				targetElement: el,
-			}, {}, 'closed');
+			}, {
+				closed: () => dispose(),
+			});
 
 			self._close = () => {
 				showing.value = false;
diff --git a/packages/frontend/src/directives/user-preview.ts b/packages/frontend/src/directives/user-preview.ts
index 7a008a4486..278d842d09 100644
--- a/packages/frontend/src/directives/user-preview.ts
+++ b/packages/frontend/src/directives/user-preview.ts
@@ -35,7 +35,7 @@ export class UserPreview {
 
 		const showing = ref(true);
 
-		popup(defineAsyncComponent(() => import('@/components/MkUserPopup.vue')), {
+		const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkUserPopup.vue')), {
 			showing,
 			q: this.user,
 			source: this.el,
@@ -47,7 +47,8 @@ export class UserPreview {
 				window.clearTimeout(this.showTimer);
 				this.hideTimer = window.setTimeout(this.close, 500);
 			},
-		}, 'closed');
+			closed: () => dispose(),
+		});
 
 		this.promise = {
 			cancel: () => {
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index f656a52371..560f692acf 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -116,11 +116,13 @@ export function promiseDialog<T extends Promise<any>>(
 	});
 
 	// NOTE: dynamic importすると挙動がおかしくなる(showingの変更が伝播しない)
-	popup(MkWaitingDialog, {
+	const { dispose } = popup(MkWaitingDialog, {
 		success: success,
 		showing: showing,
 		text: text,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 
 	return promise;
 }
@@ -166,28 +168,24 @@ type EmitsExtractor<T> = {
 	[K in keyof T as K extends `onVnode${string}` ? never : K extends `on${infer E}` ? Uncapitalize<E> : K extends string ? never : K]: T[K];
 };
 
-export async function popup<T extends Component>(
+export function popup<T extends Component>(
 	component: T,
 	props: ComponentProps<T>,
 	events: ComponentEmit<T> = {} as ComponentEmit<T>,
-	disposeEvent?: keyof ComponentEmit<T>,
-): Promise<{ dispose: () => void }> {
+): { dispose: () => void } {
 	markRaw(component);
 
 	const id = ++popupIdCount;
 	const dispose = () => {
 		// このsetTimeoutが無いと挙動がおかしくなる(autocompleteが閉じなくなる)。Vueのバグ？
 		window.setTimeout(() => {
-			popups.value = popups.value.filter(popup => popup.id !== id);
+			popups.value = popups.value.filter(p => p.id !== id);
 		}, 0);
 	};
 	const state = {
 		component,
 		props,
-		events: disposeEvent ? {
-			...events,
-			[disposeEvent]: dispose,
-		} : events,
+		events,
 		id,
 	};
 
@@ -199,15 +197,19 @@ export async function popup<T extends Component>(
 }
 
 export function pageWindow(path: string) {
-	popup(MkPageWindow, {
+	const { dispose } = popup(MkPageWindow, {
 		initialPath: path,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 }
 
 export function toast(message: string) {
-	popup(MkToast, {
+	const { dispose } = popup(MkToast, {
 		message,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 }
 
 export function alert(props: {
@@ -216,11 +218,12 @@ export function alert(props: {
 	text?: string;
 }): Promise<void> {
 	return new Promise(resolve => {
-		popup(MkDialog, props, {
+		const { dispose } = popup(MkDialog, props, {
 			done: () => {
 				resolve();
 			},
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	});
 }
 
@@ -232,14 +235,15 @@ export function confirm(props: {
 	cancelText?: string;
 }): Promise<{ canceled: boolean }> {
 	return new Promise(resolve => {
-		popup(MkDialog, {
+		const { dispose } = popup(MkDialog, {
 			...props,
 			showCancelButton: true,
 		}, {
 			done: result => {
 				resolve(result ? result : { canceled: true });
 			},
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	});
 }
 
@@ -261,7 +265,7 @@ export function actions<T extends {
 	canceled: false; result: T[number]['value'];
 }> {
 	return new Promise(resolve => {
-		popup(MkDialog, {
+		const { dispose } = popup(MkDialog, {
 			...props,
 			actions: props.actions.map(a => ({
 				text: a.text,
@@ -275,7 +279,8 @@ export function actions<T extends {
 			done: result => {
 				resolve(result ? result : { canceled: true });
 			},
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	});
 }
 
@@ -323,7 +328,7 @@ export function inputText(props: {
 	canceled: false; result: string | null;
 }> {
 	return new Promise(resolve => {
-		popup(MkDialog, {
+		const { dispose } = popup(MkDialog, {
 			title: props.title,
 			text: props.text,
 			input: {
@@ -338,7 +343,8 @@ export function inputText(props: {
 			done: result => {
 				resolve(result ? result : { canceled: true });
 			},
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	});
 }
 
@@ -377,7 +383,7 @@ export function inputNumber(props: {
 	canceled: false; result: number | null;
 }> {
 	return new Promise(resolve => {
-		popup(MkDialog, {
+		const { dispose } = popup(MkDialog, {
 			title: props.title,
 			text: props.text,
 			input: {
@@ -390,7 +396,8 @@ export function inputNumber(props: {
 			done: result => {
 				resolve(result ? result : { canceled: true });
 			},
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	});
 }
 
@@ -405,7 +412,7 @@ export function inputDate(props: {
 	canceled: false; result: Date;
 }> {
 	return new Promise(resolve => {
-		popup(MkDialog, {
+		const { dispose } = popup(MkDialog, {
 			title: props.title,
 			text: props.text,
 			input: {
@@ -417,7 +424,8 @@ export function inputDate(props: {
 			done: result => {
 				resolve(result ? { result: new Date(result.result), canceled: false } : { result: undefined, canceled: true });
 			},
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	});
 }
 
@@ -427,11 +435,12 @@ export function authenticateDialog(): Promise<{
 	canceled: false; result: { password: string; token: string | null; };
 }> {
 	return new Promise(resolve => {
-		popup(MkPasswordDialog, {}, {
+		const { dispose } = popup(MkPasswordDialog, {}, {
 			done: result => {
 				resolve(result ? { canceled: false, result } : { canceled: true, result: undefined });
 			},
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	});
 }
 
@@ -476,7 +485,7 @@ export function select<C = any>(props: {
 	canceled: false; result: C | null;
 }> {
 	return new Promise(resolve => {
-		popup(MkDialog, {
+		const { dispose } = popup(MkDialog, {
 			title: props.title,
 			text: props.text,
 			select: {
@@ -487,7 +496,8 @@ export function select<C = any>(props: {
 			done: result => {
 				resolve(result ? result : { canceled: true });
 			},
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	});
 }
 
@@ -497,53 +507,57 @@ export function success(): Promise<void> {
 		window.setTimeout(() => {
 			showing.value = false;
 		}, 1000);
-		popup(MkWaitingDialog, {
+		const { dispose } = popup(MkWaitingDialog, {
 			success: true,
 			showing: showing,
 		}, {
 			done: () => resolve(),
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	});
 }
 
 export function waiting(): Promise<void> {
 	return new Promise(resolve => {
 		const showing = ref(true);
-		popup(MkWaitingDialog, {
+		const { dispose } = popup(MkWaitingDialog, {
 			success: false,
 			showing: showing,
 		}, {
 			done: () => resolve(),
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	});
 }
 
 export function form<F extends Form>(title: string, f: F): Promise<{ canceled: true, result?: undefined } | { canceled?: false, result: GetFormResultType<F> }> {
 	return new Promise(resolve => {
-		popup(defineAsyncComponent(() => import('@/components/MkFormDialog.vue')), { title, form: f }, {
+		const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkFormDialog.vue')), { title, form: f }, {
 			done: result => {
 				resolve(result);
 			},
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	});
 }
 
 export async function selectUser(opts: { includeSelf?: boolean; localOnly?: boolean; } = {}): Promise<Misskey.entities.UserDetailed> {
 	return new Promise(resolve => {
-		popup(defineAsyncComponent(() => import('@/components/MkUserSelectDialog.vue')), {
+		const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkUserSelectDialog.vue')), {
 			includeSelf: opts.includeSelf,
 			localOnly: opts.localOnly,
 		}, {
 			ok: user => {
 				resolve(user);
 			},
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	});
 }
 
 export async function selectDriveFile(multiple: boolean): Promise<Misskey.entities.DriveFile[]> {
 	return new Promise(resolve => {
-		popup(defineAsyncComponent(() => import('@/components/MkDriveSelectDialog.vue')), {
+		const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkDriveSelectDialog.vue')), {
 			type: 'file',
 			multiple,
 		}, {
@@ -552,13 +566,14 @@ export async function selectDriveFile(multiple: boolean): Promise<Misskey.entiti
 					resolve(files);
 				}
 			},
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	});
 }
 
 export async function selectDriveFolder(multiple: boolean): Promise<Misskey.entities.DriveFolder[]> {
 	return new Promise(resolve => {
-		popup(defineAsyncComponent(() => import('@/components/MkDriveSelectDialog.vue')), {
+		const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkDriveSelectDialog.vue')), {
 			type: 'folder',
 			multiple,
 		}, {
@@ -567,20 +582,22 @@ export async function selectDriveFolder(multiple: boolean): Promise<Misskey.enti
 					resolve(folders);
 				}
 			},
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	});
 }
 
 export async function pickEmoji(src: HTMLElement, opts: ComponentProps<typeof MkEmojiPickerDialog>): Promise<string> {
 	return new Promise(resolve => {
-		popup(MkEmojiPickerDialog, {
+		const { dispose } = popup(MkEmojiPickerDialog, {
 			src,
 			...opts,
 		}, {
 			done: emoji => {
 				resolve(emoji);
 			},
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	});
 }
 
@@ -589,7 +606,7 @@ export async function cropImage(image: Misskey.entities.DriveFile, options: {
 	uploadFolder?: string | null;
 }): Promise<Misskey.entities.DriveFile> {
 	return new Promise(resolve => {
-		popup(defineAsyncComponent(() => import('@/components/MkCropperDialog.vue')), {
+		const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkCropperDialog.vue')), {
 			file: image,
 			aspectRatio: options.aspectRatio,
 			uploadFolder: options.uploadFolder,
@@ -597,7 +614,8 @@ export async function cropImage(image: Misskey.entities.DriveFile, options: {
 			ok: x => {
 				resolve(x);
 			},
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	});
 }
 
@@ -608,8 +626,7 @@ export function popupMenu(items: MenuItem[], src?: HTMLElement | EventTarget | n
 	onClosing?: () => void;
 }): Promise<void> {
 	return new Promise(resolve => {
-		let dispose;
-		popup(MkPopupMenu, {
+		const { dispose } = popup(MkPopupMenu, {
 			items,
 			src,
 			width: options?.width,
@@ -623,8 +640,6 @@ export function popupMenu(items: MenuItem[], src?: HTMLElement | EventTarget | n
 			closing: () => {
 				if (options?.onClosing) options.onClosing();
 			},
-		}).then(res => {
-			dispose = res.dispose;
 		});
 	});
 }
@@ -632,8 +647,7 @@ export function popupMenu(items: MenuItem[], src?: HTMLElement | EventTarget | n
 export function contextMenu(items: MenuItem[], ev: MouseEvent): Promise<void> {
 	ev.preventDefault();
 	return new Promise(resolve => {
-		let dispose;
-		popup(MkContextMenu, {
+		const { dispose } = popup(MkContextMenu, {
 			items,
 			ev,
 		}, {
@@ -641,8 +655,6 @@ export function contextMenu(items: MenuItem[], ev: MouseEvent): Promise<void> {
 				resolve();
 				dispose();
 			},
-		}).then(res => {
-			dispose = res.dispose;
 		});
 	});
 }
@@ -656,14 +668,11 @@ export function post(props: Record<string, any> = {}): Promise<void> {
 		//       Vueが渡されたコンポーネントに内部的に__propsというプロパティを生やす影響で、
 		//       複数のpost formを開いたときに場合によってはエラーになる
 		//       もちろん複数のpost formを開けること自体Misskeyサイドのバグなのだが
-		let dispose;
-		popup(MkPostFormDialog, props, {
+		const { dispose } = popup(MkPostFormDialog, props, {
 			closed: () => {
 				resolve();
 				dispose();
 			},
-		}).then(res => {
-			dispose = res.dispose;
 		});
 	});
 }
diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue
index f57aa51b5b..1459997dcb 100644
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@@ -464,16 +464,20 @@ function toggleRoleItem(role) {
 }
 
 function createAnnouncement() {
-	os.popup(defineAsyncComponent(() => import('@/components/MkUserAnnouncementEditDialog.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkUserAnnouncementEditDialog.vue')), {
 		user: user.value,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 }
 
 function editAnnouncement(announcement) {
-	os.popup(defineAsyncComponent(() => import('@/components/MkUserAnnouncementEditDialog.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkUserAnnouncementEditDialog.vue')), {
 		user: user.value,
 		announcement,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 }
 
 watch(() => props.userId, () => {
diff --git a/packages/frontend/src/pages/admin/abuse-report/notification-recipient.vue b/packages/frontend/src/pages/admin/abuse-report/notification-recipient.vue
index a52f8eb7af..93800873f9 100644
--- a/packages/frontend/src/pages/admin/abuse-report/notification-recipient.vue
+++ b/packages/frontend/src/pages/admin/abuse-report/notification-recipient.vue
@@ -109,7 +109,7 @@ async function onDeleteButtonClicked(id: string) {
 
 async function showEditor(mode: 'create' | 'edit', id?: string) {
 	const { dispose, needLoad } = await new Promise<{ dispose: () => void, needLoad: boolean }>(async resolve => {
-		const res = await os.popup(
+		const { dispose: _dispose } = os.popup(
 			defineAsyncComponent(() => import('./notification-recipient.editor.vue')),
 			{
 				mode,
@@ -117,10 +117,10 @@ async function showEditor(mode: 'create' | 'edit', id?: string) {
 			},
 			{
 				submitted: async () => {
-					resolve({ dispose: res.dispose, needLoad: true });
+					resolve({ dispose: _dispose, needLoad: true });
 				},
 				closed: () => {
-					resolve({ dispose: res.dispose, needLoad: false });
+					resolve({ dispose: _dispose, needLoad: false });
 				},
 			},
 		);
diff --git a/packages/frontend/src/pages/custom-emojis-manager.vue b/packages/frontend/src/pages/custom-emojis-manager.vue
index 3e2332e408..eea3f68130 100644
--- a/packages/frontend/src/pages/custom-emojis-manager.vue
+++ b/packages/frontend/src/pages/custom-emojis-manager.vue
@@ -129,18 +129,19 @@ const toggleSelect = (emoji) => {
 };
 
 const add = async (ev: MouseEvent) => {
-	os.popup(defineAsyncComponent(() => import('./emoji-edit-dialog.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('./emoji-edit-dialog.vue')), {
 	}, {
 		done: result => {
 			if (result.created) {
 				emojisPaginationComponent.value.prepend(result.created);
 			}
 		},
-	}, 'closed');
+		closed: () => dispose(),
+	});
 };
 
 const edit = (emoji) => {
-	os.popup(defineAsyncComponent(() => import('./emoji-edit-dialog.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('./emoji-edit-dialog.vue')), {
 		emoji: emoji,
 	}, {
 		done: result => {
@@ -153,7 +154,8 @@ const edit = (emoji) => {
 				emojisPaginationComponent.value.removeItem(emoji.id);
 			}
 		},
-	}, 'closed');
+		closed: () => dispose(),
+	});
 };
 
 const importEmoji = (emoji) => {
diff --git a/packages/frontend/src/pages/drive.file.info.vue b/packages/frontend/src/pages/drive.file.info.vue
index 8077edff5f..7a8786d415 100644
--- a/packages/frontend/src/pages/drive.file.info.vue
+++ b/packages/frontend/src/pages/drive.file.info.vue
@@ -160,7 +160,7 @@ function rename() {
 function describe() {
 	if (!file.value) return;
 
-	os.popup(defineAsyncComponent(() => import('@/components/MkFileCaptionEditWindow.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkFileCaptionEditWindow.vue')), {
 		default: file.value.comment ?? '',
 		file: file.value,
 	}, {
@@ -172,7 +172,8 @@ function describe() {
 				await fetch();
 			});
 		},
-	}, 'closed');
+		closed: () => dispose(),
+	});
 }
 
 async function deleteFile() {
diff --git a/packages/frontend/src/pages/drop-and-fusion.game.vue b/packages/frontend/src/pages/drop-and-fusion.game.vue
index eba5b92154..10bcfa6d4e 100644
--- a/packages/frontend/src/pages/drop-and-fusion.game.vue
+++ b/packages/frontend/src/pages/drop-and-fusion.game.vue
@@ -1008,8 +1008,18 @@ function attachGameEvents() {
 		const domX = rect.left + (x * viewScale);
 		const domY = rect.top + (y * viewScale);
 		const scoreUnit = getScoreUnit(props.gameMode);
-		os.popup(MkRippleEffect, { x: domX, y: domY }, {}, 'end');
-		os.popup(MkPlusOneEffect, { x: domX, y: domY, value: scoreDelta + (scoreUnit === 'pt' ? '' : scoreUnit) }, {}, 'end');
+
+		{
+			const { dispose } = os.popup(MkRippleEffect, { x: domX, y: domY }, {
+				end: () => dispose(),
+			});
+		}
+
+		{
+			const { dispose } = os.popup(MkPlusOneEffect, { x: domX, y: domY, value: scoreDelta + (scoreUnit === 'pt' ? '' : scoreUnit) }, {
+				end: () => dispose(),
+			});
+		}
 
 		if (nextMono) {
 			const def = monoDefinitions.value.find(x => x.id === nextMono.id)!;
diff --git a/packages/frontend/src/pages/emojis.emoji.vue b/packages/frontend/src/pages/emojis.emoji.vue
index 5301a08521..ae3a2c31e3 100644
--- a/packages/frontend/src/pages/emojis.emoji.vue
+++ b/packages/frontend/src/pages/emojis.emoji.vue
@@ -14,8 +14,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import * as os from '@/os.js';
 import * as Misskey from 'misskey-js';
+import * as os from '@/os.js';
 import { misskeyApiGet } from '@/scripts/misskey-api.js';
 import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 import { i18n } from '@/i18n.js';
@@ -40,12 +40,12 @@ function menu(ev) {
 		text: i18n.ts.info,
 		icon: 'ti ti-info-circle',
 		action: async () => {
-			os.popup(MkCustomEmojiDetailedDialog, {
+			const { dispose } = os.popup(MkCustomEmojiDetailedDialog, {
 				emoji: await misskeyApiGet('emoji', {
 					name: props.emoji.name,
-				})
+				}),
 			}, {
-				anchor: ev.target,
+				closed: () => dispose(),
 			});
 		},
 	}], ev.currentTarget ?? ev.target);
diff --git a/packages/frontend/src/pages/reset-password.vue b/packages/frontend/src/pages/reset-password.vue
index 6b67a9cc87..6d24029535 100644
--- a/packages/frontend/src/pages/reset-password.vue
+++ b/packages/frontend/src/pages/reset-password.vue
@@ -44,7 +44,9 @@ async function save() {
 
 onMounted(() => {
 	if (props.token == null) {
-		os.popup(defineAsyncComponent(() => import('@/components/MkForgotPassword.vue')), {}, {}, 'closed');
+		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkForgotPassword.vue')), {}, {
+			closed: () => dispose(),
+		});
 		mainRouter.push('/');
 	}
 });
diff --git a/packages/frontend/src/pages/settings/2fa.vue b/packages/frontend/src/pages/settings/2fa.vue
index b7d648c1a4..6a9a1e16e2 100644
--- a/packages/frontend/src/pages/settings/2fa.vue
+++ b/packages/frontend/src/pages/settings/2fa.vue
@@ -108,9 +108,11 @@ async function registerTOTP(): Promise<void> {
 		token: auth.result.token,
 	});
 
-	os.popup(defineAsyncComponent(() => import('./2fa.qrdialog.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('./2fa.qrdialog.vue')), {
 		twoFactorData,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 }
 
 async function unregisterTOTP(): Promise<void> {
diff --git a/packages/frontend/src/pages/settings/accounts.vue b/packages/frontend/src/pages/settings/accounts.vue
index 1182346de9..08c9261dcf 100644
--- a/packages/frontend/src/pages/settings/accounts.vue
+++ b/packages/frontend/src/pages/settings/accounts.vue
@@ -74,22 +74,24 @@ async function removeAccount(account) {
 }
 
 function addExistingAccount() {
-	os.popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {}, {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {}, {
 		done: async res => {
 			await addAccounts(res.id, res.i);
 			os.success();
 			init();
 		},
-	}, 'closed');
+		closed: () => dispose(),
+	});
 }
 
 function createAccount() {
-	os.popup(defineAsyncComponent(() => import('@/components/MkSignupDialog.vue')), {}, {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkSignupDialog.vue')), {}, {
 		done: async res => {
 			await addAccounts(res.id, res.i);
 			switchAccountWithToken(res.i);
 		},
-	}, 'closed');
+		closed: () => dispose(),
+	});
 }
 
 async function switchAccount(account: any) {
diff --git a/packages/frontend/src/pages/settings/api.vue b/packages/frontend/src/pages/settings/api.vue
index d9596b4e45..b35d406a98 100644
--- a/packages/frontend/src/pages/settings/api.vue
+++ b/packages/frontend/src/pages/settings/api.vue
@@ -23,7 +23,7 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
 const isDesktop = ref(window.innerWidth >= 1100);
 
 function generateToken() {
-	os.popup(defineAsyncComponent(() => import('@/components/MkTokenGenerateWindow.vue')), {}, {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkTokenGenerateWindow.vue')), {}, {
 		done: async result => {
 			const { name, permissions } = result;
 			const { token } = await misskeyApi('miauth/gen-token', {
@@ -38,7 +38,8 @@ function generateToken() {
 				text: token,
 			});
 		},
-	}, 'closed');
+		closed: () => dispose(),
+	});
 }
 
 const headerActions = computed(() => []);
diff --git a/packages/frontend/src/pages/settings/avatar-decoration.vue b/packages/frontend/src/pages/settings/avatar-decoration.vue
index 3cc911c014..77229d3349 100644
--- a/packages/frontend/src/pages/settings/avatar-decoration.vue
+++ b/packages/frontend/src/pages/settings/avatar-decoration.vue
@@ -67,7 +67,7 @@ misskeyApi('get-avatar-decorations').then(_avatarDecorations => {
 });
 
 function openDecoration(avatarDecoration, index?: number) {
-	os.popup(defineAsyncComponent(() => import('./avatar-decoration.dialog.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('./avatar-decoration.dialog.vue')), {
 		decoration: avatarDecoration,
 		usingIndex: index,
 	}, {
@@ -108,7 +108,8 @@ function openDecoration(avatarDecoration, index?: number) {
 			});
 			$i.avatarDecorations = update;
 		},
-	}, 'closed');
+		closed: () => dispose(),
+	});
 }
 
 function detachAllDecorations() {
diff --git a/packages/frontend/src/scripts/get-drive-file-menu.ts b/packages/frontend/src/scripts/get-drive-file-menu.ts
index 7aca5f83b2..14c83ed637 100644
--- a/packages/frontend/src/scripts/get-drive-file-menu.ts
+++ b/packages/frontend/src/scripts/get-drive-file-menu.ts
@@ -27,7 +27,7 @@ function rename(file: Misskey.entities.DriveFile) {
 }
 
 function describe(file: Misskey.entities.DriveFile) {
-	os.popup(defineAsyncComponent(() => import('@/components/MkFileCaptionEditWindow.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkFileCaptionEditWindow.vue')), {
 		default: file.comment ?? '',
 		file: file,
 	}, {
@@ -37,7 +37,8 @@ function describe(file: Misskey.entities.DriveFile) {
 				comment: caption.length === 0 ? null : caption,
 			});
 		},
-	}, 'closed');
+		closed: () => dispose(),
+	});
 }
 
 function toggleSensitive(file: Misskey.entities.DriveFile) {
diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
index 71ad299f50..418b6abc88 100644
--- a/packages/frontend/src/scripts/get-note-menu.ts
+++ b/packages/frontend/src/scripts/get-note-menu.ts
@@ -136,10 +136,12 @@ export function getAbuseNoteMenu(note: Misskey.entities.Note, text: string): Men
 			let noteInfo = '';
 			if (note.url ?? note.uri != null) noteInfo = `Note: ${note.url ?? note.uri}\n`;
 			noteInfo += `Local Note: ${localUrl}\n`;
-			os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+			const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
 				user: note.user,
 				initialComment: `${noteInfo}-----\n`,
-			}, {}, 'closed');
+			}, {
+				closed: () => dispose(),
+			});
 		},
 	};
 }
@@ -530,7 +532,9 @@ export function getRenoteMenu(props: {
 					const rect = el.getBoundingClientRect();
 					const x = rect.left + (el.offsetWidth / 2);
 					const y = rect.top + (el.offsetHeight / 2);
-					os.popup(MkRippleEffect, { x, y }, {}, 'end');
+					const { dispose } = os.popup(MkRippleEffect, { x, y }, {
+						end: () => dispose(),
+					});
 				}
 
 				if (!props.mock) {
@@ -566,7 +570,9 @@ export function getRenoteMenu(props: {
 					const rect = el.getBoundingClientRect();
 					const x = rect.left + (el.offsetWidth / 2);
 					const y = rect.top + (el.offsetHeight / 2);
-					os.popup(MkRippleEffect, { x, y }, {}, 'end');
+					const { dispose } = os.popup(MkRippleEffect, { x, y }, {
+						end: () => dispose(),
+					});
 				}
 
 				const configuredVisibility = defaultStore.state.rememberNoteVisibility ? defaultStore.state.visibility : defaultStore.state.defaultNoteVisibility;
@@ -615,7 +621,9 @@ export function getRenoteMenu(props: {
 							const rect = el.getBoundingClientRect();
 							const x = rect.left + (el.offsetWidth / 2);
 							const y = rect.top + (el.offsetHeight / 2);
-							os.popup(MkRippleEffect, { x, y }, {}, 'end');
+							const { dispose } = os.popup(MkRippleEffect, { x, y }, {
+								end: () => dispose(),
+							});
 						}
 
 						if (!props.mock) {
diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts
index 3e031d232f..ac8774fad0 100644
--- a/packages/frontend/src/scripts/get-user-menu.ts
+++ b/packages/frontend/src/scripts/get-user-menu.ts
@@ -100,9 +100,11 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
 	}
 
 	function reportAbuse() {
-		os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
 			user: user,
-		}, {}, 'closed');
+		}, {
+			closed: () => dispose(),
+		});
 	}
 
 	async function getConfirmed(text: string): Promise<boolean> {
diff --git a/packages/frontend/src/scripts/install-plugin.ts b/packages/frontend/src/scripts/install-plugin.ts
index d0a8675b19..37f473b6de 100644
--- a/packages/frontend/src/scripts/install-plugin.ts
+++ b/packages/frontend/src/scripts/install-plugin.ts
@@ -103,7 +103,7 @@ export async function installPlugin(code: string, meta?: AiScriptPluginMeta) {
 	}
 
 	const token = realMeta.permissions == null || realMeta.permissions.length === 0 ? null : await new Promise((res, rej) => {
-		os.popup(defineAsyncComponent(() => import('@/components/MkTokenGenerateWindow.vue')), {
+		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkTokenGenerateWindow.vue')), {
 			title: i18n.ts.tokenRequested,
 			information: i18n.ts.pluginTokenRequestedDescription,
 			initialName: realMeta.name,
@@ -118,7 +118,8 @@ export async function installPlugin(code: string, meta?: AiScriptPluginMeta) {
 				});
 				res(token);
 			},
-		}, 'closed');
+			closed: () => dispose(),
+		});
 	});
 
 	savePlugin({
diff --git a/packages/frontend/src/scripts/please-login.ts b/packages/frontend/src/scripts/please-login.ts
index 9e51272791..363da5f633 100644
--- a/packages/frontend/src/scripts/please-login.ts
+++ b/packages/frontend/src/scripts/please-login.ts
@@ -11,7 +11,7 @@ import { popup } from '@/os.js';
 export function pleaseLogin(path?: string) {
 	if ($i) return;
 
-	popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {
+	const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {
 		autoSet: true,
 		message: i18n.ts.signinRequired,
 	}, {
@@ -20,7 +20,8 @@ export function pleaseLogin(path?: string) {
 				window.location.href = path;
 			}
 		},
-	}, 'closed');
+		closed: () => dispose(),
+	});
 
 	throw new Error('signin required');
 }
diff --git a/packages/frontend/src/scripts/use-chart-tooltip.ts b/packages/frontend/src/scripts/use-chart-tooltip.ts
index bed221a622..bba64fc6ee 100644
--- a/packages/frontend/src/scripts/use-chart-tooltip.ts
+++ b/packages/frontend/src/scripts/use-chart-tooltip.ts
@@ -17,20 +17,16 @@ export function useChartTooltip(opts: { position: 'top' | 'middle' } = { positio
 		borderColor: string;
 		text: string;
 	}[] | null>(null);
-	let disposeTooltipComponent;
-
-	os.popup(MkChartTooltip, {
+	const { dispose: disposeTooltipComponent } = os.popup(MkChartTooltip, {
 		showing: tooltipShowing,
 		x: tooltipX,
 		y: tooltipY,
 		title: tooltipTitle,
 		series: tooltipSeries,
-	}, {}).then(({ dispose }) => {
-		disposeTooltipComponent = dispose;
-	});
+	}, {});
 
 	onUnmounted(() => {
-		if (disposeTooltipComponent) disposeTooltipComponent();
+		disposeTooltipComponent();
 	});
 
 	onDeactivated(() => {
diff --git a/packages/frontend/src/ui/_common_/common.ts b/packages/frontend/src/ui/_common_/common.ts
index 839fa5faf8..20a280f681 100644
--- a/packages/frontend/src/ui/_common_/common.ts
+++ b/packages/frontend/src/ui/_common_/common.ts
@@ -112,7 +112,9 @@ export function openInstanceMenu(ev: MouseEvent) {
 		text: i18n.ts._initialTutorial.launchTutorial,
 		icon: 'ti ti-presentation',
 		action: () => {
-			os.popup(defineAsyncComponent(() => import('@/components/MkTutorialDialog.vue')), {}, {}, 'closed');
+			const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkTutorialDialog.vue')), {}, {
+				closed: () => dispose(),
+			});
 		},
 	} : undefined, {
 		type: 'link',
diff --git a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
index 5d0e065f09..699aa1e1c8 100644
--- a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
@@ -74,8 +74,9 @@ function openAccountMenu(ev: MouseEvent) {
 }
 
 function more() {
-	os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {}, {
-	}, 'closed');
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {}, {
+		closed: () => dispose(),
+	});
 }
 </script>
 
diff --git a/packages/frontend/src/ui/_common_/navbar.vue b/packages/frontend/src/ui/_common_/navbar.vue
index fa1f0eb8c7..b029533f28 100644
--- a/packages/frontend/src/ui/_common_/navbar.vue
+++ b/packages/frontend/src/ui/_common_/navbar.vue
@@ -99,10 +99,11 @@ function openAccountMenu(ev: MouseEvent) {
 }
 
 function more(ev: MouseEvent) {
-	os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
 		src: ev.currentTarget ?? ev.target,
 	}, {
-	}, 'closed');
+		closed: () => dispose(),
+	});
 }
 </script>
 
diff --git a/packages/frontend/src/ui/classic.header.vue b/packages/frontend/src/ui/classic.header.vue
index ee5176b558..c03afd6cd6 100644
--- a/packages/frontend/src/ui/classic.header.vue
+++ b/packages/frontend/src/ui/classic.header.vue
@@ -71,11 +71,12 @@ const otherNavItemIndicated = computed<boolean>(() => {
 });
 
 function more(ev: MouseEvent) {
-	os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
 		src: ev.currentTarget ?? ev.target,
 		anchor: { x: 'center', y: 'bottom' },
 	}, {
-	}, 'closed');
+		closed: () => dispose(),
+	});
 }
 
 function openAccountMenu(ev: MouseEvent) {
diff --git a/packages/frontend/src/ui/classic.sidebar.vue b/packages/frontend/src/ui/classic.sidebar.vue
index 19672ef87f..d8574a915f 100644
--- a/packages/frontend/src/ui/classic.sidebar.vue
+++ b/packages/frontend/src/ui/classic.sidebar.vue
@@ -86,9 +86,11 @@ function calcViewState() {
 }
 
 function more(ev: MouseEvent) {
-	os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
 		src: ev.currentTarget ?? ev.target,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 }
 
 function openAccountMenu(ev: MouseEvent) {
diff --git a/packages/frontend/src/ui/deck/notifications-column.vue b/packages/frontend/src/ui/deck/notifications-column.vue
index 451cc58791..23b0fd4f7b 100644
--- a/packages/frontend/src/ui/deck/notifications-column.vue
+++ b/packages/frontend/src/ui/deck/notifications-column.vue
@@ -27,7 +27,7 @@ const props = defineProps<{
 const notificationsComponent = shallowRef<InstanceType<typeof XNotifications>>();
 
 function func() {
-	os.popup(defineAsyncComponent(() => import('@/components/MkNotificationSelectWindow.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkNotificationSelectWindow.vue')), {
 		excludeTypes: props.column.excludeTypes,
 	}, {
 		done: async (res) => {
@@ -36,7 +36,8 @@ function func() {
 				excludeTypes: excludeTypes,
 			});
 		},
-	}, 'closed');
+		closed: () => dispose(),
+	});
 }
 
 const menu = [{
diff --git a/packages/frontend/src/ui/visitor.vue b/packages/frontend/src/ui/visitor.vue
index 80623083cf..c229946bd4 100644
--- a/packages/frontend/src/ui/visitor.vue
+++ b/packages/frontend/src/ui/visitor.vue
@@ -126,15 +126,19 @@ const keymap = computed(() => {
 });
 
 function signin() {
-	os.popup(XSigninDialog, {
+	const { dispose } = os.popup(XSigninDialog, {
 		autoSet: true,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 }
 
 function signup() {
-	os.popup(XSignupDialog, {
+	const { dispose } = os.popup(XSignupDialog, {
 		autoSet: true,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 }
 
 onMounted(() => {
diff --git a/packages/frontend/src/widgets/WidgetNotifications.vue b/packages/frontend/src/widgets/WidgetNotifications.vue
index 4b3265dab7..773c078b49 100644
--- a/packages/frontend/src/widgets/WidgetNotifications.vue
+++ b/packages/frontend/src/widgets/WidgetNotifications.vue
@@ -54,7 +54,7 @@ const { widgetProps, configure, save } = useWidgetPropsManager(name,
 );
 
 const configureNotification = () => {
-	os.popup(defineAsyncComponent(() => import('@/components/MkNotificationSelectWindow.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkNotificationSelectWindow.vue')), {
 		excludeTypes: widgetProps.excludeTypes,
 	}, {
 		done: async (res) => {
@@ -62,7 +62,8 @@ const configureNotification = () => {
 			widgetProps.excludeTypes = excludeTypes;
 			save();
 		},
-	}, 'closed');
+		closed: () => dispose(),
+	});
 };
 
 defineExpose<WidgetComponentExpose>({

From b9ed3b2427593a279f129f6ee10064e5955fb5b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 6 Jul 2024 11:46:43 +0900
Subject: [PATCH 016/221] =?UTF-8?q?fix(dev):=20dev=E3=82=B5=E3=83=BC?=
 =?UTF-8?q?=E3=83=90=E3=83=BC=E3=81=A7`/notes/`=E3=81=AB=E7=9B=B4=E3=81=A7?=
 =?UTF-8?q?=E3=82=A2=E3=82=AF=E3=82=BB=E3=82=B9=E3=81=97=E3=81=9F=E3=82=89?=
 =?UTF-8?q?=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC=E5=81=B4=E3=81=AE=E3=83=AC?=
 =?UTF-8?q?=E3=82=B9=E3=83=9D=E3=83=B3=E3=82=B9=E3=81=8C=E8=BF=94=E3=81=A3?=
 =?UTF-8?q?=E3=81=A6=E3=81=8F=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20(#14137)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/vite.config.local-dev.ts | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/frontend/vite.config.local-dev.ts b/packages/frontend/vite.config.local-dev.ts
index f9dff13b15..0a88e489c1 100644
--- a/packages/frontend/vite.config.local-dev.ts
+++ b/packages/frontend/vite.config.local-dev.ts
@@ -1,6 +1,8 @@
 import dns from 'dns';
 import { readFile } from 'node:fs/promises';
+import type { IncomingMessage } from 'node:http';
 import { defineConfig } from 'vite';
+import type { UserConfig } from 'vite';
 import * as yaml from 'js-yaml';
 import locales from '../../locales/index.js';
 import { getConfig } from './vite.config.js';
@@ -14,7 +16,15 @@ const { port } = yaml.load(await readFile('../../.config/default.yml', 'utf-8'))
 const httpUrl = `http://localhost:${port}/`;
 const websocketUrl = `ws://localhost:${port}/`;
 
-const devConfig = {
+// activitypubリクエストはProxyを通し、それ以外はViteの開発サーバーを返す
+function varyHandler(req: IncomingMessage) {
+	if (req.headers.accept?.includes('application/activity+json')) {
+		return null;
+	}
+	return '/index.html';
+}
+
+const devConfig: UserConfig = {
 	// 基本の設定は vite.config.js から引き継ぐ
 	...defaultConfig,
 	root: 'src',
@@ -54,15 +64,11 @@ const devConfig = {
 			'/inbox': httpUrl,
 			'/notes': {
 				target: httpUrl,
-				headers: {
-					'Accept': 'application/activity+json',
-				},
+				bypass: varyHandler,
 			},
 			'/users': {
 				target: httpUrl,
-				headers: {
-					'Accept': 'application/activity+json',
-				},
+				bypass: varyHandler,
 			},
 			'/.well-known': {
 				target: httpUrl,

From 8e1d94c6c70679f041f3f4f9cb97c633deb4f536 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 6 Jul 2024 21:46:19 +0900
Subject: [PATCH 017/221] fix import path

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

diff --git a/packages/backend/src/core/MfmService.ts b/packages/backend/src/core/MfmService.ts
index 9786f8b8bb..9d175119dd 100644
--- a/packages/backend/src/core/MfmService.ts
+++ b/packages/backend/src/core/MfmService.ts
@@ -7,13 +7,13 @@ import { URL } from 'node:url';
 import { Inject, Injectable } from '@nestjs/common';
 import * as parse5 from 'parse5';
 import { Window, XMLSerializer } from 'happy-dom';
+import * as TreeAdapter from 'parse5/dist/tree-adapters/default.js';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { intersperse } from '@/misc/prelude/array.js';
 import { normalizeForSearch } from '@/misc/normalize-for-search.js';
 import type { IMentionedRemoteUsers } from '@/models/Note.js';
 import { bindThis } from '@/decorators.js';
-import * as TreeAdapter from '../../node_modules/parse5/dist/tree-adapters/default.js';
 import type * as mfm from 'mfm-js';
 
 const treeAdapter = TreeAdapter.defaultTreeAdapter;

From 0ea88c07b4e34271ca155d69dfa09b01df96cdd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 6 Jul 2024 22:52:41 +0900
Subject: [PATCH 018/221] fix changelog

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a28c9ef64..51c008c973 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,16 +14,16 @@
 - Fix: テーマプレビューが見れない問題を修正
 
 ### Server
-- チャート生成時にinstance.suspentionStateに置き換えられたinstance.isSuspendedが参照されてしまう問題を修正
 - Feat: レートリミット制限に引っかかったときに`Retry-After`ヘッダーを返すように (#13949)
-- Fix: ユーザーのフィードページのMFMをHTMLに展開するように (#14006)
-- Fix: アンテナ・クリップ・リスト・ウェブフックがロールポリシーの上限より一つ多く作れてしまうのを修正 (#14036)
 - Enhance: エンドポイント`clips/update`の必須項目を`clipId`のみに
 - Enhance: エンドポイント`admin/roles/update`の必須項目を`roleId`のみに
 - Enhance: エンドポイント`pages/update`の必須項目を`pageId`のみに
 - Enhance: エンドポイント`gallery/posts/update`の必須項目を`postId`のみに
 - Enhance: エンドポイント`i/webhook/update`の必須項目を`webhookId`のみに
 - Enhance: エンドポイント`admin/ad/update`の必須項目を`id`のみに
+- Fix: チャート生成時にinstance.suspentionStateに置き換えられたinstance.isSuspendedが参照されてしまう問題を修正
+- Fix: ユーザーのフィードページのMFMをHTMLに展開するように (#14006)
+- Fix: アンテナ・クリップ・リスト・ウェブフックがロールポリシーの上限より一つ多く作れてしまうのを修正 (#14036)
 - Fix: notRespondingSinceが実装される前に不通になったインスタンスが自動的に配信停止にならない (#14059)
 - Fix: FTT有効時、タイムライン用エンドポイントで`sinceId`にキャッシュ内最古のものより古いものを指定した場合に正しく結果が返ってこない問題を修正
 - Fix: 自分以外のクリップ内のノート個数が見えることがあるのを修正

From fe852920c3343df4df50b278c78eddaace4915a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8A=E3=81=95=E3=82=80=E3=81=AE=E3=81=B2=E3=81=A8?=
 <46447427+samunohito@users.noreply.github.com>
Date: Sun, 7 Jul 2024 09:55:06 +0900
Subject: [PATCH 019/221] =?UTF-8?q?fix(backend):=20parse5=E9=96=A2?=
 =?UTF-8?q?=E4=BF=82=E3=81=AE=E5=9E=8B=E3=81=AEimport=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4=20(#14146)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/MfmService.ts | 44 +++++++++++--------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/packages/backend/src/core/MfmService.ts b/packages/backend/src/core/MfmService.ts
index 9d175119dd..74536c68f5 100644
--- a/packages/backend/src/core/MfmService.ts
+++ b/packages/backend/src/core/MfmService.ts
@@ -7,16 +7,18 @@ import { URL } from 'node:url';
 import { Inject, Injectable } from '@nestjs/common';
 import * as parse5 from 'parse5';
 import { Window, XMLSerializer } from 'happy-dom';
-import * as TreeAdapter from 'parse5/dist/tree-adapters/default.js';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { intersperse } from '@/misc/prelude/array.js';
 import { normalizeForSearch } from '@/misc/normalize-for-search.js';
 import type { IMentionedRemoteUsers } from '@/models/Note.js';
 import { bindThis } from '@/decorators.js';
+import type { DefaultTreeAdapterMap } from 'parse5';
 import type * as mfm from 'mfm-js';
 
-const treeAdapter = TreeAdapter.defaultTreeAdapter;
+const treeAdapter = parse5.defaultTreeAdapter;
+type Node = DefaultTreeAdapterMap['node'];
+type ChildNode = DefaultTreeAdapterMap['childNode'];
 
 const urlRegex = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+/;
 const urlRegexFull = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+$/;
@@ -46,7 +48,7 @@ export class MfmService {
 
 		return text.trim();
 
-		function getText(node: TreeAdapter.Node): string {
+		function getText(node: Node): string {
 			if (treeAdapter.isTextNode(node)) return node.value;
 			if (!treeAdapter.isElementNode(node)) return '';
 			if (node.nodeName === 'br') return '\n';
@@ -58,7 +60,7 @@ export class MfmService {
 			return '';
 		}
 
-		function appendChildren(childNodes: TreeAdapter.ChildNode[]): void {
+		function appendChildren(childNodes: ChildNode[]): void {
 			if (childNodes) {
 				for (const n of childNodes) {
 					analyze(n);
@@ -66,14 +68,16 @@ export class MfmService {
 			}
 		}
 
-		function analyze(node: TreeAdapter.Node) {
+		function analyze(node: Node) {
 			if (treeAdapter.isTextNode(node)) {
 				text += node.value;
 				return;
 			}
 
 			// Skip comment or document type node
-			if (!treeAdapter.isElementNode(node)) return;
+			if (!treeAdapter.isElementNode(node)) {
+				return;
+			}
 
 			switch (node.nodeName) {
 				case 'br': {
@@ -81,8 +85,7 @@ export class MfmService {
 					break;
 				}
 
-				case 'a':
-				{
+				case 'a': {
 					const txt = getText(node);
 					const rel = node.attrs.find(x => x.name === 'rel');
 					const href = node.attrs.find(x => x.name === 'href');
@@ -90,7 +93,7 @@ export class MfmService {
 					// ハッシュタグ
 					if (normalizedHashtagNames && href && normalizedHashtagNames.has(normalizeForSearch(txt))) {
 						text += txt;
-					// メンション
+						// メンション
 					} else if (txt.startsWith('@') && !(rel && rel.value.startsWith('me '))) {
 						const part = txt.split('@');
 
@@ -102,7 +105,7 @@ export class MfmService {
 						} else if (part.length === 3) {
 							text += txt;
 						}
-					// その他
+						// その他
 					} else {
 						const generateLink = () => {
 							if (!href && !txt) {
@@ -130,8 +133,7 @@ export class MfmService {
 					break;
 				}
 
-				case 'h1':
-				{
+				case 'h1': {
 					text += '【';
 					appendChildren(node.childNodes);
 					text += '】\n';
@@ -139,16 +141,14 @@ export class MfmService {
 				}
 
 				case 'b':
-				case 'strong':
-				{
+				case 'strong': {
 					text += '**';
 					appendChildren(node.childNodes);
 					text += '**';
 					break;
 				}
 
-				case 'small':
-				{
+				case 'small': {
 					text += '<small>';
 					appendChildren(node.childNodes);
 					text += '</small>';
@@ -156,8 +156,7 @@ export class MfmService {
 				}
 
 				case 's':
-				case 'del':
-				{
+				case 'del': {
 					text += '~~';
 					appendChildren(node.childNodes);
 					text += '~~';
@@ -165,8 +164,7 @@ export class MfmService {
 				}
 
 				case 'i':
-				case 'em':
-				{
+				case 'em': {
 					text += '<i>';
 					appendChildren(node.childNodes);
 					text += '</i>';
@@ -207,8 +205,7 @@ export class MfmService {
 				case 'h3':
 				case 'h4':
 				case 'h5':
-				case 'h6':
-				{
+				case 'h6': {
 					text += '\n\n';
 					appendChildren(node.childNodes);
 					break;
@@ -221,8 +218,7 @@ export class MfmService {
 				case 'article':
 				case 'li':
 				case 'dt':
-				case 'dd':
-				{
+				case 'dd': {
 					text += '\n';
 					appendChildren(node.childNodes);
 					break;

From 984d582796f41f200d417b2d7647e9cb25b8dcec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 7 Jul 2024 09:56:09 +0900
Subject: [PATCH 020/221] =?UTF-8?q?fix(frontend):=20=E3=82=B5=E3=83=BC?=
 =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B5=E3=82=A4=E3=83=89boot=E3=81=A7?=
 =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E7=94=BB=E9=9D=A2=E3=81=AE=E6=8F=8F?=
 =?UTF-8?q?=E7=94=BB=E6=99=82=E3=81=ABDOM=E3=81=8C=E5=88=9D=E6=9C=9F?=
 =?UTF-8?q?=E5=8C=96=E3=81=A7=E3=81=8D=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82=E3=82=8B=E3=81=AE=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(#14139)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/server/web/boot.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js
index 396536948e..4275dc9527 100644
--- a/packages/backend/src/server/web/boot.js
+++ b/packages/backend/src/server/web/boot.js
@@ -29,7 +29,8 @@
 
 	let forceError = localStorage.getItem('forceError');
 	if (forceError != null) {
-		renderError('FORCED_ERROR', 'This error is forced by having forceError in local storage.')
+		renderError('FORCED_ERROR', 'This error is forced by having forceError in local storage.');
+		return;
 	}
 
 	//#region Detect language & fetch translations
@@ -155,7 +156,12 @@
 		document.head.appendChild(css);
 	}
 
-	function renderError(code, details) {
+	async function renderError(code, details) {
+		// Cannot set property 'innerHTML' of null を回避
+		if (document.readyState === 'loading') {
+			await new Promise(resolve => window.addEventListener('DOMContentLoaded', resolve));
+		}
+
 		let errorsElement = document.getElementById('errors');
 
 		if (!errorsElement) {
@@ -314,6 +320,6 @@
 			#errorInfo {
 				width: 50%;
 			}
-		`)
+		}`)
 	}
 })();

From f119f8c2cc791cec02551bfcd9801616284944e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 7 Jul 2024 14:08:18 +0900
Subject: [PATCH 021/221] =?UTF-8?q?feat(misskey-js):=20multipart/form-data?=
 =?UTF-8?q?=E3=81=AE=E3=83=AA=E3=82=AF=E3=82=A8=E3=82=B9=E3=83=88=E3=81=AB?=
 =?UTF-8?q?=E5=AF=BE=E5=BF=9C=20(#14147)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(misskey-js): multipart/form-dataのリクエストに対応

* lint

* add test

* Update Changelog

* テストを厳しくする

* lint

* multipart/form-dataではnullのプロパティを弾くように
---
 CHANGELOG.md                                  |   3 +
 packages/misskey-js/etc/misskey-js.api.md     |   2 +-
 .../misskey-js/generator/src/generator.ts     |  57 ++-
 packages/misskey-js/src/api.ts                |  51 ++-
 packages/misskey-js/src/autogen/endpoint.ts   | 382 ++++++++++++++++++
 packages/misskey-js/src/autogen/types.ts      |   2 +-
 packages/misskey-js/test/api.ts               |  54 ++-
 7 files changed, 537 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51c008c973..23de5957fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,9 @@
 - Fix: 空文字列のリアクションはフォールバックされるように
 - Fix: リノートにリアクションできないように
 
+### Misskey.js
+- Feat: `/drive/files/create` のリクエストに対応（`multipart/form-data`に対応）
+
 ## 2024.5.0
 
 ### Note
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index bea89f2a7c..be2f510ac2 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -1869,7 +1869,7 @@ type FetchExternalResourcesResponse = operations['fetch-external-resources']['re
 // @public (undocumented)
 type FetchLike = (input: string, init?: {
     method?: string;
-    body?: string;
+    body?: Blob | FormData | string;
     credentials?: RequestCredentials;
     cache?: RequestCache;
     headers: {
diff --git a/packages/misskey-js/generator/src/generator.ts b/packages/misskey-js/generator/src/generator.ts
index 78178d7c7e..4ae00a4522 100644
--- a/packages/misskey-js/generator/src/generator.ts
+++ b/packages/misskey-js/generator/src/generator.ts
@@ -20,7 +20,14 @@ async function generateBaseTypes(
 	}
 	lines.push('');
 
-	const generatedTypes = await openapiTS(openApiJsonPath, { exportType: true });
+	const generatedTypes = await openapiTS(openApiJsonPath, {
+		exportType: true,
+		transform(schemaObject) {
+			if ('format' in schemaObject && schemaObject.format === 'binary') {
+				return schemaObject.nullable ? 'Blob | null' : 'Blob';
+			}
+		},
+	});
 	lines.push(generatedTypes);
 	lines.push('');
 
@@ -56,6 +63,8 @@ async function generateEndpoints(
 	endpointOutputPath: string,
 ) {
 	const endpoints: Endpoint[] = [];
+	const endpointReqMediaTypes: EndpointReqMediaType[] = [];
+	const endpointReqMediaTypesSet = new Set<string>();
 
 	// misskey-jsはPOST固定で送っているので、こちらも決め打ちする。別メソッドに対応することがあればこちらも直す必要あり
 	const paths = openApiDocs.paths ?? {};
@@ -78,13 +87,24 @@ async function generateEndpoints(
 			const supportMediaTypes = Object.keys(reqContent);
 			if (supportMediaTypes.length > 0) {
 				// いまのところ複数のメディアタイプをとるエンドポイントは無いので決め打ちする
-				endpoint.request = new OperationTypeAlias(
+				const req = new OperationTypeAlias(
 					operationId,
 					path,
 					supportMediaTypes[0],
 					OperationsAliasType.REQUEST,
 				);
+				endpoint.request = req;
+
+				const reqType = new EndpointReqMediaType(path, req);
+				endpointReqMediaTypesSet.add(reqType.getMediaType());
+				endpointReqMediaTypes.push(reqType);
+			} else {
+				endpointReqMediaTypesSet.add('application/json');
+				endpointReqMediaTypes.push(new EndpointReqMediaType(path, undefined, 'application/json'));
 			}
+		} else {
+			endpointReqMediaTypesSet.add('application/json');
+			endpointReqMediaTypes.push(new EndpointReqMediaType(path, undefined, 'application/json'));
 		}
 
 		if (operation.responses && isResponseObject(operation.responses['200']) && operation.responses['200'].content) {
@@ -137,6 +157,19 @@ async function generateEndpoints(
 	endpointOutputLine.push('}');
 	endpointOutputLine.push('');
 
+	function generateEndpointReqMediaTypesType() {
+		return `Record<keyof Endpoints, ${[...endpointReqMediaTypesSet].map((t) => `'${t}'`).join(' | ')}>`;
+	}
+
+	endpointOutputLine.push(`export const endpointReqTypes: ${generateEndpointReqMediaTypesType()} = {`);
+
+	endpointOutputLine.push(
+		...endpointReqMediaTypes.map(it => '\t' + it.toLine()),
+	);
+
+	endpointOutputLine.push('};');
+	endpointOutputLine.push('');
+
 	await writeFile(endpointOutputPath, endpointOutputLine.join('\n'));
 }
 
@@ -314,6 +347,26 @@ class Endpoint {
 	}
 }
 
+class EndpointReqMediaType {
+	public readonly path: string;
+	public readonly mediaType: string;
+
+	constructor(path: string, request: OperationTypeAlias, mediaType?: undefined);
+	constructor(path: string, request: undefined, mediaType: string);
+	constructor(path: string, request: OperationTypeAlias | undefined, mediaType?: string) {
+		this.path = path;
+		this.mediaType = mediaType ?? request?.mediaType ?? 'application/json';
+	}
+
+	getMediaType(): string {
+		return this.mediaType;
+	}
+
+	toLine(): string {
+		return `'${this.path}': '${this.mediaType}',`;
+	}
+}
+
 async function main() {
 	const generatePath = './built/autogen';
 	await mkdir(generatePath, { recursive: true });
diff --git a/packages/misskey-js/src/api.ts b/packages/misskey-js/src/api.ts
index 959a634a74..76d055cbe4 100644
--- a/packages/misskey-js/src/api.ts
+++ b/packages/misskey-js/src/api.ts
@@ -1,7 +1,7 @@
 import './autogen/apiClientJSDoc.js';
 
-import { SwitchCaseResponseType } from './api.types.js';
-import type { Endpoints } from './api.types.js';
+import { endpointReqTypes } from './autogen/endpoint.js';
+import type { SwitchCaseResponseType, Endpoints } from './api.types.js';
 
 export type {
 	SwitchCaseResponseType,
@@ -23,7 +23,7 @@ export function isAPIError(reason: Record<PropertyKey, unknown>): reason is APIE
 
 export type FetchLike = (input: string, init?: {
 	method?: string;
-	body?: string;
+	body?: Blob | FormData | string;
 	credentials?: RequestCredentials;
 	cache?: RequestCache;
 	headers: { [key in string]: string }
@@ -49,20 +49,55 @@ export class APIClient {
 		this.fetch = opts.fetch ?? ((...args) => fetch(...args));
 	}
 
+	private assertIsRecord<T>(obj: T): obj is T & Record<string, any> {
+		return obj !== null && typeof obj === 'object' && !Array.isArray(obj);
+	}
+
 	public request<E extends keyof Endpoints, P extends Endpoints[E]['req']>(
 		endpoint: E,
 		params: P = {} as P,
 		credential?: string | null,
 	): Promise<SwitchCaseResponseType<E, P>> {
 		return new Promise((resolve, reject) => {
-			this.fetch(`${this.origin}/api/${endpoint}`, {
-				method: 'POST',
-				body: JSON.stringify({
+			let mediaType = 'application/json';
+			if (endpoint in endpointReqTypes) {
+				mediaType = endpointReqTypes[endpoint];
+			}
+			let payload: FormData | string = '{}';
+
+			if (mediaType === 'application/json') {
+				payload = JSON.stringify({
 					...params,
 					i: credential !== undefined ? credential : this.credential,
-				}),
+				});
+			} else if (mediaType === 'multipart/form-data') {
+				payload = new FormData();
+				const i = credential !== undefined ? credential : this.credential;
+				if (i != null) {
+					payload.append('i', i);
+				}
+				if (this.assertIsRecord(params)) {
+					for (const key in params) {
+						const value = params[key];
+
+						if (value == null) continue;
+
+						if (value instanceof File || value instanceof Blob) {
+							payload.append(key, value);
+						} else if (typeof value === 'object') {
+							payload.append(key, JSON.stringify(value));
+						} else {
+							payload.append(key, value);
+						}
+					}
+				}
+			}
+
+			this.fetch(`${this.origin}/api/${endpoint}`, {
+				method: 'POST',
+				body: payload,
 				headers: {
-					'Content-Type': 'application/json',
+					'Content-Type': endpointReqTypes[endpoint],
 				},
 				credentials: 'omit',
 				cache: 'no-cache',
diff --git a/packages/misskey-js/src/autogen/endpoint.ts b/packages/misskey-js/src/autogen/endpoint.ts
index 20c8509d4c..be41951e4d 100644
--- a/packages/misskey-js/src/autogen/endpoint.ts
+++ b/packages/misskey-js/src/autogen/endpoint.ts
@@ -954,3 +954,385 @@ export type Endpoints = {
 	'reversi/surrender': { req: ReversiSurrenderRequest; res: EmptyResponse };
 	'reversi/verify': { req: ReversiVerifyRequest; res: ReversiVerifyResponse };
 }
+
+export const endpointReqTypes: Record<keyof Endpoints, 'application/json' | 'multipart/form-data'> = {
+	'admin/meta': 'application/json',
+	'admin/abuse-user-reports': 'application/json',
+	'admin/abuse-report/notification-recipient/list': 'application/json',
+	'admin/abuse-report/notification-recipient/show': 'application/json',
+	'admin/abuse-report/notification-recipient/create': 'application/json',
+	'admin/abuse-report/notification-recipient/update': 'application/json',
+	'admin/abuse-report/notification-recipient/delete': 'application/json',
+	'admin/accounts/create': 'application/json',
+	'admin/accounts/delete': 'application/json',
+	'admin/accounts/find-by-email': 'application/json',
+	'admin/ad/create': 'application/json',
+	'admin/ad/delete': 'application/json',
+	'admin/ad/list': 'application/json',
+	'admin/ad/update': 'application/json',
+	'admin/announcements/create': 'application/json',
+	'admin/announcements/delete': 'application/json',
+	'admin/announcements/list': 'application/json',
+	'admin/announcements/update': 'application/json',
+	'admin/avatar-decorations/create': 'application/json',
+	'admin/avatar-decorations/delete': 'application/json',
+	'admin/avatar-decorations/list': 'application/json',
+	'admin/avatar-decorations/update': 'application/json',
+	'admin/delete-all-files-of-a-user': 'application/json',
+	'admin/unset-user-avatar': 'application/json',
+	'admin/unset-user-banner': 'application/json',
+	'admin/drive/clean-remote-files': 'application/json',
+	'admin/drive/cleanup': 'application/json',
+	'admin/drive/files': 'application/json',
+	'admin/drive/show-file': 'application/json',
+	'admin/emoji/add-aliases-bulk': 'application/json',
+	'admin/emoji/add': 'application/json',
+	'admin/emoji/copy': 'application/json',
+	'admin/emoji/delete-bulk': 'application/json',
+	'admin/emoji/delete': 'application/json',
+	'admin/emoji/import-zip': 'application/json',
+	'admin/emoji/list-remote': 'application/json',
+	'admin/emoji/list': 'application/json',
+	'admin/emoji/remove-aliases-bulk': 'application/json',
+	'admin/emoji/set-aliases-bulk': 'application/json',
+	'admin/emoji/set-category-bulk': 'application/json',
+	'admin/emoji/set-license-bulk': 'application/json',
+	'admin/emoji/update': 'application/json',
+	'admin/federation/delete-all-files': 'application/json',
+	'admin/federation/refresh-remote-instance-metadata': 'application/json',
+	'admin/federation/remove-all-following': 'application/json',
+	'admin/federation/update-instance': 'application/json',
+	'admin/get-index-stats': 'application/json',
+	'admin/get-table-stats': 'application/json',
+	'admin/get-user-ips': 'application/json',
+	'admin/invite/create': 'application/json',
+	'admin/invite/list': 'application/json',
+	'admin/promo/create': 'application/json',
+	'admin/queue/clear': 'application/json',
+	'admin/queue/deliver-delayed': 'application/json',
+	'admin/queue/inbox-delayed': 'application/json',
+	'admin/queue/promote': 'application/json',
+	'admin/queue/stats': 'application/json',
+	'admin/relays/add': 'application/json',
+	'admin/relays/list': 'application/json',
+	'admin/relays/remove': 'application/json',
+	'admin/reset-password': 'application/json',
+	'admin/resolve-abuse-user-report': 'application/json',
+	'admin/send-email': 'application/json',
+	'admin/server-info': 'application/json',
+	'admin/show-moderation-logs': 'application/json',
+	'admin/show-user': 'application/json',
+	'admin/show-users': 'application/json',
+	'admin/suspend-user': 'application/json',
+	'admin/unsuspend-user': 'application/json',
+	'admin/update-meta': 'application/json',
+	'admin/delete-account': 'application/json',
+	'admin/update-user-note': 'application/json',
+	'admin/roles/create': 'application/json',
+	'admin/roles/delete': 'application/json',
+	'admin/roles/list': 'application/json',
+	'admin/roles/show': 'application/json',
+	'admin/roles/update': 'application/json',
+	'admin/roles/assign': 'application/json',
+	'admin/roles/unassign': 'application/json',
+	'admin/roles/update-default-policies': 'application/json',
+	'admin/roles/users': 'application/json',
+	'admin/system-webhook/create': 'application/json',
+	'admin/system-webhook/delete': 'application/json',
+	'admin/system-webhook/list': 'application/json',
+	'admin/system-webhook/show': 'application/json',
+	'admin/system-webhook/update': 'application/json',
+	'announcements': 'application/json',
+	'announcements/show': 'application/json',
+	'antennas/create': 'application/json',
+	'antennas/delete': 'application/json',
+	'antennas/list': 'application/json',
+	'antennas/notes': 'application/json',
+	'antennas/show': 'application/json',
+	'antennas/update': 'application/json',
+	'ap/get': 'application/json',
+	'ap/show': 'application/json',
+	'app/create': 'application/json',
+	'app/show': 'application/json',
+	'auth/accept': 'application/json',
+	'auth/session/generate': 'application/json',
+	'auth/session/show': 'application/json',
+	'auth/session/userkey': 'application/json',
+	'blocking/create': 'application/json',
+	'blocking/delete': 'application/json',
+	'blocking/list': 'application/json',
+	'channels/create': 'application/json',
+	'channels/featured': 'application/json',
+	'channels/follow': 'application/json',
+	'channels/followed': 'application/json',
+	'channels/owned': 'application/json',
+	'channels/show': 'application/json',
+	'channels/timeline': 'application/json',
+	'channels/unfollow': 'application/json',
+	'channels/update': 'application/json',
+	'channels/favorite': 'application/json',
+	'channels/unfavorite': 'application/json',
+	'channels/my-favorites': 'application/json',
+	'channels/search': 'application/json',
+	'charts/active-users': 'application/json',
+	'charts/ap-request': 'application/json',
+	'charts/drive': 'application/json',
+	'charts/federation': 'application/json',
+	'charts/instance': 'application/json',
+	'charts/notes': 'application/json',
+	'charts/user/drive': 'application/json',
+	'charts/user/following': 'application/json',
+	'charts/user/notes': 'application/json',
+	'charts/user/pv': 'application/json',
+	'charts/user/reactions': 'application/json',
+	'charts/users': 'application/json',
+	'clips/add-note': 'application/json',
+	'clips/remove-note': 'application/json',
+	'clips/create': 'application/json',
+	'clips/delete': 'application/json',
+	'clips/list': 'application/json',
+	'clips/notes': 'application/json',
+	'clips/show': 'application/json',
+	'clips/update': 'application/json',
+	'clips/favorite': 'application/json',
+	'clips/unfavorite': 'application/json',
+	'clips/my-favorites': 'application/json',
+	'drive': 'application/json',
+	'drive/files': 'application/json',
+	'drive/files/attached-notes': 'application/json',
+	'drive/files/check-existence': 'application/json',
+	'drive/files/create': 'multipart/form-data',
+	'drive/files/delete': 'application/json',
+	'drive/files/find-by-hash': 'application/json',
+	'drive/files/find': 'application/json',
+	'drive/files/show': 'application/json',
+	'drive/files/update': 'application/json',
+	'drive/files/upload-from-url': 'application/json',
+	'drive/folders': 'application/json',
+	'drive/folders/create': 'application/json',
+	'drive/folders/delete': 'application/json',
+	'drive/folders/find': 'application/json',
+	'drive/folders/show': 'application/json',
+	'drive/folders/update': 'application/json',
+	'drive/stream': 'application/json',
+	'email-address/available': 'application/json',
+	'endpoint': 'application/json',
+	'endpoints': 'application/json',
+	'export-custom-emojis': 'application/json',
+	'federation/followers': 'application/json',
+	'federation/following': 'application/json',
+	'federation/instances': 'application/json',
+	'federation/show-instance': 'application/json',
+	'federation/update-remote-user': 'application/json',
+	'federation/users': 'application/json',
+	'federation/stats': 'application/json',
+	'following/create': 'application/json',
+	'following/delete': 'application/json',
+	'following/update': 'application/json',
+	'following/update-all': 'application/json',
+	'following/invalidate': 'application/json',
+	'following/requests/accept': 'application/json',
+	'following/requests/cancel': 'application/json',
+	'following/requests/list': 'application/json',
+	'following/requests/reject': 'application/json',
+	'gallery/featured': 'application/json',
+	'gallery/popular': 'application/json',
+	'gallery/posts': 'application/json',
+	'gallery/posts/create': 'application/json',
+	'gallery/posts/delete': 'application/json',
+	'gallery/posts/like': 'application/json',
+	'gallery/posts/show': 'application/json',
+	'gallery/posts/unlike': 'application/json',
+	'gallery/posts/update': 'application/json',
+	'get-online-users-count': 'application/json',
+	'get-avatar-decorations': 'application/json',
+	'hashtags/list': 'application/json',
+	'hashtags/search': 'application/json',
+	'hashtags/show': 'application/json',
+	'hashtags/trend': 'application/json',
+	'hashtags/users': 'application/json',
+	'i': 'application/json',
+	'i/2fa/done': 'application/json',
+	'i/2fa/key-done': 'application/json',
+	'i/2fa/password-less': 'application/json',
+	'i/2fa/register-key': 'application/json',
+	'i/2fa/register': 'application/json',
+	'i/2fa/update-key': 'application/json',
+	'i/2fa/remove-key': 'application/json',
+	'i/2fa/unregister': 'application/json',
+	'i/apps': 'application/json',
+	'i/authorized-apps': 'application/json',
+	'i/claim-achievement': 'application/json',
+	'i/change-password': 'application/json',
+	'i/delete-account': 'application/json',
+	'i/export-blocking': 'application/json',
+	'i/export-following': 'application/json',
+	'i/export-mute': 'application/json',
+	'i/export-notes': 'application/json',
+	'i/export-clips': 'application/json',
+	'i/export-favorites': 'application/json',
+	'i/export-user-lists': 'application/json',
+	'i/export-antennas': 'application/json',
+	'i/favorites': 'application/json',
+	'i/gallery/likes': 'application/json',
+	'i/gallery/posts': 'application/json',
+	'i/import-blocking': 'application/json',
+	'i/import-following': 'application/json',
+	'i/import-muting': 'application/json',
+	'i/import-user-lists': 'application/json',
+	'i/import-antennas': 'application/json',
+	'i/notifications': 'application/json',
+	'i/notifications-grouped': 'application/json',
+	'i/page-likes': 'application/json',
+	'i/pages': 'application/json',
+	'i/pin': 'application/json',
+	'i/read-all-unread-notes': 'application/json',
+	'i/read-announcement': 'application/json',
+	'i/regenerate-token': 'application/json',
+	'i/registry/get-all': 'application/json',
+	'i/registry/get-detail': 'application/json',
+	'i/registry/get': 'application/json',
+	'i/registry/keys-with-type': 'application/json',
+	'i/registry/keys': 'application/json',
+	'i/registry/remove': 'application/json',
+	'i/registry/scopes-with-domain': 'application/json',
+	'i/registry/set': 'application/json',
+	'i/revoke-token': 'application/json',
+	'i/signin-history': 'application/json',
+	'i/unpin': 'application/json',
+	'i/update-email': 'application/json',
+	'i/update': 'application/json',
+	'i/move': 'application/json',
+	'i/webhooks/create': 'application/json',
+	'i/webhooks/list': 'application/json',
+	'i/webhooks/show': 'application/json',
+	'i/webhooks/update': 'application/json',
+	'i/webhooks/delete': 'application/json',
+	'invite/create': 'application/json',
+	'invite/delete': 'application/json',
+	'invite/list': 'application/json',
+	'invite/limit': 'application/json',
+	'meta': 'application/json',
+	'emojis': 'application/json',
+	'emoji': 'application/json',
+	'miauth/gen-token': 'application/json',
+	'mute/create': 'application/json',
+	'mute/delete': 'application/json',
+	'mute/list': 'application/json',
+	'renote-mute/create': 'application/json',
+	'renote-mute/delete': 'application/json',
+	'renote-mute/list': 'application/json',
+	'my/apps': 'application/json',
+	'notes': 'application/json',
+	'notes/children': 'application/json',
+	'notes/clips': 'application/json',
+	'notes/conversation': 'application/json',
+	'notes/create': 'application/json',
+	'notes/delete': 'application/json',
+	'notes/favorites/create': 'application/json',
+	'notes/favorites/delete': 'application/json',
+	'notes/featured': 'application/json',
+	'notes/global-timeline': 'application/json',
+	'notes/hybrid-timeline': 'application/json',
+	'notes/local-timeline': 'application/json',
+	'notes/mentions': 'application/json',
+	'notes/polls/recommendation': 'application/json',
+	'notes/polls/vote': 'application/json',
+	'notes/reactions': 'application/json',
+	'notes/reactions/create': 'application/json',
+	'notes/reactions/delete': 'application/json',
+	'notes/renotes': 'application/json',
+	'notes/replies': 'application/json',
+	'notes/search-by-tag': 'application/json',
+	'notes/search': 'application/json',
+	'notes/show': 'application/json',
+	'notes/state': 'application/json',
+	'notes/thread-muting/create': 'application/json',
+	'notes/thread-muting/delete': 'application/json',
+	'notes/timeline': 'application/json',
+	'notes/translate': 'application/json',
+	'notes/unrenote': 'application/json',
+	'notes/user-list-timeline': 'application/json',
+	'notifications/create': 'application/json',
+	'notifications/flush': 'application/json',
+	'notifications/mark-all-as-read': 'application/json',
+	'notifications/test-notification': 'application/json',
+	'page-push': 'application/json',
+	'pages/create': 'application/json',
+	'pages/delete': 'application/json',
+	'pages/featured': 'application/json',
+	'pages/like': 'application/json',
+	'pages/show': 'application/json',
+	'pages/unlike': 'application/json',
+	'pages/update': 'application/json',
+	'flash/create': 'application/json',
+	'flash/delete': 'application/json',
+	'flash/featured': 'application/json',
+	'flash/like': 'application/json',
+	'flash/show': 'application/json',
+	'flash/unlike': 'application/json',
+	'flash/update': 'application/json',
+	'flash/my': 'application/json',
+	'flash/my-likes': 'application/json',
+	'ping': 'application/json',
+	'pinned-users': 'application/json',
+	'promo/read': 'application/json',
+	'roles/list': 'application/json',
+	'roles/show': 'application/json',
+	'roles/users': 'application/json',
+	'roles/notes': 'application/json',
+	'request-reset-password': 'application/json',
+	'reset-db': 'application/json',
+	'reset-password': 'application/json',
+	'server-info': 'application/json',
+	'stats': 'application/json',
+	'sw/show-registration': 'application/json',
+	'sw/update-registration': 'application/json',
+	'sw/register': 'application/json',
+	'sw/unregister': 'application/json',
+	'test': 'application/json',
+	'username/available': 'application/json',
+	'users': 'application/json',
+	'users/clips': 'application/json',
+	'users/followers': 'application/json',
+	'users/following': 'application/json',
+	'users/gallery/posts': 'application/json',
+	'users/get-frequently-replied-users': 'application/json',
+	'users/featured-notes': 'application/json',
+	'users/lists/create': 'application/json',
+	'users/lists/delete': 'application/json',
+	'users/lists/list': 'application/json',
+	'users/lists/pull': 'application/json',
+	'users/lists/push': 'application/json',
+	'users/lists/show': 'application/json',
+	'users/lists/favorite': 'application/json',
+	'users/lists/unfavorite': 'application/json',
+	'users/lists/update': 'application/json',
+	'users/lists/create-from-public': 'application/json',
+	'users/lists/update-membership': 'application/json',
+	'users/lists/get-memberships': 'application/json',
+	'users/notes': 'application/json',
+	'users/pages': 'application/json',
+	'users/flashs': 'application/json',
+	'users/reactions': 'application/json',
+	'users/recommendation': 'application/json',
+	'users/relation': 'application/json',
+	'users/report-abuse': 'application/json',
+	'users/search-by-username-and-host': 'application/json',
+	'users/search': 'application/json',
+	'users/show': 'application/json',
+	'users/achievements': 'application/json',
+	'users/update-memo': 'application/json',
+	'fetch-rss': 'application/json',
+	'fetch-external-resources': 'application/json',
+	'retention': 'application/json',
+	'bubble-game/register': 'application/json',
+	'bubble-game/ranking': 'application/json',
+	'reversi/cancel-match': 'application/json',
+	'reversi/games': 'application/json',
+	'reversi/match': 'application/json',
+	'reversi/invitations': 'application/json',
+	'reversi/show-game': 'application/json',
+	'reversi/surrender': 'application/json',
+	'reversi/verify': 'application/json',
+};
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index b59f8dcbe3..ff731a2fa6 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -13850,7 +13850,7 @@ export type operations = {
            * Format: binary
            * @description The file contents.
            */
-          file: string;
+          file: Blob;
         };
       };
     };
diff --git a/packages/misskey-js/test/api.ts b/packages/misskey-js/test/api.ts
index fa31d23faa..95f1946fa2 100644
--- a/packages/misskey-js/test/api.ts
+++ b/packages/misskey-js/test/api.ts
@@ -5,13 +5,19 @@ enableFetchMocks();
 
 function getFetchCall(call: any[]) {
 	const { body, method } = call[1];
-	if (body != null && typeof body != 'string') {
+	const contentType = call[1].headers['Content-Type'];
+	if (
+		body == null ||
+		(contentType === 'application/json' && typeof body !== 'string') ||
+		(contentType === 'multipart/form-data' && !(body instanceof FormData))
+	) {
 		throw new Error('invalid body');
 	}
 	return {
 		url: call[0],
 		method: method,
-		body: JSON.parse(body as any)
+		contentType: contentType,
+		body: body instanceof FormData ? Object.fromEntries(body.entries()) : JSON.parse(body),
 	};
 }
 
@@ -45,6 +51,7 @@ describe('API', () => {
 		expect(getFetchCall(fetchMock.mock.calls[0])).toEqual({
 			url: 'https://misskey.test/api/i',
 			method: 'POST',
+			contentType: 'application/json',
 			body: { i: 'TOKEN' }
 		});
 	});
@@ -78,10 +85,52 @@ describe('API', () => {
 		expect(getFetchCall(fetchMock.mock.calls[0])).toEqual({
 			url: 'https://misskey.test/api/notes/show',
 			method: 'POST',
+			contentType: 'application/json',
 			body: { i: 'TOKEN', noteId: 'aaaaa' }
 		});
 	});
 
+	test('multipart/form-data', async () => {
+		fetchMock.resetMocks();
+		fetchMock.mockResponse(async (req) => {
+			if (req.method == 'POST' && req.url == 'https://misskey.test/api/drive/files/create') {
+				if (req.headers.get('Content-Type')?.includes('multipart/form-data')) {
+					return JSON.stringify({ id: 'foo' });
+				} else {
+					return { status: 400 };
+				}
+			} else {
+				return { status: 404 };
+			}
+		});
+
+		const cli = new APIClient({
+			origin: 'https://misskey.test',
+			credential: 'TOKEN',
+		});
+
+		const testFile = new File([], 'foo.txt');
+
+		const res = await cli.request('drive/files/create', {
+			file: testFile,
+			name: null, // nullのパラメータは消える
+		});
+
+		expect(res).toEqual({
+			id: 'foo'
+		});
+
+		expect(getFetchCall(fetchMock.mock.calls[0])).toEqual({
+			url: 'https://misskey.test/api/drive/files/create',
+			method: 'POST',
+			contentType: 'multipart/form-data',
+			body: {
+				i: 'TOKEN',
+				file: testFile,
+			}
+		});
+	});
+
 	test('204 No Content で null が返る', async () => {
 		fetchMock.resetMocks();
 		fetchMock.mockResponse(async (req) => {
@@ -104,6 +153,7 @@ describe('API', () => {
 		expect(getFetchCall(fetchMock.mock.calls[0])).toEqual({
 			url: 'https://misskey.test/api/reset-password',
 			method: 'POST',
+			contentType: 'application/json',
 			body: { i: 'TOKEN', token: 'aaa', password: 'aaa' }
 		});
 	});

From 9ef6c4716ca25d8adeb5344c82a433370a086f88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 7 Jul 2024 14:19:00 +0900
Subject: [PATCH 022/221] =?UTF-8?q?fix(backend):=20=E5=90=8D=E5=89=8D?=
 =?UTF-8?q?=E3=82=92=E7=A9=BA=E7=99=BD=E6=96=87=E5=AD=97=E5=88=97=E3=81=A0?=
 =?UTF-8?q?=E3=81=91=E3=81=AB=E3=81=A7=E3=81=8D=E3=82=8B=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20(#14119)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(backend): 名前を空白文字列だけにできる問題を修正

* Update Changelog

* fix test

* Unicodeを含める

* fix

* ユーザー名がUnicode制御文字とスペースのみで構成される場合はnullに

* Revert "ユーザー名がUnicode制御文字とスペースのみで構成される場合はnullに"

This reverts commit 6c752a69c0d3649072e7e4ed30025183bceb48f9.

* [ci skip] changelog typo
---
 CHANGELOG.md                                        |  2 ++
 .../backend/src/server/api/endpoints/i/update.ts    |  9 ++++++++-
 packages/backend/test/e2e/endpoints.ts              | 13 +++++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23de5957fd..f62f966451 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,8 @@
 - Fix: 自分以外のクリップ内のノート個数が見えることがあるのを修正
 - Fix: 空文字列のリアクションはフォールバックされるように
 - Fix: リノートにリアクションできないように
+- Fix: ユーザー名の前後に空白文字列がある場合は省略するように
+- Fix: プロフィール編集時に名前を空白文字列のみにできる問題を修正
 
 ### Misskey.js
 - Feat: `/drive/files/create` のリクエストに対応（`multipart/form-data`に対応）
diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index a8e702f328..b39b52bc41 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -257,7 +257,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			const profile = await this.userProfilesRepository.findOneByOrFail({ userId: user.id });
 
-			if (ps.name !== undefined) updates.name = ps.name;
+			if (ps.name !== undefined) {
+				if (ps.name === null) {
+					updates.name = null;
+				} else {
+					const trimmedName = ps.name.trim();
+					updates.name = trimmedName === '' ? null : trimmedName;
+				}
+			}
 			if (ps.description !== undefined) profileUpdates.description = ps.description;
 			if (ps.lang !== undefined) profileUpdates.lang = ps.lang;
 			if (ps.location !== undefined) profileUpdates.location = ps.location;
diff --git a/packages/backend/test/e2e/endpoints.ts b/packages/backend/test/e2e/endpoints.ts
index d5583ea8bb..2b2699ecd9 100644
--- a/packages/backend/test/e2e/endpoints.ts
+++ b/packages/backend/test/e2e/endpoints.ts
@@ -117,12 +117,21 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.body.birthday, myBirthday);
 		});
 
-		test('名前を空白にできる', async () => {
+		test('名前を空白のみにした場合nullになる', async () => {
 			const res = await api('i/update', {
 				name: ' ',
 			}, alice);
 			assert.strictEqual(res.status, 200);
-			assert.strictEqual(res.body.name, ' ');
+			assert.strictEqual(res.body.name, null);
+		});
+
+		test('名前の前後に空白（ホワイトスペース）を入れてもトリムされる', async () => {
+			const res = await api('i/update', {
+				// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lexical_grammar#white_space
+				name: ' あ い う \u0009\u000b\u000c\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\ufeff',
+			}, alice);
+			assert.strictEqual(res.status, 200);
+			assert.strictEqual(res.body.name, 'あ い う');
 		});
 
 		test('誕生日の設定を削除できる', async () => {

From 55c990e0d9ed0b5b9df53019c46c8be88a6d9bf5 Mon Sep 17 00:00:00 2001
From: woxtu <woxtup@gmail.com>
Date: Tue, 9 Jul 2024 12:42:02 +0900
Subject: [PATCH 023/221] Fix compose file name (#14153)

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 06c2d2f21d..b718f3703f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -165,7 +165,7 @@ cp .github/misskey/test.yml .config/
 ```
 Prepare DB/Redis for testing.
 ```
-docker compose -f packages/backend/test/compose.yaml up
+docker compose -f packages/backend/test/compose.yml up
 ```
 Alternatively, prepare an empty (data can be erased) DB and edit `.config/test.yml`.
 

From b61f270eae18121357748a199ae3044304128a46 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 9 Jul 2024 16:08:49 +0900
Subject: [PATCH 024/221] Bump release actions to v2 (develop-stable(master)
 branches system) (#13941)

---
 .github/workflows/release-edit-with-push.yml | 14 ++++++++------
 .github/workflows/release-with-dispatch.yml  | 20 +++++++++++---------
 .github/workflows/release-with-ready.yml     | 13 ++++++++-----
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/release-edit-with-push.yml b/.github/workflows/release-edit-with-push.yml
index 86ee0b3fb5..e1bcb5a665 100644
--- a/.github/workflows/release-edit-with-push.yml
+++ b/.github/workflows/release-edit-with-push.yml
@@ -3,7 +3,7 @@ name: "Release Manager: sync changelog with PR"
 on:
   push:
     branches:
-      - release/**
+      - develop
     paths:
       - 'CHANGELOG.md'
 
@@ -20,17 +20,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      # headがrelease/かつopenのPRを1つ取得
+      # headが$GITHUB_REF_NAME, baseが$STABLE_BRANCHかつopenのPRを1つ取得
       - name: Get PR
         run: |
-          echo "pr_number=$(gh pr list --limit 1 --head "$GITHUB_REF_NAME" --json number --jq '.[] | .number')" >> $GITHUB_OUTPUT
+          echo "pr_number=$(gh pr list --limit 1 --search "head:$GITHUB_REF_NAME base:$STABLE_BRANCH is:open" --json number  --jq '.[] | .number')" >> $GITHUB_OUTPUT
         id: get_pr
+        env:
+          STABLE_BRANCH: ${{ vars.STABLE_BRANCH }}
       - name: Get target version
-        uses: misskey-dev/release-manager-actions/.github/actions/get-target-version@v1
+        uses: misskey-dev/release-manager-actions/.github/actions/get-target-version@v2
         id: v
       # CHANGELOG.mdの内容を取得
       - name: Get changelog
-        uses: misskey-dev/release-manager-actions/.github/actions/get-changelog@v1
+        uses: misskey-dev/release-manager-actions/.github/actions/get-changelog@v2
         with:
           version: ${{ steps.v.outputs.target_version }}
         id: changelog
@@ -39,5 +41,5 @@ jobs:
         run: |
           gh pr edit "$PR_NUMBER" --body "$CHANGELOG"
         env:
-          CHANGELOG: ${{ steps.changelog.outputs.changelog }}
           PR_NUMBER: ${{ steps.get_pr.outputs.pr_number }}
+          CHANGELOG: ${{ steps.changelog.outputs.changelog }}
diff --git a/.github/workflows/release-with-dispatch.yml b/.github/workflows/release-with-dispatch.yml
index bc6448cb37..0936bc0ae8 100644
--- a/.github/workflows/release-with-dispatch.yml
+++ b/.github/workflows/release-with-dispatch.yml
@@ -33,18 +33,21 @@ jobs:
       pr_number: ${{ steps.get_pr.outputs.pr_number }}
     steps:
       - uses: actions/checkout@v4
-      # headがrelease/かつopenのPRを1つ取得
+      # headが$GITHUB_REF_NAME, baseが$STABLE_BRANCHかつopenのPRを1つ取得
       - name: Get PRs
         run: |
-          echo "pr_number=$(gh pr list --limit 1 --search "head:release/ is:open" --json number  --jq '.[] | .number')" >> $GITHUB_OUTPUT
+          echo "pr_number=$(gh pr list --limit 1 --search "head:$GITHUB_REF_NAME base:$STABLE_BRANCH is:open" --json number  --jq '.[] | .number')" >> $GITHUB_OUTPUT
         id: get_pr
+        env:
+          STABLE_BRANCH: ${{ vars.STABLE_BRANCH }}
 
   merge:
-    uses: misskey-dev/release-manager-actions/.github/workflows/merge.yml@v1
+    uses: misskey-dev/release-manager-actions/.github/workflows/merge.yml@v2
     needs: get-pr
     if: ${{ needs.get-pr.outputs.pr_number != '' && inputs.merge == true }}
     with:
       pr_number: ${{ needs.get-pr.outputs.pr_number }}
+      user: 'github-actions[bot]'
       package_jsons_to_rewrite: ${{ vars.PACKAGE_JSONS_TO_REWRITE }}
       # Text to prepend to the changelog
       # The first line must be `## Unreleased`
@@ -65,15 +68,14 @@ jobs:
     secrets:
       RELEASE_APP_ID: ${{ secrets.RELEASE_APP_ID }}
       RELEASE_APP_PRIVATE_KEY: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
-      RULESET_EDIT_APP_ID: ${{ secrets.RULESET_EDIT_APP_ID }}
-      RULESET_EDIT_APP_PRIVATE_KEY: ${{ secrets.RULESET_EDIT_APP_PRIVATE_KEY }}
 
   create-prerelease:
-    uses: misskey-dev/release-manager-actions/.github/workflows/create-prerelease.yml@v1
+    uses: misskey-dev/release-manager-actions/.github/workflows/create-prerelease.yml@v2
     needs: get-pr
     if: ${{ needs.get-pr.outputs.pr_number != '' && inputs.merge != true  }}
     with:
       pr_number: ${{ needs.get-pr.outputs.pr_number }}
+      user: 'github-actions[bot]'
       package_jsons_to_rewrite: ${{ vars.PACKAGE_JSONS_TO_REWRITE }}
       use_external_app_to_release: ${{ vars.USE_RELEASE_APP == 'true' }}
       indent: ${{ vars.INDENT }}
@@ -82,10 +84,11 @@ jobs:
       RELEASE_APP_PRIVATE_KEY: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
 
   create-target:
-    uses: misskey-dev/release-manager-actions/.github/workflows/create-target.yml@v1
+    uses: misskey-dev/release-manager-actions/.github/workflows/create-target.yml@v2
     needs: get-pr
     if: ${{ needs.get-pr.outputs.pr_number == '' }}
     with:
+      user: 'github-actions[bot]'
       # The script for version increment.
       # process.env.CURRENT_VERSION: The current version.
       #
@@ -118,8 +121,7 @@ jobs:
       package_jsons_to_rewrite: ${{ vars.PACKAGE_JSONS_TO_REWRITE }}
       use_external_app_to_release: ${{ vars.USE_RELEASE_APP == 'true' }}
       indent: ${{ vars.INDENT }}
+      stable_branch: ${{ vars.STABLE_BRANCH }}
     secrets:
       RELEASE_APP_ID: ${{ secrets.RELEASE_APP_ID }}
       RELEASE_APP_PRIVATE_KEY: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
-      RULESET_EDIT_APP_ID: ${{ secrets.RULESET_EDIT_APP_ID }}
-      RULESET_EDIT_APP_PRIVATE_KEY: ${{ secrets.RULESET_EDIT_APP_PRIVATE_KEY }}
diff --git a/.github/workflows/release-with-ready.yml b/.github/workflows/release-with-ready.yml
index a0fad0e336..79b6ade012 100644
--- a/.github/workflows/release-with-ready.yml
+++ b/.github/workflows/release-with-ready.yml
@@ -16,23 +16,26 @@ jobs:
   check:
     runs-on: ubuntu-latest
     outputs:
-      ref: ${{ steps.get_pr.outputs.ref }}
+      head: ${{ steps.get_pr.outputs.head }}
+      base: ${{ steps.get_pr.outputs.base }}
     steps:
       - uses: actions/checkout@v4
       # PR情報を取得
       - name: Get PR
         run: |
-          pr_json=$(gh pr view "$PR_NUMBER" --json isDraft,headRefName)
-          echo "ref=$(echo $pr_json | jq -r '.headRefName')" >> $GITHUB_OUTPUT
+          pr_json=$(gh pr view "$PR_NUMBER" --json isDraft,headRefName,baseRefName)
+          echo "head=$(echo $pr_json | jq -r '.headRefName')" >> $GITHUB_OUTPUT
+          echo "base=$(echo $pr_json | jq -r '.baseRefName')" >> $GITHUB_OUTPUT
         id: get_pr
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}
   release:
-    uses: misskey-dev/release-manager-actions/.github/workflows/create-prerelease.yml@v1
+    uses: misskey-dev/release-manager-actions/.github/workflows/create-prerelease.yml@v2
     needs: check
-    if: startsWith(needs.check.outputs.ref, 'release/')
+    if: needs.check.outputs.head == github.event.repository.default_branch && needs.check.outputs.base == vars.STABLE_BRANCH
     with:
       pr_number: ${{ github.event.pull_request.number }}
+      user: 'github-actions[bot]'
       package_jsons_to_rewrite: ${{ vars.PACKAGE_JSONS_TO_REWRITE }}
       use_external_app_to_release: ${{ vars.USE_RELEASE_APP == 'true' }}
       indent: ${{ vars.INDENT }}

From a5407131d4d15edca924e2718902cefd81e49ee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 9 Jul 2024 17:59:15 +0900
Subject: [PATCH 025/221] =?UTF-8?q?fix/refactor(frontend):=20hotkey?=
 =?UTF-8?q?=E3=81=AE=E6=94=B9=E4=BF=AE=20(#14157)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* improve(frontend): hotkeyの改修 (#234)

(cherry picked from commit 678be147f4db709dadf25d007cc2e679e98a370e)

* Change path, add missing script

Co-authored-by: taiy <53635909+taiyme@users.noreply.github.com>

* fix

* fix

* add missing keycodes

* fix

* update changelog

---------

Co-authored-by: taiy <53635909+taiyme@users.noreply.github.com>
---
 CHANGELOG.md                                  |   2 +
 packages/frontend/src/boot/main-boot.ts       |  27 +--
 .../frontend/src/components/MkMediaAudio.vue  |  47 +++--
 .../frontend/src/components/MkMediaVideo.vue  |  47 +++--
 packages/frontend/src/components/MkMenu.vue   |  20 +-
 packages/frontend/src/components/MkModal.vue  |   8 +-
 packages/frontend/src/components/MkNote.vue   |  57 +++++-
 .../src/components/MkNoteDetailed.vue         |  26 ++-
 packages/frontend/src/directives/hotkey.ts    |   2 +-
 .../frontend/src/pages/antenna-timeline.vue   |   5 +-
 packages/frontend/src/pages/timeline.vue      |   5 +-
 packages/frontend/src/scripts/hotkey.ts       | 173 +++++++++++-------
 packages/frontend/src/scripts/keycode.ts      |  24 ---
 13 files changed, 273 insertions(+), 170 deletions(-)
 delete mode 100644 packages/frontend/src/scripts/keycode.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f62f966451..1bcf721676 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@
 - Fix: コントロールパネルでベースロールのポリシーを編集してもUI上では変更が反映されない問題を修正 
 - Fix: アンテナの編集画面のボタンに隙間を追加
 - Fix: テーマプレビューが見れない問題を修正
+- Fix: ショートカットキーが連打できる問題を修正  
+  (Cherry-picked from https://github.com/taiyme/misskey/pull/234)
 
 ### Server
 - Feat: レートリミット制限に引っかかったときに`Retry-After`ヘッダーを返すように (#13949)
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index faf230a1a2..d327016317 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -13,7 +13,6 @@ import * as sound from '@/scripts/sound.js';
 import { $i, signout, updateAccount } from '@/account.js';
 import { instance } from '@/instance.js';
 import { ColdDeviceStorage, defaultStore } from '@/store.js';
-import { makeHotkey } from '@/scripts/hotkey.js';
 import { reactionPicker } from '@/scripts/reaction-picker.js';
 import { miLocalStorage } from '@/local-storage.js';
 import { claimAchievement, claimedAchievements } from '@/scripts/achievements.js';
@@ -21,6 +20,7 @@ import { initializeSw } from '@/scripts/initialize-sw.js';
 import { deckStore } from '@/ui/deck/deck-store.js';
 import { emojiPicker } from '@/scripts/emoji-picker.js';
 import { mainRouter } from '@/router/main.js';
+import { type Keymap, makeHotkey } from '@/scripts/hotkey.js';
 
 export async function mainBoot() {
 	const { isClientUpdated } = await common(() => createApp(
@@ -69,14 +69,6 @@ export async function mainBoot() {
 		});
 	}
 
-	const hotkeys = {
-		'd': (): void => {
-			defaultStore.set('darkMode', !defaultStore.state.darkMode);
-		},
-		's': (): void => {
-			mainRouter.push('/search');
-		},
-	};
 	try {
 		if (defaultStore.state.enableSeasonalScreenEffect) {
 			const month = new Date().getMonth() + 1;
@@ -105,9 +97,6 @@ export async function mainBoot() {
 	}
 
 	if ($i) {
-		// only add post shortcuts if logged in
-		hotkeys['p|n'] = post;
-
 		defaultStore.loaded.then(() => {
 			if (defaultStore.state.accountSetupWizard !== -1) {
 				const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkUserSetupDialog.vue')), {}, {
@@ -334,7 +323,19 @@ export async function mainBoot() {
 	}
 
 	// shortcut
-	document.addEventListener('keydown', makeHotkey(hotkeys));
+	const keymap = {
+		'p|n': () => {
+			if ($i == null) return;
+			post();
+		},
+		'd': () => {
+			defaultStore.set('darkMode', !defaultStore.state.darkMode);
+		},
+		's': () => {
+			mainRouter.push('/search');
+		},
+	} as const satisfies Keymap;
+	document.addEventListener('keydown', makeHotkey(keymap), { passive: false });
 
 	initializeSw();
 }
diff --git a/packages/frontend/src/components/MkMediaAudio.vue b/packages/frontend/src/components/MkMediaAudio.vue
index ebd4fc9ca4..e8dfcc7768 100644
--- a/packages/frontend/src/components/MkMediaAudio.vue
+++ b/packages/frontend/src/components/MkMediaAudio.vue
@@ -80,6 +80,7 @@ import type { MenuItem } from '@/types/menu.js';
 import { defaultStore } from '@/store.js';
 import { i18n } from '@/i18n.js';
 import * as os from '@/os.js';
+import { type Keymap } from '@/scripts/hotkey.js';
 import bytes from '@/filters/bytes.js';
 import { hms } from '@/filters/hms.js';
 import MkMediaRange from '@/components/MkMediaRange.vue';
@@ -90,32 +91,44 @@ const props = defineProps<{
 }>();
 
 const keymap = {
-	'up': () => {
-		if (hasFocus() && audioEl.value) {
-			volume.value = Math.min(volume.value + 0.1, 1);
-		}
+	'up': {
+		allowRepeat: true,
+		callback: () => {
+			if (hasFocus() && audioEl.value) {
+				volume.value = Math.min(volume.value + 0.1, 1);
+			}
+		},
 	},
-	'down': () => {
-		if (hasFocus() && audioEl.value) {
-			volume.value = Math.max(volume.value - 0.1, 0);
-		}
+	'down': {
+		allowRepeat: true,
+		callback: () => {
+			if (hasFocus() && audioEl.value) {
+				volume.value = Math.max(volume.value - 0.1, 0);
+			}
+		},
 	},
-	'left': () => {
-		if (hasFocus() && audioEl.value) {
-			audioEl.value.currentTime = Math.max(audioEl.value.currentTime - 5, 0);
-		}
+	'left': {
+		allowRepeat: true,
+		callback: () => {
+			if (hasFocus() && audioEl.value) {
+				audioEl.value.currentTime = Math.max(audioEl.value.currentTime - 5, 0);
+			}
+		},
 	},
-	'right': () => {
-		if (hasFocus() && audioEl.value) {
-			audioEl.value.currentTime = Math.min(audioEl.value.currentTime + 5, audioEl.value.duration);
-		}
+	'right': {
+		allowRepeat: true,
+		callback: () => {
+			if (hasFocus() && audioEl.value) {
+				audioEl.value.currentTime = Math.min(audioEl.value.currentTime + 5, audioEl.value.duration);
+			}
+		},
 	},
 	'space': () => {
 		if (hasFocus()) {
 			togglePlayPause();
 		}
 	},
-};
+} as const satisfies Keymap;
 
 // PlayerElもしくはその子要素にフォーカスがあるかどうか
 function hasFocus() {
diff --git a/packages/frontend/src/components/MkMediaVideo.vue b/packages/frontend/src/components/MkMediaVideo.vue
index 707d7c1501..7c46084c63 100644
--- a/packages/frontend/src/components/MkMediaVideo.vue
+++ b/packages/frontend/src/components/MkMediaVideo.vue
@@ -112,6 +112,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { ref, shallowRef, computed, watch, onDeactivated, onActivated, onMounted } from 'vue';
 import * as Misskey from 'misskey-js';
 import type { MenuItem } from '@/types/menu.js';
+import { type Keymap } from '@/scripts/hotkey.js';
 import bytes from '@/filters/bytes.js';
 import { hms } from '@/filters/hms.js';
 import { defaultStore } from '@/store.js';
@@ -127,32 +128,44 @@ const props = defineProps<{
 }>();
 
 const keymap = {
-	'up': () => {
-		if (hasFocus() && videoEl.value) {
-			volume.value = Math.min(volume.value + 0.1, 1);
-		}
+	'up': {
+		allowRepeat: true,
+		callback: () => {
+			if (hasFocus() && videoEl.value) {
+				volume.value = Math.min(volume.value + 0.1, 1);
+			}
+		},
 	},
-	'down': () => {
-		if (hasFocus() && videoEl.value) {
-			volume.value = Math.max(volume.value - 0.1, 0);
-		}
+	'down': {
+		allowRepeat: true,
+		callback: () => {
+			if (hasFocus() && videoEl.value) {
+				volume.value = Math.max(volume.value - 0.1, 0);
+			}
+		},
 	},
-	'left': () => {
-		if (hasFocus() && videoEl.value) {
-			videoEl.value.currentTime = Math.max(videoEl.value.currentTime - 5, 0);
-		}
+	'left': {
+		allowRepeat: true,
+		callback: () => {
+			if (hasFocus() && videoEl.value) {
+				videoEl.value.currentTime = Math.max(videoEl.value.currentTime - 5, 0);
+			}
+		},
 	},
-	'right': () => {
-		if (hasFocus() && videoEl.value) {
-			videoEl.value.currentTime = Math.min(videoEl.value.currentTime + 5, videoEl.value.duration);
-		}
+	'right': {
+		allowRepeat: true,
+		callback: () => {
+			if (hasFocus() && videoEl.value) {
+				videoEl.value.currentTime = Math.min(videoEl.value.currentTime + 5, videoEl.value.duration);
+			}
+		},
 	},
 	'space': () => {
 		if (hasFocus()) {
 			togglePlayPause();
 		}
 	},
-};
+} as const satisfies Keymap;
 
 // PlayerElもしくはその子要素にフォーカスがあるかどうか
 function hasFocus() {
diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue
index d91239b9e2..119504f744 100644
--- a/packages/frontend/src/components/MkMenu.vue
+++ b/packages/frontend/src/components/MkMenu.vue
@@ -98,6 +98,7 @@ import { MenuItem, InnerMenuItem, MenuPending, MenuAction, MenuSwitch, MenuRadio
 import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
 import { isTouchUsing } from '@/scripts/touch.js';
+import { type Keymap } from '@/scripts/hotkey.js';
 
 const childrenCache = new WeakMap<MenuParent, MenuItem[]>();
 </script>
@@ -125,11 +126,20 @@ const items2 = ref<InnerMenuItem[]>();
 
 const child = shallowRef<InstanceType<typeof XChild>>();
 
-const keymap = computed(() => ({
-	'up|k|shift+tab': focusUp,
-	'down|j|tab': focusDown,
-	'esc': close,
-}));
+const keymap = {
+	'up|k|shift+tab': {
+		allowRepeat: true,
+		callback: () => focusUp(),
+	},
+	'down|j|tab': {
+		allowRepeat: true,
+		callback: () => focusDown(),
+	},
+	'esc': {
+		allowRepeat: true,
+		callback: () => close(false),
+	},
+} as const satisfies Keymap;
 
 const childShowingItem = ref<MenuItem | null>();
 
diff --git a/packages/frontend/src/components/MkModal.vue b/packages/frontend/src/components/MkModal.vue
index 9e69ab2207..264d8b6c9c 100644
--- a/packages/frontend/src/components/MkModal.vue
+++ b/packages/frontend/src/components/MkModal.vue
@@ -47,6 +47,7 @@ import * as os from '@/os.js';
 import { isTouchUsing } from '@/scripts/touch.js';
 import { defaultStore } from '@/store.js';
 import { deviceKind } from '@/scripts/device-kind.js';
+import { type Keymap } from '@/scripts/hotkey.js';
 
 function getFixedContainer(el: Element | null): Element | null {
 	if (el == null || el.tagName === 'BODY') return null;
@@ -154,8 +155,11 @@ if (type.value === 'drawer') {
 }
 
 const keymap = {
-	'esc': () => emit('esc'),
-};
+	'esc': {
+		allowRepeat: true,
+		callback: () => emit('esc'),
+	},
+} as const satisfies Keymap;
 
 const MARGIN = 16;
 const SCROLLBAR_THICKNESS = 16;
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 1313e4c58e..5f1820a379 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -198,6 +198,7 @@ import MkRippleEffect from '@/components/MkRippleEffect.vue';
 import { showMovedDialog } from '@/scripts/show-moved-dialog.js';
 import { shouldCollapsed } from '@/scripts/collapsed.js';
 import { isEnabledUrlPreview } from '@/instance.js';
+import { type Keymap } from '@/scripts/hotkey.js';
 
 const props = withDefaults(defineProps<{
 	note: Misskey.entities.Note;
@@ -294,15 +295,53 @@ function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string
 }
 
 const keymap = {
-	'r': () => reply(true),
-	'e|a|plus': () => react(true),
-	'q': () => renote(true),
-	'up|k|shift+tab': focusBefore,
-	'down|j|tab': focusAfter,
-	'esc': blur,
-	'm|o': () => showMenu(true),
-	's': () => showContent.value !== showContent.value,
-};
+	'r': () => {
+		if (renoteCollapsed.value) return;
+		reply();
+	},
+	'e|a|plus': () => {
+		if (renoteCollapsed.value) return;
+		react();
+	},
+	'q': () => {
+		if (renoteCollapsed.value) return;
+		renote();
+	},
+	'm': () => {
+		if (renoteCollapsed.value) return;
+		showMenu();
+	},
+	'c': () => {
+		if (renoteCollapsed.value) return;
+		if (!defaultStore.state.showClipButtonInNoteFooter) return;
+		clip();
+	},
+	'o': () => {
+		if (renoteCollapsed.value) return;
+		galleryEl.value?.openGallery();
+	},
+	'v|enter': () => {
+		if (renoteCollapsed.value) {
+			renoteCollapsed.value = false;
+		} else if (appearNote.value.cw != null) {
+			showContent.value = !showContent.value;
+		} else if (isLong) {
+			collapsed.value = !collapsed.value;
+		}
+	},
+	'esc': {
+		allowRepeat: true,
+		callback: () => blur(),
+	},
+	'up|k|shift+tab': {
+		allowRepeat: true,
+		callback: () => focusBefore(),
+	},
+	'down|j|tab': {
+		allowRepeat: true,
+		callback: () => focusAfter(),
+	},
+} as const satisfies Keymap;
 
 provide('react', (reaction: string) => {
 	misskeyApi('notes/reactions/create', {
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index bc1f416373..8f65e3b60a 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -233,6 +233,7 @@ import MkPagination, { type Paging } from '@/components/MkPagination.vue';
 import MkReactionIcon from '@/components/MkReactionIcon.vue';
 import MkButton from '@/components/MkButton.vue';
 import { isEnabledUrlPreview } from '@/instance.js';
+import { type Keymap } from '@/scripts/hotkey.js';
 
 const props = withDefaults(defineProps<{
 	note: Misskey.entities.Note;
@@ -294,13 +295,24 @@ const replies = ref<Misskey.entities.Note[]>([]);
 const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || appearNote.value.userId === $i?.id);
 
 const keymap = {
-	'r': () => reply(true),
-	'e|a|plus': () => react(true),
-	'q': () => renote(true),
-	'esc': blur,
-	'm|o': () => showMenu(true),
-	's': () => showContent.value !== showContent.value,
-};
+	'r': () => reply(),
+	'e|a|plus': () => react(),
+	'q': () => renote(),
+	'm': () => showMenu(),
+	'c': () => {
+		if (!defaultStore.state.showClipButtonInNoteFooter) return;
+		clip();
+	},
+	'v|enter': () => {
+		if (appearNote.value.cw != null) {
+			showContent.value = !showContent.value;
+		}
+	},
+	'esc': {
+		allowRepeat: true,
+		callback: () => blur(),
+	},
+} as const satisfies Keymap;
 
 provide('react', (reaction: string) => {
 	misskeyApi('notes/reactions/create', {
diff --git a/packages/frontend/src/directives/hotkey.ts b/packages/frontend/src/directives/hotkey.ts
index b082b6edf2..0a7d136f18 100644
--- a/packages/frontend/src/directives/hotkey.ts
+++ b/packages/frontend/src/directives/hotkey.ts
@@ -4,7 +4,7 @@
  */
 
 import { Directive } from 'vue';
-import { makeHotkey } from '../scripts/hotkey.js';
+import { makeHotkey } from '@/scripts/hotkey.js';
 
 export default {
 	mounted(el, binding) {
diff --git a/packages/frontend/src/pages/antenna-timeline.vue b/packages/frontend/src/pages/antenna-timeline.vue
index 273250d1d0..ea64e457e3 100644
--- a/packages/frontend/src/pages/antenna-timeline.vue
+++ b/packages/frontend/src/pages/antenna-timeline.vue
@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <MkStickyContainer>
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="800">
-		<div ref="rootEl" v-hotkey.global="keymap">
+		<div ref="rootEl">
 			<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
@@ -44,9 +44,6 @@ const antenna = ref<Misskey.entities.Antenna | null>(null);
 const queue = ref(0);
 const rootEl = shallowRef<HTMLElement>();
 const tlEl = shallowRef<InstanceType<typeof MkTimeline>>();
-const keymap = computed(() => ({
-	't': focus,
-}));
 
 function queueUpdated(q) {
 	queue.value = q;
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index 98744c6318..813cc326d0 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #header><MkPageHeader v-model:tab="src" :actions="headerActions" :tabs="$i ? headerTabs : headerTabsWhenNotLogin" :displayMyAvatar="true"/></template>
 	<MkSpacer :contentMax="800">
 		<MkHorizontalSwipe v-model:tab="src" :tabs="$i ? headerTabs : headerTabsWhenNotLogin">
-			<div :key="src" ref="rootEl" v-hotkey.global="keymap">
+			<div :key="src" ref="rootEl">
 				<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>
@@ -58,9 +58,6 @@ provide('shouldOmitHeaderTitle', true);
 
 const isLocalTimelineAvailable = ($i == null && instance.policies.ltlAvailable) || ($i != null && $i.policies.ltlAvailable);
 const isGlobalTimelineAvailable = ($i == null && instance.policies.gtlAvailable) || ($i != null && $i.policies.gtlAvailable);
-const keymap = {
-	't': focus,
-};
 
 const tlComponent = shallowRef<InstanceType<typeof MkTimeline>>();
 const rootEl = shallowRef<HTMLElement>();
diff --git a/packages/frontend/src/scripts/hotkey.ts b/packages/frontend/src/scripts/hotkey.ts
index 0600bff893..fd79baa604 100644
--- a/packages/frontend/src/scripts/hotkey.ts
+++ b/packages/frontend/src/scripts/hotkey.ts
@@ -3,93 +3,132 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import keyCode from './keycode.js';
+//#region types
+export type Keymap = Record<string, CallbackFunction | CallbackObject>;
 
-type Callback = (ev: KeyboardEvent) => void;
+type CallbackFunction = (ev: KeyboardEvent) => unknown;
 
-type Keymap = Record<string, Callback>;
+type CallbackObject = {
+	callback: CallbackFunction;
+	allowRepeat?: boolean;
+};
 
 type Pattern = {
 	which: string[];
-	ctrl?: boolean;
-	shift?: boolean;
-	alt?: boolean;
+	ctrl: boolean;
+	alt: boolean;
+	shift: boolean;
 };
 
 type Action = {
 	patterns: Pattern[];
-	callback: Callback;
-	allowRepeat: boolean;
+	callback: CallbackFunction;
+	options: Required<Omit<CallbackObject, 'callback'>>;
+};
+//#endregion
+
+//#region consts
+const KEY_ALIASES = {
+	'esc': 'Escape',
+	'enter': ['Enter', 'NumpadEnter'],
+	'space': [' ', 'Spacebar'],
+	'up': 'ArrowUp',
+	'down': 'ArrowDown',
+	'left': 'ArrowLeft',
+	'right': 'ArrowRight',
+	'plus': ['+', ';'],
 };
 
-const parseKeymap = (keymap: Keymap) => Object.entries(keymap).map(([patterns, callback]): Action => {
-	const result = {
-		patterns: [],
-		callback,
-		allowRepeat: true,
-	} as Action;
+const MODIFIER_KEYS = ['ctrl', 'alt', 'shift'];
 
-	if (patterns.match(/^\(.*\)$/) !== null) {
-		result.allowRepeat = false;
-		patterns = patterns.slice(1, -1);
-	}
-
-	result.patterns = patterns.split('|').map(part => {
-		const pattern = {
-			which: [],
-			ctrl: false,
-			alt: false,
-			shift: false,
-		} as Pattern;
-
-		const keys = part.trim().split('+').map(x => x.trim().toLowerCase());
-		for (const key of keys) {
-			switch (key) {
-				case 'ctrl': pattern.ctrl = true; break;
-				case 'alt': pattern.alt = true; break;
-				case 'shift': pattern.shift = true; break;
-				default: pattern.which = keyCode(key).map(k => k.toLowerCase());
-			}
-		}
-
-		return pattern;
-	});
-
-	return result;
-});
-
-const ignoreElements = ['input', 'textarea'];
-
-function match(ev: KeyboardEvent, patterns: Action['patterns']): boolean {
-	const key = ev.key.toLowerCase();
-	return patterns.some(pattern => pattern.which.includes(key) &&
-		pattern.ctrl === ev.ctrlKey &&
-		pattern.shift === ev.shiftKey &&
-		pattern.alt === ev.altKey &&
-		!ev.metaKey,
-	);
-}
+const IGNORE_ELEMENTS = ['input', 'textarea'];
+//#endregion
 
+//#region impl
 export const makeHotkey = (keymap: Keymap) => {
 	const actions = parseKeymap(keymap);
-
 	return (ev: KeyboardEvent) => {
-		if (document.activeElement) {
-			if (ignoreElements.some(el => document.activeElement!.matches(el))) return;
-			if (document.activeElement.attributes['contenteditable']) return;
+		if ('pswp' in window && window.pswp != null) return;
+		if (document.activeElement != null) {
+			if (IGNORE_ELEMENTS.includes(document.activeElement.tagName.toLowerCase())) return;
+			if ((document.activeElement as HTMLElement).isContentEditable) return;
 		}
-
-		for (const action of actions) {
-			const matched = match(ev, action.patterns);
-
-			if (matched) {
-				if (!action.allowRepeat && ev.repeat) return;
-
+		for (const { patterns, callback, options } of actions) {
+			if (matchPatterns(ev, patterns, options)) {
 				ev.preventDefault();
 				ev.stopPropagation();
-				action.callback(ev);
-				break;
+				callback(ev);
 			}
 		}
 	};
 };
+
+const parseKeymap = (keymap: Keymap) => {
+	return Object.entries(keymap).map(([rawPatterns, rawCallback]) => {
+		const patterns = parsePatterns(rawPatterns);
+		const callback = parseCallback(rawCallback);
+		const options = parseOptions(rawCallback);
+		return { patterns, callback, options } as const satisfies Action;
+	});
+};
+
+const parsePatterns = (rawPatterns: keyof Keymap) => {
+	return rawPatterns.split('|').map(part => {
+		const keys = part.split('+').map(trimLower);
+		const which = parseKeyCode(keys.findLast(x => !MODIFIER_KEYS.includes(x)));
+		const ctrl = keys.includes('ctrl');
+		const alt = keys.includes('alt');
+		const shift = keys.includes('shift');
+		return { which, ctrl, alt, shift } as const satisfies Pattern;
+	});
+};
+
+const parseCallback = (rawCallback: Keymap[keyof Keymap]) => {
+	if (typeof rawCallback === 'object') {
+		return rawCallback.callback;
+	}
+	return rawCallback;
+};
+
+const parseOptions = (rawCallback: Keymap[keyof Keymap]) => {
+	const defaultOptions = {
+		allowRepeat: false,
+	} as const satisfies Action['options'];
+	if (typeof rawCallback === 'object') {
+		const { callback, ...rawOptions } = rawCallback;
+		const options = { ...defaultOptions, ...rawOptions };
+		return { ...options } as const satisfies Action['options'];
+	}
+	return { ...defaultOptions } as const satisfies Action['options'];
+};
+
+const matchPatterns = (ev: KeyboardEvent, patterns: Action['patterns'], options: Action['options']) => {
+	if (ev.repeat && !options.allowRepeat) return false;
+	const key = ev.key.toLowerCase();
+	return patterns.some(({ which, ctrl, shift, alt }) => {
+		if (!which.includes(key)) return false;
+		if (ctrl !== (ev.ctrlKey || ev.metaKey)) return false;
+		if (alt !== ev.altKey) return false;
+		if (shift !== ev.shiftKey) return false;
+		return true;
+	});
+};
+
+const parseKeyCode = (input?: string | null) => {
+	if (input == null) return [];
+	const raw = getValueByKey(KEY_ALIASES, input);
+	if (raw == null) return [input];
+	if (typeof raw === 'string') return [trimLower(raw)];
+	return raw.map(trimLower);
+};
+
+const getValueByKey = <
+	T extends Record<keyof any, unknown>,
+	K extends keyof T | keyof any,
+	R extends K extends keyof T ? T[K] : T[keyof T] | undefined,
+>(obj: T, key: K) => {
+	return obj[key] as R;
+};
+
+const trimLower = (str: string) => str.trim().toLowerCase();
+//#endregion
diff --git a/packages/frontend/src/scripts/keycode.ts b/packages/frontend/src/scripts/keycode.ts
deleted file mode 100644
index 7ffceafada..0000000000
--- a/packages/frontend/src/scripts/keycode.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export default (input: string): string[] => {
-	if (Object.keys(aliases).some(a => a.toLowerCase() === input.toLowerCase())) {
-		const codes = aliases[input];
-		return Array.isArray(codes) ? codes : [codes];
-	} else {
-		return [input];
-	}
-};
-
-export const aliases = {
-	'esc': 'Escape',
-	'enter': ['Enter', 'NumpadEnter'],
-	'space': [' ', 'Spacebar'],
-	'up': 'ArrowUp',
-	'down': 'ArrowDown',
-	'left': 'ArrowLeft',
-	'right': 'ArrowRight',
-	'plus': ['NumpadAdd', 'Semicolon'],
-};

From 600f16d625d8b4c8e7f8a82fb4dd1a77f80bfcbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 9 Jul 2024 21:57:19 +0900
Subject: [PATCH 026/221] =?UTF-8?q?fix(backend):=20api-doc=E3=82=92Scalar?=
 =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=20(#14152)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(backend): api-docをScalarに変更

* Update Changelog
---
 CHANGELOG.md                                  |  1 +
 packages/backend/assets/api-doc.html          | 20 ++++++++++++++++
 packages/backend/assets/redoc.html            | 24 -------------------
 .../api/openapi/OpenApiServerService.ts       |  2 +-
 .../src/server/api/openapi/gen-spec.ts        |  1 -
 5 files changed, 22 insertions(+), 26 deletions(-)
 create mode 100644 packages/backend/assets/api-doc.html
 delete mode 100644 packages/backend/assets/redoc.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bcf721676..b99a2cbc53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Fix: Dockerコンテナの立ち上げ時に`pnpm`のインストールで固まることがある問題
 
 ### Client
+- Enhance: 内蔵APIドキュメントのデザイン・パフォーマンスを改善
 - Fix: `/about#federation` ページなどで各インスタンスのチャートが表示されなくなっていた問題を修正
 - Fix: ユーザーページの追加情報のラベルを投稿者のサーバーの絵文字で表示する (#13968)
 - Fix: リバーシの対局を正しく共有できないことがある問題を修正
diff --git a/packages/backend/assets/api-doc.html b/packages/backend/assets/api-doc.html
new file mode 100644
index 0000000000..19e0349d47
--- /dev/null
+++ b/packages/backend/assets/api-doc.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>Misskey API</title>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<style>
+			body {
+				margin: 0;
+				padding: 0;
+			}
+		</style>
+	</head>
+	<body>
+		<script
+			id="api-reference"
+			data-url="/api.json"></script>
+		<script src="https://cdn.jsdelivr.net/npm/@scalar/api-reference"></script>
+	</body>
+</html>
diff --git a/packages/backend/assets/redoc.html b/packages/backend/assets/redoc.html
deleted file mode 100644
index 2557b4532e..0000000000
--- a/packages/backend/assets/redoc.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>Misskey API</title>
-		<!-- needed for adaptive design -->
-		<meta charset="utf-8"/>
-		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,700|Roboto:300,400,700" rel="stylesheet">
-
-		<!--
-		ReDoc doesn't change outer page styles
-		-->
-		<style>
-			body {
-				margin: 0;
-				padding: 0;
-			}
-		</style>
-	</head>
-	<body>
-		<redoc spec-url="/api.json" expand-responses="200" expand-single-schema-field="true"></redoc>
-		<script src="https://cdn.redoc.ly/redoc/v2.1.3/bundles/redoc.standalone.js" integrity="sha256-u4DgqzYXoArvNF/Ymw3puKexfOC6lYfw0sfmeliBJ1I=" crossorigin="anonymous"></script>
-	</body>
-</html>
diff --git a/packages/backend/src/server/api/openapi/OpenApiServerService.ts b/packages/backend/src/server/api/openapi/OpenApiServerService.ts
index 5210e4d2bc..f124aa9f39 100644
--- a/packages/backend/src/server/api/openapi/OpenApiServerService.ts
+++ b/packages/backend/src/server/api/openapi/OpenApiServerService.ts
@@ -25,7 +25,7 @@ export class OpenApiServerService {
 	public createServer(fastify: FastifyInstance, _options: FastifyPluginOptions, done: (err?: Error) => void) {
 		fastify.get('/api-doc', async (_request, reply) => {
 			reply.header('Cache-Control', 'public, max-age=86400');
-			return await reply.sendFile('/redoc.html', staticAssets);
+			return await reply.sendFile('/api-doc.html', staticAssets);
 		});
 		fastify.get('/api.json', (_request, reply) => {
 			reply.header('Cache-Control', 'public, max-age=600');
diff --git a/packages/backend/src/server/api/openapi/gen-spec.ts b/packages/backend/src/server/api/openapi/gen-spec.ts
index 2a14270a24..efa47a6986 100644
--- a/packages/backend/src/server/api/openapi/gen-spec.ts
+++ b/packages/backend/src/server/api/openapi/gen-spec.ts
@@ -15,7 +15,6 @@ export function genOpenapiSpec(config: Config, includeSelfRef = false) {
 		info: {
 			version: config.version,
 			title: 'Misskey API',
-			'x-logo': { url: '/static-assets/api-doc.png' },
 		},
 
 		externalDocs: {

From 02e0a86b12473265c2fc0f219349d2c662f89f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Wed, 10 Jul 2024 01:00:40 +0900
Subject: [PATCH 027/221] fix(frontend): remove unused statement

fix #14162
---
 packages/frontend/src/components/MkNote.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 5f1820a379..fc72813285 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -318,7 +318,7 @@ const keymap = {
 	},
 	'o': () => {
 		if (renoteCollapsed.value) return;
-		galleryEl.value?.openGallery();
+		showMenu();
 	},
 	'v|enter': () => {
 		if (renoteCollapsed.value) {

From 52d8a54fc72b886fecb30a736b3ccf5057ea2a0c Mon Sep 17 00:00:00 2001
From: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>
Date: Wed, 10 Jul 2024 20:40:04 +0900
Subject: [PATCH 028/221] =?UTF-8?q?feat(misskey-js):=20`POST=20admin/roles?=
 =?UTF-8?q?/create`=E3=81=AE=E5=9E=8B=E3=82=92=E5=85=B7=E8=B1=A1=E5=8C=96?=
 =?UTF-8?q?=20(#14167)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(misskey-js): `POST admin/roles/create`の型を具象化

* fix

* docs: CHANGELOG.md

* test(misskey-js): admin/roles/createの型が合うことを表明

* test(misskey-js): single quote

* test(misskey-js): 無を読もうとして爆発するのを修正

* test(misskey-js): fix comment
---
 CHANGELOG.md                              |  1 +
 packages/misskey-js/etc/misskey-js.api.md | 18 ++++++++++-
 packages/misskey-js/src/api.types.ts      |  7 ++++-
 packages/misskey-js/src/entities.ts       | 15 ++++++++-
 packages/misskey-js/test/api.ts           | 38 +++++++++++++++++++++++
 5 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b99a2cbc53..aec4e1868c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@
 
 ### Misskey.js
 - Feat: `/drive/files/create` のリクエストに対応（`multipart/form-data`に対応）
+- Feat: `/admin/role/create` のロールポリシーの型を修正
 
 ## 2024.5.0
 
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index be2f510ac2..d11d2a4f06 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -1160,6 +1160,12 @@ export type Endpoints = Overwrite<Endpoints_2, {
         req: SigninRequest;
         res: SigninResponse;
     };
+    'admin/roles/create': {
+        req: Overwrite<AdminRolesCreateRequest, {
+            policies: PartialRolePolicyOverride;
+        }>;
+        res: AdminRolesCreateResponse;
+    };
 }>;
 
 // @public (undocumented)
@@ -1185,6 +1191,7 @@ declare namespace entities {
         SignupPendingResponse,
         SigninRequest,
         SigninResponse,
+        PartialRolePolicyOverride,
         EmptyRequest,
         EmptyResponse,
         AdminMetaResponse,
@@ -2725,6 +2732,15 @@ type PagesUpdateRequest = operations['pages___update']['requestBody']['content']
 // @public (undocumented)
 function parse(acct: string): Acct;
 
+// Warning: (ae-forgotten-export) The symbol "Values" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+type PartialRolePolicyOverride = Partial<{
+    [k in keyof RolePolicies]: Omit<Values<Role['policies']>, 'value'> & {
+        value: RolePolicies[k];
+    };
+}>;
+
 // @public (undocumented)
 export const permissions: readonly ["read:account", "write:account", "read:blocks", "write:blocks", "read:drive", "write:drive", "read:favorites", "write:favorites", "read:following", "write:following", "read:messaging", "write:messaging", "read:mutes", "write:mutes", "write:notes", "read:notifications", "write:notifications", "read:reactions", "write:reactions", "write:votes", "read:pages", "write:pages", "write:page-likes", "read:page-likes", "read:user-groups", "write:user-groups", "read:channels", "write:channels", "read:gallery", "write:gallery", "read:gallery-likes", "write:gallery-likes", "read:flash", "write:flash", "read:flash-likes", "write:flash-likes", "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", "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", "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", "write:admin:ad", "read:admin:ad", "write:invite-codes", "read:invite-codes", "write:clip-favorite", "read:clip-favorite", "read:federation", "write:report-abuse"];
 
@@ -3213,7 +3229,7 @@ type UsersUpdateMemoRequest = operations['users___update-memo']['requestBody']['
 
 // Warnings were encountered during analysis:
 //
-// src/entities.ts:25:2 - (ae-forgotten-export) The symbol "ModerationLogPayloads" needs to be exported by the entry point index.d.ts
+// src/entities.ts:34:2 - (ae-forgotten-export) The symbol "ModerationLogPayloads" needs to be exported by the entry point index.d.ts
 
 // (No @packageDocumentation comment for this package)
 
diff --git a/packages/misskey-js/src/api.types.ts b/packages/misskey-js/src/api.types.ts
index af0bade5b3..8c403639b7 100644
--- a/packages/misskey-js/src/api.types.ts
+++ b/packages/misskey-js/src/api.types.ts
@@ -1,7 +1,8 @@
 import { Endpoints as Gen } from './autogen/endpoint.js';
 import { UserDetailed } from './autogen/models.js';
-import { UsersShowRequest } from './autogen/entities.js';
+import { AdminRolesCreateRequest, AdminRolesCreateResponse, UsersShowRequest } from './autogen/entities.js';
 import {
+	PartialRolePolicyOverride,
 	SigninRequest,
 	SigninResponse,
 	SignupPendingRequest,
@@ -79,5 +80,9 @@ export type Endpoints = Overwrite<
 			req: SigninRequest;
 			res: SigninResponse;
 		},
+		'admin/roles/create': {
+			req: Overwrite<AdminRolesCreateRequest, { policies: PartialRolePolicyOverride }>;
+			res: AdminRolesCreateResponse;
+		}
 	}
 >
diff --git a/packages/misskey-js/src/entities.ts b/packages/misskey-js/src/entities.ts
index 7a84cb6a1a..7331a55a1c 100644
--- a/packages/misskey-js/src/entities.ts
+++ b/packages/misskey-js/src/entities.ts
@@ -1,5 +1,14 @@
 import { ModerationLogPayloads } from './consts.js';
-import { Announcement, EmojiDetailed, MeDetailed, Page, User, UserDetailedNotMe } from './autogen/models.js';
+import {
+	Announcement,
+	EmojiDetailed,
+	MeDetailed,
+	Page,
+	Role,
+	RolePolicies,
+	User,
+	UserDetailedNotMe
+} from './autogen/models.js';
 
 export * from './autogen/entities.js';
 export * from './autogen/models.js';
@@ -236,3 +245,7 @@ export type SigninResponse = {
 	id: User['id'],
 	i: string,
 };
+
+type Values<T extends Record<PropertyKey, unknown>> = T[keyof T];
+
+export type PartialRolePolicyOverride = Partial<{[k in keyof RolePolicies]: Omit<Values<Role['policies']>, 'value'> & { value: RolePolicies[k] }}>;
diff --git a/packages/misskey-js/test/api.ts b/packages/misskey-js/test/api.ts
index 95f1946fa2..1a7574de25 100644
--- a/packages/misskey-js/test/api.ts
+++ b/packages/misskey-js/test/api.ts
@@ -259,4 +259,42 @@ describe('API', () => {
 			expect(isAPIError(e)).toEqual(false);
 		}
 	});
+
+	test('admin/roles/create の型が合う', async() => {
+		fetchMock.resetMocks();
+		fetchMock.mockResponse(async () => {
+			return {
+				// 本来返すべき値は`Role`型だが、テストなのでお茶を濁す
+				status: 200,
+				body: '{}'
+			};
+		});
+
+		const cli = new APIClient({
+			origin: 'https://misskey.test',
+			credential: 'TOKEN',
+		});
+		await cli.request('admin/roles/create', {
+			name: 'aaa',
+			asBadge: false,
+			canEditMembersByModerator: false,
+			color: '#123456',
+			condFormula: {},
+			description: '',
+			displayOrder: 0,
+			iconUrl: '',
+			isAdministrator: false,
+			isExplorable: false,
+			isModerator: false,
+			isPublic: false,
+			policies: {
+				ltlAvailable: {
+					value: true,
+					priority: 0,
+					useDefault: false,
+				},
+			},
+			target: 'manual',
+		});
+	})
 });

From 679318541afb789842db5f2cbf918b8acf284f1d Mon Sep 17 00:00:00 2001
From: woxtu <woxtup@gmail.com>
Date: Thu, 11 Jul 2024 16:29:18 +0900
Subject: [PATCH 029/221] Improve background color specification (#14176)

---
 packages/frontend/src/pages/settings/drive-cleaner.vue | 6 +++---
 packages/frontend/src/pages/settings/drive.vue         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/pages/settings/drive-cleaner.vue b/packages/frontend/src/pages/settings/drive-cleaner.vue
index b20774c4ec..8d2946db63 100644
--- a/packages/frontend/src/pages/settings/drive-cleaner.vue
+++ b/packages/frontend/src/pages/settings/drive-cleaner.vue
@@ -48,7 +48,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script setup lang="ts">
-import { computed, ref, watch } from 'vue';
+import { computed, ref, watch, type StyleValue } from 'vue';
 import tinycolor from 'tinycolor2';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
@@ -102,10 +102,10 @@ function fetchDriveInfo(): void {
 	});
 }
 
-function genUsageBar(fsize: number): object {
+function genUsageBar(fsize: number): StyleValue {
 	return {
 		width: `${fsize / usage.value * 100}%`,
-		background: tinycolor({ h: 180 - (fsize / usage.value * 180), s: 0.7, l: 0.5 }),
+		background: tinycolor({ h: 180 - (fsize / usage.value * 180), s: 0.7, l: 0.5 }).toHslString(),
 	};
 }
 
diff --git a/packages/frontend/src/pages/settings/drive.vue b/packages/frontend/src/pages/settings/drive.vue
index 81a8d474d2..0e66b93f1c 100644
--- a/packages/frontend/src/pages/settings/drive.vue
+++ b/packages/frontend/src/pages/settings/drive.vue
@@ -95,7 +95,7 @@ const meterStyle = computed(() => {
 			h: 180 - (usage.value / capacity.value * 180),
 			s: 0.7,
 			l: 0.5,
-		}),
+		}).toHslString(),
 	};
 });
 

From f8ac3fe343a25e3d58c93650826f7377a029c3cd Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 11 Jul 2024 16:39:06 +0900
Subject: [PATCH 030/221] =?UTF-8?q?=E3=83=AA=E3=83=AA=E3=83=BC=E3=82=B9PR?=
 =?UTF-8?q?=E3=81=8C=E3=81=AA=E3=81=84=E3=81=A8=E3=81=8D=E3=81=ABrelease-e?=
 =?UTF-8?q?dit-with-push.yml=E3=81=8Cfail=E3=81=97=E3=81=A6=E8=A6=8B?=
 =?UTF-8?q?=E6=A0=84=E3=81=88=E3=81=8C=E6=82=AA=E3=81=84=E3=81=AE=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(#14160)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/release-edit-with-push.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/release-edit-with-push.yml b/.github/workflows/release-edit-with-push.yml
index e1bcb5a665..57657a4ba7 100644
--- a/.github/workflows/release-edit-with-push.yml
+++ b/.github/workflows/release-edit-with-push.yml
@@ -28,16 +28,19 @@ jobs:
         env:
           STABLE_BRANCH: ${{ vars.STABLE_BRANCH }}
       - name: Get target version
+        if: steps.get_pr.outputs.pr_number != ''
         uses: misskey-dev/release-manager-actions/.github/actions/get-target-version@v2
         id: v
       # CHANGELOG.mdの内容を取得
       - name: Get changelog
+        if: steps.get_pr.outputs.pr_number != ''
         uses: misskey-dev/release-manager-actions/.github/actions/get-changelog@v2
         with:
           version: ${{ steps.v.outputs.target_version }}
         id: changelog
       # PRのnotesを更新
       - name: Update PR
+        if: steps.get_pr.outputs.pr_number != ''
         run: |
           gh pr edit "$PR_NUMBER" --body "$CHANGELOG"
         env:

From 6b876da44af0b7e5dd553676d230f68995df148d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Thu, 11 Jul 2024 18:41:04 +0900
Subject: [PATCH 031/221] =?UTF-8?q?enhance(frontend):=20=E3=82=A6=E3=82=A7?=
 =?UTF-8?q?=E3=83=AB=E3=82=AB=E3=83=A0=E3=82=BF=E3=82=A4=E3=83=A0=E3=83=A9?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=81=AE=E3=83=87=E3=82=B6=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4=20(#14156)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance(frontend): 非ログイン時のハイライトTLのデザイン調整

* Update Changelog

* fix cw handling

* ホバーしてたらスクロールを止めるように

* fix

* lint
---
 CHANGELOG.md                                  |   1 +
 .../src/pages/welcome.timeline.note.vue       | 109 ++++++++++++++++++
 .../frontend/src/pages/welcome.timeline.vue   |  98 ++++++++--------
 3 files changed, 162 insertions(+), 46 deletions(-)
 create mode 100644 packages/frontend/src/pages/welcome.timeline.note.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aec4e1868c..259420a6c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 ### Client
 - Enhance: 内蔵APIドキュメントのデザイン・パフォーマンスを改善
+- Enhance: 非ログイン時のハイライトTLのデザインを改善
 - Fix: `/about#federation` ページなどで各インスタンスのチャートが表示されなくなっていた問題を修正
 - Fix: ユーザーページの追加情報のラベルを投稿者のサーバーの絵文字で表示する (#13968)
 - Fix: リバーシの対局を正しく共有できないことがある問題を修正
diff --git a/packages/frontend/src/pages/welcome.timeline.note.vue b/packages/frontend/src/pages/welcome.timeline.note.vue
new file mode 100644
index 0000000000..f385938343
--- /dev/null
+++ b/packages/frontend/src/pages/welcome.timeline.note.vue
@@ -0,0 +1,109 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div :key="note.id" :class="$style.note">
+	<div class="_panel _gaps_s" :class="$style.content">
+		<div v-if="note.cw != null" :class="$style.richcontent">
+			<div><Mfm :text="note.cw" :author="note.user"/></div>
+			<MkCwButton v-model="showContent" :text="note.text" :renote="note.renote" :files="note.files" :poll="note.poll" style="margin: 4px 0;"/>
+			<div v-if="showContent">
+				<MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="ti ti-arrow-back-up"></i></MkA>
+				<Mfm v-if="note.text" :text="note.text" :author="note.user"/>
+				<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">RN: ...</MkA>
+			</div>
+		</div>
+		<div v-else ref="noteTextEl" :class="[$style.text, { [$style.collapsed]: shouldCollapse }]">
+			<MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="ti ti-arrow-back-up"></i></MkA>
+			<Mfm v-if="note.text" :text="note.text" :author="note.user"/>
+			<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">RN: ...</MkA>
+		</div>
+		<div v-if="note.files && note.files.length > 0" :class="$style.richcontent">
+			<MkMediaList :mediaList="note.files.slice(0, 4)"/>
+		</div>
+		<div v-if="note.poll">
+			<MkPoll :noteId="note.id" :poll="note.poll" :readOnly="true"/>
+		</div>
+		<div v-if="note.reactionCount > 0" :class="$style.reactions">
+			<MkReactionsViewer :note="note" :maxNumber="16"/>
+		</div>
+	</div>
+</div>
+</template>
+
+<script lang="ts" setup>
+import { ref, shallowRef, onUpdated, onMounted } from 'vue';
+import * as Misskey from 'misskey-js';
+import MkReactionsViewer from '@/components/MkReactionsViewer.vue';
+import MkMediaList from '@/components/MkMediaList.vue';
+import MkPoll from '@/components/MkPoll.vue';
+import MkCwButton from '@/components/MkCwButton.vue';
+
+defineProps<{
+	note: Misskey.entities.Note;
+}>();
+
+const noteTextEl = shallowRef<HTMLDivElement>();
+const shouldCollapse = ref(false);
+const showContent = ref(false);
+
+function calcCollapse() {
+	if (noteTextEl.value) {
+		const height = noteTextEl.value.scrollHeight;
+		if (height > 200) {
+			shouldCollapse.value = true;
+		}
+	}
+}
+
+onMounted(() => {
+	calcCollapse();
+});
+
+onUpdated(() => {
+	calcCollapse();
+});
+</script>
+
+<style lang="scss" module>
+.note {
+	margin-left: auto;
+}
+
+.text {
+	position: relative;
+	max-height: 200px;
+	overflow: hidden;
+
+	&.collapsed::after {
+		content: '';
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 64px;
+		background: linear-gradient(0deg, var(--panel), var(--X15));
+	}
+}
+
+.content {
+	padding: 16px;
+	margin: 0 0 0 auto;
+	max-width: max-content;
+	border-radius: 16px;
+}
+
+.reactions {
+	box-sizing: border-box;
+	margin: 8px -16px -8px;
+	padding: 8px 16px 0;
+	width: calc(100% + 32px);
+	border-top: 1px solid var(--divider);
+}
+
+.richcontent {
+	min-width: 250px;
+}
+</style>
diff --git a/packages/frontend/src/pages/welcome.timeline.vue b/packages/frontend/src/pages/welcome.timeline.vue
index 139b2e0a07..db326f9e6c 100644
--- a/packages/frontend/src/pages/welcome.timeline.vue
+++ b/packages/frontend/src/pages/welcome.timeline.vue
@@ -4,24 +4,17 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div :class="$style.root">
-	<div ref="scrollEl" :class="[$style.scrollbox, { [$style.scroll]: isScrolling }]">
-		<div v-for="note in notes" :key="note.id" :class="$style.note">
-			<div class="_panel" :class="$style.content">
-				<div>
-					<MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="ti ti-arrow-back-up"></i></MkA>
-					<Mfm v-if="note.text" :text="note.text" :author="note.user"/>
-					<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">RN: ...</MkA>
-				</div>
-				<div v-if="note.files.length > 0" :class="$style.richcontent">
-					<MkMediaList :mediaList="note.files"/>
-				</div>
-				<div v-if="note.poll">
-					<MkPoll :noteId="note.id" :poll="note.poll" :readOnly="true"/>
-				</div>
-			</div>
-			<MkReactionsViewer ref="reactionsViewer" :note="note"/>
-		</div>
+<div :class="$style.root" class="_gaps">
+	<div
+		ref="notesMainContainerEl"
+		class="_gaps"
+		:class="[$style.scrollBoxMain, { [$style.scrollIntro]: (scrollState === 'intro'), [$style.scrollLoop]: (scrollState === 'loop') }]"
+		@animationend="changeScrollState"
+	>
+		<XNote v-for="note in notes" :key="`${note.id}_1`" :class="$style.note" :note="note"/>
+	</div>
+	<div v-if="isScrolling" class="_gaps" :class="[$style.scrollBoxSub, { [$style.scrollIntro]: (scrollState === 'intro'), [$style.scrollLoop]: (scrollState === 'loop') }]">
+		<XNote v-for="note in notes" :key="`${note.id}_2`" :class="$style.note" :note="note"/>
 	</div>
 </div>
 </template>
@@ -29,43 +22,54 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import * as Misskey from 'misskey-js';
 import { onUpdated, ref, shallowRef } from 'vue';
-import MkReactionsViewer from '@/components/MkReactionsViewer.vue';
-import MkMediaList from '@/components/MkMediaList.vue';
-import MkPoll from '@/components/MkPoll.vue';
+import XNote from '@/pages/welcome.timeline.note.vue';
 import { misskeyApiGet } from '@/scripts/misskey-api.js';
 import { getScrollContainer } from '@/scripts/scroll.js';
 
 const notes = ref<Misskey.entities.Note[]>([]);
 const isScrolling = ref(false);
-const scrollEl = shallowRef<HTMLElement>();
+const scrollState = ref<null | 'intro' | 'loop'>(null);
+const notesMainContainerEl = shallowRef<HTMLElement>();
 
 misskeyApiGet('notes/featured').then(_notes => {
 	notes.value = _notes;
 });
 
+function changeScrollState() {
+	if (scrollState.value !== 'loop') {
+		scrollState.value = 'loop';
+	}
+}
+
 onUpdated(() => {
-	if (!scrollEl.value) return;
-	const container = getScrollContainer(scrollEl.value);
+	if (!notesMainContainerEl.value) return;
+	const container = getScrollContainer(notesMainContainerEl.value);
 	const containerHeight = container ? container.clientHeight : window.innerHeight;
-	if (scrollEl.value.offsetHeight > containerHeight) {
+	if (notesMainContainerEl.value.offsetHeight > containerHeight) {
+		if (scrollState.value === null) {
+			scrollState.value = 'intro';
+		}
 		isScrolling.value = true;
 	}
 });
 </script>
 
 <style lang="scss" module>
-@keyframes scroll {
+@keyframes scrollIntro {
 	0% {
 		transform: translate3d(0, 0, 0);
 	}
-	5% {
-		transform: translate3d(0, 0, 0);
+	100% {
+		transform: translate3d(0, calc(calc(-100% - 128px) - var(--margin)), 0);
 	}
-	75% {
-		transform: translate3d(0, calc(-100% + 90vh), 0);
+}
+
+@keyframes scrollConstant {
+	0% {
+		transform: translate3d(0, -128px, 0);
 	}
-	90% {
-		transform: translate3d(0, calc(-100% + 90vh), 0);
+	100% {
+		transform: translate3d(0, calc(calc(-100% - 128px) - var(--margin)), 0);
 	}
 }
 
@@ -73,24 +77,26 @@ onUpdated(() => {
 	text-align: right;
 }
 
-.scrollbox {
-	&.scroll {
-		animation: scroll 45s linear infinite;
+.scrollBoxMain {
+	&.scrollIntro {
+		animation: scrollIntro 30s linear forwards;
+	}
+	&.scrollLoop {
+		animation: scrollConstant 30s linear infinite;
 	}
 }
 
-.note {
-	margin: 16px 0 16px auto;
+.scrollBoxSub {
+	&.scrollIntro {
+		animation: scrollIntro 30s linear forwards;
+	}
+	&.scrollLoop {
+		animation: scrollConstant 30s linear infinite;
+	}
 }
 
-.content {
-	padding: 16px;
-	margin: 0 0 0 auto;
-	max-width: max-content;
-	border-radius: 16px;
-}
-
-.richcontent {
-	min-width: 250px;
+.root:has(.note:hover) .scrollBoxMain,
+.root:has(.note:hover) .scrollBoxSub {
+	animation-play-state: paused;
 }
 </style>

From 121af778a0925d5850e9d88261e9a8e8c6fd968b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Thu, 11 Jul 2024 18:44:18 +0900
Subject: [PATCH 032/221] =?UTF-8?q?enhance(frontend):=20=E6=9C=AA=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E3=81=AE=E3=82=B5=E3=82=A6=E3=83=B3=E3=83=89=E8=A8=AD?=
 =?UTF-8?q?=E5=AE=9A=E3=82=92=E5=89=8A=E9=99=A4=20(#14116)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance(frontend): 未使用のサウンド設定を削除

* Update Changelog

* Update CHANGELOG.md
---
 CHANGELOG.md                                              | 3 +++
 locales/index.d.ts                                        | 8 --------
 locales/ja-JP.yml                                         | 2 --
 .../frontend/src/pages/settings/preferences-backups.vue   | 2 --
 packages/frontend/src/pages/settings/sounds.vue           | 2 --
 packages/frontend/src/scripts/sound.ts                    | 2 --
 packages/frontend/src/store.ts                            | 8 --------
 7 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 259420a6c6..cd123c938e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Unreleased
 
+### Note
+- デッキUIの新着ノートをサウンドで通知する機能の追加（v2024.5.0）に伴い、以前から動作しなくなっていたクライアント設定内の「アンテナ受信」「チャンネル通知」サウンドを削除しました。
+
 ### General
 - Feat: 通報を受けた際、または解決した際に、予め登録した宛先に通知を飛ばせるように(mail or webhook) #13705
 - Fix: 配信停止したインスタンス一覧が見れなくなる問題を修正
diff --git a/locales/index.d.ts b/locales/index.d.ts
index ebd980ed85..5089f7802e 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -7515,14 +7515,6 @@ export interface Locale extends ILocale {
          * 通知
          */
         "notification": string;
-        /**
-         * アンテナ受信
-         */
-        "antenna": string;
-        /**
-         * チャンネル通知
-         */
-        "channel": string;
         /**
          * リアクション選択時
          */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 0d89d33abe..a03d792140 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1971,8 +1971,6 @@ _sfx:
   note: "ノート"
   noteMy: "ノート(自分)"
   notification: "通知"
-  antenna: "アンテナ受信"
-  channel: "チャンネル通知"
   reaction: "リアクション選択時"
 
 _soundSettings:
diff --git a/packages/frontend/src/pages/settings/preferences-backups.vue b/packages/frontend/src/pages/settings/preferences-backups.vue
index b6f1043154..dace2cd847 100644
--- a/packages/frontend/src/pages/settings/preferences-backups.vue
+++ b/packages/frontend/src/pages/settings/preferences-backups.vue
@@ -113,8 +113,6 @@ const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [
 	'sound_note',
 	'sound_noteMy',
 	'sound_notification',
-	'sound_antenna',
-	'sound_channel',
 ];
 const coldDeviceStorageSaveKeys: (keyof typeof ColdDeviceStorage.default)[] = [
 	'lightTheme',
diff --git a/packages/frontend/src/pages/settings/sounds.vue b/packages/frontend/src/pages/settings/sounds.vue
index 090f0cf14c..0f1b725fae 100644
--- a/packages/frontend/src/pages/settings/sounds.vue
+++ b/packages/frontend/src/pages/settings/sounds.vue
@@ -54,8 +54,6 @@ const sounds = ref<Record<OperationType, Ref<SoundStore>>>({
 	note: defaultStore.reactiveState.sound_note,
 	noteMy: defaultStore.reactiveState.sound_noteMy,
 	notification: defaultStore.reactiveState.sound_notification,
-	antenna: defaultStore.reactiveState.sound_antenna,
-	channel: defaultStore.reactiveState.sound_channel,
 	reaction: defaultStore.reactiveState.sound_reaction,
 });
 
diff --git a/packages/frontend/src/scripts/sound.ts b/packages/frontend/src/scripts/sound.ts
index fcd59510df..bba855cd64 100644
--- a/packages/frontend/src/scripts/sound.ts
+++ b/packages/frontend/src/scripts/sound.ts
@@ -74,8 +74,6 @@ export const soundsTypes = [
 export const operationTypes = [
 	'noteMy',
 	'note',
-	'antenna',
-	'channel',
 	'notification',
 	'reaction',
 ] as const;
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index e8eb5a1ed7..9cb2742069 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -479,14 +479,6 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: { type: 'syuilo/n-ea', volume: 1 } as SoundStore,
 	},
-	sound_antenna: {
-		where: 'device',
-		default: { type: 'syuilo/triple', volume: 1 } as SoundStore,
-	},
-	sound_channel: {
-		where: 'device',
-		default: { type: 'syuilo/square-pico', volume: 1 } as SoundStore,
-	},
 	sound_reaction: {
 		where: 'device',
 		default: { type: 'syuilo/bubble2', volume: 1 } as SoundStore,

From 385969e9f56a39a1e5547b94901d155e1e811263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 12 Jul 2024 16:25:44 +0900
Subject: [PATCH 033/221] =?UTF-8?q?fix(frontend):=20=E3=83=95=E3=82=A9?=
 =?UTF-8?q?=E3=83=BC=E3=82=AB=E3=82=B9=E3=81=AE=E6=8C=99=E5=8B=95=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(#14158)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): 直前のパターンを記録するように

* fix(frontend): フォーカス/タブ移動に関する挙動を調整 (#226)

Cherry-pick commit e8c030673326871edf3623cf2b8675d68f9e1b13

Co-authored-by: taiyme <53635909+taiyme@users.noreply.github.com>

* focusのデザイン修正

* move scripts

* Modalにfocus trapを追加

* 記録するホットキーはレートリミット式にする

* escキーのハンドリングをMkModalに統一

* fix

* enterで子メニューを開けるように

* lint

* fix focus trap

* improve switch accessibility

* 一部のmodalのフォーカストラップが外れない問題を修正

* fix

* fix

* Revert "記録するホットキーはレートリミット式にする"

This reverts commit 40a7509286a87911ad4cc06d9482e8a2e5d0e7e8.

* Revert "fix(frontend): 直前のパターンを記録するように"

This reverts commit 5372b2594023952cff34aa62253ed4efef15b5dd.

* Revert "Revert "fix(frontend): 直前のパターンを記録するように""

This reverts commit a9bb52e799e110927ad92cd8f26af980819334e1.

* Revert "Revert "記録するホットキーはレートリミット式にする""

This reverts commit bdac34273e0bc5f13604c7e2f9fa6b1321a0df3d.

* 試験的にCypressでのFocustrapを無効化

* fix

* fix focus-trap

* Update Changelog

* :v:

* fix focustrap invocation logic

* スクロールがsticky headerを考慮するように

* :art:

* スタイルの微調整

* :art:

* remove deprecated key aliases

* focusElementが足りなかったので修正

* preview系にfocus時スタイルが足りなかったので修正

* `returnFocusElement` -> `returnFocusTo`

* lint

* Update packages/frontend/src/components/MkModalWindow.vue

* Apply suggestions from code review

Co-authored-by: taiy <53635909+taiyme@users.noreply.github.com>

* keydownイベントをまとめる

* use correct pesudo-element selector

* fix

* rename

---------

Co-authored-by: taiyme <53635909+taiyme@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
 CHANGELOG.md                                  |   2 +
 .../src/components/MkAchievements.vue         |   4 +-
 packages/frontend/src/components/MkButton.vue |   1 -
 .../src/components/MkChannelFollowButton.vue  |  12 +-
 .../src/components/MkChannelPreview.vue       |  19 +-
 .../frontend/src/components/MkClipPreview.vue |   8 +
 .../frontend/src/components/MkContextMenu.vue |   2 +-
 .../frontend/src/components/MkCwButton.vue    |   4 +-
 packages/frontend/src/components/MkDialog.vue |  16 +-
 .../frontend/src/components/MkDrive.file.vue  |  32 +-
 .../src/components/MkDrive.folder.vue         |   2 +-
 .../frontend/src/components/MkEmojiPicker.vue |  33 +-
 .../src/components/MkEmojiPickerDialog.vue    |   2 +
 .../src/components/MkFlashPreview.vue         |   6 +-
 packages/frontend/src/components/MkFolder.vue |  16 +-
 .../src/components/MkFollowButton.vue         |  12 +-
 .../src/components/MkGalleryPostPreview.vue   |   4 +-
 .../src/components/MkImgWithBlurhash.vue      |   4 +-
 .../frontend/src/components/MkLaunchPad.vue   |   2 +-
 .../frontend/src/components/MkMediaAudio.vue  |  26 +-
 .../frontend/src/components/MkMediaList.vue   |  54 ++-
 .../frontend/src/components/MkMediaVideo.vue  |  10 +-
 .../frontend/src/components/MkMenu.child.vue  |   5 +-
 packages/frontend/src/components/MkMenu.vue   | 367 +++++++++++-------
 packages/frontend/src/components/MkModal.vue  |  28 +-
 .../frontend/src/components/MkModalWindow.vue |  13 +-
 packages/frontend/src/components/MkNote.vue   |  48 +--
 .../src/components/MkNoteDetailed.vue         |  62 +--
 .../frontend/src/components/MkNotePreview.vue |   2 +-
 .../src/components/MkNotification.vue         |   2 +-
 .../frontend/src/components/MkPagePreview.vue |  19 +-
 .../frontend/src/components/MkPopupMenu.vue   |   6 +-
 .../frontend/src/components/MkPostForm.vue    |  10 +
 .../src/components/MkPostFormDialog.vue       |   2 +-
 packages/frontend/src/components/MkRadio.vue  |  10 +-
 packages/frontend/src/components/MkSelect.vue |  27 +-
 .../frontend/src/components/MkSuperMenu.vue   |  10 +-
 packages/frontend/src/components/MkSwitch.vue |  10 +-
 .../components/MkTutorialDialog.PostNote.vue  |   2 +-
 .../components/MkTutorialDialog.Sensitive.vue |   2 +-
 .../components/MkTutorialDialog.Timeline.vue  |   2 +-
 .../src/components/MkVisibilityPicker.vue     |   2 +-
 .../components/global/MkStickyContainer.vue   |   6 +-
 packages/frontend/src/directives/hotkey.ts    |   4 +-
 packages/frontend/src/os.ts                   |  27 +-
 .../frontend/src/pages/drive.file.info.vue    |   1 +
 packages/frontend/src/pages/games.vue         |  11 +-
 packages/frontend/src/pages/page.vue          |   1 +
 .../frontend/src/pages/settings/profile.vue   |   1 +
 .../frontend/src/pages/settings/theme.vue     |   6 +
 packages/frontend/src/scripts/focus-trap.ts   |  65 ++++
 packages/frontend/src/scripts/focus.ts        |  98 +++--
 .../src/scripts/get-dom-node-or-null.ts       |  19 +
 packages/frontend/src/scripts/hotkey.ts       |  51 ++-
 packages/frontend/src/scripts/scroll.ts       |   8 +
 packages/frontend/src/style.scss              |  25 +-
 packages/frontend/src/ui/_common_/common.vue  |   2 +-
 .../src/ui/_common_/navbar-for-mobile.vue     |   6 +-
 packages/frontend/src/ui/_common_/navbar.vue  |  86 +++-
 packages/frontend/src/ui/deck/column.vue      |   4 +-
 .../frontend/src/widgets/WidgetCalendar.vue   |   2 +-
 61 files changed, 932 insertions(+), 391 deletions(-)
 create mode 100644 packages/frontend/src/scripts/focus-trap.ts
 create mode 100644 packages/frontend/src/scripts/get-dom-node-or-null.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd123c938e..c6f48684b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@
 ### Client
 - Enhance: 内蔵APIドキュメントのデザイン・パフォーマンスを改善
 - Enhance: 非ログイン時のハイライトTLのデザインを改善
+- Enhance: フロントエンドのアクセシビリティ改善  
+  (Based on https://github.com/taiyme/misskey/pull/226)
 - Fix: `/about#federation` ページなどで各インスタンスのチャートが表示されなくなっていた問題を修正
 - Fix: ユーザーページの追加情報のラベルを投稿者のサーバーの絵文字で表示する (#13968)
 - Fix: リバーシの対局を正しく共有できないことがある問題を修正
diff --git a/packages/frontend/src/components/MkAchievements.vue b/packages/frontend/src/components/MkAchievements.vue
index 5d103fa789..c8134416b5 100644
--- a/packages/frontend/src/components/MkAchievements.vue
+++ b/packages/frontend/src/components/MkAchievements.vue
@@ -153,7 +153,7 @@ onMounted(() => {
 		background: linear-gradient(0deg, #ffee20, #eb7018);
 	}
 
-	&:before {
+	&::before {
 		content: "";
 		display: block;
 		position: absolute;
@@ -173,7 +173,7 @@ onMounted(() => {
 		background: linear-gradient(0deg, #e1e1e1, #7c7c7c);
 	}
 
-	&:before {
+	&::before {
 		content: "";
 		display: block;
 		position: absolute;
diff --git a/packages/frontend/src/components/MkButton.vue b/packages/frontend/src/components/MkButton.vue
index 25b003ba5a..9560efb7d9 100644
--- a/packages/frontend/src/components/MkButton.vue
+++ b/packages/frontend/src/components/MkButton.vue
@@ -250,7 +250,6 @@ function onMousedown(evt: MouseEvent): void {
 	}
 
 	&:focus-visible {
-		outline: solid 2px var(--focus);
 		outline-offset: 2px;
 	}
 
diff --git a/packages/frontend/src/components/MkChannelFollowButton.vue b/packages/frontend/src/components/MkChannelFollowButton.vue
index 841d37a568..35dc3ad4bf 100644
--- a/packages/frontend/src/components/MkChannelFollowButton.vue
+++ b/packages/frontend/src/components/MkChannelFollowButton.vue
@@ -87,17 +87,7 @@ async function onClick() {
 	}
 
 	&:focus-visible {
-		&:after {
-			content: "";
-			pointer-events: none;
-			position: absolute;
-			top: -5px;
-			right: -5px;
-			bottom: -5px;
-			left: -5px;
-			border: 2px solid var(--focus);
-			border-radius: 32px;
-		}
+		outline-offset: 2px;
 	}
 
 	&:hover {
diff --git a/packages/frontend/src/components/MkChannelPreview.vue b/packages/frontend/src/components/MkChannelPreview.vue
index 4ff64dc4ba..c30cb66c07 100644
--- a/packages/frontend/src/components/MkChannelPreview.vue
+++ b/packages/frontend/src/components/MkChannelPreview.vue
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div style="position: relative;">
-	<MkA :to="`/channels/${channel.id}`" class="eftoefju _panel" tabindex="-1" @click="updateLastReadedAt">
+	<MkA :to="`/channels/${channel.id}`" class="eftoefju _panel" @click="updateLastReadedAt">
 		<div class="banner" :style="bannerStyle">
 			<div class="fade"></div>
 			<div class="name"><i class="ti ti-device-tv"></i> {{ channel.name }}</div>
@@ -80,6 +80,7 @@ const bannerStyle = computed(() => {
 <style lang="scss" scoped>
 .eftoefju {
 	display: block;
+	position: relative;
 	overflow: hidden;
 	width: 100%;
 
@@ -87,6 +88,22 @@ const bannerStyle = computed(() => {
 		text-decoration: none;
 	}
 
+	&:focus-within {
+		outline: none;
+
+		&::after {
+			content: '';
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			border-radius: inherit;
+			pointer-events: none;
+			box-shadow: inset 0 0 0 2px var(--focus);
+		}
+	}
+
 	> .banner {
 		position: relative;
 		width: 100%;
diff --git a/packages/frontend/src/components/MkClipPreview.vue b/packages/frontend/src/components/MkClipPreview.vue
index 6299a28e9f..2e9a172c23 100644
--- a/packages/frontend/src/components/MkClipPreview.vue
+++ b/packages/frontend/src/components/MkClipPreview.vue
@@ -40,6 +40,14 @@ const remaining = computed(() => {
 .link {
 	display: block;
 
+	&:focus-visible {
+		outline: none;
+
+		.root {
+			box-shadow: inset 0 0 0 2px var(--focus);
+		}
+	}
+
 	&:hover {
 		text-decoration: none;
 		color: var(--accent);
diff --git a/packages/frontend/src/components/MkContextMenu.vue b/packages/frontend/src/components/MkContextMenu.vue
index a807742bb9..8ea8fa6cf3 100644
--- a/packages/frontend/src/components/MkContextMenu.vue
+++ b/packages/frontend/src/components/MkContextMenu.vue
@@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	:leaveToClass="defaultStore.state.animation ? $style.transition_fade_leaveTo : ''"
 >
 	<div ref="rootEl" :class="$style.root" :style="{ zIndex }" @contextmenu.prevent.stop="() => {}">
-		<MkMenu :items="items" :align="'left'" @close="$emit('closed')"/>
+		<MkMenu :items="items" :align="'left'" @close="emit('closed')"/>
 	</div>
 </Transition>
 </template>
diff --git a/packages/frontend/src/components/MkCwButton.vue b/packages/frontend/src/components/MkCwButton.vue
index a2cb3185f4..b5f6e78b6c 100644
--- a/packages/frontend/src/components/MkCwButton.vue
+++ b/packages/frontend/src/components/MkCwButton.vue
@@ -45,11 +45,11 @@ function toggle() {
 .label {
 	margin-left: 4px;
 
-	&:before {
+	&::before {
 		content: '(';
 	}
 
-	&:after {
+	&::after {
 		content: ')';
 	}
 }
diff --git a/packages/frontend/src/components/MkDialog.vue b/packages/frontend/src/components/MkDialog.vue
index c52404a319..5c3c6aa51d 100644
--- a/packages/frontend/src/components/MkDialog.vue
+++ b/packages/frontend/src/components/MkDialog.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkModal ref="modal" :preferType="'dialog'" :zPriority="'high'" @click="done(true)" @closed="emit('closed')">
+<MkModal ref="modal" :preferType="'dialog'" :zPriority="'high'" @click="done(true)" @closed="emit('closed')" @esc="cancel()">
 	<div :class="$style.root">
 		<div v-if="icon" :class="$style.icon">
 			<i :class="icon"></i>
@@ -51,7 +51,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { onBeforeUnmount, onMounted, ref, shallowRef, computed } from 'vue';
+import { ref, shallowRef, computed } from 'vue';
 import MkModal from '@/components/MkModal.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/MkInput.vue';
@@ -156,10 +156,6 @@ function onBgClick() {
 	if (props.cancelableByBgClick) cancel();
 }
 */
-function onKeydown(evt: KeyboardEvent) {
-	if (evt.key === 'Escape') cancel();
-}
-
 function onInputKeydown(evt: KeyboardEvent) {
 	if (evt.key === 'Enter' && okButtonDisabledReason.value === null) {
 		evt.preventDefault();
@@ -167,14 +163,6 @@ function onInputKeydown(evt: KeyboardEvent) {
 		ok();
 	}
 }
-
-onMounted(() => {
-	document.addEventListener('keydown', onKeydown);
-});
-
-onBeforeUnmount(() => {
-	document.removeEventListener('keydown', onKeydown);
-});
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/components/MkDrive.file.vue b/packages/frontend/src/components/MkDrive.file.vue
index 4106b0a436..90284890a5 100644
--- a/packages/frontend/src/components/MkDrive.file.vue
+++ b/packages/frontend/src/components/MkDrive.file.vue
@@ -115,14 +115,14 @@ function onDragend() {
 		background: rgba(#000, 0.05);
 
 		> .label {
-			&:before,
-			&:after {
+			&::before,
+			&::after {
 				background: #0b65a5;
 			}
 
 			&.red {
-				&:before,
-				&:after {
+				&::before,
+				&::after {
 					background: #c12113;
 				}
 			}
@@ -133,14 +133,14 @@ function onDragend() {
 		background: rgba(#000, 0.1);
 
 		> .label {
-			&:before,
-			&:after {
+			&::before,
+			&::after {
 				background: #0b588c;
 			}
 
 			&.red {
-				&:before,
-				&:after {
+				&::before,
+				&::after {
 					background: #ce2212;
 				}
 			}
@@ -159,8 +159,8 @@ function onDragend() {
 		}
 
 		> .label {
-			&:before,
-			&:after {
+			&::before,
+			&::after {
 				display: none;
 			}
 		}
@@ -181,8 +181,8 @@ function onDragend() {
 	left: 0;
 	pointer-events: none;
 
-	&:before,
-	&:after {
+	&::before,
+	&::after {
 		content: "";
 		display: block;
 		position: absolute;
@@ -190,14 +190,14 @@ function onDragend() {
 		background: #0c7ac9;
 	}
 
-	&:before {
+	&::before {
 		top: 0;
 		left: 57px;
 		width: 28px;
 		height: 8px;
 	}
 
-	&:after {
+	&::after {
 		top: 57px;
 		left: 0;
 		width: 8px;
@@ -205,8 +205,8 @@ function onDragend() {
 	}
 
 	&.red {
-		&:before,
-		&:after {
+		&::before,
+		&::after {
 			background: #c12113;
 		}
 	}
diff --git a/packages/frontend/src/components/MkDrive.folder.vue b/packages/frontend/src/components/MkDrive.folder.vue
index 1cc8b15b73..1790e57c24 100644
--- a/packages/frontend/src/components/MkDrive.folder.vue
+++ b/packages/frontend/src/components/MkDrive.folder.vue
@@ -296,7 +296,7 @@ function onContextmenu(ev: MouseEvent) {
 	cursor: pointer;
 
 	&.draghover {
-		&:after {
+		&::after {
 			content: "";
 			pointer-events: none;
 			position: absolute;
diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue
index 4bd4bee1e5..4a3ed69f47 100644
--- a/packages/frontend/src/components/MkEmojiPicker.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -5,7 +5,19 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div class="omfetrab" :class="['s' + size, 'w' + width, 'h' + height, { asDrawer, asWindow }]" :style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }">
-	<input ref="searchEl" :value="q" class="search" data-prevent-emoji-insert :class="{ filled: q != null && q != '' }" :placeholder="i18n.ts.search" type="search" autocapitalize="off" @input="input()" @paste.stop="paste" @keydown.stop.prevent.enter="onEnter">
+	<input
+		ref="searchEl"
+		:value="q"
+		class="search"
+		data-prevent-emoji-insert
+		:class="{ filled: q != null && q != '' }"
+		:placeholder="i18n.ts.search"
+		type="search"
+		autocapitalize="off"
+		@input="input()"
+		@paste.stop="paste"
+		@keydown="onKeydown"
+	>
 	<!-- FirefoxのTabフォーカスが想定外の挙動となるためtabindex="-1"を追加 https://github.com/misskey-dev/misskey/issues/10744 -->
 	<div ref="emojisEl" class="emojis" tabindex="-1">
 		<section class="result">
@@ -139,6 +151,7 @@ const props = withDefaults(defineProps<{
 
 const emit = defineEmits<{
 	(ev: 'chosen', v: string): void;
+	(ev: 'esc'): void;
 }>();
 
 const searchEl = shallowRef<HTMLInputElement>();
@@ -433,9 +446,18 @@ function paste(event: ClipboardEvent): void {
 	}
 }
 
-function onEnter(ev: KeyboardEvent) {
+function onKeydown(ev: KeyboardEvent) {
 	if (ev.isComposing || ev.key === 'Process' || ev.keyCode === 229) return;
-	done();
+	if (ev.key === 'Enter') {
+		ev.preventDefault();
+		ev.stopPropagation();
+		done();
+	}
+	if (ev.key === 'Escape') {
+		ev.preventDefault();
+		ev.stopPropagation();
+		emit('esc');
+	}
 }
 
 function done(query?: string): boolean | void {
@@ -702,11 +724,6 @@ defineExpose({
 					border-radius: 4px;
 					font-size: 24px;
 
-					&:focus-visible {
-						outline: solid 2px var(--focus);
-						z-index: 1;
-					}
-
 					&:hover {
 						background: rgba(0, 0, 0, 0.05);
 					}
diff --git a/packages/frontend/src/components/MkEmojiPickerDialog.vue b/packages/frontend/src/components/MkEmojiPickerDialog.vue
index adcea839ee..a413b146ba 100644
--- a/packages/frontend/src/components/MkEmojiPickerDialog.vue
+++ b/packages/frontend/src/components/MkEmojiPickerDialog.vue
@@ -13,6 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	:manualShowing="manualShowing"
 	:src="src"
 	@click="modal?.close()"
+	@esc="modal?.close()"
 	@opening="opening"
 	@close="emit('close')"
 	@closed="emit('closed')"
@@ -28,6 +29,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		:asDrawer="type === 'drawer'"
 		:max-height="maxHeight"
 		@chosen="chosen"
+		@esc="modal?.close()"
 	/>
 </MkModal>
 </template>
diff --git a/packages/frontend/src/components/MkFlashPreview.vue b/packages/frontend/src/components/MkFlashPreview.vue
index c5dd877971..6783804cc5 100644
--- a/packages/frontend/src/components/MkFlashPreview.vue
+++ b/packages/frontend/src/components/MkFlashPreview.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkA :to="`/play/${flash.id}`" class="vhpxefrk _panel" tabindex="-1">
+<MkA :to="`/play/${flash.id}`" class="vhpxefrk _panel">
 	<article>
 		<header>
 			<h1 :title="flash.title">{{ flash.title }}</h1>
@@ -39,6 +39,10 @@ const props = defineProps<{
 		color: var(--accent);
 	}
 
+	&:focus-visible {
+		outline-offset: -2px;
+	}
+
 	> article {
 		padding: 16px;
 
diff --git a/packages/frontend/src/components/MkFolder.vue b/packages/frontend/src/components/MkFolder.vue
index 9b8eb19a11..f805be7b57 100644
--- a/packages/frontend/src/components/MkFolder.vue
+++ b/packages/frontend/src/components/MkFolder.vue
@@ -7,10 +7,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 <div ref="rootEl" :class="$style.root" role="group" :aria-expanded="opened">
 	<MkStickyContainer>
 		<template #header>
-			<div :class="[$style.header, { [$style.opened]: opened }]" class="_button" role="button" data-cy-folder-header @click="toggle">
+			<button :class="[$style.header, { [$style.opened]: opened }]" class="_button" role="button" data-cy-folder-header @click="toggle">
 				<div :class="$style.headerIcon"><slot name="icon"></slot></div>
 				<div :class="$style.headerText">
-					<div>
+					<div :class="$style.headerTextMain">
 						<MkCondensedLine :minScale="2 / 3"><slot name="label"></slot></MkCondensedLine>
 					</div>
 					<div :class="$style.headerTextSub">
@@ -22,7 +22,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<i v-if="opened" class="ti ti-chevron-up icon"></i>
 					<i v-else class="ti ti-chevron-down icon"></i>
 				</div>
-			</div>
+			</button>
 		</template>
 
 		<div v-if="openedAtLeastOnce" :class="[$style.body, { [$style.bgSame]: bgSame }]" :style="{ maxHeight: maxHeight ? `${maxHeight}px` : undefined, overflow: maxHeight ? `auto` : undefined }" :aria-hidden="!opened">
@@ -147,6 +147,10 @@ onMounted(() => {
 		background: var(--buttonHoverBg);
 	}
 
+	&:focus-within {
+		outline-offset: 2px;
+	}
+
 	&.active {
 		color: var(--accent);
 		background: var(--buttonHoverBg);
@@ -190,6 +194,12 @@ onMounted(() => {
 	padding-right: 12px;
 }
 
+.headerTextMain,
+.headerTextSub {
+	width: fit-content;
+	max-width: 100%;
+}
+
 .headerTextSub {
 	color: var(--fgTransparentWeak);
 	font-size: .85em;
diff --git a/packages/frontend/src/components/MkFollowButton.vue b/packages/frontend/src/components/MkFollowButton.vue
index 6a4081079c..ea76950c0d 100644
--- a/packages/frontend/src/components/MkFollowButton.vue
+++ b/packages/frontend/src/components/MkFollowButton.vue
@@ -185,17 +185,7 @@ onBeforeUnmount(() => {
 	}
 
 	&:focus-visible {
-		&:after {
-			content: "";
-			pointer-events: none;
-			position: absolute;
-			top: -5px;
-			right: -5px;
-			bottom: -5px;
-			left: -5px;
-			border: 2px solid var(--focus);
-			border-radius: 32px;
-		}
+		outline-offset: 2px;
 	}
 
 	&:hover {
diff --git a/packages/frontend/src/components/MkGalleryPostPreview.vue b/packages/frontend/src/components/MkGalleryPostPreview.vue
index 47cccd9b7c..2bb5b8762a 100644
--- a/packages/frontend/src/components/MkGalleryPostPreview.vue
+++ b/packages/frontend/src/components/MkGalleryPostPreview.vue
@@ -83,7 +83,7 @@ function leaveHover(): void {
 
 		> article {
 			> footer {
-				&:before {
+				&::before {
 					opacity: 1;
 				}
 			}
@@ -139,7 +139,7 @@ function leaveHover(): void {
 			text-shadow: 0 0 8px #000;
 			background: linear-gradient(transparent, rgba(0, 0, 0, 0.7));
 
-			&:before {
+			&::before {
 				content: "";
 				display: block;
 				position: absolute;
diff --git a/packages/frontend/src/components/MkImgWithBlurhash.vue b/packages/frontend/src/components/MkImgWithBlurhash.vue
index 4e3fafe845..617404f5c4 100644
--- a/packages/frontend/src/components/MkImgWithBlurhash.vue
+++ b/packages/frontend/src/components/MkImgWithBlurhash.vue
@@ -14,8 +14,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 		:enterToClass="defaultStore.state.animation && props.transition?.enterToClass || undefined"
 		:leaveFromClass="defaultStore.state.animation && props.transition?.leaveFromClass || undefined"
 	>
-		<canvas v-show="hide" key="canvas" ref="canvas" :class="$style.canvas" :width="canvasWidth" :height="canvasHeight" :title="title ?? undefined"/>
-		<img v-show="!hide" key="img" ref="img" :height="imgHeight" :width="imgWidth" :class="$style.img" :src="src ?? undefined" :title="title ?? undefined" :alt="alt ?? undefined" loading="eager" decoding="async"/>
+		<canvas v-show="hide" key="canvas" ref="canvas" :class="$style.canvas" :width="canvasWidth" :height="canvasHeight" :title="title ?? undefined" tabindex="-1"/>
+		<img v-show="!hide" key="img" ref="img" :height="imgHeight ?? undefined" :width="imgWidth ?? undefined" :class="$style.img" :src="src ?? undefined" :title="title ?? undefined" :alt="alt ?? undefined" loading="eager" decoding="async" tabindex="-1"/>
 	</TransitionGroup>
 </div>
 </template>
diff --git a/packages/frontend/src/components/MkLaunchPad.vue b/packages/frontend/src/components/MkLaunchPad.vue
index f9d4334c4c..8e3c19bd12 100644
--- a/packages/frontend/src/components/MkLaunchPad.vue
+++ b/packages/frontend/src/components/MkLaunchPad.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkModal ref="modal" v-slot="{ type, maxHeight }" :preferType="preferedModalType" :anchor="anchor" :transparentBg="true" :src="src" @click="modal?.close()" @closed="emit('closed')">
+<MkModal ref="modal" v-slot="{ type, maxHeight }" :preferType="preferedModalType" :anchor="anchor" :transparentBg="true" :src="src" @click="modal?.close()" @closed="emit('closed')" @esc="modal?.close()">
 	<div class="szkkfdyq _popup _shadow" :class="{ asDrawer: type === 'drawer' }" :style="{ maxHeight: maxHeight ? maxHeight + 'px' : '' }">
 		<div class="main">
 			<template v-for="item in items" :key="item.text">
diff --git a/packages/frontend/src/components/MkMediaAudio.vue b/packages/frontend/src/components/MkMediaAudio.vue
index e8dfcc7768..582cf238c0 100644
--- a/packages/frontend/src/components/MkMediaAudio.vue
+++ b/packages/frontend/src/components/MkMediaAudio.vue
@@ -39,23 +39,37 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<audio
 			ref="audioEl"
 			preload="metadata"
+			@keydown.prevent="() => {}"
 		>
 			<source :src="audio.url">
 		</audio>
 		<div :class="[$style.controlsChild, $style.controlsLeft]">
-			<button class="_button" :class="$style.controlButton" @click="togglePlayPause">
+			<button
+				:class="['_button', $style.controlButton]"
+				tabindex="-1"
+				@click.stop="togglePlayPause"
+			>
 				<i v-if="isPlaying" class="ti ti-player-pause-filled"></i>
 				<i v-else class="ti ti-player-play-filled"></i>
 			</button>
 		</div>
 		<div :class="[$style.controlsChild, $style.controlsRight]">
-			<button class="_button" :class="$style.controlButton" @click="showMenu">
+			<button
+				:class="['_button', $style.controlButton]"
+				tabindex="-1"
+				@click.stop="() => {}"
+				@mousedown.prevent.stop="showMenu"
+			>
 				<i class="ti ti-settings"></i>
 			</button>
 		</div>
 		<div :class="[$style.controlsChild, $style.controlsTime]">{{ hms(elapsedTimeMs) }}</div>
 		<div :class="[$style.controlsChild, $style.controlsVolume]">
-			<button class="_button" :class="$style.controlButton" @click="toggleMute">
+			<button
+				:class="['_button', $style.controlButton]"
+				tabindex="-1"
+				@click.stop="toggleMute"
+			>
 				<i v-if="volume === 0" class="ti ti-volume-3"></i>
 				<i v-else class="ti ti-volume"></i>
 			</button>
@@ -371,7 +385,7 @@ onDeactivated(() => {
 	border-radius: var(--radius);
 	overflow: clip;
 
-	&:focus {
+	&:focus-visible {
 		outline: none;
 	}
 }
@@ -437,6 +451,10 @@ onDeactivated(() => {
 			color: var(--accent);
 			background-color: var(--accentedBg);
 		}
+
+		&:focus-visible {
+			outline: none;
+		}
 	}
 }
 
diff --git a/packages/frontend/src/components/MkMediaList.vue b/packages/frontend/src/components/MkMediaList.vue
index b1321a8ef9..24b177d255 100644
--- a/packages/frontend/src/components/MkMediaList.vue
+++ b/packages/frontend/src/components/MkMediaList.vue
@@ -39,6 +39,7 @@ import XVideo from '@/components/MkMediaVideo.vue';
 import * as os from '@/os.js';
 import { FILE_TYPE_BROWSERSAFE } from '@/const.js';
 import { defaultStore } from '@/store.js';
+import { focusParent } from '@/scripts/focus.js';
 
 const props = defineProps<{
 	mediaList: Misskey.entities.DriveFile[];
@@ -49,7 +50,9 @@ const gallery = shallowRef<HTMLDivElement>();
 const pswpZIndex = os.claimZIndex('middle');
 document.documentElement.style.setProperty('--mk-pswp-root-z-index', pswpZIndex.toString());
 const count = computed(() => props.mediaList.filter(media => previewable(media)).length);
-let lightbox: PhotoSwipeLightbox | null;
+let lightbox: PhotoSwipeLightbox | null = null;
+
+let activeEl: HTMLElement | null = null;
 
 const popstateHandler = (): void => {
 	if (lightbox?.pswp && lightbox.pswp.isOpen === true) {
@@ -60,7 +63,7 @@ const popstateHandler = (): void => {
 async function calcAspectRatio() {
 	if (!gallery.value) return;
 
-	let img = props.mediaList[0];
+	const img = props.mediaList[0];
 
 	if (props.mediaList.length !== 1 || !(img.properties.width && img.properties.height)) {
 		gallery.value.style.aspectRatio = '';
@@ -131,6 +134,7 @@ onMounted(() => {
 		bgOpacity: 1,
 		showAnimationDuration: 100,
 		hideAnimationDuration: 100,
+		returnFocus: false,
 		pswpModule: PhotoSwipe,
 	});
 
@@ -159,39 +163,47 @@ onMounted(() => {
 	lightbox.on('uiRegister', () => {
 		lightbox?.pswp?.ui?.registerElement({
 			name: 'altText',
-			className: 'pwsp__alt-text-container',
+			className: 'pswp__alt-text-container',
 			appendTo: 'wrapper',
-			onInit: (el, pwsp) => {
-				let textBox = document.createElement('p');
-				textBox.className = 'pwsp__alt-text _acrylic';
+			onInit: (el, pswp) => {
+				const textBox = document.createElement('p');
+				textBox.className = 'pswp__alt-text _acrylic';
 				el.appendChild(textBox);
 
-				pwsp.on('change', () => {
-					textBox.textContent = pwsp.currSlide?.data.comment;
+				pswp.on('change', () => {
+					textBox.textContent = pswp.currSlide?.data.comment;
 				});
 			},
 		});
 	});
 
-	lightbox.init();
-
-	window.addEventListener('popstate', popstateHandler);
-
-	lightbox.on('beforeOpen', () => {
+	lightbox.on('afterInit', () => {
+		activeEl = document.activeElement instanceof HTMLElement ? document.activeElement : null;
+		focusParent(activeEl, true, true);
+		lightbox?.pswp?.element?.focus({
+			preventScroll: true,
+		});
 		history.pushState(null, '', '#pswp');
 	});
 
-	lightbox.on('close', () => {
+	lightbox.on('destroy', () => {
+		focusParent(activeEl, true, false);
+		activeEl = null;
 		if (window.location.hash === '#pswp') {
 			history.back();
 		}
 	});
+
+	window.addEventListener('popstate', popstateHandler);
+
+	lightbox.init();
 });
 
 onUnmounted(() => {
 	window.removeEventListener('popstate', popstateHandler);
 	lightbox?.destroy();
 	lightbox = null;
+	activeEl = null;
 });
 
 const previewable = (file: Misskey.entities.DriveFile): boolean => {
@@ -199,6 +211,16 @@ const previewable = (file: Misskey.entities.DriveFile): boolean => {
 	// FILE_TYPE_BROWSERSAFEに適合しないものはブラウザで表示するのに不適切
 	return (file.type.startsWith('video') || file.type.startsWith('image')) && FILE_TYPE_BROWSERSAFE.includes(file.type);
 };
+
+const openGallery = () => {
+	if (props.mediaList.filter(media => previewable(media)).length > 0) {
+		lightbox?.loadAndOpen(0);
+	}
+};
+
+defineExpose({
+	openGallery,
+});
 </script>
 
 <style lang="scss" module>
@@ -298,7 +320,7 @@ const previewable = (file: Misskey.entities.DriveFile): boolean => {
 	backdrop-filter: var(--modalBgFilter);
 }
 
-.pwsp__alt-text-container {
+.pswp__alt-text-container {
 	display: flex;
 	flex-direction: row;
 	align-items: center;
@@ -312,7 +334,7 @@ const previewable = (file: Misskey.entities.DriveFile): boolean => {
 	max-width: 800px;
 }
 
-.pwsp__alt-text {
+.pswp__alt-text {
 	color: var(--fg);
 	margin: 0 auto;
 	text-align: center;
diff --git a/packages/frontend/src/components/MkMediaVideo.vue b/packages/frontend/src/components/MkMediaVideo.vue
index 7c46084c63..0ec0039df4 100644
--- a/packages/frontend/src/components/MkMediaVideo.vue
+++ b/packages/frontend/src/components/MkMediaVideo.vue
@@ -481,7 +481,7 @@ onDeactivated(() => {
 	position: relative;
 	overflow: clip;
 
-	&:focus {
+	&:focus-visible {
 		outline: none;
 	}
 }
@@ -588,6 +588,10 @@ onDeactivated(() => {
 	border-radius: 99rem;
 
 	font-size: 1.1rem;
+
+	&:focus-visible {
+		outline: none;
+	}
 }
 
 .videoLoading {
@@ -651,6 +655,10 @@ onDeactivated(() => {
 		&:hover {
 			background-color: var(--accent);
 		}
+
+		&:focus-visible {
+			outline: none;
+		}
 	}
 }
 
diff --git a/packages/frontend/src/components/MkMenu.child.vue b/packages/frontend/src/components/MkMenu.child.vue
index dfb6d34618..235790556c 100644
--- a/packages/frontend/src/components/MkMenu.child.vue
+++ b/packages/frontend/src/components/MkMenu.child.vue
@@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { nextTick, onMounted, onUnmounted, shallowRef, watch } from 'vue';
+import { nextTick, onMounted, onUnmounted, provide, shallowRef, watch } from 'vue';
 import MkMenu from './MkMenu.vue';
 import { MenuItem } from '@/types/menu.js';
 
@@ -19,7 +19,6 @@ const props = defineProps<{
 	targetElement: HTMLElement;
 	rootElement: HTMLElement;
 	width?: number;
-	viaKeyboard?: boolean;
 }>();
 
 const emit = defineEmits<{
@@ -27,6 +26,8 @@ const emit = defineEmits<{
 	(ev: 'actioned'): void;
 }>();
 
+provide('isNestingMenu', true);
+
 const el = shallowRef<HTMLElement>();
 const align = 'left';
 
diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue
index 119504f744..68479989b2 100644
--- a/packages/frontend/src/components/MkMenu.vue
+++ b/packages/frontend/src/components/MkMenu.vue
@@ -4,23 +4,42 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div role="menu">
+<div role="menu" @focusin.passive.stop="() => {}">
 	<div
-		ref="itemsEl" v-hotkey="keymap"
+		ref="itemsEl"
+		v-hotkey="keymap"
+		tabindex="0"
 		class="_popup _shadow"
-		:class="[$style.root, { [$style.center]: align === 'center', [$style.asDrawer]: asDrawer }]"
-		:style="{ width: (width && !asDrawer) ? width + 'px' : '', maxHeight: maxHeight ? maxHeight + 'px' : '' }"
-		@contextmenu.self="e => e.preventDefault()"
+		:class="{
+			[$style.root]: true,
+			[$style.center]: align === 'center',
+			[$style.asDrawer]: asDrawer,
+		}"
+		:style="{
+			width: (width && !asDrawer) ? `${width}px` : '',
+			maxHeight: maxHeight ? `${maxHeight}px` : '',
+		}"
+		@keydown.stop="() => {}"
+		@contextmenu.self.prevent="() => {}"
 	>
-		<template v-for="(item, i) in (items2 ?? [])">
-			<div v-if="item.type === 'divider'" role="separator" :class="$style.divider"></div>
-			<span v-else-if="item.type === 'label'" role="menuitem" :class="[$style.label, $style.item]">
+		<template v-for="item in (items2 ?? [])">
+			<div v-if="item.type === 'divider'" role="separator" tabindex="-1" :class="$style.divider"></div>
+			<span v-else-if="item.type === 'label'" role="menuitem" tabindex="-1" :class="[$style.label, $style.item]">
 				<span style="opacity: 0.7;">{{ item.text }}</span>
 			</span>
-			<span v-else-if="item.type === 'pending'" role="menuitem" :tabindex="i" :class="[$style.pending, $style.item]">
+			<span v-else-if="item.type === 'pending'" role="menuitem" tabindex="0" :class="[$style.pending, $style.item]">
 				<span><MkEllipsis/></span>
 			</span>
-			<MkA v-else-if="item.type === 'link'" role="menuitem" :to="item.to" :tabindex="i" class="_button" :class="$style.item" @click.passive="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<MkA
+				v-else-if="item.type === 'link'"
+				role="menuitem"
+				tabindex="0"
+				:class="['_button', $style.item]"
+				:to="item.to"
+				@click.passive="close(true)"
+				@mouseenter.passive="onItemMouseEnter"
+				@mouseleave.passive="onItemMouseLeave"
+			>
 				<i v-if="item.icon" class="ti-fw" :class="[$style.icon, item.icon]"></i>
 				<MkAvatar v-if="item.avatar" :user="item.avatar" :class="$style.avatar"/>
 				<div :class="$style.item_content">
@@ -28,20 +47,48 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<span v-if="item.indicate" :class="$style.indicator"><i class="_indicatorCircle"></i></span>
 				</div>
 			</MkA>
-			<a v-else-if="item.type === 'a'" role="menuitem" :href="item.href" :target="item.target" :download="item.download" :tabindex="i" class="_button" :class="$style.item" @click="close(true)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<a
+				v-else-if="item.type === 'a'"
+				role="menuitem"
+				tabindex="0"
+				:class="['_button', $style.item]"
+				:href="item.href"
+				:target="item.target"
+				:download="item.download"
+				@click.passive="close(true)"
+				@mouseenter.passive="onItemMouseEnter"
+				@mouseleave.passive="onItemMouseLeave"
+			>
 				<i v-if="item.icon" class="ti-fw" :class="[$style.icon, item.icon]"></i>
 				<div :class="$style.item_content">
 					<span :class="$style.item_content_text">{{ item.text }}</span>
 					<span v-if="item.indicate" :class="$style.indicator"><i class="_indicatorCircle"></i></span>
 				</div>
 			</a>
-			<button v-else-if="item.type === 'user'" role="menuitem" :tabindex="i" class="_button" :class="[$style.item, { [$style.active]: item.active }]" :disabled="item.active" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<button
+				v-else-if="item.type === 'user'"
+				role="menuitem"
+				tabindex="0"
+				:class="['_button', $style.item, { [$style.active]: item.active }]"
+				@click.prevent="item.active ? close(false) : clicked(item.action, $event)"
+				@mouseenter.passive="onItemMouseEnter"
+				@mouseleave.passive="onItemMouseLeave"
+			>
 				<MkAvatar :user="item.user" :class="$style.avatar"/><MkUserName :user="item.user"/>
 				<div v-if="item.indicate" :class="$style.item_content">
 					<span :class="$style.indicator"><i class="_indicatorCircle"></i></span>
 				</div>
 			</button>
-			<button v-else-if="item.type === 'switch'" role="menuitemcheckbox" :tabindex="i" class="_button" :class="[$style.item, $style.switch, { [$style.switchDisabled]: item.disabled } ]" @click="switchItem(item)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<button
+				v-else-if="item.type === 'switch'"
+				role="menuitemcheckbox"
+				tabindex="0"
+				:class="['_button', $style.item]"
+				:disabled="unref(item.disabled)"
+				@click.prevent="switchItem(item)"
+				@mouseenter.passive="onItemMouseEnter"
+				@mouseleave.passive="onItemMouseLeave"
+			>
 				<i v-if="item.icon" class="ti-fw" :class="[$style.icon, item.icon]"></i>
 				<MkSwitchButton v-else :class="$style.switchButton" :checked="item.ref" :disabled="item.disabled" @toggle="switchItem(item)"/>
 				<div :class="$style.item_content">
@@ -49,29 +96,61 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkSwitchButton v-if="item.icon" :class="[$style.switchButton, $style.caret]" :checked="item.ref" :disabled="item.disabled" @toggle="switchItem(item)"/>
 				</div>
 			</button>
-			<button v-else-if="item.type === 'radio'" class="_button" role="menuitem" :tabindex="i" :class="[$style.item, $style.parent, { [$style.childShowing]: childShowingItem === item }]" @mouseenter="preferClick ? null : showRadioOptions(item, $event)" @click="!preferClick ? null : showRadioOptions(item, $event)">
+			<button
+				v-else-if="item.type === 'radio'"
+				role="menuitem"
+				tabindex="0"
+				:class="['_button', $style.item, $style.parent, { [$style.active]: childShowingItem === item }]"
+				:disabled="unref(item.disabled)"
+				@mouseenter.prevent="preferClick ? null : showRadioOptions(item, $event)"
+				@keydown.enter.prevent="preferClick ? null : showRadioOptions(item, $event)"
+				@click.prevent="!preferClick ? null : showRadioOptions(item, $event)"
+			>
 				<i v-if="item.icon" class="ti-fw" :class="[$style.icon, item.icon]" style="pointer-events: none;"></i>
 				<div :class="$style.item_content">
 					<span :class="$style.item_content_text" style="pointer-events: none;">{{ item.text }}</span>
 					<span :class="$style.caret" style="pointer-events: none;"><i class="ti ti-chevron-right ti-fw"></i></span>
 				</div>
 			</button>
-			<button v-else-if="item.type === 'radioOption'" :tabindex="i" class="_button" role="menuitem" :class="[$style.item, { [$style.radioActive]: item.active }]" @click="clicked(item.action, $event, false)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<button
+				v-else-if="item.type === 'radioOption'"
+				role="menuitemradio"
+				tabindex="0"
+				:class="['_button', $style.item, $style.radio, { [$style.active]: unref(item.active) }]"
+				@click.prevent="unref(item.active) ? null : clicked(item.action, $event, false)"
+				@mouseenter.passive="onItemMouseEnter"
+				@mouseleave.passive="onItemMouseLeave"
+			>
 				<div :class="$style.icon">
-					<span :class="[$style.radio, { [$style.radioChecked]: item.active }]"></span>
+					<span :class="[$style.radioIcon, { [$style.radioChecked]: unref(item.active) }]"></span>
 				</div>
 				<div :class="$style.item_content">
 					<span :class="$style.item_content_text">{{ item.text }}</span>
 				</div>
 			</button>
-			<button v-else-if="item.type === 'parent'" class="_button" role="menuitem" :tabindex="i" :class="[$style.item, $style.parent, { [$style.childShowing]: childShowingItem === item }]" @mouseenter="preferClick ? null : showChildren(item, $event)" @click="!preferClick ? null : showChildren(item, $event)">
+			<button
+				v-else-if="item.type === 'parent'"
+				role="menuitem"
+				tabindex="0"
+				:class="['_button', $style.item, $style.parent, { [$style.active]: childShowingItem === item }]"
+				@mouseenter.prevent="preferClick ? null : showChildren(item, $event)"
+				@keydown.enter.prevent="preferClick ? null : showChildren(item, $event)"
+				@click.prevent="!preferClick ? null : showChildren(item, $event)"
+			>
 				<i v-if="item.icon" class="ti-fw" :class="[$style.icon, item.icon]" style="pointer-events: none;"></i>
 				<div :class="$style.item_content">
 					<span :class="$style.item_content_text" style="pointer-events: none;">{{ item.text }}</span>
 					<span :class="$style.caret" style="pointer-events: none;"><i class="ti ti-chevron-right ti-fw"></i></span>
 				</div>
 			</button>
-			<button v-else :tabindex="i" class="_button" role="menuitem" :class="[$style.item, { [$style.danger]: item.danger, [$style.active]: getValue(item.active) }]" :disabled="getValue(item.active)" @click="clicked(item.action, $event)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
+			<button
+				v-else role="menuitem"
+				tabindex="0"
+				:class="['_button', $style.item, { [$style.danger]: item.danger, [$style.active]: unref(item.active) }]"
+				@click.prevent="unref(item.active) ? close(false) : clicked(item.action, $event)"
+				@mouseenter.passive="onItemMouseEnter"
+				@mouseleave.passive="onItemMouseLeave"
+			>
 				<i v-if="item.icon" class="ti-fw" :class="[$style.icon, item.icon]"></i>
 				<MkAvatar v-if="item.avatar" :user="item.avatar" :class="$style.avatar"/>
 				<div :class="$style.item_content">
@@ -80,25 +159,26 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</div>
 			</button>
 		</template>
-		<span v-if="items2 == null || items2.length === 0" :class="[$style.none, $style.item]">
+		<span v-if="items2 == null || items2.length === 0" tabindex="-1" :class="[$style.none, $style.item]">
 			<span>{{ i18n.ts.none }}</span>
 		</span>
 	</div>
 	<div v-if="childMenu">
-		<XChild ref="child" :items="childMenu" :targetElement="childTarget!" :rootElement="itemsEl!" showing @actioned="childActioned" @close="close(false)"/>
+		<XChild ref="child" :items="childMenu" :targetElement="childTarget!" :rootElement="itemsEl!" @actioned="childActioned" @closed="closeChild"/>
 	</div>
 </div>
 </template>
 
 <script lang="ts">
-import { ComputedRef, computed, defineAsyncComponent, isRef, nextTick, onBeforeUnmount, onMounted, ref, shallowRef, watch } from 'vue';
-import { focusPrev, focusNext } from '@/scripts/focus.js';
+import { computed, defineAsyncComponent, inject, nextTick, onBeforeUnmount, onMounted, ref, shallowRef, unref, watch } from 'vue';
 import MkSwitchButton from '@/components/MkSwitch.button.vue';
 import { MenuItem, InnerMenuItem, MenuPending, MenuAction, MenuSwitch, MenuRadio, MenuRadioOption, MenuParent } from '@/types/menu.js';
 import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
 import { isTouchUsing } from '@/scripts/touch.js';
 import { type Keymap } from '@/scripts/hotkey.js';
+import { isFocusable } from '@/scripts/focus.js';
+import { getNodeOrNull } from '@/scripts/get-dom-node-or-null.js';
 
 const childrenCache = new WeakMap<MenuParent, MenuItem[]>();
 </script>
@@ -108,7 +188,6 @@ const XChild = defineAsyncComponent(() => import('./MkMenu.child.vue'));
 
 const props = defineProps<{
 	items: MenuItem[];
-	viaKeyboard?: boolean;
 	asDrawer?: boolean;
 	align?: 'center' | string;
 	width?: number;
@@ -120,7 +199,9 @@ const emit = defineEmits<{
 	(ev: 'hide'): void;
 }>();
 
-const itemsEl = shallowRef<HTMLDivElement>();
+const isNestingMenu = inject<boolean>('isNestingMenu', false);
+
+const itemsEl = shallowRef<HTMLElement>();
 
 const items2 = ref<InnerMenuItem[]>();
 
@@ -177,25 +258,19 @@ function childActioned() {
 	close(true);
 }
 
-const onGlobalMousedown = (event: MouseEvent) => {
-	if (childTarget.value && (event.target === childTarget.value || childTarget.value.contains(event.target as Node))) return;
-	if (child.value && child.value.checkHit(event)) return;
-	closeChild();
-};
-
 let childCloseTimer: null | number = null;
 
-function onItemMouseEnter(item) {
+function onItemMouseEnter() {
 	childCloseTimer = window.setTimeout(() => {
 		closeChild();
 	}, 300);
 }
 
-function onItemMouseLeave(item) {
+function onItemMouseLeave() {
 	if (childCloseTimer) window.clearTimeout(childCloseTimer);
 }
 
-async function showRadioOptions(item: MenuRadio, ev: MouseEvent) {
+async function showRadioOptions(item: MenuRadio, ev: Event) {
 	const children: MenuItem[] = Object.keys(item.options).map<MenuRadioOption>(key => {
 		const value = item.options[key];
 		return {
@@ -210,7 +285,7 @@ async function showRadioOptions(item: MenuRadio, ev: MouseEvent) {
 
 	if (props.asDrawer) {
 		os.popupMenu(children, ev.currentTarget ?? ev.target).finally(() => {
-			emit('close');
+			close(false);
 		});
 		emit('hide');
 	} else {
@@ -220,7 +295,7 @@ async function showRadioOptions(item: MenuRadio, ev: MouseEvent) {
 	}
 }
 
-async function showChildren(item: MenuParent, ev: MouseEvent) {
+async function showChildren(item: MenuParent, ev: Event) {
 	const children: MenuItem[] = await (async () => {
 		if (childrenCache.has(item)) {
 			return childrenCache.get(item)!;
@@ -237,7 +312,7 @@ async function showChildren(item: MenuParent, ev: MouseEvent) {
 
 	if (props.asDrawer) {
 		os.popupMenu(children, ev.currentTarget ?? ev.target).finally(() => {
-			emit('close');
+			close(false);
 		});
 		emit('hide');
 	} else {
@@ -256,15 +331,11 @@ function clicked(fn: MenuAction, ev: MouseEvent, doClose = true) {
 }
 
 function close(actioned = false) {
-	emit('close', actioned);
-}
-
-function focusUp() {
-	focusPrev(document.activeElement);
-}
-
-function focusDown() {
-	focusNext(document.activeElement);
+	disposeHandlers();
+	nextTick(() => {
+		closeChild();
+		emit('close', actioned);
+	});
 }
 
 function switchItem(item: MenuSwitch & { ref: any }) {
@@ -272,25 +343,75 @@ function switchItem(item: MenuSwitch & { ref: any }) {
 	item.ref = !item.ref;
 }
 
-function getValue<T>(item?: ComputedRef<T> | T) {
-	return isRef(item) ? item.value : item;
+function focusUp() {
+	if (disposed) return;
+	if (!itemsEl.value?.contains(document.activeElement)) return;
+
+	const focusableElements = Array.from(itemsEl.value.children).filter(isFocusable);
+	const activeIndex = focusableElements.findIndex(el => el === document.activeElement);
+	const targetIndex = (activeIndex !== -1 && activeIndex !== 0) ? (activeIndex - 1) : (focusableElements.length - 1);
+	const targetElement = focusableElements.at(targetIndex) ?? itemsEl.value;
+
+	targetElement.focus();
 }
 
-onMounted(() => {
-	if (props.viaKeyboard) {
-		nextTick(() => {
-			if (itemsEl.value) focusNext(itemsEl.value.children[0], true, false);
-		});
+function focusDown() {
+	if (disposed) return;
+	if (!itemsEl.value?.contains(document.activeElement)) return;
+
+	const focusableElements = Array.from(itemsEl.value.children).filter(isFocusable);
+	const activeIndex = focusableElements.findIndex(el => el === document.activeElement);
+	const targetIndex = (activeIndex !== -1 && activeIndex !== (focusableElements.length - 1)) ? (activeIndex + 1) : 0;
+	const targetElement = focusableElements.at(targetIndex) ?? itemsEl.value;
+
+	targetElement.focus();
+}
+
+const onGlobalFocusin = (ev: FocusEvent) => {
+	if (disposed) return;
+	if (itemsEl.value?.parentElement?.contains(getNodeOrNull(ev.target))) return;
+	nextTick(() => {
+		if (itemsEl.value != null && isFocusable(itemsEl.value)) {
+			itemsEl.value.focus({ preventScroll: true });
+			nextTick(() => focusDown());
+		}
+	});
+};
+
+const onGlobalMousedown = (ev: MouseEvent) => {
+	if (disposed) return;
+	if (childTarget.value?.contains(getNodeOrNull(ev.target))) return;
+	if (child.value?.checkHit(ev)) return;
+	closeChild();
+};
+
+const setupHandlers = () => {
+	if (!isNestingMenu) {
+		document.addEventListener('focusin', onGlobalFocusin, { passive: true });
 	}
-
-	// TODO: アクティブな要素までスクロール
-	//itemsEl.scrollTo();
-
 	document.addEventListener('mousedown', onGlobalMousedown, { passive: true });
+};
+
+let disposed = false;
+
+const disposeHandlers = () => {
+	disposed = true;
+	if (!isNestingMenu) {
+		document.removeEventListener('focusin', onGlobalFocusin);
+	}
+	document.removeEventListener('mousedown', onGlobalMousedown);
+};
+
+onMounted(() => {
+	setupHandlers();
+
+	if (!isNestingMenu) {
+		nextTick(() => itemsEl.value?.focus({ preventScroll: true }));
+	}
 });
 
 onBeforeUnmount(() => {
-	document.removeEventListener('mousedown', onGlobalMousedown);
+	disposeHandlers();
 });
 </script>
 
@@ -303,6 +424,10 @@ onBeforeUnmount(() => {
 	overflow: auto;
 	overscroll-behavior: contain;
 
+	&:focus-visible {
+		outline: none;
+	}
+
 	&.center {
 		> .item {
 			text-align: center;
@@ -320,7 +445,7 @@ onBeforeUnmount(() => {
 			font-size: 1em;
 			padding: 12px 24px;
 
-			&:before {
+			&::before {
 				width: calc(100% - 24px);
 				border-radius: 12px;
 			}
@@ -350,8 +475,10 @@ onBeforeUnmount(() => {
 	text-align: left;
 	overflow: hidden;
 	text-overflow: ellipsis;
+	text-decoration: none !important;
+	color: var(--menuFg, var(--fg));
 
-	&:before {
+	&::before {
 		content: "";
 		display: block;
 		position: absolute;
@@ -365,56 +492,56 @@ onBeforeUnmount(() => {
 		border-radius: 6px;
 	}
 
-	&:not(:disabled):hover {
-		color: var(--accent);
-		text-decoration: none;
+	&:focus-visible {
+		outline: none;
 
-		&:before {
-			background: var(--accentedBg);
+		&:not(:hover):not(:active)::before {
+			outline: var(--focus) solid 2px;
+			outline-offset: -2px;
 		}
 	}
 
+	&:not(:disabled) {
+		&:hover,
+		&:focus-visible:active,
+		&:focus-visible.active {
+			color: var(--menuHoverFg, var(--accent));
+
+			&::before {
+				background-color: var(--menuHoverBg, var(--accentedBg));
+			}
+		}
+
+		&:not(:focus-visible):active,
+		&:not(:focus-visible).active {
+			color: var(--menuActiveFg, var(--fgOnAccent));
+
+			&::before {
+				background-color: var(--menuActiveBg, var(--accent));
+			}
+		}
+	}
+
+	&:disabled {
+		cursor: not-allowed;
+	}
+
 	&.danger {
-		color: #ff2a2a;
-
-		&:hover {
-			color: #fff;
-
-			&:before {
-				background: #ff4242;
-			}
-		}
-
-		&:active {
-			color: #fff;
-
-			&:before {
-				background: #d42e2e !important;
-			}
-		}
+		--menuFg: #ff2a2a;
+		--menuHoverFg: #fff;
+		--menuHoverBg: #ff4242;
+		--menuActiveFg: #fff;
+		--menuActiveBg: #d42e2e;
 	}
 
-	&:active,
-	&.active {
-		color: var(--fgOnAccent) !important;
-		opacity: 1;
-
-		&:before {
-			background: var(--accent) !important;
-		}
+	&.radio {
+		--menuActiveFg: var(--accent);
+		--menuActiveBg: var(--accentedBg);
 	}
 
-	&.radioActive {
-		color: var(--accent) !important;
-		opacity: 1;
-
-		&:before {
-			background-color: var(--accentedBg) !important;
-		}
-	}
-
-	&:not(:active):focus-visible {
-		box-shadow: 0 0 0 2px var(--focus) inset;
+	&.parent {
+		--menuActiveFg: var(--accent);
+		--menuActiveBg: var(--accentedBg);
 	}
 
 	&.label {
@@ -432,22 +559,6 @@ onBeforeUnmount(() => {
 		pointer-events: none;
 		opacity: 0.7;
 	}
-
-	&.parent {
-		pointer-events: auto;
-		display: flex;
-		align-items: center;
-		cursor: default;
-
-		&.childShowing {
-			color: var(--accent);
-			text-decoration: none;
-
-			&:before {
-				background: var(--accentedBg);
-			}
-		}
-	}
 }
 
 .item_content {
@@ -466,18 +577,6 @@ onBeforeUnmount(() => {
 	overflow: hidden;
 }
 
-.switch {
-	position: relative;
-	display: flex;
-	transition: all 0.2s ease;
-	user-select: none;
-	cursor: pointer;
-}
-
-.switchDisabled {
-	cursor: not-allowed;
-}
-
 .switchButton {
 	margin-left: -2px;
 	--height: 1.35em;
@@ -489,14 +588,6 @@ onBeforeUnmount(() => {
 	text-overflow: ellipsis;
 }
 
-.switchInput {
-	position: absolute;
-	width: 0;
-	height: 0;
-	opacity: 0;
-	margin: 0;
-}
-
 .icon {
 	margin-right: 8px;
 	line-height: 1;
@@ -525,12 +616,12 @@ onBeforeUnmount(() => {
 	border-top: solid 0.5px var(--divider);
 }
 
-.radio {
+.radioIcon {
 	display: inline-block;
 	position: relative;
 	width: 1em;
 	height: 1em;
-	vertical-align: -.125em;
+	vertical-align: -0.125em;
 	border-radius: 50%;
 	border: solid 2px var(--divider);
 	background-color: var(--panel);
diff --git a/packages/frontend/src/components/MkModal.vue b/packages/frontend/src/components/MkModal.vue
index 264d8b6c9c..a5fbf8d365 100644
--- a/packages/frontend/src/components/MkModal.vue
+++ b/packages/frontend/src/components/MkModal.vue
@@ -30,9 +30,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 		[$style.transition_modal_leaveTo]: transitionName === 'modal',
 		[$style.transition_send_leaveTo]: transitionName === 'send',
 	})"
-	:duration="transitionDuration" appear @afterLeave="emit('closed')" @enter="emit('opening')" @afterEnter="onOpened"
+	:duration="transitionDuration" appear @afterLeave="onClosed" @enter="emit('opening')" @afterEnter="onOpened"
 >
-	<div v-show="manualShowing != null ? manualShowing : showing" v-hotkey.global="keymap" :class="[$style.root, { [$style.drawer]: type === 'drawer', [$style.dialog]: type === 'dialog', [$style.popup]: type === 'popup' }]" :style="{ zIndex, pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }">
+	<div v-show="manualShowing != null ? manualShowing : showing" ref="modalRootEl" v-hotkey.global="keymap" :class="[$style.root, { [$style.drawer]: type === 'drawer', [$style.dialog]: type === 'dialog', [$style.popup]: type === 'popup' }]" :style="{ zIndex, pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }">
 		<div data-cy-bg :data-cy-transparent="isEnableBgTransparent" class="_modalBg" :class="[$style.bg, { [$style.bgTransparent]: isEnableBgTransparent }]" :style="{ zIndex }" @click="onBgClick" @mousedown="onBgClick" @contextmenu.prevent.stop="() => {}"></div>
 		<div ref="content" :class="[$style.content, { [$style.fixed]: fixed }]" :style="{ zIndex }" @click.self="onBgClick">
 			<slot :max-height="maxHeight" :type="type"></slot>
@@ -48,6 +48,8 @@ import { isTouchUsing } from '@/scripts/touch.js';
 import { defaultStore } from '@/store.js';
 import { deviceKind } from '@/scripts/device-kind.js';
 import { type Keymap } from '@/scripts/hotkey.js';
+import { focusTrap } from '@/scripts/focus-trap.js';
+import { focusParent } from '@/scripts/focus.js';
 
 function getFixedContainer(el: Element | null): Element | null {
 	if (el == null || el.tagName === 'BODY') return null;
@@ -69,6 +71,7 @@ const props = withDefaults(defineProps<{
 	zPriority?: 'low' | 'middle' | 'high';
 	noOverlap?: boolean;
 	transparentBg?: boolean;
+	returnFocusTo?: HTMLElement | null;
 }>(), {
 	manualShowing: null,
 	src: null,
@@ -77,6 +80,7 @@ const props = withDefaults(defineProps<{
 	zPriority: 'low',
 	noOverlap: true,
 	transparentBg: false,
+	returnFocusTo: null,
 });
 
 const emit = defineEmits<{
@@ -94,6 +98,7 @@ const maxHeight = ref<number>();
 const fixed = ref(false);
 const transformOrigin = ref('center');
 const showing = ref(true);
+const modalRootEl = shallowRef<HTMLElement>();
 const content = shallowRef<HTMLElement>();
 const zIndex = os.claimZIndex(props.zPriority);
 const useSendAnime = ref(false);
@@ -132,6 +137,7 @@ const transitionDuration = computed((() =>
 					: 0
 ));
 
+let releaseFocusTrap: (() => void) | null = null;
 let contentClicking = false;
 
 function close(opts: { useSendAnimation?: boolean } = {}) {
@@ -296,6 +302,10 @@ const onOpened = () => {
 	}, { passive: true });
 };
 
+const onClosed = () => {
+	emit('closed');
+};
+
 const alignObserver = new ResizeObserver((entries, observer) => {
 	align();
 });
@@ -313,6 +323,20 @@ onMounted(() => {
 		align();
 	}, { immediate: true });
 
+	watch([showing, () => props.manualShowing], ([showing, manualShowing]) => {
+		if (manualShowing === true || (manualShowing == null && showing === true)) {
+			if (modalRootEl.value != null) {
+				const { release } = focusTrap(modalRootEl.value);
+
+				releaseFocusTrap = release;
+				modalRootEl.value.focus();
+			}
+		} else {
+			releaseFocusTrap?.();
+			focusParent(props.returnFocusTo ?? props.src, true, false);
+		}
+	}, { immediate: true });
+
 	nextTick(() => {
 		alignObserver.observe(content.value!);
 	});
diff --git a/packages/frontend/src/components/MkModalWindow.vue b/packages/frontend/src/components/MkModalWindow.vue
index d3657afa94..78053c8cfd 100644
--- a/packages/frontend/src/components/MkModalWindow.vue
+++ b/packages/frontend/src/components/MkModalWindow.vue
@@ -4,8 +4,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkModal ref="modal" :preferType="'dialog'" @click="onBgClick" @closed="$emit('closed')">
-	<div ref="rootEl" :class="$style.root" :style="{ width: `${width}px`, height: `min(${height}px, 100%)` }" @keydown="onKeydown">
+<MkModal ref="modal" :preferType="'dialog'" @click="onBgClick" @closed="emit('closed')" @esc="emit('esc')">
+	<div ref="rootEl" :class="$style.root" :style="{ width: `${width}px`, height: `min(${height}px, 100%)` }">
 		<div ref="headerEl" :class="$style.header">
 			<button v-if="withOkButton" :class="$style.headerButton" class="_button" @click="$emit('close')"><i class="ti ti-x"></i></button>
 			<span :class="$style.title">
@@ -42,6 +42,7 @@ const emit = defineEmits<{
 	(event: 'close'): void;
 	(event: 'closed'): void;
 	(event: 'ok'): void;
+	(event: 'esc'): void;
 }>();
 
 const modal = shallowRef<InstanceType<typeof MkModal>>();
@@ -58,14 +59,6 @@ const onBgClick = () => {
 	emit('click');
 };
 
-const onKeydown = (evt) => {
-	if (evt.which === 27) { // Esc
-		evt.preventDefault();
-		evt.stopPropagation();
-		close();
-	}
-};
-
 const ro = new ResizeObserver((entries, observer) => {
 	if (rootEl.value == null || headerEl.value == null) return;
 	bodyWidth.value = rootEl.value.offsetWidth;
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index fc72813285..420ff2c651 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	ref="rootEl"
 	v-hotkey="keymap"
 	:class="[$style.root, { [$style.showActionsOnlyHover]: defaultStore.state.showNoteActionsOnlyHover }]"
-	:tabindex="!isDeleted ? '-1' : undefined"
+	:tabindex="isDeleted ? '-1' : '0'"
 >
 	<MkNoteSub v-if="appearNote.reply && !renoteCollapsed" :note="appearNote.reply" :class="$style.replyTo"/>
 	<div v-if="pinned" :class="$style.tip"><i class="ti ti-pin"></i> {{ i18n.ts.pinnedNote }}</div>
@@ -28,7 +28,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</template>
 		</I18n>
 		<div :class="$style.renoteInfo">
-			<button ref="renoteTime" :class="$style.renoteTime" class="_button" @click="showRenoteMenu()">
+			<button ref="renoteTime" :class="$style.renoteTime" class="_button" @mousedown.prevent="showRenoteMenu()">
 				<i class="ti ti-dots" :class="$style.renoteMenu"></i>
 				<MkTime :time="note.createdAt"/>
 			</button>
@@ -79,7 +79,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						</div>
 					</div>
 					<div v-if="appearNote.files && appearNote.files.length > 0">
-						<MkMediaList :mediaList="appearNote.files"/>
+						<MkMediaList ref="galleryEl" :mediaList="appearNote.files"/>
 					</div>
 					<MkPoll v-if="appearNote.poll" :noteId="appearNote.id" :poll="appearNote.poll" :class="$style.poll"/>
 					<div v-if="isEnabledUrlPreview">
@@ -110,7 +110,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					ref="renoteButton"
 					:class="$style.footerButton"
 					class="_button"
-					@mousedown="renote()"
+					@mousedown.prevent="renote()"
 				>
 					<i class="ti ti-repeat"></i>
 					<p v-if="appearNote.renoteCount > 0" :class="$style.footerButtonCount">{{ number(appearNote.renoteCount) }}</p>
@@ -125,10 +125,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<i v-else class="ti ti-plus"></i>
 					<p v-if="(appearNote.reactionAcceptance === 'likeOnly' || defaultStore.state.showReactionsCount) && appearNote.reactionCount > 0" :class="$style.footerButtonCount">{{ number(appearNote.reactionCount) }}</p>
 				</button>
-				<button v-if="defaultStore.state.showClipButtonInNoteFooter" ref="clipButton" :class="$style.footerButton" class="_button" @mousedown="clip()">
+				<button v-if="defaultStore.state.showClipButtonInNoteFooter" ref="clipButton" :class="$style.footerButton" class="_button" @mousedown.prevent="clip()">
 					<i class="ti ti-paperclip"></i>
 				</button>
-				<button ref="menuButton" :class="$style.footerButton" class="_button" @mousedown="showMenu()">
+				<button ref="menuButton" :class="$style.footerButton" class="_button" @mousedown.prevent="showMenu()">
 					<i class="ti ti-dots"></i>
 				</button>
 			</footer>
@@ -175,7 +175,6 @@ import MkUsersTooltip from '@/components/MkUsersTooltip.vue';
 import MkUrlPreview from '@/components/MkUrlPreview.vue';
 import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
 import { pleaseLogin } from '@/scripts/please-login.js';
-import { focusPrev, focusNext } from '@/scripts/focus.js';
 import { checkWordMute } from '@/scripts/check-word-mute.js';
 import { userPage } from '@/filters/user.js';
 import number from '@/filters/number.js';
@@ -199,6 +198,7 @@ import { showMovedDialog } from '@/scripts/show-moved-dialog.js';
 import { shouldCollapsed } from '@/scripts/collapsed.js';
 import { isEnabledUrlPreview } from '@/instance.js';
 import { type Keymap } from '@/scripts/hotkey.js';
+import { focusPrev, focusNext } from '@/scripts/focus.js';
 
 const props = withDefaults(defineProps<{
 	note: Misskey.entities.Note;
@@ -257,6 +257,7 @@ const renoteTime = shallowRef<HTMLElement>();
 const reactButton = shallowRef<HTMLElement>();
 const clipButton = shallowRef<HTMLElement>();
 const appearNote = computed(() => isRenote ? note.value.renote as Misskey.entities.Note : note.value);
+const galleryEl = shallowRef<InstanceType<typeof MkMediaList>>();
 const isMyRenote = $i && ($i.id === note.value.userId);
 const showContent = ref(false);
 const parsed = computed(() => appearNote.value.text ? mfm.parse(appearNote.value.text) : null);
@@ -318,7 +319,7 @@ const keymap = {
 	},
 	'o': () => {
 		if (renoteCollapsed.value) return;
-		showMenu();
+		galleryEl.value?.openGallery();
 	},
 	'v|enter': () => {
 		if (renoteCollapsed.value) {
@@ -419,7 +420,7 @@ function renote(viaKeyboard = false) {
 	});
 }
 
-function reply(viaKeyboard = false): void {
+function reply(): void {
 	pleaseLogin();
 	if (props.mock) {
 		return;
@@ -427,13 +428,12 @@ function reply(viaKeyboard = false): void {
 	os.post({
 		reply: appearNote.value,
 		channel: appearNote.value.channel,
-		animation: !viaKeyboard,
 	}).then(() => {
 		focus();
 	});
 }
 
-function react(viaKeyboard = false): void {
+function react(): void {
 	pleaseLogin();
 	showMovedDialog();
 	if (appearNote.value.reactionAcceptance === 'likeOnly') {
@@ -528,18 +528,16 @@ function onContextmenu(ev: MouseEvent): void {
 	}
 }
 
-function showMenu(viaKeyboard = false): void {
+function showMenu(): void {
 	if (props.mock) {
 		return;
 	}
 
 	const { menu, cleanup } = getNoteMenu({ note: note.value, translating, translation, isDeleted, currentClip: currentClip?.value });
-	os.popupMenu(menu, menuButton.value, {
-		viaKeyboard,
-	}).then(focus).finally(cleanup);
+	os.popupMenu(menu, menuButton.value).then(focus).finally(cleanup);
 }
 
-async function clip() {
+async function clip(): Promise<void> {
 	if (props.mock) {
 		return;
 	}
@@ -547,7 +545,7 @@ async function clip() {
 	os.popupMenu(await getNoteClipMenu({ note: note.value, isDeleted, currentClip: currentClip?.value }), clipButton.value).then(focus);
 }
 
-function showRenoteMenu(viaKeyboard = false): void {
+function showRenoteMenu(): void {
 	if (props.mock) {
 		return;
 	}
@@ -572,18 +570,14 @@ function showRenoteMenu(viaKeyboard = false): void {
 			getCopyNoteLinkMenu(note.value, i18n.ts.copyLinkRenote),
 			{ type: 'divider' },
 			getUnrenote(),
-		], renoteTime.value, {
-			viaKeyboard: viaKeyboard,
-		});
+		], renoteTime.value);
 	} else {
 		os.popupMenu([
 			getCopyNoteLinkMenu(note.value, i18n.ts.copyLinkRenote),
 			{ type: 'divider' },
 			getAbuseNoteMenu(note.value, i18n.ts.reportAbuseRenote),
 			($i?.isModerator || $i?.isAdmin) ? getUnrenote() : undefined,
-		], renoteTime.value, {
-			viaKeyboard: viaKeyboard,
-		});
+		], renoteTime.value);
 	}
 }
 
@@ -596,11 +590,11 @@ function blur() {
 }
 
 function focusBefore() {
-	focusPrev(rootEl.value ?? null);
+	focusPrev(rootEl.value);
 }
 
 function focusAfter() {
-	focusNext(rootEl.value ?? null);
+	focusNext(rootEl.value);
 }
 
 function readPromo() {
@@ -638,7 +632,7 @@ function emitUpdReaction(emoji: string, delta: number) {
 	&:focus-visible {
 		outline: none;
 
-		&:after {
+		&::after {
 			content: "";
 			pointer-events: none;
 			display: block;
@@ -651,7 +645,7 @@ function emitUpdReaction(emoji: string, delta: number) {
 			margin: auto;
 			width: calc(100% - 8px);
 			height: calc(100% - 8px);
-			border: dashed 1px var(--focus);
+			border: dashed 2px var(--focus);
 			border-radius: var(--radius);
 			box-sizing: border-box;
 		}
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 8f65e3b60a..a8fed56c39 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -10,6 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	ref="rootEl"
 	v-hotkey="keymap"
 	:class="$style.root"
+	:tabindex="isDeleted ? '-1' : '0'"
 >
 	<div v-if="appearNote.reply && appearNote.reply.replyId">
 		<div v-if="!conversationLoaded" style="padding: 16px">
@@ -31,7 +32,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</I18n>
 		</span>
 		<div :class="$style.renoteInfo">
-			<button ref="renoteTime" class="_button" :class="$style.renoteTime" @click="showRenoteMenu()">
+			<button ref="renoteTime" class="_button" :class="$style.renoteTime" @mousedown.prevent="showRenoteMenu()">
 				<i v-if="isMyRenote" class="ti ti-dots" style="margin-right: 4px;"></i>
 				<MkTime :time="note.createdAt"/>
 			</button>
@@ -92,7 +93,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</div>
 				</div>
 				<div v-if="appearNote.files && appearNote.files.length > 0">
-					<MkMediaList :mediaList="appearNote.files"/>
+					<MkMediaList ref="galleryEl" :mediaList="appearNote.files"/>
 				</div>
 				<MkPoll v-if="appearNote.poll" ref="pollViewer" :noteId="appearNote.id" :poll="appearNote.poll" :class="$style.poll"/>
 				<div v-if="isEnabledUrlPreview">
@@ -118,7 +119,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				ref="renoteButton"
 				class="_button"
 				:class="$style.noteFooterButton"
-				@mousedown="renote()"
+				@mousedown.prevent="renote()"
 			>
 				<i class="ti ti-repeat"></i>
 				<p v-if="appearNote.renoteCount > 0" :class="$style.noteFooterButtonCount">{{ number(appearNote.renoteCount) }}</p>
@@ -133,10 +134,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<i v-else class="ti ti-plus"></i>
 				<p v-if="(appearNote.reactionAcceptance === 'likeOnly' || defaultStore.state.showReactionsCount) && appearNote.reactionCount > 0" :class="$style.noteFooterButtonCount">{{ number(appearNote.reactionCount) }}</p>
 			</button>
-			<button v-if="defaultStore.state.showClipButtonInNoteFooter" ref="clipButton" class="_button" :class="$style.noteFooterButton" @mousedown="clip()">
+			<button v-if="defaultStore.state.showClipButtonInNoteFooter" ref="clipButton" class="_button" :class="$style.noteFooterButton" @mousedown.prevent="clip()">
 				<i class="ti ti-paperclip"></i>
 			</button>
-			<button ref="menuButton" class="_button" :class="$style.noteFooterButton" @mousedown="showMenu()">
+			<button ref="menuButton" class="_button" :class="$style.noteFooterButton" @mousedown.prevent="showMenu()">
 				<i class="ti ti-dots"></i>
 			</button>
 		</footer>
@@ -281,6 +282,7 @@ const renoteTime = shallowRef<HTMLElement>();
 const reactButton = shallowRef<HTMLElement>();
 const clipButton = shallowRef<HTMLElement>();
 const appearNote = computed(() => isRenote ? note.value.renote as Misskey.entities.Note : note.value);
+const galleryEl = shallowRef<InstanceType<typeof MkMediaList>>();
 const isMyRenote = $i && ($i.id === note.value.userId);
 const showContent = ref(false);
 const isDeleted = ref(false);
@@ -303,6 +305,7 @@ const keymap = {
 		if (!defaultStore.state.showClipButtonInNoteFooter) return;
 		clip();
 	},
+	'o': () => galleryEl.value?.openGallery(),
 	'v|enter': () => {
 		if (appearNote.value.cw != null) {
 			showContent.value = !showContent.value;
@@ -392,29 +395,26 @@ if (appearNote.value.reactionAcceptance === 'likeOnly') {
 	});
 }
 
-function renote(viaKeyboard = false) {
+function renote() {
 	pleaseLogin();
 	showMovedDialog();
 
 	const { menu } = getRenoteMenu({ note: note.value, renoteButton });
-	os.popupMenu(menu, renoteButton.value, {
-		viaKeyboard,
-	});
+	os.popupMenu(menu, renoteButton.value);
 }
 
-function reply(viaKeyboard = false): void {
+function reply(): void {
 	pleaseLogin();
 	showMovedDialog();
 	os.post({
 		reply: appearNote.value,
 		channel: appearNote.value.channel,
-		animation: !viaKeyboard,
 	}).then(() => {
 		focus();
 	});
 }
 
-function react(viaKeyboard = false): void {
+function react(): void {
 	pleaseLogin();
 	showMovedDialog();
 	if (appearNote.value.reactionAcceptance === 'likeOnly') {
@@ -424,7 +424,7 @@ function react(viaKeyboard = false): void {
 			noteId: appearNote.value.id,
 			reaction: '❤️',
 		});
-		const el = reactButton.value as HTMLElement | null | undefined;
+		const el = reactButton.value;
 		if (el) {
 			const rect = el.getBoundingClientRect();
 			const x = rect.left + (el.offsetWidth / 2);
@@ -488,18 +488,16 @@ function onContextmenu(ev: MouseEvent): void {
 	}
 }
 
-function showMenu(viaKeyboard = false): void {
+function showMenu(): void {
 	const { menu, cleanup } = getNoteMenu({ note: note.value, translating, translation, isDeleted });
-	os.popupMenu(menu, menuButton.value, {
-		viaKeyboard,
-	}).then(focus).finally(cleanup);
+	os.popupMenu(menu, menuButton.value).then(focus).finally(cleanup);
 }
 
-async function clip() {
+async function clip(): Promise<void> {
 	os.popupMenu(await getNoteClipMenu({ note: note.value, isDeleted }), clipButton.value).then(focus);
 }
 
-function showRenoteMenu(viaKeyboard = false): void {
+function showRenoteMenu(): void {
 	if (!isMyRenote) return;
 	pleaseLogin();
 	os.popupMenu([{
@@ -512,9 +510,7 @@ function showRenoteMenu(viaKeyboard = false): void {
 			});
 			isDeleted.value = true;
 		},
-	}], renoteTime.value, {
-		viaKeyboard: viaKeyboard,
-	});
+	}], renoteTime.value);
 }
 
 function focus() {
@@ -556,6 +552,28 @@ function loadConversation() {
 	transition: box-shadow 0.1s ease;
 	overflow: clip;
 	contain: content;
+
+	&:focus-visible {
+		outline: none;
+
+		&::after {
+			content: "";
+			pointer-events: none;
+			display: block;
+			position: absolute;
+			z-index: 10;
+			top: 0;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			margin: auto;
+			width: calc(100% - 8px);
+			height: calc(100% - 8px);
+			border: dashed 2px var(--focus);
+			border-radius: var(--radius);
+			box-sizing: border-box;
+		}
+	}
 }
 
 .replyTo {
diff --git a/packages/frontend/src/components/MkNotePreview.vue b/packages/frontend/src/components/MkNotePreview.vue
index cc2f770cda..c4479bb0d6 100644
--- a/packages/frontend/src/components/MkNotePreview.vue
+++ b/packages/frontend/src/components/MkNotePreview.vue
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div :class="$style.root">
-	<MkAvatar :class="$style.avatar" :user="user" link preview/>
+	<MkAvatar :class="$style.avatar" :user="user"/>
 	<div :class="$style.main">
 		<div :class="$style.header">
 			<MkUserName :user="user" :nowrap="true"/>
diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue
index 3fa2eb254e..ee65743574 100644
--- a/packages/frontend/src/components/MkNotification.vue
+++ b/packages/frontend/src/components/MkNotification.vue
@@ -343,7 +343,7 @@ function getActualReactedUsersCount(notification: Misskey.entities.Notification)
 	margin-right: 4px;
 	position: relative;
 
-	&:before {
+	&::before {
 		position: absolute;
 		transform: rotate(180deg);
 	}
diff --git a/packages/frontend/src/components/MkPagePreview.vue b/packages/frontend/src/components/MkPagePreview.vue
index f6dc00698c..8559d4b96e 100644
--- a/packages/frontend/src/components/MkPagePreview.vue
+++ b/packages/frontend/src/components/MkPagePreview.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkA :to="`/@${page.user.username}/pages/${page.name}`" class="vhpxefrj" tabindex="-1">
+<MkA :to="`/@${page.user.username}/pages/${page.name}`" class="vhpxefrj">
 	<div v-if="page.eyeCatchingImage" class="thumbnail">
 		<MediaImage
 			:image="page.eyeCatchingImage"
@@ -50,12 +50,29 @@ const props = defineProps<{
 <style lang="scss" scoped>
 .vhpxefrj {
 	display: block;
+	position: relative;
 
 	&:hover {
 		text-decoration: none;
 		color: var(--accent);
 	}
 
+	&:focus-within {
+		outline: none;
+
+		&::after {
+			content: "";
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			border-radius: var(--radius);
+			pointer-events: none;
+			box-shadow: inset 0 0 0 2px var(--focus);
+		}
+	}
+
 	> .thumbnail {
 		& + article {
 			border-radius: 0 0 var(--radius) var(--radius);
diff --git a/packages/frontend/src/components/MkPopupMenu.vue b/packages/frontend/src/components/MkPopupMenu.vue
index be0b07612a..8a0c7b1e54 100644
--- a/packages/frontend/src/components/MkPopupMenu.vue
+++ b/packages/frontend/src/components/MkPopupMenu.vue
@@ -4,8 +4,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkModal ref="modal" v-slot="{ type, maxHeight }" :manualShowing="manualShowing" :zPriority="'high'" :src="src" :transparentBg="true" @click="click" @close="onModalClose" @closed="onModalClosed">
-	<MkMenu :items="items" :align="align" :width="width" :max-height="maxHeight" :asDrawer="type === 'drawer'" :class="{ [$style.drawer]: type === 'drawer' }" @close="onMenuClose" @hide="hide"/>
+<MkModal ref="modal" v-slot="{ type, maxHeight }" :manualShowing="manualShowing" :zPriority="'high'" :src="src" :transparentBg="true" :returnFocusTo="returnFocusTo" @click="click" @close="onModalClose" @closed="onModalClosed">
+	<MkMenu :items="items" :align="align" :width="width" :max-height="maxHeight" :asDrawer="type === 'drawer'" :returnFocusTo="returnFocusTo" :class="{ [$style.drawer]: type === 'drawer' }" @close="onMenuClose" @hide="hide"/>
 </MkModal>
 </template>
 
@@ -19,8 +19,8 @@ defineProps<{
 	items: MenuItem[];
 	align?: 'center' | string;
 	width?: number;
-	viaKeyboard?: boolean;
 	src?: any;
+	returnFocusTo?: HTMLElement | null;
 }>();
 
 const emit = defineEmits<{
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 0dc1aa0891..d057d197ec 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -570,6 +570,7 @@ function clear() {
 
 function onKeydown(ev: KeyboardEvent) {
 	if (ev.key === 'Enter' && (ev.ctrlKey || ev.metaKey) && canPost.value) post();
+
 	if (ev.key === 'Escape') emit('esc');
 }
 
@@ -1083,6 +1084,15 @@ defineExpose({
 	margin: 12px 12px 12px 6px;
 	vertical-align: bottom;
 
+	&:focus-visible {
+		outline: none;
+
+		.submitInner {
+			outline: 2px solid var(--fgOnAccent);
+			outline-offset: -4px;
+		}
+	}
+
 	&:disabled {
 		opacity: 0.7;
 	}
diff --git a/packages/frontend/src/components/MkPostFormDialog.vue b/packages/frontend/src/components/MkPostFormDialog.vue
index ac37cb31bc..d6bca29050 100644
--- a/packages/frontend/src/components/MkPostFormDialog.vue
+++ b/packages/frontend/src/components/MkPostFormDialog.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkModal ref="modal" :preferType="'dialog'" @click="modal?.close()" @closed="onModalClosed()">
+<MkModal ref="modal" :preferType="'dialog'" @click="modal?.close()" @closed="onModalClosed()" @esc="modal?.close()">
 	<MkPostForm ref="form" :class="$style.form" v-bind="props" autofocus freezeAfterPosted @posted="onPosted" @cancel="modal?.close()" @esc="modal?.close()"/>
 </MkModal>
 </template>
diff --git a/packages/frontend/src/components/MkRadio.vue b/packages/frontend/src/components/MkRadio.vue
index 6676e3bf5b..22fc86723e 100644
--- a/packages/frontend/src/components/MkRadio.vue
+++ b/packages/frontend/src/components/MkRadio.vue
@@ -9,6 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	:class="[$style.root, { [$style.disabled]: disabled, [$style.checked]: checked }]"
 	:aria-checked="checked"
 	:aria-disabled="disabled"
+	role="checkbox"
 	@click="toggle"
 >
 	<input
@@ -69,6 +70,11 @@ function toggle(): void {
 		border-color: var(--inputBorderHover) !important;
 	}
 
+	&:focus-within {
+		outline: none;
+		box-shadow: 0 0 0 2px var(--focus);
+	}
+
 	&.checked {
 		background-color: var(--accentedBg) !important;
 		border-color: var(--accentedBg) !important;
@@ -78,7 +84,7 @@ function toggle(): void {
 		> .button {
 			border-color: var(--accent);
 
-			&:after {
+			&::after {
 				background-color: var(--accent);
 				transform: scale(1);
 				opacity: 1;
@@ -104,7 +110,7 @@ function toggle(): void {
 	border-radius: 100%;
 	transition: inherit;
 
-	&:after {
+	&::after {
 		content: '';
 		display: block;
 		position: absolute;
diff --git a/packages/frontend/src/components/MkSelect.vue b/packages/frontend/src/components/MkSelect.vue
index 358d9b1f4b..0eba8d6a9c 100644
--- a/packages/frontend/src/components/MkSelect.vue
+++ b/packages/frontend/src/components/MkSelect.vue
@@ -6,20 +6,29 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <div>
 	<div :class="$style.label" @click="focus"><slot name="label"></slot></div>
-	<div ref="container" :class="[$style.input, { [$style.inline]: inline, [$style.disabled]: disabled, [$style.focused]: focused }]" @mousedown.prevent="show">
+	<div
+		ref="container"
+		tabindex="0"
+		:class="[$style.input, { [$style.inline]: inline, [$style.disabled]: disabled, [$style.focused]: focused || opening }]"
+		@focus="focused = true"
+		@blur="focused = false"
+		@mousedown.prevent="show"
+		@keydown.space.enter="show"
+	>
 		<div ref="prefixEl" :class="$style.prefix"><slot name="prefix"></slot></div>
 		<select
 			ref="inputEl"
 			v-model="v"
 			v-adaptive-border
+			tabindex="-1"
 			:class="$style.inputCore"
 			:disabled="disabled"
 			:required="required"
 			:readonly="readonly"
 			:placeholder="placeholder"
-			@focus="focused = true"
-			@blur="focused = false"
 			@input="onInput"
+			@mousedown.prevent="() => {}"
+			@keydown.prevent="() => {}"
 		>
 			<slot></slot>
 		</select>
@@ -75,7 +84,7 @@ const height =
 	props.large ? 39 :
 	36;
 
-const focus = () => inputEl.value?.focus();
+const focus = () => container.value?.focus();
 const onInput = (ev) => {
 	changed.value = true;
 };
@@ -126,7 +135,9 @@ onMounted(() => {
 });
 
 function show() {
-	focused.value = true;
+	if (opening.value) return;
+	focus();
+
 	opening.value = true;
 
 	const menu: MenuItem[] = [];
@@ -173,8 +184,6 @@ function show() {
 		onClosing: () => {
 			opening.value = false;
 		},
-	}).then(() => {
-		focused.value = false;
 	});
 }
 </script>
@@ -225,6 +234,10 @@ function show() {
 		}
 	}
 
+	&:focus {
+		outline: none;
+	}
+
 	&:hover {
 		> .inputCore {
 			border-color: var(--inputBorderHover) !important;
diff --git a/packages/frontend/src/components/MkSuperMenu.vue b/packages/frontend/src/components/MkSuperMenu.vue
index 3023f63e5d..1a880170be 100644
--- a/packages/frontend/src/components/MkSuperMenu.vue
+++ b/packages/frontend/src/components/MkSuperMenu.vue
@@ -10,15 +10,15 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 		<div class="items">
 			<template v-for="(item, i) in group.items">
-				<a v-if="item.type === 'a'" :href="item.href" :target="item.target" :tabindex="i" class="_button item" :class="{ danger: item.danger, active: item.active }">
+				<a v-if="item.type === 'a'" :href="item.href" :target="item.target" class="_button item" :class="{ danger: item.danger, active: item.active }">
 					<span v-if="item.icon" class="icon"><i :class="item.icon" class="ti-fw"></i></span>
 					<span class="text">{{ item.text }}</span>
 				</a>
-				<button v-else-if="item.type === 'button'" :tabindex="i" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="ev => item.action(ev)">
+				<button v-else-if="item.type === 'button'" class="_button item" :class="{ danger: item.danger, active: item.active }" :disabled="item.active" @click="ev => item.action(ev)">
 					<span v-if="item.icon" class="icon"><i :class="item.icon" class="ti-fw"></i></span>
 					<span class="text">{{ item.text }}</span>
 				</button>
-				<MkA v-else :to="item.to" :tabindex="i" class="_button item" :class="{ danger: item.danger, active: item.active }">
+				<MkA v-else :to="item.to" class="_button item" :class="{ danger: item.danger, active: item.active }">
 					<span v-if="item.icon" class="icon"><i :class="item.icon" class="ti-fw"></i></span>
 					<span class="text">{{ item.text }}</span>
 				</MkA>
@@ -67,6 +67,10 @@ defineProps<{
 					background: var(--panelHighlight);
 				}
 
+				&:focus-visible {
+					outline-offset: -2px;
+				}
+
 				&.active {
 					color: var(--accent);
 					background: var(--accentedBg);
diff --git a/packages/frontend/src/components/MkSwitch.vue b/packages/frontend/src/components/MkSwitch.vue
index 721ac357f4..a0994d9cc9 100644
--- a/packages/frontend/src/components/MkSwitch.vue
+++ b/packages/frontend/src/components/MkSwitch.vue
@@ -10,9 +10,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 		type="checkbox"
 		:disabled="disabled"
 		:class="$style.input"
-		@keydown.enter="toggle"
+		@click="toggle"
 	>
-	<XButton :checked="checked" :disabled="disabled" @toggle="toggle"/>
+	<XButton :class="$style.toggle" :checked="checked" :disabled="disabled" @toggle="toggle"/>
 	<span v-if="!noBody" :class="$style.body">
 		<!-- TODO: 無名slotの方は廃止 -->
 		<span :class="$style.label">
@@ -75,7 +75,13 @@ const toggle = () => {
 	height: 0;
 	opacity: 0;
 	margin: 0;
+
+	&:focus-visible ~ .toggle {
+		outline: 2px solid var(--focus);
+		outline-offset: 2px;
+	}
 }
+
 .body {
 	margin-left: 12px;
 	margin-top: 2px;
diff --git a/packages/frontend/src/components/MkTutorialDialog.PostNote.vue b/packages/frontend/src/components/MkTutorialDialog.PostNote.vue
index e1d88b5e5c..27483cc7c2 100644
--- a/packages/frontend/src/components/MkTutorialDialog.PostNote.vue
+++ b/packages/frontend/src/components/MkTutorialDialog.PostNote.vue
@@ -105,7 +105,7 @@ const exampleCWNote = reactive<Misskey.entities.Note>({
 	font-weight: bold;
 	text-align: left;
 
-	&:before {
+	&::before {
 		content: "";
 		display: block;
 		width: calc(100% - 38px);
diff --git a/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue b/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue
index 7ae48dcd15..d8d4b5aab7 100644
--- a/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue
+++ b/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue
@@ -115,7 +115,7 @@ const exampleNote = reactive<Misskey.entities.Note>({
 	font-weight: bold;
 	text-align: left;
 
-	&:before {
+	&::before {
 		content: "";
 		display: block;
 		width: calc(100% - 38px);
diff --git a/packages/frontend/src/components/MkTutorialDialog.Timeline.vue b/packages/frontend/src/components/MkTutorialDialog.Timeline.vue
index 57f26e86a7..6f2930ebc9 100644
--- a/packages/frontend/src/components/MkTutorialDialog.Timeline.vue
+++ b/packages/frontend/src/components/MkTutorialDialog.Timeline.vue
@@ -56,7 +56,7 @@ import { i18n } from '@/i18n.js';
 	font-weight: bold;
 	text-align: left;
 
-	&:before {
+	&::before {
 		content: "";
 		display: block;
 		width: calc(100% - 38px);
diff --git a/packages/frontend/src/components/MkVisibilityPicker.vue b/packages/frontend/src/components/MkVisibilityPicker.vue
index 5ecd41bfdf..75066bbc32 100644
--- a/packages/frontend/src/components/MkVisibilityPicker.vue
+++ b/packages/frontend/src/components/MkVisibilityPicker.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkModal ref="modal" v-slot="{ type }" :zPriority="'high'" :src="src" @click="modal?.close()" @closed="emit('closed')">
+<MkModal ref="modal" v-slot="{ type }" :zPriority="'high'" :src="src" @click="modal?.close()" @closed="emit('closed')" @esc="modal?.close()">
 	<div class="_popup" :class="{ [$style.root]: true, [$style.asDrawer]: type === 'drawer' }">
 		<div :class="[$style.label, $style.item]">
 			{{ i18n.ts.visibility }}
diff --git a/packages/frontend/src/components/global/MkStickyContainer.vue b/packages/frontend/src/components/global/MkStickyContainer.vue
index 89993e1b8e..b12dc8cb31 100644
--- a/packages/frontend/src/components/global/MkStickyContainer.vue
+++ b/packages/frontend/src/components/global/MkStickyContainer.vue
@@ -8,7 +8,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<div ref="headerEl">
 		<slot name="header"></slot>
 	</div>
-	<div ref="bodyEl" :data-sticky-container-header-height="headerHeight">
+	<div
+		ref="bodyEl"
+		:data-sticky-container-header-height="headerHeight"
+		:data-sticky-container-footer-height="footerHeight"
+	>
 		<slot></slot>
 	</div>
 	<div ref="footerEl">
diff --git a/packages/frontend/src/directives/hotkey.ts b/packages/frontend/src/directives/hotkey.ts
index 0a7d136f18..0e5c7ede24 100644
--- a/packages/frontend/src/directives/hotkey.ts
+++ b/packages/frontend/src/directives/hotkey.ts
@@ -13,9 +13,9 @@ export default {
 		el._keyHandler = makeHotkey(binding.value);
 
 		if (el._hotkey_global) {
-			document.addEventListener('keydown', el._keyHandler);
+			document.addEventListener('keydown', el._keyHandler, { passive: false });
 		} else {
-			el.addEventListener('keydown', el._keyHandler);
+			el.addEventListener('keydown', el._keyHandler, { passive: false });
 		}
 	},
 
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index 560f692acf..17ee6e294a 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -5,7 +5,7 @@
 
 // TODO: なんでもかんでもos.tsに突っ込むのやめたいのでよしなに分割する
 
-import { Component, markRaw, Ref, ref, defineAsyncComponent } from 'vue';
+import { Component, markRaw, Ref, ref, defineAsyncComponent, nextTick } from 'vue';
 import { EventEmitter } from 'eventemitter3';
 import * as Misskey from 'misskey-js';
 import type { ComponentProps as CP } from 'vue-component-type-helpers';
@@ -24,6 +24,8 @@ import MkContextMenu from '@/components/MkContextMenu.vue';
 import { MenuItem } from '@/types/menu.js';
 import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 import { showMovedDialog } from '@/scripts/show-moved-dialog.js';
+import { getHTMLElementOrNull } from '@/scripts/get-dom-node-or-null.js';
+import { focusParent } from './scripts/focus.js';
 
 export const openingWindowsCount = ref(0);
 
@@ -622,31 +624,33 @@ export async function cropImage(image: Misskey.entities.DriveFile, options: {
 export function popupMenu(items: MenuItem[], src?: HTMLElement | EventTarget | null, options?: {
 	align?: string;
 	width?: number;
-	viaKeyboard?: boolean;
 	onClosing?: () => void;
 }): Promise<void> {
-	return new Promise(resolve => {
+	let returnFocusTo = getHTMLElementOrNull(src) ?? getHTMLElementOrNull(document.activeElement);
+	return new Promise(resolve => nextTick(() => {
 		const { dispose } = popup(MkPopupMenu, {
 			items,
 			src,
 			width: options?.width,
 			align: options?.align,
-			viaKeyboard: options?.viaKeyboard,
+			returnFocusTo,
 		}, {
 			closed: () => {
 				resolve();
 				dispose();
+				returnFocusTo = null;
 			},
 			closing: () => {
-				if (options?.onClosing) options.onClosing();
+				options?.onClosing?.();
 			},
 		});
-	});
+	}));
 }
 
 export function contextMenu(items: MenuItem[], ev: MouseEvent): Promise<void> {
+	let returnFocusTo = getHTMLElementOrNull(ev.currentTarget ?? ev.target) ?? getHTMLElementOrNull(document.activeElement);
 	ev.preventDefault();
-	return new Promise(resolve => {
+	return new Promise(resolve => nextTick(() => {
 		const { dispose } = popup(MkContextMenu, {
 			items,
 			ev,
@@ -654,14 +658,19 @@ export function contextMenu(items: MenuItem[], ev: MouseEvent): Promise<void> {
 			closed: () => {
 				resolve();
 				dispose();
+
+				// MkModalを通していないのでここでフォーカスを戻す処理を行う
+				if (returnFocusTo != null) {
+					focusParent(returnFocusTo, true, false);
+					returnFocusTo = null;
+				}
 			},
 		});
-	});
+	}));
 }
 
 export function post(props: Record<string, any> = {}): Promise<void> {
 	showMovedDialog();
-
 	return new Promise(resolve => {
 		// NOTE: MkPostFormDialogをdynamic importするとiOSでテキストエリアに自動フォーカスできない
 		// NOTE: ただ、dynamic importしない場合、MkPostFormDialogインスタンスが使いまわされ、
diff --git a/packages/frontend/src/pages/drive.file.info.vue b/packages/frontend/src/pages/drive.file.info.vue
index 7a8786d415..a774412f83 100644
--- a/packages/frontend/src/pages/drive.file.info.vue
+++ b/packages/frontend/src/pages/drive.file.info.vue
@@ -234,6 +234,7 @@ onMounted(async () => {
 			background-color: var(--accentedBg);
 			color: var(--accent);
 			text-decoration: none;
+			outline: none;
 		}
 
 		&.danger {
diff --git a/packages/frontend/src/pages/games.vue b/packages/frontend/src/pages/games.vue
index afd6df1ad9..b52f4decaa 100644
--- a/packages/frontend/src/pages/games.vue
+++ b/packages/frontend/src/pages/games.vue
@@ -8,12 +8,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #header><MkPageHeader/></template>
 	<MkSpacer :contentMax="800">
 		<div class="_gaps">
-			<div class="_panel">
+			<div class="_panel" :class="$style.link">
 				<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">
+			<div class="_panel" :class="$style.link">
 				<MkA to="/reversi">
 					<img src="/client-assets/reversi/logo.png" style="display: block; max-width: 100%; max-height: 200px; margin: auto;"/>
 				</MkA>
@@ -32,3 +32,10 @@ definePageMetadata(() => ({
 	icon: 'ti ti-device-gamepad',
 }));
 </script>
+
+<style module>
+.link:focus-within {
+	outline: 2px solid var(--focus);
+	outline-offset: -2px;
+}
+</style>
diff --git a/packages/frontend/src/pages/page.vue b/packages/frontend/src/pages/page.vue
index e73d032000..e2f04eb764 100644
--- a/packages/frontend/src/pages/page.vue
+++ b/packages/frontend/src/pages/page.vue
@@ -286,6 +286,7 @@ definePageMetadata(() => ({
 		background-color: var(--accentedBg);
 		color: var(--accent);
 		text-decoration: none;
+		outline: none;
 	}
 }
 
diff --git a/packages/frontend/src/pages/settings/profile.vue b/packages/frontend/src/pages/settings/profile.vue
index 60bf9b4d3d..a328933686 100644
--- a/packages/frontend/src/pages/settings/profile.vue
+++ b/packages/frontend/src/pages/settings/profile.vue
@@ -342,6 +342,7 @@ definePageMetadata(() => ({
 	&:hover, &:focus {
 		opacity: .7;
 	}
+
 	&:active {
 		cursor: pointer;
 	}
diff --git a/packages/frontend/src/pages/settings/theme.vue b/packages/frontend/src/pages/settings/theme.vue
index 0a4bd4b826..7d192bcbea 100644
--- a/packages/frontend/src/pages/settings/theme.vue
+++ b/packages/frontend/src/pages/settings/theme.vue
@@ -213,12 +213,18 @@ definePageMetadata(() => ({
 			}
 		}
 
+		.dn:focus-visible ~ .toggle {
+			outline: 2px solid var(--focus);
+			outline-offset: 2px;
+		}
+
 		.toggle {
 			cursor: pointer;
 			display: inline-block;
 			position: relative;
 			width: 90px;
 			height: 50px;
+			margin: 4px; // focus用のアウトライン
 			background-color: #83D8FF;
 			border-radius: 90px - 6;
 			transition: background-color 200ms cubic-bezier(0.445, 0.05, 0.55, 0.95) !important;
diff --git a/packages/frontend/src/scripts/focus-trap.ts b/packages/frontend/src/scripts/focus-trap.ts
new file mode 100644
index 0000000000..734c73652f
--- /dev/null
+++ b/packages/frontend/src/scripts/focus-trap.ts
@@ -0,0 +1,65 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+import { getHTMLElementOrNull } from '@/scripts/get-dom-node-or-null.js';
+
+const focusTrapElements = new Set<HTMLElement>();
+const ignoreElements = [
+	'script',
+	'style',
+];
+
+function containsFocusTrappedElements(el: HTMLElement): boolean {
+	return Array.from(focusTrapElements).some((focusTrapElement) => {
+		return el.contains(focusTrapElement);
+	});
+}
+
+function releaseFocusTrap(el: HTMLElement): void {
+	focusTrapElements.delete(el);
+	if (el.parentElement != null && el !== document.body) {
+		el.parentElement.childNodes.forEach((siblingNode) => {
+			const siblingEl = getHTMLElementOrNull(siblingNode);
+			if (!siblingEl) return;
+			if (siblingEl !== el && (focusTrapElements.has(siblingEl) || containsFocusTrappedElements(siblingEl) || focusTrapElements.size === 0)) {
+				siblingEl.inert = false;
+			} else if (
+				focusTrapElements.size > 0 &&
+				!containsFocusTrappedElements(siblingEl) &&
+				!focusTrapElements.has(siblingEl) &&
+				!ignoreElements.includes(siblingEl.tagName.toLowerCase())
+			) {
+				siblingEl.inert = true;
+			} else {
+				siblingEl.inert = false;
+			}
+		});
+		releaseFocusTrap(el.parentElement);
+	}
+}
+
+export function focusTrap(el: HTMLElement, parent: true): void;
+export function focusTrap(el: HTMLElement, parent?: false): { release: () => void; };
+export function focusTrap(el: HTMLElement, parent = false): { release: () => void; } | void {
+	if (el.parentElement != null && el !== document.body) {
+		el.parentElement.childNodes.forEach((siblingNode) => {
+			const siblingEl = getHTMLElementOrNull(siblingNode);
+			if (!siblingEl) return;
+			if (siblingEl !== el && !ignoreElements.includes(siblingEl.tagName.toLowerCase())) {
+				siblingEl.inert = true;
+			}
+		});
+		focusTrap(el.parentElement, true);
+	}
+
+	if (!parent) {
+		focusTrapElements.add(el);
+
+		return {
+			release: () => {
+				releaseFocusTrap(el);
+			},
+		};
+	}
+}
diff --git a/packages/frontend/src/scripts/focus.ts b/packages/frontend/src/scripts/focus.ts
index ea6ee61c88..eb2da5ad86 100644
--- a/packages/frontend/src/scripts/focus.ts
+++ b/packages/frontend/src/scripts/focus.ts
@@ -3,30 +3,78 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-export function focusPrev(el: Element | null, self = false, scroll = true) {
-	if (el == null) return;
-	if (!self) el = el.previousElementSibling;
-	if (el) {
-		if (el.hasAttribute('tabindex')) {
-			(el as HTMLElement).focus({
-				preventScroll: !scroll,
-			});
-		} else {
-			focusPrev(el.previousElementSibling, true);
-		}
-	}
-}
+import { getScrollPosition, getScrollContainer, getStickyBottom, getStickyTop } from '@/scripts/scroll.js';
+import { getElementOrNull, getNodeOrNull } from '@/scripts/get-dom-node-or-null.js';
 
-export function focusNext(el: Element | null, self = false, scroll = true) {
-	if (el == null) return;
-	if (!self) el = el.nextElementSibling;
-	if (el) {
-		if (el.hasAttribute('tabindex')) {
-			(el as HTMLElement).focus({
-				preventScroll: !scroll,
-			});
-		} else {
-			focusPrev(el.nextElementSibling, true);
-		}
+type MaybeHTMLElement = EventTarget | Node | Element | HTMLElement;
+
+export const isFocusable = (input: MaybeHTMLElement | null | undefined): input is HTMLElement => {
+	if (input == null || !(input instanceof HTMLElement)) return false;
+
+	if (input.tabIndex < 0) return false;
+	if ('disabled' in input && input.disabled === true) return false;
+	if ('readonly' in input && input.readonly === true) return false;
+
+	if (!input.ownerDocument.contains(input)) return false;
+
+	const style = window.getComputedStyle(input);
+	if (style.display === 'none') return false;
+	if (style.visibility === 'hidden') return false;
+	if (style.opacity === '0') return false;
+	if (style.pointerEvents === 'none') return false;
+
+	return true;
+};
+
+export const focusPrev = (input: MaybeHTMLElement | null | undefined, self = false, scroll = true) => {
+	const element = self ? input : getElementOrNull(input)?.previousElementSibling;
+	if (element == null) return;
+	if (isFocusable(element)) {
+		focusOrScroll(element, scroll);
+	} else {
+		focusPrev(element, false, scroll);
 	}
-}
+};
+
+export const focusNext = (input: MaybeHTMLElement | null | undefined, self = false, scroll = true) => {
+	const element = self ? input : getElementOrNull(input)?.nextElementSibling;
+	if (element == null) return;
+	if (isFocusable(element)) {
+		focusOrScroll(element, scroll);
+	} else {
+		focusNext(element, false, scroll);
+	}
+};
+
+export const focusParent = (input: MaybeHTMLElement | null | undefined, self = false, scroll = true) => {
+	const element = self ? input : getNodeOrNull(input)?.parentElement;
+	if (element == null) return;
+	if (isFocusable(element)) {
+		focusOrScroll(element, scroll);
+	} else {
+		focusParent(element, false, scroll);
+	}
+};
+
+const focusOrScroll = (element: HTMLElement, scroll: boolean) => {
+	if (scroll) {
+		const scrollContainer = getScrollContainer(element) ?? document.documentElement;
+		const scrollContainerTop = getScrollPosition(scrollContainer);
+		const stickyTop = getStickyTop(element, scrollContainer);
+		const stickyBottom = getStickyBottom(element, scrollContainer);
+		const top = element.getBoundingClientRect().top;
+		const bottom = element.getBoundingClientRect().bottom;
+
+		let scrollTo = scrollContainerTop;
+		if (top < stickyTop) {
+			scrollTo += top - stickyTop;
+		} else if (bottom > window.innerHeight - stickyBottom) {
+			scrollTo += bottom - window.innerHeight + stickyBottom;
+		}
+		scrollContainer.scrollTo({ top: scrollTo, behavior: 'instant' });
+	}
+
+	if (document.activeElement !== element) {
+		element.focus({ preventScroll: true });
+	}
+};
diff --git a/packages/frontend/src/scripts/get-dom-node-or-null.ts b/packages/frontend/src/scripts/get-dom-node-or-null.ts
new file mode 100644
index 0000000000..fbf54675fd
--- /dev/null
+++ b/packages/frontend/src/scripts/get-dom-node-or-null.ts
@@ -0,0 +1,19 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export const getNodeOrNull = (input: unknown): Node | null => {
+	if (input instanceof Node) return input;
+	return null;
+};
+
+export const getElementOrNull = (input: unknown): Element | null => {
+	if (input instanceof Element) return input;
+	return null;
+};
+
+export const getHTMLElementOrNull = (input: unknown): HTMLElement | null => {
+	if (input instanceof HTMLElement) return input;
+	return null;
+};
diff --git a/packages/frontend/src/scripts/hotkey.ts b/packages/frontend/src/scripts/hotkey.ts
index fd79baa604..ff3cbe98ac 100644
--- a/packages/frontend/src/scripts/hotkey.ts
+++ b/packages/frontend/src/scripts/hotkey.ts
@@ -2,6 +2,7 @@
  * SPDX-FileCopyrightText: syuilo and misskey-project
  * SPDX-License-Identifier: AGPL-3.0-only
  */
+import { getHTMLElementOrNull } from "@/scripts/get-dom-node-or-null.js";
 
 //#region types
 export type Keymap = Record<string, CallbackFunction | CallbackObject>;
@@ -30,8 +31,8 @@ type Action = {
 //#region consts
 const KEY_ALIASES = {
 	'esc': 'Escape',
-	'enter': ['Enter', 'NumpadEnter'],
-	'space': [' ', 'Spacebar'],
+	'enter': 'Enter',
+	'space': ' ',
 	'up': 'ArrowUp',
 	'down': 'ArrowDown',
 	'left': 'ArrowLeft',
@@ -44,6 +45,10 @@ const MODIFIER_KEYS = ['ctrl', 'alt', 'shift'];
 const IGNORE_ELEMENTS = ['input', 'textarea'];
 //#endregion
 
+//#region store
+let latestHotkey: Pattern & { callback: CallbackFunction } | null = null;
+//#endregion
+
 //#region impl
 export const makeHotkey = (keymap: Keymap) => {
 	const actions = parseKeymap(keymap);
@@ -51,13 +56,14 @@ export const makeHotkey = (keymap: Keymap) => {
 		if ('pswp' in window && window.pswp != null) return;
 		if (document.activeElement != null) {
 			if (IGNORE_ELEMENTS.includes(document.activeElement.tagName.toLowerCase())) return;
-			if ((document.activeElement as HTMLElement).isContentEditable) return;
+			if (getHTMLElementOrNull(document.activeElement)?.isContentEditable) return;
 		}
-		for (const { patterns, callback, options } of actions) {
-			if (matchPatterns(ev, patterns, options)) {
+		for (const action of actions) {
+			if (matchPatterns(ev, action)) {
 				ev.preventDefault();
 				ev.stopPropagation();
-				callback(ev);
+				action.callback(ev);
+				storePattern(ev, action.callback);
 			}
 		}
 	};
@@ -102,10 +108,21 @@ const parseOptions = (rawCallback: Keymap[keyof Keymap]) => {
 	return { ...defaultOptions } as const satisfies Action['options'];
 };
 
-const matchPatterns = (ev: KeyboardEvent, patterns: Action['patterns'], options: Action['options']) => {
+const matchPatterns = (ev: KeyboardEvent, action: Action) => {
+	const { patterns, options, callback } = action;
 	if (ev.repeat && !options.allowRepeat) return false;
 	const key = ev.key.toLowerCase();
 	return patterns.some(({ which, ctrl, shift, alt }) => {
+		if (
+			latestHotkey != null &&
+			latestHotkey.which.includes(key) &&
+			latestHotkey.ctrl === ctrl &&
+			latestHotkey.alt === alt &&
+			latestHotkey.shift === shift &&
+			latestHotkey.callback === callback
+		) {
+			return false;
+		}
 		if (!which.includes(key)) return false;
 		if (ctrl !== (ev.ctrlKey || ev.metaKey)) return false;
 		if (alt !== ev.altKey) return false;
@@ -114,6 +131,26 @@ const matchPatterns = (ev: KeyboardEvent, patterns: Action['patterns'], options:
 	});
 };
 
+let lastHotKeyStoreTimer: number | null = null;
+
+const storePattern = (ev: KeyboardEvent, callback: CallbackFunction) => {
+	if (lastHotKeyStoreTimer != null) {
+		clearTimeout(lastHotKeyStoreTimer);
+	}
+
+	latestHotkey = {
+		which: [ev.key.toLowerCase()],
+		ctrl: ev.ctrlKey || ev.metaKey,
+		alt: ev.altKey,
+		shift: ev.shiftKey,
+		callback,
+	};
+
+	lastHotKeyStoreTimer = window.setTimeout(() => {
+		latestHotkey = null;
+	}, 500);
+};
+
 const parseKeyCode = (input?: string | null) => {
 	if (input == null) return [];
 	const raw = getValueByKey(KEY_ALIASES, input);
diff --git a/packages/frontend/src/scripts/scroll.ts b/packages/frontend/src/scripts/scroll.ts
index 8edb6fca05..f0274034b5 100644
--- a/packages/frontend/src/scripts/scroll.ts
+++ b/packages/frontend/src/scripts/scroll.ts
@@ -23,6 +23,14 @@ export function getStickyTop(el: HTMLElement, container: HTMLElement | null = nu
 	return getStickyTop(el.parentElement, container, newTop);
 }
 
+export function getStickyBottom(el: HTMLElement, container: HTMLElement | null = null, bottom = 0) {
+	if (!el.parentElement) return bottom;
+	const data = el.dataset.stickyContainerFooterHeight;
+	const newBottom = data ? Number(data) + bottom : bottom;
+	if (el === container) return newBottom;
+	return getStickyBottom(el.parentElement, container, newBottom);
+}
+
 export function getScrollPosition(el: HTMLElement | null): number {
 	const container = getScrollContainer(el);
 	return container == null ? window.scrollY : container.scrollTop;
diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index 250a2616a7..2feb79ef81 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -113,6 +113,10 @@ a {
 	-webkit-tap-highlight-color: transparent;
 	-webkit-touch-callout: none;
 
+	&:focus-visible {
+		outline-offset: 2px;
+	}
+
 	&:hover {
 		text-decoration: underline;
 	}
@@ -143,12 +147,21 @@ rt {
 	white-space: initial;
 }
 
+:focus-visible {
+	outline: var(--focus) solid 2px;
+	outline-offset: -2px;
+
+	&:hover {
+		text-decoration: none;
+	}
+}
+
 .ti {
 	width: 1.28em;
 	vertical-align: -12%;
 	line-height: 1em;
 
-	&:before {
+	&::before {
 		font-size: 128%;
 	}
 }
@@ -230,10 +243,6 @@ rt {
 	line-height: inherit;
 	max-width: 100%;
 
-	&:focus-visible {
-		outline: none;
-	}
-
 	&:disabled {
 		opacity: 0.5;
 		cursor: default;
@@ -270,13 +279,17 @@ rt {
 
 ._help {
 	color: var(--accent);
-	cursor: help
+	cursor: help;
 }
 
 ._textButton {
 	@extend ._button;
 	color: var(--accent);
 
+	&:focus-visible {
+		outline-offset: 2px;
+	}
+
 	&:not(:disabled):hover {
 		text-decoration: underline;
 	}
diff --git a/packages/frontend/src/ui/_common_/common.vue b/packages/frontend/src/ui/_common_/common.vue
index 822b552837..d7df2d10f9 100644
--- a/packages/frontend/src/ui/_common_/common.vue
+++ b/packages/frontend/src/ui/_common_/common.vue
@@ -227,7 +227,7 @@ if ($i) {
 	right: 15px;
 	pointer-events: none;
 
-	&:before {
+	&::before {
 		content: "";
 		display: block;
 		width: 18px;
diff --git a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
index 699aa1e1c8..87e9e45e63 100644
--- a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
@@ -139,7 +139,7 @@ function more() {
 	font-weight: bold;
 	text-align: left;
 
-	&:before {
+	&::before {
 		content: "";
 		display: block;
 		width: calc(100% - 38px);
@@ -155,7 +155,7 @@ function more() {
 	}
 
 	&:hover, &.active {
-		&:before {
+		&::before {
 			background: var(--accentLighten);
 		}
 	}
@@ -226,7 +226,7 @@ function more() {
 	}
 
 	&:hover, &.active {
-		&:before {
+		&::before {
 			content: "";
 			display: block;
 			width: calc(100% - 24px);
diff --git a/packages/frontend/src/ui/_common_/navbar.vue b/packages/frontend/src/ui/_common_/navbar.vue
index b029533f28..8307da0d42 100644
--- a/packages/frontend/src/ui/_common_/navbar.vue
+++ b/packages/frontend/src/ui/_common_/navbar.vue
@@ -166,6 +166,15 @@ function more(ev: MouseEvent) {
 		display: block;
 		text-align: center;
 		width: 100%;
+
+		&:focus-visible {
+			outline: none;
+
+			> .instanceIcon {
+				outline: 2px solid var(--focus);
+				outline-offset: 2px;
+			}
+		}
 	}
 
 	.instanceIcon {
@@ -192,7 +201,7 @@ function more(ev: MouseEvent) {
 		font-weight: bold;
 		text-align: left;
 
-		&:before {
+		&::before {
 			content: "";
 			display: block;
 			width: calc(100% - 38px);
@@ -207,8 +216,17 @@ function more(ev: MouseEvent) {
 			background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB));
 		}
 
+		&:focus-visible {
+			outline: none;
+
+			&::before {
+				outline: 2px solid var(--fgOnAccent);
+				outline-offset: -4px;
+			}
+		}
+
 		&:hover, &.active {
-			&:before {
+			&::before {
 				background: var(--accentLighten);
 			}
 		}
@@ -234,6 +252,14 @@ function more(ev: MouseEvent) {
 		text-align: left;
 		box-sizing: border-box;
 		overflow: clip;
+
+		&:focus-visible {
+			outline: none;
+
+			> .avatar {
+				box-shadow: 0 0 0 4px var(--focus);
+			}
+		}
 	}
 
 	.avatar {
@@ -282,10 +308,19 @@ function more(ev: MouseEvent) {
 			color: var(--navActive);
 		}
 
-		&:hover, &.active {
+		&:focus-visible {
+			outline: none;
+
+			&::before {
+				outline: 2px solid var(--focus);
+				outline-offset: -2px;
+			}
+		}
+
+		&:hover, &.active, &:focus {
 			color: var(--accent);
 
-			&:before {
+			&::before {
 				content: "";
 				display: block;
 				width: calc(100% - 34px);
@@ -352,6 +387,15 @@ function more(ev: MouseEvent) {
 		display: block;
 		text-align: center;
 		width: 100%;
+
+		&:focus-visible {
+			outline: none;
+
+			> .instanceIcon {
+				outline: 2px solid var(--focus);
+				outline-offset: 2px;
+			}
+		}
 	}
 
 	.instanceIcon {
@@ -376,7 +420,7 @@ function more(ev: MouseEvent) {
 		height: 52px;
 		text-align: center;
 
-		&:before {
+		&::before {
 			content: "";
 			display: block;
 			position: absolute;
@@ -391,8 +435,17 @@ function more(ev: MouseEvent) {
 			background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB));
 		}
 
+		&:focus-visible {
+			outline: none;
+
+			&::before {
+				outline: 2px solid var(--fgOnAccent);
+				outline-offset: -4px;
+			}
+		}
+
 		&:hover, &.active {
-			&:before {
+			&::before {
 				background: var(--accentLighten);
 			}
 		}
@@ -413,6 +466,14 @@ function more(ev: MouseEvent) {
 		padding: 20px 0;
 		width: 100%;
 		overflow: clip;
+
+		&:focus-visible {
+			outline: none;
+
+			> .avatar {
+				box-shadow: 0 0 0 4px var(--focus);
+			}
+		}
 	}
 
 	.avatar {
@@ -442,11 +503,20 @@ function more(ev: MouseEvent) {
 		width: 100%;
 		text-align: center;
 
-		&:hover, &.active {
+		&:focus-visible {
+			outline: none;
+
+			&::before {
+				outline: 2px solid var(--focus);
+				outline-offset: -2px;
+			}
+		}
+
+		&:hover, &.active, &:focus {
 			text-decoration: none;
 			color: var(--accent);
 
-			&:before {
+			&::before {
 				content: "";
 				display: block;
 				height: 100%;
diff --git a/packages/frontend/src/ui/deck/column.vue b/packages/frontend/src/ui/deck/column.vue
index 07845bacbb..e96402d13b 100644
--- a/packages/frontend/src/ui/deck/column.vue
+++ b/packages/frontend/src/ui/deck/column.vue
@@ -271,7 +271,7 @@ function onDrop(ev) {
 	border-radius: 10px;
 
 	&.draghover {
-		&:after {
+		&::after {
 			content: "";
 			display: block;
 			position: absolute;
@@ -285,7 +285,7 @@ function onDrop(ev) {
 	}
 
 	&.dragging {
-		&:after {
+		&::after {
 			content: "";
 			display: block;
 			position: absolute;
diff --git a/packages/frontend/src/widgets/WidgetCalendar.vue b/packages/frontend/src/widgets/WidgetCalendar.vue
index c688e8a0b1..6ece33eff3 100644
--- a/packages/frontend/src/widgets/WidgetCalendar.vue
+++ b/packages/frontend/src/widgets/WidgetCalendar.vue
@@ -121,7 +121,7 @@ defineExpose<WidgetComponentExpose>({
 .root {
 	padding: 16px 0;
 
-	&:after {
+	&::after {
 		content: "";
 		display: block;
 		clear: both;

From 76b1c74a375dc3de5588995803d445a2951aea32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 12 Jul 2024 16:39:09 +0900
Subject: [PATCH 034/221] fix(frontend): use proper import path

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

diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index 17ee6e294a..5e332533ef 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -25,7 +25,7 @@ import { MenuItem } from '@/types/menu.js';
 import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 import { showMovedDialog } from '@/scripts/show-moved-dialog.js';
 import { getHTMLElementOrNull } from '@/scripts/get-dom-node-or-null.js';
-import { focusParent } from './scripts/focus.js';
+import { focusParent } from '@/scripts/focus.js';
 
 export const openingWindowsCount = ref(0);
 

From 6cd15275bbcd17498166cda3455370d5f009e0bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8A=E3=81=95=E3=82=80=E3=81=AE=E3=81=B2=E3=81=A8?=
 <46447427+samunohito@users.noreply.github.com>
Date: Fri, 12 Jul 2024 21:14:09 +0900
Subject: [PATCH 035/221] =?UTF-8?q?fix:=20=E3=82=B5=E3=82=B8=E3=82=A7?=
 =?UTF-8?q?=E3=82=B9=E3=83=88=E3=81=95=E3=82=8C=E3=82=8B=E3=83=A6=E3=83=BC?=
 =?UTF-8?q?=E3=82=B6=E3=81=AE=E3=83=AA=E3=82=B9=E3=83=88=E3=82=A2=E3=83=83?=
 =?UTF-8?q?=E3=83=97=E6=96=B9=E6=B3=95=E3=82=92=E8=A6=8B=E7=9B=B4=E3=81=97?=
 =?UTF-8?q?=20(#14180)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: サジェストされるユーザのリストアップ方法を見直し

* fix comment

* fix CHANGELOG.md

* ノートの無いユーザ（updatedAtが無いユーザ）は含めないらしい

* fix test
---
 CHANGELOG.md                                  |   5 +
 packages/backend/src/core/CoreModule.ts       |   6 +
 .../backend/src/core/UserSearchService.ts     | 205 ++++++++++++++
 .../users/search-by-username-and-host.ts      | 101 +------
 .../backend/test/unit/UserSearchService.ts    | 265 ++++++++++++++++++
 5 files changed, 492 insertions(+), 90 deletions(-)
 create mode 100644 packages/backend/src/core/UserSearchService.ts
 create mode 100644 packages/backend/test/unit/UserSearchService.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6f48684b9..060ddd0e81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,11 @@
 - Fix: リノートにリアクションできないように
 - Fix: ユーザー名の前後に空白文字列がある場合は省略するように
 - Fix: プロフィール編集時に名前を空白文字列のみにできる問題を修正
+- Fix: ユーザ名のサジェスト時に表示される内容と順番を調整(以下の順番になります) #14149
+  1. フォロー中かつアクティブなユーザ
+  2. フォロー中かつ非アクティブなユーザ
+  3. フォローしていないアクティブなユーザ
+  4. フォローしていない非アクティブなユーザ
 
 ### Misskey.js
 - Feat: `/drive/files/create` のリクエストに対応（`multipart/form-data`に対応）
diff --git a/packages/backend/src/core/CoreModule.ts b/packages/backend/src/core/CoreModule.ts
index b5b34487ec..0208540afa 100644
--- a/packages/backend/src/core/CoreModule.ts
+++ b/packages/backend/src/core/CoreModule.ts
@@ -12,6 +12,7 @@ import {
 } from '@/core/entities/AbuseReportNotificationRecipientEntityService.js';
 import { AbuseReportNotificationService } from '@/core/AbuseReportNotificationService.js';
 import { SystemWebhookService } from '@/core/SystemWebhookService.js';
+import { UserSearchService } from '@/core/UserSearchService.js';
 import { AccountMoveService } from './AccountMoveService.js';
 import { AccountUpdateService } from './AccountUpdateService.js';
 import { AiService } from './AiService.js';
@@ -202,6 +203,7 @@ const $UserFollowingService: Provider = { provide: 'UserFollowingService', useEx
 const $UserKeypairService: Provider = { provide: 'UserKeypairService', useExisting: UserKeypairService };
 const $UserListService: Provider = { provide: 'UserListService', useExisting: UserListService };
 const $UserMutingService: Provider = { provide: 'UserMutingService', useExisting: UserMutingService };
+const $UserSearchService: Provider = { provide: 'UserSearchService', useExisting: UserSearchService };
 const $UserSuspendService: Provider = { provide: 'UserSuspendService', useExisting: UserSuspendService };
 const $UserAuthService: Provider = { provide: 'UserAuthService', useExisting: UserAuthService };
 const $VideoProcessingService: Provider = { provide: 'VideoProcessingService', useExisting: VideoProcessingService };
@@ -348,6 +350,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		UserKeypairService,
 		UserListService,
 		UserMutingService,
+		UserSearchService,
 		UserSuspendService,
 		UserAuthService,
 		VideoProcessingService,
@@ -490,6 +493,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$UserKeypairService,
 		$UserListService,
 		$UserMutingService,
+		$UserSearchService,
 		$UserSuspendService,
 		$UserAuthService,
 		$VideoProcessingService,
@@ -633,6 +637,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		UserKeypairService,
 		UserListService,
 		UserMutingService,
+		UserSearchService,
 		UserSuspendService,
 		UserAuthService,
 		VideoProcessingService,
@@ -774,6 +779,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$UserKeypairService,
 		$UserListService,
 		$UserMutingService,
+		$UserSearchService,
 		$UserSuspendService,
 		$UserAuthService,
 		$VideoProcessingService,
diff --git a/packages/backend/src/core/UserSearchService.ts b/packages/backend/src/core/UserSearchService.ts
new file mode 100644
index 0000000000..0d03cf6ee0
--- /dev/null
+++ b/packages/backend/src/core/UserSearchService.ts
@@ -0,0 +1,205 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { Brackets, SelectQueryBuilder } from 'typeorm';
+import { DI } from '@/di-symbols.js';
+import { type FollowingsRepository, MiUser, type UsersRepository } from '@/models/_.js';
+import { bindThis } from '@/decorators.js';
+import { sqlLikeEscape } from '@/misc/sql-like-escape.js';
+import type { Config } from '@/config.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { Packed } from '@/misc/json-schema.js';
+
+function defaultActiveThreshold() {
+	return new Date(Date.now() - 1000 * 60 * 60 * 24 * 30);
+}
+
+@Injectable()
+export class UserSearchService {
+	constructor(
+		@Inject(DI.config)
+		private config: Config,
+		@Inject(DI.usersRepository)
+		private usersRepository: UsersRepository,
+		@Inject(DI.followingsRepository)
+		private followingsRepository: FollowingsRepository,
+		private userEntityService: UserEntityService,
+	) {
+	}
+
+	/**
+	 * ユーザ名とホスト名によるユーザ検索を行う.
+	 *
+	 * - 検索結果には優先順位がつけられており、以下の順序で検索が行われる.
+	 *   1. フォローしているユーザのうち、一定期間以内（※）に更新されたユーザ
+	 *   2. フォローしているユーザのうち、一定期間以内に更新されていないユーザ
+	 *   3. フォローしていないユーザのうち、一定期間以内に更新されたユーザ
+	 *   4. フォローしていないユーザのうち、一定期間以内に更新されていないユーザ
+	 * - ログインしていない場合は、以下の順序で検索が行われる.
+	 *   1. 一定期間以内に更新されたユーザ
+	 *   2. 一定期間以内に更新されていないユーザ
+	 * - それぞれの検索結果はユーザ名の昇順でソートされる.
+	 * - 動作的には先に登場した検索結果の登場位置が優先される(条件的にユーザIDが重複することはないが).
+	 *   （1で既にヒットしていた場合、2, 3, 4でヒットしても無視される）
+	 * - ユーザ名とホスト名の検索条件はそれぞれ前方一致で検索される.
+	 * - ユーザ名の検索は大文字小文字を区別しない.
+	 * - ホスト名の検索は大文字小文字を区別しない.
+	 * - 検索結果は最大で {@link opts.limit} 件までとなる.
+	 *
+	 * ※一定期間とは {@link params.activeThreshold} で指定された日時から現在までの期間を指す.
+	 *
+	 * @param params 検索条件.
+	 * @param opts 関数の動作を制御するオプション.
+	 * @param me 検索を実行するユーザの情報. 未ログインの場合は指定しない.
+	 * @see {@link UserSearchService#buildSearchUserQueries}
+	 * @see {@link UserSearchService#buildSearchUserNoLoginQueries}
+	 */
+	@bindThis
+	public async search(
+		params: {
+			username?: string | null,
+			host?: string | null,
+			activeThreshold?: Date,
+		},
+		opts?: {
+			limit?: number,
+			detail?: boolean,
+		},
+		me?: MiUser | null,
+	): Promise<Packed<'User'>[]> {
+		const queries = me ? this.buildSearchUserQueries(me, params) : this.buildSearchUserNoLoginQueries(params);
+
+		let resultSet = new Set<MiUser['id']>();
+		const limit = opts?.limit ?? 10;
+		for (const query of queries) {
+			const ids = await query
+				.select('user.id')
+				.limit(limit - resultSet.size)
+				.orderBy('user.usernameLower', 'ASC')
+				.getRawMany<{ user_id: MiUser['id'] }>()
+				.then(res => res.map(x => x.user_id));
+
+			resultSet = new Set([...resultSet, ...ids]);
+			if (resultSet.size >= limit) {
+				break;
+			}
+		}
+
+		return this.userEntityService.packMany<'UserLite' | 'UserDetailed'>(
+			[...resultSet].slice(0, limit),
+			me,
+			{ schema: opts?.detail ? 'UserDetailed' : 'UserLite' },
+		);
+	}
+
+	/**
+	 * ログイン済みユーザによる検索実行時のクエリ一覧を構築する.
+	 * @param me
+	 * @param params
+	 * @private
+	 */
+	@bindThis
+	private buildSearchUserQueries(
+		me: MiUser,
+		params: {
+			username?: string | null,
+			host?: string | null,
+			activeThreshold?: Date,
+		},
+	) {
+		// デフォルト30日以内に更新されたユーザーをアクティブユーザーとする
+		const activeThreshold = params.activeThreshold ?? defaultActiveThreshold();
+
+		const followingUserQuery = this.followingsRepository.createQueryBuilder('following')
+			.select('following.followeeId')
+			.where('following.followerId = :followerId', { followerId: me.id });
+
+		const activeFollowingUsersQuery = this.generateUserQueryBuilder(params)
+			.andWhere(`user.id IN (${followingUserQuery.getQuery()})`)
+			.andWhere('user.updatedAt > :activeThreshold', { activeThreshold });
+		activeFollowingUsersQuery.setParameters(followingUserQuery.getParameters());
+
+		const inactiveFollowingUsersQuery = this.generateUserQueryBuilder(params)
+			.andWhere(`user.id IN (${followingUserQuery.getQuery()})`)
+			.andWhere(new Brackets(qb => {
+				qb
+					.where('user.updatedAt IS NULL')
+					.orWhere('user.updatedAt <= :activeThreshold', { activeThreshold });
+			}));
+		inactiveFollowingUsersQuery.setParameters(followingUserQuery.getParameters());
+
+		// 自分自身がヒットするとしたらここ
+		const activeUserQuery = this.generateUserQueryBuilder(params)
+			.andWhere(`user.id NOT IN (${followingUserQuery.getQuery()})`)
+			.andWhere('user.updatedAt > :activeThreshold', { activeThreshold });
+		activeUserQuery.setParameters(followingUserQuery.getParameters());
+
+		const inactiveUserQuery = this.generateUserQueryBuilder(params)
+			.andWhere(`user.id NOT IN (${followingUserQuery.getQuery()})`)
+			.andWhere('user.updatedAt <= :activeThreshold', { activeThreshold });
+		inactiveUserQuery.setParameters(followingUserQuery.getParameters());
+
+		return [activeFollowingUsersQuery, inactiveFollowingUsersQuery, activeUserQuery, inactiveUserQuery];
+	}
+
+	/**
+	 * ログインしていないユーザによる検索実行時のクエリ一覧を構築する.
+	 * @param params
+	 * @private
+	 */
+	@bindThis
+	private buildSearchUserNoLoginQueries(params: {
+		username?: string | null,
+		host?: string | null,
+		activeThreshold?: Date,
+	}) {
+		// デフォルト30日以内に更新されたユーザーをアクティブユーザーとする
+		const activeThreshold = params.activeThreshold ?? defaultActiveThreshold();
+
+		const activeUserQuery = this.generateUserQueryBuilder(params)
+			.andWhere(new Brackets(qb => {
+				qb
+					.where('user.updatedAt IS NULL')
+					.orWhere('user.updatedAt > :activeThreshold', { activeThreshold });
+			}));
+
+		const inactiveUserQuery = this.generateUserQueryBuilder(params)
+			.andWhere('user.updatedAt <= :activeThreshold', { activeThreshold });
+
+		return [activeUserQuery, inactiveUserQuery];
+	}
+
+	/**
+	 * ユーザ検索クエリで共通する抽出条件をあらかじめ設定したクエリビルダを生成する.
+	 * @param params
+	 * @private
+	 */
+	@bindThis
+	private generateUserQueryBuilder(params: {
+		username?: string | null,
+		host?: string | null,
+	}): SelectQueryBuilder<MiUser> {
+		const userQuery = this.usersRepository.createQueryBuilder('user');
+
+		if (params.username) {
+			userQuery.andWhere('user.usernameLower LIKE :username', { username: sqlLikeEscape(params.username.toLowerCase()) + '%' });
+		}
+
+		if (params.host) {
+			if (params.host === this.config.hostname || params.host === '.') {
+				userQuery.andWhere('user.host IS NULL');
+			} else {
+				userQuery.andWhere('user.host LIKE :host', {
+					host: sqlLikeEscape(params.host.toLowerCase()) + '%',
+				});
+			}
+		}
+
+		userQuery.andWhere('user.isSuspended = FALSE');
+
+		return userQuery;
+	}
+}
diff --git a/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts b/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts
index 7b3bdab327..8ff952dcb5 100644
--- a/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts
+++ b/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts
@@ -3,15 +3,9 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { Brackets } from 'typeorm';
-import { Inject, Injectable } from '@nestjs/common';
-import type { UsersRepository, FollowingsRepository } from '@/models/_.js';
-import type { Config } from '@/config.js';
-import type { MiUser } from '@/models/User.js';
+import { Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import { UserEntityService } from '@/core/entities/UserEntityService.js';
-import { DI } from '@/di-symbols.js';
-import { sqlLikeEscape } from '@/misc/sql-like-escape.js';
+import { UserSearchService } from '@/core/UserSearchService.js';
 
 export const meta = {
 	tags: ['users'],
@@ -49,89 +43,16 @@ export const paramDef = {
 @Injectable()
 export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
 	constructor(
-		@Inject(DI.config)
-		private config: Config,
-
-		@Inject(DI.usersRepository)
-		private usersRepository: UsersRepository,
-
-		@Inject(DI.followingsRepository)
-		private followingsRepository: FollowingsRepository,
-
-		private userEntityService: UserEntityService,
+		private userSearchService: UserSearchService,
 	) {
-		super(meta, paramDef, async (ps, me) => {
-			const setUsernameAndHostQuery = (query = this.usersRepository.createQueryBuilder('user')) => {
-				if (ps.username) {
-					query.andWhere('user.usernameLower LIKE :username', { username: sqlLikeEscape(ps.username.toLowerCase()) + '%' });
-				}
-
-				if (ps.host) {
-					if (ps.host === this.config.hostname || ps.host === '.') {
-						query.andWhere('user.host IS NULL');
-					} else {
-						query.andWhere('user.host LIKE :host', {
-							host: sqlLikeEscape(ps.host.toLowerCase()) + '%',
-						});
-					}
-				}
-
-				return query;
-			};
-
-			const activeThreshold = new Date(Date.now() - (1000 * 60 * 60 * 24 * 30)); // 30日
-
-			let users: MiUser[] = [];
-
-			if (me) {
-				const followingQuery = this.followingsRepository.createQueryBuilder('following')
-					.select('following.followeeId')
-					.where('following.followerId = :followerId', { followerId: me.id });
-
-				const query = setUsernameAndHostQuery()
-					.andWhere(`user.id IN (${ followingQuery.getQuery() })`)
-					.andWhere('user.id != :meId', { meId: me.id })
-					.andWhere('user.isSuspended = FALSE')
-					.andWhere(new Brackets(qb => {
-						qb
-							.where('user.updatedAt IS NULL')
-							.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
-					}));
-
-				query.setParameters(followingQuery.getParameters());
-
-				users = await query
-					.orderBy('user.usernameLower', 'ASC')
-					.limit(ps.limit)
-					.getMany();
-
-				if (users.length < ps.limit) {
-					const otherQuery = setUsernameAndHostQuery()
-						.andWhere(`user.id NOT IN (${ followingQuery.getQuery() })`)
-						.andWhere('user.isSuspended = FALSE')
-						.andWhere('user.updatedAt IS NOT NULL');
-
-					otherQuery.setParameters(followingQuery.getParameters());
-
-					const otherUsers = await otherQuery
-						.orderBy('user.updatedAt', 'DESC')
-						.limit(ps.limit - users.length)
-						.getMany();
-
-					users = users.concat(otherUsers);
-				}
-			} else {
-				const query = setUsernameAndHostQuery()
-					.andWhere('user.isSuspended = FALSE')
-					.andWhere('user.updatedAt IS NOT NULL');
-
-				users = await query
-					.orderBy('user.updatedAt', 'DESC')
-					.limit(ps.limit - users.length)
-					.getMany();
-			}
-
-			return await this.userEntityService.packMany(users, me, { schema: ps.detail ? 'UserDetailed' : 'UserLite' });
+		super(meta, paramDef, (ps, me) => {
+			return this.userSearchService.search({
+				username: ps.username,
+				host: ps.host,
+			}, {
+				limit: ps.limit,
+				detail: ps.detail,
+			}, me);
 		});
 	}
 }
diff --git a/packages/backend/test/unit/UserSearchService.ts b/packages/backend/test/unit/UserSearchService.ts
new file mode 100644
index 0000000000..7ea325d420
--- /dev/null
+++ b/packages/backend/test/unit/UserSearchService.ts
@@ -0,0 +1,265 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Test, TestingModule } from '@nestjs/testing';
+import { describe, jest, test } from '@jest/globals';
+import { In } from 'typeorm';
+import { UserSearchService } from '@/core/UserSearchService.js';
+import { FollowingsRepository, MiUser, UserProfilesRepository, UsersRepository } from '@/models/_.js';
+import { IdService } from '@/core/IdService.js';
+import { GlobalModule } from '@/GlobalModule.js';
+import { DI } from '@/di-symbols.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
+
+describe('UserSearchService', () => {
+	let app: TestingModule;
+	let service: UserSearchService;
+
+	let usersRepository: UsersRepository;
+	let followingsRepository: FollowingsRepository;
+	let idService: IdService;
+	let userProfilesRepository: UserProfilesRepository;
+
+	let root: MiUser;
+	let alice: MiUser;
+	let alyce: MiUser;
+	let alycia: MiUser;
+	let alysha: MiUser;
+	let alyson: MiUser;
+	let alyssa: MiUser;
+	let bob: MiUser;
+	let bobbi: MiUser;
+	let bobbie: MiUser;
+	let bobby: MiUser;
+
+	async function createUser(data: Partial<MiUser> = {}) {
+		const user = await usersRepository
+			.insert({
+				id: idService.gen(),
+				...data,
+			})
+			.then(x => usersRepository.findOneByOrFail(x.identifiers[0]));
+
+		await userProfilesRepository.insert({
+			userId: user.id,
+		});
+
+		return user;
+	}
+
+	async function createFollowings(follower: MiUser, followees: MiUser[]) {
+		for (const followee of followees) {
+			await followingsRepository.insert({
+				id: idService.gen(),
+				followerId: follower.id,
+				followeeId: followee.id,
+			});
+		}
+	}
+
+	async function setActive(users: MiUser[]) {
+		for (const user of users) {
+			await usersRepository.update(user.id, {
+				updatedAt: new Date(),
+			});
+		}
+	}
+
+	async function setInactive(users: MiUser[]) {
+		for (const user of users) {
+			await usersRepository.update(user.id, {
+				updatedAt: new Date(0),
+			});
+		}
+	}
+
+	async function setSuspended(users: MiUser[]) {
+		for (const user of users) {
+			await usersRepository.update(user.id, {
+				isSuspended: true,
+			});
+		}
+	}
+
+	beforeAll(async () => {
+		app = await Test
+			.createTestingModule({
+				imports: [
+					GlobalModule,
+				],
+				providers: [
+					UserSearchService,
+					{
+						provide: UserEntityService, useFactory: jest.fn(() => ({
+							// とりあえずIDが返れば確認が出来るので
+							packMany: (value: any) => value,
+						})),
+					},
+					IdService,
+				],
+			})
+			.compile();
+
+		await app.init();
+
+		usersRepository = app.get(DI.usersRepository);
+		userProfilesRepository = app.get(DI.userProfilesRepository);
+		followingsRepository = app.get(DI.followingsRepository);
+
+		service = app.get(UserSearchService);
+		idService = app.get(IdService);
+	});
+
+	beforeEach(async () => {
+		root = await createUser({ username: 'root', usernameLower: 'root', isRoot: true });
+		alice = await createUser({ username: 'Alice', usernameLower: 'alice' });
+		alyce = await createUser({ username: 'Alyce', usernameLower: 'alyce' });
+		alycia = await createUser({ username: 'Alycia', usernameLower: 'alycia' });
+		alysha = await createUser({ username: 'Alysha', usernameLower: 'alysha' });
+		alyson = await createUser({ username: 'Alyson', usernameLower: 'alyson', host: 'example.com' });
+		alyssa = await createUser({ username: 'Alyssa', usernameLower: 'alyssa', host: 'example.com' });
+		bob = await createUser({ username: 'Bob', usernameLower: 'bob' });
+		bobbi = await createUser({ username: 'Bobbi', usernameLower: 'bobbi' });
+		bobbie = await createUser({ username: 'Bobbie', usernameLower: 'bobbie', host: 'example.com' });
+		bobby = await createUser({ username: 'Bobby', usernameLower: 'bobby', host: 'example.com' });
+	});
+
+	afterEach(async () => {
+		await usersRepository.delete({});
+	});
+
+	afterAll(async () => {
+		await app.close();
+	});
+
+	describe('search', () => {
+		test('フォロー中のアクティブユーザのうち、"al"から始まる人が全員ヒットする', async () => {
+			await createFollowings(root, [alice, alyce, alycia, alysha, alyson, alyssa, bob, bobbi, bobbie, bobby]);
+			await setActive([alice, alyce, alyssa, bob, bobbi, bobbie, bobby]);
+			await setInactive([alycia, alysha, alyson]);
+
+			const result = await service.search(
+				{ username: 'al' },
+				{ limit: 100 },
+				root,
+			);
+
+			// alycia, alysha, alysonは非アクティブなので後ろに行く
+			expect(result).toEqual([alice, alyce, alyssa, alycia, alysha, alyson].map(x => x.id));
+		});
+
+		test('フォロー中の非アクティブユーザのうち、"al"から始まる人が全員ヒットする', async () => {
+			await createFollowings(root, [alycia, alysha, alyson, alyssa, bob, bobbi, bobbie, bobby]);
+			await setInactive([alice, alyce, alycia, alysha, alyson, alyssa, bob, bobbi, bobbie, bobby]);
+
+			const result = await service.search(
+				{ username: 'al' },
+				{ limit: 100 },
+				root,
+			);
+
+			// alice, alyceはフォローしていないので後ろに行く
+			expect(result).toEqual([alycia, alysha, alyson, alyssa, alice, alyce].map(x => x.id));
+		});
+
+		test('フォローしていないアクティブユーザのうち、"al"から始まる人が全員ヒットする', async () => {
+			await setActive([alysha, alyson, alyssa, bob, bobbi, bobbie, bobby]);
+			await setInactive([alice, alyce, alycia]);
+
+			const result = await service.search(
+				{ username: 'al' },
+				{ limit: 100 },
+				root,
+			);
+
+			// alice, alyce, alyciaは非アクティブなので後ろに行く
+			expect(result).toEqual([alysha, alyson, alyssa, alice, alyce, alycia].map(x => x.id));
+		});
+
+		test('フォローしていない非アクティブユーザのうち、"al"から始まる人が全員ヒットする', async () => {
+			await setInactive([alice, alyce, alycia, alysha, alyson, alyssa, bob, bobbi, bobbie, bobby]);
+
+			const result = await service.search(
+				{ username: 'al' },
+				{ limit: 100 },
+				root,
+			);
+
+			expect(result).toEqual([alice, alyce, alycia, alysha, alyson, alyssa].map(x => x.id));
+		});
+
+		test('フォロー（アクティブ）、フォロー（非アクティブ）、非フォロー（アクティブ）、非フォロー（非アクティブ）混在時の優先順位度確認', async () => {
+			await createFollowings(root, [alyson, alyssa, bob, bobbi, bobbie]);
+			await setActive([root, alyssa, bob, bobbi, alyce, alycia]);
+			await setInactive([alyson, alice, alysha, bobbie, bobby]);
+
+			const result = await service.search(
+				{ },
+				{ limit: 100 },
+				root,
+			);
+
+			// 見る用
+			// const users = await usersRepository.findBy({ id: In(result) }).then(it => new Map(it.map(x => [x.id, x])));
+			// console.log(result.map(x => users.get(x as any)).map(it => it?.username));
+
+			// フォローしててアクティブなので先頭: alyssa, bob, bobbi
+			// フォローしてて非アクティブなので次: alyson, bobbie
+			// フォローしてないけどアクティブなので次: alyce, alycia, root(アルファベット順的にここになる)
+			// フォローしてないし非アクティブなので最後: alice, alysha, bobby
+			expect(result).toEqual([alyssa, bob, bobbi, alyson, bobbie, alyce, alycia, root, alice, alysha, bobby].map(x => x.id));
+		});
+
+		test('[非ログイン] アクティブユーザのうち、"al"から始まる人が全員ヒットする', async () => {
+			await setActive([alysha, alyson, alyssa, bob, bobbi, bobbie, bobby]);
+			await setInactive([alice, alyce, alycia]);
+
+			const result = await service.search(
+				{ username: 'al' },
+				{ limit: 100 },
+			);
+
+			// alice, alyce, alyciaは非アクティブなので後ろに行く
+			expect(result).toEqual([alysha, alyson, alyssa, alice, alyce, alycia].map(x => x.id));
+		});
+
+		test('[非ログイン] 非アクティブユーザのうち、"al"から始まる人が全員ヒットする', async () => {
+			await setInactive([alice, alyce, alycia, alysha, alyson, alyssa, bob, bobbi, bobbie, bobby]);
+
+			const result = await service.search(
+				{ username: 'al' },
+				{ limit: 100 },
+			);
+
+			expect(result).toEqual([alice, alyce, alycia, alysha, alyson, alyssa].map(x => x.id));
+		});
+
+		test('フォロー中のアクティブユーザのうち、"al"から始まり"example.com"にいる人が全員ヒットする', async () => {
+			await createFollowings(root, [alice, alyce, alycia, alysha, alyson, alyssa, bob, bobbi, bobbie, bobby]);
+			await setActive([alice, alyce, alycia, alysha, alyson, alyssa, bob, bobbi, bobbie, bobby]);
+
+			const result = await service.search(
+				{ username: 'al', host: 'exam' },
+				{ limit: 100 },
+				root,
+			);
+
+			expect(result).toEqual([alyson, alyssa].map(x => x.id));
+		});
+
+		test('サスペンド済みユーザは出ない', async () => {
+			await setActive([alice, alyce, alycia, alysha, alyson, alyssa, bob, bobbi, bobbie, bobby]);
+			await setSuspended([alice, alyce, alycia]);
+
+			const result = await service.search(
+				{ username: 'al' },
+				{ limit: 100 },
+				root,
+			);
+
+			expect(result).toEqual([alysha, alyson, alyssa].map(x => x.id));
+		});
+	});
+});

From 91de35ecdf94bb9ada06eb0c34a597bc50064681 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 13 Jul 2024 10:30:28 +0900
Subject: [PATCH 036/221] =?UTF-8?q?fix(backend):=20=E3=83=87=E3=83=95?=
 =?UTF-8?q?=E3=82=A9=E3=83=AB=E3=83=88=E3=83=86=E3=83=BC=E3=83=9E=E3=81=AB?=
 =?UTF-8?q?=E7=84=A1=E5=8A=B9=E3=81=AA=E3=83=86=E3=83=BC=E3=83=9E=E3=82=B3?=
 =?UTF-8?q?=E3=83=BC=E3=83=89=E3=82=92=E5=85=A5=E5=8A=9B=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=81=A8UI=E3=81=8C=E4=BD=BF=E7=94=A8=E3=81=A7=E3=81=8D?=
 =?UTF-8?q?=E3=81=AA=E3=81=8F=E3=81=AA=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #13955
---
 CHANGELOG.md                                  |  1 +
 .../src/core/entities/MetaEntityService.ts    | 21 ++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 060ddd0e81..5533e3b518 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Feat: 通報を受けた際、または解決した際に、予め登録した宛先に通知を飛ばせるように(mail or webhook) #13705
 - Fix: 配信停止したインスタンス一覧が見れなくなる問題を修正
 - Fix: Dockerコンテナの立ち上げ時に`pnpm`のインストールで固まることがある問題
+- Fix: デフォルトテーマに無効なテーマコードを入力するとUIが使用できなくなる問題を修正
 
 ### Client
 - Enhance: 内蔵APIドキュメントのデザイン・パフォーマンスを改善
diff --git a/packages/backend/src/core/entities/MetaEntityService.ts b/packages/backend/src/core/entities/MetaEntityService.ts
index 5dfec589e1..09641ce485 100644
--- a/packages/backend/src/core/entities/MetaEntityService.ts
+++ b/packages/backend/src/core/entities/MetaEntityService.ts
@@ -50,6 +50,22 @@ export class MetaEntityService {
 			}))
 			.getMany();
 
+		// クライアントの手間を減らすためあらかじめJSONに変換しておく
+		let defaultLightTheme = null;
+		let defaultDarkTheme = null;
+		if (instance.defaultLightTheme) {
+			try {
+				defaultLightTheme = JSON.stringify(JSON5.parse(instance.defaultLightTheme));
+			} catch (e) {
+			}
+		}
+		if (instance.defaultDarkTheme) {
+			try {
+				defaultDarkTheme = JSON.stringify(JSON5.parse(instance.defaultDarkTheme));
+			} catch (e) {
+			}
+		}
+
 		const packed: Packed<'MetaLite'> = {
 			maintainerName: instance.maintainerName,
 			maintainerEmail: instance.maintainerEmail,
@@ -90,9 +106,8 @@ export class MetaEntityService {
 			backgroundImageUrl: instance.backgroundImageUrl,
 			logoImageUrl: instance.logoImageUrl,
 			maxNoteTextLength: MAX_NOTE_TEXT_LENGTH,
-			// クライアントの手間を減らすためあらかじめJSONに変換しておく
-			defaultLightTheme: instance.defaultLightTheme ? JSON.stringify(JSON5.parse(instance.defaultLightTheme)) : null,
-			defaultDarkTheme: instance.defaultDarkTheme ? JSON.stringify(JSON5.parse(instance.defaultDarkTheme)) : null,
+			defaultLightTheme,
+			defaultDarkTheme,
 			ads: ads.map(ad => ({
 				id: ad.id,
 				url: ad.url,

From 1b175ea759ffdb0e70b66f1958ef114ecd00a50f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 13 Jul 2024 13:02:27 +0900
Subject: [PATCH 037/221] =?UTF-8?q?fix(frontend):=20=E3=81=99=E3=81=A7?=
 =?UTF-8?q?=E3=81=ABfocus=20trap=E5=AF=BE=E8=B1=A1=E3=81=AE=E8=A6=81?=
 =?UTF-8?q?=E7=B4=A0=E3=81=ABinert=E3=81=8C=E3=81=8B=E3=81=8B=E3=81=A3?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8B=E5=A0=B4=E5=90=88=E3=81=AF=E8=A7=A3?=
 =?UTF-8?q?=E9=99=A4=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(#1418?=
 =?UTF-8?q?9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): すでにfocus trap対象の要素にinertがかかっている場合は解除するように

* 他のfocus-trapped要素とのインタラクションがある場合の動作を変更

* typo
---
 .../src/components/MkEmojiPickerDialog.vue    |  1 +
 packages/frontend/src/components/MkModal.vue  |  4 +++-
 packages/frontend/src/scripts/focus-trap.ts   | 23 +++++++++++++++----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/src/components/MkEmojiPickerDialog.vue b/packages/frontend/src/components/MkEmojiPickerDialog.vue
index a413b146ba..7e1ffbfa9e 100644
--- a/packages/frontend/src/components/MkEmojiPickerDialog.vue
+++ b/packages/frontend/src/components/MkEmojiPickerDialog.vue
@@ -9,6 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	v-slot="{ type, maxHeight }"
 	:zPriority="'middle'"
 	:preferType="defaultStore.state.emojiPickerUseDrawerForMobile === false ? 'popup' : 'auto'"
+	:hasInteractionWithOtherFocusTrappedEls="true"
 	:transparentBg="true"
 	:manualShowing="manualShowing"
 	:src="src"
diff --git a/packages/frontend/src/components/MkModal.vue b/packages/frontend/src/components/MkModal.vue
index a5fbf8d365..f8032f9b43 100644
--- a/packages/frontend/src/components/MkModal.vue
+++ b/packages/frontend/src/components/MkModal.vue
@@ -71,6 +71,7 @@ const props = withDefaults(defineProps<{
 	zPriority?: 'low' | 'middle' | 'high';
 	noOverlap?: boolean;
 	transparentBg?: boolean;
+	hasInteractionWithOtherFocusTrappedEls?: boolean;
 	returnFocusTo?: HTMLElement | null;
 }>(), {
 	manualShowing: null,
@@ -80,6 +81,7 @@ const props = withDefaults(defineProps<{
 	zPriority: 'low',
 	noOverlap: true,
 	transparentBg: false,
+	hasInteractionWithOtherFocusTrappedEls: false,
 	returnFocusTo: null,
 });
 
@@ -326,7 +328,7 @@ onMounted(() => {
 	watch([showing, () => props.manualShowing], ([showing, manualShowing]) => {
 		if (manualShowing === true || (manualShowing == null && showing === true)) {
 			if (modalRootEl.value != null) {
-				const { release } = focusTrap(modalRootEl.value);
+				const { release } = focusTrap(modalRootEl.value, props.hasInteractionWithOtherFocusTrappedEls);
 
 				releaseFocusTrap = release;
 				modalRootEl.value.focus();
diff --git a/packages/frontend/src/scripts/focus-trap.ts b/packages/frontend/src/scripts/focus-trap.ts
index 734c73652f..a5df36f520 100644
--- a/packages/frontend/src/scripts/focus-trap.ts
+++ b/packages/frontend/src/scripts/focus-trap.ts
@@ -18,6 +18,9 @@ function containsFocusTrappedElements(el: HTMLElement): boolean {
 
 function releaseFocusTrap(el: HTMLElement): void {
 	focusTrapElements.delete(el);
+	if (el.inert === true) {
+		el.inert = false;
+	}
 	if (el.parentElement != null && el !== document.body) {
 		el.parentElement.childNodes.forEach((siblingNode) => {
 			const siblingEl = getHTMLElementOrNull(siblingNode);
@@ -39,18 +42,28 @@ function releaseFocusTrap(el: HTMLElement): void {
 	}
 }
 
-export function focusTrap(el: HTMLElement, parent: true): void;
-export function focusTrap(el: HTMLElement, parent?: false): { release: () => void; };
-export function focusTrap(el: HTMLElement, parent = false): { release: () => void; } | void {
+export function focusTrap(el: HTMLElement, hasInteractionWithOtherFocusTrappedEls: boolean, parent: true): void;
+export function focusTrap(el: HTMLElement, hasInteractionWithOtherFocusTrappedEls?: boolean, parent?: false): { release: () => void; };
+export function focusTrap(el: HTMLElement, hasInteractionWithOtherFocusTrappedEls = false, parent = false): { release: () => void; } | void {
+	if (el.inert === true) {
+		el.inert = false;
+	}
 	if (el.parentElement != null && el !== document.body) {
 		el.parentElement.childNodes.forEach((siblingNode) => {
 			const siblingEl = getHTMLElementOrNull(siblingNode);
 			if (!siblingEl) return;
-			if (siblingEl !== el && !ignoreElements.includes(siblingEl.tagName.toLowerCase())) {
+			if (
+				siblingEl !== el &&
+				(
+					hasInteractionWithOtherFocusTrappedEls === false ||
+					(!focusTrapElements.has(siblingEl) && !containsFocusTrappedElements(siblingEl))
+				) &&
+				!ignoreElements.includes(siblingEl.tagName.toLowerCase())
+			) {
 				siblingEl.inert = true;
 			}
 		});
-		focusTrap(el.parentElement, true);
+		focusTrap(el.parentElement, hasInteractionWithOtherFocusTrappedEls, true);
 	}
 
 	if (!parent) {

From bcc92d546fde7a75a48074dc96096ae2083b5025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 13 Jul 2024 16:15:25 +0900
Subject: [PATCH 038/221] =?UTF-8?q?fix(frontend):=20=E3=83=9B=E3=83=83?=
 =?UTF-8?q?=E3=83=88=E3=82=AD=E3=83=BC=E3=81=AE=E3=83=AC=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E3=83=AA=E3=83=9F=E3=83=83=E3=83=88=E3=81=8CallowRepeat?=
 =?UTF-8?q?=E3=82=92=E8=80=83=E6=85=AE=E3=81=97=E3=81=AA=E3=81=84=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(#14192)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/packages/frontend/src/scripts/hotkey.ts b/packages/frontend/src/scripts/hotkey.ts
index ff3cbe98ac..04fb235694 100644
--- a/packages/frontend/src/scripts/hotkey.ts
+++ b/packages/frontend/src/scripts/hotkey.ts
@@ -114,6 +114,7 @@ const matchPatterns = (ev: KeyboardEvent, action: Action) => {
 	const key = ev.key.toLowerCase();
 	return patterns.some(({ which, ctrl, shift, alt }) => {
 		if (
+			options.allowRepeat === false &&
 			latestHotkey != null &&
 			latestHotkey.which.includes(key) &&
 			latestHotkey.ctrl === ctrl &&

From 9fcae7d9b287eda113363780094257614e06242d Mon Sep 17 00:00:00 2001
From: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>
Date: Sat, 13 Jul 2024 16:59:08 +0900
Subject: [PATCH 039/221] refactor(sw): enable noImplicitAny (#14191)

---
 packages/sw/tsconfig.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/sw/tsconfig.json b/packages/sw/tsconfig.json
index f3f3543013..50d4aae19d 100644
--- a/packages/sw/tsconfig.json
+++ b/packages/sw/tsconfig.json
@@ -2,7 +2,6 @@
 	"compilerOptions": {
 		"allowJs": true,
 		"noEmitOnError": false,
-		"noImplicitAny": false,
 		"noImplicitReturns": true,
 		"noUnusedParameters": false,
 		"noUnusedLocals": true,

From c83c831c53ab2367e2323737ee0f2ae89ab2de6d Mon Sep 17 00:00:00 2001
From: Gianni Ceccarelli <dakkar@thenautilus.net>
Date: Sat, 13 Jul 2024 12:26:48 +0100
Subject: [PATCH 040/221] parse `notRespondingSince` from redis instance cache
 (#14079)

if we don't do this, we'll get a string, and `DeliverProcessorService`
will error out `i.notRespondingSince.getTime is not a function`
---
 packages/backend/src/core/FederatedInstanceService.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/core/FederatedInstanceService.ts b/packages/backend/src/core/FederatedInstanceService.ts
index 6799f2c5bb..7aeeb78178 100644
--- a/packages/backend/src/core/FederatedInstanceService.ts
+++ b/packages/backend/src/core/FederatedInstanceService.ts
@@ -40,6 +40,7 @@ export class FederatedInstanceService implements OnApplicationShutdown {
 					firstRetrievedAt: new Date(parsed.firstRetrievedAt),
 					latestRequestReceivedAt: parsed.latestRequestReceivedAt ? new Date(parsed.latestRequestReceivedAt) : null,
 					infoUpdatedAt: parsed.infoUpdatedAt ? new Date(parsed.infoUpdatedAt) : null,
+					notRespondingSince: parsed.notRespondingSince ? new Date(parsed.notRespondingSince) : null,
 				};
 			},
 		});

From b5fd6183d20e8a93f05aaf85a9b1e586e42464c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 14 Jul 2024 08:00:27 +0900
Subject: [PATCH 041/221] =?UTF-8?q?deps(frontend):=20AiScript=20VSCode?=
 =?UTF-8?q?=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92?=
 =?UTF-8?q?=E4=B8=8A=E3=81=92=E3=82=8B=20(#14199)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/package.json |  2 +-
 pnpm-lock.yaml                 | 50 ++++++++++++----------------------
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 743722c231..a0c1c69883 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -29,7 +29,7 @@
 		"@twemoji/parser": "15.1.1",
 		"@vitejs/plugin-vue": "5.0.5",
 		"@vue/compiler-sfc": "3.4.31",
-		"aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.1.9",
+		"aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.1.11",
 		"astring": "1.8.6",
 		"broadcast-channel": "7.0.0",
 		"buraha": "0.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 10968f3e82..6e3ddfc5d4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -725,8 +725,8 @@ importers:
         specifier: 3.4.31
         version: 3.4.31
       aiscript-vscode:
-        specifier: github:aiscript-dev/aiscript-vscode#v0.1.9
-        version: https://codeload.github.com/aiscript-dev/aiscript-vscode/tar.gz/34bf4e1530efcf1efa855bd04e2dab39735e1b02
+        specifier: github:aiscript-dev/aiscript-vscode#v0.1.11
+        version: https://codeload.github.com/aiscript-dev/aiscript-vscode/tar.gz/e1e1b27f2f72cd28a473e004b6da0d8fc0bd40d9
       astring:
         specifier: 1.8.6
         version: 1.8.6
@@ -919,7 +919,7 @@ importers:
         version: 8.1.11(bufferutil@4.0.7)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.5.3))
       '@testing-library/vue':
         specifier: 8.1.0
-        version: 8.1.0(@vue/compiler-sfc@3.4.31)(@vue/server-renderer@3.4.29(vue@3.4.31(typescript@5.5.3)))(vue@3.4.31(typescript@5.5.3))
+        version: 8.1.0(@vue/compiler-sfc@3.4.31)(@vue/server-renderer@3.4.31(vue@3.4.31(typescript@5.5.3)))(vue@3.4.31(typescript@5.5.3))
       '@types/escape-regexp':
         specifier: 0.0.3
         version: 0.0.3
@@ -5438,9 +5438,6 @@ packages:
   '@vue/compiler-sfc@3.4.31':
     resolution: {integrity: sha512-einJxqEw8IIJxzmnxmJBuK2usI+lJonl53foq+9etB2HAzlPjAS/wa7r0uUpXw5ByX3/0uswVSrjNb17vJm1kQ==}
 
-  '@vue/compiler-ssr@3.4.29':
-    resolution: {integrity: sha512-rFbwCmxJ16tDp3N8XCx5xSQzjhidYjXllvEcqX/lopkoznlNPz3jyy0WGJCyhAaVQK677WWFt3YO/WUEkMMUFQ==}
-
   '@vue/compiler-ssr@3.4.31':
     resolution: {integrity: sha512-RtefmITAje3fJ8FSg1gwgDhdKhZVntIVbwupdyZDSifZTRMiWxWehAOTCc8/KZDnBOcYQ4/9VWxsTbd3wT0hAA==}
 
@@ -5472,11 +5469,6 @@ packages:
   '@vue/runtime-dom@3.4.31':
     resolution: {integrity: sha512-2Auws3mB7+lHhTFCg8E9ZWopA6Q6L455EcU7bzcQ4x6Dn4cCPuqj6S2oBZgN2a8vJRS/LSYYxwFFq2Hlx3Fsaw==}
 
-  '@vue/server-renderer@3.4.29':
-    resolution: {integrity: sha512-HMLCmPI2j/k8PVkSBysrA2RxcxC5DgBiCdj7n7H2QtR8bQQPqKAe8qoaxLcInzouBmzwJ+J0x20ygN/B5mYBng==}
-    peerDependencies:
-      vue: 3.4.29
-
   '@vue/server-renderer@3.4.31':
     resolution: {integrity: sha512-D5BLbdvrlR9PE3by9GaUp1gQXlCNadIZytMIb8H2h3FMWJd4oUfkUTEH2wAr3qxoRz25uxbTcbqd3WKlm9EHQA==}
     peerDependencies:
@@ -5593,9 +5585,9 @@ packages:
     resolution: {integrity: sha512-gOsf2YwSlleG6IjRYG2A7k0HmBMEo6qVNk9Bp/EaLgAJT5ngH6PXbqa4ItvnEwCm/velL5jAnQgsHsWnjhGmvw==}
     engines: {node: '>=18'}
 
-  aiscript-vscode@https://codeload.github.com/aiscript-dev/aiscript-vscode/tar.gz/34bf4e1530efcf1efa855bd04e2dab39735e1b02:
-    resolution: {tarball: https://codeload.github.com/aiscript-dev/aiscript-vscode/tar.gz/34bf4e1530efcf1efa855bd04e2dab39735e1b02}
-    version: 0.1.9
+  aiscript-vscode@https://codeload.github.com/aiscript-dev/aiscript-vscode/tar.gz/e1e1b27f2f72cd28a473e004b6da0d8fc0bd40d9:
+    resolution: {tarball: https://codeload.github.com/aiscript-dev/aiscript-vscode/tar.gz/e1e1b27f2f72cd28a473e004b6da0d8fc0bd40d9}
+    version: 0.1.11
     engines: {vscode: ^1.83.0}
 
   ajv-draft-04@1.0.0:
@@ -11716,6 +11708,9 @@ packages:
   vue-component-type-helpers@2.0.24:
     resolution: {integrity: sha512-Jr5N8QVYEcbQuMN1LRgvg61758G8HTnzUlQsAFOxx6Y6X8kmhJ7C+jOvWsQruYxi3uHhhS6BghyRlyiwO99DBg==}
 
+  vue-component-type-helpers@2.0.26:
+    resolution: {integrity: sha512-sO9qQ8oC520SW6kqlls0iqDak53gsTVSrYylajgjmkt1c0vcgjsGSy1KzlDrbEx8pm02IEYhlUkU5hCYf8rwtg==}
+
   vue-demi@0.14.7:
     resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==}
     engines: {node: '>=12'}
@@ -16525,7 +16520,7 @@ snapshots:
       ts-dedent: 2.2.0
       type-fest: 2.19.0
       vue: 3.4.31(typescript@5.5.3)
-      vue-component-type-helpers: 2.0.24
+      vue-component-type-helpers: 2.0.26
     transitivePeerDependencies:
       - encoding
       - prettier
@@ -16789,11 +16784,11 @@ snapshots:
     dependencies:
       '@testing-library/dom': 10.1.0
 
-  '@testing-library/vue@8.1.0(@vue/compiler-sfc@3.4.31)(@vue/server-renderer@3.4.29(vue@3.4.31(typescript@5.5.3)))(vue@3.4.31(typescript@5.5.3))':
+  '@testing-library/vue@8.1.0(@vue/compiler-sfc@3.4.31)(@vue/server-renderer@3.4.31(vue@3.4.31(typescript@5.5.3)))(vue@3.4.31(typescript@5.5.3))':
     dependencies:
       '@babel/runtime': 7.23.4
       '@testing-library/dom': 9.3.4
-      '@vue/test-utils': 2.4.1(@vue/server-renderer@3.4.29(vue@3.4.31(typescript@5.5.3)))(vue@3.4.31(typescript@5.5.3))
+      '@vue/test-utils': 2.4.1(@vue/server-renderer@3.4.31(vue@3.4.31(typescript@5.5.3)))(vue@3.4.31(typescript@5.5.3))
       vue: 3.4.31(typescript@5.5.3)
     optionalDependencies:
       '@vue/compiler-sfc': 3.4.31
@@ -17599,12 +17594,6 @@ snapshots:
       postcss: 8.4.38
       source-map-js: 1.2.0
 
-  '@vue/compiler-ssr@3.4.29':
-    dependencies:
-      '@vue/compiler-dom': 3.4.29
-      '@vue/shared': 3.4.29
-    optional: true
-
   '@vue/compiler-ssr@3.4.31':
     dependencies:
       '@vue/compiler-dom': 3.4.31
@@ -17653,13 +17642,6 @@ snapshots:
       '@vue/shared': 3.4.31
       csstype: 3.1.3
 
-  '@vue/server-renderer@3.4.29(vue@3.4.31(typescript@5.5.3))':
-    dependencies:
-      '@vue/compiler-ssr': 3.4.29
-      '@vue/shared': 3.4.29
-      vue: 3.4.31(typescript@5.5.3)
-    optional: true
-
   '@vue/server-renderer@3.4.31(vue@3.4.31(typescript@5.5.3))':
     dependencies:
       '@vue/compiler-ssr': 3.4.31
@@ -17670,13 +17652,13 @@ snapshots:
 
   '@vue/shared@3.4.31': {}
 
-  '@vue/test-utils@2.4.1(@vue/server-renderer@3.4.29(vue@3.4.31(typescript@5.5.3)))(vue@3.4.31(typescript@5.5.3))':
+  '@vue/test-utils@2.4.1(@vue/server-renderer@3.4.31(vue@3.4.31(typescript@5.5.3)))(vue@3.4.31(typescript@5.5.3))':
     dependencies:
       js-beautify: 1.14.9
       vue: 3.4.31(typescript@5.5.3)
       vue-component-type-helpers: 1.8.4
     optionalDependencies:
-      '@vue/server-renderer': 3.4.29(vue@3.4.31(typescript@5.5.3))
+      '@vue/server-renderer': 3.4.31(vue@3.4.31(typescript@5.5.3))
 
   '@webgpu/types@0.1.30': {}
 
@@ -17767,7 +17749,7 @@ snapshots:
       clean-stack: 5.2.0
       indent-string: 5.0.0
 
-  aiscript-vscode@https://codeload.github.com/aiscript-dev/aiscript-vscode/tar.gz/34bf4e1530efcf1efa855bd04e2dab39735e1b02:
+  aiscript-vscode@https://codeload.github.com/aiscript-dev/aiscript-vscode/tar.gz/e1e1b27f2f72cd28a473e004b6da0d8fc0bd40d9:
     dependencies:
       '@aiscript-dev/aiscript-languageserver': https://github.com/aiscript-dev/aiscript-languageserver/releases/download/0.1.6/aiscript-dev-aiscript-languageserver-0.1.6.tgz
       vscode-languageclient: 9.0.1
@@ -24875,6 +24857,8 @@ snapshots:
 
   vue-component-type-helpers@2.0.24: {}
 
+  vue-component-type-helpers@2.0.26: {}
+
   vue-demi@0.14.7(vue@3.4.31(typescript@5.5.3)):
     dependencies:
       vue: 3.4.31(typescript@5.5.3)

From 58c596cacf8d2bd2572075051e4361500e791bdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 14 Jul 2024 09:26:25 +0900
Subject: [PATCH 042/221] =?UTF-8?q?fix(backend):=20=E4=B8=80=E8=88=AC?=
 =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=8B=E3=82=89=E8=A6=8B?=
 =?UTF-8?q?=E3=81=9F=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=AE=E3=83=90?=
 =?UTF-8?q?=E3=83=83=E3=82=B8=E3=81=AE=E4=B8=80=E8=A6=A7=E3=81=AB=E5=85=AC?=
 =?UTF-8?q?=E9=96=8B=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E3=82=82=E3=81=AE=E3=81=8C=E5=90=AB=E3=81=BE=E3=82=8C=E3=82=8B?=
 =?UTF-8?q?=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82=E3=82=8B=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20(#14195)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance(backend): 公開バッジのみをpackするように (MisskeyIO#652)

(cherry picked from commit b8a90659f35fef49d1d00fb2f9b152226c97643c)

* Update Changelog

* fix

* Update UserEntityService.ts

---------

Co-authored-by: CyberRex <26585194+CyberRex0@users.noreply.github.com>
---
 CHANGELOG.md                                       |  2 ++
 .../backend/src/core/entities/UserEntityService.ts | 14 +++++++++-----
 packages/backend/test/e2e/users.ts                 | 13 +++++++++++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5533e3b518..bd2a9e32e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,8 @@
   2. フォロー中かつ非アクティブなユーザ
   3. フォローしていないアクティブなユーザ
   4. フォローしていない非アクティブなユーザ
+- Fix: 一般ユーザーから見たユーザーのバッジの一覧に公開されていないものが含まれることがある問題を修正  
+  (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/652)
 
 ### Misskey.js
 - Feat: `/drive/files/create` のリクエストに対応（`multipart/form-data`に対応）
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index da96878713..7fd093c191 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -501,11 +501,15 @@ export class UserEntityService implements OnModuleInit {
 			emojis: this.customEmojiService.populateEmojis(user.emojis, user.host),
 			onlineStatus: this.getOnlineStatus(user),
 			// パフォーマンス上の理由でローカルユーザーのみ
-			badgeRoles: user.host == null ? this.roleService.getUserBadgeRoles(user.id).then(rs => rs.sort((a, b) => b.displayOrder - a.displayOrder).map(r => ({
-				name: r.name,
-				iconUrl: r.iconUrl,
-				displayOrder: r.displayOrder,
-			}))) : undefined,
+			badgeRoles: user.host == null ? this.roleService.getUserBadgeRoles(user.id).then((rs) => rs
+				.filter((r) => r.isPublic || iAmModerator)
+				.sort((a, b) => b.displayOrder - a.displayOrder)
+				.map((r) => ({
+					name: r.name,
+					iconUrl: r.iconUrl,
+					displayOrder: r.displayOrder,
+				}))
+			) : undefined,
 
 			...(isDetailed ? {
 				url: profile!.url,
diff --git a/packages/backend/test/e2e/users.ts b/packages/backend/test/e2e/users.ts
index 3458e06384..61fd759932 100644
--- a/packages/backend/test/e2e/users.ts
+++ b/packages/backend/test/e2e/users.ts
@@ -231,7 +231,7 @@ describe('ユーザー', () => {
 		rolePublic = await role(root, { isPublic: true, name: 'Public Role' });
 		await api('admin/roles/assign', { userId: userRolePublic.id, roleId: rolePublic.id }, root);
 		userRoleBadge = await signup({ username: 'userRoleBadge' });
-		roleBadge = await role(root, { asBadge: true, name: 'Badge Role' });
+		roleBadge = await role(root, { asBadge: true, name: 'Badge Role', isPublic: true });
 		await api('admin/roles/assign', { userId: userRoleBadge.id, roleId: roleBadge.id }, root);
 		userSilenced = await signup({ username: 'userSilenced' });
 		await post(userSilenced, { text: 'test' });
@@ -655,7 +655,16 @@ describe('ユーザー', () => {
 			iconUrl: roleBadge.iconUrl,
 			displayOrder: roleBadge.displayOrder,
 		}]);
-		assert.deepStrictEqual(response.roles, []); // バッヂだからといってrolesが取れるとは限らない
+		assert.deepStrictEqual(response.roles, [{
+			id: roleBadge.id,
+			name: roleBadge.name,
+			color: roleBadge.color,
+			iconUrl: roleBadge.iconUrl,
+			description: roleBadge.description,
+			isModerator: roleBadge.isModerator,
+			isAdministrator: roleBadge.isAdministrator,
+			displayOrder: roleBadge.displayOrder,
+		}]);
 	});
 	test('をID指定のリスト形式で取得することができる（空）', async () => {
 		const parameters = { userIds: [] };

From 7afa593d114335368d9031b6e1d5b1edbc4ea9c9 Mon Sep 17 00:00:00 2001
From: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
Date: Sun, 14 Jul 2024 09:31:05 +0900
Subject: [PATCH 043/221] =?UTF-8?q?Feat:=20=E3=83=A6=E3=83=BC=E3=82=B6?=
 =?UTF-8?q?=E3=83=BC=E3=81=AE=E3=82=A2=E3=82=A4=E3=82=B3=E3=83=B3/?=
 =?UTF-8?q?=E3=83=90=E3=83=8A=E3=83=BC=E3=81=AE=E5=A4=89=E6=9B=B4=E5=8F=AF?=
 =?UTF-8?q?=E5=90=A6=E3=82=92=E3=83=AD=E3=83=BC=E3=83=AB=E3=81=A7=E8=A8=AD?=
 =?UTF-8?q?=E5=AE=9A=E5=8F=AF=E8=83=BD=E3=81=AB=20(#14078)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: implement role policy "canUpdateBioMedia"

* docs(changelog): update changelog

* docs(changelog): update changelog

* chore: regenerate misskey-js type definitions

* chore: Apply suggestion from code review

Co-authored-by: anatawa12 <anatawa12@icloud.com>

* chore: fix unnecessarily strict inequality check

* chore: policies should be gotten only once

---------

Co-authored-by: anatawa12 <anatawa12@icloud.com>
---
 CHANGELOG.md                                  |  2 ++
 locales/index.d.ts                            |  4 ++++
 locales/ja-JP.yml                             |  1 +
 packages/backend/src/core/RoleService.ts      |  3 +++
 .../activitypub/models/ApPersonService.ts     |  8 +++++++
 .../backend/src/models/json-schema/role.ts    |  4 ++++
 .../src/server/api/endpoints/i/update.ts      | 23 ++++++++++++++-----
 packages/frontend/src/const.ts                |  1 +
 .../frontend/src/pages/admin/roles.editor.vue | 20 ++++++++++++++++
 packages/frontend/src/pages/admin/roles.vue   |  8 +++++++
 packages/misskey-js/src/autogen/types.ts      |  1 +
 11 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd2a9e32e5..bcc2aa29c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
 
 ### General
 - Feat: 通報を受けた際、または解決した際に、予め登録した宛先に通知を飛ばせるように(mail or webhook) #13705
+- Feat: ユーザーのアイコン/バナーの変更可否をロールで設定可能に
+  - 変更不可となっていても、設定済みのものを解除してデフォルト画像に戻すことは出来ます
 - Fix: 配信停止したインスタンス一覧が見れなくなる問題を修正
 - Fix: Dockerコンテナの立ち上げ時に`pnpm`のインストールで固まることがある問題
 - Fix: デフォルトテーマに無効なテーマコードを入力するとUIが使用できなくなる問題を修正
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 5089f7802e..c2f8e944dd 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -6594,6 +6594,10 @@ export interface Locale extends ILocale {
              * ファイルにNSFWを常に付与
              */
             "alwaysMarkNsfw": string;
+            /**
+             * アイコンとバナーの更新を許可
+             */
+            "canUpdateBioMedia": string;
             /**
              * ノートのピン留めの最大数
              */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index a03d792140..8d117e6dc8 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1705,6 +1705,7 @@ _role:
     canManageAvatarDecorations: "アバターデコレーションの管理"
     driveCapacity: "ドライブ容量"
     alwaysMarkNsfw: "ファイルにNSFWを常に付与"
+    canUpdateBioMedia: "アイコンとバナーの更新を許可"
     pinMax: "ノートのピン留めの最大数"
     antennaMax: "アンテナの作成可能数"
     wordMuteMax: "ワードミュートの最大文字数"
diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts
index e2ebecb99f..94026fd503 100644
--- a/packages/backend/src/core/RoleService.ts
+++ b/packages/backend/src/core/RoleService.ts
@@ -47,6 +47,7 @@ export type RolePolicies = {
 	canHideAds: boolean;
 	driveCapacityMb: number;
 	alwaysMarkNsfw: boolean;
+	canUpdateBioMedia: boolean;
 	pinLimit: number;
 	antennaLimit: number;
 	wordMuteLimit: number;
@@ -75,6 +76,7 @@ export const DEFAULT_POLICIES: RolePolicies = {
 	canHideAds: false,
 	driveCapacityMb: 100,
 	alwaysMarkNsfw: false,
+	canUpdateBioMedia: true,
 	pinLimit: 5,
 	antennaLimit: 5,
 	wordMuteLimit: 200,
@@ -376,6 +378,7 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 			canHideAds: calc('canHideAds', vs => vs.some(v => v === true)),
 			driveCapacityMb: calc('driveCapacityMb', vs => Math.max(...vs)),
 			alwaysMarkNsfw: calc('alwaysMarkNsfw', vs => vs.some(v => v === true)),
+			canUpdateBioMedia: calc('canUpdateBioMedia', vs => vs.some(v => v === true)),
 			pinLimit: calc('pinLimit', vs => Math.max(...vs)),
 			antennaLimit: calc('antennaLimit', vs => Math.max(...vs)),
 			wordMuteLimit: calc('wordMuteLimit', vs => Math.max(...vs)),
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 398c8695d2..457205e023 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -34,6 +34,7 @@ import { StatusError } from '@/misc/status-error.js';
 import type { UtilityService } from '@/core/UtilityService.js';
 import type { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
+import { RoleService } from '@/core/RoleService.js';
 import { MetaService } from '@/core/MetaService.js';
 import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
 import type { AccountMoveService } from '@/core/AccountMoveService.js';
@@ -100,6 +101,8 @@ export class ApPersonService implements OnModuleInit {
 
 		@Inject(DI.followingsRepository)
 		private followingsRepository: FollowingsRepository,
+
+		private roleService: RoleService,
 	) {
 	}
 
@@ -238,6 +241,11 @@ export class ApPersonService implements OnModuleInit {
 			return this.apImageService.resolveImage(user, img).catch(() => null);
 		}));
 
+		if (((avatar != null && avatar.id != null) || (banner != null && banner.id != null))
+				&& !(await this.roleService.getUserPolicies(user.id)).canUpdateBioMedia) {
+			return {};
+		}
+
 		/*
 			we don't want to return nulls on errors! if the database fields
 			are already null, nothing changes; if the database has old
diff --git a/packages/backend/src/models/json-schema/role.ts b/packages/backend/src/models/json-schema/role.ts
index d9987a70c3..7366f05356 100644
--- a/packages/backend/src/models/json-schema/role.ts
+++ b/packages/backend/src/models/json-schema/role.ts
@@ -228,6 +228,10 @@ export const packedRolePoliciesSchema = {
 			type: 'boolean',
 			optional: false, nullable: false,
 		},
+		canUpdateBioMedia: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
 		pinLimit: {
 			type: 'integer',
 			optional: false, nullable: false,
diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index b39b52bc41..a1e2fa5e4c 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -25,7 +25,7 @@ import { UserFollowingService } from '@/core/UserFollowingService.js';
 import { AccountUpdateService } from '@/core/AccountUpdateService.js';
 import { HashtagService } from '@/core/HashtagService.js';
 import { DI } from '@/di-symbols.js';
-import { RoleService } from '@/core/RoleService.js';
+import { RolePolicies, RoleService } from '@/core/RoleService.js';
 import { CacheService } from '@/core/CacheService.js';
 import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js';
 import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
@@ -256,6 +256,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const profileUpdates = {} as Partial<MiUserProfile>;
 
 			const profile = await this.userProfilesRepository.findOneByOrFail({ userId: user.id });
+			let policies: RolePolicies | null = null;
 
 			if (ps.name !== undefined) {
 				if (ps.name === null) {
@@ -296,14 +297,16 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}
 
 			if (ps.mutedWords !== undefined) {
-				checkMuteWordCount(ps.mutedWords, (await this.roleService.getUserPolicies(user.id)).wordMuteLimit);
+				policies ??= await this.roleService.getUserPolicies(user.id);
+				checkMuteWordCount(ps.mutedWords, policies.wordMuteLimit);
 				validateMuteWordRegex(ps.mutedWords);
 
 				profileUpdates.mutedWords = ps.mutedWords;
 				profileUpdates.enableWordMute = ps.mutedWords.length > 0;
 			}
 			if (ps.hardMutedWords !== undefined) {
-				checkMuteWordCount(ps.hardMutedWords, (await this.roleService.getUserPolicies(user.id)).wordMuteLimit);
+				policies ??= await this.roleService.getUserPolicies(user.id);
+				checkMuteWordCount(ps.hardMutedWords, policies.wordMuteLimit);
 				validateMuteWordRegex(ps.hardMutedWords);
 				profileUpdates.hardMutedWords = ps.hardMutedWords;
 			}
@@ -322,13 +325,17 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			if (typeof ps.injectFeaturedNote === 'boolean') profileUpdates.injectFeaturedNote = ps.injectFeaturedNote;
 			if (typeof ps.receiveAnnouncementEmail === 'boolean') profileUpdates.receiveAnnouncementEmail = ps.receiveAnnouncementEmail;
 			if (typeof ps.alwaysMarkNsfw === 'boolean') {
-				if ((await roleService.getUserPolicies(user.id)).alwaysMarkNsfw) throw new ApiError(meta.errors.restrictedByRole);
+				policies ??= await this.roleService.getUserPolicies(user.id);
+				if (policies.alwaysMarkNsfw) throw new ApiError(meta.errors.restrictedByRole);
 				profileUpdates.alwaysMarkNsfw = ps.alwaysMarkNsfw;
 			}
 			if (typeof ps.autoSensitive === 'boolean') profileUpdates.autoSensitive = ps.autoSensitive;
 			if (ps.emailNotificationTypes !== undefined) profileUpdates.emailNotificationTypes = ps.emailNotificationTypes;
 
 			if (ps.avatarId) {
+				policies ??= await this.roleService.getUserPolicies(user.id);
+				if (!policies.canUpdateBioMedia) throw new ApiError(meta.errors.restrictedByRole);
+
 				const avatar = await this.driveFilesRepository.findOneBy({ id: ps.avatarId });
 
 				if (avatar == null || avatar.userId !== user.id) throw new ApiError(meta.errors.noSuchAvatar);
@@ -344,6 +351,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}
 
 			if (ps.bannerId) {
+				policies ??= await this.roleService.getUserPolicies(user.id);
+				if (!policies.canUpdateBioMedia) throw new ApiError(meta.errors.restrictedByRole);
+
 				const banner = await this.driveFilesRepository.findOneBy({ id: ps.bannerId });
 
 				if (banner == null || banner.userId !== user.id) throw new ApiError(meta.errors.noSuchBanner);
@@ -359,14 +369,15 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}
 
 			if (ps.avatarDecorations) {
+				policies ??= await this.roleService.getUserPolicies(user.id);
 				const decorations = await this.avatarDecorationService.getAll(true);
-				const [myRoles, myPolicies] = await Promise.all([this.roleService.getUserRoles(user.id), this.roleService.getUserPolicies(user.id)]);
+				const myRoles = await this.roleService.getUserRoles(user.id);
 				const allRoles = await this.roleService.getRoles();
 				const decorationIds = decorations
 					.filter(d => d.roleIdsThatCanBeUsedThisDecoration.filter(roleId => allRoles.some(r => r.id === roleId)).length === 0 || myRoles.some(r => d.roleIdsThatCanBeUsedThisDecoration.includes(r.id)))
 					.map(d => d.id);
 
-				if (ps.avatarDecorations.length > myPolicies.avatarDecorationLimit) throw new ApiError(meta.errors.restrictedByRole);
+				if (ps.avatarDecorations.length > policies.avatarDecorationLimit) throw new ApiError(meta.errors.restrictedByRole);
 
 				updates.avatarDecorations = ps.avatarDecorations.filter(d => decorationIds.includes(d.id)).map(d => ({
 					id: d.id,
diff --git a/packages/frontend/src/const.ts b/packages/frontend/src/const.ts
index 9e41926a97..e135bc69a0 100644
--- a/packages/frontend/src/const.ts
+++ b/packages/frontend/src/const.ts
@@ -87,6 +87,7 @@ export const ROLE_POLICIES = [
 	'canHideAds',
 	'driveCapacityMb',
 	'alwaysMarkNsfw',
+	'canUpdateBioMedia',
 	'pinLimit',
 	'antennaLimit',
 	'wordMuteLimit',
diff --git a/packages/frontend/src/pages/admin/roles.editor.vue b/packages/frontend/src/pages/admin/roles.editor.vue
index eb8a59b34f..3e948abdf1 100644
--- a/packages/frontend/src/pages/admin/roles.editor.vue
+++ b/packages/frontend/src/pages/admin/roles.editor.vue
@@ -378,6 +378,26 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</div>
 			</MkFolder>
 
+			<MkFolder v-if="matchQuery([i18n.ts._role._options.canUpdateBioMedia, 'canUpdateBioMedia'])">
+				<template #label>{{ i18n.ts._role._options.canUpdateBioMedia }}</template>
+				<template #suffix>
+					<span v-if="role.policies.canUpdateBioMedia.useDefault" :class="$style.useDefaultLabel">{{ i18n.ts._role.useBaseValue }}</span>
+					<span v-else>{{ role.policies.canUpdateBioMedia.value ? i18n.ts.yes : i18n.ts.no }}</span>
+					<span :class="$style.priorityIndicator"><i :class="getPriorityIcon(role.policies.canUpdateBioMedia)"></i></span>
+				</template>
+				<div class="_gaps">
+					<MkSwitch v-model="role.policies.canUpdateBioMedia.useDefault" :readonly="readonly">
+						<template #label>{{ i18n.ts._role.useBaseValue }}</template>
+					</MkSwitch>
+					<MkSwitch v-model="role.policies.canUpdateBioMedia.value" :disabled="role.policies.canUpdateBioMedia.useDefault" :readonly="readonly">
+						<template #label>{{ i18n.ts.enable }}</template>
+					</MkSwitch>
+					<MkRange v-model="role.policies.canUpdateBioMedia.priority" :min="0" :max="2" :step="1" easing :textConverter="(v) => v === 0 ? i18n.ts._role._priority.low : v === 1 ? i18n.ts._role._priority.middle : v === 2 ? i18n.ts._role._priority.high : ''">
+						<template #label>{{ i18n.ts._role.priority }}</template>
+					</MkRange>
+				</div>
+			</MkFolder>
+
 			<MkFolder v-if="matchQuery([i18n.ts._role._options.pinMax, 'pinLimit'])">
 				<template #label>{{ i18n.ts._role._options.pinMax }}</template>
 				<template #suffix>
diff --git a/packages/frontend/src/pages/admin/roles.vue b/packages/frontend/src/pages/admin/roles.vue
index 50323e3de5..6fb950494b 100644
--- a/packages/frontend/src/pages/admin/roles.vue
+++ b/packages/frontend/src/pages/admin/roles.vue
@@ -134,6 +134,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 							</MkSwitch>
 						</MkFolder>
 
+						<MkFolder v-if="matchQuery([i18n.ts._role._options.canUpdateBioMedia, 'canUpdateBioMedia'])">
+							<template #label>{{ i18n.ts._role._options.canUpdateBioMedia }}</template>
+							<template #suffix>{{ policies.canUpdateBioMedia ? i18n.ts.yes : i18n.ts.no }}</template>
+							<MkSwitch v-model="policies.canUpdateBioMedia">
+								<template #label>{{ i18n.ts.enable }}</template>
+							</MkSwitch>
+						</MkFolder>
+
 						<MkFolder v-if="matchQuery([i18n.ts._role._options.pinMax, 'pinLimit'])">
 							<template #label>{{ i18n.ts._role._options.pinMax }}</template>
 							<template #suffix>{{ policies.pinLimit }}</template>
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index ff731a2fa6..d3c857219b 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4786,6 +4786,7 @@ export type components = {
       canHideAds: boolean;
       driveCapacityMb: number;
       alwaysMarkNsfw: boolean;
+      canUpdateBioMedia: boolean;
       pinLimit: number;
       antennaLimit: number;
       wordMuteLimit: number;

From 31e82fc29a335ffc55e57ac89713a4d00de1fe93 Mon Sep 17 00:00:00 2001
From: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>
Date: Sun, 14 Jul 2024 09:33:16 +0900
Subject: [PATCH 044/221] test(backend): kill many `any` in backend test
 (partial) (#14054)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* kill any on utils:api

* kill any on timeline test

* use optional chain to kill TS2532 on timeline test
変更前: 該当ノートが見つからなければundefinedに対するプロパティアクセスとしてテストがクラッシュ
変更後: 該当ノートが見つからなければoptional chainがundefinedとして評価されるが、strictEqualの右辺がnon-nullableなためアサーションに失敗しテストがクラッシュ

* kill `as any` for ApMfmService

* kill argument any for api-visibility

* kill argument any across a few tests

* do not return value that has yielded from `await`-ing `Promise<void>`

* force cast

* runtime non-null assertion to coerce

* rewrite `assert.notEqual(expr, null)` to `assert.ok(expr)`
こうすることでassertion type扱いになり、non-nullableになる

* change return type of `failedApiCall` to `void`
戻り値がどこにも使われていない

* split bindings for exports.ts
型が合わなくて文句を言ってくるので適切に分割

* runtime non-null assertion

* runtime non-null assertion

* 何故かうまく行かないので、とりあえずXORしてみる

* Revert "何故かうまく行かないので、とりあえずXORしてみる"

This reverts commit 48cf32c930924840d0892af92d71b9437acb5844.

* castAsErrorで安全ではないキャストを隠蔽

* 型アサーションの追加

* 型アサーションの追加

* 型アサーションの追加

* voidで値を返さない

* castAsError

* assert.ok => kill nullability

* もはや明示的な型の指定は必要ない

* castAsError

* castAsError

* 型アサーションの追加

* nullableを一旦抑止

* 変数を分離して型エラーを排除

* 不要なプロパティを削除する処理を隠蔽してanyを排除

* Repository type

* simple type

* assert.ok => kill nullability

* revert `as any` drop
reverts fe95c05b3f53266108128680d9358a3796844232 partialy

* test: fix invalid assertion
partially revert b99b7b5392d9d20c81dfee1346ba8b33ff9e1fbb

* test: 52d8a54fc72b886fecb30a736b3ccf5057ea2a0c により型が合うようになった部分の`as any`を除去

* format

* test: apply https://github.com/misskey-dev/misskey/pull/14054#discussion_r1672369526 (part 1)

* test: use non-null assertion to suppress too many error

* Update packages/backend/test/utils.ts

Co-authored-by: anatawa12 <anatawa12@icloud.com>

---------

Co-authored-by: anatawa12 <anatawa12@icloud.com>
---
 .../src/core/activitypub/ApMfmService.ts      |   2 +-
 packages/backend/test/e2e/2fa.ts              |  30 +-
 packages/backend/test/e2e/api-visibility.ts   |  16 +-
 packages/backend/test/e2e/block.ts            |  12 +-
 packages/backend/test/e2e/clips.ts            |  12 +-
 packages/backend/test/e2e/endpoints.ts        |  17 +-
 packages/backend/test/e2e/exports.ts          |  70 ++---
 packages/backend/test/e2e/move.ts             |  68 +++--
 packages/backend/test/e2e/mute.ts             |  72 ++---
 packages/backend/test/e2e/note.ts             |  75 +++--
 packages/backend/test/e2e/renote-mute.ts      |  16 +-
 packages/backend/test/e2e/thread-mute.ts      |  10 +-
 packages/backend/test/e2e/timelines.ts        | 266 +++++++++---------
 packages/backend/test/unit/ApMfmService.ts    |   8 +-
 packages/backend/test/unit/FileInfoService.ts | 101 ++-----
 packages/backend/test/utils.ts                |  32 ++-
 16 files changed, 403 insertions(+), 404 deletions(-)

diff --git a/packages/backend/src/core/activitypub/ApMfmService.ts b/packages/backend/src/core/activitypub/ApMfmService.ts
index ab75b9abbd..4036d2794a 100644
--- a/packages/backend/src/core/activitypub/ApMfmService.ts
+++ b/packages/backend/src/core/activitypub/ApMfmService.ts
@@ -25,7 +25,7 @@ export class ApMfmService {
 	}
 
 	@bindThis
-	public getNoteHtml(note: MiNote, apAppend?: string) {
+	public getNoteHtml(note: Pick<MiNote, 'text' | 'mentionedRemoteUsers'>, apAppend?: string) {
 		let noMisskeyContent = false;
 		const srcMfm = (note.text ?? '') + (apAppend ?? '');
 
diff --git a/packages/backend/test/e2e/2fa.ts b/packages/backend/test/e2e/2fa.ts
index 13c56b88a6..06548fa7da 100644
--- a/packages/backend/test/e2e/2fa.ts
+++ b/packages/backend/test/e2e/2fa.ts
@@ -206,7 +206,7 @@ describe('2要素認証', () => {
 			username,
 		}, alice);
 		assert.strictEqual(usersShowResponse.status, 200);
-		assert.strictEqual(usersShowResponse.body.twoFactorEnabled, true);
+		assert.strictEqual((usersShowResponse.body as unknown as { twoFactorEnabled: boolean }).twoFactorEnabled, true);
 
 		const signinResponse = await api('signin', {
 			...signinParam(),
@@ -248,7 +248,7 @@ describe('2要素認証', () => {
 			keyName,
 			credentialId,
 			creationOptions: registerKeyResponse.body,
-		}) as any, alice);
+		} as any) as any, alice);
 		assert.strictEqual(keyDoneResponse.status, 200);
 		assert.strictEqual(keyDoneResponse.body.id, credentialId.toString('base64url'));
 		assert.strictEqual(keyDoneResponse.body.name, keyName);
@@ -257,22 +257,22 @@ describe('2要素認証', () => {
 			username,
 		});
 		assert.strictEqual(usersShowResponse.status, 200);
-		assert.strictEqual(usersShowResponse.body.securityKeys, true);
+		assert.strictEqual((usersShowResponse.body as unknown as { securityKeys: boolean }).securityKeys, true);
 
 		const signinResponse = await api('signin', {
 			...signinParam(),
 		});
 		assert.strictEqual(signinResponse.status, 200);
 		assert.strictEqual(signinResponse.body.i, undefined);
-		assert.notEqual(signinResponse.body.challenge, undefined);
-		assert.notEqual(signinResponse.body.allowCredentials, undefined);
-		assert.strictEqual(signinResponse.body.allowCredentials[0].id, credentialId.toString('base64url'));
+		assert.notEqual((signinResponse.body as unknown as { challenge: unknown | undefined }).challenge, undefined);
+		assert.notEqual((signinResponse.body as unknown as { allowCredentials: unknown | undefined }).allowCredentials, undefined);
+		assert.strictEqual((signinResponse.body as unknown as { allowCredentials: {id: string}[] }).allowCredentials[0].id, credentialId.toString('base64url'));
 
 		const signinResponse2 = await api('signin', signinWithSecurityKeyParam({
 			keyName,
 			credentialId,
 			requestOptions: signinResponse.body,
-		}));
+		} as any));
 		assert.strictEqual(signinResponse2.status, 200);
 		assert.notEqual(signinResponse2.body.i, undefined);
 
@@ -307,7 +307,7 @@ describe('2要素認証', () => {
 			keyName,
 			credentialId,
 			creationOptions: registerKeyResponse.body,
-		}) as any, alice);
+		} as any) as any, alice);
 		assert.strictEqual(keyDoneResponse.status, 200);
 
 		const passwordLessResponse = await api('i/2fa/password-less', {
@@ -319,7 +319,7 @@ describe('2要素認証', () => {
 			username,
 		});
 		assert.strictEqual(usersShowResponse.status, 200);
-		assert.strictEqual(usersShowResponse.body.usePasswordLessLogin, true);
+		assert.strictEqual((usersShowResponse.body as unknown as { usePasswordLessLogin: boolean }).usePasswordLessLogin, true);
 
 		const signinResponse = await api('signin', {
 			...signinParam(),
@@ -333,7 +333,7 @@ describe('2要素認証', () => {
 				keyName,
 				credentialId,
 				requestOptions: signinResponse.body,
-			}),
+			} as any),
 			password: '',
 		});
 		assert.strictEqual(signinResponse2.status, 200);
@@ -370,7 +370,7 @@ describe('2要素認証', () => {
 			keyName,
 			credentialId,
 			creationOptions: registerKeyResponse.body,
-		}) as any, alice);
+		} as any) as any, alice);
 		assert.strictEqual(keyDoneResponse.status, 200);
 
 		const renamedKey = 'other-key';
@@ -383,6 +383,7 @@ describe('2要素認証', () => {
 		const iResponse = await api('i', {
 		}, alice);
 		assert.strictEqual(iResponse.status, 200);
+		assert.ok(iResponse.body.securityKeysList);
 		const securityKeys = iResponse.body.securityKeysList.filter((s: { id: string; }) => s.id === credentialId.toString('base64url'));
 		assert.strictEqual(securityKeys.length, 1);
 		assert.strictEqual(securityKeys[0].name, renamedKey);
@@ -419,13 +420,14 @@ describe('2要素認証', () => {
 			keyName,
 			credentialId,
 			creationOptions: registerKeyResponse.body,
-		}) as any, alice);
+		} as any) as any, alice);
 		assert.strictEqual(keyDoneResponse.status, 200);
 
 		// テストの実行順によっては複数残ってるので全部消す
 		const iResponse = await api('i', {
 		}, alice);
 		assert.strictEqual(iResponse.status, 200);
+		assert.ok(iResponse.body.securityKeysList);
 		for (const key of iResponse.body.securityKeysList) {
 			const removeKeyResponse = await api('i/2fa/remove-key', {
 				token: otpToken(registerResponse.body.secret),
@@ -439,7 +441,7 @@ describe('2要素認証', () => {
 			username,
 		});
 		assert.strictEqual(usersShowResponse.status, 200);
-		assert.strictEqual(usersShowResponse.body.securityKeys, false);
+		assert.strictEqual((usersShowResponse.body as unknown as { securityKeys: boolean }).securityKeys, false);
 
 		const signinResponse = await api('signin', {
 			...signinParam(),
@@ -470,7 +472,7 @@ describe('2要素認証', () => {
 			username,
 		});
 		assert.strictEqual(usersShowResponse.status, 200);
-		assert.strictEqual(usersShowResponse.body.twoFactorEnabled, true);
+		assert.strictEqual((usersShowResponse.body as unknown as { twoFactorEnabled: boolean }).twoFactorEnabled, true);
 
 		const unregisterResponse = await api('i/2fa/unregister', {
 			token: otpToken(registerResponse.body.secret),
diff --git a/packages/backend/test/e2e/api-visibility.ts b/packages/backend/test/e2e/api-visibility.ts
index c61b0c2a86..2dd645d97a 100644
--- a/packages/backend/test/e2e/api-visibility.ts
+++ b/packages/backend/test/e2e/api-visibility.ts
@@ -410,21 +410,21 @@ describe('API visibility', () => {
 		test('[HTL] public-post が 自分が見れる', async () => {
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 			assert.strictEqual(res.status, 200);
-			const notes = res.body.filter((n: any) => n.id === pub.id);
+			const notes = res.body.filter(n => n.id === pub.id);
 			assert.strictEqual(notes[0].text, 'x');
 		});
 
 		test('[HTL] public-post が 非フォロワーから見れない', async () => {
 			const res = await api('notes/timeline', { limit: 100 }, other);
 			assert.strictEqual(res.status, 200);
-			const notes = res.body.filter((n: any) => n.id === pub.id);
+			const notes = res.body.filter(n => n.id === pub.id);
 			assert.strictEqual(notes.length, 0);
 		});
 
 		test('[HTL] followers-post が フォロワーから見れる', async () => {
 			const res = await api('notes/timeline', { limit: 100 }, follower);
 			assert.strictEqual(res.status, 200);
-			const notes = res.body.filter((n: any) => n.id === fol.id);
+			const notes = res.body.filter(n => n.id === fol.id);
 			assert.strictEqual(notes[0].text, 'x');
 		});
 		//#endregion
@@ -433,21 +433,21 @@ describe('API visibility', () => {
 		test('[replies] followers-reply が フォロワーから見れる', async () => {
 			const res = await api('notes/replies', { noteId: tgt.id, limit: 100 }, follower);
 			assert.strictEqual(res.status, 200);
-			const notes = res.body.filter((n: any) => n.id === folR.id);
+			const notes = res.body.filter(n => n.id === folR.id);
 			assert.strictEqual(notes[0].text, 'x');
 		});
 
 		test('[replies] followers-reply が 非フォロワー (リプライ先ではない) から見れない', async () => {
 			const res = await api('notes/replies', { noteId: tgt.id, limit: 100 }, other);
 			assert.strictEqual(res.status, 200);
-			const notes = res.body.filter((n: any) => n.id === folR.id);
+			const notes = res.body.filter(n => n.id === folR.id);
 			assert.strictEqual(notes.length, 0);
 		});
 
 		test('[replies] followers-reply が 非フォロワー (リプライ先である) から見れる', async () => {
 			const res = await api('notes/replies', { noteId: tgt.id, limit: 100 }, target);
 			assert.strictEqual(res.status, 200);
-			const notes = res.body.filter((n: any) => n.id === folR.id);
+			const notes = res.body.filter(n => n.id === folR.id);
 			assert.strictEqual(notes[0].text, 'x');
 		});
 		//#endregion
@@ -456,14 +456,14 @@ describe('API visibility', () => {
 		test('[mentions] followers-reply が 非フォロワー (リプライ先である) から見れる', async () => {
 			const res = await api('notes/mentions', { limit: 100 }, target);
 			assert.strictEqual(res.status, 200);
-			const notes = res.body.filter((n: any) => n.id === folR.id);
+			const notes = res.body.filter(n => n.id === folR.id);
 			assert.strictEqual(notes[0].text, 'x');
 		});
 
 		test('[mentions] followers-mention が 非フォロワー (メンション先である) から見れる', async () => {
 			const res = await api('notes/mentions', { limit: 100 }, target);
 			assert.strictEqual(res.status, 200);
-			const notes = res.body.filter((n: any) => n.id === folM.id);
+			const notes = res.body.filter(n => n.id === folM.id);
 			assert.strictEqual(notes[0].text, '@target x');
 		});
 		//#endregion
diff --git a/packages/backend/test/e2e/block.ts b/packages/backend/test/e2e/block.ts
index e4f798498f..35b0e59383 100644
--- a/packages/backend/test/e2e/block.ts
+++ b/packages/backend/test/e2e/block.ts
@@ -6,7 +6,7 @@
 process.env.NODE_ENV = 'test';
 
 import * as assert from 'assert';
-import { api, post, signup } from '../utils.js';
+import { api, castAsError, post, signup } from '../utils.js';
 import type * as misskey from 'misskey-js';
 
 describe('Block', () => {
@@ -33,7 +33,7 @@ describe('Block', () => {
 		const res = await api('following/create', { userId: alice.id }, bob);
 
 		assert.strictEqual(res.status, 400);
-		assert.strictEqual(res.body.error.id, 'c4ab57cc-4e41-45e9-bfd9-584f61e35ce0');
+		assert.strictEqual(castAsError(res.body).error.id, 'c4ab57cc-4e41-45e9-bfd9-584f61e35ce0');
 	});
 
 	test('ブロックされているユーザーにリアクションできない', async () => {
@@ -42,7 +42,8 @@ describe('Block', () => {
 		const res = await api('notes/reactions/create', { noteId: note.id, reaction: '👍' }, bob);
 
 		assert.strictEqual(res.status, 400);
-		assert.strictEqual(res.body.error.id, '20ef5475-9f38-4e4c-bd33-de6d979498ec');
+		assert.ok(res.body);
+		assert.strictEqual(castAsError(res.body).error.id, '20ef5475-9f38-4e4c-bd33-de6d979498ec');
 	});
 
 	test('ブロックされているユーザーに返信できない', async () => {
@@ -51,7 +52,8 @@ describe('Block', () => {
 		const res = await api('notes/create', { replyId: note.id, text: 'yo' }, bob);
 
 		assert.strictEqual(res.status, 400);
-		assert.strictEqual(res.body.error.id, 'b390d7e1-8a5e-46ed-b625-06271cafd3d3');
+		assert.ok(res.body);
+		assert.strictEqual(castAsError(res.body).error.id, 'b390d7e1-8a5e-46ed-b625-06271cafd3d3');
 	});
 
 	test('ブロックされているユーザーのノートをRenoteできない', async () => {
@@ -60,7 +62,7 @@ describe('Block', () => {
 		const res = await api('notes/create', { renoteId: note.id, text: 'yo' }, bob);
 
 		assert.strictEqual(res.status, 400);
-		assert.strictEqual(res.body.error.id, 'b390d7e1-8a5e-46ed-b625-06271cafd3d3');
+		assert.strictEqual(castAsError(res.body).error.id, 'b390d7e1-8a5e-46ed-b625-06271cafd3d3');
 	});
 
 	// TODO: ユーザーリストに入れられないテスト
diff --git a/packages/backend/test/e2e/clips.ts b/packages/backend/test/e2e/clips.ts
index a229ec06f9..a130c3698d 100644
--- a/packages/backend/test/e2e/clips.ts
+++ b/packages/backend/test/e2e/clips.ts
@@ -79,14 +79,14 @@ describe('クリップ', () => {
 	};
 
 	const deleteClip = async (parameters: Misskey.entities.ClipsDeleteRequest, request: Partial<ApiRequest<'clips/delete'>> = {}): Promise<void> => {
-		return await successfulApiCall({
+		await successfulApiCall({
 			endpoint: 'clips/delete',
 			parameters,
 			user: alice,
 			...request,
 		}, {
 			status: 204,
-		}) as any as void;
+		});
 	};
 
 	const show = async (parameters: Misskey.entities.ClipsShowRequest, request: Partial<ApiRequest<'clips/show'>> = {}): Promise<Misskey.entities.Clip> => {
@@ -454,25 +454,25 @@ describe('クリップ', () => {
 		let aliceClip: Misskey.entities.Clip;
 
 		const favorite = async (parameters: Misskey.entities.ClipsFavoriteRequest, request: Partial<ApiRequest<'clips/favorite'>> = {}): Promise<void> => {
-			return successfulApiCall({
+			await successfulApiCall({
 				endpoint: 'clips/favorite',
 				parameters,
 				user: alice,
 				...request,
 			}, {
 				status: 204,
-			}) as any as void;
+			});
 		};
 
 		const unfavorite = async (parameters: Misskey.entities.ClipsUnfavoriteRequest, request: Partial<ApiRequest<'clips/unfavorite'>> = {}): Promise<void> => {
-			return successfulApiCall({
+			await successfulApiCall({
 				endpoint: 'clips/unfavorite',
 				parameters,
 				user: alice,
 				...request,
 			}, {
 				status: 204,
-			}) as any as void;
+			});
 		};
 
 		const myFavorites = async (request: Partial<ApiRequest<'clips/my-favorites'>> = {}): Promise<Misskey.entities.Clip[]> => {
diff --git a/packages/backend/test/e2e/endpoints.ts b/packages/backend/test/e2e/endpoints.ts
index 2b2699ecd9..5aaec7f6f9 100644
--- a/packages/backend/test/e2e/endpoints.ts
+++ b/packages/backend/test/e2e/endpoints.ts
@@ -10,7 +10,7 @@ import * as assert from 'assert';
 // https://github.com/node-fetch/node-fetch/pull/1664
 import { Blob } from 'node-fetch';
 import { MiUser } from '@/models/_.js';
-import { api, initTestDb, post, signup, simpleGet, uploadFile } from '../utils.js';
+import { api, castAsError, initTestDb, post, signup, simpleGet, uploadFile } from '../utils.js';
 import type * as misskey from 'misskey-js';
 
 describe('Endpoints', () => {
@@ -164,7 +164,7 @@ describe('Endpoints', () => {
 
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
-			assert.strictEqual(res.body.id, alice.id);
+			assert.strictEqual((res.body as unknown as { id: string }).id, alice.id);
 		});
 
 		test('ユーザーが存在しなかったら怒る', async () => {
@@ -285,7 +285,8 @@ describe('Endpoints', () => {
 			}, alice);
 
 			assert.strictEqual(res.status, 400);
-			assert.strictEqual(res.body.error.code, 'CANNOT_REACT_TO_RENOTE');
+			assert.ok(res.body);
+			assert.strictEqual(castAsError(res.body).error.code, 'CANNOT_REACT_TO_RENOTE');
 		});
 
 		test('引用にリアクションできる', async () => {
@@ -1063,7 +1064,7 @@ describe('Endpoints', () => {
 				userId: bob.id,
 			}, alice);
 			assert.strictEqual(res1.status, 204);
-			assert.strictEqual(res2.body?.memo, memo);
+			assert.strictEqual((res2.body as unknown as { memo: string })?.memo, memo);
 		});
 
 		test('自分に関するメモを更新できる', async () => {
@@ -1078,7 +1079,7 @@ describe('Endpoints', () => {
 				userId: alice.id,
 			}, alice);
 			assert.strictEqual(res1.status, 204);
-			assert.strictEqual(res2.body?.memo, memo);
+			assert.strictEqual((res2.body as unknown as { memo: string })?.memo, memo);
 		});
 
 		test('メモを削除できる', async () => {
@@ -1099,7 +1100,7 @@ describe('Endpoints', () => {
 			}, alice);
 
 			// memoには常に文字列かnullが入っている(5cac151)
-			assert.strictEqual(res.body.memo, null);
+			assert.strictEqual((res.body as unknown as { memo: string | null }).memo, null);
 		});
 
 		test('メモは個人ごとに独立して保存される', async () => {
@@ -1126,8 +1127,8 @@ describe('Endpoints', () => {
 				}, carol),
 			]);
 
-			assert.strictEqual(resAlice.body.memo, memoAliceToBob);
-			assert.strictEqual(resCarol.body.memo, memoCarolToBob);
+			assert.strictEqual((resAlice.body as unknown as { memo: string }).memo, memoAliceToBob);
+			assert.strictEqual((resCarol.body as unknown as { memo: string }).memo, memoCarolToBob);
 		});
 	});
 });
diff --git a/packages/backend/test/e2e/exports.ts b/packages/backend/test/e2e/exports.ts
index 80a5331a6d..4bcecc9716 100644
--- a/packages/backend/test/e2e/exports.ts
+++ b/packages/backend/test/e2e/exports.ts
@@ -61,14 +61,14 @@ describe('export-clips', () => {
 	});
 
 	test('basic export', async () => {
-		let res = await api('clips/create', {
+		const res1 = await api('clips/create', {
 			name: 'foo',
 			description: 'bar',
 		}, alice);
-		assert.strictEqual(res.status, 200);
+		assert.strictEqual(res1.status, 200);
 
-		res = await api('i/export-clips', {}, alice);
-		assert.strictEqual(res.status, 204);
+		const res2 = await api('i/export-clips', {}, alice);
+		assert.strictEqual(res2.status, 204);
 
 		const exported = await pollFirstDriveFile();
 		assert.strictEqual(exported[0].name, 'foo');
@@ -77,7 +77,7 @@ describe('export-clips', () => {
 	});
 
 	test('export with notes', async () => {
-		let res = await api('clips/create', {
+		const res = await api('clips/create', {
 			name: 'foo',
 			description: 'bar',
 		}, alice);
@@ -96,15 +96,15 @@ describe('export-clips', () => {
 		});
 
 		for (const note of [note1, note2]) {
-			res = await api('clips/add-note', {
+			const res2 = await api('clips/add-note', {
 				clipId: clip.id,
 				noteId: note.id,
 			}, alice);
-			assert.strictEqual(res.status, 204);
+			assert.strictEqual(res2.status, 204);
 		}
 
-		res = await api('i/export-clips', {}, alice);
-		assert.strictEqual(res.status, 204);
+		const res3 = await api('i/export-clips', {}, alice);
+		assert.strictEqual(res3.status, 204);
 
 		const exported = await pollFirstDriveFile();
 		assert.strictEqual(exported[0].name, 'foo');
@@ -116,19 +116,19 @@ describe('export-clips', () => {
 	});
 
 	test('multiple clips', async () => {
-		let res = await api('clips/create', {
+		const res1 = await api('clips/create', {
 			name: 'kawaii',
 			description: 'kawaii',
 		}, alice);
-		assert.strictEqual(res.status, 200);
-		const clip1 = res.body;
+		assert.strictEqual(res1.status, 200);
+		const clip1 = res1.body;
 
-		res = await api('clips/create', {
+		const res2 = await api('clips/create', {
 			name: 'yuri',
 			description: 'yuri',
 		}, alice);
-		assert.strictEqual(res.status, 200);
-		const clip2 = res.body;
+		assert.strictEqual(res2.status, 200);
+		const clip2 = res2.body;
 
 		const note1 = await post(alice, {
 			text: 'baz1',
@@ -138,20 +138,26 @@ describe('export-clips', () => {
 			text: 'baz2',
 		});
 
-		res = await api('clips/add-note', {
-			clipId: clip1.id,
-			noteId: note1.id,
-		}, alice);
-		assert.strictEqual(res.status, 204);
+		{
+			const res = await api('clips/add-note', {
+				clipId: clip1.id,
+				noteId: note1.id,
+			}, alice);
+			assert.strictEqual(res.status, 204);
+		}
 
-		res = await api('clips/add-note', {
-			clipId: clip2.id,
-			noteId: note2.id,
-		}, alice);
-		assert.strictEqual(res.status, 204);
+		{
+			const res = await api('clips/add-note', {
+				clipId: clip2.id,
+				noteId: note2.id,
+			}, alice);
+			assert.strictEqual(res.status, 204);
+		}
 
-		res = await api('i/export-clips', {}, alice);
-		assert.strictEqual(res.status, 204);
+		{
+			const res = await api('i/export-clips', {}, alice);
+			assert.strictEqual(res.status, 204);
+		}
 
 		const exported = await pollFirstDriveFile();
 		assert.strictEqual(exported[0].name, 'kawaii');
@@ -163,7 +169,7 @@ describe('export-clips', () => {
 	});
 
 	test('Clipping other user\'s note', async () => {
-		let res = await api('clips/create', {
+		const res = await api('clips/create', {
 			name: 'kawaii',
 			description: 'kawaii',
 		}, alice);
@@ -175,14 +181,14 @@ describe('export-clips', () => {
 			visibility: 'followers',
 		});
 
-		res = await api('clips/add-note', {
+		const res2 = await api('clips/add-note', {
 			clipId: clip.id,
 			noteId: note.id,
 		}, alice);
-		assert.strictEqual(res.status, 204);
+		assert.strictEqual(res2.status, 204);
 
-		res = await api('i/export-clips', {}, alice);
-		assert.strictEqual(res.status, 204);
+		const res3 = await api('i/export-clips', {}, alice);
+		assert.strictEqual(res3.status, 204);
 
 		const exported = await pollFirstDriveFile();
 		assert.strictEqual(exported[0].name, 'kawaii');
diff --git a/packages/backend/test/e2e/move.ts b/packages/backend/test/e2e/move.ts
index 35240cd3c8..fd798bdb25 100644
--- a/packages/backend/test/e2e/move.ts
+++ b/packages/backend/test/e2e/move.ts
@@ -13,14 +13,14 @@ import { loadConfig } from '@/config.js';
 import { MiRepository, MiUser, UsersRepository, miRepository } from '@/models/_.js';
 import { secureRndstr } from '@/misc/secure-rndstr.js';
 import { jobQueue } from '@/boot/common.js';
-import { api, initTestDb, signup, successfulApiCall, uploadFile } from '../utils.js';
+import { api, castAsError, initTestDb, signup, successfulApiCall, uploadFile } from '../utils.js';
 import type * as misskey from 'misskey-js';
 
 describe('Account Move', () => {
 	let jq: INestApplicationContext;
 	let url: URL;
 
-	let root: any;
+	let root: misskey.entities.SignupResponse;
 	let alice: misskey.entities.SignupResponse;
 	let bob: misskey.entities.SignupResponse;
 	let carol: misskey.entities.SignupResponse;
@@ -93,8 +93,8 @@ describe('Account Move', () => {
 			}, bob);
 
 			assert.strictEqual(res.status, 400);
-			assert.strictEqual(res.body.error.code, 'NO_SUCH_USER');
-			assert.strictEqual(res.body.error.id, 'fcd2eef9-a9b2-4c4f-8624-038099e90aa5');
+			assert.strictEqual(castAsError(res.body).error.code, 'NO_SUCH_USER');
+			assert.strictEqual(castAsError(res.body).error.id, 'fcd2eef9-a9b2-4c4f-8624-038099e90aa5');
 		});
 
 		test('Unable to add duplicated aliases to alsoKnownAs', async () => {
@@ -103,8 +103,8 @@ describe('Account Move', () => {
 			}, bob);
 
 			assert.strictEqual(res.status, 400);
-			assert.strictEqual(res.body.error.code, 'INVALID_PARAM');
-			assert.strictEqual(res.body.error.id, '3d81ceae-475f-4600-b2a8-2bc116157532');
+			assert.strictEqual(castAsError(res.body).error.code, 'INVALID_PARAM');
+			assert.strictEqual(castAsError(res.body).error.id, '3d81ceae-475f-4600-b2a8-2bc116157532');
 		});
 
 		test('Unable to add itself', async () => {
@@ -113,8 +113,8 @@ describe('Account Move', () => {
 			}, bob);
 
 			assert.strictEqual(res.status, 400);
-			assert.strictEqual(res.body.error.code, 'FORBIDDEN_TO_SET_YOURSELF');
-			assert.strictEqual(res.body.error.id, '25c90186-4ab0-49c8-9bba-a1fa6c202ba4');
+			assert.strictEqual(castAsError(res.body).error.code, 'FORBIDDEN_TO_SET_YOURSELF');
+			assert.strictEqual(castAsError(res.body).error.id, '25c90186-4ab0-49c8-9bba-a1fa6c202ba4');
 		});
 
 		test('Unable to add a nonexisting local account to alsoKnownAs', async () => {
@@ -123,16 +123,16 @@ describe('Account Move', () => {
 			}, bob);
 
 			assert.strictEqual(res1.status, 400);
-			assert.strictEqual(res1.body.error.code, 'NO_SUCH_USER');
-			assert.strictEqual(res1.body.error.id, 'fcd2eef9-a9b2-4c4f-8624-038099e90aa5');
+			assert.strictEqual(castAsError(res1.body).error.code, 'NO_SUCH_USER');
+			assert.strictEqual(castAsError(res1.body).error.id, 'fcd2eef9-a9b2-4c4f-8624-038099e90aa5');
 
 			const res2 = await api('i/update', {
 				alsoKnownAs: ['@alice', 'nonexist'],
 			}, bob);
 
 			assert.strictEqual(res2.status, 400);
-			assert.strictEqual(res2.body.error.code, 'NO_SUCH_USER');
-			assert.strictEqual(res2.body.error.id, 'fcd2eef9-a9b2-4c4f-8624-038099e90aa5');
+			assert.strictEqual(castAsError(res2.body).error.code, 'NO_SUCH_USER');
+			assert.strictEqual(castAsError(res2.body).error.id, 'fcd2eef9-a9b2-4c4f-8624-038099e90aa5');
 		});
 
 		test('Able to add two existing local account to alsoKnownAs', async () => {
@@ -241,8 +241,8 @@ describe('Account Move', () => {
 			}, root);
 
 			assert.strictEqual(res.status, 400);
-			assert.strictEqual(res.body.error.code, 'NOT_ROOT_FORBIDDEN');
-			assert.strictEqual(res.body.error.id, '4362e8dc-731f-4ad8-a694-be2a88922a24');
+			assert.strictEqual(castAsError(res.body).error.code, 'NOT_ROOT_FORBIDDEN');
+			assert.strictEqual(castAsError(res.body).error.id, '4362e8dc-731f-4ad8-a694-be2a88922a24');
 		});
 
 		test('Unable to move to a nonexisting local account', async () => {
@@ -251,8 +251,8 @@ describe('Account Move', () => {
 			}, alice);
 
 			assert.strictEqual(res.status, 400);
-			assert.strictEqual(res.body.error.code, 'NO_SUCH_USER');
-			assert.strictEqual(res.body.error.id, 'fcd2eef9-a9b2-4c4f-8624-038099e90aa5');
+			assert.strictEqual(castAsError(res.body).error.code, 'NO_SUCH_USER');
+			assert.strictEqual(castAsError(res.body).error.id, 'fcd2eef9-a9b2-4c4f-8624-038099e90aa5');
 		});
 
 		test('Unable to move if alsoKnownAs is invalid', async () => {
@@ -261,8 +261,8 @@ describe('Account Move', () => {
 			}, alice);
 
 			assert.strictEqual(res.status, 400);
-			assert.strictEqual(res.body.error.code, 'DESTINATION_ACCOUNT_FORBIDS');
-			assert.strictEqual(res.body.error.id, 'b5c90186-4ab0-49c8-9bba-a1f766282ba4');
+			assert.strictEqual(castAsError(res.body).error.code, 'DESTINATION_ACCOUNT_FORBIDS');
+			assert.strictEqual(castAsError(res.body).error.id, 'b5c90186-4ab0-49c8-9bba-a1f766282ba4');
 		});
 
 		test('Relationships have been properly migrated', async () => {
@@ -279,36 +279,44 @@ describe('Account Move', () => {
 				userId: alice.id,
 			}, alice);
 			assert.strictEqual(aliceFollowings.status, 200);
+			assert.ok(aliceFollowings);
 			assert.strictEqual(aliceFollowings.body.length, 3);
 
 			const carolFollowings = await api('users/following', {
 				userId: carol.id,
 			}, carol);
 			assert.strictEqual(carolFollowings.status, 200);
+			assert.ok(carolFollowings);
 			assert.strictEqual(carolFollowings.body.length, 2);
 			assert.strictEqual(carolFollowings.body[0].followeeId, bob.id);
 			assert.strictEqual(carolFollowings.body[1].followeeId, alice.id);
 
 			const blockings = await api('blocking/list', {}, dave);
 			assert.strictEqual(blockings.status, 200);
+			assert.ok(blockings);
 			assert.strictEqual(blockings.body.length, 2);
 			assert.strictEqual(blockings.body[0].blockeeId, bob.id);
 			assert.strictEqual(blockings.body[1].blockeeId, alice.id);
 
 			const mutings = await api('mute/list', {}, dave);
 			assert.strictEqual(mutings.status, 200);
+			assert.ok(mutings);
 			assert.strictEqual(mutings.body.length, 2);
 			assert.strictEqual(mutings.body[0].muteeId, bob.id);
 			assert.strictEqual(mutings.body[1].muteeId, alice.id);
 
 			const rootLists = await api('users/lists/list', {}, root);
 			assert.strictEqual(rootLists.status, 200);
+			assert.ok(rootLists);
+			assert.ok(rootLists.body[0].userIds);
 			assert.strictEqual(rootLists.body[0].userIds.length, 2);
 			assert.ok(rootLists.body[0].userIds.find((id: string) => id === bob.id));
 			assert.ok(rootLists.body[0].userIds.find((id: string) => id === alice.id));
 
 			const eveLists = await api('users/lists/list', {}, eve);
 			assert.strictEqual(eveLists.status, 200);
+			assert.ok(eveLists);
+			assert.ok(eveLists.body[0].userIds);
 			assert.strictEqual(eveLists.body[0].userIds.length, 1);
 			assert.ok(eveLists.body[0].userIds.find((id: string) => id === bob.id));
 		});
@@ -347,8 +355,8 @@ describe('Account Move', () => {
 			}, bob);
 
 			assert.strictEqual(res.status, 400);
-			assert.strictEqual(res.body.error.code, 'DESTINATION_ACCOUNT_FORBIDS');
-			assert.strictEqual(res.body.error.id, 'b5c90186-4ab0-49c8-9bba-a1f766282ba4');
+			assert.strictEqual(castAsError(res.body).error.code, 'DESTINATION_ACCOUNT_FORBIDS');
+			assert.strictEqual(castAsError(res.body).error.id, 'b5c90186-4ab0-49c8-9bba-a1f766282ba4');
 		});
 
 		test('Follow and follower counts are properly adjusted', async () => {
@@ -419,8 +427,9 @@ describe('Account Move', () => {
 		] as const)('Prohibit access after moving: %s', async (endpoint) => {
 			const res = await api(endpoint, {}, alice);
 			assert.strictEqual(res.status, 403);
-			assert.strictEqual(res.body.error.code, 'YOUR_ACCOUNT_MOVED');
-			assert.strictEqual(res.body.error.id, '56f20ec9-fd06-4fa5-841b-edd6d7d4fa31');
+			assert.ok(res.body);
+			assert.strictEqual(castAsError(res.body).error.code, 'YOUR_ACCOUNT_MOVED');
+			assert.strictEqual(castAsError(res.body).error.id, '56f20ec9-fd06-4fa5-841b-edd6d7d4fa31');
 		});
 
 		test('Prohibit access after moving: /antennas/update', async () => {
@@ -438,16 +447,19 @@ describe('Account Move', () => {
 			}, alice);
 
 			assert.strictEqual(res.status, 403);
-			assert.strictEqual(res.body.error.code, 'YOUR_ACCOUNT_MOVED');
-			assert.strictEqual(res.body.error.id, '56f20ec9-fd06-4fa5-841b-edd6d7d4fa31');
+			assert.ok(res.body);
+			assert.strictEqual(castAsError(res.body).error.code, 'YOUR_ACCOUNT_MOVED');
+			assert.strictEqual(castAsError(res.body).error.id, '56f20ec9-fd06-4fa5-841b-edd6d7d4fa31');
 		});
 
 		test('Prohibit access after moving: /drive/files/create', async () => {
+			// FIXME: 一旦逃げておく
 			const res = await uploadFile(alice);
 
 			assert.strictEqual(res.status, 403);
-			assert.strictEqual((res.body! as any as { error: misskey.api.APIError }).error.code, 'YOUR_ACCOUNT_MOVED');
-			assert.strictEqual((res.body! as any as { error: misskey.api.APIError }).error.id, '56f20ec9-fd06-4fa5-841b-edd6d7d4fa31');
+			assert.ok(res.body);
+			assert.strictEqual(castAsError(res.body).error.code, 'YOUR_ACCOUNT_MOVED');
+			assert.strictEqual(castAsError(res.body).error.id, '56f20ec9-fd06-4fa5-841b-edd6d7d4fa31');
 		});
 
 		test('Prohibit updating alsoKnownAs after moving', async () => {
@@ -456,8 +468,8 @@ describe('Account Move', () => {
 			}, alice);
 
 			assert.strictEqual(res.status, 403);
-			assert.strictEqual(res.body.error.code, 'YOUR_ACCOUNT_MOVED');
-			assert.strictEqual(res.body.error.id, '56f20ec9-fd06-4fa5-841b-edd6d7d4fa31');
+			assert.strictEqual(castAsError(res.body).error.code, 'YOUR_ACCOUNT_MOVED');
+			assert.strictEqual(castAsError(res.body).error.id, '56f20ec9-fd06-4fa5-841b-edd6d7d4fa31');
 		});
 	});
 });
diff --git a/packages/backend/test/e2e/mute.ts b/packages/backend/test/e2e/mute.ts
index 0e52c5decc..f37da288b7 100644
--- a/packages/backend/test/e2e/mute.ts
+++ b/packages/backend/test/e2e/mute.ts
@@ -47,8 +47,8 @@ describe('Mute', () => {
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(Array.isArray(res.body), true);
-		assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-		assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+		assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+		assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 	});
 
 	test('ミュートしているユーザーからメンションされても、hasUnreadMentions が true にならない', async () => {
@@ -92,9 +92,9 @@ describe('Mute', () => {
 
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 		});
 
 		test('タイムラインにミュートしているユーザーの投稿のRenoteが含まれない', async () => {
@@ -108,9 +108,9 @@ describe('Mute', () => {
 
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 		});
 	});
 
@@ -124,8 +124,8 @@ describe('Mute', () => {
 
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === bob.id), true);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === carol.id), false);
 		});
 
 		test('通知にミュートしているユーザーからのリプライが含まれない', async () => {
@@ -138,8 +138,8 @@ describe('Mute', () => {
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
 
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === bob.id), true);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === carol.id), false);
 		});
 
 		test('通知にミュートしているユーザーからのリプライが含まれない', async () => {
@@ -152,8 +152,8 @@ describe('Mute', () => {
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
 
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === bob.id), true);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === carol.id), false);
 		});
 
 		test('通知にミュートしているユーザーからの引用リノートが含まれない', async () => {
@@ -166,8 +166,8 @@ describe('Mute', () => {
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
 
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === bob.id), true);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === carol.id), false);
 		});
 
 		test('通知にミュートしているユーザーからのリノートが含まれない', async () => {
@@ -180,8 +180,8 @@ describe('Mute', () => {
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
 
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === bob.id), true);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === carol.id), false);
 		});
 
 		test('通知にミュートしているユーザーからのフォロー通知が含まれない', async () => {
@@ -193,8 +193,8 @@ describe('Mute', () => {
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
 
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === bob.id), true);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === carol.id), false);
 
 			await api('following/delete', { userId: alice.id }, bob);
 			await api('following/delete', { userId: alice.id }, carol);
@@ -210,8 +210,8 @@ describe('Mute', () => {
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
 
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === bob.id), true);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === carol.id), false);
 
 			await api('following/delete', { userId: alice.id }, bob);
 			await api('following/delete', { userId: alice.id }, carol);
@@ -228,8 +228,8 @@ describe('Mute', () => {
 
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === bob.id), true);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === carol.id), false);
 		});
 		test('通知にミュートしているユーザーからのリプライが含まれない', async () => {
 			const aliceNote = await post(alice, { text: 'hi' });
@@ -241,8 +241,8 @@ describe('Mute', () => {
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
 
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === bob.id), true);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === carol.id), false);
 		});
 
 		test('通知にミュートしているユーザーからのリプライが含まれない', async () => {
@@ -255,8 +255,8 @@ describe('Mute', () => {
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
 
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === bob.id), true);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === carol.id), false);
 		});
 
 		test('通知にミュートしているユーザーからの引用リノートが含まれない', async () => {
@@ -269,8 +269,8 @@ describe('Mute', () => {
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
 
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === bob.id), true);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === carol.id), false);
 		});
 
 		test('通知にミュートしているユーザーからのリノートが含まれない', async () => {
@@ -283,8 +283,8 @@ describe('Mute', () => {
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
 
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === bob.id), true);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === carol.id), false);
 		});
 
 		test('通知にミュートしているユーザーからのフォロー通知が含まれない', async () => {
@@ -296,8 +296,8 @@ describe('Mute', () => {
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
 
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === bob.id), true);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === carol.id), false);
 
 			await api('following/delete', { userId: alice.id }, bob);
 			await api('following/delete', { userId: alice.id }, carol);
@@ -313,8 +313,8 @@ describe('Mute', () => {
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
 
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === bob.id), true);
-			assert.strictEqual(res.body.some((notification: any) => notification.userId === carol.id), false);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === bob.id), true);
+			assert.strictEqual(res.body.some(notification => 'userId' in notification && notification.userId === carol.id), false);
 		});
 	});
 });
diff --git a/packages/backend/test/e2e/note.ts b/packages/backend/test/e2e/note.ts
index 7ce9f47bc3..5937eb9b49 100644
--- a/packages/backend/test/e2e/note.ts
+++ b/packages/backend/test/e2e/note.ts
@@ -3,16 +3,18 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import type { Repository } from "typeorm";
+
 process.env.NODE_ENV = 'test';
 
 import * as assert from 'assert';
 import { MiNote } from '@/models/Note.js';
 import { MAX_NOTE_TEXT_LENGTH } from '@/const.js';
-import { api, initTestDb, post, role, signup, uploadFile, uploadUrl } from '../utils.js';
+import { api, castAsError, initTestDb, post, role, signup, uploadFile, uploadUrl } from '../utils.js';
 import type * as misskey from 'misskey-js';
 
 describe('Note', () => {
-	let Notes: any;
+	let Notes: Repository<MiNote>;
 
 	let root: misskey.entities.SignupResponse;
 	let alice: misskey.entities.SignupResponse;
@@ -61,8 +63,8 @@ describe('Note', () => {
 		}, alice);
 
 		assert.strictEqual(res.status, 400);
-		assert.strictEqual(res.body.error.code, 'NO_SUCH_FILE');
-		assert.strictEqual(res.body.error.id, 'b6992544-63e7-67f0-fa7f-32444b1b5306');
+		assert.strictEqual(castAsError(res.body).error.code, 'NO_SUCH_FILE');
+		assert.strictEqual(castAsError(res.body).error.id, 'b6992544-63e7-67f0-fa7f-32444b1b5306');
 	}, 1000 * 10);
 
 	test('存在しないファイルで怒られる', async () => {
@@ -72,8 +74,8 @@ describe('Note', () => {
 		}, alice);
 
 		assert.strictEqual(res.status, 400);
-		assert.strictEqual(res.body.error.code, 'NO_SUCH_FILE');
-		assert.strictEqual(res.body.error.id, 'b6992544-63e7-67f0-fa7f-32444b1b5306');
+		assert.strictEqual(castAsError(res.body).error.code, 'NO_SUCH_FILE');
+		assert.strictEqual(castAsError(res.body).error.id, 'b6992544-63e7-67f0-fa7f-32444b1b5306');
 	});
 
 	test('不正なファイルIDで怒られる', async () => {
@@ -81,8 +83,8 @@ describe('Note', () => {
 			fileIds: ['kyoppie'],
 		}, alice);
 		assert.strictEqual(res.status, 400);
-		assert.strictEqual(res.body.error.code, 'NO_SUCH_FILE');
-		assert.strictEqual(res.body.error.id, 'b6992544-63e7-67f0-fa7f-32444b1b5306');
+		assert.strictEqual(castAsError(res.body).error.code, 'NO_SUCH_FILE');
+		assert.strictEqual(castAsError(res.body).error.id, 'b6992544-63e7-67f0-fa7f-32444b1b5306');
 	});
 
 	test('返信できる', async () => {
@@ -101,6 +103,7 @@ describe('Note', () => {
 		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
 		assert.strictEqual(res.body.createdNote.text, alicePost.text);
 		assert.strictEqual(res.body.createdNote.replyId, alicePost.replyId);
+		assert.ok(res.body.createdNote.reply);
 		assert.strictEqual(res.body.createdNote.reply.text, bobPost.text);
 	});
 
@@ -118,6 +121,7 @@ describe('Note', () => {
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
 		assert.strictEqual(res.body.createdNote.renoteId, alicePost.renoteId);
+		assert.ok(res.body.createdNote.renote);
 		assert.strictEqual(res.body.createdNote.renote.text, bobPost.text);
 	});
 
@@ -137,6 +141,7 @@ describe('Note', () => {
 		assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
 		assert.strictEqual(res.body.createdNote.text, alicePost.text);
 		assert.strictEqual(res.body.createdNote.renoteId, alicePost.renoteId);
+		assert.ok(res.body.createdNote.renote);
 		assert.strictEqual(res.body.createdNote.renote.text, bobPost.text);
 	});
 
@@ -218,7 +223,7 @@ describe('Note', () => {
 		}, bob);
 
 		assert.strictEqual(bobReply.status, 400);
-		assert.strictEqual(bobReply.body.error.code, 'CANNOT_REPLY_TO_AN_INVISIBLE_NOTE');
+		assert.strictEqual(castAsError(bobReply.body).error.code, 'CANNOT_REPLY_TO_AN_INVISIBLE_NOTE');
 	});
 
 	test('visibility: specifiedなノートに対してvisibility: specifiedで返信できる', async () => {
@@ -256,7 +261,7 @@ describe('Note', () => {
 		}, bob);
 
 		assert.strictEqual(bobReply.status, 400);
-		assert.strictEqual(bobReply.body.error.code, 'CANNOT_REPLY_TO_SPECIFIED_VISIBILITY_NOTE_WITH_EXTENDED_VISIBILITY');
+		assert.strictEqual(castAsError(bobReply.body).error.code, 'CANNOT_REPLY_TO_SPECIFIED_VISIBILITY_NOTE_WITH_EXTENDED_VISIBILITY');
 	});
 
 	test('文字数ぎりぎりで怒られない', async () => {
@@ -333,6 +338,7 @@ describe('Note', () => {
 		assert.strictEqual(res.body.createdNote.text, post.text);
 
 		const noteDoc = await Notes.findOneBy({ id: res.body.createdNote.id });
+		assert.ok(noteDoc);
 		assert.deepStrictEqual(noteDoc.mentions, [bob.id]);
 	});
 
@@ -345,6 +351,7 @@ describe('Note', () => {
 
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(typeof res.body === 'object' && !Array.isArray(res.body), true);
+			assert.ok(res.body.createdNote.files);
 			assert.strictEqual(res.body.createdNote.files.length, 1);
 			assert.strictEqual(res.body.createdNote.files[0].id, file.body!.id);
 		});
@@ -363,8 +370,9 @@ describe('Note', () => {
 
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
-			const myNote = res.body.find((note: { id: string; files: { id: string }[] }) => note.id === createdNote.body.createdNote.id);
-			assert.notEqual(myNote, null);
+			const myNote = res.body.find(note => note.id === createdNote.body.createdNote.id);
+			assert.ok(myNote);
+			assert.ok(myNote.files);
 			assert.strictEqual(myNote.files.length, 1);
 			assert.strictEqual(myNote.files[0].id, file.body!.id);
 		});
@@ -389,7 +397,9 @@ describe('Note', () => {
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
 			const myNote = res.body.find((note: { id: string }) => note.id === renoted.body.createdNote.id);
-			assert.notEqual(myNote, null);
+			assert.ok(myNote);
+			assert.ok(myNote.renote);
+			assert.ok(myNote.renote.files);
 			assert.strictEqual(myNote.renote.files.length, 1);
 			assert.strictEqual(myNote.renote.files[0].id, file.body!.id);
 		});
@@ -415,7 +425,9 @@ describe('Note', () => {
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
 			const myNote = res.body.find((note: { id: string }) => note.id === reply.body.createdNote.id);
-			assert.notEqual(myNote, null);
+			assert.ok(myNote);
+			assert.ok(myNote.reply);
+			assert.ok(myNote.reply.files);
 			assert.strictEqual(myNote.reply.files.length, 1);
 			assert.strictEqual(myNote.reply.files[0].id, file.body!.id);
 		});
@@ -446,7 +458,10 @@ describe('Note', () => {
 			assert.strictEqual(res.status, 200);
 			assert.strictEqual(Array.isArray(res.body), true);
 			const myNote = res.body.find((note: { id: string }) => note.id === renoted.body.createdNote.id);
-			assert.notEqual(myNote, null);
+			assert.ok(myNote);
+			assert.ok(myNote.renote);
+			assert.ok(myNote.renote.reply);
+			assert.ok(myNote.renote.reply.files);
 			assert.strictEqual(myNote.renote.reply.files.length, 1);
 			assert.strictEqual(myNote.renote.reply.files[0].id, file.body!.id);
 		});
@@ -474,7 +489,7 @@ describe('Note', () => {
 						priority: 0,
 						value: true,
 					},
-				} as any,
+				},
 			}, root);
 
 			assert.strictEqual(res.status, 200);
@@ -498,7 +513,7 @@ describe('Note', () => {
 			}, alice);
 
 			assert.strictEqual(liftnsfw.status, 400);
-			assert.strictEqual(liftnsfw.body.error.code, 'RESTRICTED_BY_ROLE');
+			assert.strictEqual(castAsError(liftnsfw.body).error.code, 'RESTRICTED_BY_ROLE');
 
 			const oldaddnsfw = await api('drive/files/update', {
 				fileId: file.body!.id,
@@ -710,7 +725,7 @@ describe('Note', () => {
 			}, alice);
 
 			assert.strictEqual(note1.status, 400);
-			assert.strictEqual(note1.body.error.code, 'CONTAINS_PROHIBITED_WORDS');
+			assert.strictEqual(castAsError(note1.body).error.code, 'CONTAINS_PROHIBITED_WORDS');
 		});
 
 		test('禁止ワードを含む投稿はエラーになる (正規表現)', async () => {
@@ -727,7 +742,7 @@ describe('Note', () => {
 			}, alice);
 
 			assert.strictEqual(note2.status, 400);
-			assert.strictEqual(note2.body.error.code, 'CONTAINS_PROHIBITED_WORDS');
+			assert.strictEqual(castAsError(note2.body).error.code, 'CONTAINS_PROHIBITED_WORDS');
 		});
 
 		test('禁止ワードを含む投稿はエラーになる (スペースアンド)', async () => {
@@ -744,7 +759,7 @@ describe('Note', () => {
 			}, alice);
 
 			assert.strictEqual(note2.status, 400);
-			assert.strictEqual(note2.body.error.code, 'CONTAINS_PROHIBITED_WORDS');
+			assert.strictEqual(castAsError(note2.body).error.code, 'CONTAINS_PROHIBITED_WORDS');
 		});
 
 		test('禁止ワードを含んでるリモートノートもエラーになる', async () => {
@@ -786,7 +801,7 @@ describe('Note', () => {
 						priority: 1,
 						value: 0,
 					},
-				} as any,
+				},
 			}, root);
 
 			assert.strictEqual(res.status, 200);
@@ -807,7 +822,7 @@ describe('Note', () => {
 			}, alice);
 
 			assert.strictEqual(note.status, 400);
-			assert.strictEqual(note.body.error.code, 'CONTAINS_TOO_MANY_MENTIONS');
+			assert.strictEqual(castAsError(note.body).error.code, 'CONTAINS_TOO_MANY_MENTIONS');
 
 			await api('admin/roles/unassign', {
 				userId: alice.id,
@@ -840,7 +855,7 @@ describe('Note', () => {
 						priority: 1,
 						value: 0,
 					},
-				} as any,
+				},
 			}, root);
 
 			assert.strictEqual(res.status, 200);
@@ -863,7 +878,7 @@ describe('Note', () => {
 			}, alice);
 
 			assert.strictEqual(note.status, 400);
-			assert.strictEqual(note.body.error.code, 'CONTAINS_TOO_MANY_MENTIONS');
+			assert.strictEqual(castAsError(note.body).error.code, 'CONTAINS_TOO_MANY_MENTIONS');
 
 			await api('admin/roles/unassign', {
 				userId: alice.id,
@@ -896,7 +911,7 @@ describe('Note', () => {
 						priority: 1,
 						value: 1,
 					},
-				} as any,
+				},
 			}, root);
 
 			assert.strictEqual(res.status, 200);
@@ -951,6 +966,7 @@ describe('Note', () => {
 
 			assert.strictEqual(deleteOneRes.status, 204);
 			let mainNote = await Notes.findOneBy({ id: mainNoteRes.body.createdNote.id });
+			assert.ok(mainNote);
 			assert.strictEqual(mainNote.repliesCount, 1);
 
 			const deleteTwoRes = await api('notes/delete', {
@@ -959,6 +975,7 @@ describe('Note', () => {
 
 			assert.strictEqual(deleteTwoRes.status, 204);
 			mainNote = await Notes.findOneBy({ id: mainNoteRes.body.createdNote.id });
+			assert.ok(mainNote);
 			assert.strictEqual(mainNote.repliesCount, 0);
 		});
 	});
@@ -980,7 +997,7 @@ describe('Note', () => {
 				}, alice);
 
 				assert.strictEqual(res.status, 400);
-				assert.strictEqual(res.body.error.code, 'UNAVAILABLE');
+				assert.strictEqual(castAsError(res.body).error.code, 'UNAVAILABLE');
 			});
 
 			afterAll(async () => {
@@ -992,7 +1009,7 @@ describe('Note', () => {
 			const res = await api('notes/translate', { noteId: 'foo', targetLang: 'ja' }, alice);
 
 			assert.strictEqual(res.status, 400);
-			assert.strictEqual(res.body.error.code, 'NO_SUCH_NOTE');
+			assert.strictEqual(castAsError(res.body).error.code, 'NO_SUCH_NOTE');
 		});
 
 		test('不可視なノートは翻訳できない', async () => {
@@ -1000,7 +1017,7 @@ describe('Note', () => {
 			const bobTranslateAttempt = await api('notes/translate', { noteId: aliceNote.id, targetLang: 'ja' }, bob);
 
 			assert.strictEqual(bobTranslateAttempt.status, 400);
-			assert.strictEqual(bobTranslateAttempt.body.error.code, 'CANNOT_TRANSLATE_INVISIBLE_NOTE');
+			assert.strictEqual(castAsError(bobTranslateAttempt.body).error.code, 'CANNOT_TRANSLATE_INVISIBLE_NOTE');
 		});
 
 		test('text: null なノートを翻訳すると空のレスポンスが返ってくる', async () => {
@@ -1016,7 +1033,7 @@ describe('Note', () => {
 
 			// NOTE: デフォルトでは登録されていないので落ちる
 			assert.strictEqual(res.status, 400);
-			assert.strictEqual(res.body.error.code, 'UNAVAILABLE');
+			assert.strictEqual(castAsError(res.body).error.code, 'UNAVAILABLE');
 		});
 	});
 });
diff --git a/packages/backend/test/e2e/renote-mute.ts b/packages/backend/test/e2e/renote-mute.ts
index f6895c43d8..0f636b9ae2 100644
--- a/packages/backend/test/e2e/renote-mute.ts
+++ b/packages/backend/test/e2e/renote-mute.ts
@@ -42,9 +42,9 @@ describe('Renote Mute', () => {
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(Array.isArray(res.body), true);
-		assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-		assert.strictEqual(res.body.some((note: any) => note.id === carolRenote.id), false);
-		assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), true);
+		assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+		assert.strictEqual(res.body.some(note => note.id === carolRenote.id), false);
+		assert.strictEqual(res.body.some(note => note.id === carolNote.id), true);
 	});
 
 	test('タイムラインにリノートミュートしているユーザーの引用が含まれる', async () => {
@@ -59,9 +59,9 @@ describe('Renote Mute', () => {
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(Array.isArray(res.body), true);
-		assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-		assert.strictEqual(res.body.some((note: any) => note.id === carolRenote.id), true);
-		assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), true);
+		assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+		assert.strictEqual(res.body.some(note => note.id === carolRenote.id), true);
+		assert.strictEqual(res.body.some(note => note.id === carolNote.id), true);
 	});
 
 	// #12956
@@ -76,8 +76,8 @@ describe('Renote Mute', () => {
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(Array.isArray(res.body), true);
-		assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), true);
-		assert.strictEqual(res.body.some((note: any) => note.id === bobRenote.id), true);
+		assert.strictEqual(res.body.some(note => note.id === carolNote.id), true);
+		assert.strictEqual(res.body.some(note => note.id === bobRenote.id), true);
 	});
 
 	test('ストリームにリノートミュートしているユーザーのリノートが流れない', async () => {
diff --git a/packages/backend/test/e2e/thread-mute.ts b/packages/backend/test/e2e/thread-mute.ts
index 53bb6eb765..1ac99df884 100644
--- a/packages/backend/test/e2e/thread-mute.ts
+++ b/packages/backend/test/e2e/thread-mute.ts
@@ -33,9 +33,9 @@ describe('Note thread mute', () => {
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(Array.isArray(res.body), true);
-		assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
-		assert.strictEqual(res.body.some((note: any) => note.id === carolReply.id), false);
-		assert.strictEqual(res.body.some((note: any) => note.id === carolReplyWithoutMention.id), false);
+		assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
+		assert.strictEqual(res.body.some(note => note.id === carolReply.id), false);
+		assert.strictEqual(res.body.some(note => note.id === carolReplyWithoutMention.id), false);
 	});
 
 	test('ミュートしているスレッドからメンションされても、hasUnreadMentions が true にならない', async () => {
@@ -93,8 +93,8 @@ describe('Note thread mute', () => {
 
 		assert.strictEqual(res.status, 200);
 		assert.strictEqual(Array.isArray(res.body), true);
-		assert.strictEqual(res.body.some((notification: any) => notification.note.id === carolReply.id), false);
-		assert.strictEqual(res.body.some((notification: any) => notification.note.id === carolReplyWithoutMention.id), false);
+		assert.strictEqual(res.body.some(notification => 'note' in notification && notification.note.id === carolReply.id), false);
+		assert.strictEqual(res.body.some(notification => 'note' in notification && notification.note.id === carolReplyWithoutMention.id), false);
 
 		// NOTE: bobの投稿はスレッドミュート前に行われたため通知に含まれていてもよい
 	});
diff --git a/packages/backend/test/e2e/timelines.ts b/packages/backend/test/e2e/timelines.ts
index fccc052d99..540b866b28 100644
--- a/packages/backend/test/e2e/timelines.ts
+++ b/packages/backend/test/e2e/timelines.ts
@@ -37,8 +37,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
-			assert.strictEqual(res.body.find((note: any) => note.id === aliceNote.id).text, 'hi');
+			assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
+			assert.strictEqual(res.body.find(note => note.id === aliceNote.id)?.text, 'hi');
 		});
 
 		test.concurrent('フォローしているユーザーのノートが含まれる', async () => {
@@ -53,8 +53,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 		});
 
 		test.concurrent('フォローしているユーザーの visibility: followers なノートが含まれる', async () => {
@@ -69,9 +69,9 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-			assert.strictEqual(res.body.find((note: any) => note.id === bobNote.id).text, 'hi');
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.find(note => note.id === bobNote.id)?.text, 'hi');
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 		});
 
 		test.concurrent('withReplies: false でフォローしているユーザーの他人への返信が含まれない', async () => {
@@ -86,8 +86,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 		});
 
 		test.concurrent('withReplies: true でフォローしているユーザーの他人への返信が含まれる', async () => {
@@ -103,8 +103,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 		});
 
 		test.concurrent('withReplies: true でフォローしているユーザーの他人へのDM返信が含まれない', async () => {
@@ -120,8 +120,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 		});
 
 		test.concurrent('withReplies: true でフォローしているユーザーの他人の visibility: followers な投稿への返信が含まれない', async () => {
@@ -137,8 +137,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 		});
 
 		test.concurrent('withReplies: true でフォローしているユーザーの行った別のフォローしているユーザーの visibility: followers な投稿への返信が含まれる', async () => {
@@ -156,9 +156,9 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), true);
-			assert.strictEqual(res.body.find((note: any) => note.id === carolNote.id).text, 'hi');
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), true);
+			assert.strictEqual(res.body.find(note => note.id === carolNote.id)?.text, 'hi');
 		});
 
 		test.concurrent('withReplies: true でフォローしているユーザーの行った別のフォローしているユーザーの投稿への visibility: specified な返信が含まれない', async () => {
@@ -175,8 +175,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), true);
 		});
 
 		test.concurrent('withReplies: false でフォローしているユーザーのそのユーザー自身への返信が含まれる', async () => {
@@ -191,8 +191,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
 		});
 
 		test.concurrent('withReplies: false でフォローしているユーザーからの自分への返信が含まれる', async () => {
@@ -207,8 +207,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('自分の他人への返信が含まれる', async () => {
@@ -221,8 +221,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
 		});
 
 		test.concurrent('フォローしているユーザーの他人の投稿のリノートが含まれる', async () => {
@@ -237,8 +237,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 		});
 
 		test.concurrent('[withRenotes: false] フォローしているユーザーの他人の投稿のリノートが含まれない', async () => {
@@ -255,8 +255,8 @@ describe('Timelines', () => {
 				withRenotes: false,
 			}, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 		});
 
 		test.concurrent('[withRenotes: false] フォローしているユーザーの他人の投稿の引用が含まれる', async () => {
@@ -273,8 +273,8 @@ describe('Timelines', () => {
 				withRenotes: false,
 			}, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 		});
 
 		test.concurrent('フォローしているユーザーの他人への visibility: specified なノートが含まれない', async () => {
@@ -288,7 +288,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 
 		test.concurrent('フォローしているユーザーが行ったミュートしているユーザーのリノートが含まれない', async () => {
@@ -304,8 +304,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 		});
 
 		test.concurrent('withReplies: true でフォローしているユーザーが行ったミュートしているユーザーの投稿への返信が含まれない', async () => {
@@ -322,8 +322,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 		});
 
 		test.concurrent('フォローしているリモートユーザーのノートが含まれる', async () => {
@@ -338,7 +338,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('フォローしているリモートユーザーの visibility: home なノートが含まれる', async () => {
@@ -353,7 +353,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('[withFiles: true] フォローしているユーザーのファイル付きノートのみ含まれる', async () => {
@@ -374,10 +374,10 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100, withFiles: true }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote1.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote2.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
+			assert.strictEqual(res.body.some(note => note.id === carolNote1.id), false);
+			assert.strictEqual(res.body.some(note => note.id === carolNote2.id), false);
 		}, 1000 * 10);
 
 		test.concurrent('フォローしているユーザーのチャンネル投稿が含まれない', async () => {
@@ -392,7 +392,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 
 		test.concurrent('自分の visibility: specified なノートが含まれる', async () => {
@@ -404,8 +404,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
-			assert.strictEqual(res.body.find((note: any) => note.id === aliceNote.id).text, 'hi');
+			assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
+			assert.strictEqual(res.body.find(note => note.id === aliceNote.id)?.text, 'hi');
 		});
 
 		test.concurrent('フォローしているユーザーの自身を visibleUserIds に指定した visibility: specified なノートが含まれる', async () => {
@@ -419,8 +419,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-			assert.strictEqual(res.body.find((note: any) => note.id === bobNote.id).text, 'hi');
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.find(note => note.id === bobNote.id)?.text, 'hi');
 		});
 
 		test.concurrent('フォローしていないユーザーの自身を visibleUserIds に指定した visibility: specified なノートが含まれない', async () => {
@@ -432,7 +432,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 
 		test.concurrent('フォローしているユーザーの自身を visibleUserIds に指定していない visibility: specified なノートが含まれない', async () => {
@@ -446,7 +446,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 
 		test.concurrent('フォローしていないユーザーからの visibility: specified なノートに返信したときの自身のノートが含まれる', async () => {
@@ -459,8 +459,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
-			assert.strictEqual(res.body.find((note: any) => note.id === aliceNote.id).text, 'ok');
+			assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
+			assert.strictEqual(res.body.find(note => note.id === aliceNote.id)?.text, 'ok');
 		});
 
 		/* TODO
@@ -474,8 +474,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-			assert.strictEqual(res.body.find((note: any) => note.id === bobNote.id).text, 'ok');
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.find(note => note.id === bobNote.id).text, 'ok');
 		});
 		*/
 
@@ -490,7 +490,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 	});
 
@@ -505,8 +505,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/local-timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 		});
 
 		test.concurrent('他人の他人への返信が含まれない', async () => {
@@ -519,8 +519,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/local-timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), true);
 		});
 
 		test.concurrent('他人のその人自身への返信が含まれる', async () => {
@@ -533,8 +533,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/local-timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
 		});
 
 		test.concurrent('チャンネル投稿が含まれない', async () => {
@@ -547,7 +547,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/local-timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 
 		test.concurrent('リモートユーザーのノートが含まれない', async () => {
@@ -559,7 +559,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/local-timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 
 		// 含まれても良いと思うけど実装が面倒なので含まれない
@@ -575,8 +575,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/local-timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 		});
 
 		test.concurrent('ミュートしているユーザーのノートが含まれない', async () => {
@@ -591,8 +591,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/local-timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 		});
 
 		test.concurrent('フォローしているユーザーが行ったミュートしているユーザーのリノートが含まれない', async () => {
@@ -608,8 +608,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/local-timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 		});
 
 		test.concurrent('withReplies: true でフォローしているユーザーが行ったミュートしているユーザーの投稿への返信が含まれない', async () => {
@@ -626,8 +626,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/local-timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), false);
 		});
 
 		test.concurrent('withReplies: false でフォローしているユーザーからの自分への返信が含まれる', async () => {
@@ -642,8 +642,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/local-timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('[withReplies: true] 他人の他人への返信が含まれる', async () => {
@@ -656,7 +656,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/local-timeline', { limit: 100, withReplies: true }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('[withFiles: true] ファイル付きノートのみ含まれる', async () => {
@@ -670,8 +670,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/local-timeline', { limit: 100, withFiles: true }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
 		}, 1000 * 10);
 	});
 
@@ -685,7 +685,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/hybrid-timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('ローカルユーザーの visibility: home なノートが含まれない', async () => {
@@ -697,7 +697,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/hybrid-timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 
 		test.concurrent('フォローしているローカルユーザーの visibility: home なノートが含まれる', async () => {
@@ -711,7 +711,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/hybrid-timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('withReplies: false でフォローしているユーザーからの自分への返信が含まれる', async () => {
@@ -726,8 +726,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/hybrid-timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('他人の他人への返信が含まれない', async () => {
@@ -740,8 +740,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/hybrid-timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === carolNote.id), true);
 		});
 
 		test.concurrent('リモートユーザーのノートが含まれない', async () => {
@@ -753,7 +753,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/local-timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 
 		test.concurrent('フォローしているリモートユーザーのノートが含まれる', async () => {
@@ -768,7 +768,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/hybrid-timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('フォローしているリモートユーザーの visibility: home なノートが含まれる', async () => {
@@ -783,7 +783,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/hybrid-timeline', { limit: 100 }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('[withReplies: true] 他人の他人への返信が含まれる', async () => {
@@ -796,7 +796,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/hybrid-timeline', { limit: 100, withReplies: true }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('[withFiles: true] ファイル付きノートのみ含まれる', async () => {
@@ -810,8 +810,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/hybrid-timeline', { limit: 100, withFiles: true }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
 		}, 1000 * 10);
 	});
 
@@ -828,7 +828,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('リスインしているフォローしていないユーザーの visibility: home なノートが含まれる', async () => {
@@ -843,7 +843,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('リスインしているフォローしていないユーザーの visibility: followers なノートが含まれない', async () => {
@@ -858,7 +858,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 
 		test.concurrent('リスインしているフォローしていないユーザーの他人への返信が含まれない', async () => {
@@ -874,7 +874,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 
 		test.concurrent('リスインしているフォローしていないユーザーのユーザー自身への返信が含まれる', async () => {
@@ -890,8 +890,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
 		});
 
 		test.concurrent('withReplies: false でリスインしているフォローしていないユーザーからの自分への返信が含まれる', async () => {
@@ -908,7 +908,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('withReplies: false でリスインしているフォローしていないユーザーの他人への返信が含まれない', async () => {
@@ -925,7 +925,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 
 		test.concurrent('withReplies: true でリスインしているフォローしていないユーザーの他人への返信が含まれる', async () => {
@@ -942,7 +942,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('リスインしているフォローしているユーザーの visibility: home なノートが含まれる', async () => {
@@ -958,7 +958,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('リスインしているフォローしているユーザーの visibility: followers なノートが含まれる', async () => {
@@ -974,8 +974,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-			assert.strictEqual(res.body.find((note: any) => note.id === bobNote.id).text, 'hi');
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.find(note => note.id === bobNote.id)?.text, 'hi');
 		});
 
 		test.concurrent('リスインしている自分の visibility: followers なノートが含まれる', async () => {
@@ -990,8 +990,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
-			assert.strictEqual(res.body.find((note: any) => note.id === aliceNote.id).text, 'hi');
+			assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
+			assert.strictEqual(res.body.find(note => note.id === aliceNote.id)?.text, 'hi');
 		});
 
 		test.concurrent('リスインしているユーザーのチャンネルノートが含まれない', async () => {
@@ -1007,7 +1007,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 
 		test.concurrent('[withFiles: true] リスインしているユーザーのファイル付きノートのみ含まれる', async () => {
@@ -1023,8 +1023,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/user-list-timeline', { listId: list.id, withFiles: true }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
 		}, 1000 * 10);
 
 		test.concurrent('リスインしているユーザーの自身宛ての visibility: specified なノートが含まれる', async () => {
@@ -1039,8 +1039,8 @@ describe('Timelines', () => {
 
 			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-			assert.strictEqual(res.body.find((note: any) => note.id === bobNote.id).text, 'hi');
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.find(note => note.id === bobNote.id)?.text, 'hi');
 		});
 
 		test.concurrent('リスインしているユーザーの自身宛てではない visibility: specified なノートが含まれない', async () => {
@@ -1056,7 +1056,7 @@ describe('Timelines', () => {
 
 			const res = await api('notes/user-list-timeline', { listId: list.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 	});
 
@@ -1070,7 +1070,7 @@ describe('Timelines', () => {
 
 			const res = await api('users/notes', { userId: bob.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('フォローしていないユーザーの visibility: followers なノートが含まれない', async () => {
@@ -1082,7 +1082,7 @@ describe('Timelines', () => {
 
 			const res = await api('users/notes', { userId: bob.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 
 		test.concurrent('フォローしているユーザーの visibility: followers なノートが含まれる', async () => {
@@ -1096,8 +1096,8 @@ describe('Timelines', () => {
 
 			const res = await api('users/notes', { userId: bob.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
-			assert.strictEqual(res.body.find((note: any) => note.id === bobNote.id).text, 'hi');
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.find(note => note.id === bobNote.id)?.text, 'hi');
 		});
 
 		test.concurrent('自身の visibility: followers なノートが含まれる', async () => {
@@ -1109,8 +1109,8 @@ describe('Timelines', () => {
 
 			const res = await api('users/notes', { userId: alice.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
-			assert.strictEqual(res.body.find((note: any) => note.id === aliceNote.id).text, 'hi');
+			assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
+			assert.strictEqual(res.body.find(note => note.id === aliceNote.id)?.text, 'hi');
 		});
 
 		test.concurrent('チャンネル投稿が含まれない', async () => {
@@ -1123,7 +1123,7 @@ describe('Timelines', () => {
 
 			const res = await api('users/notes', { userId: bob.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 
 		test.concurrent('[withReplies: false] 他人への返信が含まれない', async () => {
@@ -1137,8 +1137,8 @@ describe('Timelines', () => {
 
 			const res = await api('users/notes', { userId: bob.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), false);
 		});
 
 		test.concurrent('[withReplies: true] 他人への返信が含まれる', async () => {
@@ -1152,8 +1152,8 @@ describe('Timelines', () => {
 
 			const res = await api('users/notes', { userId: bob.id, withReplies: true }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
 		});
 
 		test.concurrent('[withReplies: true] 他人への visibility: specified な返信が含まれない', async () => {
@@ -1167,8 +1167,8 @@ describe('Timelines', () => {
 
 			const res = await api('users/notes', { userId: bob.id, withReplies: true }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), false);
 		});
 
 		test.concurrent('[withFiles: true] ファイル付きノートのみ含まれる', async () => {
@@ -1182,8 +1182,8 @@ describe('Timelines', () => {
 
 			const res = await api('users/notes', { userId: bob.id, withFiles: true }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), false);
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
 		}, 1000 * 10);
 
 		test.concurrent('[withChannelNotes: true] チャンネル投稿が含まれる', async () => {
@@ -1196,7 +1196,7 @@ describe('Timelines', () => {
 
 			const res = await api('users/notes', { userId: bob.id, withChannelNotes: true }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('[withChannelNotes: true] 他人が取得した場合センシティブチャンネル投稿が含まれない', async () => {
@@ -1209,7 +1209,7 @@ describe('Timelines', () => {
 
 			const res = await api('users/notes', { userId: bob.id, withChannelNotes: true }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 
 		test.concurrent('[withChannelNotes: true] 自分が取得した場合センシティブチャンネル投稿が含まれる', async () => {
@@ -1222,7 +1222,7 @@ describe('Timelines', () => {
 
 			const res = await api('users/notes', { userId: bob.id, withChannelNotes: true }, bob);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
 		test.concurrent('ミュートしているユーザーに関連する投稿が含まれない', async () => {
@@ -1237,7 +1237,7 @@ describe('Timelines', () => {
 
 			const res = await api('users/notes', { userId: bob.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 
 		test.concurrent('ミュートしていても userId に指定したユーザーの投稿が含まれる', async () => {
@@ -1253,9 +1253,9 @@ describe('Timelines', () => {
 
 			const res = await api('users/notes', { userId: bob.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote3.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote3.id), true);
 		});
 
 		test.concurrent('自身の visibility: specified なノートが含まれる', async () => {
@@ -1267,7 +1267,7 @@ describe('Timelines', () => {
 
 			const res = await api('users/notes', { userId: alice.id, withReplies: true }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
 		});
 
 		test.concurrent('visibleUserIds に指定されてない visibility: specified なノートが含まれない', async () => {
@@ -1279,7 +1279,7 @@ describe('Timelines', () => {
 
 			const res = await api('users/notes', { userId: bob.id, withReplies: true }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
 
 		/** @see https://github.com/misskey-dev/misskey/issues/14000 */
diff --git a/packages/backend/test/unit/ApMfmService.ts b/packages/backend/test/unit/ApMfmService.ts
index 79cb81f5c9..e81a321c9b 100644
--- a/packages/backend/test/unit/ApMfmService.ts
+++ b/packages/backend/test/unit/ApMfmService.ts
@@ -23,10 +23,10 @@ describe('ApMfmService', () => {
 
 	describe('getNoteHtml', () => {
 		test('Do not provide _misskey_content for simple text', () => {
-			const note: MiNote = {
+			const note = {
 				text: 'テキスト #タグ @mention 🍊 :emoji: https://example.com',
 				mentionedRemoteUsers: '[]',
-			} as any;
+			};
 
 			const { content, noMisskeyContent } = apMfmService.getNoteHtml(note);
 
@@ -35,10 +35,10 @@ describe('ApMfmService', () => {
 		});
 
 		test('Provide _misskey_content for MFM', () => {
-			const note: MiNote = {
+			const note = {
 				text: '$[tada foo]',
 				mentionedRemoteUsers: '[]',
-			} as any;
+			};
 
 			const { content, noMisskeyContent } = apMfmService.getNoteHtml(note);
 
diff --git a/packages/backend/test/unit/FileInfoService.ts b/packages/backend/test/unit/FileInfoService.ts
index aa9b34b706..29bd03a201 100644
--- a/packages/backend/test/unit/FileInfoService.ts
+++ b/packages/backend/test/unit/FileInfoService.ts
@@ -12,7 +12,7 @@ import { ModuleMocker } from 'jest-mock';
 import { Test } from '@nestjs/testing';
 import { afterAll, beforeAll, describe, test } from '@jest/globals';
 import { GlobalModule } from '@/GlobalModule.js';
-import { FileInfoService } from '@/core/FileInfoService.js';
+import { FileInfo, FileInfoService } from '@/core/FileInfoService.js';
 //import { DI } from '@/di-symbols.js';
 import { AiService } from '@/core/AiService.js';
 import { LoggerService } from '@/core/LoggerService.js';
@@ -28,6 +28,15 @@ const moduleMocker = new ModuleMocker(global);
 describe('FileInfoService', () => {
 	let app: TestingModule;
 	let fileInfoService: FileInfoService;
+	const strip = (fileInfo: FileInfo): Omit<Partial<FileInfo>, 'warnings' | 'blurhash' | 'sensitive' | 'porn'> => {
+		const fi: Partial<FileInfo> = fileInfo;
+		delete fi.warnings;
+		delete fi.sensitive;
+		delete fi.blurhash;
+		delete fi.porn;
+		
+		return fi;
+	}
 
 	beforeAll(async () => {
 		app = await Test.createTestingModule({
@@ -63,11 +72,7 @@ describe('FileInfoService', () => {
 
 	test('Empty file', async () => {
 		const path = `${resources}/emptyfile`;
-		const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
-		delete info.warnings;
-		delete info.blurhash;
-		delete info.sensitive;
-		delete info.porn;
+		const info = strip(await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }));
 		assert.deepStrictEqual(info, {
 			size: 0,
 			md5: 'd41d8cd98f00b204e9800998ecf8427e',
@@ -84,11 +89,7 @@ describe('FileInfoService', () => {
 	describe('IMAGE', () => {
 		test('Generic JPEG', async () => {
 			const path = `${resources}/192.jpg`;
-			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
-			delete info.warnings;
-			delete info.blurhash;
-			delete info.sensitive;
-			delete info.porn;
+			const info = strip(await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }));
 			assert.deepStrictEqual(info, {
 				size: 5131,
 				md5: '8c9ed0677dd2b8f9f7472c3af247e5e3',
@@ -104,11 +105,7 @@ describe('FileInfoService', () => {
 
 		test('Generic APNG', async () => {
 			const path = `${resources}/anime.png`;
-			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
-			delete info.warnings;
-			delete info.blurhash;
-			delete info.sensitive;
-			delete info.porn;
+			const info = strip(await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }));
 			assert.deepStrictEqual(info, {
 				size: 1868,
 				md5: '08189c607bea3b952704676bb3c979e0',
@@ -124,11 +121,7 @@ describe('FileInfoService', () => {
 
 		test('Generic AGIF', async () => {
 			const path = `${resources}/anime.gif`;
-			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
-			delete info.warnings;
-			delete info.blurhash;
-			delete info.sensitive;
-			delete info.porn;
+			const info = strip(await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }));
 			assert.deepStrictEqual(info, {
 				size: 2248,
 				md5: '32c47a11555675d9267aee1a86571e7e',
@@ -144,11 +137,7 @@ describe('FileInfoService', () => {
 
 		test('PNG with alpha', async () => {
 			const path = `${resources}/with-alpha.png`;
-			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
-			delete info.warnings;
-			delete info.blurhash;
-			delete info.sensitive;
-			delete info.porn;
+			const info = strip(await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }));
 			assert.deepStrictEqual(info, {
 				size: 3772,
 				md5: 'f73535c3e1e27508885b69b10cf6e991',
@@ -164,11 +153,7 @@ describe('FileInfoService', () => {
 
 		test('Generic SVG', async () => {
 			const path = `${resources}/image.svg`;
-			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
-			delete info.warnings;
-			delete info.blurhash;
-			delete info.sensitive;
-			delete info.porn;
+			const info = strip(await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }));
 			assert.deepStrictEqual(info, {
 				size: 505,
 				md5: 'b6f52b4b021e7b92cdd04509c7267965',
@@ -185,11 +170,7 @@ describe('FileInfoService', () => {
 		test('SVG with XML definition', async () => {
 			// https://github.com/misskey-dev/misskey/issues/4413
 			const path = `${resources}/with-xml-def.svg`;
-			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
-			delete info.warnings;
-			delete info.blurhash;
-			delete info.sensitive;
-			delete info.porn;
+			const info = strip(await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }));
 			assert.deepStrictEqual(info, {
 				size: 544,
 				md5: '4b7a346cde9ccbeb267e812567e33397',
@@ -205,11 +186,7 @@ describe('FileInfoService', () => {
 
 		test('Dimension limit', async () => {
 			const path = `${resources}/25000x25000.png`;
-			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
-			delete info.warnings;
-			delete info.blurhash;
-			delete info.sensitive;
-			delete info.porn;
+			const info = strip(await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }));
 			assert.deepStrictEqual(info, {
 				size: 75933,
 				md5: '268c5dde99e17cf8fe09f1ab3f97df56',
@@ -225,11 +202,7 @@ describe('FileInfoService', () => {
 
 		test('Rotate JPEG', async () => {
 			const path = `${resources}/rotate.jpg`;
-			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
-			delete info.warnings;
-			delete info.blurhash;
-			delete info.sensitive;
-			delete info.porn;
+			const info = strip(await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }));
 			assert.deepStrictEqual(info, {
 				size: 12624,
 				md5: '68d5b2d8d1d1acbbce99203e3ec3857e',
@@ -247,11 +220,7 @@ describe('FileInfoService', () => {
 	describe('AUDIO', () => {
 		test('MP3', async () => {
 			const path = `${resources}/kick_gaba7.mp3`;
-			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
-			delete info.warnings;
-			delete info.blurhash;
-			delete info.sensitive;
-			delete info.porn;
+			const info = strip(await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }));
 			delete info.width;
 			delete info.height;
 			delete info.orientation;
@@ -267,11 +236,7 @@ describe('FileInfoService', () => {
 
 		test('WAV', async () => {
 			const path = `${resources}/kick_gaba7.wav`;
-			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
-			delete info.warnings;
-			delete info.blurhash;
-			delete info.sensitive;
-			delete info.porn;
+			const info = strip(await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }));
 			delete info.width;
 			delete info.height;
 			delete info.orientation;
@@ -287,11 +252,7 @@ describe('FileInfoService', () => {
 
 		test('AAC', async () => {
 			const path = `${resources}/kick_gaba7.aac`;
-			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
-			delete info.warnings;
-			delete info.blurhash;
-			delete info.sensitive;
-			delete info.porn;
+			const info = strip(await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }));
 			delete info.width;
 			delete info.height;
 			delete info.orientation;
@@ -307,11 +268,7 @@ describe('FileInfoService', () => {
 
 		test('FLAC', async () => {
 			const path = `${resources}/kick_gaba7.flac`;
-			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
-			delete info.warnings;
-			delete info.blurhash;
-			delete info.sensitive;
-			delete info.porn;
+			const info = strip(await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }));
 			delete info.width;
 			delete info.height;
 			delete info.orientation;
@@ -327,11 +284,7 @@ describe('FileInfoService', () => {
 
 		test('MPEG-4 AUDIO (M4A)', async () => {
 			const path = `${resources}/kick_gaba7.m4a`;
-			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
-			delete info.warnings;
-			delete info.blurhash;
-			delete info.sensitive;
-			delete info.porn;
+			const info = strip(await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }));
 			delete info.width;
 			delete info.height;
 			delete info.orientation;
@@ -347,11 +300,7 @@ describe('FileInfoService', () => {
 
 		test('WEBM AUDIO', async () => {
 			const path = `${resources}/kick_gaba7.webm`;
-			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
-			delete info.warnings;
-			delete info.blurhash;
-			delete info.sensitive;
-			delete info.porn;
+			const info = strip(await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }));
 			delete info.width;
 			delete info.height;
 			delete info.orientation;
diff --git a/packages/backend/test/utils.ts b/packages/backend/test/utils.ts
index 06c3f82601..e70befeebe 100644
--- a/packages/backend/test/utils.ts
+++ b/packages/backend/test/utils.ts
@@ -18,6 +18,7 @@ import { entities } from '../src/postgres.js';
 import { loadConfig } from '../src/config.js';
 import type * as misskey from 'misskey-js';
 import { type Response } from 'node-fetch';
+import { ApiError } from "@/server/api/error.js";
 
 export { server as startServer, jobQueue as startJobQueue } from '@/boot/common.js';
 
@@ -48,27 +49,28 @@ export const successfulApiCall = async <E extends keyof misskey.Endpoints, P ext
 	const res = await api(endpoint, parameters, user);
 	const status = assertion.status ?? (res.body == null ? 204 : 200);
 	assert.strictEqual(res.status, status, inspect(res.body, { depth: 5, colors: true }));
-	return res.body;
+
+	return res.body as misskey.api.SwitchCaseResponseType<E, P>;
 };
 
-export const failedApiCall = async <T, E extends keyof misskey.Endpoints, P extends misskey.Endpoints[E]['req']>(request: ApiRequest<E, P>, assertion: {
+export const failedApiCall = async <E extends keyof misskey.Endpoints, P extends misskey.Endpoints[E]['req']>(request: ApiRequest<E, P>, assertion: {
 	status: number,
 	code: string,
 	id: string
-}): Promise<T> => {
+}): Promise<void> => {
 	const { endpoint, parameters, user } = request;
 	const { status, code, id } = assertion;
 	const res = await api(endpoint, parameters, user);
 	assert.strictEqual(res.status, status, inspect(res.body));
-	assert.strictEqual(res.body.error.code, code, inspect(res.body));
-	assert.strictEqual(res.body.error.id, id, inspect(res.body));
-	return res.body;
+	assert.ok(res.body);
+	assert.strictEqual(castAsError(res.body as any).error.code, code, inspect(res.body));
+	assert.strictEqual(castAsError(res.body as any).error.id, id, inspect(res.body));
 };
 
-export const api = async <E extends keyof misskey.Endpoints>(path: E, params: misskey.Endpoints[E]['req'], me?: UserToken): Promise<{
+export const api = async <E extends keyof misskey.Endpoints, P extends misskey.Endpoints[E]['req']>(path: E, params: P, me?: UserToken): Promise<{
 	status: number,
 	headers: Headers,
-	body: any
+	body: misskey.api.SwitchCaseResponseType<E, P>
 }> => {
 	const bodyAuth: Record<string, string> = {};
 	const headers: Record<string, string> = {
@@ -89,13 +91,14 @@ export const api = async <E extends keyof misskey.Endpoints>(path: E, params: mi
 	});
 
 	const body = res.headers.get('content-type') === 'application/json; charset=utf-8'
-		? await res.json()
+		? await res.json() as misskey.api.SwitchCaseResponseType<E, P>
 		: null;
 
 	return {
 		status: res.status,
 		headers: res.headers,
-		body,
+		// FIXME: removing this non-null assertion: requires better typing around empty response.
+		body: body!,
 	};
 };
 
@@ -141,7 +144,8 @@ export const post = async (user: UserToken, params: misskey.Endpoints['notes/cre
 
 	const res = await api('notes/create', q, user);
 
-	return res.body ? res.body.createdNote : null;
+	// FIXME: the return type should reflect this fact.
+	return (res.body ? res.body.createdNote : null)!;
 };
 
 export const createAppToken = async (user: UserToken, permissions: (typeof misskey.permissions)[number][]) => {
@@ -635,3 +639,9 @@ export async function sendEnvResetRequest() {
 		throw new Error('server env update failed.');
 	}
 }
+
+// 与えられた値を強制的にエラーとみなす。この関数は型安全性を破壊するため、異常系のアサーション以外で用いられるべきではない。
+// FIXME(misskey-js): misskey-jsがエラー情報を公開するようになったらこの関数を廃止する
+export function castAsError(obj: Record<string, unknown>): { error: ApiError } {
+	return obj as { error: ApiError };
+}

From 6dd6fcf88f621d787c6524d81844b1d514434859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 14 Jul 2024 14:49:50 +0900
Subject: [PATCH 045/221] =?UTF-8?q?enhance(frontend):=20=E3=82=B5=E3=83=BC?=
 =?UTF-8?q?=E3=83=90=E3=83=BC=E6=83=85=E5=A0=B1=E3=83=BB=E3=81=8A=E5=95=8F?=
 =?UTF-8?q?=E3=81=84=E5=90=88=E3=82=8F=E3=81=9B=E3=83=9A=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=82=92=E6=94=B9=E4=BF=AE=20(#14198)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* improve(frontend): サーバー情報・お問い合わせページを改修 (#238)

* Revert "Revert "enhance(frontend): add contact page" (#208)" (This reverts commit 5a329a09c987b3249f97f9d53af67d1bffb09eea.)

* improve(frontend): サーバー情報・お問い合わせページを改修

(cherry picked from commit e72758d8cda3db009c5d1bf1f4141682931b91f8)

* fix

* Update Changelog

* tweak

* lint

* 既存の翻訳を使用するように

---------

Co-authored-by: taiy <53635909+taiyme@users.noreply.github.com>
---
 CHANGELOG.md                                  |   2 +
 packages/frontend/src/components/MkMenu.vue   |   1 +
 .../src/components/MkVisitorDashboard.vue     |  11 +-
 .../frontend/src/pages/about.overview.vue     | 205 ++++++++++++++++++
 packages/frontend/src/pages/about.vue         | 201 +----------------
 packages/frontend/src/pages/contact.vue       |  26 ++-
 packages/frontend/src/ui/_common_/common.ts   |  24 +-
 7 files changed, 250 insertions(+), 220 deletions(-)
 create mode 100644 packages/frontend/src/pages/about.overview.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcc2aa29c6..6e411e5329 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@
 - Enhance: 非ログイン時のハイライトTLのデザインを改善
 - Enhance: フロントエンドのアクセシビリティ改善  
   (Based on https://github.com/taiyme/misskey/pull/226)
+- Enhance: サーバー情報ページ・お問い合わせページを改善  
+  (Cherry-picked from https://github.com/taiyme/misskey/pull/238)
 - Fix: `/about#federation` ページなどで各インスタンスのチャートが表示されなくなっていた問題を修正
 - Fix: ユーザーページの追加情報のラベルを投稿者のサーバーの絵文字で表示する (#13968)
 - Fix: リバーシの対局を正しく共有できないことがある問題を修正
diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue
index 68479989b2..2276da1d21 100644
--- a/packages/frontend/src/components/MkMenu.vue
+++ b/packages/frontend/src/components/MkMenu.vue
@@ -54,6 +54,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				:class="['_button', $style.item]"
 				:href="item.href"
 				:target="item.target"
+				:rel="item.target === '_blank' ? 'noopener noreferrer' : undefined"
 				:download="item.download"
 				@click.passive="close(true)"
 				@mouseenter.passive="onItemMouseEnter"
diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue
index 4d81bd0283..445780eca7 100644
--- a/packages/frontend/src/components/MkVisitorDashboard.vue
+++ b/packages/frontend/src/components/MkVisitorDashboard.vue
@@ -23,7 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 			<div class="_gaps_s" :class="$style.mainActions">
 				<MkButton :class="$style.mainAction" full rounded gradate data-cy-signup style="margin-right: 12px;" @click="signup()">{{ i18n.ts.joinThisServer }}</MkButton>
-				<MkButton :class="$style.mainAction" full rounded @click="exploreOtherServers()">{{ i18n.ts.exploreOtherServers }}</MkButton>
+				<MkButton :class="$style.mainAction" full rounded link to="https://misskey-hub.net/servers/">{{ i18n.ts.exploreOtherServers }}</MkButton>
 				<MkButton :class="$style.mainAction" full rounded data-cy-signin @click="signin()">{{ i18n.ts.login }}</MkButton>
 			</div>
 		</div>
@@ -65,7 +65,8 @@ import { i18n } from '@/i18n.js';
 import { instance } from '@/instance.js';
 import MkNumber from '@/components/MkNumber.vue';
 import XActiveUsersChart from '@/components/MkVisitorDashboard.ActiveUsersChart.vue';
-import { openInstanceMenu } from '@/ui/_common_/common';
+import { openInstanceMenu } from '@/ui/_common_/common.js';
+import type { MenuItem } from '@/types/menu.js';
 
 const stats = ref<Misskey.entities.StatsResponse | null>(null);
 
@@ -89,13 +90,9 @@ function signup() {
 	});
 }
 
-function showMenu(ev) {
+function showMenu(ev: MouseEvent) {
 	openInstanceMenu(ev);
 }
-
-function exploreOtherServers() {
-	window.open('https://misskey-hub.net/servers/', '_blank', 'noopener');
-}
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/pages/about.overview.vue b/packages/frontend/src/pages/about.overview.vue
new file mode 100644
index 0000000000..84419b3bef
--- /dev/null
+++ b/packages/frontend/src/pages/about.overview.vue
@@ -0,0 +1,205 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<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>
+
+	<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.tsx.poweredByMisskeyDescription({ name: instance.name ?? host })">
+			</div>
+			<FormLink to="/about-misskey">
+				<template #icon><i class="ti ti-info-circle"></i></template>
+				{{ i18n.ts.aboutMisskey }}
+			</FormLink>
+			<FormLink v-if="instance.repositoryUrl || instance.providesTarball" :to="instance.repositoryUrl || `/tarball/misskey-${version}.tar.gz`" external>
+				<template #icon><i class="ti ti-code"></i></template>
+				{{ i18n.ts.sourceCode }}
+			</FormLink>
+			<MkInfo v-else warn>
+				{{ i18n.ts.sourceCodeIsNotYetProvided }}
+			</MkInfo>
+		</div>
+	</FormSection>
+
+	<FormSection>
+		<div class="_gaps_m">
+			<FormSplit>
+				<MkKeyValue :copy="instance.maintainerName">
+					<template #key>{{ i18n.ts.administrator }}</template>
+					<template #value>
+						<template v-if="instance.maintainerName">{{ instance.maintainerName }}</template>
+						<span v-else style="opacity: 0.7;">({{ i18n.ts.none }})</span>
+					</template>
+				</MkKeyValue>
+				<MkKeyValue :copy="instance.maintainerEmail">
+					<template #key>{{ i18n.ts.contact }}</template>
+					<template #value>
+						<template v-if="instance.maintainerEmail">{{ instance.maintainerEmail }}</template>
+						<span v-else style="opacity: 0.7;">({{ i18n.ts.none }})</span>
+					</template>
+				</MkKeyValue>
+				<MkKeyValue>
+					<template #key>{{ i18n.ts.inquiry }}</template>
+					<template #value>
+						<MkLink v-if="instance.inquiryUrl" :url="instance.inquiryUrl" target="_blank">{{ instance.inquiryUrl }}</MkLink>
+						<span v-else style="opacity: 0.7;">({{ i18n.ts.none }})</span>
+					</template>
+				</MkKeyValue>
+			</FormSplit>
+			<div class="_gaps_s">
+				<FormLink v-if="instance.impressumUrl" :to="instance.impressumUrl" external>
+					<template #icon><i class="ti ti-user-shield"></i></template>
+					<template #default>{{ i18n.ts.impressum }}</template>
+				</FormLink>
+				<MkFolder v-if="instance.serverRules.length > 0">
+					<template #icon><i class="ti ti-checkup-list"></i></template>
+					<template #label>{{ i18n.ts.serverRules }}</template>
+					<ol class="_gaps_s" :class="$style.rules">
+						<li v-for="item in instance.serverRules" :key="item" :class="$style.rule">
+							<div :class="$style.ruleText" v-html="item"></div>
+						</li>
+					</ol>
+				</MkFolder>
+				<FormLink v-if="instance.tosUrl" :to="instance.tosUrl" external>
+					<template #icon><i class="ti ti-license"></i></template>
+					<template #default>{{ i18n.ts.termsOfService }}</template>
+				</FormLink>
+				<FormLink v-if="instance.privacyPolicyUrl" :to="instance.privacyPolicyUrl" external>
+					<template #icon><i class="ti ti-shield-lock"></i></template>
+					<template #default>{{ i18n.ts.privacyPolicy }}</template>
+				</FormLink>
+				<FormLink v-if="instance.feedbackUrl" :to="instance.feedbackUrl" external>
+					<template #icon><i class="ti ti-message"></i></template>
+					<template #default>{{ i18n.ts.feedback }}</template>
+				</FormLink>
+			</div>
+		</div>
+	</FormSection>
+
+	<FormSuspense v-slot="{ result: stats }" :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>
+</template>
+
+<script lang="ts" setup>
+import { host, version } from '@/config.js';
+import { i18n } from '@/i18n.js';
+import { instance } from '@/instance.js';
+import number from '@/filters/number.js';
+import { misskeyApi } from '@/scripts/misskey-api.js';
+import FormLink from '@/components/form/link.vue';
+import FormSection from '@/components/form/section.vue';
+import FormSplit from '@/components/form/split.vue';
+import FormSuspense from '@/components/form/suspense.vue';
+import MkFolder from '@/components/MkFolder.vue';
+import MkKeyValue from '@/components/MkKeyValue.vue';
+import MkLink from '@/components/MkLink.vue';
+
+const initStats = () => misskeyApi('stats', {});
+</script>
+
+<style lang="scss" module>
+.banner {
+	text-align: center;
+	border-radius: 10px;
+	overflow: clip;
+	background-color: var(--panel);
+	background-size: cover;
+	background-position: center center;
+}
+
+.bannerIcon {
+	display: block;
+	margin: 16px auto 0 auto;
+	height: 64px;
+	border-radius: 8px;
+}
+
+.bannerName {
+	display: block;
+	padding: 16px;
+	color: #fff;
+	text-shadow: 0 0 8px #000;
+	background: linear-gradient(transparent, rgba(0, 0, 0, 0.7));
+}
+
+.rules {
+	counter-reset: item;
+	list-style: none;
+	padding: 0;
+	margin: 0;
+}
+
+.rule {
+	display: flex;
+	gap: 8px;
+	word-break: break-word;
+
+	&::before {
+		flex-shrink: 0;
+		display: flex;
+		position: sticky;
+		top: calc(var(--stickyTop, 0px) + 8px);
+		counter-increment: item;
+		content: counter(item);
+		width: 32px;
+		height: 32px;
+		line-height: 32px;
+		background-color: var(--accentedBg);
+		color: var(--accent);
+		font-size: 13px;
+		font-weight: bold;
+		align-items: center;
+		justify-content: center;
+		border-radius: 999px;
+	}
+}
+
+.ruleText {
+	padding-top: 6px;
+}
+</style>
diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue
index 324d1c11de..8dfeb6d2a7 100644
--- a/packages/frontend/src/pages/about.vue
+++ b/packages/frontend/src/pages/about.vue
@@ -8,113 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<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>
-
-				<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.tsx.poweredByMisskeyDescription({ name: instance.name ?? host })">
-						</div>
-						<FormLink to="/about-misskey">
-							<template #icon><i class="ti ti-info-circle"></i></template>
-							{{ i18n.ts.aboutMisskey }}
-						</FormLink>
-						<FormLink v-if="instance.repositoryUrl || instance.providesTarball" :to="instance.repositoryUrl || `/tarball/misskey-${version}.tar.gz`" external>
-							<template #icon><i class="ti ti-code"></i></template>
-							{{ i18n.ts.sourceCode }}
-						</FormLink>
-						<MkInfo v-else warn>
-							{{ i18n.ts.sourceCodeIsNotYetProvided }}
-						</MkInfo>
-					</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>
-						</FormSplit>
-						<FormLink v-if="instance.impressumUrl" :to="instance.impressumUrl" external>
-							<template #icon><i class="ti ti-user-shield"></i></template>
-							{{ i18n.ts.impressum }}
-						</FormLink>
-						<div class="_gaps_s">
-							<MkFolder v-if="instance.serverRules.length > 0">
-								<template #label>
-									<i class="ti ti-checkup-list"></i>
-									{{ 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>
-								<template #icon><i class="ti ti-license"></i></template>
-								{{ i18n.ts.termsOfService }}
-							</FormLink>
-							<FormLink v-if="instance.privacyPolicyUrl" :to="instance.privacyPolicyUrl" external>
-								<template #icon><i class="ti ti-shield-lock"></i></template>
-								{{ i18n.ts.privacyPolicy }}
-							</FormLink>
-							<FormLink v-if="instance.feedbackUrl" :to="instance.feedbackUrl" external>
-								<template #icon><i class="ti ti-message"></i></template>
-								{{ i18n.ts.feedback }}
-							</FormLink>
-						</div>
-					</div>
-				</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>
-					</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>
+			<XOverview/>
 		</MkSpacer>
 		<MkSpacer v-else-if="tab === 'emojis'" :contentMax="1000" :marginMin="20">
 			<XEmojis/>
@@ -130,26 +24,16 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, watch, ref } from 'vue';
-import * as Misskey from 'misskey-js';
-import XEmojis from './about.emojis.vue';
-import XFederation from './about.federation.vue';
-import { version, host } from '@/config.js';
-import FormLink from '@/components/form/link.vue';
-import FormSection from '@/components/form/section.vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import FormSplit from '@/components/form/split.vue';
-import MkFolder from '@/components/MkFolder.vue';
-import MkKeyValue from '@/components/MkKeyValue.vue';
-import MkInfo from '@/components/MkInfo.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 { computed, defineAsyncComponent, ref, watch } from 'vue';
 import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { claimAchievement } from '@/scripts/achievements.js';
-import { instance } from '@/instance.js';
+import { definePageMetadata } from '@/scripts/page-metadata.js';
+import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
+
+const XOverview = defineAsyncComponent(() => import('@/pages/about.overview.vue'));
+const XEmojis = defineAsyncComponent(() => import('@/pages/about.emojis.vue'));
+const XFederation = defineAsyncComponent(() => import('@/pages/about.federation.vue'));
+const MkInstanceStats = defineAsyncComponent(() => import('@/components/MkInstanceStats.vue'));
 
 const props = withDefaults(defineProps<{
 	initialTab?: string;
@@ -157,7 +41,6 @@ const props = withDefaults(defineProps<{
 	initialTab: 'overview',
 });
 
-const stats = ref<Misskey.entities.StatsResponse | null>(null);
 const tab = ref(props.initialTab);
 
 watch(tab, () => {
@@ -166,11 +49,6 @@ watch(tab, () => {
 	}
 });
 
-const initStats = () => misskeyApi('stats', {
-}).then((res) => {
-	stats.value = res;
-});
-
 const headerActions = computed(() => []);
 
 const headerTabs = computed(() => [{
@@ -195,64 +73,3 @@ definePageMetadata(() => ({
 	icon: 'ti ti-info-circle',
 }));
 </script>
-
-<style lang="scss" module>
-.banner {
-	text-align: center;
-	border-radius: 10px;
-	overflow: clip;
-	background-size: cover;
-	background-position: center center;
-}
-
-.bannerIcon {
-	display: block;
-	margin: 16px auto 0 auto;
-	height: 64px;
-	border-radius: 8px;
-}
-
-.bannerName {
-	display: block;
-	padding: 16px;
-	color: #fff;
-	text-shadow: 0 0 8px #000;
-	background: linear-gradient(transparent, rgba(0, 0, 0, 0.7));
-}
-
-.rules {
-	counter-reset: item;
-	list-style: none;
-	padding: 0;
-	margin: 0;
-}
-
-.rule {
-	display: flex;
-	gap: 8px;
-	word-break: break-word;
-
-	&::before {
-		flex-shrink: 0;
-		display: flex;
-		position: sticky;
-		top: calc(var(--stickyTop, 0px) + 8px);
-		counter-increment: item;
-		content: counter(item);
-		width: 32px;
-		height: 32px;
-		line-height: 32px;
-		background-color: var(--accentedBg);
-		color: var(--accent);
-		font-size: 13px;
-		font-weight: bold;
-		align-items: center;
-		justify-content: center;
-		border-radius: 999px;
-	}
-}
-
-.ruleText {
-	padding-top: 6px;
-}
-</style>
diff --git a/packages/frontend/src/pages/contact.vue b/packages/frontend/src/pages/contact.vue
index bcdcf43275..1f2bee5a77 100644
--- a/packages/frontend/src/pages/contact.vue
+++ b/packages/frontend/src/pages/contact.vue
@@ -7,18 +7,26 @@ SPDX-License-Identifier: AGPL-3.0-only
 <MkStickyContainer>
 	<template #header><MkPageHeader/></template>
 	<MkSpacer :contentMax="600" :marginMin="20">
-		<div class="_gaps">
-			<MkKeyValue>
-				<template #key>{{ i18n.ts.inquiry }}</template>
+		<div class="_gaps_m">
+			<MkKeyValue :copy="instance.maintainerName">
+				<template #key>{{ i18n.ts.administrator }}</template>
 				<template #value>
-					<MkLink :url="instance.inquiryUrl" target="_blank">{{ instance.inquiryUrl }}</MkLink>
+					<template v-if="instance.maintainerName">{{ instance.maintainerName }}</template>
+					<span v-else style="opacity: 0.7;">({{ i18n.ts.none }})</span>
 				</template>
 			</MkKeyValue>
-
-			<MkKeyValue>
-				<template #key>{{ i18n.ts.email }}</template>
+			<MkKeyValue :copy="instance.maintainerEmail">
+				<template #key>{{ i18n.ts.contact }}</template>
 				<template #value>
-					<div>{{ instance.maintainerEmail }}</div>
+					<template v-if="instance.maintainerEmail">{{ instance.maintainerEmail }}</template>
+					<span v-else style="opacity: 0.7;">({{ i18n.ts.none }})</span>
+				</template>
+			</MkKeyValue>
+			<MkKeyValue :copy="instance.inquiryUrl">
+				<template #key>{{ i18n.ts.inquiry }}</template>
+				<template #value>
+					<MkLink v-if="instance.inquiryUrl" :url="instance.inquiryUrl" target="_blank">{{ instance.inquiryUrl }}</MkLink>
+					<span v-else style="opacity: 0.7;">({{ i18n.ts.none }})</span>
 				</template>
 			</MkKeyValue>
 		</div>
@@ -28,8 +36,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { instance } from '@/instance.js';
+import { definePageMetadata } from '@/scripts/page-metadata.js';
 import MkKeyValue from '@/components/MkKeyValue.vue';
 import MkLink from '@/components/MkLink.vue';
 
diff --git a/packages/frontend/src/ui/_common_/common.ts b/packages/frontend/src/ui/_common_/common.ts
index 20a280f681..74c3028745 100644
--- a/packages/frontend/src/ui/_common_/common.ts
+++ b/packages/frontend/src/ui/_common_/common.ts
@@ -85,29 +85,29 @@ export function openInstanceMenu(ev: MouseEvent) {
 		icon: 'ti ti-help-circle',
 		to: '/contact',
 	}, (instance.impressumUrl) ? {
+		type: 'a',
 		text: i18n.ts.impressum,
 		icon: 'ti ti-file-invoice',
-		action: () => {
-			window.open(instance.impressumUrl, '_blank', 'noopener');
-		},
+		href: instance.impressumUrl,
+		target: '_blank',
 	} : undefined, (instance.tosUrl) ? {
+		type: 'a',
 		text: i18n.ts.termsOfService,
 		icon: 'ti ti-notebook',
-		action: () => {
-			window.open(instance.tosUrl, '_blank', 'noopener');
-		},
+		href: instance.tosUrl,
+		target: '_blank',
 	} : undefined, (instance.privacyPolicyUrl) ? {
+		type: 'a',
 		text: i18n.ts.privacyPolicy,
 		icon: 'ti ti-shield-lock',
-		action: () => {
-			window.open(instance.privacyPolicyUrl, '_blank', 'noopener');
-		},
+		href: instance.privacyPolicyUrl,
+		target: '_blank',
 	} : undefined, (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl) ? undefined : { type: 'divider' }, {
+		type: 'a',
 		text: i18n.ts.document,
 		icon: 'ti ti-bulb',
-		action: () => {
-			window.open('https://misskey-hub.net/docs/for-users/', '_blank', 'noopener');
-		},
+		href: 'https://misskey-hub.net/docs/for-users/',
+		target: '_blank',
 	}, ($i) ? {
 		text: i18n.ts._initialTutorial.launchTutorial,
 		icon: 'ti ti-presentation',

From 3c032dd5b917c97bf8fb1b87a69f36d56537f493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 14 Jul 2024 15:27:52 +0900
Subject: [PATCH 046/221] =?UTF-8?q?enhance:=20=E9=9D=9E=E3=83=AD=E3=82=B0?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E6=99=82=E3=81=AB=E3=81=AF=E5=88=A5=E3=82=B5?=
 =?UTF-8?q?=E3=83=BC=E3=83=90=E3=83=BC=E3=81=AB=E9=81=B7=E7=A7=BB=E3=81=A7?=
 =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(#13089)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance: 非ログイン時にはMisskey Hub経由で別サーバーに遷移できるように

* fix

* サーバーサイド照会を削除

* クライアント側の照会動作

* hubを経由せずにリモートで続行できるように

* fix と pleaseLogin誘導箇所の追加

* fix

* fix

* Update CHANGELOG.md

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
 CHANGELOG.md                                  |   1 +
 locales/index.d.ts                            |  26 +++-
 locales/ja-JP.yml                             |   8 +-
 .../src/components/MkFollowButton.vue         |   6 +-
 packages/frontend/src/components/MkNote.vue   |  14 +-
 .../src/components/MkNoteDetailed.vue         |  14 +-
 packages/frontend/src/components/MkPoll.vue   |   8 +-
 packages/frontend/src/components/MkSignin.vue | 133 +++++++++++++++---
 .../src/components/MkSigninDialog.vue         |   9 +-
 .../frontend/src/components/MkUserInfo.vue    |   2 +-
 packages/frontend/src/os.ts                   |  10 ++
 packages/frontend/src/pages/flash/flash.vue   |   3 +
 packages/frontend/src/pages/follow.vue        |  71 ----------
 packages/frontend/src/pages/lookup.vue        |  97 +++++++++++++
 packages/frontend/src/pages/user/home.vue     |   4 +-
 packages/frontend/src/router/definition.ts    |  12 +-
 .../frontend/src/scripts/get-user-menu.ts     |   4 +-
 packages/frontend/src/scripts/please-login.ts |  16 ++-
 packages/frontend/src/scripts/url.ts          |   5 +
 19 files changed, 330 insertions(+), 113 deletions(-)
 delete mode 100644 packages/frontend/src/pages/follow.vue
 create mode 100644 packages/frontend/src/pages/lookup.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e411e5329..2156c81474 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 
 ### Client
 - Enhance: 内蔵APIドキュメントのデザイン・パフォーマンスを改善
+- Enhance: 非ログイン時に他サーバーに遷移するアクションを追加
 - Enhance: 非ログイン時のハイライトTLのデザインを改善
 - Enhance: フロントエンドのアクセシビリティ改善  
   (Based on https://github.com/taiyme/misskey/pull/226)
diff --git a/locales/index.d.ts b/locales/index.d.ts
index c2f8e944dd..84a402b0de 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -736,6 +736,22 @@ export interface Locale extends ILocale {
      * リモートで表示
      */
     "showOnRemote": string;
+    /**
+     * リモートで続行
+     */
+    "continueOnRemote": string;
+    /**
+     * Misskey Hubからサーバーを選択
+     */
+    "chooseServerOnMisskeyHub": string;
+    /**
+     * サーバーのドメインを直接指定
+     */
+    "specifyServerHost": string;
+    /**
+     * ドメインを入力してください
+     */
+    "inputHostName": string;
     /**
      * 全般
      */
@@ -1921,9 +1937,13 @@ export interface Locale extends ILocale {
      */
     "onlyOneFileCanBeAttached": string;
     /**
-     * 続行する前に、サインアップまたはサインインが必要です
+     * 続行する前に、登録またはログインが必要です
      */
     "signinRequired": string;
+    /**
+     * 続行するには、お使いのサーバーに移動するか、このサーバーに登録・ログインする必要があります
+     */
+    "signinOrContinueOnRemote": string;
     /**
      * 招待
      */
@@ -4984,6 +5004,10 @@ export interface Locale extends ILocale {
      * お問い合わせ
      */
     "inquiry": string;
+     /**
+     * もう一度お試しください。
+     */
+    "tryAgain": string;
     "_delivery": {
         /**
          * 配信状態
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 8d117e6dc8..bb3999f0e3 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -180,6 +180,10 @@ addAccount: "アカウントを追加"
 reloadAccountsList: "アカウントリストの情報を更新"
 loginFailed: "ログインに失敗しました"
 showOnRemote: "リモートで表示"
+continueOnRemote: "リモートで続行"
+chooseServerOnMisskeyHub: "Misskey Hubからサーバーを選択"
+specifyServerHost: "サーバーのドメインを直接指定"
+inputHostName: "ドメインを入力してください"
 general: "全般"
 wallpaper: "壁紙"
 setWallpaper: "壁紙を設定"
@@ -476,7 +480,8 @@ attachAsFileQuestion: "クリップボードのテキストが長いです。テ
 noMessagesYet: "まだチャットはありません"
 newMessageExists: "新しいメッセージがあります"
 onlyOneFileCanBeAttached: "メッセージに添付できるファイルはひとつです"
-signinRequired: "続行する前に、サインアップまたはサインインが必要です"
+signinRequired: "続行する前に、登録またはログインが必要です"
+signinOrContinueOnRemote: "続行するには、お使いのサーバーに移動するか、このサーバーに登録・ログインする必要があります"
 invitations: "招待"
 invitationCode: "招待コード"
 checking: "確認しています"
@@ -1242,6 +1247,7 @@ keepOriginalFilenameDescription: "この設定をオフにすると、アップ
 noDescription: "説明文はありません"
 alwaysConfirmFollow: "フォローの際常に確認する"
 inquiry: "お問い合わせ"
+tryAgain: "もう一度お試しください。"
 
 _delivery:
   status: "配信状態"
diff --git a/packages/frontend/src/components/MkFollowButton.vue b/packages/frontend/src/components/MkFollowButton.vue
index ea76950c0d..d8ac8024b4 100644
--- a/packages/frontend/src/components/MkFollowButton.vue
+++ b/packages/frontend/src/components/MkFollowButton.vue
@@ -42,6 +42,8 @@ import { misskeyApi } from '@/scripts/misskey-api.js';
 import { useStream } from '@/stream.js';
 import { i18n } from '@/i18n.js';
 import { claimAchievement } from '@/scripts/achievements.js';
+import { pleaseLogin } from '@/scripts/please-login.js';
+import { host } from '@/config.js';
 import { $i } from '@/account.js';
 import { defaultStore } from '@/store.js';
 
@@ -63,7 +65,7 @@ const hasPendingFollowRequestFromYou = ref(props.user.hasPendingFollowRequestFro
 const wait = ref(false);
 const connection = useStream().useChannel('main');
 
-if (props.user.isFollowing == null) {
+if (props.user.isFollowing == null && $i) {
 	misskeyApi('users/show', {
 		userId: props.user.id,
 	})
@@ -78,6 +80,8 @@ function onFollowChange(user: Misskey.entities.UserDetailed) {
 }
 
 async function onClick() {
+	pleaseLogin(undefined, { type: 'web', path: `/@${props.user.username}@${props.user.host ?? host}` });
+
 	wait.value = true;
 
 	try {
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 420ff2c651..c518c7dd41 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -196,6 +196,7 @@ import { MenuItem } from '@/types/menu.js';
 import MkRippleEffect from '@/components/MkRippleEffect.vue';
 import { showMovedDialog } from '@/scripts/show-moved-dialog.js';
 import { shouldCollapsed } from '@/scripts/collapsed.js';
+import { host } from '@/config.js';
 import { isEnabledUrlPreview } from '@/instance.js';
 import { type Keymap } from '@/scripts/hotkey.js';
 import { focusPrev, focusNext } from '@/scripts/focus.js';
@@ -278,6 +279,11 @@ const renoteCollapsed = ref(
 	),
 );
 
+const pleaseLoginContext = {
+	type: 'lookup',
+	path: `https://${host}/notes/${appearNote.value.id}`,
+} as const;
+
 /* 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';
@@ -411,7 +417,7 @@ if (!props.mock) {
 }
 
 function renote(viaKeyboard = false) {
-	pleaseLogin();
+	pleaseLogin(undefined, pleaseLoginContext);
 	showMovedDialog();
 
 	const { menu } = getRenoteMenu({ note: note.value, renoteButton, mock: props.mock });
@@ -421,7 +427,7 @@ function renote(viaKeyboard = false) {
 }
 
 function reply(): void {
-	pleaseLogin();
+	pleaseLogin(undefined, pleaseLoginContext);
 	if (props.mock) {
 		return;
 	}
@@ -434,7 +440,7 @@ function reply(): void {
 }
 
 function react(): void {
-	pleaseLogin();
+	pleaseLogin(undefined, pleaseLoginContext);
 	showMovedDialog();
 	if (appearNote.value.reactionAcceptance === 'likeOnly') {
 		sound.playMisskeySfx('reaction');
@@ -565,7 +571,7 @@ function showRenoteMenu(): void {
 	}
 
 	if (isMyRenote) {
-		pleaseLogin();
+		pleaseLogin(undefined, pleaseLoginContext);
 		os.popupMenu([
 			getCopyNoteLinkMenu(note.value, i18n.ts.copyLinkRenote),
 			{ type: 'divider' },
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index a8fed56c39..737e9a853a 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -222,6 +222,7 @@ import { reactionPicker } from '@/scripts/reaction-picker.js';
 import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm.js';
 import { $i } from '@/account.js';
 import { i18n } from '@/i18n.js';
+import { host } from '@/config.js';
 import { getNoteClipMenu, getNoteMenu, getRenoteMenu } from '@/scripts/get-note-menu.js';
 import { useNoteCapture } from '@/scripts/use-note-capture.js';
 import { deepClone } from '@/scripts/clone.js';
@@ -296,6 +297,11 @@ const conversation = ref<Misskey.entities.Note[]>([]);
 const replies = ref<Misskey.entities.Note[]>([]);
 const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || appearNote.value.userId === $i?.id);
 
+const pleaseLoginContext = {
+	type: 'lookup',
+	path: `https://${host}/notes/${appearNote.value.id}`,
+} as const;
+
 const keymap = {
 	'r': () => reply(),
 	'e|a|plus': () => react(),
@@ -396,7 +402,7 @@ if (appearNote.value.reactionAcceptance === 'likeOnly') {
 }
 
 function renote() {
-	pleaseLogin();
+	pleaseLogin(undefined, pleaseLoginContext);
 	showMovedDialog();
 
 	const { menu } = getRenoteMenu({ note: note.value, renoteButton });
@@ -404,7 +410,7 @@ function renote() {
 }
 
 function reply(): void {
-	pleaseLogin();
+	pleaseLogin(undefined, pleaseLoginContext);
 	showMovedDialog();
 	os.post({
 		reply: appearNote.value,
@@ -415,7 +421,7 @@ function reply(): void {
 }
 
 function react(): void {
-	pleaseLogin();
+	pleaseLogin(undefined, pleaseLoginContext);
 	showMovedDialog();
 	if (appearNote.value.reactionAcceptance === 'likeOnly') {
 		sound.playMisskeySfx('reaction');
@@ -499,7 +505,7 @@ async function clip(): Promise<void> {
 
 function showRenoteMenu(): void {
 	if (!isMyRenote) return;
-	pleaseLogin();
+	pleaseLogin(undefined, pleaseLoginContext);
 	os.popupMenu([{
 		text: i18n.ts.unrenote,
 		icon: 'ti ti-trash',
diff --git a/packages/frontend/src/components/MkPoll.vue b/packages/frontend/src/components/MkPoll.vue
index a98690f1c3..82e2a605f1 100644
--- a/packages/frontend/src/components/MkPoll.vue
+++ b/packages/frontend/src/components/MkPoll.vue
@@ -34,6 +34,7 @@ import { pleaseLogin } from '@/scripts/please-login.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { i18n } from '@/i18n.js';
+import { host } from '@/config.js';
 import { useInterval } from '@/scripts/use-interval.js';
 
 const props = defineProps<{
@@ -60,6 +61,11 @@ const timer = computed(() => i18n.tsx._poll[
 
 const showResult = ref(props.readOnly || isVoted.value);
 
+const pleaseLoginContext = {
+	type: 'lookup',
+	path: `https://${host}/notes/${props.note.id}`,
+} as const;
+
 // 期限付きアンケート
 if (props.poll.expiresAt) {
 	const tick = () => {
@@ -76,7 +82,7 @@ if (props.poll.expiresAt) {
 }
 
 const vote = async (id) => {
-	pleaseLogin();
+	pleaseLogin(undefined, pleaseLoginContext);
 
 	if (props.readOnly || closed.value || isVoted.value) return;
 
diff --git a/packages/frontend/src/components/MkSignin.vue b/packages/frontend/src/components/MkSignin.vue
index db32cdd6a1..746ddd7154 100644
--- a/packages/frontend/src/components/MkSignin.vue
+++ b/packages/frontend/src/components/MkSignin.vue
@@ -6,10 +6,23 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <form :class="{ signing, totpLogin }" @submit.prevent="onSubmit">
 	<div class="_gaps_m">
-		<div v-show="withAvatar" :class="$style.avatar" :style="{ backgroundImage: user ? `url('${ user.avatarUrl }')` : undefined, marginBottom: message ? '1.5em' : undefined }"></div>
+		<div v-show="withAvatar" :class="$style.avatar" :style="{ backgroundImage: user ? `url('${user.avatarUrl}')` : undefined, marginBottom: message ? '1.5em' : undefined }"></div>
 		<MkInfo v-if="message">
 			{{ message }}
 		</MkInfo>
+		<div v-if="openOnRemote" class="_gaps_m">
+			<div class="_gaps_s">
+				<MkButton type="button" rounded primary style="margin: 0 auto;" @click="openRemote(openOnRemote)">
+					{{ i18n.ts.continueOnRemote }} <i class="ti ti-external-link"></i>
+				</MkButton>
+				<button type="button" class="_button" :class="$style.instanceManualSelectButton" @click="specifyHostAndOpenRemote(openOnRemote)">
+					{{ i18n.ts.specifyServerHost }}
+				</button>
+			</div>
+			<div :class="$style.orHr">
+				<p :class="$style.orMsg">{{ i18n.ts.or }}</p>
+			</div>
+		</div>
 		<div v-if="!totpLogin" class="normal-signin _gaps_m">
 			<MkInput v-model="username" :placeholder="i18n.ts.username" type="text" pattern="^[a-zA-Z0-9_]+$" :spellcheck="false" autocomplete="username webauthn" autofocus required data-cy-signin-username @update:modelValue="onUsernameChange">
 				<template #prefix>@</template>
@@ -28,8 +41,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 					{{ i18n.ts.retry }}
 				</MkButton>
 			</div>
-			<div v-if="user && user.securityKeys" class="or-hr">
-				<p class="or-msg">{{ i18n.ts.or }}</p>
+			<div v-if="user && user.securityKeys" :class="$style.orHr">
+				<p :class="$style.orMsg">{{ i18n.ts.or }}</p>
 			</div>
 			<div class="twofa-group totp-group _gaps">
 				<MkInput v-if="user && user.usePasswordLessLogin" v-model="password" type="password" autocomplete="current-password" :withPasswordToggle="true" required>
@@ -53,6 +66,7 @@ import { defineAsyncComponent, ref } from 'vue';
 import { toUnicode } from 'punycode/';
 import * as Misskey from 'misskey-js';
 import { supported as webAuthnSupported, get as webAuthnRequest, parseRequestOptionsFromJSON } from '@github/webauthn-json/browser-ponyfill';
+import type { OpenOnRemoteOptions } from '@/scripts/please-login.js';
 import { showSuspendedDialog } from '@/scripts/show-suspended-dialog.js';
 import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/MkInput.vue';
@@ -60,6 +74,7 @@ import MkInfo from '@/components/MkInfo.vue';
 import { host as configHost } from '@/config.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
+import { query, extractDomain } from '@/scripts/url.js';
 import { login } from '@/account.js';
 import { i18n } from '@/i18n.js';
 
@@ -78,22 +93,16 @@ const emit = defineEmits<{
 	(ev: 'login', v: any): void;
 }>();
 
-const props = defineProps({
-	withAvatar: {
-		type: Boolean,
-		required: false,
-		default: true,
-	},
-	autoSet: {
-		type: Boolean,
-		required: false,
-		default: false,
-	},
-	message: {
-		type: String,
-		required: false,
-		default: '',
-	},
+const props = withDefaults(defineProps<{
+	withAvatar?: boolean;
+	autoSet?: boolean;
+	message?: string,
+	openOnRemote?: OpenOnRemoteOptions,
+}>(), {
+	withAvatar: true,
+	autoSet: false,
+	message: '',
+	openOnRemote: undefined,
 });
 
 function onUsernameChange(): void {
@@ -222,6 +231,60 @@ function resetPassword(): void {
 		closed: () => dispose(),
 	});
 }
+
+function openRemote(options: OpenOnRemoteOptions, targetHost?: string): void {
+	switch (options.type) {
+		case 'web':
+		case 'lookup': {
+			let _path = options.path;
+
+			if (options.type === 'lookup') {
+				// TODO: v2024.2.0以降が浸透してきたら正式なURLに変更する▼
+				// _path = `/lookup?uri=${encodeURIComponent(_path)}`;
+				_path = `/authorize-follow?acct=${encodeURIComponent(_path)}`;
+			}
+
+			if (targetHost) {
+				window.open(`https://${targetHost}${_path}`, '_blank', 'noopener');
+			} else {
+				window.open(`https://misskey-hub.net/mi-web/?path=${encodeURIComponent(_path)}`, '_blank', 'noopener');
+			}
+			break;
+		}
+		case 'share': {
+			const params = query(options.params);			
+			if (targetHost) {
+				window.open(`https://${targetHost}/share?${params}`, '_blank', 'noopener');
+			} else {
+				window.open(`https://misskey-hub.net/share/?${params}`, '_blank', 'noopener');
+			}
+			break;
+		}
+	}
+}
+
+async function specifyHostAndOpenRemote(options: OpenOnRemoteOptions): Promise<void> {
+	const { canceled, result: hostTemp } = await os.inputText({
+		title: i18n.ts.inputHostName,
+		placeholder: 'misskey.example.com',
+	});
+
+	if (canceled) return;
+
+	let targetHost: string | null = hostTemp;
+
+	// ドメイン部分だけを取り出す
+	targetHost = extractDomain(targetHost);
+	if (targetHost == null) {
+		os.alert({
+			type: 'error',
+			title: i18n.ts.invalidValue,
+			text: i18n.ts.tryAgain,
+		});
+		return;
+	}
+	openRemote(options, targetHost);
+}
 </script>
 
 <style lang="scss" module>
@@ -234,4 +297,36 @@ function resetPassword(): void {
 	background-size: cover;
 	border-radius: 100%;
 }
+
+.instanceManualSelectButton {
+	display: block;
+	text-align: center;
+	opacity: .7;
+	font-size: .8em;
+
+	&:hover {
+		text-decoration: underline;
+	}
+}
+
+.orHr {
+	position: relative;
+	margin: .4em auto;
+	width: 100%;
+	height: 1px;
+	background: var(--divider);
+}
+
+.orMsg {
+	position: absolute;
+	top: -.6em;
+	display: inline-block;
+	padding: 0 1em;
+	background: var(--panel);
+	font-size: 0.8em;
+	color: var(--fgOnPanel);
+	margin: 0;
+	left: 50%;
+	transform: translateX(-50%);
+}
 </style>
diff --git a/packages/frontend/src/components/MkSigninDialog.vue b/packages/frontend/src/components/MkSigninDialog.vue
index 33355bb99e..524c62b4d3 100644
--- a/packages/frontend/src/components/MkSigninDialog.vue
+++ b/packages/frontend/src/components/MkSigninDialog.vue
@@ -6,21 +6,22 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <MkModalWindow
 	ref="dialog"
-	:width="370"
-	:height="400"
+	:width="400"
+	:height="430"
 	@close="onClose"
 	@closed="emit('closed')"
 >
 	<template #header>{{ i18n.ts.login }}</template>
 
 	<MkSpacer :marginMin="20" :marginMax="28">
-		<MkSignin :autoSet="autoSet" :message="message" @login="onLogin"/>
+		<MkSignin :autoSet="autoSet" :message="message" :openOnRemote="openOnRemote" @login="onLogin"/>
 	</MkSpacer>
 </MkModalWindow>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue';
+import type { OpenOnRemoteOptions } from '@/scripts/please-login.js';
 import MkSignin from '@/components/MkSignin.vue';
 import MkModalWindow from '@/components/MkModalWindow.vue';
 import { i18n } from '@/i18n.js';
@@ -28,9 +29,11 @@ import { i18n } from '@/i18n.js';
 withDefaults(defineProps<{
 	autoSet?: boolean;
 	message?: string,
+	openOnRemote?: OpenOnRemoteOptions,
 }>(), {
 	autoSet: false,
 	message: '',
+	openOnRemote: undefined,
 });
 
 const emit = defineEmits<{
diff --git a/packages/frontend/src/components/MkUserInfo.vue b/packages/frontend/src/components/MkUserInfo.vue
index f247ba8fdd..d6f1ae453c 100644
--- a/packages/frontend/src/components/MkUserInfo.vue
+++ b/packages/frontend/src/components/MkUserInfo.vue
@@ -29,7 +29,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<p :class="$style.statusItemLabel">{{ i18n.ts.followers }}</p><span :class="$style.statusItemValue">{{ number(user.followersCount) }}</span>
 		</div>
 	</div>
-	<MkFollowButton v-if="$i && user.id != $i.id" :class="$style.follow" :user="user" mini/>
+	<MkFollowButton v-if="user.id != $i?.id" :class="$style.follow" :user="user" mini/>
 </div>
 </template>
 
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index 5e332533ef..a0b0e6c833 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -23,6 +23,7 @@ import MkPopupMenu from '@/components/MkPopupMenu.vue';
 import MkContextMenu from '@/components/MkContextMenu.vue';
 import { MenuItem } from '@/types/menu.js';
 import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { pleaseLogin } from '@/scripts/please-login.js';
 import { showMovedDialog } from '@/scripts/show-moved-dialog.js';
 import { getHTMLElementOrNull } from '@/scripts/get-dom-node-or-null.js';
 import { focusParent } from '@/scripts/focus.js';
@@ -670,6 +671,15 @@ export function contextMenu(items: MenuItem[], ev: MouseEvent): Promise<void> {
 }
 
 export function post(props: Record<string, any> = {}): Promise<void> {
+	pleaseLogin(undefined, (props.initialText || props.initialNote ? {
+		type: 'share',
+		params: {
+			text: props.initialText ?? props.initialNote.text,
+			visibility: props.initialVisibility ?? props.initialNote?.visibility,
+			localOnly: (props.initialLocalOnly || props.initialNote?.localOnly) ? '1' : '0',
+		},
+	} : undefined));
+
 	showMovedDialog();
 	return new Promise(resolve => {
 		// NOTE: MkPostFormDialogをdynamic importするとiOSでテキストエリアに自動フォーカスできない
diff --git a/packages/frontend/src/pages/flash/flash.vue b/packages/frontend/src/pages/flash/flash.vue
index 40499fde0e..8a63176d00 100644
--- a/packages/frontend/src/pages/flash/flash.vue
+++ b/packages/frontend/src/pages/flash/flash.vue
@@ -79,6 +79,7 @@ import { defaultStore } from '@/store.js';
 import { $i } from '@/account.js';
 import { isSupportShare } from '@/scripts/navigator.js';
 import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { pleaseLogin } from '@/scripts/please-login.js';
 
 const props = defineProps<{
 	id: string;
@@ -143,6 +144,7 @@ function shareWithNote() {
 
 function like() {
 	if (!flash.value) return;
+	pleaseLogin();
 
 	os.apiWithDialog('flash/like', {
 		flashId: flash.value.id,
@@ -154,6 +156,7 @@ function like() {
 
 async function unlike() {
 	if (!flash.value) return;
+	pleaseLogin();
 
 	const confirm = await os.confirm({
 		type: 'warning',
diff --git a/packages/frontend/src/pages/follow.vue b/packages/frontend/src/pages/follow.vue
deleted file mode 100644
index 247b0ac639..0000000000
--- a/packages/frontend/src/pages/follow.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<div>
-</div>
-</template>
-
-<script lang="ts" setup>
-import { } from 'vue';
-import * as Misskey from 'misskey-js';
-import * as os from '@/os.js';
-import { misskeyApi } from '@/scripts/misskey-api.js';
-import { i18n } from '@/i18n.js';
-import { defaultStore } from '@/store.js';
-import { mainRouter } from '@/router/main.js';
-
-async function follow(user): Promise<void> {
-	const { canceled } = await os.confirm({
-		type: 'question',
-		text: i18n.tsx.followConfirm({ name: user.name || user.username }),
-	});
-
-	if (canceled) {
-		window.close();
-		return;
-	}
-
-	os.apiWithDialog('following/create', {
-		userId: user.id,
-		withReplies: defaultStore.state.defaultWithReplies,
-	});
-	user.withReplies = defaultStore.state.defaultWithReplies;
-}
-
-const acct = new URL(location.href).searchParams.get('acct');
-if (acct == null) {
-	throw new Error('acct required');
-}
-
-let promise;
-
-if (acct.startsWith('https://')) {
-	promise = misskeyApi('ap/show', {
-		uri: acct,
-	});
-	promise.then(res => {
-		if (res.type === 'User') {
-			follow(res.object);
-		} else if (res.type === 'Note') {
-			mainRouter.push(`/notes/${res.object.id}`);
-		} else {
-			os.alert({
-				type: 'error',
-				text: 'Not a user',
-			}).then(() => {
-				window.close();
-			});
-		}
-	});
-} else {
-	promise = misskeyApi('users/show', Misskey.acct.parse(acct));
-	promise.then(user => {
-		follow(user);
-	});
-}
-
-os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject);
-</script>
diff --git a/packages/frontend/src/pages/lookup.vue b/packages/frontend/src/pages/lookup.vue
new file mode 100644
index 0000000000..3233953942
--- /dev/null
+++ b/packages/frontend/src/pages/lookup.vue
@@ -0,0 +1,97 @@
+<!--
+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="800">
+		<div v-if="state === 'done'" class="_buttonsCenter">
+			<MkButton @click="close">{{ i18n.ts.close }}</MkButton>
+			<MkButton @click="goToMisskey">{{ i18n.ts.goToMisskey }}</MkButton>
+		</div>
+		<div v-else class="_fullInfo">
+			<MkLoading/>
+		</div>
+	</MkSpacer>
+</MkStickyContainer>
+</template>
+
+<script lang="ts" setup>
+import { computed, ref } from 'vue';
+import * as Misskey from 'misskey-js';
+import * as os from '@/os.js';
+import { misskeyApi } from '@/scripts/misskey-api.js';
+import { i18n } from '@/i18n.js';
+import { definePageMetadata } from '@/scripts/page-metadata.js';
+import { mainRouter } from '@/router/main.js';
+import MkButton from '@/components/MkButton.vue';
+
+const state = ref<'fetching' | 'done'>('fetching');
+
+function fetch() {
+	const params = new URL(location.href).searchParams;
+
+	// acctのほうはdeprecated
+	let uri = params.get('uri') ?? params.get('acct');
+	if (uri == null) {
+		state.value = 'done';
+		return;
+	}
+
+	let promise: Promise<any>;
+
+	if (uri.startsWith('https://')) {
+		promise = misskeyApi('ap/show', {
+			uri,
+		});
+		promise.then(res => {
+			if (res.type === 'User') {
+				mainRouter.replace(res.object.host ? `/@${res.object.username}@${res.object.host}` : `/@${res.object.username}`);
+			} else if (res.type === 'Note') {
+				mainRouter.replace(`/notes/${res.object.id}`);
+			} else {
+				os.alert({
+					type: 'error',
+					text: 'Not a user',
+				});
+			}
+		});
+	} else {
+		if (uri.startsWith('acct:')) {
+			uri = uri.slice(5);
+		}
+		promise = misskeyApi('users/show', Misskey.acct.parse(uri));
+		promise.then(user => {
+			mainRouter.replace(user.host ? `/@${user.username}@${user.host}` : `/@${user.username}`);
+		});
+	}
+
+	os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject);
+}
+
+function close(): void {
+	window.close();
+
+	// 閉じなければ100ms後タイムラインに
+	window.setTimeout(() => {
+		location.href = '/';
+	}, 100);
+}
+
+function goToMisskey(): void {
+	location.href = '/';
+}
+
+fetch();
+
+const headerActions = computed(() => []);
+
+const headerTabs = computed(() => []);
+
+definePageMetadata({
+	title: i18n.ts.lookup,
+	icon: 'ti ti-world-search',
+});
+</script>
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index 834d799072..d67990e9a2 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -32,9 +32,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 							</div>
 						</div>
 						<span v-if="$i && $i.id != user.id && user.isFollowed" class="followed">{{ i18n.ts.followsYou }}</span>
-						<div v-if="$i" class="actions">
+						<div class="actions">
 							<button class="menu _button" @click="menu"><i class="ti ti-dots"></i></button>
-							<MkFollowButton v-if="$i.id != user.id" v-model:user="user" :inline="true" :transparent="false" :full="true" class="koudoku"/>
+							<MkFollowButton v-if="$i?.id != user.id" v-model:user="user" :inline="true" :transparent="false" :full="true" class="koudoku"/>
 						</div>
 					</div>
 					<MkAvatar class="avatar" :user="user" indicator/>
diff --git a/packages/frontend/src/router/definition.ts b/packages/frontend/src/router/definition.ts
index 12ab633af1..f7a219c57e 100644
--- a/packages/frontend/src/router/definition.ts
+++ b/packages/frontend/src/router/definition.ts
@@ -237,8 +237,18 @@ const routes: RouteDef[] = [{
 		origin: 'origin',
 	},
 }, {
+	// Legacy Compatibility	
 	path: '/authorize-follow',
-	component: page(() => import('@/pages/follow.vue')),
+	redirect: '/lookup',
+	loginRequired: true,
+}, {
+	// Mastodon Compatibility
+	path: '/authorize_interaction',
+	redirect: '/lookup',
+	loginRequired: true,
+}, {
+	path: '/lookup',
+	component: page(() => import('@/pages/lookup.vue')),
 	loginRequired: true,
 }, {
 	path: '/share',
diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts
index ac8774fad0..2d1fea8ea4 100644
--- a/packages/frontend/src/scripts/get-user-menu.ts
+++ b/packages/frontend/src/scripts/get-user-menu.ts
@@ -186,7 +186,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
 			const canonical = user.host === null ? `@${user.username}` : `@${user.username}@${toUnicode(user.host)}`;
 			copyToClipboard(`${url}/${canonical}`);
 		},
-	}, {
+	}, ...($i ? [{
 		icon: 'ti ti-mail',
 		text: i18n.ts.sendMessage,
 		action: () => {
@@ -259,7 +259,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
 				},
 			}));
 		},
-	}] as any;
+	}] : [])] as any;
 
 	if ($i && meId !== user.id) {
 		if (iAmModerator) {
diff --git a/packages/frontend/src/scripts/please-login.ts b/packages/frontend/src/scripts/please-login.ts
index 363da5f633..b04062a58a 100644
--- a/packages/frontend/src/scripts/please-login.ts
+++ b/packages/frontend/src/scripts/please-login.ts
@@ -8,12 +8,24 @@ import { $i } from '@/account.js';
 import { i18n } from '@/i18n.js';
 import { popup } from '@/os.js';
 
-export function pleaseLogin(path?: string) {
+export type OpenOnRemoteOptions = {
+	type: 'web';
+	path: string;
+} | {
+	type: 'lookup';
+	path: string;	
+} | {
+	type: 'share';
+	params: Record<string, string>;
+};
+
+export function pleaseLogin(path?: string, openOnRemote?: OpenOnRemoteOptions) {
 	if ($i) return;
 
 	const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {
 		autoSet: true,
-		message: i18n.ts.signinRequired,
+		message: openOnRemote ? i18n.ts.signinOrContinueOnRemote : i18n.ts.signinRequired,
+		openOnRemote,
 	}, {
 		cancelled: () => {
 			if (path) {
diff --git a/packages/frontend/src/scripts/url.ts b/packages/frontend/src/scripts/url.ts
index e3072b3b7d..c477fb5506 100644
--- a/packages/frontend/src/scripts/url.ts
+++ b/packages/frontend/src/scripts/url.ts
@@ -21,3 +21,8 @@ export function query(obj: Record<string, any>): string {
 export function appendQuery(url: string, query: string): string {
 	return `${url}${/\?/.test(url) ? url.endsWith('?') ? '' : '&' : '?'}${query}`;
 }
+
+export function extractDomain(url: string) {
+	const match = url.match(/^(https)?:?\/{0,2}([^\/]+)/);
+	return match ? match[2] : null;
+}

From 76181385d2a8397c7df68c93f6ce9e5c293fc6b3 Mon Sep 17 00:00:00 2001
From: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>
Date: Sun, 14 Jul 2024 15:52:43 +0900
Subject: [PATCH 047/221] refactor(misskey-js): enable
 exactOptionalPropertyTypes (#14203)

* refactor(misskey-js): enable exactOptionalPropertyTypes

* refactor(misskey-js): fix error where is appeared by enabling
---
 packages/misskey-js/src/streaming.ts | 4 +++-
 packages/misskey-js/tsconfig.json    | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/misskey-js/src/streaming.ts b/packages/misskey-js/src/streaming.ts
index 0f26857782..83930e621c 100644
--- a/packages/misskey-js/src/streaming.ts
+++ b/packages/misskey-js/src/streaming.ts
@@ -291,7 +291,9 @@ export abstract class Connection<Channel extends AnyOf<Channels> = any> extends
 
 		this.stream = stream;
 		this.channel = channel;
-		this.name = name;
+		if (name !== undefined) {
+			this.name = name;
+		}
 	}
 
 	public send<T extends keyof Channel['receives']>(type: T, body: Channel['receives'][T]): void {
diff --git a/packages/misskey-js/tsconfig.json b/packages/misskey-js/tsconfig.json
index 6e34e332e0..f7bbc47304 100644
--- a/packages/misskey-js/tsconfig.json
+++ b/packages/misskey-js/tsconfig.json
@@ -15,6 +15,7 @@
 		"experimentalDecorators": true,
 		"noImplicitReturns": true,
 		"esModuleInterop": true,
+		"exactOptionalPropertyTypes": true,
 		"typeRoots": [
 			"./node_modules/@types"
 		],

From b9f3fccfac6818c1c25ce06c0d63f7d61ce6cbbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 14 Jul 2024 16:21:59 +0900
Subject: [PATCH 048/221] =?UTF-8?q?fix(frontend):=20Nested=20Route?=
 =?UTF-8?q?=E3=81=AE=E3=81=A8=E3=81=8D=E3=81=ABRouterView=E3=81=AB?=
 =?UTF-8?q?=E5=BD=93=E3=81=9F=E3=82=8B=E3=82=AD=E3=83=BC=E3=81=8C=E3=83=AB?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=AEpath=E3=81=A8=E3=81=B6=E3=81=A1?=
 =?UTF-8?q?=E5=BD=93=E3=81=9F=E3=82=8B=E5=8F=AF=E8=83=BD=E6=80=A7=E3=81=8C?=
 =?UTF-8?q?=E3=81=82=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20(#1420?=
 =?UTF-8?q?2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
 packages/frontend/src/components/global/RouterView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/global/RouterView.vue b/packages/frontend/src/components/global/RouterView.vue
index 06cb30eff1..02a2edee3f 100644
--- a/packages/frontend/src/components/global/RouterView.vue
+++ b/packages/frontend/src/components/global/RouterView.vue
@@ -60,7 +60,7 @@ function onChange({ resolved, key: newKey }) {
 	if (current == null || 'redirect' in current.route) return;
 	currentPageComponent.value = current.route.component;
 	currentPageProps.value = current.props;
-	key.value = current.route.path + JSON.stringify(Object.fromEntries(current.props));
+	key.value = newKey + JSON.stringify(Object.fromEntries(current.props));
 
 	nextTick(() => {
 		// ページ遷移完了後に再びキャッシュを有効化

From 09d30fef5b274c988e98e52f474afe11ff843111 Mon Sep 17 00:00:00 2001
From: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>
Date: Sun, 14 Jul 2024 17:27:27 +0900
Subject: [PATCH 049/221] =?UTF-8?q?ci:=20=E3=83=AF=E3=83=BC=E3=82=AF?=
 =?UTF-8?q?=E3=83=95=E3=83=AD=E3=83=BC=E3=81=8C=E6=9B=B4=E6=96=B0=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AB=E3=82=82=E3=83=AF?=
 =?UTF-8?q?=E3=83=BC=E3=82=AF=E3=83=95=E3=83=AD=E3=83=BC=E3=81=8C=E8=B5=B7?=
 =?UTF-8?q?=E5=8B=95=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=20(#14207)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ci: include themselves in `on.push.paths`
command: find .github/workflows -type f \( -name '*.yaml' -or -name '*.yml' \) | xargs -I {} yq_4.44.2-linux_x86-64 'select(.on.push.paths != null) | .[0] | map("{}")[0]' {} | xargs -I {} ~/.local/bin/yq_4.44.2-linux_x86-64 -i '.on.push.paths += ["{}"]' {}

* ci: include themselves in `on.pull_request.paths`
command: find .github/workflows -type f \( -name '*.yaml' -or -name '*.yml' \) | xargs -I {} yq_4.44.2-linux_x86-64 'select(.on.pull_request.paths != null) | .[0] | map("{}")[0]' {} | xargs -I {} ~/.local/bin/yq_4.44.2-linux_x86-64 -i '.on.pull_request.paths += ["{}"]' {}
---
 .github/workflows/api-misskey-js.yml           | 3 ++-
 .github/workflows/check-misskey-js-version.yml | 3 ++-
 .github/workflows/get-api-diff.yml             | 2 +-
 .github/workflows/lint.yml                     | 3 ++-
 .github/workflows/locale.yml                   | 3 ++-
 .github/workflows/release-edit-with-push.yml   | 2 +-
 .github/workflows/test-backend.yml             | 3 ++-
 .github/workflows/test-frontend.yml            | 4 ++--
 .github/workflows/test-misskey-js.yml          | 3 ++-
 .github/workflows/validate-api-json.yml        | 3 ++-
 10 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/api-misskey-js.yml b/.github/workflows/api-misskey-js.yml
index 1b7b68b14f..f9385239b0 100644
--- a/.github/workflows/api-misskey-js.yml
+++ b/.github/workflows/api-misskey-js.yml
@@ -4,10 +4,11 @@ on:
   push:
     paths:
       - packages/misskey-js/**
+      - .github/workflows/api-misskey-js.yml
   pull_request:
     paths:
       - packages/misskey-js/**
-
+      - .github/workflows/api-misskey-js.yml
 jobs:
   report:
 
diff --git a/.github/workflows/check-misskey-js-version.yml b/.github/workflows/check-misskey-js-version.yml
index 325a893605..99c29ac974 100644
--- a/.github/workflows/check-misskey-js-version.yml
+++ b/.github/workflows/check-misskey-js-version.yml
@@ -6,12 +6,13 @@ on:
     paths:
       - packages/misskey-js/package.json
       - package.json
+      - .github/workflows/check-misskey-js-version.yml
   pull_request:
     branches: [ develop ]
     paths:
       - packages/misskey-js/package.json
       - package.json
-
+      - .github/workflows/check-misskey-js-version.yml
 jobs:
   check-version:
     # ルートの package.json と packages/misskey-js/package.json のバージョンが一致しているかを確認する
diff --git a/.github/workflows/get-api-diff.yml b/.github/workflows/get-api-diff.yml
index 9b9c8f11c4..33fa2ccc39 100644
--- a/.github/workflows/get-api-diff.yml
+++ b/.github/workflows/get-api-diff.yml
@@ -9,7 +9,7 @@ on:
     paths:
       - packages/backend/**
       - .github/workflows/get-api-diff.yml
-
+      - .github/workflows/get-api-diff.yml
 jobs:
   get-from-misskey:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 1a1b30168a..cd8ae0b45b 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -11,6 +11,7 @@ on:
       - packages/sw/**
       - packages/misskey-js/**
       - packages/shared/eslint.config.js
+      - .github/workflows/lint.yml
   pull_request:
     paths:
       - packages/backend/**
@@ -18,7 +19,7 @@ on:
       - packages/sw/**
       - packages/misskey-js/**
       - packages/shared/eslint.config.js
-
+      - .github/workflows/lint.yml
 jobs:
   pnpm_install:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/locale.yml b/.github/workflows/locale.yml
index de2247e772..be3764f3e4 100644
--- a/.github/workflows/locale.yml
+++ b/.github/workflows/locale.yml
@@ -4,10 +4,11 @@ on:
   push:
     paths:
       - locales/**
+      - .github/workflows/locale.yml
   pull_request:
     paths:
       - locales/**
-
+      - .github/workflows/locale.yml
 jobs:
   locale_verify:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release-edit-with-push.yml b/.github/workflows/release-edit-with-push.yml
index 57657a4ba7..f86c1948f8 100644
--- a/.github/workflows/release-edit-with-push.yml
+++ b/.github/workflows/release-edit-with-push.yml
@@ -6,7 +6,7 @@ on:
       - develop
     paths:
       - 'CHANGELOG.md'
-
+      # - .github/workflows/release-edit-with-push.yml
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index b1c54bb3e7..99ca09a8ec 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -9,12 +9,13 @@ on:
       - packages/backend/**
       # for permissions
       - packages/misskey-js/**
+      - .github/workflows/test-backend.yml
   pull_request:
     paths:
       - packages/backend/**
       # for permissions
       - packages/misskey-js/**
-
+      - .github/workflows/test-backend.yml
 jobs:
   unit:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml
index 9d5053b82a..5acf85cb0e 100644
--- a/.github/workflows/test-frontend.yml
+++ b/.github/workflows/test-frontend.yml
@@ -11,7 +11,7 @@ on:
       - packages/misskey-js/**
       # for e2e
       - packages/backend/**
-
+      - .github/workflows/test-frontend.yml
   pull_request:
     paths:
       - packages/frontend/**
@@ -19,7 +19,7 @@ on:
       - packages/misskey-js/**
       # for e2e
       - packages/backend/**
-
+      - .github/workflows/test-frontend.yml
 jobs:
   vitest:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/test-misskey-js.yml b/.github/workflows/test-misskey-js.yml
index 2589d908b8..43f5b5b860 100644
--- a/.github/workflows/test-misskey-js.yml
+++ b/.github/workflows/test-misskey-js.yml
@@ -8,11 +8,12 @@ on:
     branches: [ develop ]
     paths:
       - packages/misskey-js/**
+      - .github/workflows/test-misskey-js.yml
   pull_request:
     branches: [ develop ]
     paths:
       - packages/misskey-js/**
-
+      - .github/workflows/test-misskey-js.yml
 jobs:
   test:
 
diff --git a/.github/workflows/validate-api-json.yml b/.github/workflows/validate-api-json.yml
index 24340e7d81..b931e64790 100644
--- a/.github/workflows/validate-api-json.yml
+++ b/.github/workflows/validate-api-json.yml
@@ -7,10 +7,11 @@ on:
       - develop
     paths:
       - packages/backend/**
+      - .github/workflows/validate-api-json.yml
   pull_request:
     paths:
       - packages/backend/**
-
+      - .github/workflows/validate-api-json.yml
 jobs:
   validate-api-json:
     runs-on: ubuntu-latest

From 722acf5986bda0ddea3a4724d171e4d553037bbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 14 Jul 2024 17:28:34 +0900
Subject: [PATCH 050/221] fix(frontend): follow-up of #13089 (#14206)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): #13089 を修正

* fix

* 正規表現を強化

* fix
---
 locales/index.d.ts                            |  2 +-
 packages/frontend/src/components/MkNote.vue   | 16 +++++------
 .../src/components/MkNoteDetailed.vue         | 16 +++++------
 packages/frontend/src/components/MkPoll.vue   |  9 ++++---
 packages/frontend/src/components/MkSignin.vue | 10 ++++---
 packages/frontend/src/scripts/please-login.ts | 27 ++++++++++++++++++-
 packages/frontend/src/scripts/url.ts          |  4 +--
 7 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 84a402b0de..694ee53a1f 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -5004,7 +5004,7 @@ export interface Locale extends ILocale {
      * お問い合わせ
      */
     "inquiry": string;
-     /**
+    /**
      * もう一度お試しください。
      */
     "tryAgain": string;
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index c518c7dd41..13273a53b4 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -174,7 +174,7 @@ import MkPoll from '@/components/MkPoll.vue';
 import MkUsersTooltip from '@/components/MkUsersTooltip.vue';
 import MkUrlPreview from '@/components/MkUrlPreview.vue';
 import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
-import { pleaseLogin } from '@/scripts/please-login.js';
+import { pleaseLogin, type OpenOnRemoteOptions } from '@/scripts/please-login.js';
 import { checkWordMute } from '@/scripts/check-word-mute.js';
 import { userPage } from '@/filters/user.js';
 import number from '@/filters/number.js';
@@ -279,10 +279,10 @@ const renoteCollapsed = ref(
 	),
 );
 
-const pleaseLoginContext = {
+const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({
 	type: 'lookup',
-	path: `https://${host}/notes/${appearNote.value.id}`,
-} as const;
+	url: `https://${host}/notes/${appearNote.value.id}`,
+}));
 
 /* Overload FunctionにLintが対応していないのでコメントアウト
 function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly: true): boolean;
@@ -417,7 +417,7 @@ if (!props.mock) {
 }
 
 function renote(viaKeyboard = false) {
-	pleaseLogin(undefined, pleaseLoginContext);
+	pleaseLogin(undefined, pleaseLoginContext.value);
 	showMovedDialog();
 
 	const { menu } = getRenoteMenu({ note: note.value, renoteButton, mock: props.mock });
@@ -427,7 +427,7 @@ function renote(viaKeyboard = false) {
 }
 
 function reply(): void {
-	pleaseLogin(undefined, pleaseLoginContext);
+	pleaseLogin(undefined, pleaseLoginContext.value);
 	if (props.mock) {
 		return;
 	}
@@ -440,7 +440,7 @@ function reply(): void {
 }
 
 function react(): void {
-	pleaseLogin(undefined, pleaseLoginContext);
+	pleaseLogin(undefined, pleaseLoginContext.value);
 	showMovedDialog();
 	if (appearNote.value.reactionAcceptance === 'likeOnly') {
 		sound.playMisskeySfx('reaction');
@@ -571,7 +571,7 @@ function showRenoteMenu(): void {
 	}
 
 	if (isMyRenote) {
-		pleaseLogin(undefined, pleaseLoginContext);
+		pleaseLogin(undefined, pleaseLoginContext.value);
 		os.popupMenu([
 			getCopyNoteLinkMenu(note.value, i18n.ts.copyLinkRenote),
 			{ type: 'divider' },
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 737e9a853a..9a3e595789 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -209,7 +209,7 @@ import MkPoll from '@/components/MkPoll.vue';
 import MkUsersTooltip from '@/components/MkUsersTooltip.vue';
 import MkUrlPreview from '@/components/MkUrlPreview.vue';
 import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
-import { pleaseLogin } from '@/scripts/please-login.js';
+import { pleaseLogin, type OpenOnRemoteOptions } from '@/scripts/please-login.js';
 import { checkWordMute } from '@/scripts/check-word-mute.js';
 import { userPage } from '@/filters/user.js';
 import { notePage } from '@/filters/note.js';
@@ -297,10 +297,10 @@ const conversation = ref<Misskey.entities.Note[]>([]);
 const replies = ref<Misskey.entities.Note[]>([]);
 const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || appearNote.value.userId === $i?.id);
 
-const pleaseLoginContext = {
+const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({
 	type: 'lookup',
-	path: `https://${host}/notes/${appearNote.value.id}`,
-} as const;
+	url: `https://${host}/notes/${appearNote.value.id}`,
+}));
 
 const keymap = {
 	'r': () => reply(),
@@ -402,7 +402,7 @@ if (appearNote.value.reactionAcceptance === 'likeOnly') {
 }
 
 function renote() {
-	pleaseLogin(undefined, pleaseLoginContext);
+	pleaseLogin(undefined, pleaseLoginContext.value);
 	showMovedDialog();
 
 	const { menu } = getRenoteMenu({ note: note.value, renoteButton });
@@ -410,7 +410,7 @@ function renote() {
 }
 
 function reply(): void {
-	pleaseLogin(undefined, pleaseLoginContext);
+	pleaseLogin(undefined, pleaseLoginContext.value);
 	showMovedDialog();
 	os.post({
 		reply: appearNote.value,
@@ -421,7 +421,7 @@ function reply(): void {
 }
 
 function react(): void {
-	pleaseLogin(undefined, pleaseLoginContext);
+	pleaseLogin(undefined, pleaseLoginContext.value);
 	showMovedDialog();
 	if (appearNote.value.reactionAcceptance === 'likeOnly') {
 		sound.playMisskeySfx('reaction');
@@ -505,7 +505,7 @@ async function clip(): Promise<void> {
 
 function showRenoteMenu(): void {
 	if (!isMyRenote) return;
-	pleaseLogin(undefined, pleaseLoginContext);
+	pleaseLogin(undefined, pleaseLoginContext.value);
 	os.popupMenu([{
 		text: i18n.ts.unrenote,
 		icon: 'ti ti-trash',
diff --git a/packages/frontend/src/components/MkPoll.vue b/packages/frontend/src/components/MkPoll.vue
index 82e2a605f1..72bd8f4f6c 100644
--- a/packages/frontend/src/components/MkPoll.vue
+++ b/packages/frontend/src/components/MkPoll.vue
@@ -36,6 +36,7 @@ import { misskeyApi } from '@/scripts/misskey-api.js';
 import { i18n } from '@/i18n.js';
 import { host } from '@/config.js';
 import { useInterval } from '@/scripts/use-interval.js';
+import type { OpenOnRemoteOptions } from '@/scripts/please-login.js';
 
 const props = defineProps<{
 	noteId: string;
@@ -61,10 +62,10 @@ const timer = computed(() => i18n.tsx._poll[
 
 const showResult = ref(props.readOnly || isVoted.value);
 
-const pleaseLoginContext = {
+const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({
 	type: 'lookup',
-	path: `https://${host}/notes/${props.note.id}`,
-} as const;
+	url: `https://${host}/notes/${props.noteId}`,
+}));
 
 // 期限付きアンケート
 if (props.poll.expiresAt) {
@@ -82,7 +83,7 @@ if (props.poll.expiresAt) {
 }
 
 const vote = async (id) => {
-	pleaseLogin(undefined, pleaseLoginContext);
+	pleaseLogin(undefined, pleaseLoginContext.value);
 
 	if (props.readOnly || closed.value || isVoted.value) return;
 
diff --git a/packages/frontend/src/components/MkSignin.vue b/packages/frontend/src/components/MkSignin.vue
index 746ddd7154..a123bbddc6 100644
--- a/packages/frontend/src/components/MkSignin.vue
+++ b/packages/frontend/src/components/MkSignin.vue
@@ -236,12 +236,14 @@ function openRemote(options: OpenOnRemoteOptions, targetHost?: string): void {
 	switch (options.type) {
 		case 'web':
 		case 'lookup': {
-			let _path = options.path;
+			let _path: string;
 
 			if (options.type === 'lookup') {
-				// TODO: v2024.2.0以降が浸透してきたら正式なURLに変更する▼
+				// TODO: v2024.7.0以降が浸透してきたら正式なURLに変更する▼
 				// _path = `/lookup?uri=${encodeURIComponent(_path)}`;
-				_path = `/authorize-follow?acct=${encodeURIComponent(_path)}`;
+				_path = `/authorize-follow?acct=${encodeURIComponent(options.url)}`;
+			} else {
+				_path = options.path;
 			}
 
 			if (targetHost) {
@@ -252,7 +254,7 @@ function openRemote(options: OpenOnRemoteOptions, targetHost?: string): void {
 			break;
 		}
 		case 'share': {
-			const params = query(options.params);			
+			const params = query(options.params);
 			if (targetHost) {
 				window.open(`https://${targetHost}/share?${params}`, '_blank', 'noopener');
 			} else {
diff --git a/packages/frontend/src/scripts/please-login.ts b/packages/frontend/src/scripts/please-login.ts
index b04062a58a..18f05bc7f4 100644
--- a/packages/frontend/src/scripts/please-login.ts
+++ b/packages/frontend/src/scripts/please-login.ts
@@ -9,13 +9,38 @@ import { i18n } from '@/i18n.js';
 import { popup } from '@/os.js';
 
 export type OpenOnRemoteOptions = {
+	/**
+	 * 外部のMisskey Webで特定のパスを開く
+	 */
 	type: 'web';
+
+	/**
+	 * 内部パス（例: `/settings`）
+	 */
 	path: string;
 } | {
+	/**
+	 * 外部のMisskey Webで照会する
+	 */
 	type: 'lookup';
-	path: string;	
+
+	/**
+	 * 照会したいエンティティのURL
+	 *
+	 * （例: `https://misskey.example.com/notes/abcdexxxxyz`）
+	 */
+	url: string;
 } | {
+	/**
+	 * 外部のMisskeyでノートする
+	 */
 	type: 'share';
+
+	/**
+	 * `/share` ページに渡すクエリストリング
+	 *
+	 * @see https://go.misskey-hub.net/spec/share/
+	 */
 	params: Record<string, string>;
 };
 
diff --git a/packages/frontend/src/scripts/url.ts b/packages/frontend/src/scripts/url.ts
index c477fb5506..5a8265af9e 100644
--- a/packages/frontend/src/scripts/url.ts
+++ b/packages/frontend/src/scripts/url.ts
@@ -23,6 +23,6 @@ export function appendQuery(url: string, query: string): string {
 }
 
 export function extractDomain(url: string) {
-	const match = url.match(/^(https)?:?\/{0,2}([^\/]+)/);
-	return match ? match[2] : null;
+	const match = url.match(/^(?:https?:)?(?:\/\/)?(?:[^@\n]+@)?([^:\/\n]+)/im);
+	return match ? match[1] : null;
 }

From c5607d86333bdca38b9ff8c02a5979492f9d602c Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 14 Jul 2024 20:14:43 +0900
Subject: [PATCH 051/221] =?UTF-8?q?enhance(backend):=20config=E3=81=ABsign?=
 =?UTF-8?q?ToActivityPubGet=E3=81=AE=E6=8C=87=E5=AE=9A=E3=81=8C=E7=84=A1?=
 =?UTF-8?q?=E3=81=84=E5=A0=B4=E5=90=88true=E3=81=A8=E8=A6=8B=E5=81=9A?=
 =?UTF-8?q?=E3=81=99=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

trueの方が望ましいため
---
 packages/backend/src/config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index 0ac521d409..4cc27898be 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -259,7 +259,7 @@ export function loadConfig(): Config {
 		deliverJobMaxAttempts: config.deliverJobMaxAttempts,
 		inboxJobMaxAttempts: config.inboxJobMaxAttempts,
 		proxyRemoteFiles: config.proxyRemoteFiles,
-		signToActivityPubGet: config.signToActivityPubGet,
+		signToActivityPubGet: config.signToActivityPubGet ?? true,
 		mediaProxy: externalMediaProxy ?? internalMediaProxy,
 		externalMediaProxyEnabled: externalMediaProxy !== null && externalMediaProxy !== internalMediaProxy,
 		videoThumbnailGenerator: config.videoThumbnailGenerator ?

From 4b9c60ad21704e7e75df830205cec2db7afc2baa Mon Sep 17 00:00:00 2001
From: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
Date: Sun, 14 Jul 2024 20:24:29 +0900
Subject: [PATCH 052/221] =?UTF-8?q?fix(backend):=20=E3=83=A6=E3=83=BC?=
 =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=81=AE=E3=83=AA=E3=82=A2=E3=82=AF=E3=82=B7?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E4=B8=80=E8=A6=A7=E3=81=A7=E3=83=9F=E3=83=A5?=
 =?UTF-8?q?=E3=83=BC=E3=83=88/=E3=83=96=E3=83=AD=E3=83=83=E3=82=AF?=
 =?UTF-8?q?=E3=81=8C=E6=A9=9F=E8=83=BD=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA?=
 =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=9F=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20(#14100)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: mute/block was not considered on users/reactions

* docs(changelog): update changelog

* chore: Apply suggestion from code review

Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com>

---------

Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
---
 CHANGELOG.md                                  |  1 +
 packages/backend/src/misc/is-user-related.ts  |  4 ++++
 .../server/api/endpoints/users/reactions.ts   | 19 +++++++++++++++++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2156c81474..e50dbfec9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,7 @@
   4. フォローしていない非アクティブなユーザ
 - Fix: 一般ユーザーから見たユーザーのバッジの一覧に公開されていないものが含まれることがある問題を修正  
   (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/652)
+- Fix: ユーザーのリアクション一覧でミュート/ブロックが機能していなかった問題を修正
 
 ### Misskey.js
 - Feat: `/drive/files/create` のリクエストに対応（`multipart/form-data`に対応）
diff --git a/packages/backend/src/misc/is-user-related.ts b/packages/backend/src/misc/is-user-related.ts
index 93c9b2b814..862d6e6a38 100644
--- a/packages/backend/src/misc/is-user-related.ts
+++ b/packages/backend/src/misc/is-user-related.ts
@@ -4,6 +4,10 @@
  */
 
 export function isUserRelated(note: any, userIds: Set<string>, ignoreAuthor = false): boolean {
+	if (!note) {
+		return false;
+	}
+
 	if (userIds.has(note.userId) && !ignoreAuthor) {
 		return true;
 	}
diff --git a/packages/backend/src/server/api/endpoints/users/reactions.ts b/packages/backend/src/server/api/endpoints/users/reactions.ts
index aca883a052..7805ae3288 100644
--- a/packages/backend/src/server/api/endpoints/users/reactions.ts
+++ b/packages/backend/src/server/api/endpoints/users/reactions.ts
@@ -12,6 +12,7 @@ import { DI } from '@/di-symbols.js';
 import { CacheService } from '@/core/CacheService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { RoleService } from '@/core/RoleService.js';
+import { isUserRelated } from '@/misc/is-user-related.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -74,6 +75,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private roleService: RoleService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
+			const userIdsWhoBlockingMe = me ? await this.cacheService.userBlockedCache.fetch(me.id) : new Set<string>();
 			const iAmModerator = me ? await this.roleService.isModerator(me) : false; // Moderators can see reactions of all users
 			if (!iAmModerator) {
 				const user = await this.cacheService.findUserById(ps.userId);
@@ -85,8 +87,15 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				if ((me == null || me.id !== ps.userId) && !profile.publicReactions) {
 					throw new ApiError(meta.errors.reactionsNotPublic);
 				}
+
+				// early return if me is blocked by requesting user
+				if (userIdsWhoBlockingMe.has(ps.userId)) {
+					return [];
+				}
 			}
 
+			const userIdsWhoMeMuting = me ? await this.cacheService.userMutingsCache.fetch(me.id) : new Set<string>();
+
 			const query = this.queryService.makePaginationQuery(this.noteReactionsRepository.createQueryBuilder('reaction'),
 				ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
 				.andWhere('reaction.userId = :userId', { userId: ps.userId })
@@ -94,9 +103,15 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			this.queryService.generateVisibilityQuery(query, me);
 
-			const reactions = await query
+			const reactions = (await query
 				.limit(ps.limit)
-				.getMany();
+				.getMany()).filter(reaction => {
+				if (reaction.note?.userId === ps.userId) return true; // we can see reactions to note of requesting user
+				if (me && isUserRelated(reaction.note, userIdsWhoBlockingMe)) return false;
+				if (me && isUserRelated(reaction.note, userIdsWhoMeMuting)) return false;
+
+				return true;
+			});
 
 			return await this.noteReactionEntityService.packMany(reactions, me, { withNote: true });
 		});

From d47fd4ffe152d3dbd4b224e63f350e29ace75e81 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Sun, 14 Jul 2024 21:29:35 +0900
Subject: [PATCH 053/221] fix: error with trying to handle SIGKILL (#14208)

---
 packages/misskey-bubble-game/build.js | 1 -
 packages/misskey-js/build.js          | 1 -
 packages/misskey-reversi/build.js     | 1 -
 3 files changed, 3 deletions(-)

diff --git a/packages/misskey-bubble-game/build.js b/packages/misskey-bubble-game/build.js
index 0b79f4b915..e626c97a59 100644
--- a/packages/misskey-bubble-game/build.js
+++ b/packages/misskey-bubble-game/build.js
@@ -95,7 +95,6 @@ async function watchSrc() {
 		process.on('SIGHUP', resolve);
 		process.on('SIGINT', resolve);
 		process.on('SIGTERM', resolve);
-		process.on('SIGKILL', resolve);
 		process.on('uncaughtException', reject);
 		process.on('exit', resolve);
 	}).finally(async () => {
diff --git a/packages/misskey-js/build.js b/packages/misskey-js/build.js
index a13d9c1186..a80b71646f 100644
--- a/packages/misskey-js/build.js
+++ b/packages/misskey-js/build.js
@@ -95,7 +95,6 @@ async function watchSrc() {
 		process.on('SIGHUP', resolve);
 		process.on('SIGINT', resolve);
 		process.on('SIGTERM', resolve);
-		process.on('SIGKILL', resolve);
 		process.on('uncaughtException', reject);
 		process.on('exit', resolve);
 	}).finally(async () => {
diff --git a/packages/misskey-reversi/build.js b/packages/misskey-reversi/build.js
index 0b79f4b915..e626c97a59 100644
--- a/packages/misskey-reversi/build.js
+++ b/packages/misskey-reversi/build.js
@@ -95,7 +95,6 @@ async function watchSrc() {
 		process.on('SIGHUP', resolve);
 		process.on('SIGINT', resolve);
 		process.on('SIGTERM', resolve);
-		process.on('SIGKILL', resolve);
 		process.on('uncaughtException', reject);
 		process.on('exit', resolve);
 	}).finally(async () => {

From aa0632727f3de73b0e348f86ffd1c5c3135a46e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 14 Jul 2024 21:29:57 +0900
Subject: [PATCH 054/221] chore(deps): bump actions/setup-node from 4.0.2 to
 4.0.3 (#14165)

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v4.0.2...v4.0.3)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/api-misskey-js.yml           | 2 +-
 .github/workflows/changelog-check.yml          | 2 +-
 .github/workflows/check-misskey-js-autogen.yml | 2 +-
 .github/workflows/get-api-diff.yml             | 2 +-
 .github/workflows/lint.yml                     | 6 +++---
 .github/workflows/locale.yml                   | 2 +-
 .github/workflows/on-release-created.yml       | 2 +-
 .github/workflows/storybook.yml                | 2 +-
 .github/workflows/test-backend.yml             | 4 ++--
 .github/workflows/test-frontend.yml            | 4 ++--
 .github/workflows/test-misskey-js.yml          | 2 +-
 .github/workflows/test-production.yml          | 2 +-
 .github/workflows/validate-api-json.yml        | 2 +-
 13 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/api-misskey-js.yml b/.github/workflows/api-misskey-js.yml
index f9385239b0..e7db18316c 100644
--- a/.github/workflows/api-misskey-js.yml
+++ b/.github/workflows/api-misskey-js.yml
@@ -21,7 +21,7 @@ jobs:
       - run: corepack enable
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.3
         with:
           node-version-file: '.node-version'
           cache: 'pnpm'
diff --git a/.github/workflows/changelog-check.yml b/.github/workflows/changelog-check.yml
index f254af0d1f..d4e99f966e 100644
--- a/.github/workflows/changelog-check.yml
+++ b/.github/workflows/changelog-check.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Checkout head
         uses: actions/checkout@v4.1.1
       - name: Setup Node.js
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.3
         with:
           node-version-file: '.node-version'
 
diff --git a/.github/workflows/check-misskey-js-autogen.yml b/.github/workflows/check-misskey-js-autogen.yml
index 39acad8bc3..3a2a2d5f8d 100644
--- a/.github/workflows/check-misskey-js-autogen.yml
+++ b/.github/workflows/check-misskey-js-autogen.yml
@@ -28,7 +28,7 @@ jobs:
 
       - name: setup node
         id: setup-node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.3
         with:
           node-version-file: '.node-version'
           cache: pnpm
diff --git a/.github/workflows/get-api-diff.yml b/.github/workflows/get-api-diff.yml
index 33fa2ccc39..4afafabf2e 100644
--- a/.github/workflows/get-api-diff.yml
+++ b/.github/workflows/get-api-diff.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Install pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4.0.2
+      uses: actions/setup-node@v4.0.3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index cd8ae0b45b..1c5cab208c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -29,7 +29,7 @@ jobs:
         fetch-depth: 0
         submodules: true
     - uses: pnpm/action-setup@v4
-    - uses: actions/setup-node@v4.0.2
+    - uses: actions/setup-node@v4.0.3
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'
@@ -53,7 +53,7 @@ jobs:
         fetch-depth: 0
         submodules: true
     - uses: pnpm/action-setup@v4
-    - uses: actions/setup-node@v4.0.2
+    - uses: actions/setup-node@v4.0.3
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'
@@ -76,7 +76,7 @@ jobs:
         fetch-depth: 0
         submodules: true
     - uses: pnpm/action-setup@v4
-    - uses: actions/setup-node@v4.0.2
+    - uses: actions/setup-node@v4.0.3
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'
diff --git a/.github/workflows/locale.yml b/.github/workflows/locale.yml
index be3764f3e4..95251bfe31 100644
--- a/.github/workflows/locale.yml
+++ b/.github/workflows/locale.yml
@@ -19,7 +19,7 @@ jobs:
         fetch-depth: 0
         submodules: true
     - uses: pnpm/action-setup@v4
-    - uses: actions/setup-node@v4.0.2
+    - uses: actions/setup-node@v4.0.3
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'
diff --git a/.github/workflows/on-release-created.yml b/.github/workflows/on-release-created.yml
index edfdab99e9..22c04ff297 100644
--- a/.github/workflows/on-release-created.yml
+++ b/.github/workflows/on-release-created.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.3
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
index daa76509c8..68452aacaf 100644
--- a/.github/workflows/storybook.yml
+++ b/.github/workflows/storybook.yml
@@ -36,7 +36,7 @@ jobs:
     - name: Install pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js 20.x
-      uses: actions/setup-node@v4.0.2
+      uses: actions/setup-node@v4.0.3
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'
diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 99ca09a8ec..bfb79ef090 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -46,7 +46,7 @@ jobs:
     - name: Install FFmpeg
       uses: FedericoCarboni/setup-ffmpeg@v3
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4.0.2
+      uses: actions/setup-node@v4.0.3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'
@@ -93,7 +93,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.3
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml
index 5acf85cb0e..c17a9fd387 100644
--- a/.github/workflows/test-frontend.yml
+++ b/.github/workflows/test-frontend.yml
@@ -35,7 +35,7 @@ jobs:
     - name: Install pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4.0.2
+      uses: actions/setup-node@v4.0.3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'
@@ -90,7 +90,7 @@ jobs:
     - name: Install pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4.0.2
+      uses: actions/setup-node@v4.0.3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'
diff --git a/.github/workflows/test-misskey-js.yml b/.github/workflows/test-misskey-js.yml
index 43f5b5b860..6ee67e8735 100644
--- a/.github/workflows/test-misskey-js.yml
+++ b/.github/workflows/test-misskey-js.yml
@@ -31,7 +31,7 @@ jobs:
       - run: corepack enable
 
       - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.3
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
diff --git a/.github/workflows/test-production.yml b/.github/workflows/test-production.yml
index 7f8db65293..18d02ec030 100644
--- a/.github/workflows/test-production.yml
+++ b/.github/workflows/test-production.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Install pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4.0.2
+      uses: actions/setup-node@v4.0.3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'
diff --git a/.github/workflows/validate-api-json.yml b/.github/workflows/validate-api-json.yml
index b931e64790..90f2929a25 100644
--- a/.github/workflows/validate-api-json.yml
+++ b/.github/workflows/validate-api-json.yml
@@ -27,7 +27,7 @@ jobs:
     - name: Install pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4.0.2
+      uses: actions/setup-node@v4.0.3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

From f0b9d70720b27977051563713e02abf38eb2b45a Mon Sep 17 00:00:00 2001
From: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>
Date: Sun, 14 Jul 2024 21:30:57 +0900
Subject: [PATCH 055/221] ci: cache eslint (#14204)

* ci: cache eslint

* dummy commit to trigger

* fix syntax error
---
 .github/workflows/lint.yml    | 11 ++++++++++-
 packages/backend/src/const.ts |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 1c5cab208c..c21fc95123 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -40,6 +40,8 @@ jobs:
     needs: [pnpm_install]
     runs-on: ubuntu-latest
     continue-on-error: true
+    env:
+      eslint-cache-version: v1
     strategy:
       matrix:
         workspace:
@@ -59,7 +61,14 @@ jobs:
         cache: 'pnpm'
     - run: corepack enable
     - run: pnpm i --frozen-lockfile
-    - run: pnpm --filter ${{ matrix.workspace }} run eslint
+    - name: Restore eslint cache
+      uses: actions/cache@v4.0.2
+      with:
+        path: node_modules/.cache/eslint
+        key: eslint-${{ env.eslint-cache-version }}-${{ hashFiles('/pnpm-lock.yaml') }}-${{ github.ref_name }}-${{ github.sha }}
+        restore-keys: |
+          eslint-${{ env.eslint-cache-version }}-${{ hashFiles('/pnpm-lock.yaml') }}-
+    - run: pnpm --filter ${{ matrix.workspace }} run eslint --cache --cache-location node_modules/.cache/eslint --cache-strategy content
 
   typecheck:
     needs: [pnpm_install]
diff --git a/packages/backend/src/const.ts b/packages/backend/src/const.ts
index a238f4973a..4dc689238b 100644
--- a/packages/backend/src/const.ts
+++ b/packages/backend/src/const.ts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+// dummy
 export const MAX_NOTE_TEXT_LENGTH = 3000;
 
 export const USER_ONLINE_THRESHOLD = 1000 * 60 * 10; // 10min

From 16795f18a7d9672f408b81228db67c7df77417f6 Mon Sep 17 00:00:00 2001
From: easrng <easrng@gmail.com>
Date: Sun, 14 Jul 2024 06:31:30 -0600
Subject: [PATCH 056/221] Enhance(frontend): Allow negative delay in MFM
 (#14200)

Co-authored-by: easrng <me@easrng.net>
---
 CHANGELOG.md                                                    | 1 +
 .../frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e50dbfec9b..83f2261c1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Fix: 配信停止したインスタンス一覧が見れなくなる問題を修正
 - Fix: Dockerコンテナの立ち上げ時に`pnpm`のインストールで固まることがある問題
 - Fix: デフォルトテーマに無効なテーマコードを入力するとUIが使用できなくなる問題を修正
+- Enhance: Allow negative delay for MFM animation elements (`tada`, `jelly`, `twitch`, `shake`, `spin`, `jump`, `bounce`, `rainbow`)
 
 ### Client
 - Enhance: 内蔵APIドキュメントのデザイン・パフォーマンスを改善
diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index cab8d9c704..0d869892bd 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -65,7 +65,7 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
 	const validTime = (t: string | boolean | null | undefined) => {
 		if (t == null) return null;
 		if (typeof t === 'boolean') return null;
-		return t.match(/^[0-9.]+s$/) ? t : null;
+		return t.match(/^\-?[0-9.]+s$/) ? t : null;
 	};
 
 	const validColor = (c: unknown): string | null => {

From 1b84760c19a56c8928ac639d514fe28c7d01e42d Mon Sep 17 00:00:00 2001
From: Souma <101255979+5ouma@users.noreply.github.com>
Date: Sun, 14 Jul 2024 21:33:22 +0900
Subject: [PATCH 057/221] enhance(backend): Load settings via environment
 variables (#14179)

* feat(backend): Load settings via environment variables

If they're not loaded from the config file.

* chore(docker): Add hints for environment variables

It supports users to know about them.

* docs(changelog): Add the description about this change

Users can notice what's changed by this PR.

* style(backend): Fix code syntax

To pass the linter.
---
 .config/docker_example.env     |  6 ++++++
 .config/docker_example.yml     |  3 +++
 CHANGELOG.md                   |  1 +
 compose_example.yml            |  2 ++
 packages/backend/src/config.ts | 16 ++++++++++------
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/.config/docker_example.env b/.config/docker_example.env
index 4fe8e76b78..c61248da2e 100644
--- a/.config/docker_example.env
+++ b/.config/docker_example.env
@@ -1,5 +1,11 @@
+# misskey settings
+# MISSKEY_URL=https://example.tld/
+
 # db settings
 POSTGRES_PASSWORD=example-misskey-pass
+# DATABASE_PASSWORD=${POSTGRES_PASSWORD}
 POSTGRES_USER=example-misskey-user
+# DATABASE_USER=${POSTGRES_USER}
 POSTGRES_DB=misskey
+# DATABASE_DB=${POSTGRES_DB}
 DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}"
diff --git a/.config/docker_example.yml b/.config/docker_example.yml
index 42ac18de1b..d347882d1a 100644
--- a/.config/docker_example.yml
+++ b/.config/docker_example.yml
@@ -6,6 +6,7 @@
 #───┘ URL └─────────────────────────────────────────────────────
 
 # Final accessible URL seen by a user.
+# You can set url from an environment variable instead.
 url: https://example.tld/
 
 # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
@@ -38,9 +39,11 @@ db:
   port: 5432
 
   # Database name
+  # You can set db from an environment variable instead.
   db: misskey
 
   # Auth
+  # You can set user and pass from environment variables instead.
   user: example-misskey-user
   pass: example-misskey-pass
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83f2261c1d..14cae5d3de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@
 - Enhance: エンドポイント`gallery/posts/update`の必須項目を`postId`のみに
 - Enhance: エンドポイント`i/webhook/update`の必須項目を`webhookId`のみに
 - Enhance: エンドポイント`admin/ad/update`の必須項目を`id`のみに
+- Enhance: `default.yml`内の`url`, `db.db`, `db.user`, `db.pass`を環境変数から読み込めるように
 - Fix: チャート生成時にinstance.suspentionStateに置き換えられたinstance.isSuspendedが参照されてしまう問題を修正
 - Fix: ユーザーのフィードページのMFMをHTMLに展開するように (#14006)
 - Fix: アンテナ・クリップ・リスト・ウェブフックがロールポリシーの上限より一つ多く作れてしまうのを修正 (#14036)
diff --git a/compose_example.yml b/compose_example.yml
index 75d0d3a59c..336bd814a7 100644
--- a/compose_example.yml
+++ b/compose_example.yml
@@ -17,6 +17,8 @@ services:
     networks:
       - internal_network
       - external_network
+    # env_file:
+    #   - .config/docker.env
     volumes:
       - ./files:/misskey/files
       - ./.config:/misskey/.config:ro
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index 4cc27898be..3e5a1e81cd 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -23,7 +23,7 @@ type RedisOptionsSource = Partial<RedisOptions> & {
  * 設定ファイルの型
  */
 type Source = {
-	url: string;
+	url?: string;
 	port?: number;
 	socket?: string;
 	chmodSocket?: string;
@@ -31,9 +31,9 @@ type Source = {
 	db: {
 		host: string;
 		port: number;
-		db: string;
-		user: string;
-		pass: string;
+		db?: string;
+		user?: string;
+		pass?: string;
 		disableCache?: boolean;
 		extra?: { [x: string]: string };
 	};
@@ -202,13 +202,17 @@ export function loadConfig(): Config {
 		: { 'src/_boot_.ts': { file: 'src/_boot_.ts' } };
 	const config = yaml.load(fs.readFileSync(path, 'utf-8')) as Source;
 
-	const url = tryCreateUrl(config.url);
+	const url = tryCreateUrl(config.url ?? process.env.MISSKEY_URL ?? '');
 	const version = meta.version;
 	const host = url.host;
 	const hostname = url.hostname;
 	const scheme = url.protocol.replace(/:$/, '');
 	const wsScheme = scheme.replace('http', 'ws');
 
+	const dbDb = config.db.db ?? process.env.DATABASE_DB ?? '';
+	const dbUser = config.db.user ?? process.env.DATABASE_USER ?? '';
+	const dbPass = config.db.pass ?? process.env.DATABASE_PASSWORD ?? '';
+
 	const externalMediaProxy = config.mediaProxy ?
 		config.mediaProxy.endsWith('/') ? config.mediaProxy.substring(0, config.mediaProxy.length - 1) : config.mediaProxy
 		: null;
@@ -231,7 +235,7 @@ export function loadConfig(): Config {
 		apiUrl: `${scheme}://${host}/api`,
 		authUrl: `${scheme}://${host}/auth`,
 		driveUrl: `${scheme}://${host}/files`,
-		db: config.db,
+		db: { ...config.db, db: dbDb, user: dbUser, pass: dbPass },
 		dbReplications: config.dbReplications,
 		dbSlaves: config.dbSlaves,
 		meilisearch: config.meilisearch,

From ce39c3a2fbf9ab9efaff82fdbad84ac9f2311c6e Mon Sep 17 00:00:00 2001
From: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>
Date: Mon, 15 Jul 2024 14:58:48 +0900
Subject: [PATCH 058/221] chore(backend): registed -> registered (#14213)

* chore(backend): registed -> registered

* Update CHANGELOG.md
---
 CHANGELOG.md                                                  | 1 +
 .../backend/src/core/activitypub/models/ApQuestionService.ts  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14cae5d3de..d7b5979a21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@
 - Fix: 一般ユーザーから見たユーザーのバッジの一覧に公開されていないものが含まれることがある問題を修正  
   (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/652)
 - Fix: ユーザーのリアクション一覧でミュート/ブロックが機能していなかった問題を修正
+- Fix: エラーメッセージの誤字を修正 (#14213)
 
 ### Misskey.js
 - Feat: `/drive/files/create` のリクエストに対応（`multipart/form-data`に対応）
diff --git a/packages/backend/src/core/activitypub/models/ApQuestionService.ts b/packages/backend/src/core/activitypub/models/ApQuestionService.ts
index 4fae1e897b..73004d10b0 100644
--- a/packages/backend/src/core/activitypub/models/ApQuestionService.ts
+++ b/packages/backend/src/core/activitypub/models/ApQuestionService.ts
@@ -74,10 +74,10 @@ export class ApQuestionService {
 
 		//#region このサーバーに既に登録されているか
 		const note = await this.notesRepository.findOneBy({ uri });
-		if (note == null) throw new Error('Question is not registed');
+		if (note == null) throw new Error('Question is not registered');
 
 		const poll = await this.pollsRepository.findOneBy({ noteId: note.id });
-		if (poll == null) throw new Error('Question is not registed');
+		if (poll == null) throw new Error('Question is not registered');
 		//#endregion
 
 		// resolve new Question object

From 1001277d430e84d126c93483d38ce7d6be0e8b48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8A=E3=81=95=E3=82=80=E3=81=AE=E3=81=B2=E3=81=A8?=
 <46447427+samunohito@users.noreply.github.com>
Date: Mon, 15 Jul 2024 22:08:02 +0900
Subject: [PATCH 059/221] =?UTF-8?q?fix:=20CHANGELOG.md=E3=81=AE=E8=A8=98?=
 =?UTF-8?q?=E8=BC=89=E3=81=AB=E6=BC=8F=E3=82=8C=E3=81=8C=E3=81=82=E3=81=A3?=
 =?UTF-8?q?=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20(#14220)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7b5979a21..058aa33719 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,8 @@
   2. フォロー中かつ非アクティブなユーザ
   3. フォローしていないアクティブなユーザ
   4. フォローしていない非アクティブなユーザ
+
+  また、自分自身のアカウントもサジェストされるようになりました。
 - Fix: 一般ユーザーから見たユーザーのバッジの一覧に公開されていないものが含まれることがある問題を修正  
   (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/652)
 - Fix: ユーザーのリアクション一覧でミュート/ブロックが機能していなかった問題を修正

From 3b075c9c441e8fe2d7446a7201cd1950437ba0b6 Mon Sep 17 00:00:00 2001
From: Eiichi Yoshikawa <edo@bari-ikutsu.com>
Date: Tue, 16 Jul 2024 08:38:42 +0900
Subject: [PATCH 060/221] =?UTF-8?q?fix(frontend):=20MkSignin.vue=E3=81=AEc?=
 =?UTF-8?q?redentialRequest=E3=81=8B=E3=82=89Reactivity=E3=82=92=E5=89=8A?=
 =?UTF-8?q?=E9=99=A4=20(#14223)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove reactivity from credentialRequest in MkSignin.vue

* Update Changelog
---
 CHANGELOG.md                                  |  1 +
 packages/frontend/src/components/MkSignin.vue | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 058aa33719..53bf9233fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 - Fix: テーマプレビューが見れない問題を修正
 - Fix: ショートカットキーが連打できる問題を修正  
   (Cherry-picked from https://github.com/taiyme/misskey/pull/234)
+- Fix: MkSignin.vueのcredentialRequestからReactivityを削除（ProxyがPasskey認証処理に渡ることを避けるため）
 
 ### Server
 - Feat: レートリミット制限に引っかかったときに`Retry-After`ヘッダーを返すように (#13949)
diff --git a/packages/frontend/src/components/MkSignin.vue b/packages/frontend/src/components/MkSignin.vue
index a123bbddc6..781145e1bc 100644
--- a/packages/frontend/src/components/MkSignin.vue
+++ b/packages/frontend/src/components/MkSignin.vue
@@ -87,7 +87,7 @@ const host = ref(toUnicode(configHost));
 const totpLogin = ref(false);
 const isBackupCode = ref(false);
 const queryingKey = ref(false);
-const credentialRequest = ref<CredentialRequestOptions | null>(null);
+let credentialRequest: CredentialRequestOptions | null = null;
 
 const emit = defineEmits<{
 	(ev: 'login', v: any): void;
@@ -122,14 +122,14 @@ function onLogin(res: any): Promise<void> | void {
 }
 
 async function queryKey(): Promise<void> {
-	if (credentialRequest.value == null) return;
+	if (credentialRequest == null) return;
 	queryingKey.value = true;
-	await webAuthnRequest(credentialRequest.value)
+	await webAuthnRequest(credentialRequest)
 		.catch(() => {
 			queryingKey.value = false;
 			return Promise.reject(null);
 		}).then(credential => {
-			credentialRequest.value = null;
+			credentialRequest = null;
 			queryingKey.value = false;
 			signing.value = true;
 			return misskeyApi('signin', {
@@ -160,7 +160,7 @@ function onSubmit(): void {
 			}).then(res => {
 				totpLogin.value = true;
 				signing.value = false;
-				credentialRequest.value = parseRequestOptionsFromJSON({
+				credentialRequest = parseRequestOptionsFromJSON({
 					publicKey: res,
 				});
 			})

From 8ebc3b51f7c7ca8956ac84783837f706a36fafc6 Mon Sep 17 00:00:00 2001
From: woxtu <woxtup@gmail.com>
Date: Tue, 16 Jul 2024 23:27:05 +0900
Subject: [PATCH 061/221] Fix typo (#14231)

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53bf9233fc..a51ff49417 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,7 +39,7 @@
 - Enhance: エンドポイント`i/webhook/update`の必須項目を`webhookId`のみに
 - Enhance: エンドポイント`admin/ad/update`の必須項目を`id`のみに
 - Enhance: `default.yml`内の`url`, `db.db`, `db.user`, `db.pass`を環境変数から読み込めるように
-- Fix: チャート生成時にinstance.suspentionStateに置き換えられたinstance.isSuspendedが参照されてしまう問題を修正
+- Fix: チャート生成時にinstance.suspensionStateに置き換えられたinstance.isSuspendedが参照されてしまう問題を修正
 - Fix: ユーザーのフィードページのMFMをHTMLに展開するように (#14006)
 - Fix: アンテナ・クリップ・リスト・ウェブフックがロールポリシーの上限より一つ多く作れてしまうのを修正 (#14036)
 - Fix: notRespondingSinceが実装される前に不通になったインスタンスが自動的に配信停止にならない (#14059)

From 070f0e723d522b5ee2f01beb6a4c127798ed3197 Mon Sep 17 00:00:00 2001
From: FineArchs <133759614+FineArchs@users.noreply.github.com>
Date: Wed, 17 Jul 2024 16:55:17 +0900
Subject: [PATCH 062/221] =?UTF-8?q?AiScript=E3=82=920.19.0=E3=81=AB?=
 =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88=20(#1422?=
 =?UTF-8?q?6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update autogen files

* Update CHANGELOG.md

* Update flash-edit.vue
---
 CHANGELOG.md                                  |   1 +
 packages/frontend/package.json                |   2 +-
 .../frontend/src/pages/flash/flash-edit.vue   |  11 +-
 pnpm-lock.yaml                                | 902 ++++++++++++------
 4 files changed, 610 insertions(+), 306 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a51ff49417..9c634276d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
   (Based on https://github.com/taiyme/misskey/pull/226)
 - Enhance: サーバー情報ページ・お問い合わせページを改善  
   (Cherry-picked from https://github.com/taiyme/misskey/pull/238)
+- Enhance: AiScriptを0.19.0にアップデート
 - Fix: `/about#federation` ページなどで各インスタンスのチャートが表示されなくなっていた問題を修正
 - Fix: ユーザーページの追加情報のラベルを投稿者のサーバーの絵文字で表示する (#13968)
 - Fix: リバーシの対局を正しく共有できないことがある問題を修正
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index a0c1c69883..fbeae08aa0 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -24,7 +24,7 @@
 		"@rollup/plugin-json": "6.1.0",
 		"@rollup/plugin-replace": "5.0.7",
 		"@rollup/pluginutils": "5.1.0",
-		"@syuilo/aiscript": "0.18.0",
+		"@syuilo/aiscript": "0.19.0",
 		"@tabler/icons-webfont": "3.3.0",
 		"@twemoji/parser": "15.1.1",
 		"@vitejs/plugin-vue": "5.0.5",
diff --git a/packages/frontend/src/pages/flash/flash-edit.vue b/packages/frontend/src/pages/flash/flash-edit.vue
index 3445da26a2..0b9f4dfe58 100644
--- a/packages/frontend/src/pages/flash/flash-edit.vue
+++ b/packages/frontend/src/pages/flash/flash-edit.vue
@@ -37,6 +37,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
 import * as Misskey from 'misskey-js';
+import { AISCRIPT_VERSION } from '@syuilo/aiscript';
 import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
@@ -48,7 +49,7 @@ import MkInput from '@/components/MkInput.vue';
 import MkSelect from '@/components/MkSelect.vue';
 import { useRouter } from '@/router/supplier.js';
 
-const PRESET_DEFAULT = `/// @ 0.18.0
+const PRESET_DEFAULT = `/// @ ${AISCRIPT_VERSION}
 
 var name = ""
 
@@ -66,7 +67,7 @@ Ui:render([
 ])
 `;
 
-const PRESET_OMIKUJI = `/// @ 0.18.0
+const PRESET_OMIKUJI = `/// @ ${AISCRIPT_VERSION}
 // ユーザーごとに日替わりのおみくじのプリセット
 
 // 選択肢
@@ -109,7 +110,7 @@ Ui:render([
 ])
 `;
 
-const PRESET_SHUFFLE = `/// @ 0.18.0
+const PRESET_SHUFFLE = `/// @ ${AISCRIPT_VERSION}
 // 巻き戻し可能な文字シャッフルのプリセット
 
 let string = "ペペロンチーノ"
@@ -188,7 +189,7 @@ var cursor = 0
 do()
 `;
 
-const PRESET_QUIZ = `/// @ 0.18.0
+const PRESET_QUIZ = `/// @ ${AISCRIPT_VERSION}
 let title = '地理クイズ'
 
 let qas = [{
@@ -301,7 +302,7 @@ qaEls.push(Ui:C:container({
 Ui:render(qaEls)
 `;
 
-const PRESET_TIMELINE = `/// @ 0.18.0
+const PRESET_TIMELINE = `/// @ ${AISCRIPT_VERSION}
 // APIリクエストを行いローカルタイムラインを表示するプリセット
 
 @fetch() {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6e3ddfc5d4..7d3fec8596 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -48,11 +48,11 @@ importers:
     optionalDependencies:
       '@tensorflow/tfjs-core':
         specifier: 4.4.0
-        version: 4.4.0(encoding@0.1.13)
+        version: 4.20.0(encoding@0.1.13)
     devDependencies:
       '@misskey-dev/eslint-plugin':
         specifier: 2.0.2
-        version: 2.0.2(@eslint/compat@1.1.0)(@typescript-eslint/eslint-plugin@7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3))(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0))(eslint@9.6.0)(globals@15.7.0)
+        version: 2.0.2(@eslint/compat@1.1.1)(@typescript-eslint/eslint-plugin@7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3))(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0))(eslint@9.6.0)(globals@15.7.0)
       '@types/node':
         specifier: 20.14.9
         version: 20.14.9
@@ -115,7 +115,7 @@ importers:
         version: 3.0.0
       '@fastify/http-proxy':
         specifier: 9.5.0
-        version: 9.5.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
+        version: 9.5.0(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       '@fastify/multipart':
         specifier: 8.3.0
         version: 8.3.0
@@ -274,13 +274,13 @@ importers:
         version: 4.1.0
       jsdom:
         specifier: 24.1.0
-        version: 24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
+        version: 24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       json5:
         specifier: 2.2.3
         version: 2.2.3
       jsonld:
         specifier: 8.3.2
-        version: 8.3.2(web-streams-polyfill@3.2.1)
+        version: 8.3.2(web-streams-polyfill@4.0.0)
       jsrsasign:
         specifier: 11.1.0
         version: 11.1.0
@@ -319,7 +319,7 @@ importers:
         version: 6.9.14
       nsfwjs:
         specifier: 2.4.2
-        version: 2.4.2(@tensorflow/tfjs@4.4.0(encoding@0.1.13)(seedrandom@3.0.5))
+        version: 2.4.2(@tensorflow/tfjs@4.20.0(encoding@0.1.13)(seedrandom@3.0.5))
       oauth:
         specifier: 0.10.0
         version: 0.10.0
@@ -433,7 +433,7 @@ importers:
         version: 3.6.7
       ws:
         specifier: 8.17.1
-        version: 8.17.1(bufferutil@4.0.7)(utf-8-validate@6.0.3)
+        version: 8.17.1(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       xev:
         specifier: 3.0.2
         version: 3.0.2
@@ -443,46 +443,46 @@ importers:
         version: 1.3.11
       '@swc/core-darwin-arm64':
         specifier: 1.3.56
-        version: 1.3.56
+        version: 1.7.0-nightly-20240715.2
       '@swc/core-darwin-x64':
         specifier: 1.3.56
-        version: 1.3.56
+        version: 1.7.0-nightly-20240715.2
       '@swc/core-freebsd-x64':
         specifier: 1.3.11
         version: 1.3.11
       '@swc/core-linux-arm-gnueabihf':
         specifier: 1.3.56
-        version: 1.3.56
+        version: 1.7.0-nightly-20240715.2
       '@swc/core-linux-arm64-gnu':
         specifier: 1.3.56
-        version: 1.3.56
+        version: 1.7.0-nightly-20240715.2
       '@swc/core-linux-arm64-musl':
         specifier: 1.3.56
-        version: 1.3.56
+        version: 1.7.0-nightly-20240715.2
       '@swc/core-linux-x64-gnu':
         specifier: 1.3.56
-        version: 1.3.56
+        version: 1.7.0-nightly-20240715.2
       '@swc/core-linux-x64-musl':
         specifier: 1.3.56
-        version: 1.3.56
+        version: 1.7.0-nightly-20240715.2
       '@swc/core-win32-arm64-msvc':
         specifier: 1.3.56
-        version: 1.3.56
+        version: 1.7.0-nightly-20240715.2
       '@swc/core-win32-ia32-msvc':
         specifier: 1.3.56
-        version: 1.3.56
+        version: 1.7.0-nightly-20240715.2
       '@swc/core-win32-x64-msvc':
         specifier: 1.3.56
-        version: 1.3.56
+        version: 1.7.0-nightly-20240715.2
       '@tensorflow/tfjs':
         specifier: 4.4.0
-        version: 4.4.0(encoding@0.1.13)(seedrandom@3.0.5)
+        version: 4.20.0(encoding@0.1.13)(seedrandom@3.0.5)
       '@tensorflow/tfjs-node':
         specifier: 4.4.0
-        version: 4.4.0(encoding@0.1.13)(seedrandom@3.0.5)
+        version: 4.20.0(encoding@0.1.13)(seedrandom@3.0.5)
       bufferutil:
         specifier: 4.0.7
-        version: 4.0.7
+        version: 4.0.8
       slacc-android-arm-eabi:
         specifier: 0.0.10
         version: 0.0.10
@@ -524,7 +524,7 @@ importers:
         version: 0.0.10
       utf-8-validate:
         specifier: 6.0.3
-        version: 6.0.3
+        version: 6.0.4
     devDependencies:
       '@jest/globals':
         specifier: 29.7.0
@@ -651,10 +651,10 @@ importers:
         version: 8.5.10
       '@typescript-eslint/eslint-plugin':
         specifier: 7.15.0
-        version: 7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3)
+        version: 7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint@9.7.0)(typescript@5.5.3)
       '@typescript-eslint/parser':
         specifier: 7.15.0
-        version: 7.15.0(eslint@9.6.0)(typescript@5.5.3)
+        version: 7.15.0(eslint@9.7.0)(typescript@5.5.3)
       aws-sdk-client-mock:
         specifier: 4.0.1
         version: 4.0.1
@@ -663,7 +663,7 @@ importers:
         version: 7.0.3
       eslint-plugin-import:
         specifier: 2.29.1
-        version: 2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)
+        version: 2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint@9.7.0)
       execa:
         specifier: 9.2.0
         version: 9.2.0
@@ -710,8 +710,8 @@ importers:
         specifier: 5.1.0
         version: 5.1.0(rollup@4.18.0)
       '@syuilo/aiscript':
-        specifier: 0.18.0
-        version: 0.18.0
+        specifier: 0.19.0
+        version: 0.19.0
       '@tabler/icons-webfont':
         specifier: 3.3.0
         version: 3.3.0
@@ -720,7 +720,7 @@ importers:
         version: 15.1.1
       '@vitejs/plugin-vue':
         specifier: 5.0.5
-        version: 5.0.5(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.5.3))
+        version: 5.0.5(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))(vue@3.4.31(typescript@5.5.3))
       '@vue/compiler-sfc':
         specifier: 3.4.31
         version: 3.4.31
@@ -852,7 +852,7 @@ importers:
         version: 1.12.0(vue@3.4.31(typescript@5.5.3))
       vite:
         specifier: 5.3.2
-        version: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)
+        version: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2)
       vue:
         specifier: 3.4.31
         version: 3.4.31(typescript@5.5.3)
@@ -871,7 +871,7 @@ importers:
         version: 8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@storybook/addon-interactions':
         specifier: 8.1.11
-        version: 8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))
+        version: 8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))
       '@storybook/addon-links':
         specifier: 8.1.11
         version: 8.1.11(react@18.3.1)
@@ -901,10 +901,10 @@ importers:
         version: 8.1.11(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.3)
       '@storybook/react-vite':
         specifier: 8.1.11
-        version: 8.1.11(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.18.0)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))
+        version: 8.1.11(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.18.0)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))
       '@storybook/test':
         specifier: 8.1.11
-        version: 8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))
+        version: 8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))
       '@storybook/theming':
         specifier: 8.1.11
         version: 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -916,7 +916,7 @@ importers:
         version: 8.1.11(encoding@0.1.13)(prettier@3.3.2)(vue@3.4.31(typescript@5.5.3))
       '@storybook/vue3-vite':
         specifier: 8.1.11
-        version: 8.1.11(bufferutil@4.0.7)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.5.3))
+        version: 8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))(vue@3.4.31(typescript@5.5.3))
       '@testing-library/vue':
         specifier: 8.1.0
         version: 8.1.0(@vue/compiler-sfc@3.4.31)(@vue/server-renderer@3.4.31(vue@3.4.31(typescript@5.5.3)))(vue@3.4.31(typescript@5.5.3))
@@ -958,13 +958,13 @@ importers:
         version: 8.5.10
       '@typescript-eslint/eslint-plugin':
         specifier: 7.15.0
-        version: 7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3)
+        version: 7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint@9.7.0)(typescript@5.5.3)
       '@typescript-eslint/parser':
         specifier: 7.15.0
-        version: 7.15.0(eslint@9.6.0)(typescript@5.5.3)
+        version: 7.15.0(eslint@9.7.0)(typescript@5.5.3)
       '@vitest/coverage-v8':
         specifier: 1.6.0
-        version: 1.6.0(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))
+        version: 1.6.0(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))
       '@vue/runtime-core':
         specifier: 3.4.31
         version: 3.4.31
@@ -979,10 +979,10 @@ importers:
         version: 13.13.0
       eslint-plugin-import:
         specifier: 2.29.1
-        version: 2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)
+        version: 2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint@9.7.0)
       eslint-plugin-vue:
         specifier: 9.26.0
-        version: 9.26.0(eslint@9.6.0)
+        version: 9.26.0(eslint@9.7.0)
       fast-glob:
         specifier: 3.3.2
         version: 3.3.2
@@ -1021,7 +1021,7 @@ importers:
         version: 2.0.4
       storybook:
         specifier: 8.1.11
-        version: 8.1.11(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)
+        version: 8.1.11(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)
       storybook-addon-misskey-theme:
         specifier: github:misskey-dev/storybook-addon-misskey-theme
         version: https://codeload.github.com/misskey-dev/storybook-addon-misskey-theme/tar.gz/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/components@8.1.11(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/core-events@8.1.11)(@storybook/manager-api@8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/preview-api@8.1.11)(@storybook/theming@8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/types@8.1.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -1030,16 +1030,16 @@ importers:
         version: 1.0.3
       vitest:
         specifier: 1.6.0
-        version: 1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1)
+        version: 1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2)
       vitest-fetch-mock:
         specifier: 0.2.2
-        version: 0.2.2(encoding@0.1.13)(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))
+        version: 0.2.2(encoding@0.1.13)(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))
       vue-component-type-helpers:
         specifier: 2.0.24
         version: 2.0.24
       vue-eslint-parser:
         specifier: 9.4.3
-        version: 9.4.3(eslint@9.6.0)
+        version: 9.4.3(eslint@9.7.0)
       vue-tsc:
         specifier: 2.0.24
         version: 2.0.24(typescript@5.5.3)
@@ -1067,10 +1067,10 @@ importers:
         version: 3.0.8
       '@typescript-eslint/eslint-plugin':
         specifier: 7.1.0
-        version: 7.1.0(@typescript-eslint/parser@7.1.0(eslint@9.6.0)(typescript@5.3.3))(eslint@9.6.0)(typescript@5.3.3)
+        version: 7.1.0(@typescript-eslint/parser@7.1.0(eslint@9.7.0)(typescript@5.3.3))(eslint@9.7.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
         specifier: 7.1.0
-        version: 7.1.0(eslint@9.6.0)(typescript@5.3.3)
+        version: 7.1.0(eslint@9.7.0)(typescript@5.3.3)
       esbuild:
         specifier: 0.19.11
         version: 0.19.11
@@ -1101,7 +1101,7 @@ importers:
         version: 7.47.0(@types/node@20.14.9)
       '@swc/jest':
         specifier: 0.2.36
-        version: 0.2.36(@swc/core@1.6.6)
+        version: 0.2.36(@swc/core@1.6.13)
       '@types/jest':
         specifier: 29.5.12
         version: 29.5.12
@@ -1110,10 +1110,10 @@ importers:
         version: 20.14.9
       '@typescript-eslint/eslint-plugin':
         specifier: 7.15.0
-        version: 7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3)
+        version: 7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint@9.7.0)(typescript@5.5.3)
       '@typescript-eslint/parser':
         specifier: 7.15.0
-        version: 7.15.0(eslint@9.6.0)(typescript@5.5.3)
+        version: 7.15.0(eslint@9.7.0)(typescript@5.5.3)
       esbuild:
         specifier: 0.22.0
         version: 0.22.0
@@ -1158,10 +1158,10 @@ importers:
         version: 20.9.1
       '@typescript-eslint/eslint-plugin':
         specifier: 6.11.0
-        version: 6.11.0(@typescript-eslint/parser@6.11.0(eslint@9.6.0)(typescript@5.3.3))(eslint@9.6.0)(typescript@5.3.3)
+        version: 6.11.0(@typescript-eslint/parser@6.11.0(eslint@9.7.0)(typescript@5.3.3))(eslint@9.7.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
         specifier: 6.11.0
-        version: 6.11.0(eslint@9.6.0)(typescript@5.3.3)
+        version: 6.11.0(eslint@9.7.0)(typescript@5.3.3)
       openapi-types:
         specifier: 12.1.3
         version: 12.1.3
@@ -1189,10 +1189,10 @@ importers:
         version: 20.11.5
       '@typescript-eslint/eslint-plugin':
         specifier: 7.1.0
-        version: 7.1.0(@typescript-eslint/parser@7.1.0(eslint@9.6.0)(typescript@5.3.3))(eslint@9.6.0)(typescript@5.3.3)
+        version: 7.1.0(@typescript-eslint/parser@7.1.0(eslint@9.7.0)(typescript@5.3.3))(eslint@9.7.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
         specifier: 7.1.0
-        version: 7.1.0(eslint@9.6.0)(typescript@5.3.3)
+        version: 7.1.0(eslint@9.7.0)(typescript@5.3.3)
       esbuild:
         specifier: 0.19.11
         version: 0.19.11
@@ -1223,13 +1223,13 @@ importers:
     devDependencies:
       '@typescript-eslint/parser':
         specifier: 7.15.0
-        version: 7.15.0(eslint@9.6.0)(typescript@5.5.3)
+        version: 7.15.0(eslint@9.7.0)(typescript@5.5.3)
       '@typescript/lib-webworker':
         specifier: npm:@types/serviceworker@0.0.67
         version: '@types/serviceworker@0.0.67'
       eslint-plugin-import:
         specifier: 2.29.1
-        version: 2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)
+        version: 2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint@9.7.0)
       nodemon:
         specifier: 3.1.4
         version: 3.1.4
@@ -2821,12 +2821,16 @@ packages:
     resolution: {integrity: sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
 
+  '@eslint-community/regexpp@4.11.0':
+    resolution: {integrity: sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+
   '@eslint-community/regexpp@4.6.2':
     resolution: {integrity: sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
 
-  '@eslint/compat@1.1.0':
-    resolution: {integrity: sha512-s9Wi/p25+KbzxKlDm3VshQdImhWk+cbdblhwGNnyCU5lpSwtWa4v7VQCxSki0FAUrGA3s8nCWgYzAH41mwQVKQ==}
+  '@eslint/compat@1.1.1':
+    resolution: {integrity: sha512-lpHyRyplhGPL5mGEh6M9O5nnKk0Gz4bFI+Zu6tKlPpDUN7XshWvH9C/px4UVm87IAANE0W81CEsNGbS1KlzXpA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@eslint/config-array@0.17.0':
@@ -2841,6 +2845,10 @@ packages:
     resolution: {integrity: sha512-D9B0/3vNg44ZeWbYMpBoXqNP4j6eQD5vNwIlGAuFRRzK/WtT/jvDQW3Bi9kkf3PMDMlM7Yi+73VLUsn5bJcl8A==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@eslint/js@9.7.0':
+    resolution: {integrity: sha512-ChuWDQenef8OSFnvuxv0TCVxEwmu3+hPNKvM9B34qpM0rDRbjL8t5QkQeHHeAfsKQjuH9wS82WeCi1J/owatng==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   '@eslint/object-schema@2.1.4':
     resolution: {integrity: sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -3199,6 +3207,9 @@ packages:
   '@jridgewell/source-map@0.3.5':
     resolution: {integrity: sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==}
 
+  '@jridgewell/source-map@0.3.6':
+    resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}
+
   '@jridgewell/sourcemap-codec@1.4.14':
     resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
 
@@ -4533,8 +4544,8 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@swc/core-darwin-arm64@1.3.56':
-    resolution: {integrity: sha512-DZcu7BzDaLEdWHabz9DRTP0yEBLqkrWmskFcD5BX0lGAvoIvE4duMnAqi5F2B3X7630QioHRCYFoRw2WkeE3Cw==}
+  '@swc/core-darwin-arm64@1.6.13':
+    resolution: {integrity: sha512-SOF4buAis72K22BGJ3N8y88mLNfxLNprTuJUpzikyMGrvkuBFNcxYtMhmomO0XHsgLDzOJ+hWzcgjRNzjMsUcQ==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [darwin]
@@ -4545,8 +4556,14 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@swc/core-darwin-x64@1.3.56':
-    resolution: {integrity: sha512-VH5saqYFasdRXJy6RAT+MXm0+IjkMZvOkohJwUei+oA65cKJofQwrJ1jZro8yOJFYvUSI3jgNRGsdBkmo/4hMw==}
+  '@swc/core-darwin-arm64@1.7.0-nightly-20240715.2':
+    resolution: {integrity: sha512-tOMR9yVA1MD320KySitaRT5yUvdzdmuUjX4+sOw2UKHqgk2s68j6JlBHZjdmqpviXXH5qwXWH3ui8ElcHcpN0Q==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@swc/core-darwin-x64@1.6.13':
+    resolution: {integrity: sha512-AW8akFSC+tmPE6YQQvK9S2A1B8pjnXEINg+gGgw0KRUUXunvu1/OEOeC5L2Co1wAwhD7bhnaefi06Qi9AiwOag==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [darwin]
@@ -4557,14 +4574,20 @@ packages:
     cpu: [x64]
     os: [darwin]
 
+  '@swc/core-darwin-x64@1.7.0-nightly-20240715.2':
+    resolution: {integrity: sha512-GVQqC/vSOS/LPXYEF00/+JMwXIFBquIhBy4HEdfybkoRaoeLUHxdqkUhI6dW0lRe85QUrSkg69ylAXwD4foU8Q==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [darwin]
+
   '@swc/core-freebsd-x64@1.3.11':
     resolution: {integrity: sha512-02uqYktPp6WmZfZ2Crc/yIVOcgANtjo8ciHcT7yLHvz7v+S7gx1I2tyNGUFtTX5hcR2IFNGrL8Yj4DvpTABFHg==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [freebsd]
 
-  '@swc/core-linux-arm-gnueabihf@1.3.56':
-    resolution: {integrity: sha512-LWwPo6NnJkH01+ukqvkoNIOpMdw+Zundm4vBeicwyVrkP+mC3kwVfi03TUFpQUz3kRKdw/QEnxGTj+MouCPbtw==}
+  '@swc/core-linux-arm-gnueabihf@1.6.13':
+    resolution: {integrity: sha512-f4gxxvDXVUm2HLYXRd311mSrmbpQF2MZ4Ja6XCQz1hWAxXdhRl1gpnZ+LH/xIfGSwQChrtLLVrkxdYUCVuIjFg==}
     engines: {node: '>=10'}
     cpu: [arm]
     os: [linux]
@@ -4575,8 +4598,14 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@swc/core-linux-arm64-gnu@1.3.56':
-    resolution: {integrity: sha512-GzsUy/4egJ4cMlxbM+Ub7AMi5CKAc+pxBxrh8MUPQbyStW8jGgnQsJouTnGy0LHawtdEnsCOl6PcO6OgvktXuQ==}
+  '@swc/core-linux-arm-gnueabihf@1.7.0-nightly-20240715.2':
+    resolution: {integrity: sha512-r2VnlO7ABL+fUAEJa/qJeqBKG2lxQV9XcgHIyeWHzcyf9G9frcevcXSHbJSGBIIxiADRuoyrYGfRwzsLXDt7jA==}
+    engines: {node: '>=10'}
+    cpu: [arm]
+    os: [linux]
+
+  '@swc/core-linux-arm64-gnu@1.6.13':
+    resolution: {integrity: sha512-Nf/eoW2CbG8s+9JoLtjl9FByBXyQ5cjdBsA4efO7Zw4p+YSuXDgc8HRPC+E2+ns0praDpKNZtLvDtmF2lL+2Gg==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
@@ -4587,8 +4616,14 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@swc/core-linux-arm64-musl@1.3.56':
-    resolution: {integrity: sha512-9gxL09BIiAv8zY0DjfnFf19bo8+P4T9tdhzPwcm+1yPJcY5yr1+YFWLNFzz01agtOj6VlZ2/wUJTaOfdjjtc+A==}
+  '@swc/core-linux-arm64-gnu@1.7.0-nightly-20240715.2':
+    resolution: {integrity: sha512-Pk+RwrvsY1fB2PE3b/RcIbVfvzc3pO8WcTvZjmXQENQ0Af0R+pIR+tnnXweZB48ZdfoBE0sPE3Du1SntoZOcnA==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@swc/core-linux-arm64-musl@1.6.13':
+    resolution: {integrity: sha512-2OysYSYtdw79prJYuKIiux/Gj0iaGEbpS2QZWCIY4X9sGoETJ5iMg+lY+YCrIxdkkNYd7OhIbXdYFyGs/w5LDg==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
@@ -4599,8 +4634,14 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@swc/core-linux-x64-gnu@1.3.56':
-    resolution: {integrity: sha512-n0ORNknl50vMRkll3BDO1E4WOqY6iISlPV1ZQCRLWQ6YQ2q8/WAryBxc2OAybcGHBUFkxyACpJukeU1QZ/9tNw==}
+  '@swc/core-linux-arm64-musl@1.7.0-nightly-20240715.2':
+    resolution: {integrity: sha512-spizj6AJ3xxVz/+7sbeXeqkiGrks4u451gGf4pzlhYqWZzxsWjSS9lZXVGJ6vHslofYsQEK0pIsN+F/wOIspUg==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@swc/core-linux-x64-gnu@1.6.13':
+    resolution: {integrity: sha512-PkR4CZYJNk5hcd2+tMWBpnisnmYsUzazI1O5X7VkIGFcGePTqJ/bWlfUIVVExWxvAI33PQFzLbzmN5scyIUyGQ==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
@@ -4611,8 +4652,14 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@swc/core-linux-x64-musl@1.3.56':
-    resolution: {integrity: sha512-r+D34WLAOAlJtfw1gaVWpHRwCncU9nzW9i7w9kSw4HpWYnHJOz54jLGSEmNsrhdTCz1VK2ar+V2ktFUsrlGlDA==}
+  '@swc/core-linux-x64-gnu@1.7.0-nightly-20240715.2':
+    resolution: {integrity: sha512-08zfcePPoBBBcoSHvNWK2OZk4EQtwB/tgFstDf5HROOKr9YqCxVYemWCwBFuqVHr6ALAoEeizPOqCilvk0jQnw==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@swc/core-linux-x64-musl@1.6.13':
+    resolution: {integrity: sha512-OdsY7wryTxCKwGQcwW9jwWg3cxaHBkTTHi91+5nm7hFPpmZMz1HivJrWAMwVE7iXFw+M4l6ugB/wCvpYrUAAjA==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
@@ -4623,8 +4670,14 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@swc/core-win32-arm64-msvc@1.3.56':
-    resolution: {integrity: sha512-29Yt75Is6X24z3x8h/xZC1HnDPkPpyLH9mDQiM6Cuc0I9mVr1XSriPEUB2N/awf5IE4SA8c+3IVq1DtKWbkJIw==}
+  '@swc/core-linux-x64-musl@1.7.0-nightly-20240715.2':
+    resolution: {integrity: sha512-hrkT5htUfC4DWHI8tI6DxBHQpw6LU6AuWjMuEJcHtGnHA3BeXxXrZsCPpuxKfUHEEQbdijK67pWWh5SCfrX+Lw==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@swc/core-win32-arm64-msvc@1.6.13':
+    resolution: {integrity: sha512-ap6uNmYjwk9M/+bFEuWRNl3hq4VqgQ/Lk+ID/F5WGqczNr0L7vEf+pOsRAn0F6EV+o/nyb3ePt8rLhE/wjHpPg==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [win32]
@@ -4635,8 +4688,14 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@swc/core-win32-ia32-msvc@1.3.56':
-    resolution: {integrity: sha512-mplp0zbYDrcHtfvkniXlXdB04e2qIjz2Gq/XHKr4Rnc6xVORJjjXF91IemXKpavx2oZYJws+LNJL7UFQ8jyCdQ==}
+  '@swc/core-win32-arm64-msvc@1.7.0-nightly-20240715.2':
+    resolution: {integrity: sha512-3SQj5cKo91+cNorNvOne2cqHW3Wcg+/irYts0lCGy3pruZXcgUKeTQ3kmV8pRPtXCs17YLysZOSyCF9DQIbacw==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@swc/core-win32-ia32-msvc@1.6.13':
+    resolution: {integrity: sha512-IJ8KH4yIUHTnS/U1jwQmtbfQals7zWPG0a9hbEfIr4zI0yKzjd83lmtS09lm2Q24QBWOCFGEEbuZxR4tIlvfzA==}
     engines: {node: '>=10'}
     cpu: [ia32]
     os: [win32]
@@ -4647,8 +4706,14 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@swc/core-win32-x64-msvc@1.3.56':
-    resolution: {integrity: sha512-zp8MBnrw/bjdLenO/ifYzHrImSjKunqL0C2IF4LXYNRfcbYFh2NwobsVQMZ20IT0474lKRdlP8Oxdt+bHuXrzA==}
+  '@swc/core-win32-ia32-msvc@1.7.0-nightly-20240715.2':
+    resolution: {integrity: sha512-BiHjqoPhodpgrNXoPaflvpC98NXLa3jI6vV5ZSTLkpJ1JR+T9RcB+unkllr/mjqUZaqafW9AE784A9+wHzja3Q==}
+    engines: {node: '>=10'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@swc/core-win32-x64-msvc@1.6.13':
+    resolution: {integrity: sha512-f6/sx6LMuEnbuxtiSL/EkR0Y6qUHFw1XVrh6rwzKXptTipUdOY+nXpKoh+1UsBm/r7H0/5DtOdrn3q5ZHbFZjQ==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [win32]
@@ -4659,6 +4724,21 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@swc/core-win32-x64-msvc@1.7.0-nightly-20240715.2':
+    resolution: {integrity: sha512-bfSnQxYLOKRakwQo/sJA8I/krU/TfxdlER41OlvEiBXVYEjJFMb7z9NyPsk/DBbqeaA1ywHun8ohBhuEwJWpDQ==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@swc/core@1.6.13':
+    resolution: {integrity: sha512-eailUYex6fkfaQTev4Oa3mwn0/e3mQU4H8y1WPuImYQESOQDtVrowwUGDSc19evpBbHpKtwM+hw8nLlhIsF+Tw==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@swc/helpers': '*'
+    peerDependenciesMeta:
+      '@swc/helpers':
+        optional: true
+
   '@swc/core@1.6.6':
     resolution: {integrity: sha512-sHfmIUPUXNrQTwFMVCY5V5Ena2GTOeaWjS2GFUpjLhAgVfP90OP67DWow7+cYrfFtqBdILHuWnjkTcd0+uPKlg==}
     engines: {node: '>=10'}
@@ -4683,8 +4763,8 @@ packages:
   '@swc/wasm@1.2.130':
     resolution: {integrity: sha512-rNcJsBxS70+pv8YUWwf5fRlWX6JoY/HJc25HD/F8m6Kv7XhJdqPPMhyX6TKkUBPAG7TWlZYoxa+rHAjPy4Cj3Q==}
 
-  '@syuilo/aiscript@0.18.0':
-    resolution: {integrity: sha512-/iY9Vv4LLjtW/KUzId1QwXC4BlpIEPCMcoT7dyRhYdyxtwhS3Hx4b/4j1HYP+n3Pq9XKyW5zvkY72/+DNu4g6Q==}
+  '@syuilo/aiscript@0.19.0':
+    resolution: {integrity: sha512-ZWG4s1m6RrFjE7NeIMaxFz769YO1jW5ReTrOROrEO4IHheOrjxxJ/Ffe2TUNqX9/XxDloMwfWplKhfSzx8LGMA==}
 
   '@szmarczak/http-timer@4.0.6':
     resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==}
@@ -4700,44 +4780,44 @@ packages:
   '@tabler/icons@3.3.0':
     resolution: {integrity: sha512-PLVe9d7b59sKytbx00KgeGhQG3N176Ezv8YMmsnSz4s0ifDzMWlp/h2wEfQZ0ZNe8e377GY2OW6kovUe3Rnd0g==}
 
-  '@tensorflow/tfjs-backend-cpu@4.4.0':
-    resolution: {integrity: sha512-d4eln500/qNym78z9IrUUzF0ITBoJGLrxV8xd92kLVoXhg35Mm+zqUXShjFcrH8joOHOFuST0qZ0TbDDqcPzPA==}
+  '@tensorflow/tfjs-backend-cpu@4.20.0':
+    resolution: {integrity: sha512-1QRQ6AqAa/VB8JOArf5nY3Dc/QQHXbfuxgdIdQhKrABEHgvlaWt2Vv696UhIlVl75YoNY+vWlCwBdGQIKYfFGw==}
     engines: {yarn: '>= 1.3.2'}
     peerDependencies:
-      '@tensorflow/tfjs-core': 4.4.0
+      '@tensorflow/tfjs-core': 4.20.0
 
-  '@tensorflow/tfjs-backend-webgl@4.4.0':
-    resolution: {integrity: sha512-TzQKvfAPgGt9cMG+5bVoTckoG1xr/PVJM/uODkPvzcMqi3j97kuWDXwkYJIgXldStmfiKkU7f5CmyD3Cq3E6BA==}
+  '@tensorflow/tfjs-backend-webgl@4.20.0':
+    resolution: {integrity: sha512-M03fJonJGxm2u3SCzRNA2JLh0gxaAye64SEmGAXOehizowxy42l+lMsPWU8xU7r7mN6PEilBNkuKAf5YJ7Xumg==}
     engines: {yarn: '>= 1.3.2'}
     peerDependencies:
-      '@tensorflow/tfjs-core': 4.4.0
+      '@tensorflow/tfjs-core': 4.20.0
 
-  '@tensorflow/tfjs-converter@4.4.0':
-    resolution: {integrity: sha512-JUjpRStrAuw37tgPd5UENu0UjQVuJT09yF7KpOur4BriJ0uQqrbEZHMPHmvUtr5nYzkqlXJTuXIyxvEY/olNpg==}
+  '@tensorflow/tfjs-converter@4.20.0':
+    resolution: {integrity: sha512-UJ2ntQ1TNtVHB5qGMwB0j306bs3KH1E1HKJ9Dxvrc6PUaivOV+CPKqmbidOFG5LylXeRC36JBdhe+gVT2nFHNw==}
     peerDependencies:
-      '@tensorflow/tfjs-core': 4.4.0
+      '@tensorflow/tfjs-core': 4.20.0
 
-  '@tensorflow/tfjs-core@4.4.0':
-    resolution: {integrity: sha512-Anxpc7cAOA0Q7EUXdTbQKMg3reFvrdkgDlaYzH9ZfkMq2CgLV4Au6E/s6HmbYn/VrAtWy9mLY5c/lLJqh4764g==}
+  '@tensorflow/tfjs-core@4.20.0':
+    resolution: {integrity: sha512-m/cc9qDc63al9UhdbXRUYTLGfJJlhuN5tylAX/2pJMLj32c8a6ThGDJYoKzpf32n5g3MQGYLchjClDxeGdXMPQ==}
     engines: {yarn: '>= 1.3.2'}
 
-  '@tensorflow/tfjs-data@4.4.0':
-    resolution: {integrity: sha512-aY4eq4cgrsrXeBU6ABZAAN3tV0fG4YcHd0z+cYuNXnCo+VEQLJnPmhn+xymZ4VQZQH4GXbVS4dV9pXMclFNRFw==}
+  '@tensorflow/tfjs-data@4.20.0':
+    resolution: {integrity: sha512-k6S8joXhoXkatcoT6mYCxBzRCsnrLfnl6xjLe46SnXO0oEEy4Vuzbmp5Ydl1uU2hHr73zL91EdAC1k8Hng/+oA==}
     peerDependencies:
-      '@tensorflow/tfjs-core': 4.4.0
+      '@tensorflow/tfjs-core': 4.20.0
       seedrandom: ^3.0.5
 
-  '@tensorflow/tfjs-layers@4.4.0':
-    resolution: {integrity: sha512-OGC7shfiD9Gc698hINHK4y9slOJvu5m54tVNm4xf+WSNrw/avvgpar6yyoL5bakYIZNQvFNK75Yr8VRPR7oPeQ==}
+  '@tensorflow/tfjs-layers@4.20.0':
+    resolution: {integrity: sha512-SCHZH29Vyw+Y9eoaJHiaNo6yqM9vD3XCKncoczonRRywejm3FFqddg1AuWAfSE9XoNPE21o9PsknvKLl/Uh+Cg==}
     peerDependencies:
-      '@tensorflow/tfjs-core': 4.4.0
+      '@tensorflow/tfjs-core': 4.20.0
 
-  '@tensorflow/tfjs-node@4.4.0':
-    resolution: {integrity: sha512-+JSAddsupjSQUDZeb7QGOFkL3Tty3kjPHx8ethiYFzwTZJHCMvM7wZJd0Fqnjxym6A0KpsmB7SPZgwRRXVIlPA==}
+  '@tensorflow/tfjs-node@4.20.0':
+    resolution: {integrity: sha512-pVSOlzsVqh5ck3aiNPJCltB3ASKjsLqNPvJ28lXn9Xg648U4eHDk8G47m9w4uf0FdVcWDfjPM3hDCbBZ/E2KXg==}
     engines: {node: '>=8.11.0'}
 
-  '@tensorflow/tfjs@4.4.0':
-    resolution: {integrity: sha512-EmCsnzdvawyk4b+4JKaLLuicHcJQRZtL1zSy9AWJLiiHTbDDseYgLxfaCEfLk8v2bUe7SBXwl3n3B7OjgvH11Q==}
+  '@tensorflow/tfjs@4.20.0':
+    resolution: {integrity: sha512-+ZLfJq2jyIOE2/+yKPoyD/gfy3RZypbfMrlzvBDgodTK5jnexprihhX38hxilh9HPWvWQXJqiUjKJP5ECCikrw==}
     hasBin: true
 
   '@testing-library/dom@10.1.0':
@@ -5024,8 +5104,8 @@ packages:
   '@types/mysql@2.15.22':
     resolution: {integrity: sha512-wK1pzsJVVAjYCSZWQoWHziQZbNggXFDUEIGf54g4ZM/ERuP86uGdWeKZWMYlqTPMZfHJJvLPyogXGvCOg87yLQ==}
 
-  '@types/node-fetch@2.6.4':
-    resolution: {integrity: sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==}
+  '@types/node-fetch@2.6.11':
+    resolution: {integrity: sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==}
 
   '@types/node@18.17.15':
     resolution: {integrity: sha512-2yrWpBk32tvV/JAd3HNHWuZn/VDN1P+72hWirHnvsvTGSqbANi+kSeuQR9yAHnbvaBvHDsoTdXV0Fe+iRtHLKA==}
@@ -5120,6 +5200,9 @@ packages:
   '@types/seedrandom@2.4.30':
     resolution: {integrity: sha512-AnxLHewubLVzoF/A4qdxBGHCKifw8cY32iro3DQX9TPcetE95zBeVt3jnsvtvAUf1vwzMfwzp4t/L2yqPlnjkQ==}
 
+  '@types/seedrandom@2.4.34':
+    resolution: {integrity: sha512-ytDiArvrn/3Xk6/vtylys5tlY6eo7Ane0hvcx++TKo6RxQXuVfW0AF/oeWqAj9dN29SyhtawuXstgmPlwNcv/A==}
+
   '@types/seedrandom@3.0.8':
     resolution: {integrity: sha512-TY1eezMU2zH2ozQoAFAQFOPpvP15g+ZgSfTZt31AUUH/Rxtnz3H+A/Sv1Snw2/amp//omibc+AEkTaA8KUeOLQ==}
 
@@ -5183,9 +5266,6 @@ packages:
   '@types/web-push@3.6.3':
     resolution: {integrity: sha512-v3oT4mMJsHeJ/rraliZ+7TbZtr5bQQuxcgD7C3/1q/zkAj29c8RE0F9lVZVu3hiQe5Z9fYcBreV7TLnfKR+4mg==}
 
-  '@types/webgl-ext@0.0.30':
-    resolution: {integrity: sha512-LKVgNmBxN0BbljJrVUwkxwRYqzsAEPcZOe6S2T6ZaBDIrFp0qu4FNlpc5sM1tGbXUYFgdVQIoeLk1Y1UoblyEg==}
-
   '@types/wrap-ansi@3.0.0':
     resolution: {integrity: sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==}
 
@@ -5489,8 +5569,8 @@ packages:
       '@vue/server-renderer':
         optional: true
 
-  '@webgpu/types@0.1.30':
-    resolution: {integrity: sha512-9AXJSmL3MzY8ZL//JjudA//q+2kBRGhLBFpkdGksWIuxrMy81nFrCzj2Am+mbh8WoU6rXmv7cY5E3rdlyru2Qg==}
+  '@webgpu/types@0.1.38':
+    resolution: {integrity: sha512-7LrhVKz2PRh+DD7+S+PVaFd5HxaWQvoMqBbsV9fNJO1pjUs1P8bM2vQVNfk+3URTqbuTI7gkXi0rfsN0IadoBA==}
 
   '@yarnpkg/esbuild-plugin-pnp@3.0.0-rc.15':
     resolution: {integrity: sha512-kYzDJO5CA9sy+on/s2aIW0411AklfCi8Ck/4QDivOqsMKpStZA2SsR+X27VTggGwpStWaLrjJcDcdDMowtG8MA==}
@@ -6007,8 +6087,8 @@ packages:
   buffer@6.0.3:
     resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
 
-  bufferutil@4.0.7:
-    resolution: {integrity: sha512-kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw==}
+  bufferutil@4.0.8:
+    resolution: {integrity: sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw==}
     engines: {node: '>=6.14.2'}
 
   bullmq@5.8.3:
@@ -7004,6 +7084,10 @@ packages:
     resolution: {integrity: sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  eslint-scope@8.0.2:
+    resolution: {integrity: sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   eslint-visitor-keys@3.4.3:
     resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -7017,6 +7101,11 @@ packages:
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     hasBin: true
 
+  eslint@9.7.0:
+    resolution: {integrity: sha512-FzJ9D/0nGiCGBf8UXO/IGLTgLVzIxze1zpfA8Ton2mjLovXdAPlYDv+MQDcqj3TmrhAGYfOpz9RfR+ent0AgAw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    hasBin: true
+
   espree@10.1.0:
     resolution: {integrity: sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -7038,6 +7127,10 @@ packages:
     resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
     engines: {node: '>=0.10'}
 
+  esquery@1.6.0:
+    resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==}
+    engines: {node: '>=0.10'}
+
   esrecurse@4.3.0:
     resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
     engines: {node: '>=4.0'}
@@ -7342,10 +7435,6 @@ packages:
     resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==}
     engines: {node: '>= 0.12'}
 
-  form-data@3.0.1:
-    resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==}
-    engines: {node: '>= 6'}
-
   form-data@4.0.0:
     resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
     engines: {node: '>= 6'}
@@ -7384,15 +7473,12 @@ packages:
     resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
     engines: {node: '>=10'}
 
-  fs-minipass@1.2.7:
-    resolution: {integrity: sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==}
-
   fs-minipass@2.1.0:
     resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
     engines: {node: '>= 8'}
 
-  fs-minipass@3.0.2:
-    resolution: {integrity: sha512-2GAfyfoaCDRrM6jaOS3UsBts8yJ55VioXdWcOL7dK9zdAuKT71+WBA4ifnNYqVjYv+4SsPxjK0JT4yIIn4cA/g==}
+  fs-minipass@3.0.3:
+    resolution: {integrity: sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
 
   fs.realpath@1.0.0:
@@ -8964,9 +9050,6 @@ packages:
     resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==}
     engines: {node: '>=8'}
 
-  minipass@2.9.0:
-    resolution: {integrity: sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==}
-
   minipass@3.3.6:
     resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==}
     engines: {node: '>=8'}
@@ -8983,9 +9066,6 @@ packages:
     resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
     engines: {node: '>=16 || 14 >=14.17'}
 
-  minizlib@1.3.3:
-    resolution: {integrity: sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==}
-
   minizlib@2.1.2:
     resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
     engines: {node: '>= 8'}
@@ -9172,6 +9252,15 @@ packages:
       encoding:
         optional: true
 
+  node-fetch@2.6.13:
+    resolution: {integrity: sha512-StxNAxh15zr77QvvkmveSQ8uCQ4+v5FkvNTj0OESmiHu+VRi/gXArXtkWMElOsOUNLtUEvI4yS+rdtOHZTwlQA==}
+    engines: {node: 4.x || >=6.0.0}
+    peerDependencies:
+      encoding: ^0.1.0
+    peerDependenciesMeta:
+      encoding:
+        optional: true
+
   node-fetch@2.7.0:
     resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
     engines: {node: 4.x || >=6.0.0}
@@ -9391,6 +9480,10 @@ packages:
     resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
     engines: {node: '>= 0.8.0'}
 
+  optionator@0.9.4:
+    resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
+    engines: {node: '>= 0.8.0'}
+
   ora@5.4.1:
     resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
     engines: {node: '>=10'}
@@ -11036,10 +11129,6 @@ packages:
   tar-stream@3.1.6:
     resolution: {integrity: sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==}
 
-  tar@4.4.19:
-    resolution: {integrity: sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==}
-    engines: {node: '>=4.5'}
-
   tar@6.2.1:
     resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
     engines: {node: '>=10'}
@@ -11068,6 +11157,11 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  terser@5.31.2:
+    resolution: {integrity: sha512-LGyRZVFm/QElZHy/CPr/O4eNZOZIzsrQ92y4v9UJe/pFJjypje2yI3C2FmPtvUEnhadlSbmG2nXtdcjHOjCfxw==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   test-exclude@6.0.0:
     resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
     engines: {node: '>=8'}
@@ -11535,8 +11629,8 @@ packages:
       '@types/react':
         optional: true
 
-  utf-8-validate@6.0.3:
-    resolution: {integrity: sha512-uIuGf9TWQ/y+0Lp+KGZCMuJWc3N9BHA+l/UmHd/oUHwJJDeysyTRxNQVkbzsIWfGFbRe3OcgML/i0mvVRPOyDA==}
+  utf-8-validate@6.0.4:
+    resolution: {integrity: sha512-xu9GQDeFp+eZ6LnCywXN/zBancWvOpUMzgjLPSjy4BRHSmTelvn2E0DG0o1sTiw5hkCKBHo8rwSKncfRfv2EEQ==}
     engines: {node: '>=6.14.2'}
 
   util-deprecate@1.0.2:
@@ -11794,6 +11888,10 @@ packages:
     resolution: {integrity: sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==}
     engines: {node: '>= 8'}
 
+  web-streams-polyfill@4.0.0:
+    resolution: {integrity: sha512-0zJXHRAYEjM2tUfZ2DiSOHAa2aw1tisnnhU3ufD57R8iefL+DcdJyRBRyJpG+NUimDgbTI/lH+gAE1PAvV3Cgw==}
+    engines: {node: '>= 8'}
+
   webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
 
@@ -11870,6 +11968,10 @@ packages:
     resolution: {integrity: sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==}
     engines: {node: '>= 10.0.0'}
 
+  word-wrap@1.2.5:
+    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
+    engines: {node: '>=0.10.0'}
+
   wordwrap@1.0.0:
     resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==}
 
@@ -13699,10 +13801,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@digitalbazaar/http-client@3.4.1(web-streams-polyfill@3.2.1)':
+  '@digitalbazaar/http-client@3.4.1(web-streams-polyfill@4.0.0)':
     dependencies:
       ky: 0.33.3
-      ky-universal: 0.11.0(ky@0.33.3)(web-streams-polyfill@3.2.1)
+      ky-universal: 0.11.0(ky@0.33.3)(web-streams-polyfill@4.0.0)
       undici: 5.28.2
     transitivePeerDependencies:
       - web-streams-polyfill
@@ -14006,11 +14108,18 @@ snapshots:
       eslint: 9.6.0
       eslint-visitor-keys: 3.4.3
 
+  '@eslint-community/eslint-utils@4.4.0(eslint@9.7.0)':
+    dependencies:
+      eslint: 9.7.0
+      eslint-visitor-keys: 3.4.3
+
   '@eslint-community/regexpp@4.10.0': {}
 
+  '@eslint-community/regexpp@4.11.0': {}
+
   '@eslint-community/regexpp@4.6.2': {}
 
-  '@eslint/compat@1.1.0': {}
+  '@eslint/compat@1.1.1': {}
 
   '@eslint/config-array@0.17.0':
     dependencies:
@@ -14036,6 +14145,8 @@ snapshots:
 
   '@eslint/js@9.6.0': {}
 
+  '@eslint/js@9.7.0': {}
+
   '@eslint/object-schema@2.1.4': {}
 
   '@fal-works/esbuild-plugin-global-externals@2.1.2': {}
@@ -14080,12 +14191,12 @@ snapshots:
     dependencies:
       fast-json-stringify: 5.8.0
 
-  '@fastify/http-proxy@9.5.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)':
+  '@fastify/http-proxy@9.5.0(bufferutil@4.0.8)(utf-8-validate@6.0.4)':
     dependencies:
       '@fastify/reply-from': 9.0.1
       fast-querystring: 1.1.2
       fastify-plugin: 4.5.0
-      ws: 8.17.1(bufferutil@4.0.7)(utf-8-validate@6.0.3)
+      ws: 8.17.1(bufferutil@4.0.8)(utf-8-validate@6.0.4)
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
@@ -14474,13 +14585,13 @@ snapshots:
       '@types/yargs': 17.0.19
       chalk: 4.1.2
 
-  '@joshwooding/vite-plugin-react-docgen-typescript@0.3.1(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))':
+  '@joshwooding/vite-plugin-react-docgen-typescript@0.3.1(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))':
     dependencies:
       glob: 7.2.3
       glob-promise: 4.2.2(glob@7.2.3)
       magic-string: 0.27.0
       react-docgen-typescript: 2.2.2(typescript@5.5.3)
-      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)
+      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2)
     optionalDependencies:
       typescript: 5.5.3
 
@@ -14507,6 +14618,12 @@ snapshots:
       '@jridgewell/gen-mapping': 0.3.5
       '@jridgewell/trace-mapping': 0.3.25
 
+  '@jridgewell/source-map@0.3.6':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/trace-mapping': 0.3.25
+    optional: true
+
   '@jridgewell/sourcemap-codec@1.4.14': {}
 
   '@jridgewell/sourcemap-codec@1.4.15': {}
@@ -14596,9 +14713,9 @@ snapshots:
 
   '@misskey-dev/browser-image-resizer@2024.1.0': {}
 
-  '@misskey-dev/eslint-plugin@2.0.2(@eslint/compat@1.1.0)(@typescript-eslint/eslint-plugin@7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3))(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0))(eslint@9.6.0)(globals@15.7.0)':
+  '@misskey-dev/eslint-plugin@2.0.2(@eslint/compat@1.1.1)(@typescript-eslint/eslint-plugin@7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3))(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0))(eslint@9.6.0)(globals@15.7.0)':
     dependencies:
-      '@eslint/compat': 1.1.0
+      '@eslint/compat': 1.1.1
       '@typescript-eslint/eslint-plugin': 7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3)
       '@typescript-eslint/parser': 7.15.0(eslint@9.6.0)(typescript@5.5.3)
       eslint: 9.6.0
@@ -15924,11 +16041,11 @@ snapshots:
     dependencies:
       '@storybook/global': 5.0.0
 
-  '@storybook/addon-interactions@8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))':
+  '@storybook/addon-interactions@8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))':
     dependencies:
       '@storybook/global': 5.0.0
       '@storybook/instrumenter': 8.1.11
-      '@storybook/test': 8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))
+      '@storybook/test': 8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))
       '@storybook/types': 8.1.11
       polished: 4.2.2
       ts-dedent: 2.2.0
@@ -16034,7 +16151,7 @@ snapshots:
       - prettier
       - supports-color
 
-  '@storybook/builder-vite@8.1.11(encoding@0.1.13)(prettier@3.3.2)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))':
+  '@storybook/builder-vite@8.1.11(encoding@0.1.13)(prettier@3.3.2)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))':
     dependencies:
       '@storybook/channels': 8.1.11
       '@storybook/client-logger': 8.1.11
@@ -16053,7 +16170,7 @@ snapshots:
       fs-extra: 11.1.1
       magic-string: 0.30.10
       ts-dedent: 2.2.0
-      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)
+      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2)
     optionalDependencies:
       typescript: 5.5.3
     transitivePeerDependencies:
@@ -16069,7 +16186,7 @@ snapshots:
       telejson: 7.2.0
       tiny-invariant: 1.3.3
 
-  '@storybook/cli@8.1.11(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)':
+  '@storybook/cli@8.1.11(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)':
     dependencies:
       '@babel/core': 7.24.7
       '@babel/types': 7.24.7
@@ -16077,7 +16194,7 @@ snapshots:
       '@storybook/codemod': 8.1.11
       '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
       '@storybook/core-events': 8.1.11
-      '@storybook/core-server': 8.1.11(bufferutil@4.0.7)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)
+      '@storybook/core-server': 8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)
       '@storybook/csf-tools': 8.1.11
       '@storybook/node-logger': 8.1.11
       '@storybook/telemetry': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
@@ -16200,7 +16317,7 @@ snapshots:
       '@storybook/csf': 0.1.9
       ts-dedent: 2.2.0
 
-  '@storybook/core-server@8.1.11(bufferutil@4.0.7)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)':
+  '@storybook/core-server@8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)':
     dependencies:
       '@aw-web-design/x-default-browser': 1.4.126
       '@babel/core': 7.24.7
@@ -16246,7 +16363,7 @@ snapshots:
       util: 0.12.5
       util-deprecate: 1.0.2
       watchpack: 2.4.0
-      ws: 8.17.1(bufferutil@4.0.7)(utf-8-validate@6.0.3)
+      ws: 8.17.1(bufferutil@4.0.8)(utf-8-validate@6.0.4)
     transitivePeerDependencies:
       - bufferutil
       - encoding
@@ -16364,11 +16481,11 @@ snapshots:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
 
-  '@storybook/react-vite@8.1.11(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.18.0)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))':
+  '@storybook/react-vite@8.1.11(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.18.0)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))':
     dependencies:
-      '@joshwooding/vite-plugin-react-docgen-typescript': 0.3.1(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))
+      '@joshwooding/vite-plugin-react-docgen-typescript': 0.3.1(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))
       '@rollup/pluginutils': 5.1.0(rollup@4.18.0)
-      '@storybook/builder-vite': 8.1.11(encoding@0.1.13)(prettier@3.3.2)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))
+      '@storybook/builder-vite': 8.1.11(encoding@0.1.13)(prettier@3.3.2)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))
       '@storybook/node-logger': 8.1.11
       '@storybook/react': 8.1.11(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.3)
       '@storybook/types': 8.1.11
@@ -16379,7 +16496,7 @@ snapshots:
       react-dom: 18.3.1(react@18.3.1)
       resolve: 1.22.8
       tsconfig-paths: 4.2.0
-      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)
+      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2)
     transitivePeerDependencies:
       - '@preact/preset-vite'
       - encoding
@@ -16450,14 +16567,14 @@ snapshots:
       - prettier
       - supports-color
 
-  '@storybook/test@8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))':
+  '@storybook/test@8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))':
     dependencies:
       '@storybook/client-logger': 8.1.11
       '@storybook/core-events': 8.1.11
       '@storybook/instrumenter': 8.1.11
       '@storybook/preview-api': 8.1.11
       '@testing-library/dom': 10.1.0
-      '@testing-library/jest-dom': 6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))
+      '@testing-library/jest-dom': 6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))
       '@testing-library/user-event': 14.5.2(@testing-library/dom@10.1.0)
       '@vitest/expect': 1.6.0
       '@vitest/spy': 1.6.0
@@ -16485,16 +16602,16 @@ snapshots:
       '@types/express': 4.17.17
       file-system-cache: 2.3.0
 
-  '@storybook/vue3-vite@8.1.11(bufferutil@4.0.7)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.5.3))':
+  '@storybook/vue3-vite@8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))(vue@3.4.31(typescript@5.5.3))':
     dependencies:
-      '@storybook/builder-vite': 8.1.11(encoding@0.1.13)(prettier@3.3.2)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))
-      '@storybook/core-server': 8.1.11(bufferutil@4.0.7)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)
+      '@storybook/builder-vite': 8.1.11(encoding@0.1.13)(prettier@3.3.2)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))
+      '@storybook/core-server': 8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)
       '@storybook/types': 8.1.11
       '@storybook/vue3': 8.1.11(encoding@0.1.13)(prettier@3.3.2)(vue@3.4.31(typescript@5.5.3))
       find-package-json: 1.2.0
       magic-string: 0.30.10
       typescript: 5.5.3
-      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)
+      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2)
       vue-component-meta: 2.0.16(typescript@5.5.3)
       vue-docgen-api: 4.75.1(vue@3.4.31(typescript@5.5.3))
     transitivePeerDependencies:
@@ -16546,71 +16663,117 @@ snapshots:
       '@swc/wasm': 1.2.130
     optional: true
 
-  '@swc/core-darwin-arm64@1.3.56':
+  '@swc/core-darwin-arm64@1.6.13':
     optional: true
 
   '@swc/core-darwin-arm64@1.6.6':
     optional: true
 
-  '@swc/core-darwin-x64@1.3.56':
+  '@swc/core-darwin-arm64@1.7.0-nightly-20240715.2':
+    optional: true
+
+  '@swc/core-darwin-x64@1.6.13':
     optional: true
 
   '@swc/core-darwin-x64@1.6.6':
     optional: true
 
+  '@swc/core-darwin-x64@1.7.0-nightly-20240715.2':
+    optional: true
+
   '@swc/core-freebsd-x64@1.3.11':
     dependencies:
       '@swc/wasm': 1.2.130
     optional: true
 
-  '@swc/core-linux-arm-gnueabihf@1.3.56':
+  '@swc/core-linux-arm-gnueabihf@1.6.13':
     optional: true
 
   '@swc/core-linux-arm-gnueabihf@1.6.6':
     optional: true
 
-  '@swc/core-linux-arm64-gnu@1.3.56':
+  '@swc/core-linux-arm-gnueabihf@1.7.0-nightly-20240715.2':
+    optional: true
+
+  '@swc/core-linux-arm64-gnu@1.6.13':
     optional: true
 
   '@swc/core-linux-arm64-gnu@1.6.6':
     optional: true
 
-  '@swc/core-linux-arm64-musl@1.3.56':
+  '@swc/core-linux-arm64-gnu@1.7.0-nightly-20240715.2':
+    optional: true
+
+  '@swc/core-linux-arm64-musl@1.6.13':
     optional: true
 
   '@swc/core-linux-arm64-musl@1.6.6':
     optional: true
 
-  '@swc/core-linux-x64-gnu@1.3.56':
+  '@swc/core-linux-arm64-musl@1.7.0-nightly-20240715.2':
+    optional: true
+
+  '@swc/core-linux-x64-gnu@1.6.13':
     optional: true
 
   '@swc/core-linux-x64-gnu@1.6.6':
     optional: true
 
-  '@swc/core-linux-x64-musl@1.3.56':
+  '@swc/core-linux-x64-gnu@1.7.0-nightly-20240715.2':
+    optional: true
+
+  '@swc/core-linux-x64-musl@1.6.13':
     optional: true
 
   '@swc/core-linux-x64-musl@1.6.6':
     optional: true
 
-  '@swc/core-win32-arm64-msvc@1.3.56':
+  '@swc/core-linux-x64-musl@1.7.0-nightly-20240715.2':
+    optional: true
+
+  '@swc/core-win32-arm64-msvc@1.6.13':
     optional: true
 
   '@swc/core-win32-arm64-msvc@1.6.6':
     optional: true
 
-  '@swc/core-win32-ia32-msvc@1.3.56':
+  '@swc/core-win32-arm64-msvc@1.7.0-nightly-20240715.2':
+    optional: true
+
+  '@swc/core-win32-ia32-msvc@1.6.13':
     optional: true
 
   '@swc/core-win32-ia32-msvc@1.6.6':
     optional: true
 
-  '@swc/core-win32-x64-msvc@1.3.56':
+  '@swc/core-win32-ia32-msvc@1.7.0-nightly-20240715.2':
+    optional: true
+
+  '@swc/core-win32-x64-msvc@1.6.13':
     optional: true
 
   '@swc/core-win32-x64-msvc@1.6.6':
     optional: true
 
+  '@swc/core-win32-x64-msvc@1.7.0-nightly-20240715.2':
+    optional: true
+
+  '@swc/core@1.6.13':
+    dependencies:
+      '@swc/counter': 0.1.3
+      '@swc/types': 0.1.9
+    optionalDependencies:
+      '@swc/core-darwin-arm64': 1.6.13
+      '@swc/core-darwin-x64': 1.6.13
+      '@swc/core-linux-arm-gnueabihf': 1.6.13
+      '@swc/core-linux-arm64-gnu': 1.6.13
+      '@swc/core-linux-arm64-musl': 1.6.13
+      '@swc/core-linux-x64-gnu': 1.6.13
+      '@swc/core-linux-x64-musl': 1.6.13
+      '@swc/core-win32-arm64-msvc': 1.6.13
+      '@swc/core-win32-ia32-msvc': 1.6.13
+      '@swc/core-win32-x64-msvc': 1.6.13
+
   '@swc/core@1.6.6':
     dependencies:
       '@swc/counter': 0.1.3
@@ -16629,6 +16792,13 @@ snapshots:
 
   '@swc/counter@0.1.3': {}
 
+  '@swc/jest@0.2.36(@swc/core@1.6.13)':
+    dependencies:
+      '@jest/create-cache-key-function': 29.7.0
+      '@swc/core': 1.6.13
+      '@swc/counter': 0.1.3
+      jsonc-parser: 3.2.0
+
   '@swc/jest@0.2.36(@swc/core@1.6.6)':
     dependencies:
       '@jest/create-cache-key-function': 29.7.0
@@ -16643,7 +16813,7 @@ snapshots:
   '@swc/wasm@1.2.130':
     optional: true
 
-  '@syuilo/aiscript@0.18.0':
+  '@syuilo/aiscript@0.19.0':
     dependencies:
       seedrandom: 3.0.5
       stringz: 2.1.0
@@ -16663,76 +16833,74 @@ snapshots:
 
   '@tabler/icons@3.3.0': {}
 
-  '@tensorflow/tfjs-backend-cpu@4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))':
+  '@tensorflow/tfjs-backend-cpu@4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))':
     dependencies:
-      '@tensorflow/tfjs-core': 4.4.0(encoding@0.1.13)
-      '@types/seedrandom': 2.4.30
+      '@tensorflow/tfjs-core': 4.20.0(encoding@0.1.13)
+      '@types/seedrandom': 2.4.34
       seedrandom: 3.0.5
 
-  '@tensorflow/tfjs-backend-webgl@4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))':
+  '@tensorflow/tfjs-backend-webgl@4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))':
     dependencies:
-      '@tensorflow/tfjs-backend-cpu': 4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))
-      '@tensorflow/tfjs-core': 4.4.0(encoding@0.1.13)
+      '@tensorflow/tfjs-backend-cpu': 4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))
+      '@tensorflow/tfjs-core': 4.20.0(encoding@0.1.13)
       '@types/offscreencanvas': 2019.3.0
-      '@types/seedrandom': 2.4.30
-      '@types/webgl-ext': 0.0.30
+      '@types/seedrandom': 2.4.34
       seedrandom: 3.0.5
 
-  '@tensorflow/tfjs-converter@4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))':
+  '@tensorflow/tfjs-converter@4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))':
     dependencies:
-      '@tensorflow/tfjs-core': 4.4.0(encoding@0.1.13)
+      '@tensorflow/tfjs-core': 4.20.0(encoding@0.1.13)
 
-  '@tensorflow/tfjs-core@4.4.0(encoding@0.1.13)':
+  '@tensorflow/tfjs-core@4.20.0(encoding@0.1.13)':
     dependencies:
       '@types/long': 4.0.2
       '@types/offscreencanvas': 2019.7.0
       '@types/seedrandom': 2.4.30
-      '@types/webgl-ext': 0.0.30
-      '@webgpu/types': 0.1.30
+      '@webgpu/types': 0.1.38
       long: 4.0.0
       node-fetch: 2.6.11(encoding@0.1.13)
       seedrandom: 3.0.5
     transitivePeerDependencies:
       - encoding
 
-  '@tensorflow/tfjs-data@4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))(encoding@0.1.13)(seedrandom@3.0.5)':
+  '@tensorflow/tfjs-data@4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))(encoding@0.1.13)(seedrandom@3.0.5)':
     dependencies:
-      '@tensorflow/tfjs-core': 4.4.0(encoding@0.1.13)
-      '@types/node-fetch': 2.6.4
-      node-fetch: 2.6.11(encoding@0.1.13)
+      '@tensorflow/tfjs-core': 4.20.0(encoding@0.1.13)
+      '@types/node-fetch': 2.6.11
+      node-fetch: 2.6.13(encoding@0.1.13)
       seedrandom: 3.0.5
       string_decoder: 1.3.0
     transitivePeerDependencies:
       - encoding
 
-  '@tensorflow/tfjs-layers@4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))':
+  '@tensorflow/tfjs-layers@4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))':
     dependencies:
-      '@tensorflow/tfjs-core': 4.4.0(encoding@0.1.13)
+      '@tensorflow/tfjs-core': 4.20.0(encoding@0.1.13)
 
-  '@tensorflow/tfjs-node@4.4.0(encoding@0.1.13)(seedrandom@3.0.5)':
+  '@tensorflow/tfjs-node@4.20.0(encoding@0.1.13)(seedrandom@3.0.5)':
     dependencies:
       '@mapbox/node-pre-gyp': 1.0.9(encoding@0.1.13)
-      '@tensorflow/tfjs': 4.4.0(encoding@0.1.13)(seedrandom@3.0.5)
+      '@tensorflow/tfjs': 4.20.0(encoding@0.1.13)(seedrandom@3.0.5)
       adm-zip: 0.5.10
       google-protobuf: 3.21.2
       https-proxy-agent: 2.2.4
       progress: 2.0.3
       rimraf: 2.7.1
-      tar: 4.4.19
+      tar: 6.2.1
     transitivePeerDependencies:
       - encoding
       - seedrandom
       - supports-color
     optional: true
 
-  '@tensorflow/tfjs@4.4.0(encoding@0.1.13)(seedrandom@3.0.5)':
+  '@tensorflow/tfjs@4.20.0(encoding@0.1.13)(seedrandom@3.0.5)':
     dependencies:
-      '@tensorflow/tfjs-backend-cpu': 4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))
-      '@tensorflow/tfjs-backend-webgl': 4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))
-      '@tensorflow/tfjs-converter': 4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))
-      '@tensorflow/tfjs-core': 4.4.0(encoding@0.1.13)
-      '@tensorflow/tfjs-data': 4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))(encoding@0.1.13)(seedrandom@3.0.5)
-      '@tensorflow/tfjs-layers': 4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))
+      '@tensorflow/tfjs-backend-cpu': 4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))
+      '@tensorflow/tfjs-backend-webgl': 4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))
+      '@tensorflow/tfjs-converter': 4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))
+      '@tensorflow/tfjs-core': 4.20.0(encoding@0.1.13)
+      '@tensorflow/tfjs-data': 4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))(encoding@0.1.13)(seedrandom@3.0.5)
+      '@tensorflow/tfjs-layers': 4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))
       argparse: 1.0.10
       chalk: 4.1.2
       core-js: 3.29.1
@@ -16764,7 +16932,7 @@ snapshots:
       lz-string: 1.5.0
       pretty-format: 27.5.1
 
-  '@testing-library/jest-dom@6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))':
+  '@testing-library/jest-dom@6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))':
     dependencies:
       '@adobe/css-tools': 4.3.3
       '@babel/runtime': 7.23.4
@@ -16778,7 +16946,7 @@ snapshots:
       '@jest/globals': 29.7.0
       '@types/jest': 29.5.12
       jest: 29.7.0(@types/node@20.14.9)
-      vitest: 1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1)
+      vitest: 1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2)
 
   '@testing-library/user-event@14.5.2(@testing-library/dom@10.1.0)':
     dependencies:
@@ -17050,10 +17218,10 @@ snapshots:
     dependencies:
       '@types/node': 20.14.9
 
-  '@types/node-fetch@2.6.4':
+  '@types/node-fetch@2.6.11':
     dependencies:
       '@types/node': 20.14.9
-      form-data: 3.0.1
+      form-data: 4.0.0
 
   '@types/node@18.17.15': {}
 
@@ -17154,6 +17322,8 @@ snapshots:
 
   '@types/seedrandom@2.4.30': {}
 
+  '@types/seedrandom@2.4.34': {}
+
   '@types/seedrandom@3.0.8': {}
 
   '@types/semver@7.5.8': {}
@@ -17205,8 +17375,6 @@ snapshots:
     dependencies:
       '@types/node': 20.14.9
 
-  '@types/webgl-ext@0.0.30': {}
-
   '@types/wrap-ansi@3.0.0': {}
 
   '@types/ws@8.5.10':
@@ -17224,16 +17392,16 @@ snapshots:
       '@types/node': 20.14.9
     optional: true
 
-  '@typescript-eslint/eslint-plugin@6.11.0(@typescript-eslint/parser@6.11.0(eslint@9.6.0)(typescript@5.3.3))(eslint@9.6.0)(typescript@5.3.3)':
+  '@typescript-eslint/eslint-plugin@6.11.0(@typescript-eslint/parser@6.11.0(eslint@9.7.0)(typescript@5.3.3))(eslint@9.7.0)(typescript@5.3.3)':
     dependencies:
       '@eslint-community/regexpp': 4.6.2
-      '@typescript-eslint/parser': 6.11.0(eslint@9.6.0)(typescript@5.3.3)
+      '@typescript-eslint/parser': 6.11.0(eslint@9.7.0)(typescript@5.3.3)
       '@typescript-eslint/scope-manager': 6.11.0
-      '@typescript-eslint/type-utils': 6.11.0(eslint@9.6.0)(typescript@5.3.3)
-      '@typescript-eslint/utils': 6.11.0(eslint@9.6.0)(typescript@5.3.3)
+      '@typescript-eslint/type-utils': 6.11.0(eslint@9.7.0)(typescript@5.3.3)
+      '@typescript-eslint/utils': 6.11.0(eslint@9.7.0)(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 6.11.0
       debug: 4.3.4(supports-color@5.5.0)
-      eslint: 9.6.0
+      eslint: 9.7.0
       graphemer: 1.4.0
       ignore: 5.2.4
       natural-compare: 1.4.0
@@ -17244,16 +17412,16 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/eslint-plugin@7.1.0(@typescript-eslint/parser@7.1.0(eslint@9.6.0)(typescript@5.3.3))(eslint@9.6.0)(typescript@5.3.3)':
+  '@typescript-eslint/eslint-plugin@7.1.0(@typescript-eslint/parser@7.1.0(eslint@9.7.0)(typescript@5.3.3))(eslint@9.7.0)(typescript@5.3.3)':
     dependencies:
       '@eslint-community/regexpp': 4.6.2
-      '@typescript-eslint/parser': 7.1.0(eslint@9.6.0)(typescript@5.3.3)
+      '@typescript-eslint/parser': 7.1.0(eslint@9.7.0)(typescript@5.3.3)
       '@typescript-eslint/scope-manager': 7.1.0
-      '@typescript-eslint/type-utils': 7.1.0(eslint@9.6.0)(typescript@5.3.3)
-      '@typescript-eslint/utils': 7.1.0(eslint@9.6.0)(typescript@5.3.3)
+      '@typescript-eslint/type-utils': 7.1.0(eslint@9.7.0)(typescript@5.3.3)
+      '@typescript-eslint/utils': 7.1.0(eslint@9.7.0)(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 7.1.0
       debug: 4.3.4(supports-color@5.5.0)
-      eslint: 9.6.0
+      eslint: 9.7.0
       graphemer: 1.4.0
       ignore: 5.2.4
       natural-compare: 1.4.0
@@ -17282,27 +17450,45 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@6.11.0(eslint@9.6.0)(typescript@5.3.3)':
+  '@typescript-eslint/eslint-plugin@7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint@9.7.0)(typescript@5.5.3)':
+    dependencies:
+      '@eslint-community/regexpp': 4.10.0
+      '@typescript-eslint/parser': 7.15.0(eslint@9.7.0)(typescript@5.5.3)
+      '@typescript-eslint/scope-manager': 7.15.0
+      '@typescript-eslint/type-utils': 7.15.0(eslint@9.7.0)(typescript@5.5.3)
+      '@typescript-eslint/utils': 7.15.0(eslint@9.7.0)(typescript@5.5.3)
+      '@typescript-eslint/visitor-keys': 7.15.0
+      eslint: 9.7.0
+      graphemer: 1.4.0
+      ignore: 5.3.1
+      natural-compare: 1.4.0
+      ts-api-utils: 1.3.0(typescript@5.5.3)
+    optionalDependencies:
+      typescript: 5.5.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/parser@6.11.0(eslint@9.7.0)(typescript@5.3.3)':
     dependencies:
       '@typescript-eslint/scope-manager': 6.11.0
       '@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)
-      eslint: 9.6.0
+      eslint: 9.7.0
     optionalDependencies:
       typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@7.1.0(eslint@9.6.0)(typescript@5.3.3)':
+  '@typescript-eslint/parser@7.1.0(eslint@9.7.0)(typescript@5.3.3)':
     dependencies:
       '@typescript-eslint/scope-manager': 7.1.0
       '@typescript-eslint/types': 7.1.0
       '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 7.1.0
       debug: 4.3.4(supports-color@5.5.0)
-      eslint: 9.6.0
+      eslint: 9.7.0
     optionalDependencies:
       typescript: 5.3.3
     transitivePeerDependencies:
@@ -17321,6 +17507,19 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3)':
+    dependencies:
+      '@typescript-eslint/scope-manager': 7.15.0
+      '@typescript-eslint/types': 7.15.0
+      '@typescript-eslint/typescript-estree': 7.15.0(typescript@5.5.3)
+      '@typescript-eslint/visitor-keys': 7.15.0
+      debug: 4.3.5(supports-color@8.1.1)
+      eslint: 9.7.0
+    optionalDependencies:
+      typescript: 5.5.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/scope-manager@6.11.0':
     dependencies:
       '@typescript-eslint/types': 6.11.0
@@ -17336,24 +17535,24 @@ snapshots:
       '@typescript-eslint/types': 7.15.0
       '@typescript-eslint/visitor-keys': 7.15.0
 
-  '@typescript-eslint/type-utils@6.11.0(eslint@9.6.0)(typescript@5.3.3)':
+  '@typescript-eslint/type-utils@6.11.0(eslint@9.7.0)(typescript@5.3.3)':
     dependencies:
       '@typescript-eslint/typescript-estree': 6.11.0(typescript@5.3.3)
-      '@typescript-eslint/utils': 6.11.0(eslint@9.6.0)(typescript@5.3.3)
+      '@typescript-eslint/utils': 6.11.0(eslint@9.7.0)(typescript@5.3.3)
       debug: 4.3.5(supports-color@8.1.1)
-      eslint: 9.6.0
+      eslint: 9.7.0
       ts-api-utils: 1.0.1(typescript@5.3.3)
     optionalDependencies:
       typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/type-utils@7.1.0(eslint@9.6.0)(typescript@5.3.3)':
+  '@typescript-eslint/type-utils@7.1.0(eslint@9.7.0)(typescript@5.3.3)':
     dependencies:
       '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
-      '@typescript-eslint/utils': 7.1.0(eslint@9.6.0)(typescript@5.3.3)
+      '@typescript-eslint/utils': 7.1.0(eslint@9.7.0)(typescript@5.3.3)
       debug: 4.3.4(supports-color@5.5.0)
-      eslint: 9.6.0
+      eslint: 9.7.0
       ts-api-utils: 1.0.1(typescript@5.3.3)
     optionalDependencies:
       typescript: 5.3.3
@@ -17372,6 +17571,18 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/type-utils@7.15.0(eslint@9.7.0)(typescript@5.5.3)':
+    dependencies:
+      '@typescript-eslint/typescript-estree': 7.15.0(typescript@5.5.3)
+      '@typescript-eslint/utils': 7.15.0(eslint@9.7.0)(typescript@5.5.3)
+      debug: 4.3.5(supports-color@8.1.1)
+      eslint: 9.7.0
+      ts-api-utils: 1.3.0(typescript@5.5.3)
+    optionalDependencies:
+      typescript: 5.5.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/types@6.11.0': {}
 
   '@typescript-eslint/types@7.1.0': {}
@@ -17422,29 +17633,29 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@6.11.0(eslint@9.6.0)(typescript@5.3.3)':
+  '@typescript-eslint/utils@6.11.0(eslint@9.7.0)(typescript@5.3.3)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@9.6.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.7.0)
       '@types/json-schema': 7.0.12
       '@types/semver': 7.5.8
       '@typescript-eslint/scope-manager': 6.11.0
       '@typescript-eslint/types': 6.11.0
       '@typescript-eslint/typescript-estree': 6.11.0(typescript@5.3.3)
-      eslint: 9.6.0
+      eslint: 9.7.0
       semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  '@typescript-eslint/utils@7.1.0(eslint@9.6.0)(typescript@5.3.3)':
+  '@typescript-eslint/utils@7.1.0(eslint@9.7.0)(typescript@5.3.3)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@9.6.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.7.0)
       '@types/json-schema': 7.0.12
       '@types/semver': 7.5.8
       '@typescript-eslint/scope-manager': 7.1.0
       '@typescript-eslint/types': 7.1.0
       '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
-      eslint: 9.6.0
+      eslint: 9.7.0
       semver: 7.6.0
     transitivePeerDependencies:
       - supports-color
@@ -17461,6 +17672,17 @@ snapshots:
       - supports-color
       - typescript
 
+  '@typescript-eslint/utils@7.15.0(eslint@9.7.0)(typescript@5.5.3)':
+    dependencies:
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.7.0)
+      '@typescript-eslint/scope-manager': 7.15.0
+      '@typescript-eslint/types': 7.15.0
+      '@typescript-eslint/typescript-estree': 7.15.0(typescript@5.5.3)
+      eslint: 9.7.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
   '@typescript-eslint/visitor-keys@6.11.0':
     dependencies:
       '@typescript-eslint/types': 6.11.0
@@ -17478,12 +17700,12 @@ snapshots:
 
   '@ungap/structured-clone@1.2.0': {}
 
-  '@vitejs/plugin-vue@5.0.5(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1))(vue@3.4.31(typescript@5.5.3))':
+  '@vitejs/plugin-vue@5.0.5(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))(vue@3.4.31(typescript@5.5.3))':
     dependencies:
-      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)
+      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2)
       vue: 3.4.31(typescript@5.5.3)
 
-  '@vitest/coverage-v8@1.6.0(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1))':
+  '@vitest/coverage-v8@1.6.0(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))':
     dependencies:
       '@ampproject/remapping': 2.2.1
       '@bcoe/v8-coverage': 0.2.3
@@ -17498,7 +17720,7 @@ snapshots:
       std-env: 3.7.0
       strip-literal: 2.1.0
       test-exclude: 6.0.0
-      vitest: 1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1)
+      vitest: 1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2)
     transitivePeerDependencies:
       - supports-color
 
@@ -17660,7 +17882,7 @@ snapshots:
     optionalDependencies:
       '@vue/server-renderer': 3.4.31(vue@3.4.31(typescript@5.5.3))
 
-  '@webgpu/types@0.1.30': {}
+  '@webgpu/types@0.1.38': {}
 
   '@yarnpkg/esbuild-plugin-pnp@3.0.0-rc.15(esbuild@0.19.11)':
     dependencies:
@@ -18258,7 +18480,7 @@ snapshots:
       base64-js: 1.5.1
       ieee754: 1.2.1
 
-  bufferutil@4.0.7:
+  bufferutil@4.0.8:
     dependencies:
       node-gyp-build: 4.6.0
     optional: true
@@ -18290,10 +18512,10 @@ snapshots:
   cacache@18.0.0:
     dependencies:
       '@npmcli/fs': 3.1.0
-      fs-minipass: 3.0.2
+      fs-minipass: 3.0.3
       glob: 10.4.2
       lru-cache: 10.2.2
-      minipass: 7.0.4
+      minipass: 7.1.2
       minipass-collect: 1.0.2
       minipass-flush: 1.0.5
       minipass-pipeline: 1.2.4
@@ -19426,6 +19648,16 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  eslint-module-utils@2.8.0(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint-import-resolver-node@0.3.9)(eslint@9.7.0):
+    dependencies:
+      debug: 3.2.7(supports-color@8.1.1)
+    optionalDependencies:
+      '@typescript-eslint/parser': 7.15.0(eslint@9.7.0)(typescript@5.5.3)
+      eslint: 9.7.0
+      eslint-import-resolver-node: 0.3.9
+    transitivePeerDependencies:
+      - supports-color
+
   eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0):
     dependencies:
       array-includes: 3.1.7
@@ -19453,16 +19685,43 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-plugin-vue@9.26.0(eslint@9.6.0):
+  eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint@9.7.0):
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@9.6.0)
-      eslint: 9.6.0
+      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: 9.7.0
+      eslint-import-resolver-node: 0.3.9
+      eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint-import-resolver-node@0.3.9)(eslint@9.7.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
+    optionalDependencies:
+      '@typescript-eslint/parser': 7.15.0(eslint@9.7.0)(typescript@5.5.3)
+    transitivePeerDependencies:
+      - eslint-import-resolver-typescript
+      - eslint-import-resolver-webpack
+      - supports-color
+
+  eslint-plugin-vue@9.26.0(eslint@9.7.0):
+    dependencies:
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.7.0)
+      eslint: 9.7.0
       globals: 13.24.0
       natural-compare: 1.4.0
       nth-check: 2.1.1
       postcss-selector-parser: 6.0.16
       semver: 7.6.0
-      vue-eslint-parser: 9.4.3(eslint@9.6.0)
+      vue-eslint-parser: 9.4.3(eslint@9.7.0)
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
       - supports-color
@@ -19479,6 +19738,11 @@ snapshots:
       esrecurse: 4.3.0
       estraverse: 5.3.0
 
+  eslint-scope@8.0.2:
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
+
   eslint-visitor-keys@3.4.3: {}
 
   eslint-visitor-keys@4.0.0: {}
@@ -19522,6 +19786,45 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  eslint@9.7.0:
+    dependencies:
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.7.0)
+      '@eslint-community/regexpp': 4.11.0
+      '@eslint/config-array': 0.17.0
+      '@eslint/eslintrc': 3.1.0
+      '@eslint/js': 9.7.0
+      '@humanwhocodes/module-importer': 1.0.1
+      '@humanwhocodes/retry': 0.3.0
+      '@nodelib/fs.walk': 1.2.8
+      ajv: 6.12.6
+      chalk: 4.1.2
+      cross-spawn: 7.0.3
+      debug: 4.3.5(supports-color@8.1.1)
+      escape-string-regexp: 4.0.0
+      eslint-scope: 8.0.2
+      eslint-visitor-keys: 4.0.0
+      espree: 10.1.0
+      esquery: 1.6.0
+      esutils: 2.0.3
+      fast-deep-equal: 3.1.3
+      file-entry-cache: 8.0.0
+      find-up: 5.0.0
+      glob-parent: 6.0.2
+      ignore: 5.3.1
+      imurmurhash: 0.1.4
+      is-glob: 4.0.3
+      is-path-inside: 3.0.3
+      json-stable-stringify-without-jsonify: 1.0.1
+      levn: 0.4.1
+      lodash.merge: 4.6.2
+      minimatch: 3.1.2
+      natural-compare: 1.4.0
+      optionator: 0.9.4
+      strip-ansi: 6.0.1
+      text-table: 0.2.0
+    transitivePeerDependencies:
+      - supports-color
+
   espree@10.1.0:
     dependencies:
       acorn: 8.12.0
@@ -19544,6 +19847,10 @@ snapshots:
     dependencies:
       estraverse: 5.3.0
 
+  esquery@1.6.0:
+    dependencies:
+      estraverse: 5.3.0
+
   esrecurse@4.3.0:
     dependencies:
       estraverse: 5.3.0
@@ -19970,12 +20277,6 @@ snapshots:
       combined-stream: 1.0.8
       mime-types: 2.1.35
 
-  form-data@3.0.1:
-    dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      mime-types: 2.1.35
-
   form-data@4.0.0:
     dependencies:
       asynckit: 0.4.0
@@ -20019,18 +20320,13 @@ snapshots:
       jsonfile: 6.1.0
       universalify: 2.0.0
 
-  fs-minipass@1.2.7:
-    dependencies:
-      minipass: 2.9.0
-    optional: true
-
   fs-minipass@2.1.0:
     dependencies:
       minipass: 3.3.6
 
-  fs-minipass@3.0.2:
+  fs-minipass@3.0.3:
     dependencies:
-      minipass: 5.0.0
+      minipass: 7.1.2
 
   fs.realpath@1.0.0: {}
 
@@ -21271,7 +21567,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3):
+  jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4):
     dependencies:
       cssstyle: 4.0.1
       data-urls: 5.0.0
@@ -21292,7 +21588,7 @@ snapshots:
       whatwg-encoding: 3.1.1
       whatwg-mimetype: 4.0.0
       whatwg-url: 14.0.0
-      ws: 8.17.1(bufferutil@4.0.7)(utf-8-validate@6.0.3)
+      ws: 8.17.1(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       xml-name-validator: 5.0.0
     transitivePeerDependencies:
       - bufferutil
@@ -21346,9 +21642,9 @@ snapshots:
     optionalDependencies:
       graceful-fs: 4.2.11
 
-  jsonld@8.3.2(web-streams-polyfill@3.2.1):
+  jsonld@8.3.2(web-streams-polyfill@4.0.0):
     dependencies:
-      '@digitalbazaar/http-client': 3.4.1(web-streams-polyfill@3.2.1)
+      '@digitalbazaar/http-client': 3.4.1(web-streams-polyfill@4.0.0)
       canonicalize: 1.0.8
       lru-cache: 6.0.0
       rdf-canonize: 3.4.0
@@ -21399,13 +21695,13 @@ snapshots:
 
   kleur@3.0.3: {}
 
-  ky-universal@0.11.0(ky@0.33.3)(web-streams-polyfill@3.2.1):
+  ky-universal@0.11.0(ky@0.33.3)(web-streams-polyfill@4.0.0):
     dependencies:
       abort-controller: 3.0.0
       ky: 0.33.3
       node-fetch: 3.3.2
     optionalDependencies:
-      web-streams-polyfill: 3.2.1
+      web-streams-polyfill: 4.0.0
 
   ky@0.33.3: {}
 
@@ -21575,7 +21871,7 @@ snapshots:
       cacache: 18.0.0
       http-cache-semantics: 4.1.1
       is-lambda: 1.0.1
-      minipass: 7.0.4
+      minipass: 7.1.2
       minipass-fetch: 3.0.3
       minipass-flush: 1.0.5
       minipass-pipeline: 1.2.4
@@ -22029,12 +22325,6 @@ snapshots:
     dependencies:
       minipass: 3.3.6
 
-  minipass@2.9.0:
-    dependencies:
-      safe-buffer: 5.2.1
-      yallist: 3.1.1
-    optional: true
-
   minipass@3.3.6:
     dependencies:
       yallist: 4.0.0
@@ -22045,11 +22335,6 @@ snapshots:
 
   minipass@7.1.2: {}
 
-  minizlib@1.3.3:
-    dependencies:
-      minipass: 2.9.0
-    optional: true
-
   minizlib@2.1.2:
     dependencies:
       minipass: 3.3.6
@@ -22241,6 +22526,12 @@ snapshots:
     optionalDependencies:
       encoding: 0.1.13
 
+  node-fetch@2.6.13(encoding@0.1.13):
+    dependencies:
+      whatwg-url: 5.0.0
+    optionalDependencies:
+      encoding: 0.1.13
+
   node-fetch@2.7.0(encoding@0.1.13):
     dependencies:
       whatwg-url: 5.0.0
@@ -22371,10 +22662,10 @@ snapshots:
       set-blocking: 2.0.0
     optional: true
 
-  nsfwjs@2.4.2(@tensorflow/tfjs@4.4.0(encoding@0.1.13)(seedrandom@3.0.5)):
+  nsfwjs@2.4.2(@tensorflow/tfjs@4.20.0(encoding@0.1.13)(seedrandom@3.0.5)):
     dependencies:
       '@nsfw-filter/gif-frames': 1.0.2
-      '@tensorflow/tfjs': 4.4.0(encoding@0.1.13)(seedrandom@3.0.5)
+      '@tensorflow/tfjs': 4.20.0(encoding@0.1.13)(seedrandom@3.0.5)
 
   nth-check@2.1.1:
     dependencies:
@@ -22496,6 +22787,15 @@ snapshots:
       prelude-ls: 1.2.1
       type-check: 0.4.0
 
+  optionator@0.9.4:
+    dependencies:
+      deep-is: 0.1.4
+      fast-levenshtein: 2.0.6
+      levn: 0.4.1
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
+      word-wrap: 1.2.5
+
   ora@5.4.1:
     dependencies:
       bl: 4.1.0
@@ -24038,9 +24338,9 @@ snapshots:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
 
-  storybook@8.1.11(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3):
+  storybook@8.1.11(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4):
     dependencies:
-      '@storybook/cli': 8.1.11(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.7)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.3)
+      '@storybook/cli': 8.1.11(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)
     transitivePeerDependencies:
       - '@babel/preset-env'
       - bufferutil
@@ -24236,17 +24536,6 @@ snapshots:
       fast-fifo: 1.3.0
       streamx: 2.15.0
 
-  tar@4.4.19:
-    dependencies:
-      chownr: 1.1.4
-      fs-minipass: 1.2.7
-      minipass: 2.9.0
-      minizlib: 1.3.3
-      mkdirp: 0.5.6
-      safe-buffer: 5.2.1
-      yallist: 3.1.1
-    optional: true
-
   tar@6.2.1:
     dependencies:
       chownr: 2.0.0
@@ -24284,6 +24573,14 @@ snapshots:
       commander: 2.20.3
       source-map-support: 0.5.21
 
+  terser@5.31.2:
+    dependencies:
+      '@jridgewell/source-map': 0.3.6
+      acorn: 8.12.0
+      commander: 2.20.3
+      source-map-support: 0.5.21
+    optional: true
+
   test-exclude@6.0.0:
     dependencies:
       '@istanbuljs/schema': 0.1.3
@@ -24681,7 +24978,7 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.0.28
 
-  utf-8-validate@6.0.3:
+  utf-8-validate@6.0.4:
     dependencies:
       node-gyp-build: 4.6.0
     optional: true
@@ -24745,13 +25042,13 @@ snapshots:
       unist-util-stringify-position: 4.0.0
       vfile-message: 4.0.2
 
-  vite-node@1.6.0(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1):
+  vite-node@1.6.0(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2):
     dependencies:
       cac: 6.7.14
       debug: 4.3.5(supports-color@8.1.1)
       pathe: 1.1.2
       picocolors: 1.0.0
-      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)
+      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -24764,7 +25061,7 @@ snapshots:
 
   vite-plugin-turbosnap@1.0.3: {}
 
-  vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1):
+  vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2):
     dependencies:
       esbuild: 0.21.5
       postcss: 8.4.38
@@ -24773,16 +25070,16 @@ snapshots:
       '@types/node': 20.14.9
       fsevents: 2.3.3
       sass: 1.77.6
-      terser: 5.31.1
+      terser: 5.31.2
 
-  vitest-fetch-mock@0.2.2(encoding@0.1.13)(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1)):
+  vitest-fetch-mock@0.2.2(encoding@0.1.13)(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2)):
     dependencies:
       cross-fetch: 3.1.6(encoding@0.1.13)
-      vitest: 1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1)
+      vitest: 1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2)
     transitivePeerDependencies:
       - encoding
 
-  vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.77.6)(terser@5.31.1):
+  vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2):
     dependencies:
       '@vitest/expect': 1.6.0
       '@vitest/runner': 1.6.0
@@ -24801,13 +25098,13 @@ snapshots:
       strip-literal: 2.1.0
       tinybench: 2.6.0
       tinypool: 0.8.4
-      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)
-      vite-node: 1.6.0(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.1)
+      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2)
+      vite-node: 1.6.0(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2)
       why-is-node-running: 2.2.2
     optionalDependencies:
       '@types/node': 20.14.9
       happy-dom: 10.0.3
-      jsdom: 24.1.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
+      jsdom: 24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4)
     transitivePeerDependencies:
       - less
       - lightningcss
@@ -24878,10 +25175,10 @@ snapshots:
       vue: 3.4.31(typescript@5.5.3)
       vue-inbrowser-compiler-independent-utils: 4.71.1(vue@3.4.31(typescript@5.5.3))
 
-  vue-eslint-parser@9.4.3(eslint@9.6.0):
+  vue-eslint-parser@9.4.3(eslint@9.7.0):
     dependencies:
       debug: 4.3.4(supports-color@5.5.0)
-      eslint: 9.6.0
+      eslint: 9.7.0
       eslint-scope: 7.2.2
       eslint-visitor-keys: 3.4.3
       espree: 9.6.1
@@ -24968,6 +25265,9 @@ snapshots:
 
   web-streams-polyfill@3.2.1: {}
 
+  web-streams-polyfill@4.0.0:
+    optional: true
+
   webidl-conversions@3.0.1: {}
 
   webidl-conversions@7.0.0: {}
@@ -25052,6 +25352,8 @@ snapshots:
       assert-never: 1.2.1
       babel-walk: 3.0.0-canary-5
 
+  word-wrap@1.2.5: {}
+
   wordwrap@1.0.0: {}
 
   wrap-ansi@6.2.0:
@@ -25085,10 +25387,10 @@ snapshots:
       imurmurhash: 0.1.4
       signal-exit: 3.0.7
 
-  ws@8.17.1(bufferutil@4.0.7)(utf-8-validate@6.0.3):
+  ws@8.17.1(bufferutil@4.0.8)(utf-8-validate@6.0.4):
     optionalDependencies:
-      bufferutil: 4.0.7
-      utf-8-validate: 6.0.3
+      bufferutil: 4.0.8
+      utf-8-validate: 6.0.4
 
   xev@3.0.2: {}
 

From f0d738d8bf96bee3cf87de377fd39839914ac7d7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Jul 2024 08:15:21 +0000
Subject: [PATCH 063/221] Bump version to 2024.7.0-beta.0

---
 CHANGELOG.md                     | 2 +-
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c634276d2..75f739f546 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Unreleased
+## 2024.7.0
 
 ### Note
 - デッキUIの新着ノートをサウンドで通知する機能の追加（v2024.5.0）に伴い、以前から動作しなくなっていたクライアント設定内の「アンテナ受信」「チャンネル通知」サウンドを削除しました。
diff --git a/package.json b/package.json
index bf8415d212..872a6b4b5e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.5.0",
+	"version": "2024.7.0-beta.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 00342d3dbc..1567ed7e61 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.5.0",
+	"version": "2024.7.0-beta.0",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From bda1de8a676c223cbde012aa041c0a1901af2a3d Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 17 Jul 2024 18:19:06 +0900
Subject: [PATCH 064/221] use pnpm@9.5.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 872a6b4b5e..0dd7afb9e9 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
 		"type": "git",
 		"url": "https://github.com/misskey-dev/misskey.git"
 	},
-	"packageManager": "pnpm@9.0.6",
+	"packageManager": "pnpm@9.5.0",
 	"workspaces": [
 		"packages/frontend",
 		"packages/backend",

From 8b4933cc48a8c296931fa795720297fffa7a9144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Wed, 17 Jul 2024 19:08:39 +0900
Subject: [PATCH 065/221] fix changelog (wrong category)

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75f739f546..02497883f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,6 @@
 - Fix: 配信停止したインスタンス一覧が見れなくなる問題を修正
 - Fix: Dockerコンテナの立ち上げ時に`pnpm`のインストールで固まることがある問題
 - Fix: デフォルトテーマに無効なテーマコードを入力するとUIが使用できなくなる問題を修正
-- Enhance: Allow negative delay for MFM animation elements (`tada`, `jelly`, `twitch`, `shake`, `spin`, `jump`, `bounce`, `rainbow`)
 
 ### Client
 - Enhance: 内蔵APIドキュメントのデザイン・パフォーマンスを改善
@@ -21,6 +20,7 @@
 - Enhance: サーバー情報ページ・お問い合わせページを改善  
   (Cherry-picked from https://github.com/taiyme/misskey/pull/238)
 - Enhance: AiScriptを0.19.0にアップデート
+- Enhance: Allow negative delay for MFM animation elements (`tada`, `jelly`, `twitch`, `shake`, `spin`, `jump`, `bounce`, `rainbow`)
 - Fix: `/about#federation` ページなどで各インスタンスのチャートが表示されなくなっていた問題を修正
 - Fix: ユーザーページの追加情報のラベルを投稿者のサーバーの絵文字で表示する (#13968)
 - Fix: リバーシの対局を正しく共有できないことがある問題を修正

From 68bcd91d57c9a11ae4191dfefa156c4454c8a073 Mon Sep 17 00:00:00 2001
From: Chocolate Pie <106949016+chocolate-pie@users.noreply.github.com>
Date: Wed, 17 Jul 2024 21:52:05 +0900
Subject: [PATCH 066/221] chore: Use clipboard API directly (#14227)

* chore: Use clipboard API directly

* fix: Fix lint
---
 packages/frontend/src/components/MkCode.vue   |  2 +-
 .../src/components/MkDrive.folder.vue         |  2 +-
 .../frontend/src/components/MkInviteCode.vue  |  2 +-
 .../frontend/src/components/MkKeyValue.vue    |  2 +-
 .../frontend/src/components/MkPageWindow.vue  |  2 +-
 .../frontend/src/components/global/MkA.vue    |  2 +-
 .../src/components/global/MkCustomEmoji.vue   |  2 +-
 .../src/components/global/MkEmoji.vue         |  2 +-
 packages/frontend/src/os.ts                   |  2 +-
 packages/frontend/src/pages/channel.vue       |  2 +-
 packages/frontend/src/pages/clip.vue          |  2 +-
 .../src/pages/drop-and-fusion.game.vue        |  2 +-
 packages/frontend/src/pages/emojis.emoji.vue  |  2 +-
 packages/frontend/src/pages/flash/flash.vue   |  2 +-
 packages/frontend/src/pages/gallery/post.vue  |  2 +-
 packages/frontend/src/pages/page.vue          |  2 +-
 .../frontend/src/pages/settings/plugin.vue    |  2 +-
 .../src/pages/settings/theme.manage.vue       |  2 +-
 .../frontend/src/scripts/copy-to-clipboard.ts | 31 ++-----------------
 .../src/scripts/get-drive-file-menu.ts        |  2 +-
 .../frontend/src/scripts/get-note-menu.ts     |  2 +-
 .../frontend/src/scripts/get-user-menu.ts     |  2 +-
 22 files changed, 23 insertions(+), 50 deletions(-)

diff --git a/packages/frontend/src/components/MkCode.vue b/packages/frontend/src/components/MkCode.vue
index a3c80e743b..1d4c0b6366 100644
--- a/packages/frontend/src/components/MkCode.vue
+++ b/packages/frontend/src/components/MkCode.vue
@@ -30,7 +30,7 @@ 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';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 
 const props = defineProps<{
 	code: string;
diff --git a/packages/frontend/src/components/MkDrive.folder.vue b/packages/frontend/src/components/MkDrive.folder.vue
index 1790e57c24..c940596cde 100644
--- a/packages/frontend/src/components/MkDrive.folder.vue
+++ b/packages/frontend/src/components/MkDrive.folder.vue
@@ -39,7 +39,7 @@ import { misskeyApi } from '@/scripts/misskey-api.js';
 import { i18n } from '@/i18n.js';
 import { defaultStore } from '@/store.js';
 import { claimAchievement } from '@/scripts/achievements.js';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import { MenuItem } from '@/types/menu.js';
 
 const props = withDefaults(defineProps<{
diff --git a/packages/frontend/src/components/MkInviteCode.vue b/packages/frontend/src/components/MkInviteCode.vue
index 1c6f412dc1..de51a98789 100644
--- a/packages/frontend/src/components/MkInviteCode.vue
+++ b/packages/frontend/src/components/MkInviteCode.vue
@@ -62,7 +62,7 @@ import { computed } from 'vue';
 import * as Misskey from 'misskey-js';
 import MkFolder from '@/components/MkFolder.vue';
 import MkButton from '@/components/MkButton.vue';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import { i18n } from '@/i18n.js';
 import * as os from '@/os.js';
 
diff --git a/packages/frontend/src/components/MkKeyValue.vue b/packages/frontend/src/components/MkKeyValue.vue
index 20b1ef2be2..50c9e16e5e 100644
--- a/packages/frontend/src/components/MkKeyValue.vue
+++ b/packages/frontend/src/components/MkKeyValue.vue
@@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { } from 'vue';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
 
diff --git a/packages/frontend/src/components/MkPageWindow.vue b/packages/frontend/src/components/MkPageWindow.vue
index aa4509b14b..bd86b01591 100644
--- a/packages/frontend/src/components/MkPageWindow.vue
+++ b/packages/frontend/src/components/MkPageWindow.vue
@@ -33,7 +33,7 @@ import { computed, onMounted, onUnmounted, provide, ref, shallowRef } from 'vue'
 import RouterView from '@/components/global/RouterView.vue';
 import MkWindow from '@/components/MkWindow.vue';
 import { popout as _popout } from '@/scripts/popout.js';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import { url } from '@/config.js';
 import { useScrollPositionManager } from '@/nirax.js';
 import { i18n } from '@/i18n.js';
diff --git a/packages/frontend/src/components/global/MkA.vue b/packages/frontend/src/components/global/MkA.vue
index d1e9113c48..3a45ca429f 100644
--- a/packages/frontend/src/components/global/MkA.vue
+++ b/packages/frontend/src/components/global/MkA.vue
@@ -16,7 +16,7 @@ export type MkABehavior = 'window' | 'browser' | null;
 <script lang="ts" setup>
 import { computed, inject, shallowRef } from 'vue';
 import * as os from '@/os.js';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import { url } from '@/config.js';
 import { i18n } from '@/i18n.js';
 import { useRouter } from '@/router/supplier.js';
diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue
index 4581908a8a..dff56cd7f0 100644
--- a/packages/frontend/src/components/global/MkCustomEmoji.vue
+++ b/packages/frontend/src/components/global/MkCustomEmoji.vue
@@ -31,7 +31,7 @@ import { defaultStore } from '@/store.js';
 import { customEmojisMap } from '@/custom-emojis.js';
 import * as os from '@/os.js';
 import { misskeyApiGet } from '@/scripts/misskey-api.js';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import * as sound from '@/scripts/sound.js';
 import { i18n } from '@/i18n.js';
 import MkCustomEmojiDetailedDialog from '@/components/MkCustomEmojiDetailedDialog.vue';
diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue
index 65f75642b2..fa780d4ad3 100644
--- a/packages/frontend/src/components/global/MkEmoji.vue
+++ b/packages/frontend/src/components/global/MkEmoji.vue
@@ -14,7 +14,7 @@ import { char2fluentEmojiFilePath, char2twemojiFilePath } from '@/scripts/emoji-
 import { defaultStore } from '@/store.js';
 import { colorizeEmoji, getEmojiName } from '@/scripts/emojilist.js';
 import * as os from '@/os.js';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import * as sound from '@/scripts/sound.js';
 import { i18n } from '@/i18n.js';
 
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index a0b0e6c833..3085f33e21 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -22,7 +22,7 @@ import MkEmojiPickerDialog from '@/components/MkEmojiPickerDialog.vue';
 import MkPopupMenu from '@/components/MkPopupMenu.vue';
 import MkContextMenu from '@/components/MkContextMenu.vue';
 import { MenuItem } from '@/types/menu.js';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import { pleaseLogin } from '@/scripts/please-login.js';
 import { showMovedDialog } from '@/scripts/show-moved-dialog.js';
 import { getHTMLElementOrNull } from '@/scripts/get-dom-node-or-null.js';
diff --git a/packages/frontend/src/pages/channel.vue b/packages/frontend/src/pages/channel.vue
index a895df76e8..3c3ff08aee 100644
--- a/packages/frontend/src/pages/channel.vue
+++ b/packages/frontend/src/pages/channel.vue
@@ -93,7 +93,7 @@ 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';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import { miLocalStorage } from '@/local-storage.js';
 import { useRouter } from '@/router/supplier.js';
 
diff --git a/packages/frontend/src/pages/clip.vue b/packages/frontend/src/pages/clip.vue
index fd64a55c65..fb984de368 100644
--- a/packages/frontend/src/pages/clip.vue
+++ b/packages/frontend/src/pages/clip.vue
@@ -43,7 +43,7 @@ import { url } from '@/config.js';
 import MkButton from '@/components/MkButton.vue';
 import { clipsCache } from '@/cache.js';
 import { isSupportShare } from '@/scripts/navigator.js';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 
 const props = defineProps<{
 	clipId: string,
diff --git a/packages/frontend/src/pages/drop-and-fusion.game.vue b/packages/frontend/src/pages/drop-and-fusion.game.vue
index 10bcfa6d4e..0f0b7e1ea8 100644
--- a/packages/frontend/src/pages/drop-and-fusion.game.vue
+++ b/packages/frontend/src/pages/drop-and-fusion.game.vue
@@ -210,7 +210,7 @@ import { apiUrl } from '@/config.js';
 import { $i } from '@/account.js';
 import * as sound from '@/scripts/sound.js';
 import MkRange from '@/components/MkRange.vue';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 
 type FrontendMonoDefinition = {
 	id: string;
diff --git a/packages/frontend/src/pages/emojis.emoji.vue b/packages/frontend/src/pages/emojis.emoji.vue
index ae3a2c31e3..97429c29a4 100644
--- a/packages/frontend/src/pages/emojis.emoji.vue
+++ b/packages/frontend/src/pages/emojis.emoji.vue
@@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 import * as Misskey from 'misskey-js';
 import * as os from '@/os.js';
 import { misskeyApiGet } from '@/scripts/misskey-api.js';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import { i18n } from '@/i18n.js';
 import MkCustomEmojiDetailedDialog from '@/components/MkCustomEmojiDetailedDialog.vue';
 
diff --git a/packages/frontend/src/pages/flash/flash.vue b/packages/frontend/src/pages/flash/flash.vue
index 8a63176d00..020463a133 100644
--- a/packages/frontend/src/pages/flash/flash.vue
+++ b/packages/frontend/src/pages/flash/flash.vue
@@ -78,7 +78,7 @@ import MkCode from '@/components/MkCode.vue';
 import { defaultStore } from '@/store.js';
 import { $i } from '@/account.js';
 import { isSupportShare } from '@/scripts/navigator.js';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import { pleaseLogin } from '@/scripts/please-login.js';
 
 const props = defineProps<{
diff --git a/packages/frontend/src/pages/gallery/post.vue b/packages/frontend/src/pages/gallery/post.vue
index 615675225d..fc2b5f810c 100644
--- a/packages/frontend/src/pages/gallery/post.vue
+++ b/packages/frontend/src/pages/gallery/post.vue
@@ -77,7 +77,7 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { defaultStore } from '@/store.js';
 import { $i } from '@/account.js';
 import { isSupportShare } from '@/scripts/navigator.js';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import { useRouter } from '@/router/supplier.js';
 
 const router = useRouter();
diff --git a/packages/frontend/src/pages/page.vue b/packages/frontend/src/pages/page.vue
index e2f04eb764..20b776aaa2 100644
--- a/packages/frontend/src/pages/page.vue
+++ b/packages/frontend/src/pages/page.vue
@@ -125,7 +125,7 @@ import { $i } from '@/account.js';
 import { isSupportShare } from '@/scripts/navigator.js';
 import { instance } from '@/instance.js';
 import { getStaticImageUrl } from '@/scripts/media-proxy.js';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 
 const props = defineProps<{
 	pageName: string;
diff --git a/packages/frontend/src/pages/settings/plugin.vue b/packages/frontend/src/pages/settings/plugin.vue
index 9804454e66..3c3dcfe41e 100644
--- a/packages/frontend/src/pages/settings/plugin.vue
+++ b/packages/frontend/src/pages/settings/plugin.vue
@@ -82,7 +82,7 @@ import MkCode from '@/components/MkCode.vue';
 import MkFolder from '@/components/MkFolder.vue';
 import MkKeyValue from '@/components/MkKeyValue.vue';
 import * as os from '@/os.js';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import { ColdDeviceStorage } from '@/store.js';
 import { unisonReload } from '@/scripts/unison-reload.js';
 import { i18n } from '@/i18n.js';
diff --git a/packages/frontend/src/pages/settings/theme.manage.vue b/packages/frontend/src/pages/settings/theme.manage.vue
index 8a94d7388b..579ca6b20b 100644
--- a/packages/frontend/src/pages/settings/theme.manage.vue
+++ b/packages/frontend/src/pages/settings/theme.manage.vue
@@ -38,7 +38,7 @@ import MkSelect from '@/components/MkSelect.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkButton from '@/components/MkButton.vue';
 import { Theme, getBuiltinThemesRef } from '@/scripts/theme.js';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import * as os from '@/os.js';
 import { getThemes, removeTheme } from '@/theme-store.js';
 import { i18n } from '@/i18n.js';
diff --git a/packages/frontend/src/scripts/copy-to-clipboard.ts b/packages/frontend/src/scripts/copy-to-clipboard.ts
index 216c0464b3..7e0bb25606 100644
--- a/packages/frontend/src/scripts/copy-to-clipboard.ts
+++ b/packages/frontend/src/scripts/copy-to-clipboard.ts
@@ -6,33 +6,6 @@
 /**
  * Clipboardに値をコピー(TODO: 文字列以外も対応)
  */
-export default val => {
-	// 空div 生成
-	const tmp = document.createElement('div');
-	// 選択用のタグ生成
-	const pre = document.createElement('pre');
-
-	// 親要素のCSSで user-select: none だとコピーできないので書き換える
-	pre.style.webkitUserSelect = 'auto';
-	pre.style.userSelect = 'auto';
-
-	tmp.appendChild(pre).textContent = val;
-
-	// 要素を画面外へ
-	const s = tmp.style;
-	s.position = 'fixed';
-	s.right = '200%';
-
-	// body に追加
-	document.body.appendChild(tmp);
-	// 要素を選択
-	document.getSelection().selectAllChildren(tmp);
-
-	// クリップボードにコピー
-	const result = document.execCommand('copy');
-
-	// 要素削除
-	document.body.removeChild(tmp);
-
-	return result;
+export function copyToClipboard(input: string | null) {
+	if (input) navigator.clipboard.writeText(input);
 };
diff --git a/packages/frontend/src/scripts/get-drive-file-menu.ts b/packages/frontend/src/scripts/get-drive-file-menu.ts
index 14c83ed637..7c6c4b4db4 100644
--- a/packages/frontend/src/scripts/get-drive-file-menu.ts
+++ b/packages/frontend/src/scripts/get-drive-file-menu.ts
@@ -6,7 +6,7 @@
 import * as Misskey from 'misskey-js';
 import { defineAsyncComponent } from 'vue';
 import { i18n } from '@/i18n.js';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { MenuItem } from '@/types/menu.js';
diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
index 418b6abc88..ebb96d1746 100644
--- a/packages/frontend/src/scripts/get-note-menu.ts
+++ b/packages/frontend/src/scripts/get-note-menu.ts
@@ -11,7 +11,7 @@ import { i18n } from '@/i18n.js';
 import { instance } from '@/instance.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import { url } from '@/config.js';
 import { defaultStore, noteActions } from '@/store.js';
 import { miLocalStorage } from '@/local-storage.js';
diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts
index 2d1fea8ea4..dacafb859f 100644
--- a/packages/frontend/src/scripts/get-user-menu.ts
+++ b/packages/frontend/src/scripts/get-user-menu.ts
@@ -7,7 +7,7 @@ import { toUnicode } from 'punycode';
 import { defineAsyncComponent, ref, watch } from 'vue';
 import * as Misskey from 'misskey-js';
 import { i18n } from '@/i18n.js';
-import copyToClipboard from '@/scripts/copy-to-clipboard.js';
+import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import { host, url } from '@/config.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';

From 6942a920c8c5bc51b358341bb9b451addcc4ec2b Mon Sep 17 00:00:00 2001
From: woxtu <woxtup@gmail.com>
Date: Thu, 18 Jul 2024 00:31:52 +0900
Subject: [PATCH 067/221] refactor(frontend): Improve typing (#14240)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Improve typing

* Remove redundant promise

* Refactor

* Update packages/frontend/src/scripts/mfm-function-picker.ts

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>

* Update packages/frontend/src/scripts/mfm-function-picker.ts

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
---
 .../src/scripts/mfm-function-picker.ts        | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/packages/frontend/src/scripts/mfm-function-picker.ts b/packages/frontend/src/scripts/mfm-function-picker.ts
index 8867a8c50f..9938e534c1 100644
--- a/packages/frontend/src/scripts/mfm-function-picker.ts
+++ b/packages/frontend/src/scripts/mfm-function-picker.ts
@@ -7,29 +7,24 @@ import { Ref, nextTick } from 'vue';
 import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
 import { MFM_TAGS } from '@/const.js';
+import type { MenuItem } from '@/types/menu.js';
 
 /**
  * MFMの装飾のリストを表示する
  */
-export function mfmFunctionPicker(src: any, textArea: HTMLInputElement | HTMLTextAreaElement, textRef: Ref<string>) {
-	return new Promise((res, rej) => {
-		os.popupMenu([{
-			text: i18n.ts.addMfmFunction,
-			type: 'label',
-		}, ...getFunctionList(textArea, textRef)], src);
-	});
+export function mfmFunctionPicker(src: HTMLElement | EventTarget | null, textArea: HTMLInputElement | HTMLTextAreaElement, textRef: Ref<string>) {
+	os.popupMenu([{
+		text: i18n.ts.addMfmFunction,
+		type: 'label',
+	}, ...getFunctionList(textArea, textRef)], src);
 }
 
-function getFunctionList(textArea: HTMLInputElement | HTMLTextAreaElement, textRef: Ref<string>) : object[] {
-	const ret: object[] = [];
-	MFM_TAGS.forEach(tag => {
-		ret.push({
-			text: tag,
-			icon: 'ti ti-icons',
-			action: () => add(textArea, textRef, tag),
-		});
-	});
-	return ret;
+function getFunctionList(textArea: HTMLInputElement | HTMLTextAreaElement, textRef: Ref<string>): MenuItem[] {
+	return MFM_TAGS.map(tag => ({
+		text: tag,
+		icon: 'ti ti-icons',
+		action: () => add(textArea, textRef, tag),
+	}));
 }
 
 function add(textArea: HTMLInputElement | HTMLTextAreaElement, textRef: Ref<string>, type: string) {

From 3331f3972a02f8b662a3bf3e5a94f7b0a45ebbb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Thu, 18 Jul 2024 01:22:24 +0900
Subject: [PATCH 068/221] =?UTF-8?q?fix(frontend):=20=E3=80=8C=E3=82=A2?=
 =?UTF-8?q?=E3=83=8B=E3=83=A1=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E7=94=BB?=
 =?UTF-8?q?=E5=83=8F=E3=82=92=E5=86=8D=E7=94=9F=E3=81=97=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E3=80=8D=E3=81=8C=E3=82=AA=E3=83=B3=E3=81=AE=E3=81=A8=E3=81=8D?=
 =?UTF-8?q?=E3=81=AB=E3=83=90=E3=83=8A=E3=83=BC=E7=94=BB=E5=83=8F=E3=83=BB?=
 =?UTF-8?q?=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC=E8=83=8C=E6=99=AF=E7=94=BB?=
 =?UTF-8?q?=E5=83=8F=E3=81=8C=E3=82=A2=E3=83=8B=E3=83=A1=E3=83=BC=E3=82=B7?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=20(#14243)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: stop animating banner and backgrounds when stop showing animated images is enabled

(cherry picked from commit 8fe2596316e9688509745706ea424f0b4bfd4136)

* chore: nest ternary

(cherry picked from commit 2783fe5f5bd7c0647db9f9b6fb5e000e4f411092)

* chore: flip ternary

(cherry picked from commit b9d66f824cff373cc53bfa846a56c16f456a6d5b)

* update changelog

---------

Co-authored-by: Marie <marie@kaifa.ch>
---
 CHANGELOG.md                                     |  2 ++
 packages/frontend/src/components/MkUserInfo.vue  |  4 +++-
 packages/frontend/src/components/MkUserPopup.vue |  3 ++-
 packages/frontend/src/pages/user/home.vue        | 11 +++++++++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02497883f0..9eea70d3b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,8 @@
 - Fix: ショートカットキーが連打できる問題を修正  
   (Cherry-picked from https://github.com/taiyme/misskey/pull/234)
 - Fix: MkSignin.vueのcredentialRequestからReactivityを削除（ProxyがPasskey認証処理に渡ることを避けるため）
+- Fix: 「アニメーション画像を再生しない」がオンのときでもサーバーのバナー画像・背景画像がアニメーションしてしまう問題を修正  
+  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/574)
 
 ### Server
 - Feat: レートリミット制限に引っかかったときに`Retry-After`ヘッダーを返すように (#13949)
diff --git a/packages/frontend/src/components/MkUserInfo.vue b/packages/frontend/src/components/MkUserInfo.vue
index d6f1ae453c..f0b9606590 100644
--- a/packages/frontend/src/components/MkUserInfo.vue
+++ b/packages/frontend/src/components/MkUserInfo.vue
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div class="_panel" :class="$style.root">
-	<div :class="$style.banner" :style="user.bannerUrl ? `background-image: url(${user.bannerUrl})` : ''"></div>
+	<div :class="$style.banner" :style="user.bannerUrl ? `background-image: url(${defaultStore.state.disableShowingAnimatedImages ? getStaticImageUrl(user.bannerUrl) : user.bannerUrl})` : ''"></div>
 	<MkAvatar :class="$style.avatar" :user="user" indicator/>
 	<div :class="$style.title">
 		<MkA :class="$style.name" :to="userPage(user)"><MkUserName :user="user" :nowrap="false"/></MkA>
@@ -41,6 +41,8 @@ import { userPage } from '@/filters/user.js';
 import { i18n } from '@/i18n.js';
 import { $i } from '@/account.js';
 import { isFollowingVisibleForMe, isFollowersVisibleForMe } from '@/scripts/isFfVisibleForMe.js';
+import { getStaticImageUrl } from '@/scripts/media-proxy.js';
+import { defaultStore } from '@/store.js';
 
 defineProps<{
 	user: Misskey.entities.UserDetailed;
diff --git a/packages/frontend/src/components/MkUserPopup.vue b/packages/frontend/src/components/MkUserPopup.vue
index 41b27a1afb..ea1241002e 100644
--- a/packages/frontend/src/components/MkUserPopup.vue
+++ b/packages/frontend/src/components/MkUserPopup.vue
@@ -13,7 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 >
 	<div v-if="showing" :class="$style.root" class="_popup _shadow" :style="{ zIndex, top: top + 'px', left: left + 'px' }" @mouseover="() => { emit('mouseover'); }" @mouseleave="() => { emit('mouseleave'); }">
 		<div v-if="user != null">
-			<div :class="$style.banner" :style="user.bannerUrl ? `background-image: url(${user.bannerUrl})` : ''">
+			<div :class="$style.banner" :style="user.bannerUrl ? `background-image: url(${defaultStore.state.disableShowingAnimatedImages ? getStaticImageUrl(user.bannerUrl) : user.bannerUrl})` : ''">
 				<span v-if="$i && $i.id != user.id && user.isFollowed" :class="$style.followed">{{ i18n.ts.followsYou }}</span>
 			</div>
 			<svg viewBox="0 0 128 128" :class="$style.avatarBack">
@@ -67,6 +67,7 @@ import { i18n } from '@/i18n.js';
 import { defaultStore } from '@/store.js';
 import { $i } from '@/account.js';
 import { isFollowingVisibleForMe, isFollowersVisibleForMe } from '@/scripts/isFfVisibleForMe.js';
+import { getStaticImageUrl } from '@/scripts/media-proxy.js';
 
 const props = defineProps<{
 	showing: boolean;
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index d67990e9a2..1b4ec47469 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -173,6 +173,7 @@ import { confetti } from '@/scripts/confetti.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { isFollowingVisibleForMe, isFollowersVisibleForMe } from '@/scripts/isFfVisibleForMe.js';
 import { useRouter } from '@/router/supplier.js';
+import { getStaticImageUrl } from '@/scripts/media-proxy.js';
 
 function calcAge(birthdate: string): number {
 	const date = new Date(birthdate);
@@ -220,8 +221,14 @@ watch(moderationNote, async () => {
 
 const style = computed(() => {
 	if (props.user.bannerUrl == null) return {};
-	return {
-		backgroundImage: `url(${ props.user.bannerUrl })`,
+	if (defaultStore.state.disableShowingAnimatedImages) {
+		return {
+			backgroundImage: `url(${ getStaticImageUrl(props.user.bannerUrl) })`,
+		};
+	} else {
+		return {
+			backgroundImage: `url(${ props.user.bannerUrl })`,
+		};
 	};
 });
 

From 5f88d56d9699863da58deb243db114da53f12f6b Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 18 Jul 2024 01:28:17 +0900
Subject: [PATCH 069/221] =?UTF-8?q?perf(federation):=20Ed25519=E7=BD=B2?=
 =?UTF-8?q?=E5=90=8D=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B=20(#1346?=
 =?UTF-8?q?4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 1. ed25519キーペアを発行・Personとして公開鍵を送受信

* validate additionalPublicKeys

* getAuthUserFromApIdはmainを選ぶ

* :v:

* fix

* signatureAlgorithm

* set publicKeyCache lifetime

* refresh

* httpMessageSignatureAcceptable

* ED25519_SIGNED_ALGORITHM

* ED25519_PUBLIC_KEY_SIGNATURE_ALGORITHM

* remove sign additionalPublicKeys signature requirements

* httpMessageSignaturesSupported

* httpMessageSignaturesImplementationLevel

* httpMessageSignaturesImplementationLevel: '01'

* perf(federation): Use hint for getAuthUserFromApId (#13470)

* Hint for getAuthUserFromApId

* とどのつまりこれでいいのか？

* use @misskey-dev/node-http-message-signatures

* fix

* signedPost, signedGet

* ap-request.tsを復活させる

* remove digest prerender

* fix test?

* fix test

* add httpMessageSignaturesImplementationLevel to FederationInstance

* ManyToOne

* fetchPersonWithRenewal

* exactKey

* :v:

* use const

* use gen-key-pair fn. from  '@misskey-dev/node-http-message-signatures'

* update node-http-message-signatures

* fix

* @misskey-dev/node-http-message-signatures@0.0.0-alpha.11

* getAuthUserFromApIdでupdatePersonの頻度を増やす

* cacheRaw.date

* use requiredInputs
https://github.com/misskey-dev/misskey/pull/13464#discussion_r1509964359

* update @misskey-dev/node-http-message-signatures

* clean up

* err msg

* fix(backend): fetchInstanceMetadataのLockが永遠に解除されない問題を修正

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>

* fix httpMessageSignaturesImplementationLevel validation

* fix test

* fix

* comment

* comment

* improve test

* fix

* use Promise.all in genRSAAndEd25519KeyPair

* refreshAndprepareEd25519KeyPair

* refreshAndfindKey

* commetn

* refactor public keys add

* digestプリレンダを復活させる

RFC実装時にどうするか考える

* fix, async

* fix

* !== true

* use save

* Deliver update person when new key generated (not tested)
https://github.com/misskey-dev/misskey/pull/13464#issuecomment-1977049061

* 循環参照で落ちるのを解消？

* fix?

* Revert "fix?"

This reverts commit 0082f6f8e8c5d5febd14933ba9a1ac643f70ca92.

* a

* logger

* log

* change logger

* 秘密鍵の変更は、フラグではなく鍵を引き回すようにする

* addAllKnowingSharedInboxRecipe

* nanka meccha kaeta

* delivre

* キャッシュ有効チェックはロック取得前に行う

* @misskey-dev/node-http-message-signatures@0.0.3

* PrivateKeyPem

* getLocalUserPrivateKey

* fix test

* if

* fix ap-request

* update node-http-message-signatures

* fix type error

* update package

* fix type

* update package

* retry no key

* @misskey-dev/node-http-message-signatures@0.0.8

* fix type error

* log keyid

* logger

* db-resolver

* JSON.stringify

* HTTP Signatureがなかったり使えなかったりしそうな場合にLD Signatureを活用するように

* inbox-delayed use actor if no signature

* ユーザーとキーの同一性チェックはhostの一致にする

* log signature parse err

* save array

* とりあえずtryで囲っておく

* fetchPersonWithRenewalでエラーが起きたら古いデータを返す

* use transactionalEntityManager

* fix spdx

* @misskey-dev/node-http-message-signatures@0.0.10

* add comment

* fix

* publicKeyに配列が入ってもいいようにする
https://github.com/misskey-dev/misskey/pull/13950

* define additionalPublicKeys

* fix

* merge fix

* refreshAndprepareEd25519KeyPair → refreshAndPrepareEd25519KeyPair

* remove gen-key-pair.ts

* defaultMaxListeners = 512

* Revert "defaultMaxListeners = 512"

This reverts commit f2c412c18057a9300540794ccbe4dfbf6d259ed6.

* genRSAAndEd25519KeyPairではキーを直列に生成する?

* maxConcurrency: 8

* maxConcurrency: 16

* maxConcurrency: 8

* Revert "genRSAAndEd25519KeyPairではキーを直列に生成する?"

This reverts commit d0aada55c1ed5aa98f18731ec82f3ac5eb5a6c16.

* maxWorkers: '90%'

* Revert "maxWorkers: '90%'"

This reverts commit 9e0a93f110456320d6485a871f014f7cdab29b33.

* e2e/timelines.tsで個々のテストに対するtimeoutを削除, maxConcurrency: 32

* better error handling of this.userPublickeysRepository.delete

* better comment

* set result to keypairEntityCache

* deliverJobConcurrency: 16, deliverJobPerSec: 1024, inboxJobConcurrency: 4

* inboxJobPerSec: 64

* delete request.headers['host'];

* fix

* // node-fetch will generate this for us. if we keep 'Host', it won't change with redirects!

* move delete host

* modify comment

* modify comment

* fix correct → collect

* refreshAndfindKey → refreshAndFindKey

* modify comment

* modify attachLdSignature

* getApId, InboxProcessorService

* TODO

* [skip ci] add CHANGELOG

---------

Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com>
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
---
 .config/docker_example.yml                    |   6 +-
 .config/example.yml                           |   8 +-
 .devcontainer/devcontainer.yml                |   8 +-
 CHANGELOG.md                                  |   2 +
 CONTRIBUTING.md                               |   2 +-
 chart/files/default.yml                       |   8 +-
 .../migration/1708980134301-APMultipleKeys.js |  39 ++++
 .../migration/1709242519122-HttpSignImplLv.js |  16 ++
 .../1709269211718-APMultipleKeysFix1.js       |  16 ++
 packages/backend/package.json                 |   2 +-
 .../backend/src/@types/http-signature.d.ts    |  82 -------
 packages/backend/src/const.ts                 |   5 +
 .../backend/src/core/AccountUpdateService.ts  |  27 ++-
 .../src/core/CreateSystemUserService.ts       |   7 +-
 .../src/core/FetchInstanceMetadataService.ts  |  61 +++--
 .../backend/src/core/GlobalEventService.ts    |   1 +
 .../backend/src/core/HttpRequestService.ts    |   2 +-
 packages/backend/src/core/QueueService.ts     |  17 +-
 packages/backend/src/core/RelayService.ts     |  13 +-
 packages/backend/src/core/SignupService.ts    |  22 +-
 .../backend/src/core/UserKeypairService.ts    | 155 ++++++++++++-
 .../backend/src/core/UserSuspendService.ts    |  66 ++----
 packages/backend/src/core/WebfingerService.ts |   2 +-
 .../core/activitypub/ApDbResolverService.ts   | 178 +++++++++++----
 .../activitypub/ApDeliverManagerService.ts    |  95 +++++++-
 .../src/core/activitypub/ApInboxService.ts    |  11 +-
 .../src/core/activitypub/ApRendererService.ts |  21 +-
 .../src/core/activitypub/ApRequestService.ts  | 210 +++++++-----------
 .../src/core/activitypub/ApResolverService.ts |   8 +-
 .../src/core/activitypub/misc/contexts.ts     |   1 +
 .../activitypub/models/ApPersonService.ts     | 114 ++++++++--
 packages/backend/src/core/activitypub/type.ts |  11 +-
 .../core/entities/InstanceEntityService.ts    |   1 +
 packages/backend/src/misc/cache.ts            |   3 +
 packages/backend/src/misc/gen-key-pair.ts     |  43 +---
 packages/backend/src/models/Instance.ts       |   5 +
 packages/backend/src/models/UserKeypair.ts    |  24 +-
 packages/backend/src/models/UserPublickey.ts  |  14 +-
 .../models/json-schema/federation-instance.ts |   4 +
 .../src/queue/QueueProcessorService.ts        |   8 +-
 .../processors/DeliverProcessorService.ts     |  38 ++--
 .../queue/processors/InboxProcessorService.ts | 130 ++++++-----
 packages/backend/src/queue/types.ts           |  23 +-
 .../src/server/ActivityPubServerService.ts    | 101 ++++-----
 .../src/server/NodeinfoServerService.ts       |   7 +
 .../endpoints/admin/queue/inbox-delayed.ts    |   3 +-
 packages/backend/test/e2e/timelines.ts        |  10 +-
 packages/backend/test/misc/mock-resolver.ts   |   2 +
 .../test/unit/FetchInstanceMetadataService.ts |  23 +-
 packages/backend/test/unit/ap-request.ts      |  90 +++++---
 packages/misskey-js/src/autogen/types.ts      |   1 +
 pnpm-lock.yaml                                |  44 ++--
 52 files changed, 1096 insertions(+), 694 deletions(-)
 create mode 100644 packages/backend/migration/1708980134301-APMultipleKeys.js
 create mode 100644 packages/backend/migration/1709242519122-HttpSignImplLv.js
 create mode 100644 packages/backend/migration/1709269211718-APMultipleKeysFix1.js
 delete mode 100644 packages/backend/src/@types/http-signature.d.ts

diff --git a/.config/docker_example.yml b/.config/docker_example.yml
index d347882d1a..bd0ad2872a 100644
--- a/.config/docker_example.yml
+++ b/.config/docker_example.yml
@@ -164,12 +164,12 @@ id: 'aidx'
 #clusterLimit: 1
 
 # Job concurrency per worker
-# deliverJobConcurrency: 128
-# inboxJobConcurrency: 16
+# deliverJobConcurrency: 16
+# inboxJobConcurrency: 4
 
 # Job rate limiter
 # deliverJobPerSec: 128
-# inboxJobPerSec: 32
+# inboxJobPerSec: 64
 
 # Job attempts
 # deliverJobMaxAttempts: 12
diff --git a/.config/example.yml b/.config/example.yml
index b11cbd1373..0d525f61c4 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -230,15 +230,15 @@ id: 'aidx'
 #clusterLimit: 1
 
 # Job concurrency per worker
-#deliverJobConcurrency: 128
-#inboxJobConcurrency: 16
+#deliverJobConcurrency: 16
+#inboxJobConcurrency: 4
 #relationshipJobConcurrency: 16
 # What's relationshipJob?:
 #  Follow, unfollow, block and unblock(ings) while following-imports, etc. or account migrations.
 
 # Job rate limiter
-#deliverJobPerSec: 128
-#inboxJobPerSec: 32
+#deliverJobPerSec: 1024
+#inboxJobPerSec: 64
 #relationshipJobPerSec: 64
 
 # Job attempts
diff --git a/.devcontainer/devcontainer.yml b/.devcontainer/devcontainer.yml
index beefcfd0a2..d74d741e02 100644
--- a/.devcontainer/devcontainer.yml
+++ b/.devcontainer/devcontainer.yml
@@ -157,12 +157,12 @@ id: 'aidx'
 #clusterLimit: 1
 
 # Job concurrency per worker
-# deliverJobConcurrency: 128
-# inboxJobConcurrency: 16
+# deliverJobConcurrency: 16
+# inboxJobConcurrency: 4
 
 # Job rate limiter
-# deliverJobPerSec: 128
-# inboxJobPerSec: 32
+# deliverJobPerSec: 1024
+# inboxJobPerSec: 64
 
 # Job attempts
 # deliverJobMaxAttempts: 12
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9eea70d3b0..395716bbe2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@
 - Feat: 通報を受けた際、または解決した際に、予め登録した宛先に通知を飛ばせるように(mail or webhook) #13705
 - Feat: ユーザーのアイコン/バナーの変更可否をロールで設定可能に
   - 変更不可となっていても、設定済みのものを解除してデフォルト画像に戻すことは出来ます
+- Feat: 連合に使うHTTP SignaturesがEd25519鍵に対応するように #13464
+  - Ed25519署名に対応するサーバーが増えると、deliverで要求されるサーバーリソースが削減されます
 - Fix: 配信停止したインスタンス一覧が見れなくなる問題を修正
 - Fix: Dockerコンテナの立ち上げ時に`pnpm`のインストールで固まることがある問題
 - Fix: デフォルトテーマに無効なテーマコードを入力するとUIが使用できなくなる問題を修正
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b718f3703f..532a2dc66f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -185,7 +185,7 @@ TODO
 ## Environment Variable
 
 - `MISSKEY_CONFIG_YML`: Specify the file path of config.yml instead of default.yml (e.g. `2nd.yml`).
-- `MISSKEY_WEBFINGER_USE_HTTP`: If it's set true, WebFinger requests will be http instead of https, useful for testing federation between servers in localhost. NEVER USE IN PRODUCTION.
+- `MISSKEY_USE_HTTP`: If it's set true, federation requests (like nodeinfo and webfinger) will be http instead of https, useful for testing federation between servers in localhost. NEVER USE IN PRODUCTION. (was `MISSKEY_WEBFINGER_USE_HTTP`)
 
 ## Continuous integration
 Misskey uses GitHub Actions for executing automated tests.
diff --git a/chart/files/default.yml b/chart/files/default.yml
index f98b8ebfee..4017588fa0 100644
--- a/chart/files/default.yml
+++ b/chart/files/default.yml
@@ -178,12 +178,12 @@ id: "aidx"
 #clusterLimit: 1
 
 # Job concurrency per worker
-# deliverJobConcurrency: 128
-# inboxJobConcurrency: 16
+# deliverJobConcurrency: 16
+# inboxJobConcurrency: 4
 
 # Job rate limiter
-# deliverJobPerSec: 128
-# inboxJobPerSec: 32
+# deliverJobPerSec: 1024
+# inboxJobPerSec: 64
 
 # Job attempts
 # deliverJobMaxAttempts: 12
diff --git a/packages/backend/migration/1708980134301-APMultipleKeys.js b/packages/backend/migration/1708980134301-APMultipleKeys.js
new file mode 100644
index 0000000000..ca55526c6e
--- /dev/null
+++ b/packages/backend/migration/1708980134301-APMultipleKeys.js
@@ -0,0 +1,39 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class APMultipleKeys1708980134301 {
+    name = 'APMultipleKeys1708980134301'
+
+    async up(queryRunner) {
+        await queryRunner.query(`DROP INDEX "public"."IDX_171e64971c780ebd23fae140bb"`);
+        await queryRunner.query(`ALTER TABLE "user_keypair" ADD "ed25519PublicKey" character varying(128)`);
+        await queryRunner.query(`ALTER TABLE "user_keypair" ADD "ed25519PrivateKey" character varying(128)`);
+        await queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "FK_10c146e4b39b443ede016f6736d"`);
+        await queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "PK_10c146e4b39b443ede016f6736d"`);
+        await queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "PK_0db6a5fdb992323449edc8ee421" PRIMARY KEY ("userId", "keyId")`);
+        await queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "PK_0db6a5fdb992323449edc8ee421"`);
+        await queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "PK_171e64971c780ebd23fae140bba" PRIMARY KEY ("keyId")`);
+        await queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "UQ_10c146e4b39b443ede016f6736d" UNIQUE ("userId")`);
+        await queryRunner.query(`CREATE INDEX "IDX_10c146e4b39b443ede016f6736" ON "user_publickey" ("userId") `);
+        await queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "FK_10c146e4b39b443ede016f6736d" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "FK_10c146e4b39b443ede016f6736d"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_10c146e4b39b443ede016f6736"`);
+        await queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "UQ_10c146e4b39b443ede016f6736d"`);
+        await queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "PK_171e64971c780ebd23fae140bba"`);
+        await queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "PK_0db6a5fdb992323449edc8ee421" PRIMARY KEY ("userId", "keyId")`);
+        await queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "PK_0db6a5fdb992323449edc8ee421"`);
+        await queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "PK_10c146e4b39b443ede016f6736d" PRIMARY KEY ("userId")`);
+        await queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "FK_10c146e4b39b443ede016f6736d" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "followersVisibility" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "followersVisibility" TYPE "public"."user_profile_followersVisibility_enum_old" USING "followersVisibility"::"text"::"public"."user_profile_followersVisibility_enum_old"`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "followersVisibility" SET DEFAULT 'public'`);
+        await queryRunner.query(`ALTER TABLE "user_keypair" DROP COLUMN "ed25519PrivateKey"`);
+        await queryRunner.query(`ALTER TABLE "user_keypair" DROP COLUMN "ed25519PublicKey"`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_171e64971c780ebd23fae140bb" ON "user_publickey" ("keyId") `);
+    }
+}
diff --git a/packages/backend/migration/1709242519122-HttpSignImplLv.js b/packages/backend/migration/1709242519122-HttpSignImplLv.js
new file mode 100644
index 0000000000..7748bae006
--- /dev/null
+++ b/packages/backend/migration/1709242519122-HttpSignImplLv.js
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class HttpSignImplLv1709242519122 {
+    name = 'HttpSignImplLv1709242519122'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "instance" ADD "httpMessageSignaturesImplementationLevel" character varying(16) NOT NULL DEFAULT '00'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "httpMessageSignaturesImplementationLevel"`);
+    }
+}
diff --git a/packages/backend/migration/1709269211718-APMultipleKeysFix1.js b/packages/backend/migration/1709269211718-APMultipleKeysFix1.js
new file mode 100644
index 0000000000..d2011802f2
--- /dev/null
+++ b/packages/backend/migration/1709269211718-APMultipleKeysFix1.js
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class APMultipleKeys1709269211718 {
+    name = 'APMultipleKeys1709269211718'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "UQ_10c146e4b39b443ede016f6736d"`);
+    }
+
+    async down(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "UQ_10c146e4b39b443ede016f6736d" UNIQUE ("userId")`);
+    }
+}
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 22fdc5cf16..893171ebd6 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -79,13 +79,13 @@
 		"@fastify/multipart": "8.3.0",
 		"@fastify/static": "7.0.4",
 		"@fastify/view": "9.1.0",
+		"@misskey-dev/node-http-message-signatures": "0.0.10",
 		"@misskey-dev/sharp-read-bmp": "1.2.0",
 		"@misskey-dev/summaly": "5.1.0",
 		"@napi-rs/canvas": "^0.1.53",
 		"@nestjs/common": "10.3.10",
 		"@nestjs/core": "10.3.10",
 		"@nestjs/testing": "10.3.10",
-		"@peertube/http-signature": "1.7.0",
 		"@sentry/node": "8.13.0",
 		"@sentry/profiling-node": "8.13.0",
 		"@simplewebauthn/server": "10.0.0",
diff --git a/packages/backend/src/@types/http-signature.d.ts b/packages/backend/src/@types/http-signature.d.ts
deleted file mode 100644
index 75b62e55f0..0000000000
--- a/packages/backend/src/@types/http-signature.d.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-declare module '@peertube/http-signature' {
-	import type { IncomingMessage, ClientRequest } from 'node:http';
-
-	interface ISignature {
-		keyId: string;
-		algorithm: string;
-		headers: string[];
-		signature: string;
-	}
-
-	interface IOptions {
-		headers?: string[];
-		algorithm?: string;
-		strict?: boolean;
-		authorizationHeaderName?: string;
-	}
-
-	interface IParseRequestOptions extends IOptions {
-		clockSkew?: number;
-	}
-
-	interface IParsedSignature {
-		scheme: string;
-		params: ISignature;
-		signingString: string;
-		algorithm: string;
-		keyId: string;
-	}
-
-	type RequestSignerConstructorOptions =
-		IRequestSignerConstructorOptionsFromProperties |
-		IRequestSignerConstructorOptionsFromFunction;
-
-	interface IRequestSignerConstructorOptionsFromProperties {
-		keyId: string;
-		key: string | Buffer;
-		algorithm?: string;
-	}
-
-	interface IRequestSignerConstructorOptionsFromFunction {
-		sign?: (data: string, cb: (err: any, sig: ISignature) => void) => void;
-	}
-
-	class RequestSigner {
-		constructor(options: RequestSignerConstructorOptions);
-
-		public writeHeader(header: string, value: string): string;
-
-		public writeDateHeader(): string;
-
-		public writeTarget(method: string, path: string): void;
-
-		public sign(cb: (err: any, authz: string) => void): void;
-	}
-
-	interface ISignRequestOptions extends IOptions {
-		keyId: string;
-		key: string;
-		httpVersion?: string;
-	}
-
-	export function parse(request: IncomingMessage, options?: IParseRequestOptions): IParsedSignature;
-	export function parseRequest(request: IncomingMessage, options?: IParseRequestOptions): IParsedSignature;
-
-	export function sign(request: ClientRequest, options: ISignRequestOptions): boolean;
-	export function signRequest(request: ClientRequest, options: ISignRequestOptions): boolean;
-	export function createSigner(): RequestSigner;
-	export function isSigner(obj: any): obj is RequestSigner;
-
-	export function sshKeyToPEM(key: string): string;
-	export function sshKeyFingerprint(key: string): string;
-	export function pemToRsaSSHKey(pem: string, comment: string): string;
-
-	export function verify(parsedSignature: IParsedSignature, pubkey: string | Buffer): boolean;
-	export function verifySignature(parsedSignature: IParsedSignature, pubkey: string | Buffer): boolean;
-	export function verifyHMAC(parsedSignature: IParsedSignature, secret: string): boolean;
-}
diff --git a/packages/backend/src/const.ts b/packages/backend/src/const.ts
index 4dc689238b..c132cc7e7b 100644
--- a/packages/backend/src/const.ts
+++ b/packages/backend/src/const.ts
@@ -9,6 +9,11 @@ export const MAX_NOTE_TEXT_LENGTH = 3000;
 export const USER_ONLINE_THRESHOLD = 1000 * 60 * 10; // 10min
 export const USER_ACTIVE_THRESHOLD = 1000 * 60 * 60 * 24 * 3; // 3days
 
+export const REMOTE_USER_CACHE_TTL = 1000 * 60 * 60 * 3; // 3hours
+export const REMOTE_USER_MOVE_COOLDOWN = 1000 * 60 * 60 * 24 * 14; // 14days
+
+export const REMOTE_SERVER_CACHE_TTL = 1000 * 60 * 60 * 3; // 3hours
+
 //#region hard limits
 // If you change DB_* values, you must also change the DB schema.
 
diff --git a/packages/backend/src/core/AccountUpdateService.ts b/packages/backend/src/core/AccountUpdateService.ts
index 69a57b4854..ca0864f679 100644
--- a/packages/backend/src/core/AccountUpdateService.ts
+++ b/packages/backend/src/core/AccountUpdateService.ts
@@ -3,7 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { Inject, Injectable } from '@nestjs/common';
+import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
+import { ModuleRef } from '@nestjs/core';
 import { DI } from '@/di-symbols.js';
 import type { UsersRepository } from '@/models/_.js';
 import type { MiUser } from '@/models/User.js';
@@ -12,30 +13,44 @@ import { RelayService } from '@/core/RelayService.js';
 import { ApDeliverManagerService } from '@/core/activitypub/ApDeliverManagerService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
+import type { PrivateKeyWithPem } from '@misskey-dev/node-http-message-signatures';
 
 @Injectable()
-export class AccountUpdateService {
+export class AccountUpdateService implements OnModuleInit {
+	private apDeliverManagerService: ApDeliverManagerService;
 	constructor(
+		private moduleRef: ModuleRef,
+
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
 		private userEntityService: UserEntityService,
 		private apRendererService: ApRendererService,
-		private apDeliverManagerService: ApDeliverManagerService,
 		private relayService: RelayService,
 	) {
 	}
 
+	async onModuleInit() {
+		this.apDeliverManagerService = this.moduleRef.get(ApDeliverManagerService.name);
+	}
+
 	@bindThis
-	public async publishToFollowers(userId: MiUser['id']) {
+	/**
+	 * Deliver account update to followers
+	 * @param userId user id
+	 * @param deliverKey optional. Private key to sign the deliver.
+	 */
+	public async publishToFollowers(userId: MiUser['id'], deliverKey?: PrivateKeyWithPem) {
 		const user = await this.usersRepository.findOneBy({ id: userId });
 		if (user == null) throw new Error('user not found');
 
 		// フォロワーがリモートユーザーかつ投稿者がローカルユーザーならUpdateを配信
 		if (this.userEntityService.isLocalUser(user)) {
 			const content = this.apRendererService.addContext(this.apRendererService.renderUpdate(await this.apRendererService.renderPerson(user), user));
-			this.apDeliverManagerService.deliverToFollowers(user, content);
-			this.relayService.deliverToRelays(user, content);
+			await Promise.allSettled([
+				this.apDeliverManagerService.deliverToFollowers(user, content, deliverKey),
+				this.relayService.deliverToRelays(user, content, deliverKey),
+			]);
 		}
 	}
 }
diff --git a/packages/backend/src/core/CreateSystemUserService.ts b/packages/backend/src/core/CreateSystemUserService.ts
index 6c5b0f6a36..60ddc9cde2 100644
--- a/packages/backend/src/core/CreateSystemUserService.ts
+++ b/packages/backend/src/core/CreateSystemUserService.ts
@@ -7,7 +7,7 @@ import { randomUUID } from 'node:crypto';
 import { Inject, Injectable } from '@nestjs/common';
 import bcrypt from 'bcryptjs';
 import { IsNull, DataSource } from 'typeorm';
-import { genRsaKeyPair } from '@/misc/gen-key-pair.js';
+import { genRSAAndEd25519KeyPair } from '@/misc/gen-key-pair.js';
 import { MiUser } from '@/models/User.js';
 import { MiUserProfile } from '@/models/UserProfile.js';
 import { IdService } from '@/core/IdService.js';
@@ -38,7 +38,7 @@ export class CreateSystemUserService {
 		// Generate secret
 		const secret = generateNativeUserToken();
 
-		const keyPair = await genRsaKeyPair();
+		const keyPair = await genRSAAndEd25519KeyPair();
 
 		let account!: MiUser;
 
@@ -64,9 +64,8 @@ export class CreateSystemUserService {
 			}).then(x => transactionalEntityManager.findOneByOrFail(MiUser, x.identifiers[0]));
 
 			await transactionalEntityManager.insert(MiUserKeypair, {
-				publicKey: keyPair.publicKey,
-				privateKey: keyPair.privateKey,
 				userId: account.id,
+				...keyPair,
 			});
 
 			await transactionalEntityManager.insert(MiUserProfile, {
diff --git a/packages/backend/src/core/FetchInstanceMetadataService.ts b/packages/backend/src/core/FetchInstanceMetadataService.ts
index aa16468ecb..dc53c8711d 100644
--- a/packages/backend/src/core/FetchInstanceMetadataService.ts
+++ b/packages/backend/src/core/FetchInstanceMetadataService.ts
@@ -15,6 +15,7 @@ import { LoggerService } from '@/core/LoggerService.js';
 import { HttpRequestService } from '@/core/HttpRequestService.js';
 import { bindThis } from '@/decorators.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
+import { REMOTE_SERVER_CACHE_TTL } from '@/const.js';
 import type { DOMWindow } from 'jsdom';
 
 type NodeInfo = {
@@ -24,6 +25,7 @@ type NodeInfo = {
 		version?: unknown;
 	};
 	metadata?: {
+		httpMessageSignaturesImplementationLevel?: unknown,
 		name?: unknown;
 		nodeName?: unknown;
 		nodeDescription?: unknown;
@@ -39,6 +41,7 @@ type NodeInfo = {
 @Injectable()
 export class FetchInstanceMetadataService {
 	private logger: Logger;
+	private httpColon = 'https://';
 
 	constructor(
 		private httpRequestService: HttpRequestService,
@@ -48,6 +51,7 @@ export class FetchInstanceMetadataService {
 		private redisClient: Redis.Redis,
 	) {
 		this.logger = this.loggerService.getLogger('metadata', 'cyan');
+		this.httpColon = process.env.MISSKEY_USE_HTTP?.toLowerCase() === 'true' ? 'http://' : 'https://';
 	}
 
 	@bindThis
@@ -59,7 +63,7 @@ export class FetchInstanceMetadataService {
 		return await this.redisClient.set(
 			`fetchInstanceMetadata:mutex:v2:${host}`, '1',
 			'EX', 30, // 30秒したら自動でロック解除 https://github.com/misskey-dev/misskey/issues/13506#issuecomment-1975375395
-			'GET' // 古い値を返す（なかったらnull）
+			'GET', // 古い値を返す（なかったらnull）
 		);
 	}
 
@@ -73,23 +77,24 @@ export class FetchInstanceMetadataService {
 	public async fetchInstanceMetadata(instance: MiInstance, force = false): Promise<void> {
 		const host = instance.host;
 
-		// finallyでunlockされてしまうのでtry内でロックチェックをしない
-		// （returnであってもfinallyは実行される）
-		if (!force && await this.tryLock(host) === '1') {
-			// 1が返ってきていたらロックされているという意味なので、何もしない
-			return;
+		if (!force) {
+			// キャッシュ有効チェックはロック取得前に行う
+			const _instance = await this.federatedInstanceService.fetch(host);
+			const now = Date.now();
+			if (_instance && _instance.infoUpdatedAt != null && (now - _instance.infoUpdatedAt.getTime() < REMOTE_SERVER_CACHE_TTL)) {
+				this.logger.debug(`Skip because updated recently ${_instance.infoUpdatedAt.toJSON()}`);
+				return;
+			}
+
+			// finallyでunlockされてしまうのでtry内でロックチェックをしない
+			// （returnであってもfinallyは実行される）
+			if (await this.tryLock(host) === '1') {
+				// 1が返ってきていたら他にロックされているという意味なので、何もしない
+				return;
+			}
 		}
 
 		try {
-			if (!force) {
-				const _instance = await this.federatedInstanceService.fetch(host);
-				const now = Date.now();
-				if (_instance && _instance.infoUpdatedAt && (now - _instance.infoUpdatedAt.getTime() < 1000 * 60 * 60 * 24)) {
-					// unlock at the finally caluse
-					return;
-				}
-			}
-
 			this.logger.info(`Fetching metadata of ${instance.host} ...`);
 
 			const [info, dom, manifest] = await Promise.all([
@@ -118,6 +123,14 @@ export class FetchInstanceMetadataService {
 				updates.openRegistrations = info.openRegistrations;
 				updates.maintainerName = info.metadata ? info.metadata.maintainer ? (info.metadata.maintainer.name ?? null) : null : null;
 				updates.maintainerEmail = info.metadata ? info.metadata.maintainer ? (info.metadata.maintainer.email ?? null) : null : null;
+				if (info.metadata && info.metadata.httpMessageSignaturesImplementationLevel && (
+					info.metadata.httpMessageSignaturesImplementationLevel === '01' ||
+					info.metadata.httpMessageSignaturesImplementationLevel === '11'
+				)) {
+					updates.httpMessageSignaturesImplementationLevel = info.metadata.httpMessageSignaturesImplementationLevel;
+				} else {
+					updates.httpMessageSignaturesImplementationLevel = '00';
+				}
 			}
 
 			if (name) updates.name = name;
@@ -129,6 +142,12 @@ export class FetchInstanceMetadataService {
 			await this.federatedInstanceService.update(instance.id, updates);
 
 			this.logger.succ(`Successfuly updated metadata of ${instance.host}`);
+			this.logger.debug('Updated metadata:', {
+				info: !!info,
+				dom: !!dom,
+				manifest: !!manifest,
+				updates,
+			});
 		} catch (e) {
 			this.logger.error(`Failed to update metadata of ${instance.host}: ${e}`);
 		} finally {
@@ -141,7 +160,7 @@ export class FetchInstanceMetadataService {
 		this.logger.info(`Fetching nodeinfo of ${instance.host} ...`);
 
 		try {
-			const wellknown = await this.httpRequestService.getJson('https://' + instance.host + '/.well-known/nodeinfo')
+			const wellknown = await this.httpRequestService.getJson(this.httpColon + instance.host + '/.well-known/nodeinfo')
 				.catch(err => {
 					if (err.statusCode === 404) {
 						throw new Error('No nodeinfo provided');
@@ -184,7 +203,7 @@ export class FetchInstanceMetadataService {
 	private async fetchDom(instance: MiInstance): Promise<DOMWindow['document']> {
 		this.logger.info(`Fetching HTML of ${instance.host} ...`);
 
-		const url = 'https://' + instance.host;
+		const url = this.httpColon + instance.host;
 
 		const html = await this.httpRequestService.getHtml(url);
 
@@ -196,7 +215,7 @@ export class FetchInstanceMetadataService {
 
 	@bindThis
 	private async fetchManifest(instance: MiInstance): Promise<Record<string, unknown> | null> {
-		const url = 'https://' + instance.host;
+		const url = this.httpColon + instance.host;
 
 		const manifestUrl = url + '/manifest.json';
 
@@ -207,7 +226,7 @@ export class FetchInstanceMetadataService {
 
 	@bindThis
 	private async fetchFaviconUrl(instance: MiInstance, doc: DOMWindow['document'] | null): Promise<string | null> {
-		const url = 'https://' + instance.host;
+		const url = this.httpColon + instance.host;
 
 		if (doc) {
 			// https://github.com/misskey-dev/misskey/pull/8220#issuecomment-1025104043
@@ -234,12 +253,12 @@ export class FetchInstanceMetadataService {
 	@bindThis
 	private async fetchIconUrl(instance: MiInstance, doc: DOMWindow['document'] | null, manifest: Record<string, any> | null): Promise<string | null> {
 		if (manifest && manifest.icons && manifest.icons.length > 0 && manifest.icons[0].src) {
-			const url = 'https://' + instance.host;
+			const url = this.httpColon + instance.host;
 			return (new URL(manifest.icons[0].src, url)).href;
 		}
 
 		if (doc) {
-			const url = 'https://' + instance.host;
+			const url = this.httpColon + instance.host;
 
 			// https://github.com/misskey-dev/misskey/pull/8220#issuecomment-1025104043
 			const links = Array.from(doc.getElementsByTagName('link')).reverse();
diff --git a/packages/backend/src/core/GlobalEventService.ts b/packages/backend/src/core/GlobalEventService.ts
index a70743bed2..2a7d8d4bbe 100644
--- a/packages/backend/src/core/GlobalEventService.ts
+++ b/packages/backend/src/core/GlobalEventService.ts
@@ -245,6 +245,7 @@ export interface InternalEventTypes {
 	unmute: { muterId: MiUser['id']; muteeId: MiUser['id']; };
 	userListMemberAdded: { userListId: MiUserList['id']; memberId: MiUser['id']; };
 	userListMemberRemoved: { userListId: MiUserList['id']; memberId: MiUser['id']; };
+	userKeypairUpdated: { userId: MiUser['id']; };
 }
 
 // name/messages(spec) pairs dictionary
diff --git a/packages/backend/src/core/HttpRequestService.ts b/packages/backend/src/core/HttpRequestService.ts
index 7f3cac7c58..4249c158d7 100644
--- a/packages/backend/src/core/HttpRequestService.ts
+++ b/packages/backend/src/core/HttpRequestService.ts
@@ -70,7 +70,7 @@ export class HttpRequestService {
 			localAddress: config.outgoingAddress,
 		});
 
-		const maxSockets = Math.max(256, config.deliverJobConcurrency ?? 128);
+		const maxSockets = Math.max(256, config.deliverJobConcurrency ?? 16);
 
 		this.httpAgent = config.proxy
 			? new HttpProxyAgent({
diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
index 80827a500b..dd3f2182b4 100644
--- a/packages/backend/src/core/QueueService.ts
+++ b/packages/backend/src/core/QueueService.ts
@@ -13,7 +13,6 @@ import type { Config } from '@/config.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import type { Antenna } from '@/server/api/endpoints/i/import-antennas.js';
-import { ApRequestCreator } from '@/core/activitypub/ApRequestService.js';
 import type {
 	DbJobData,
 	DeliverJobData,
@@ -33,7 +32,7 @@ import type {
 	UserWebhookDeliverQueue,
 	SystemWebhookDeliverQueue,
 } from './QueueModule.js';
-import type httpSignature from '@peertube/http-signature';
+import { genRFC3230DigestHeader, type PrivateKeyWithPem, type ParsedSignature } from '@misskey-dev/node-http-message-signatures';
 import type * as Bull from 'bullmq';
 
 @Injectable()
@@ -90,21 +89,21 @@ export class QueueService {
 	}
 
 	@bindThis
-	public deliver(user: ThinUser, content: IActivity | null, to: string | null, isSharedInbox: boolean) {
+	public async deliver(user: ThinUser, content: IActivity | null, to: string | null, isSharedInbox: boolean, privateKey?: PrivateKeyWithPem) {
 		if (content == null) return null;
 		if (to == null) return null;
 
 		const contentBody = JSON.stringify(content);
-		const digest = ApRequestCreator.createDigest(contentBody);
 
 		const data: DeliverJobData = {
 			user: {
 				id: user.id,
 			},
 			content: contentBody,
-			digest,
+			digest: await genRFC3230DigestHeader(contentBody, 'SHA-256'),
 			to,
 			isSharedInbox,
+			privateKey: privateKey && { keyId: privateKey.keyId, privateKeyPem: privateKey.privateKeyPem },
 		};
 
 		return this.deliverQueue.add(to, data, {
@@ -122,13 +121,13 @@ export class QueueService {
 	 * @param user `{ id: string; }` この関数ではThinUserに変換しないので前もって変換してください
 	 * @param content IActivity | null
 	 * @param inboxes `Map<string, boolean>` / key: to (inbox url), value: isSharedInbox (whether it is sharedInbox)
+	 * @param forceMainKey boolean | undefined, force to use main (rsa) key
 	 * @returns void
 	 */
 	@bindThis
-	public async deliverMany(user: ThinUser, content: IActivity | null, inboxes: Map<string, boolean>) {
+	public async deliverMany(user: ThinUser, content: IActivity | null, inboxes: Map<string, boolean>, privateKey?: PrivateKeyWithPem) {
 		if (content == null) return null;
 		const contentBody = JSON.stringify(content);
-		const digest = ApRequestCreator.createDigest(contentBody);
 
 		const opts = {
 			attempts: this.config.deliverJobMaxAttempts ?? 12,
@@ -144,9 +143,9 @@ export class QueueService {
 			data: {
 				user,
 				content: contentBody,
-				digest,
 				to: d[0],
 				isSharedInbox: d[1],
+				privateKey: privateKey && { keyId: privateKey.keyId, privateKeyPem: privateKey.privateKeyPem },
 			} as DeliverJobData,
 			opts,
 		})));
@@ -155,7 +154,7 @@ export class QueueService {
 	}
 
 	@bindThis
-	public inbox(activity: IActivity, signature: httpSignature.IParsedSignature) {
+	public inbox(activity: IActivity, signature: ParsedSignature | null) {
 		const data = {
 			activity: activity,
 			signature,
diff --git a/packages/backend/src/core/RelayService.ts b/packages/backend/src/core/RelayService.ts
index 8dd3d64f5b..ad01f98902 100644
--- a/packages/backend/src/core/RelayService.ts
+++ b/packages/backend/src/core/RelayService.ts
@@ -16,6 +16,8 @@ import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
 import { DI } from '@/di-symbols.js';
 import { deepClone } from '@/misc/clone.js';
 import { bindThis } from '@/decorators.js';
+import { UserKeypairService } from './UserKeypairService.js';
+import type { PrivateKeyWithPem } from '@misskey-dev/node-http-message-signatures';
 
 const ACTOR_USERNAME = 'relay.actor' as const;
 
@@ -34,6 +36,7 @@ export class RelayService {
 		private queueService: QueueService,
 		private createSystemUserService: CreateSystemUserService,
 		private apRendererService: ApRendererService,
+		private userKeypairService: UserKeypairService,
 	) {
 		this.relaysCache = new MemorySingleCache<MiRelay[]>(1000 * 60 * 10);
 	}
@@ -111,7 +114,7 @@ export class RelayService {
 	}
 
 	@bindThis
-	public async deliverToRelays(user: { id: MiUser['id']; host: null; }, activity: any): Promise<void> {
+	public async deliverToRelays(user: { id: MiUser['id']; host: null; }, activity: any, privateKey?: PrivateKeyWithPem): Promise<void> {
 		if (activity == null) return;
 
 		const relays = await this.relaysCache.fetch(() => this.relaysRepository.findBy({
@@ -121,11 +124,9 @@ export class RelayService {
 
 		const copy = deepClone(activity);
 		if (!copy.to) copy.to = ['https://www.w3.org/ns/activitystreams#Public'];
+		privateKey = privateKey ?? await this.userKeypairService.getLocalUserPrivateKeyPem(user.id);
+		const signed = await this.apRendererService.attachLdSignature(copy, privateKey);
 
-		const signed = await this.apRendererService.attachLdSignature(copy, user);
-
-		for (const relay of relays) {
-			this.queueService.deliver(user, signed, relay.inbox, false);
-		}
+		this.queueService.deliverMany(user, signed, new Map(relays.map(({ inbox }) => [inbox, false])), privateKey);
 	}
 }
diff --git a/packages/backend/src/core/SignupService.ts b/packages/backend/src/core/SignupService.ts
index 5522ecd6cc..54c6170062 100644
--- a/packages/backend/src/core/SignupService.ts
+++ b/packages/backend/src/core/SignupService.ts
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { generateKeyPair } from 'node:crypto';
 import { Inject, Injectable } from '@nestjs/common';
 import bcrypt from 'bcryptjs';
 import { DataSource, IsNull } from 'typeorm';
@@ -21,6 +20,7 @@ import { bindThis } from '@/decorators.js';
 import UsersChart from '@/core/chart/charts/users.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { MetaService } from '@/core/MetaService.js';
+import { genRSAAndEd25519KeyPair } from '@/misc/gen-key-pair.js';
 
 @Injectable()
 export class SignupService {
@@ -93,22 +93,7 @@ export class SignupService {
 			}
 		}
 
-		const keyPair = await new Promise<string[]>((res, rej) =>
-			generateKeyPair('rsa', {
-				modulusLength: 2048,
-				publicKeyEncoding: {
-					type: 'spki',
-					format: 'pem',
-				},
-				privateKeyEncoding: {
-					type: 'pkcs8',
-					format: 'pem',
-					cipher: undefined,
-					passphrase: undefined,
-				},
-			}, (err, publicKey, privateKey) =>
-				err ? rej(err) : res([publicKey, privateKey]),
-			));
+		const keyPair = await genRSAAndEd25519KeyPair();
 
 		let account!: MiUser;
 
@@ -131,9 +116,8 @@ export class SignupService {
 			}));
 
 			await transactionalEntityManager.save(new MiUserKeypair({
-				publicKey: keyPair[0],
-				privateKey: keyPair[1],
 				userId: account.id,
+				...keyPair,
 			}));
 
 			await transactionalEntityManager.save(new MiUserProfile({
diff --git a/packages/backend/src/core/UserKeypairService.ts b/packages/backend/src/core/UserKeypairService.ts
index 51ac99179a..aa90f1e209 100644
--- a/packages/backend/src/core/UserKeypairService.ts
+++ b/packages/backend/src/core/UserKeypairService.ts
@@ -5,41 +5,184 @@
 
 import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
 import * as Redis from 'ioredis';
+import { genEd25519KeyPair, importPrivateKey, PrivateKey, PrivateKeyWithPem } from '@misskey-dev/node-http-message-signatures';
 import type { MiUser } from '@/models/User.js';
 import type { UserKeypairsRepository } from '@/models/_.js';
-import { RedisKVCache } from '@/misc/cache.js';
+import { RedisKVCache, MemoryKVCache } from '@/misc/cache.js';
 import type { MiUserKeypair } from '@/models/UserKeypair.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
+import { GlobalEventService, GlobalEvents } from '@/core/GlobalEventService.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import type { webcrypto } from 'node:crypto';
 
 @Injectable()
 export class UserKeypairService implements OnApplicationShutdown {
-	private cache: RedisKVCache<MiUserKeypair>;
+	private keypairEntityCache: RedisKVCache<MiUserKeypair>;
+	private privateKeyObjectCache: MemoryKVCache<webcrypto.CryptoKey>;
 
 	constructor(
 		@Inject(DI.redis)
 		private redisClient: Redis.Redis,
-
+		@Inject(DI.redisForSub)
+		private redisForSub: Redis.Redis,
 		@Inject(DI.userKeypairsRepository)
 		private userKeypairsRepository: UserKeypairsRepository,
+
+		private globalEventService: GlobalEventService,
+		private userEntityService: UserEntityService,
 	) {
-		this.cache = new RedisKVCache<MiUserKeypair>(this.redisClient, 'userKeypair', {
+		this.keypairEntityCache = new RedisKVCache<MiUserKeypair>(this.redisClient, 'userKeypair', {
 			lifetime: 1000 * 60 * 60 * 24, // 24h
 			memoryCacheLifetime: Infinity,
 			fetcher: (key) => this.userKeypairsRepository.findOneByOrFail({ userId: key }),
 			toRedisConverter: (value) => JSON.stringify(value),
 			fromRedisConverter: (value) => JSON.parse(value),
 		});
+		this.privateKeyObjectCache = new MemoryKVCache<webcrypto.CryptoKey>(1000 * 60 * 60 * 1);
+
+		this.redisForSub.on('message', this.onMessage);
 	}
 
 	@bindThis
 	public async getUserKeypair(userId: MiUser['id']): Promise<MiUserKeypair> {
-		return await this.cache.fetch(userId);
+		return await this.keypairEntityCache.fetch(userId);
+	}
+
+	/**
+	 * Get private key [Only PrivateKeyWithPem for queue data etc.]
+	 * @param userIdOrHint user id or MiUserKeypair
+	 * @param preferType
+	 *		If ed25519-like(`ed25519`, `01`, `11`) is specified, ed25519 keypair will be returned if exists.
+	 *		Otherwise, main keypair will be returned.
+	 * @returns
+	 */
+	@bindThis
+	public async getLocalUserPrivateKeyPem(
+		userIdOrHint: MiUser['id'] | MiUserKeypair,
+		preferType?: string,
+	): Promise<PrivateKeyWithPem> {
+		const keypair = typeof userIdOrHint === 'string' ? await this.getUserKeypair(userIdOrHint) : userIdOrHint;
+		if (
+			preferType && ['01', '11', 'ed25519'].includes(preferType.toLowerCase()) &&
+			keypair.ed25519PublicKey != null && keypair.ed25519PrivateKey != null
+		) {
+			return {
+				keyId: `${this.userEntityService.genLocalUserUri(keypair.userId)}#ed25519-key`,
+				privateKeyPem: keypair.ed25519PrivateKey,
+			};
+		}
+		return {
+			keyId: `${this.userEntityService.genLocalUserUri(keypair.userId)}#main-key`,
+			privateKeyPem: keypair.privateKey,
+		};
+	}
+
+	/**
+	 * Get private key [Only PrivateKey for ap request]
+	 * Using cache due to performance reasons of `crypto.subtle.importKey`
+	 * @param userIdOrHint user id, MiUserKeypair, or PrivateKeyWithPem
+	 * @param preferType
+	 * 		If ed25519-like(`ed25519`, `01`, `11`) is specified, ed25519 keypair will be returned if exists.
+	 *		Otherwise, main keypair will be returned. (ignored if userIdOrHint is PrivateKeyWithPem)
+	 * @returns
+	 */
+	@bindThis
+	public async getLocalUserPrivateKey(
+		userIdOrHint: MiUser['id'] | MiUserKeypair | PrivateKeyWithPem,
+		preferType?: string,
+	): Promise<PrivateKey> {
+		if (typeof userIdOrHint === 'object' && 'privateKeyPem' in userIdOrHint) {
+			// userIdOrHint is PrivateKeyWithPem
+			return {
+				keyId: userIdOrHint.keyId,
+				privateKey: await this.privateKeyObjectCache.fetch(userIdOrHint.keyId, async () => {
+					return await importPrivateKey(userIdOrHint.privateKeyPem);
+				}),
+			};
+		}
+
+		const userId = typeof userIdOrHint === 'string' ? userIdOrHint : userIdOrHint.userId;
+		const getKeypair = () => typeof userIdOrHint === 'string' ? this.getUserKeypair(userId) : userIdOrHint;
+
+		if (preferType && ['01', '11', 'ed25519'].includes(preferType.toLowerCase())) {
+			const keyId = `${this.userEntityService.genLocalUserUri(userId)}#ed25519-key`;
+			const fetched = await this.privateKeyObjectCache.fetchMaybe(keyId, async () => {
+				const keypair = await getKeypair();
+				if (keypair.ed25519PublicKey != null && keypair.ed25519PrivateKey != null) {
+					return await importPrivateKey(keypair.ed25519PrivateKey);
+				}
+				return;
+			});
+			if (fetched) {
+				return {
+					keyId,
+					privateKey: fetched,
+				};
+			}
+		}
+
+		const keyId = `${this.userEntityService.genLocalUserUri(userId)}#main-key`;
+		return {
+			keyId,
+			privateKey: await this.privateKeyObjectCache.fetch(keyId, async () => {
+				const keypair = await getKeypair();
+				return await importPrivateKey(keypair.privateKey);
+			}),
+		};
 	}
 
+	@bindThis
+	public async refresh(userId: MiUser['id']): Promise<void> {
+		return await this.keypairEntityCache.refresh(userId);
+	}
+
+	/**
+	 * If DB has ed25519 keypair, refresh cache and return it.
+	 * If not, create, save and return ed25519 keypair.
+	 * @param userId user id
+	 * @returns MiUserKeypair if keypair is created, void if keypair is already exists
+	 */
+	@bindThis
+	public async refreshAndPrepareEd25519KeyPair(userId: MiUser['id']): Promise<MiUserKeypair | void> {
+		await this.refresh(userId);
+		const keypair = await this.keypairEntityCache.fetch(userId);
+		if (keypair.ed25519PublicKey != null) {
+			return;
+		}
+
+		const ed25519 = await genEd25519KeyPair();
+		await this.userKeypairsRepository.update({ userId }, {
+			ed25519PublicKey: ed25519.publicKey,
+			ed25519PrivateKey: ed25519.privateKey,
+		});
+		this.globalEventService.publishInternalEvent('userKeypairUpdated', { userId });
+		const result = {
+			...keypair,
+			ed25519PublicKey: ed25519.publicKey,
+			ed25519PrivateKey: ed25519.privateKey,
+		};
+		this.keypairEntityCache.set(userId, result);
+		return result;
+	}
+
+	@bindThis
+	private async onMessage(_: string, data: string): Promise<void> {
+		const obj = JSON.parse(data);
+
+		if (obj.channel === 'internal') {
+			const { type, body } = obj.message as GlobalEvents['internal']['payload'];
+			switch (type) {
+				case 'userKeypairUpdated': {
+					this.refresh(body.userId);
+					break;
+				}
+			}
+		}
+	}
 	@bindThis
 	public dispose(): void {
-		this.cache.dispose();
+		this.keypairEntityCache.dispose();
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/UserSuspendService.ts b/packages/backend/src/core/UserSuspendService.ts
index d594a223f4..fc5a68c72e 100644
--- a/packages/backend/src/core/UserSuspendService.ts
+++ b/packages/backend/src/core/UserSuspendService.ts
@@ -3,27 +3,23 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { Inject, Injectable } from '@nestjs/common';
-import { Not, IsNull } from 'typeorm';
-import type { FollowingsRepository } from '@/models/_.js';
+import { Injectable } from '@nestjs/common';
 import type { MiUser } from '@/models/User.js';
-import { QueueService } from '@/core/QueueService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
-import { DI } from '@/di-symbols.js';
 import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
+import { UserKeypairService } from './UserKeypairService.js';
+import { ApDeliverManagerService } from './activitypub/ApDeliverManagerService.js';
 
 @Injectable()
 export class UserSuspendService {
 	constructor(
-		@Inject(DI.followingsRepository)
-		private followingsRepository: FollowingsRepository,
-
 		private userEntityService: UserEntityService,
-		private queueService: QueueService,
 		private globalEventService: GlobalEventService,
 		private apRendererService: ApRendererService,
+		private userKeypairService: UserKeypairService,
+		private apDeliverManagerService: ApDeliverManagerService,
 	) {
 	}
 
@@ -32,28 +28,12 @@ export class UserSuspendService {
 		this.globalEventService.publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: true });
 
 		if (this.userEntityService.isLocalUser(user)) {
-			// 知り得る全SharedInboxにDelete配信
 			const content = this.apRendererService.addContext(this.apRendererService.renderDelete(this.userEntityService.genLocalUserUri(user.id), user));
-
-			const queue: string[] = [];
-
-			const followings = await this.followingsRepository.find({
-				where: [
-					{ followerSharedInbox: Not(IsNull()) },
-					{ followeeSharedInbox: Not(IsNull()) },
-				],
-				select: ['followerSharedInbox', 'followeeSharedInbox'],
-			});
-
-			const inboxes = followings.map(x => x.followerSharedInbox ?? x.followeeSharedInbox);
-
-			for (const inbox of inboxes) {
-				if (inbox != null && !queue.includes(inbox)) queue.push(inbox);
-			}
-
-			for (const inbox of queue) {
-				this.queueService.deliver(user, content, inbox, true);
-			}
+			const manager = this.apDeliverManagerService.createDeliverManager(user, content);
+			manager.addAllKnowingSharedInboxRecipe();
+			// process deliver時にはキーペアが消去されているはずなので、ここで挿入する
+			const privateKey = await this.userKeypairService.getLocalUserPrivateKeyPem(user.id, 'main');
+			manager.execute({ privateKey });
 		}
 	}
 
@@ -62,28 +42,12 @@ export class UserSuspendService {
 		this.globalEventService.publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: false });
 
 		if (this.userEntityService.isLocalUser(user)) {
-			// 知り得る全SharedInboxにUndo Delete配信
 			const content = this.apRendererService.addContext(this.apRendererService.renderUndo(this.apRendererService.renderDelete(this.userEntityService.genLocalUserUri(user.id), user), user));
-
-			const queue: string[] = [];
-
-			const followings = await this.followingsRepository.find({
-				where: [
-					{ followerSharedInbox: Not(IsNull()) },
-					{ followeeSharedInbox: Not(IsNull()) },
-				],
-				select: ['followerSharedInbox', 'followeeSharedInbox'],
-			});
-
-			const inboxes = followings.map(x => x.followerSharedInbox ?? x.followeeSharedInbox);
-
-			for (const inbox of inboxes) {
-				if (inbox != null && !queue.includes(inbox)) queue.push(inbox);
-			}
-
-			for (const inbox of queue) {
-				this.queueService.deliver(user as any, content, inbox, true);
-			}
+			const manager = this.apDeliverManagerService.createDeliverManager(user, content);
+			manager.addAllKnowingSharedInboxRecipe();
+			// process deliver時にはキーペアが消去されているはずなので、ここで挿入する
+			const privateKey = await this.userKeypairService.getLocalUserPrivateKeyPem(user.id, 'main');
+			manager.execute({ privateKey });
 		}
 	}
 }
diff --git a/packages/backend/src/core/WebfingerService.ts b/packages/backend/src/core/WebfingerService.ts
index 374536a741..aa1144778c 100644
--- a/packages/backend/src/core/WebfingerService.ts
+++ b/packages/backend/src/core/WebfingerService.ts
@@ -46,7 +46,7 @@ export class WebfingerService {
 		const m = query.match(mRegex);
 		if (m) {
 			const hostname = m[2];
-			const useHttp = process.env.MISSKEY_WEBFINGER_USE_HTTP && process.env.MISSKEY_WEBFINGER_USE_HTTP.toLowerCase() === 'true';
+			const useHttp = process.env.MISSKEY_USE_HTTP && process.env.MISSKEY_USE_HTTP.toLowerCase() === 'true';
 			return `http${useHttp ? '' : 's'}://${hostname}/.well-known/webfinger?${urlQuery({ resource: `acct:${query}` })}`;
 		}
 
diff --git a/packages/backend/src/core/activitypub/ApDbResolverService.ts b/packages/backend/src/core/activitypub/ApDbResolverService.ts
index f6b70ead44..973394683f 100644
--- a/packages/backend/src/core/activitypub/ApDbResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApDbResolverService.ts
@@ -5,7 +5,7 @@
 
 import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
-import type { NotesRepository, UserPublickeysRepository, UsersRepository } from '@/models/_.js';
+import type { MiUser, NotesRepository, UserPublickeysRepository, UsersRepository } from '@/models/_.js';
 import type { Config } from '@/config.js';
 import { MemoryKVCache } from '@/misc/cache.js';
 import type { MiUserPublickey } from '@/models/UserPublickey.js';
@@ -13,9 +13,12 @@ import { CacheService } from '@/core/CacheService.js';
 import type { MiNote } from '@/models/Note.js';
 import { bindThis } from '@/decorators.js';
 import { MiLocalUser, MiRemoteUser } from '@/models/User.js';
+import Logger from '@/logger.js';
 import { getApId } from './type.js';
 import { ApPersonService } from './models/ApPersonService.js';
+import { ApLoggerService } from './ApLoggerService.js';
 import type { IObject } from './type.js';
+import { UtilityService } from '../UtilityService.js';
 
 export type UriParseResult = {
 	/** wether the URI was generated by us */
@@ -35,8 +38,8 @@ export type UriParseResult = {
 
 @Injectable()
 export class ApDbResolverService implements OnApplicationShutdown {
-	private publicKeyCache: MemoryKVCache<MiUserPublickey | null>;
-	private publicKeyByUserIdCache: MemoryKVCache<MiUserPublickey | null>;
+	private publicKeyByUserIdCache: MemoryKVCache<MiUserPublickey[] | null>;
+	private logger: Logger;
 
 	constructor(
 		@Inject(DI.config)
@@ -53,9 +56,17 @@ export class ApDbResolverService implements OnApplicationShutdown {
 
 		private cacheService: CacheService,
 		private apPersonService: ApPersonService,
+		private apLoggerService: ApLoggerService,
+		private utilityService: UtilityService,
 	) {
-		this.publicKeyCache = new MemoryKVCache<MiUserPublickey | null>(Infinity);
-		this.publicKeyByUserIdCache = new MemoryKVCache<MiUserPublickey | null>(Infinity);
+		this.publicKeyByUserIdCache = new MemoryKVCache<MiUserPublickey[] | null>(Infinity);
+		this.logger = this.apLoggerService.logger.createSubLogger('db-resolver');
+	}
+
+	private punyHost(url: string): string {
+		const urlObj = new URL(url);
+		const host = `${this.utilityService.toPuny(urlObj.hostname)}${urlObj.port.length > 0 ? ':' + urlObj.port : ''}`;
+		return host;
 	}
 
 	@bindThis
@@ -116,62 +127,141 @@ export class ApDbResolverService implements OnApplicationShutdown {
 		}
 	}
 
-	/**
-	 * AP KeyId => Misskey User and Key
-	 */
 	@bindThis
-	public async getAuthUserFromKeyId(keyId: string): Promise<{
-		user: MiRemoteUser;
-		key: MiUserPublickey;
-	} | null> {
-		const key = await this.publicKeyCache.fetch(keyId, async () => {
-			const key = await this.userPublickeysRepository.findOneBy({
-				keyId,
-			});
-
-			if (key == null) return null;
-
-			return key;
-		}, key => key != null);
-
-		if (key == null) return null;
-
-		const user = await this.cacheService.findUserById(key.userId).catch(() => null) as MiRemoteUser | null;
-		if (user == null) return null;
-		if (user.isDeleted) return null;
-
-		return {
-			user,
-			key,
-		};
+	private async refreshAndFindKey(userId: MiUser['id'], keyId: string): Promise<MiUserPublickey | null> {
+		this.refreshCacheByUserId(userId);
+		const keys = await this.getPublicKeyByUserId(userId);
+		if (keys == null || !Array.isArray(keys) || keys.length === 0) {
+			this.logger.warn(`No key found (refreshAndFindKey) userId=${userId} keyId=${keyId} keys=${JSON.stringify(keys)}`);
+			return null;
+		}
+		const exactKey = keys.find(x => x.keyId === keyId);
+		if (exactKey) return exactKey;
+		this.logger.warn(`No exact key found (refreshAndFindKey) userId=${userId} keyId=${keyId} keys=${JSON.stringify(keys)}`);
+		return null;
 	}
 
 	/**
 	 * AP Actor id => Misskey User and Key
+	 * @param uri AP Actor id
+	 * @param keyId Key id to find. If not specified, main key will be selected.
+	 * @returns
+	 *	1. `null` if the user and key host do not match
+	 *	2. `{ user: null, key: null }` if the user is not found
+	 *	3. `{ user: MiRemoteUser, key: null }` if key is not found
+	 *  4. `{ user: MiRemoteUser, key: MiUserPublickey }` if both are found
 	 */
 	@bindThis
-	public async getAuthUserFromApId(uri: string): Promise<{
+	public async getAuthUserFromApId(uri: string, keyId?: string): Promise<{
 		user: MiRemoteUser;
 		key: MiUserPublickey | null;
-	} | null> {
-		const user = await this.apPersonService.resolvePerson(uri) as MiRemoteUser;
-		if (user.isDeleted) return null;
+	} | {
+		user: null;
+		key: null;
+	} |
+	null> {
+		if (keyId) {
+			if (this.punyHost(uri) !== this.punyHost(keyId)) {
+				/**
+				 * keyIdはURL形式かつkeyIdのホストはuriのホストと一致するはず
+				 * （ApPersonService.validateActorに由来）
+				 *
+				 * ただ、Mastodonはリプライ関連で他人のトゥートをHTTP Signature署名して送ってくることがある
+				 * そのような署名は有効性に疑問があるので無視することにする
+				 * ここではuriとkeyIdのホストが一致しない場合は無視する
+				 * ハッシュをなくしたkeyIdとuriの同一性を比べてみてもいいが、`uri#*-key`というkeyIdを設定するのが
+				 * 決まりごとというわけでもないため幅を持たせることにする
+				 *
+				 *
+				 * The keyId should be in URL format and its host should match the host of the uri
+				 * (derived from ApPersonService.validateActor)
+				 *
+				 * However, Mastodon sometimes sends toots from other users with HTTP Signature signing for reply-related purposes
+				 * Such signatures are of questionable validity, so we choose to ignore them
+				 * Here, we ignore cases where the hosts of uri and keyId do not match
+				 * We could also compare the equality of keyId without the hash and uri, but since setting a keyId like `uri#*-key`
+				 * is not a strict rule, we decide to allow for some flexibility
+				 */
+				this.logger.warn(`actor uri and keyId are not matched uri=${uri} keyId=${keyId}`);
+				return null;
+			}
+		}
 
-		const key = await this.publicKeyByUserIdCache.fetch(
-			user.id,
-			() => this.userPublickeysRepository.findOneBy({ userId: user.id }),
+		const user = await this.apPersonService.resolvePerson(uri, undefined, true) as MiRemoteUser;
+		if (user.isDeleted) return { user: null, key: null };
+
+		const keys = await this.getPublicKeyByUserId(user.id);
+
+		if (keys == null || !Array.isArray(keys) || keys.length === 0) {
+			this.logger.warn(`No key found uri=${uri} userId=${user.id} keys=${JSON.stringify(keys)}`);
+			return { user, key: null };
+		}
+
+		if (!keyId) {
+			// Choose the main-like
+			const mainKey = keys.find(x => {
+				try {
+					const url = new URL(x.keyId);
+					const path = url.pathname.split('/').pop()?.toLowerCase();
+					if (url.hash) {
+						if (url.hash.toLowerCase().includes('main')) {
+							return true;
+						}
+					} else if (path?.includes('main') || path === 'publickey') {
+						return true;
+					}
+				} catch { /* noop */ }
+
+				return false;
+			});
+			return { user, key: mainKey ?? keys[0] };
+		}
+
+		const exactKey = keys.find(x => x.keyId === keyId);
+		if (exactKey) return { user, key: exactKey };
+
+		/**
+		 * keyIdで見つからない場合、まずはキャッシュを更新して再取得
+		 * If not found with keyId, update cache and reacquire
+		 */
+		const cacheRaw = this.publicKeyByUserIdCache.cache.get(user.id);
+		if (cacheRaw && cacheRaw.date > Date.now() - 1000 * 60 * 12) {
+			const exactKey = await this.refreshAndFindKey(user.id, keyId);
+			if (exactKey) return { user, key: exactKey };
+		}
+
+		/**
+		 * lastFetchedAtでの更新制限を弱めて再取得
+		 * Reacquisition with weakened update limit at lastFetchedAt
+		 */
+		if (user.lastFetchedAt == null || user.lastFetchedAt < new Date(Date.now() - 1000 * 60 * 12)) {
+			this.logger.info(`Fetching user to find public key uri=${uri} userId=${user.id} keyId=${keyId}`);
+			const renewed = await this.apPersonService.fetchPersonWithRenewal(uri, 0);
+			if (renewed == null || renewed.isDeleted) return null;
+
+			return { user, key: await this.refreshAndFindKey(user.id, keyId) };
+		}
+
+		this.logger.warn(`No key found uri=${uri} userId=${user.id} keyId=${keyId}`);
+		return { user, key: null };
+	}
+
+	@bindThis
+	public async getPublicKeyByUserId(userId: MiUser['id']): Promise<MiUserPublickey[] | null> {
+		return await this.publicKeyByUserIdCache.fetch(
+			userId,
+			() => this.userPublickeysRepository.find({ where: { userId } }),
 			v => v != null,
 		);
+	}
 
-		return {
-			user,
-			key,
-		};
+	@bindThis
+	public refreshCacheByUserId(userId: MiUser['id']): void {
+		this.publicKeyByUserIdCache.delete(userId);
 	}
 
 	@bindThis
 	public dispose(): void {
-		this.publicKeyCache.dispose();
 		this.publicKeyByUserIdCache.dispose();
 	}
 
diff --git a/packages/backend/src/core/activitypub/ApDeliverManagerService.ts b/packages/backend/src/core/activitypub/ApDeliverManagerService.ts
index 5d07cd8e8f..db3302e6ff 100644
--- a/packages/backend/src/core/activitypub/ApDeliverManagerService.ts
+++ b/packages/backend/src/core/activitypub/ApDeliverManagerService.ts
@@ -9,10 +9,14 @@ import { DI } from '@/di-symbols.js';
 import type { FollowingsRepository } from '@/models/_.js';
 import type { MiLocalUser, MiRemoteUser, MiUser } from '@/models/User.js';
 import { QueueService } from '@/core/QueueService.js';
-import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
 import type { IActivity } from '@/core/activitypub/type.js';
 import { ThinUser } from '@/queue/types.js';
+import { AccountUpdateService } from '@/core/AccountUpdateService.js';
+import type Logger from '@/logger.js';
+import { UserKeypairService } from '../UserKeypairService.js';
+import { ApLoggerService } from './ApLoggerService.js';
+import type { PrivateKeyWithPem } from '@misskey-dev/node-http-message-signatures';
 
 interface IRecipe {
 	type: string;
@@ -27,12 +31,19 @@ interface IDirectRecipe extends IRecipe {
 	to: MiRemoteUser;
 }
 
+interface IAllKnowingSharedInboxRecipe extends IRecipe {
+	type: 'AllKnowingSharedInbox';
+}
+
 const isFollowers = (recipe: IRecipe): recipe is IFollowersRecipe =>
 	recipe.type === 'Followers';
 
 const isDirect = (recipe: IRecipe): recipe is IDirectRecipe =>
 	recipe.type === 'Direct';
 
+const isAllKnowingSharedInbox = (recipe: IRecipe): recipe is IAllKnowingSharedInboxRecipe =>
+	recipe.type === 'AllKnowingSharedInbox';
+
 class DeliverManager {
 	private actor: ThinUser;
 	private activity: IActivity | null;
@@ -40,16 +51,18 @@ class DeliverManager {
 
 	/**
 	 * Constructor
-	 * @param userEntityService
+	 * @param userKeypairService
 	 * @param followingsRepository
 	 * @param queueService
 	 * @param actor Actor
 	 * @param activity Activity to deliver
 	 */
 	constructor(
-		private userEntityService: UserEntityService,
+		private userKeypairService: UserKeypairService,
 		private followingsRepository: FollowingsRepository,
 		private queueService: QueueService,
+		private accountUpdateService: AccountUpdateService,
+		private logger: Logger,
 
 		actor: { id: MiUser['id']; host: null; },
 		activity: IActivity | null,
@@ -91,6 +104,18 @@ class DeliverManager {
 		this.addRecipe(recipe);
 	}
 
+	/**
+	 * Add recipe for all-knowing shared inbox deliver
+	 */
+	@bindThis
+	public addAllKnowingSharedInboxRecipe(): void {
+		const deliver: IAllKnowingSharedInboxRecipe = {
+			type: 'AllKnowingSharedInbox',
+		};
+
+		this.addRecipe(deliver);
+	}
+
 	/**
 	 * Add recipe
 	 * @param recipe Recipe
@@ -104,11 +129,44 @@ class DeliverManager {
 	 * Execute delivers
 	 */
 	@bindThis
-	public async execute(): Promise<void> {
+	public async execute(opts?: { privateKey?: PrivateKeyWithPem }): Promise<void> {
+		//#region MIGRATION
+		if (!opts?.privateKey) {
+			/**
+			 * ed25519の署名がなければ追加する
+			 */
+			const created = await this.userKeypairService.refreshAndPrepareEd25519KeyPair(this.actor.id);
+			if (created) {
+				// createdが存在するということは新規作成されたということなので、フォロワーに配信する
+				this.logger.info(`ed25519 key pair created for user ${this.actor.id} and publishing to followers`);
+				// リモートに配信
+				const keyPair = await this.userKeypairService.getLocalUserPrivateKeyPem(created, 'main');
+				await this.accountUpdateService.publishToFollowers(this.actor.id, keyPair);
+			}
+		}
+		//#endregion
+
+		//#region collect inboxes by recipes
 		// The value flags whether it is shared or not.
 		// key: inbox URL, value: whether it is sharedInbox
 		const inboxes = new Map<string, boolean>();
 
+		if (this.recipes.some(r => isAllKnowingSharedInbox(r))) {
+			// all-knowing shared inbox
+			const followings = await this.followingsRepository.find({
+				where: [
+					{ followerSharedInbox: Not(IsNull()) },
+					{ followeeSharedInbox: Not(IsNull()) },
+				],
+				select: ['followerSharedInbox', 'followeeSharedInbox'],
+			});
+
+			for (const following of followings) {
+				if (following.followeeSharedInbox) inboxes.set(following.followeeSharedInbox, true);
+				if (following.followerSharedInbox) inboxes.set(following.followerSharedInbox, true);
+			}
+		}
+
 		// build inbox list
 		// Process follower recipes first to avoid duplication when processing direct recipes later.
 		if (this.recipes.some(r => isFollowers(r))) {
@@ -142,39 +200,49 @@ class DeliverManager {
 
 			inboxes.set(recipe.to.inbox, false);
 		}
+		//#endregion
 
 		// deliver
-		await this.queueService.deliverMany(this.actor, this.activity, inboxes);
+		await this.queueService.deliverMany(this.actor, this.activity, inboxes, opts?.privateKey);
+		this.logger.info(`Deliver queues dispatched: inboxes=${inboxes.size} actorId=${this.actor.id} activityId=${this.activity?.id}`);
 	}
 }
 
 @Injectable()
 export class ApDeliverManagerService {
+	private logger: Logger;
+
 	constructor(
 		@Inject(DI.followingsRepository)
 		private followingsRepository: FollowingsRepository,
 
-		private userEntityService: UserEntityService,
+		private userKeypairService: UserKeypairService,
 		private queueService: QueueService,
+		private accountUpdateService: AccountUpdateService,
+		private apLoggerService: ApLoggerService,
 	) {
+		this.logger = this.apLoggerService.logger.createSubLogger('deliver-manager');
 	}
 
 	/**
 	 * Deliver activity to followers
 	 * @param actor
 	 * @param activity Activity
+	 * @param forceMainKey Force to use main (rsa) key
 	 */
 	@bindThis
-	public async deliverToFollowers(actor: { id: MiLocalUser['id']; host: null; }, activity: IActivity): Promise<void> {
+	public async deliverToFollowers(actor: { id: MiLocalUser['id']; host: null; }, activity: IActivity, privateKey?: PrivateKeyWithPem): Promise<void> {
 		const manager = new DeliverManager(
-			this.userEntityService,
+			this.userKeypairService,
 			this.followingsRepository,
 			this.queueService,
+			this.accountUpdateService,
+			this.logger,
 			actor,
 			activity,
 		);
 		manager.addFollowersRecipe();
-		await manager.execute();
+		await manager.execute({ privateKey });
 	}
 
 	/**
@@ -186,9 +254,11 @@ export class ApDeliverManagerService {
 	@bindThis
 	public async deliverToUser(actor: { id: MiLocalUser['id']; host: null; }, activity: IActivity, to: MiRemoteUser): Promise<void> {
 		const manager = new DeliverManager(
-			this.userEntityService,
+			this.userKeypairService,
 			this.followingsRepository,
 			this.queueService,
+			this.accountUpdateService,
+			this.logger,
 			actor,
 			activity,
 		);
@@ -199,10 +269,11 @@ export class ApDeliverManagerService {
 	@bindThis
 	public createDeliverManager(actor: { id: MiUser['id']; host: null; }, activity: IActivity | null): DeliverManager {
 		return new DeliverManager(
-			this.userEntityService,
+			this.userKeypairService,
 			this.followingsRepository,
 			this.queueService,
-
+			this.accountUpdateService,
+			this.logger,
 			actor,
 			activity,
 		);
diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts
index e2164fec1d..1bef9fe071 100644
--- a/packages/backend/src/core/activitypub/ApInboxService.ts
+++ b/packages/backend/src/core/activitypub/ApInboxService.ts
@@ -114,15 +114,8 @@ export class ApInboxService {
 			result = await this.performOneActivity(actor, activity);
 		}
 
-		// ついでにリモートユーザーの情報が古かったら更新しておく
-		if (actor.uri) {
-			if (actor.lastFetchedAt == null || Date.now() - actor.lastFetchedAt.getTime() > 1000 * 60 * 60 * 24) {
-				setImmediate(() => {
-					this.apPersonService.updatePerson(actor.uri);
-				});
-			}
-		}
-		return result;
+		// ついでにリモートユーザーの情報が古かったら更新しておく?
+		// → No, この関数が呼び出される前に署名検証で更新されているはず
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts
index 98e944f347..5d7419f934 100644
--- a/packages/backend/src/core/activitypub/ApRendererService.ts
+++ b/packages/backend/src/core/activitypub/ApRendererService.ts
@@ -22,7 +22,6 @@ import { UserKeypairService } from '@/core/UserKeypairService.js';
 import { MfmService } from '@/core/MfmService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
-import type { MiUserKeypair } from '@/models/UserKeypair.js';
 import type { UsersRepository, UserProfilesRepository, NotesRepository, DriveFilesRepository, PollsRepository } from '@/models/_.js';
 import { bindThis } from '@/decorators.js';
 import { CustomEmojiService } from '@/core/CustomEmojiService.js';
@@ -31,6 +30,7 @@ import { JsonLdService } from './JsonLdService.js';
 import { ApMfmService } from './ApMfmService.js';
 import { CONTEXT } from './misc/contexts.js';
 import type { IAccept, IActivity, IAdd, IAnnounce, IApDocument, IApEmoji, IApHashtag, IApImage, IApMention, IBlock, ICreate, IDelete, IFlag, IFollow, IKey, ILike, IMove, IObject, IPost, IQuestion, IReject, IRemove, ITombstone, IUndo, IUpdate } from './type.js';
+import type { PrivateKeyWithPem } from '@misskey-dev/node-http-message-signatures';
 
 @Injectable()
 export class ApRendererService {
@@ -251,15 +251,15 @@ export class ApRendererService {
 	}
 
 	@bindThis
-	public renderKey(user: MiLocalUser, key: MiUserKeypair, postfix?: string): IKey {
+	public renderKey(user: MiLocalUser, publicKey: string, postfix?: string): IKey {
 		return {
-			id: `${this.config.url}/users/${user.id}${postfix ?? '/publickey'}`,
+			id: `${this.userEntityService.genLocalUserUri(user.id)}${postfix ?? '/publickey'}`,
 			type: 'Key',
 			owner: this.userEntityService.genLocalUserUri(user.id),
-			publicKeyPem: createPublicKey(key.publicKey).export({
+			publicKeyPem: createPublicKey(publicKey).export({
 				type: 'spki',
 				format: 'pem',
-			}),
+			}) as string,
 		};
 	}
 
@@ -499,7 +499,10 @@ export class ApRendererService {
 			tag,
 			manuallyApprovesFollowers: user.isLocked,
 			discoverable: user.isExplorable,
-			publicKey: this.renderKey(user, keypair, '#main-key'),
+			publicKey: this.renderKey(user, keypair.publicKey, '#main-key'),
+			additionalPublicKeys: [
+				...(keypair.ed25519PublicKey ? [this.renderKey(user, keypair.ed25519PublicKey, '#ed25519-key')] : []),
+			],
 			isCat: user.isCat,
 			attachment: attachment.length ? attachment : undefined,
 		};
@@ -622,12 +625,10 @@ export class ApRendererService {
 	}
 
 	@bindThis
-	public async attachLdSignature(activity: any, user: { id: MiUser['id']; host: null; }): Promise<IActivity> {
-		const keypair = await this.userKeypairService.getUserKeypair(user.id);
-
+	public async attachLdSignature(activity: any, key: PrivateKeyWithPem): Promise<IActivity> {
 		const jsonLd = this.jsonLdService.use();
 		jsonLd.debug = false;
-		activity = await jsonLd.signRsaSignature2017(activity, keypair.privateKey, `${this.config.url}/users/${user.id}#main-key`);
+		activity = await jsonLd.signRsaSignature2017(activity, key.privateKeyPem, key.keyId);
 
 		return activity;
 	}
diff --git a/packages/backend/src/core/activitypub/ApRequestService.ts b/packages/backend/src/core/activitypub/ApRequestService.ts
index 93ac8ce9a7..0cae91316b 100644
--- a/packages/backend/src/core/activitypub/ApRequestService.ts
+++ b/packages/backend/src/core/activitypub/ApRequestService.ts
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import * as crypto from 'node:crypto';
 import { URL } from 'node:url';
 import { Inject, Injectable } from '@nestjs/common';
+import { genRFC3230DigestHeader, signAsDraftToRequest } from '@misskey-dev/node-http-message-signatures';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import type { MiUser } from '@/models/User.js';
@@ -15,122 +15,61 @@ import { LoggerService } from '@/core/LoggerService.js';
 import { bindThis } from '@/decorators.js';
 import type Logger from '@/logger.js';
 import { validateContentTypeSetAsActivityPub } from '@/core/activitypub/misc/validator.js';
+import type { PrivateKeyWithPem, PrivateKey } from '@misskey-dev/node-http-message-signatures';
 
-type Request = {
-	url: string;
-	method: string;
-	headers: Record<string, string>;
-};
+export async function createSignedPost(args: { level: string; key: PrivateKey; url: string; body: string; digest?: string, additionalHeaders: Record<string, string> }) {
+	const u = new URL(args.url);
+	const request = {
+		url: u.href,
+		method: 'POST',
+		headers: {
+			'Date': new Date().toUTCString(),
+			'Host': u.host,
+			'Content-Type': 'application/activity+json',
+			...args.additionalHeaders,
+		} as Record<string, string>,
+	};
 
-type Signed = {
-	request: Request;
-	signingString: string;
-	signature: string;
-	signatureHeader: string;
-};
+	// TODO: httpMessageSignaturesImplementationLevelによって新規格で通信をするようにする
+	const digestHeader = args.digest ?? await genRFC3230DigestHeader(args.body, 'SHA-256');
+	request.headers['Digest'] = digestHeader;
 
-type PrivateKey = {
-	privateKeyPem: string;
-	keyId: string;
-};
+	const result = await signAsDraftToRequest(
+		request,
+		args.key,
+		['(request-target)', 'date', 'host', 'digest'],
+	);
 
-export class ApRequestCreator {
-	static createSignedPost(args: { key: PrivateKey, url: string, body: string, digest?: string, additionalHeaders: Record<string, string> }): Signed {
-		const u = new URL(args.url);
-		const digestHeader = args.digest ?? this.createDigest(args.body);
+	return {
+		request,
+		...result,
+	};
+}
 
-		const request: Request = {
-			url: u.href,
-			method: 'POST',
-			headers: this.#objectAssignWithLcKey({
-				'Date': new Date().toUTCString(),
-				'Host': u.host,
-				'Content-Type': 'application/activity+json',
-				'Digest': digestHeader,
-			}, args.additionalHeaders),
-		};
+export async function createSignedGet(args: { level: string; key: PrivateKey; url: string; additionalHeaders: Record<string, string> }) {
+	const u = new URL(args.url);
+	const request = {
+		url: u.href,
+		method: 'GET',
+		headers: {
+			'Accept': 'application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+			'Date': new Date().toUTCString(),
+			'Host': new URL(args.url).host,
+			...args.additionalHeaders,
+		} as Record<string, string>,
+	};
 
-		const result = this.#signToRequest(request, args.key, ['(request-target)', 'date', 'host', 'digest']);
+	// TODO: httpMessageSignaturesImplementationLevelによって新規格で通信をするようにする
+	const result = await signAsDraftToRequest(
+		request,
+		args.key,
+		['(request-target)', 'date', 'host', 'accept'],
+	);
 
-		return {
-			request,
-			signingString: result.signingString,
-			signature: result.signature,
-			signatureHeader: result.signatureHeader,
-		};
-	}
-
-	static createDigest(body: string) {
-		return `SHA-256=${crypto.createHash('sha256').update(body).digest('base64')}`;
-	}
-
-	static createSignedGet(args: { key: PrivateKey, url: string, additionalHeaders: Record<string, string> }): Signed {
-		const u = new URL(args.url);
-
-		const request: Request = {
-			url: u.href,
-			method: 'GET',
-			headers: this.#objectAssignWithLcKey({
-				'Accept': 'application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
-				'Date': new Date().toUTCString(),
-				'Host': new URL(args.url).host,
-			}, args.additionalHeaders),
-		};
-
-		const result = this.#signToRequest(request, args.key, ['(request-target)', 'date', 'host', 'accept']);
-
-		return {
-			request,
-			signingString: result.signingString,
-			signature: result.signature,
-			signatureHeader: result.signatureHeader,
-		};
-	}
-
-	static #signToRequest(request: Request, key: PrivateKey, includeHeaders: string[]): Signed {
-		const signingString = this.#genSigningString(request, includeHeaders);
-		const signature = crypto.sign('sha256', Buffer.from(signingString), key.privateKeyPem).toString('base64');
-		const signatureHeader = `keyId="${key.keyId}",algorithm="rsa-sha256",headers="${includeHeaders.join(' ')}",signature="${signature}"`;
-
-		request.headers = this.#objectAssignWithLcKey(request.headers, {
-			Signature: signatureHeader,
-		});
-		// node-fetch will generate this for us. if we keep 'Host', it won't change with redirects!
-		delete request.headers['host'];
-
-		return {
-			request,
-			signingString,
-			signature,
-			signatureHeader,
-		};
-	}
-
-	static #genSigningString(request: Request, includeHeaders: string[]): string {
-		request.headers = this.#lcObjectKey(request.headers);
-
-		const results: string[] = [];
-
-		for (const key of includeHeaders.map(x => x.toLowerCase())) {
-			if (key === '(request-target)') {
-				results.push(`(request-target): ${request.method.toLowerCase()} ${new URL(request.url).pathname}`);
-			} else {
-				results.push(`${key}: ${request.headers[key]}`);
-			}
-		}
-
-		return results.join('\n');
-	}
-
-	static #lcObjectKey(src: Record<string, string>): Record<string, string> {
-		const dst: Record<string, string> = {};
-		for (const key of Object.keys(src).filter(x => x !== '__proto__' && typeof src[x] === 'string')) dst[key.toLowerCase()] = src[key];
-		return dst;
-	}
-
-	static #objectAssignWithLcKey(a: Record<string, string>, b: Record<string, string>): Record<string, string> {
-		return Object.assign(this.#lcObjectKey(a), this.#lcObjectKey(b));
-	}
+	return {
+		request,
+		...result,
+	};
 }
 
 @Injectable()
@@ -150,21 +89,28 @@ export class ApRequestService {
 	}
 
 	@bindThis
-	public async signedPost(user: { id: MiUser['id'] }, url: string, object: unknown, digest?: string): Promise<void> {
+	public async signedPost(user: { id: MiUser['id'] }, url: string, object: unknown, level: string, digest?: string, key?: PrivateKeyWithPem): Promise<void> {
 		const body = typeof object === 'string' ? object : JSON.stringify(object);
-
-		const keypair = await this.userKeypairService.getUserKeypair(user.id);
-
-		const req = ApRequestCreator.createSignedPost({
-			key: {
-				privateKeyPem: keypair.privateKey,
-				keyId: `${this.config.url}/users/${user.id}#main-key`,
-			},
+		const keyFetched = await this.userKeypairService.getLocalUserPrivateKey(key ?? user.id, level);
+		const req = await createSignedPost({
+			level,
+			key: keyFetched,
 			url,
 			body,
-			digest,
 			additionalHeaders: {
+				'User-Agent': this.config.userAgent,
 			},
+			digest,
+		});
+
+		// node-fetch will generate this for us. if we keep 'Host', it won't change with redirects!
+		delete req.request.headers['Host'];
+
+		this.logger.debug('create signed post', {
+			version: 'draft',
+			level,
+			url,
+			keyId: keyFetched.keyId,
 		});
 
 		await this.httpRequestService.send(url, {
@@ -180,19 +126,27 @@ export class ApRequestService {
 	 * @param url URL to fetch
 	 */
 	@bindThis
-	public async signedGet(url: string, user: { id: MiUser['id'] }): Promise<unknown> {
-		const keypair = await this.userKeypairService.getUserKeypair(user.id);
-
-		const req = ApRequestCreator.createSignedGet({
-			key: {
-				privateKeyPem: keypair.privateKey,
-				keyId: `${this.config.url}/users/${user.id}#main-key`,
-			},
+	public async signedGet(url: string, user: { id: MiUser['id'] }, level: string): Promise<unknown> {
+		const key = await this.userKeypairService.getLocalUserPrivateKey(user.id, level);
+		const req = await createSignedGet({
+			level,
+			key,
 			url,
 			additionalHeaders: {
+				'User-Agent': this.config.userAgent,
 			},
 		});
 
+		// node-fetch will generate this for us. if we keep 'Host', it won't change with redirects!
+		delete req.request.headers['Host'];
+
+		this.logger.debug('create signed get', {
+			version: 'draft',
+			level,
+			url,
+			keyId: key.keyId,
+		});
+
 		const res = await this.httpRequestService.send(url, {
 			method: req.request.method,
 			headers: req.request.headers,
diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts
index bb3c40f093..727ff6f956 100644
--- a/packages/backend/src/core/activitypub/ApResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApResolverService.ts
@@ -16,6 +16,7 @@ import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import type Logger from '@/logger.js';
+import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import { isCollectionOrOrderedCollection } from './type.js';
 import { ApDbResolverService } from './ApDbResolverService.js';
 import { ApRendererService } from './ApRendererService.js';
@@ -41,6 +42,7 @@ export class Resolver {
 		private httpRequestService: HttpRequestService,
 		private apRendererService: ApRendererService,
 		private apDbResolverService: ApDbResolverService,
+		private federatedInstanceService: FederatedInstanceService,
 		private loggerService: LoggerService,
 		private recursionLimit = 100,
 	) {
@@ -103,8 +105,10 @@ export class Resolver {
 			this.user = await this.instanceActorService.getInstanceActor();
 		}
 
+		const server = await this.federatedInstanceService.fetch(host);
+
 		const object = (this.user
-			? await this.apRequestService.signedGet(value, this.user) as IObject
+			? await this.apRequestService.signedGet(value, this.user, server.httpMessageSignaturesImplementationLevel) as IObject
 			: await this.httpRequestService.getActivityJson(value)) as IObject;
 
 		if (
@@ -200,6 +204,7 @@ export class ApResolverService {
 		private httpRequestService: HttpRequestService,
 		private apRendererService: ApRendererService,
 		private apDbResolverService: ApDbResolverService,
+		private federatedInstanceService: FederatedInstanceService,
 		private loggerService: LoggerService,
 	) {
 	}
@@ -220,6 +225,7 @@ export class ApResolverService {
 			this.httpRequestService,
 			this.apRendererService,
 			this.apDbResolverService,
+			this.federatedInstanceService,
 			this.loggerService,
 		);
 	}
diff --git a/packages/backend/src/core/activitypub/misc/contexts.ts b/packages/backend/src/core/activitypub/misc/contexts.ts
index feb8c42c56..fc4e3e3bef 100644
--- a/packages/backend/src/core/activitypub/misc/contexts.ts
+++ b/packages/backend/src/core/activitypub/misc/contexts.ts
@@ -134,6 +134,7 @@ const security_v1 = {
 		'privateKey': { '@id': 'sec:privateKey', '@type': '@id' },
 		'privateKeyPem': 'sec:privateKeyPem',
 		'publicKey': { '@id': 'sec:publicKey', '@type': '@id' },
+		'additionalPublicKeys': { '@id': 'sec:publicKey', '@type': '@id' },
 		'publicKeyBase58': 'sec:publicKeyBase58',
 		'publicKeyPem': 'sec:publicKeyPem',
 		'publicKeyWif': 'sec:publicKeyWif',
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 457205e023..c41fc713d5 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -3,9 +3,10 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import { verify } from 'crypto';
 import { Inject, Injectable } from '@nestjs/common';
 import promiseLimit from 'promise-limit';
-import { DataSource } from 'typeorm';
+import { DataSource, In, Not } from 'typeorm';
 import { ModuleRef } from '@nestjs/core';
 import { DI } from '@/di-symbols.js';
 import type { FollowingsRepository, InstancesRepository, UserProfilesRepository, UserPublickeysRepository, UsersRepository } from '@/models/_.js';
@@ -39,6 +40,7 @@ import { MetaService } from '@/core/MetaService.js';
 import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
 import type { AccountMoveService } from '@/core/AccountMoveService.js';
 import { checkHttps } from '@/misc/check-https.js';
+import { REMOTE_USER_CACHE_TTL, REMOTE_USER_MOVE_COOLDOWN } from '@/const.js';
 import { getApId, getApType, getOneApHrefNullable, isActor, isCollection, isCollectionOrOrderedCollection, isPropertyValue } from '../type.js';
 import { extractApHashtags } from './tag.js';
 import type { OnModuleInit } from '@nestjs/common';
@@ -48,7 +50,7 @@ import type { ApResolverService, Resolver } from '../ApResolverService.js';
 import type { ApLoggerService } from '../ApLoggerService.js';
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import type { ApImageService } from './ApImageService.js';
-import type { IActor, IObject } from '../type.js';
+import type { IActor, IKey, IObject } from '../type.js';
 
 const nameLength = 128;
 const summaryLength = 2048;
@@ -185,13 +187,38 @@ export class ApPersonService implements OnModuleInit {
 		}
 
 		if (x.publicKey) {
-			if (typeof x.publicKey.id !== 'string') {
-				throw new Error('invalid Actor: publicKey.id is not a string');
+			const publicKeys = Array.isArray(x.publicKey) ? x.publicKey : [x.publicKey];
+
+			for (const publicKey of publicKeys) {
+				if (typeof publicKey.id !== 'string') {
+					throw new Error('invalid Actor: publicKey.id is not a string');
+				}
+
+				const publicKeyIdHost = this.punyHost(publicKey.id);
+				if (publicKeyIdHost !== expectHost) {
+					throw new Error('invalid Actor: publicKey.id has different host');
+				}
+			}
+		}
+
+		if (x.additionalPublicKeys) {
+			if (!x.publicKey) {
+				throw new Error('invalid Actor: additionalPublicKeys is set but publicKey is not');
 			}
 
-			const publicKeyIdHost = this.punyHost(x.publicKey.id);
-			if (publicKeyIdHost !== expectHost) {
-				throw new Error('invalid Actor: publicKey.id has different host');
+			if (!Array.isArray(x.additionalPublicKeys)) {
+				throw new Error('invalid Actor: additionalPublicKeys is not an array');
+			}
+
+			for (const key of x.additionalPublicKeys) {
+				if (typeof key.id !== 'string') {
+					throw new Error('invalid Actor: additionalPublicKeys.id is not a string');
+				}
+
+				const keyIdHost = this.punyHost(key.id);
+				if (keyIdHost !== expectHost) {
+					throw new Error('invalid Actor: additionalPublicKeys.id has different host');
+				}
 			}
 		}
 
@@ -228,6 +255,33 @@ export class ApPersonService implements OnModuleInit {
 		return null;
 	}
 
+	/**
+	 * uriからUser(Person)をフェッチします。
+	 *
+	 * Misskeyに対象のPersonが登録されていればそれを返し、登録がなければnullを返します。
+	 * また、TTLが0でない場合、TTLを過ぎていた場合はupdatePersonを実行します。
+	 */
+	@bindThis
+	async fetchPersonWithRenewal(uri: string, TTL = REMOTE_USER_CACHE_TTL): Promise<MiLocalUser | MiRemoteUser | null> {
+		const exist = await this.fetchPerson(uri);
+		if (exist == null) return null;
+
+		if (this.userEntityService.isRemoteUser(exist)) {
+			if (TTL === 0 || exist.lastFetchedAt == null || Date.now() - exist.lastFetchedAt.getTime() > TTL) {
+				this.logger.debug('fetchPersonWithRenewal: renew', { uri, TTL, lastFetchedAt: exist.lastFetchedAt });
+				try {
+					await this.updatePerson(exist.uri);
+					return await this.fetchPerson(uri);
+				} catch (err) {
+					this.logger.error('error occurred while renewing user', { err });
+				}
+			}
+			this.logger.debug('fetchPersonWithRenewal: use cache', { uri, TTL, lastFetchedAt: exist.lastFetchedAt });
+		}
+
+		return exist;
+	}
+
 	private async resolveAvatarAndBanner(user: MiRemoteUser, icon: any, image: any): Promise<Partial<Pick<MiRemoteUser, 'avatarId' | 'bannerId' | 'avatarUrl' | 'bannerUrl' | 'avatarBlurhash' | 'bannerBlurhash'>>> {
 		if (user == null) throw new Error('failed to create user: user is null');
 
@@ -363,11 +417,15 @@ export class ApPersonService implements OnModuleInit {
 				}));
 
 				if (person.publicKey) {
-					await transactionalEntityManager.save(new MiUserPublickey({
-						userId: user.id,
-						keyId: person.publicKey.id,
-						keyPem: person.publicKey.publicKeyPem,
-					}));
+					const publicKeys = new Map<string, IKey>();
+					(person.additionalPublicKeys ?? []).forEach(key => publicKeys.set(key.id, key));
+					(Array.isArray(person.publicKey) ? person.publicKey : [person.publicKey]).forEach(key => publicKeys.set(key.id, key));
+
+					await transactionalEntityManager.save(Array.from(publicKeys.values(), key => new MiUserPublickey({
+						keyId: key.id,
+						userId: user!.id,
+						keyPem: key.publicKeyPem,
+					})));
 				}
 			});
 		} catch (e) {
@@ -513,11 +571,29 @@ export class ApPersonService implements OnModuleInit {
 		// Update user
 		await this.usersRepository.update(exist.id, updates);
 
-		if (person.publicKey) {
-			await this.userPublickeysRepository.update({ userId: exist.id }, {
-				keyId: person.publicKey.id,
-				keyPem: person.publicKey.publicKeyPem,
+		try {
+			// Deleteアクティビティ受信時にもここが走ってsaveがuserforeign key制約エラーを吐くことがある
+			// とりあえずtry-catchで囲っておく
+			const publicKeys = new Map<string, IKey>();
+			if (person.publicKey) {
+				(person.additionalPublicKeys ?? []).forEach(key => publicKeys.set(key.id, key));
+				(Array.isArray(person.publicKey) ? person.publicKey : [person.publicKey]).forEach(key => publicKeys.set(key.id, key));
+
+				await this.userPublickeysRepository.save(Array.from(publicKeys.values(), key => ({
+					keyId: key.id,
+					userId: exist.id,
+					keyPem: key.publicKeyPem,
+				})));
+			}
+
+			this.userPublickeysRepository.delete({
+				keyId: Not(In(Array.from(publicKeys.keys()))),
+				userId: exist.id,
+			}).catch(err => {
+				this.logger.error('something happened while deleting remote user public keys:', { userId: exist.id, err });
 			});
+		} catch (err) {
+			this.logger.error('something happened while updating remote user public keys:', { userId: exist.id, err });
 		}
 
 		let _description: string | null = null;
@@ -559,7 +635,7 @@ export class ApPersonService implements OnModuleInit {
 			exist.movedAt == null ||
 			// 以前のmovingから14日以上経過した場合のみ移行処理を許可
 			// （Mastodonのクールダウン期間は30日だが若干緩めに設定しておく）
-			exist.movedAt.getTime() + 1000 * 60 * 60 * 24 * 14 < updated.movedAt.getTime()
+			exist.movedAt.getTime() + REMOTE_USER_MOVE_COOLDOWN < updated.movedAt.getTime()
 		)) {
 			this.logger.info(`Start to process Move of @${updated.username}@${updated.host} (${uri})`);
 			return this.processRemoteMove(updated, movePreventUris)
@@ -582,9 +658,9 @@ export class ApPersonService implements OnModuleInit {
 	 * リモートサーバーからフェッチしてMisskeyに登録しそれを返します。
 	 */
 	@bindThis
-	public async resolvePerson(uri: string, resolver?: Resolver): Promise<MiLocalUser | MiRemoteUser> {
+	public async resolvePerson(uri: string, resolver?: Resolver, withRenewal = false): Promise<MiLocalUser | MiRemoteUser> {
 		//#region このサーバーに既に登録されていたらそれを返す
-		const exist = await this.fetchPerson(uri);
+		const exist = withRenewal ? await this.fetchPersonWithRenewal(uri) : await this.fetchPerson(uri);
 		if (exist) return exist;
 		//#endregion
 
diff --git a/packages/backend/src/core/activitypub/type.ts b/packages/backend/src/core/activitypub/type.ts
index 5b6c6c8ca6..1d55971660 100644
--- a/packages/backend/src/core/activitypub/type.ts
+++ b/packages/backend/src/core/activitypub/type.ts
@@ -55,7 +55,7 @@ export function getOneApId(value: ApObject): string {
 export function getApId(value: string | IObject): string {
 	if (typeof value === 'string') return value;
 	if (typeof value.id === 'string') return value.id;
-	throw new Error('cannot detemine id');
+	throw new Error('cannot determine id');
 }
 
 /**
@@ -169,10 +169,8 @@ export interface IActor extends IObject {
 	discoverable?: boolean;
 	inbox: string;
 	sharedInbox?: string;	// 後方互換性のため
-	publicKey?: {
-		id: string;
-		publicKeyPem: string;
-	};
+	publicKey?: IKey | IKey[];
+	additionalPublicKeys?: IKey[];
 	followers?: string | ICollection | IOrderedCollection;
 	following?: string | ICollection | IOrderedCollection;
 	featured?: string | IOrderedCollection;
@@ -236,8 +234,9 @@ export const isEmoji = (object: IObject): object is IApEmoji =>
 
 export interface IKey extends IObject {
 	type: 'Key';
+	id: string;
 	owner: string;
-	publicKeyPem: string | Buffer;
+	publicKeyPem: string;
 }
 
 export interface IApDocument extends IObject {
diff --git a/packages/backend/src/core/entities/InstanceEntityService.ts b/packages/backend/src/core/entities/InstanceEntityService.ts
index 9117b13914..fd0f55c6ab 100644
--- a/packages/backend/src/core/entities/InstanceEntityService.ts
+++ b/packages/backend/src/core/entities/InstanceEntityService.ts
@@ -56,6 +56,7 @@ export class InstanceEntityService {
 			infoUpdatedAt: instance.infoUpdatedAt ? instance.infoUpdatedAt.toISOString() : null,
 			latestRequestReceivedAt: instance.latestRequestReceivedAt ? instance.latestRequestReceivedAt.toISOString() : null,
 			moderationNote: iAmModerator ? instance.moderationNote : null,
+			httpMessageSignaturesImplementationLevel: instance.httpMessageSignaturesImplementationLevel,
 		};
 	}
 
diff --git a/packages/backend/src/misc/cache.ts b/packages/backend/src/misc/cache.ts
index bba64a06ef..f498c110bf 100644
--- a/packages/backend/src/misc/cache.ts
+++ b/packages/backend/src/misc/cache.ts
@@ -195,6 +195,9 @@ export class MemoryKVCache<T> {
 	private lifetime: number;
 	private gcIntervalHandle: NodeJS.Timeout;
 
+	/**
+	 * @param lifetime キャッシュの生存期間 (ms)
+	 */
 	constructor(lifetime: MemoryKVCache<never>['lifetime']) {
 		this.cache = new Map();
 		this.lifetime = lifetime;
diff --git a/packages/backend/src/misc/gen-key-pair.ts b/packages/backend/src/misc/gen-key-pair.ts
index 02a303dc0a..0b033ec33e 100644
--- a/packages/backend/src/misc/gen-key-pair.ts
+++ b/packages/backend/src/misc/gen-key-pair.ts
@@ -3,39 +3,14 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import * as crypto from 'node:crypto';
-import * as util from 'node:util';
+import { genEd25519KeyPair, genRsaKeyPair } from '@misskey-dev/node-http-message-signatures';
 
-const generateKeyPair = util.promisify(crypto.generateKeyPair);
-
-export async function genRsaKeyPair(modulusLength = 2048) {
-	return await generateKeyPair('rsa', {
-		modulusLength,
-		publicKeyEncoding: {
-			type: 'spki',
-			format: 'pem',
-		},
-		privateKeyEncoding: {
-			type: 'pkcs8',
-			format: 'pem',
-			cipher: undefined,
-			passphrase: undefined,
-		},
-	});
-}
-
-export async function genEcKeyPair(namedCurve: 'prime256v1' | 'secp384r1' | 'secp521r1' | 'curve25519' = 'prime256v1') {
-	return await generateKeyPair('ec', {
-		namedCurve,
-		publicKeyEncoding: {
-			type: 'spki',
-			format: 'pem',
-		},
-		privateKeyEncoding: {
-			type: 'pkcs8',
-			format: 'pem',
-			cipher: undefined,
-			passphrase: undefined,
-		},
-	});
+export async function genRSAAndEd25519KeyPair(rsaModulusLength = 4096) {
+	const [rsa, ed25519] = await Promise.all([genRsaKeyPair(rsaModulusLength), genEd25519KeyPair()]);
+	return {
+		publicKey: rsa.publicKey,
+		privateKey: rsa.privateKey,
+		ed25519PublicKey: ed25519.publicKey,
+		ed25519PrivateKey: ed25519.privateKey,
+	};
 }
diff --git a/packages/backend/src/models/Instance.ts b/packages/backend/src/models/Instance.ts
index 17cd5c6665..f2f2831cf1 100644
--- a/packages/backend/src/models/Instance.ts
+++ b/packages/backend/src/models/Instance.ts
@@ -158,4 +158,9 @@ export class MiInstance {
 		length: 16384, default: '',
 	})
 	public moderationNote: string;
+
+	@Column('varchar', {
+		length: 16, default: '00', nullable: false,
+	})
+	public httpMessageSignaturesImplementationLevel: string;
 }
diff --git a/packages/backend/src/models/UserKeypair.ts b/packages/backend/src/models/UserKeypair.ts
index f5252d126c..afa74ef11a 100644
--- a/packages/backend/src/models/UserKeypair.ts
+++ b/packages/backend/src/models/UserKeypair.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { PrimaryColumn, Entity, JoinColumn, Column, OneToOne } from 'typeorm';
+import { PrimaryColumn, Entity, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { id } from './util/id.js';
 import { MiUser } from './User.js';
 
@@ -12,22 +12,42 @@ export class MiUserKeypair {
 	@PrimaryColumn(id())
 	public userId: MiUser['id'];
 
-	@OneToOne(type => MiUser, {
+	@ManyToOne(type => MiUser, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
 	public user: MiUser | null;
 
+	/**
+	 * RSA public key
+	 */
 	@Column('varchar', {
 		length: 4096,
 	})
 	public publicKey: string;
 
+	/**
+	 * RSA private key
+	 */
 	@Column('varchar', {
 		length: 4096,
 	})
 	public privateKey: string;
 
+	@Column('varchar', {
+		length: 128,
+		nullable: true,
+		default: null,
+	})
+	public ed25519PublicKey: string | null;
+
+	@Column('varchar', {
+		length: 128,
+		nullable: true,
+		default: null,
+	})
+	public ed25519PrivateKey: string | null;
+
 	constructor(data: Partial<MiUserKeypair>) {
 		if (data == null) return;
 
diff --git a/packages/backend/src/models/UserPublickey.ts b/packages/backend/src/models/UserPublickey.ts
index 6bcd785304..0ecff2bcbe 100644
--- a/packages/backend/src/models/UserPublickey.ts
+++ b/packages/backend/src/models/UserPublickey.ts
@@ -9,7 +9,13 @@ import { MiUser } from './User.js';
 
 @Entity('user_publickey')
 export class MiUserPublickey {
-	@PrimaryColumn(id())
+	@PrimaryColumn('varchar', {
+		length: 256,
+	})
+	public keyId: string;
+
+	@Index()
+	@Column(id())
 	public userId: MiUser['id'];
 
 	@OneToOne(type => MiUser, {
@@ -18,12 +24,6 @@ export class MiUserPublickey {
 	@JoinColumn()
 	public user: MiUser | null;
 
-	@Index({ unique: true })
-	@Column('varchar', {
-		length: 256,
-	})
-	public keyId: string;
-
 	@Column('varchar', {
 		length: 4096,
 	})
diff --git a/packages/backend/src/models/json-schema/federation-instance.ts b/packages/backend/src/models/json-schema/federation-instance.ts
index ed40d405c6..c02e7f557a 100644
--- a/packages/backend/src/models/json-schema/federation-instance.ts
+++ b/packages/backend/src/models/json-schema/federation-instance.ts
@@ -116,5 +116,9 @@ export const packedFederationInstanceSchema = {
 			type: 'string',
 			optional: true, nullable: true,
 		},
+		httpMessageSignaturesImplementationLevel: {
+			type: 'string',
+			optional: false, nullable: false,
+		},
 	},
 } as const;
diff --git a/packages/backend/src/queue/QueueProcessorService.ts b/packages/backend/src/queue/QueueProcessorService.ts
index 7bd74f3210..169b22c3f5 100644
--- a/packages/backend/src/queue/QueueProcessorService.ts
+++ b/packages/backend/src/queue/QueueProcessorService.ts
@@ -250,9 +250,9 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			}, {
 				...baseQueueOptions(this.config, QUEUE.DELIVER),
 				autorun: false,
-				concurrency: this.config.deliverJobConcurrency ?? 128,
+				concurrency: this.config.deliverJobConcurrency ?? 16,
 				limiter: {
-					max: this.config.deliverJobPerSec ?? 128,
+					max: this.config.deliverJobPerSec ?? 1024,
 					duration: 1000,
 				},
 				settings: {
@@ -290,9 +290,9 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			}, {
 				...baseQueueOptions(this.config, QUEUE.INBOX),
 				autorun: false,
-				concurrency: this.config.inboxJobConcurrency ?? 16,
+				concurrency: this.config.inboxJobConcurrency ?? 4,
 				limiter: {
-					max: this.config.inboxJobPerSec ?? 32,
+					max: this.config.inboxJobPerSec ?? 64,
 					duration: 1000,
 				},
 				settings: {
diff --git a/packages/backend/src/queue/processors/DeliverProcessorService.ts b/packages/backend/src/queue/processors/DeliverProcessorService.ts
index d665945861..3bd9187e8b 100644
--- a/packages/backend/src/queue/processors/DeliverProcessorService.ts
+++ b/packages/backend/src/queue/processors/DeliverProcessorService.ts
@@ -73,25 +73,33 @@ export class DeliverProcessorService {
 		}
 
 		try {
-			await this.apRequestService.signedPost(job.data.user, job.data.to, job.data.content, job.data.digest);
+			const _server = await this.federatedInstanceService.fetch(host);
+			await this.fetchInstanceMetadataService.fetchInstanceMetadata(_server).then(() => {});
+			const server = await this.federatedInstanceService.fetch(host);
+
+			await this.apRequestService.signedPost(
+				job.data.user,
+				job.data.to,
+				job.data.content,
+				server.httpMessageSignaturesImplementationLevel,
+				job.data.digest,
+				job.data.privateKey,
+			);
 
 			// Update stats
-			this.federatedInstanceService.fetch(host).then(i => {
-				if (i.isNotResponding) {
-					this.federatedInstanceService.update(i.id, {
-						isNotResponding: false,
-						notRespondingSince: null,
-					});
-				}
+			if (server.isNotResponding) {
+				this.federatedInstanceService.update(server.id, {
+					isNotResponding: false,
+					notRespondingSince: null,
+				});
+			}
 
-				this.fetchInstanceMetadataService.fetchInstanceMetadata(i);
-				this.apRequestChart.deliverSucc();
-				this.federationChart.deliverd(i.host, true);
+			this.apRequestChart.deliverSucc();
+			this.federationChart.deliverd(server.host, true);
 
-				if (meta.enableChartsForFederatedInstances) {
-					this.instanceChart.requestSent(i.host, true);
-				}
-			});
+			if (meta.enableChartsForFederatedInstances) {
+				this.instanceChart.requestSent(server.host, true);
+			}
 
 			return 'Success';
 		} catch (res) {
diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts
index fa7009f8f5..935c623df1 100644
--- a/packages/backend/src/queue/processors/InboxProcessorService.ts
+++ b/packages/backend/src/queue/processors/InboxProcessorService.ts
@@ -5,8 +5,8 @@
 
 import { URL } from 'node:url';
 import { Injectable } from '@nestjs/common';
-import httpSignature from '@peertube/http-signature';
 import * as Bull from 'bullmq';
+import { verifyDraftSignature } from '@misskey-dev/node-http-message-signatures';
 import type Logger from '@/logger.js';
 import { MetaService } from '@/core/MetaService.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
@@ -20,6 +20,7 @@ import type { MiRemoteUser } from '@/models/User.js';
 import type { MiUserPublickey } from '@/models/UserPublickey.js';
 import { ApDbResolverService } from '@/core/activitypub/ApDbResolverService.js';
 import { StatusError } from '@/misc/status-error.js';
+import * as Acct from '@/misc/acct.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
 import { JsonLdService } from '@/core/activitypub/JsonLdService.js';
@@ -52,8 +53,15 @@ export class InboxProcessorService {
 
 	@bindThis
 	public async process(job: Bull.Job<InboxJobData>): Promise<string> {
-		const signature = job.data.signature;	// HTTP-signature
+		const signature = job.data.signature ?
+			'version' in job.data.signature ? job.data.signature.value : job.data.signature
+			: null;
+		if (Array.isArray(signature)) {
+			// RFC 9401はsignatureが配列になるが、とりあえずエラーにする
+			throw new Error('signature is array');
+		}
 		let activity = job.data.activity;
+		let actorUri = getApId(activity.actor);
 
 		//#region Log
 		const info = Object.assign({}, activity);
@@ -61,7 +69,7 @@ export class InboxProcessorService {
 		this.logger.debug(JSON.stringify(info, null, 2));
 		//#endregion
 
-		const host = this.utilityService.toPuny(new URL(signature.keyId).hostname);
+		const host = this.utilityService.toPuny(new URL(actorUri).hostname);
 
 		// ブロックしてたら中断
 		const meta = await this.metaService.fetch();
@@ -69,69 +77,76 @@ export class InboxProcessorService {
 			return `Blocked request: ${host}`;
 		}
 
-		const keyIdLower = signature.keyId.toLowerCase();
-		if (keyIdLower.startsWith('acct:')) {
-			return `Old keyId is no longer supported. ${keyIdLower}`;
-		}
-
 		// HTTP-Signature keyIdを元にDBから取得
-		let authUser: {
-			user: MiRemoteUser;
-			key: MiUserPublickey | null;
-		} | null = await this.apDbResolverService.getAuthUserFromKeyId(signature.keyId);
+		let authUser: Awaited<ReturnType<typeof this.apDbResolverService.getAuthUserFromApId>> = null;
+		let httpSignatureIsValid = null as boolean | null;
 
-		// keyIdでわからなければ、activity.actorを元にDBから取得 || activity.actorを元にリモートから取得
-		if (authUser == null) {
-			try {
-				authUser = await this.apDbResolverService.getAuthUserFromApId(getApId(activity.actor));
-			} catch (err) {
-				// 対象が4xxならスキップ
-				if (err instanceof StatusError) {
-					if (!err.isRetryable) {
-						throw new Bull.UnrecoverableError(`skip: Ignored deleted actors on both ends ${activity.actor} - ${err.statusCode}`);
-					}
-					throw new Error(`Error in actor ${activity.actor} - ${err.statusCode}`);
+		try {
+			authUser = await this.apDbResolverService.getAuthUserFromApId(actorUri, signature?.keyId);
+		} catch (err) {
+			// 対象が4xxならスキップ
+			if (err instanceof StatusError) {
+				if (!err.isRetryable) {
+					throw new Bull.UnrecoverableError(`skip: Ignored deleted actors on both ends ${activity.actor} - ${err.statusCode}`);
 				}
+				throw new Error(`Error in actor ${activity.actor} - ${err.statusCode}`);
 			}
 		}
 
-		// それでもわからなければ終了
-		if (authUser == null) {
+		// authUser.userがnullならスキップ
+		if (authUser != null && authUser.user == null) {
 			throw new Bull.UnrecoverableError('skip: failed to resolve user');
 		}
 
-		// publicKey がなくても終了
-		if (authUser.key == null) {
-			throw new Bull.UnrecoverableError('skip: failed to resolve user publicKey');
+		if (signature != null && authUser != null) {
+			if (signature.keyId.toLowerCase().startsWith('acct:')) {
+				this.logger.warn(`Old keyId is no longer supported. lowerKeyId=${signature.keyId.toLowerCase()}`);
+			} else if (authUser.key != null) {
+				// keyがなかったらLD Signatureで検証するべき
+				// HTTP-Signatureの検証
+				const errorLogger = (ms: any) => this.logger.error(ms);
+				httpSignatureIsValid = await verifyDraftSignature(signature, authUser.key.keyPem, errorLogger);
+				this.logger.debug('Inbox message validation: ', {
+					userId: authUser.user.id,
+					userAcct: Acct.toString(authUser.user),
+					parsedKeyId: signature.keyId,
+					foundKeyId: authUser.key.keyId,
+					httpSignatureValid: httpSignatureIsValid,
+				});
+			}
 		}
 
-		// HTTP-Signatureの検証
-		const httpSignatureValidated = httpSignature.verifySignature(signature, authUser.key.keyPem);
-
-		// また、signatureのsignerは、activity.actorと一致する必要がある
-		if (!httpSignatureValidated || authUser.user.uri !== activity.actor) {
+		if (
+			authUser == null ||
+			httpSignatureIsValid !== true ||
+			authUser.user.uri !== actorUri // 一応チェック
+		) {
 			// 一致しなくても、でもLD-Signatureがありそうならそっちも見る
 			const ldSignature = activity.signature;
-			if (ldSignature) {
+
+			if (ldSignature && ldSignature.creator) {
 				if (ldSignature.type !== 'RsaSignature2017') {
 					throw new Bull.UnrecoverableError(`skip: unsupported LD-signature type ${ldSignature.type}`);
 				}
 
-				// ldSignature.creator: https://example.oom/users/user#main-key
-				// みたいになっててUserを引っ張れば公開キーも入ることを期待する
-				if (ldSignature.creator) {
-					const candicate = ldSignature.creator.replace(/#.*/, '');
-					await this.apPersonService.resolvePerson(candicate).catch(() => null);
+				if (ldSignature.creator.toLowerCase().startsWith('acct:')) {
+					throw new Bull.UnrecoverableError(`old key not supported ${ldSignature.creator}`);
 				}
 
-				// keyIdからLD-Signatureのユーザーを取得
-				authUser = await this.apDbResolverService.getAuthUserFromKeyId(ldSignature.creator);
+				authUser = await this.apDbResolverService.getAuthUserFromApId(actorUri, ldSignature.creator);
+
 				if (authUser == null) {
-					throw new Bull.UnrecoverableError('skip: LD-Signatureのユーザーが取得できませんでした');
+					throw new Bull.UnrecoverableError(`skip: LD-Signatureのactorとcreatorが一致しませんでした uri=${actorUri} creator=${ldSignature.creator}`);
+				}
+				if (authUser.user == null) {
+					throw new Bull.UnrecoverableError(`skip: LD-Signatureのユーザーが取得できませんでした uri=${actorUri} creator=${ldSignature.creator}`);
+				}
+				// 一応actorチェック
+				if (authUser.user.uri !== actorUri) {
+					throw new Bull.UnrecoverableError(`skip: LD-Signature user(${authUser.user.uri}) !== activity.actor(${actorUri})`);
 				}
-
 				if (authUser.key == null) {
-					throw new Bull.UnrecoverableError('skip: LD-SignatureのユーザーはpublicKeyを持っていませんでした');
+					throw new Bull.UnrecoverableError(`skip: LD-SignatureのユーザーはpublicKeyを持っていませんでした uri=${actorUri} creator=${ldSignature.creator}`);
 				}
 
 				const jsonLd = this.jsonLdService.use();
@@ -142,13 +157,27 @@ export class InboxProcessorService {
 					throw new Bull.UnrecoverableError('skip: LD-Signatureの検証に失敗しました');
 				}
 
+				// ブロックしてたら中断
+				const ldHost = this.utilityService.extractDbHost(authUser.user.uri);
+				if (this.utilityService.isBlockedHost(meta.blockedHosts, ldHost)) {
+					throw new Bull.UnrecoverableError(`Blocked request: ${ldHost}`);
+				}
+
 				// アクティビティを正規化
+				// GHSA-2vxv-pv3m-3wvj
 				delete activity.signature;
 				try {
 					activity = await jsonLd.compact(activity) as IActivity;
 				} catch (e) {
 					throw new Bull.UnrecoverableError(`skip: failed to compact activity: ${e}`);
 				}
+
+				// actorが正規化前後で一致しているか確認
+				actorUri = getApId(activity.actor);
+				if (authUser.user.uri !== actorUri) {
+					throw new Bull.UnrecoverableError(`skip: LD-Signature user(${authUser.user.uri}) !== activity(after normalization).actor(${actorUri})`);
+				}
+
 				// TODO: 元のアクティビティと非互換な形に正規化される場合は転送をスキップする
 				// https://github.com/mastodon/mastodon/blob/664b0ca/app/services/activitypub/process_collection_service.rb#L24-L29
 				activity.signature = ldSignature;
@@ -158,19 +187,8 @@ export class InboxProcessorService {
 				delete compactedInfo['@context'];
 				this.logger.debug(`compacted: ${JSON.stringify(compactedInfo, null, 2)}`);
 				//#endregion
-
-				// もう一度actorチェック
-				if (authUser.user.uri !== activity.actor) {
-					throw new Bull.UnrecoverableError(`skip: LD-Signature user(${authUser.user.uri}) !== activity.actor(${activity.actor})`);
-				}
-
-				// ブロックしてたら中断
-				const ldHost = this.utilityService.extractDbHost(authUser.user.uri);
-				if (this.utilityService.isBlockedHost(meta.blockedHosts, ldHost)) {
-					throw new Bull.UnrecoverableError(`Blocked request: ${ldHost}`);
-				}
 			} else {
-				throw new Bull.UnrecoverableError(`skip: http-signature verification failed and no LD-Signature. keyId=${signature.keyId}`);
+				throw new Bull.UnrecoverableError(`skip: http-signature verification failed and no LD-Signature. http_signature_keyId=${signature?.keyId}`);
 			}
 		}
 
diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts
index a4077a0547..f2466f2e3d 100644
--- a/packages/backend/src/queue/types.ts
+++ b/packages/backend/src/queue/types.ts
@@ -9,7 +9,24 @@ import type { MiNote } from '@/models/Note.js';
 import type { MiUser } from '@/models/User.js';
 import type { MiWebhook } from '@/models/Webhook.js';
 import type { IActivity } from '@/core/activitypub/type.js';
-import type httpSignature from '@peertube/http-signature';
+import type { ParsedSignature, PrivateKeyWithPem } from '@misskey-dev/node-http-message-signatures';
+
+/**
+ * @peertube/http-signature 時代の古いデータにも対応しておく
+ * TODO: 2026年ぐらいには消す
+ */
+export interface OldParsedSignature {
+	scheme: 'Signature';
+	params: {
+		keyId: string;
+		algorithm: string;
+		headers: string[];
+		signature: string;
+	};
+	signingString: string;
+	algorithm: string;
+	keyId: string;
+}
 
 export type DeliverJobData = {
 	/** Actor */
@@ -22,11 +39,13 @@ export type DeliverJobData = {
 	to: string;
 	/** whether it is sharedInbox */
 	isSharedInbox: boolean;
+	/** force to use main (rsa) key */
+	privateKey?: PrivateKeyWithPem;
 };
 
 export type InboxJobData = {
 	activity: IActivity;
-	signature: httpSignature.IParsedSignature;
+	signature: ParsedSignature | OldParsedSignature | null;
 };
 
 export type RelationshipJobData = {
diff --git a/packages/backend/src/server/ActivityPubServerService.ts b/packages/backend/src/server/ActivityPubServerService.ts
index 3255d64621..753eaad047 100644
--- a/packages/backend/src/server/ActivityPubServerService.ts
+++ b/packages/backend/src/server/ActivityPubServerService.ts
@@ -3,11 +3,10 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import * as crypto from 'node:crypto';
 import { IncomingMessage } from 'node:http';
 import { Inject, Injectable } from '@nestjs/common';
 import fastifyAccepts from '@fastify/accepts';
-import httpSignature from '@peertube/http-signature';
+import { verifyDigestHeader, parseRequestSignature } from '@misskey-dev/node-http-message-signatures';
 import { Brackets, In, IsNull, LessThan, Not } from 'typeorm';
 import accepts from 'accepts';
 import vary from 'vary';
@@ -31,12 +30,17 @@ import { IActivity } from '@/core/activitypub/type.js';
 import { isQuote, isRenote } from '@/misc/is-renote.js';
 import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions, FastifyBodyParser } from 'fastify';
 import type { FindOptionsWhere } from 'typeorm';
+import { LoggerService } from '@/core/LoggerService.js';
+import Logger from '@/logger.js';
 
 const ACTIVITY_JSON = 'application/activity+json; charset=utf-8';
 const LD_JSON = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"; charset=utf-8';
 
 @Injectable()
 export class ActivityPubServerService {
+	private logger: Logger;
+	private inboxLogger: Logger;
+
 	constructor(
 		@Inject(DI.config)
 		private config: Config,
@@ -71,8 +75,11 @@ export class ActivityPubServerService {
 		private queueService: QueueService,
 		private userKeypairService: UserKeypairService,
 		private queryService: QueryService,
+		private loggerService: LoggerService,
 	) {
 		//this.createServer = this.createServer.bind(this);
+		this.logger = this.loggerService.getLogger('server-ap', 'gray');
+		this.inboxLogger = this.logger.createSubLogger('inbox', 'gray');
 	}
 
 	@bindThis
@@ -100,70 +107,44 @@ export class ActivityPubServerService {
 	}
 
 	@bindThis
-	private inbox(request: FastifyRequest, reply: FastifyReply) {
-		let signature;
+	private async inbox(request: FastifyRequest, reply: FastifyReply) {
+		if (request.body == null) {
+			this.inboxLogger.warn('request body is empty');
+			reply.code(400);
+			return;
+		}
+
+		let signature: ReturnType<typeof parseRequestSignature>;
+
+		const verifyDigest = await verifyDigestHeader(request.raw, request.rawBody || '', true);
+		if (verifyDigest !== true) {
+			this.inboxLogger.warn('digest verification failed');
+			reply.code(401);
+			return;
+		}
 
 		try {
-			signature = httpSignature.parseRequest(request.raw, { 'headers': [] });
-		} catch (e) {
+			signature = parseRequestSignature(request.raw, {
+				requiredInputs: {
+					draft: ['(request-target)', 'digest', 'host', 'date'],
+				},
+			});
+		} catch (err) {
+			this.inboxLogger.warn('signature header parsing failed', { err });
+
+			if (typeof request.body === 'object' && 'signature' in request.body) {
+				// LD SignatureがあればOK
+				this.queueService.inbox(request.body as IActivity, null);
+				reply.code(202);
+				return;
+			}
+
+			this.inboxLogger.warn('signature header parsing failed and LD signature not found');
 			reply.code(401);
 			return;
 		}
 
-		if (signature.params.headers.indexOf('host') === -1
-			|| request.headers.host !== this.config.host) {
-			// Host not specified or not match.
-			reply.code(401);
-			return;
-		}
-
-		if (signature.params.headers.indexOf('digest') === -1) {
-			// Digest not found.
-			reply.code(401);
-		} else {
-			const digest = request.headers.digest;
-
-			if (typeof digest !== 'string') {
-				// Huh?
-				reply.code(401);
-				return;
-			}
-
-			const re = /^([a-zA-Z0-9\-]+)=(.+)$/;
-			const match = digest.match(re);
-
-			if (match == null) {
-				// Invalid digest
-				reply.code(401);
-				return;
-			}
-
-			const algo = match[1].toUpperCase();
-			const digestValue = match[2];
-
-			if (algo !== 'SHA-256') {
-				// Unsupported digest algorithm
-				reply.code(401);
-				return;
-			}
-
-			if (request.rawBody == null) {
-				// Bad request
-				reply.code(400);
-				return;
-			}
-
-			const hash = crypto.createHash('sha256').update(request.rawBody).digest('base64');
-
-			if (hash !== digestValue) {
-				// Invalid digest
-				reply.code(401);
-				return;
-			}
-		}
-
 		this.queueService.inbox(request.body as IActivity, signature);
-
 		reply.code(202);
 	}
 
@@ -640,7 +621,7 @@ export class ActivityPubServerService {
 			if (this.userEntityService.isLocalUser(user)) {
 				reply.header('Cache-Control', 'public, max-age=180');
 				this.setResponseType(request, reply);
-				return (this.apRendererService.addContext(this.apRendererService.renderKey(user, keypair)));
+				return (this.apRendererService.addContext(this.apRendererService.renderKey(user, keypair.publicKey)));
 			} else {
 				reply.code(400);
 				return;
diff --git a/packages/backend/src/server/NodeinfoServerService.ts b/packages/backend/src/server/NodeinfoServerService.ts
index cc18997fdc..c0f8084768 100644
--- a/packages/backend/src/server/NodeinfoServerService.ts
+++ b/packages/backend/src/server/NodeinfoServerService.ts
@@ -94,6 +94,13 @@ export class NodeinfoServerService {
 					localComments: 0,
 				},
 				metadata: {
+					/**
+					 * '00': Draft, RSA only
+					 * '01': Draft, Ed25519 suported
+					 * '11': RFC 9421, Ed25519 supported
+					 */
+					httpMessageSignaturesImplementationLevel: '01',
+
 					nodeName: meta.name,
 					nodeDescription: meta.description,
 					nodeAdmins: [{
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts b/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts
index 305ae1af1d..bfe230da8d 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts
@@ -56,7 +56,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const res = [] as [string, number][];
 
 			for (const job of jobs) {
-				const host = new URL(job.data.signature.keyId).host;
+				const signature = job.data.signature ? 'version' in job.data.signature ? job.data.signature.value : job.data.signature : null;
+				const host = signature ? Array.isArray(signature) ? 'TODO' : new URL(signature.keyId).host : new URL(job.data.activity.actor).host;
 				if (res.find(x => x[0] === host)) {
 					res.find(x => x[0] === host)![1]++;
 				} else {
diff --git a/packages/backend/test/e2e/timelines.ts b/packages/backend/test/e2e/timelines.ts
index 540b866b28..fce1eacf00 100644
--- a/packages/backend/test/e2e/timelines.ts
+++ b/packages/backend/test/e2e/timelines.ts
@@ -378,7 +378,7 @@ describe('Timelines', () => {
 			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
 			assert.strictEqual(res.body.some(note => note.id === carolNote1.id), false);
 			assert.strictEqual(res.body.some(note => note.id === carolNote2.id), false);
-		}, 1000 * 10);
+		});
 
 		test.concurrent('フォローしているユーザーのチャンネル投稿が含まれない', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
@@ -672,7 +672,7 @@ describe('Timelines', () => {
 
 			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), false);
 			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
-		}, 1000 * 10);
+		});
 	});
 
 	describe('Social TL', () => {
@@ -812,7 +812,7 @@ describe('Timelines', () => {
 
 			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), false);
 			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
-		}, 1000 * 10);
+		});
 	});
 
 	describe('User List TL', () => {
@@ -1025,7 +1025,7 @@ describe('Timelines', () => {
 
 			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), false);
 			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
-		}, 1000 * 10);
+		});
 
 		test.concurrent('リスインしているユーザーの自身宛ての visibility: specified なノートが含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
@@ -1184,7 +1184,7 @@ describe('Timelines', () => {
 
 			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), false);
 			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
-		}, 1000 * 10);
+		});
 
 		test.concurrent('[withChannelNotes: true] チャンネル投稿が含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
diff --git a/packages/backend/test/misc/mock-resolver.ts b/packages/backend/test/misc/mock-resolver.ts
index 3c7e796700..485506ee64 100644
--- a/packages/backend/test/misc/mock-resolver.ts
+++ b/packages/backend/test/misc/mock-resolver.ts
@@ -14,6 +14,7 @@ import type { InstanceActorService } from '@/core/InstanceActorService.js';
 import type { LoggerService } from '@/core/LoggerService.js';
 import type { MetaService } from '@/core/MetaService.js';
 import type { UtilityService } from '@/core/UtilityService.js';
+import type { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import { bindThis } from '@/decorators.js';
 import type {
 	FollowRequestsRepository,
@@ -47,6 +48,7 @@ export class MockResolver extends Resolver {
 			{} as HttpRequestService,
 			{} as ApRendererService,
 			{} as ApDbResolverService,
+			{} as FederatedInstanceService,
 			loggerService,
 		);
 	}
diff --git a/packages/backend/test/unit/FetchInstanceMetadataService.ts b/packages/backend/test/unit/FetchInstanceMetadataService.ts
index bf8f3ab0e3..2e66b81fcd 100644
--- a/packages/backend/test/unit/FetchInstanceMetadataService.ts
+++ b/packages/backend/test/unit/FetchInstanceMetadataService.ts
@@ -75,62 +75,61 @@ describe('FetchInstanceMetadataService', () => {
 	test('Lock and update', async () => {
 		redisClient.set = mockRedis();
 		const now = Date.now();
-		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: { getTime: () => { return now - 10 * 1000 * 60 * 60 * 24; } } } as any);
+		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: new Date(now - 10 * 1000 * 60 * 60 * 24) } as any);
 		httpRequestService.getJson.mockImplementation(() => { throw Error(); });
 		const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
 		const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
 
 		await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' } as any);
+		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(1);
 		expect(tryLockSpy).toHaveBeenCalledTimes(1);
 		expect(unlockSpy).toHaveBeenCalledTimes(1);
-		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(1);
 		expect(httpRequestService.getJson).toHaveBeenCalled();
 	});
 
-	test('Lock and don\'t update', async () => {
+	test('Don\'t lock and update if recently updated', async () => {
 		redisClient.set = mockRedis();
-		const now = Date.now();
-		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: { getTime: () => now } } as any);
+		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: new Date() } as any);
 		httpRequestService.getJson.mockImplementation(() => { throw Error(); });
 		const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
 		const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
 
 		await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' } as any);
-		expect(tryLockSpy).toHaveBeenCalledTimes(1);
-		expect(unlockSpy).toHaveBeenCalledTimes(1);
 		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(1);
+		expect(tryLockSpy).toHaveBeenCalledTimes(0);
+		expect(unlockSpy).toHaveBeenCalledTimes(0);
 		expect(httpRequestService.getJson).toHaveBeenCalledTimes(0);
 	});
 
 	test('Do nothing when lock not acquired', async () => {
 		redisClient.set = mockRedis();
 		const now = Date.now();
-		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: { getTime: () => now - 10 * 1000 * 60 * 60 * 24 } } as any);
+		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: new Date(now - 10 * 1000 * 60 * 60 * 24) } as any);
 		httpRequestService.getJson.mockImplementation(() => { throw Error(); });
 		await fetchInstanceMetadataService.tryLock('example.com');
 		const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
 		const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
 
 		await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' } as any);
+		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(1);
 		expect(tryLockSpy).toHaveBeenCalledTimes(1);
 		expect(unlockSpy).toHaveBeenCalledTimes(0);
-		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(0);
 		expect(httpRequestService.getJson).toHaveBeenCalledTimes(0);
 	});
 
-	test('Do when lock not acquired but forced', async () => {
+	test('Do when forced', async () => {
 		redisClient.set = mockRedis();
 		const now = Date.now();
-		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: { getTime: () => now - 10 * 1000 * 60 * 60 * 24 } } as any);
+		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: new Date(now - 10 * 1000 * 60 * 60 * 24) } as any);
 		httpRequestService.getJson.mockImplementation(() => { throw Error(); });
 		await fetchInstanceMetadataService.tryLock('example.com');
 		const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
 		const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
 
 		await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' } as any, true);
+		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(0);
 		expect(tryLockSpy).toHaveBeenCalledTimes(0);
 		expect(unlockSpy).toHaveBeenCalledTimes(1);
-		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(0);
 		expect(httpRequestService.getJson).toHaveBeenCalled();
 	});
 });
diff --git a/packages/backend/test/unit/ap-request.ts b/packages/backend/test/unit/ap-request.ts
index d3d39240dc..50894c8b81 100644
--- a/packages/backend/test/unit/ap-request.ts
+++ b/packages/backend/test/unit/ap-request.ts
@@ -4,10 +4,8 @@
  */
 
 import * as assert from 'assert';
-import httpSignature from '@peertube/http-signature';
-
-import { genRsaKeyPair } from '@/misc/gen-key-pair.js';
-import { ApRequestCreator } from '@/core/activitypub/ApRequestService.js';
+import { verifyDraftSignature, parseRequestSignature, genEd25519KeyPair, genRsaKeyPair, importPrivateKey } from '@misskey-dev/node-http-message-signatures';
+import { createSignedGet, createSignedPost } from '@/core/activitypub/ApRequestService.js';
 
 export const buildParsedSignature = (signingString: string, signature: string, algorithm: string) => {
 	return {
@@ -24,38 +22,68 @@ export const buildParsedSignature = (signingString: string, signature: string, a
 	};
 };
 
-describe('ap-request', () => {
-	test('createSignedPost with verify', async () => {
-		const keypair = await genRsaKeyPair();
-		const key = { keyId: 'x', 'privateKeyPem': keypair.privateKey };
-		const url = 'https://example.com/inbox';
-		const activity = { a: 1 };
-		const body = JSON.stringify(activity);
-		const headers = {
-			'User-Agent': 'UA',
-		};
+async function getKeyPair(level: string) {
+	if (level === '00') {
+		return await genRsaKeyPair();
+	} else if (level === '01') {
+		return await genEd25519KeyPair();
+	}
+	throw new Error('Invalid level');
+}
 
-		const req = ApRequestCreator.createSignedPost({ key, url, body, additionalHeaders: headers });
+describe('ap-request post', () => {
+	const url = 'https://example.com/inbox';
+	const activity = { a: 1 };
+	const body = JSON.stringify(activity);
+	const headers = {
+		'User-Agent': 'UA',
+	};
 
-		const parsed = buildParsedSignature(req.signingString, req.signature, 'rsa-sha256');
+	describe.each(['00', '01'])('createSignedPost with verify', (level) => {
+		test('pem', async () => {
+			const keypair = await getKeyPair(level);
+			const key = { keyId: 'x', 'privateKeyPem': keypair.privateKey };
 
-		const result = httpSignature.verifySignature(parsed, keypair.publicKey);
-		assert.deepStrictEqual(result, true);
-	});
+			const req = await createSignedPost({ level, key, url, body, additionalHeaders: headers });
 
-	test('createSignedGet with verify', async () => {
-		const keypair = await genRsaKeyPair();
-		const key = { keyId: 'x', 'privateKeyPem': keypair.privateKey };
-		const url = 'https://example.com/outbox';
-		const headers = {
-			'User-Agent': 'UA',
-		};
+			const parsed = parseRequestSignature(req.request);
+			expect(parsed.version).toBe('draft');
+			expect(Array.isArray(parsed.value)).toBe(false);
+			const verify = await verifyDraftSignature(parsed.value as any, keypair.publicKey);
+			assert.deepStrictEqual(verify, true);
+		});
+		test('imported', async () => {
+			const keypair = await getKeyPair(level);
+			const key = { keyId: 'x', 'privateKey': await importPrivateKey(keypair.privateKey) };
 
-		const req = ApRequestCreator.createSignedGet({ key, url, additionalHeaders: headers });
+			const req = await createSignedPost({ level, key, url, body, additionalHeaders: headers });
 
-		const parsed = buildParsedSignature(req.signingString, req.signature, 'rsa-sha256');
-
-		const result = httpSignature.verifySignature(parsed, keypair.publicKey);
-		assert.deepStrictEqual(result, true);
+			const parsed = parseRequestSignature(req.request);
+			expect(parsed.version).toBe('draft');
+			expect(Array.isArray(parsed.value)).toBe(false);
+			const verify = await verifyDraftSignature(parsed.value as any, keypair.publicKey);
+			assert.deepStrictEqual(verify, true);
+		});
+	});
+});
+
+describe('ap-request get', () => {
+	describe.each(['00', '01'])('createSignedGet with verify', (level) => {
+		test('pass', async () => {
+			const keypair = await getKeyPair(level);
+			const key = { keyId: 'x', 'privateKeyPem': keypair.privateKey };
+			const url = 'https://example.com/outbox';
+			const headers = {
+				'User-Agent': 'UA',
+			};
+
+			const req = await createSignedGet({ level, key, url, additionalHeaders: headers });
+
+			const parsed = parseRequestSignature(req.request);
+			expect(parsed.version).toBe('draft');
+			expect(Array.isArray(parsed.value)).toBe(false);
+			const verify = await verifyDraftSignature(parsed.value as any, keypair.publicKey);
+			assert.deepStrictEqual(verify, true);
+		});
 	});
 });
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index d3c857219b..2a7e5a323d 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4608,6 +4608,7 @@ export type components = {
       /** Format: date-time */
       latestRequestReceivedAt: string | null;
       moderationNote?: string | null;
+      httpMessageSignaturesImplementationLevel: string;
     };
     GalleryPost: {
       /**
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7d3fec8596..2d426c2fa8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -125,6 +125,9 @@ importers:
       '@fastify/view':
         specifier: 9.1.0
         version: 9.1.0
+      '@misskey-dev/node-http-message-signatures':
+        specifier: 0.0.10
+        version: 0.0.10
       '@misskey-dev/sharp-read-bmp':
         specifier: 1.2.0
         version: 1.2.0
@@ -143,9 +146,6 @@ importers:
       '@nestjs/testing':
         specifier: 10.3.10
         version: 10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.10)(encoding@0.1.13)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.10))
-      '@peertube/http-signature':
-        specifier: 1.7.0
-        version: 1.7.0
       '@sentry/node':
         specifier: 8.13.0
         version: 8.13.0
@@ -3228,6 +3228,11 @@ packages:
   '@kurkle/color@0.3.2':
     resolution: {integrity: sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==}
 
+  '@lapo/asn1js@2.0.4':
+    resolution: {integrity: sha512-KJD3wQAZxozcraJdWp3utDU6DEZgAVBGp9INCdptUpZaXCEYkpwNb7h7wyYh5y6DxtpvIud8k0suhWJ/z2rKvw==}
+    engines: {node: '>=12.20.0'}
+    hasBin: true
+
   '@levischuck/tiny-cbor@0.2.2':
     resolution: {integrity: sha512-f5CnPw997Y2GQ8FAvtuVVC19FX8mwNNC+1XJcIi16n/LTJifKO6QBgGLgN3YEmqtGMk17SKSuoWES3imJVxAVw==}
 
@@ -3281,6 +3286,10 @@ packages:
       eslint-plugin-import: '>= 2'
       globals: '>= 15'
 
+  '@misskey-dev/node-http-message-signatures@0.0.10':
+    resolution: {integrity: sha512-HiAuc//tOU077KFUJhHYLAPWku9enTpOFIqQiK6l2i2mIizRvv7HhV7Y+yuav5quDOAz+WZGK/i5C9OR5fkKIg==}
+    engines: {node: '>=18.4.0'}
+
   '@misskey-dev/sharp-read-bmp@1.2.0':
     resolution: {integrity: sha512-er4pRakXzHYfEgOFAFfQagqDouG+wLm+kwNq1I30oSdIHDa0wM3KjFpfIGQ25Fks4GcmOl1s7Zh6xoQu5dNjTw==}
 
@@ -3671,10 +3680,6 @@ packages:
   '@peculiar/asn1-x509@2.3.8':
     resolution: {integrity: sha512-voKxGfDU1c6r9mKiN5ZUsZWh3Dy1BABvTM3cimf0tztNwyMJPhiXY94eRTgsMQe6ViLfT6EoXxkWVzcm3mFAFw==}
 
-  '@peertube/http-signature@1.7.0':
-    resolution: {integrity: sha512-aGQIwo6/sWtyyqhVK4e1MtxYz4N1X8CNt6SOtCc+Wnczs5S5ONaLHDDR8LYaGn0MgOwvGgXyuZ5sJIfd7iyoUw==}
-    engines: {node: '>=0.10'}
-
   '@pkgjs/parseargs@0.11.0':
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
@@ -10524,6 +10529,9 @@ packages:
     resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
 
+  rfc4648@1.5.3:
+    resolution: {integrity: sha512-MjOWxM065+WswwnmNONOT+bD1nXzY9Km6u3kzvnx8F8/HXGZdz3T6e6vZJ8Q/RIMUSp/nxqjH3GwvJDy8ijeQQ==}
+
   rfdc@1.3.0:
     resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==}
 
@@ -11075,6 +11083,10 @@ packages:
     resolution: {integrity: sha512-pQ+V+nYQdC5H3Q7qBZAz/MO6lwGhoC2gOAjuouGf/VO0m7vQRh8QNMl2Uf6SwAtzZ9bOw3UIeBukEGNJl5dtXQ==}
     engines: {node: '>=14.16'}
 
+  structured-headers@1.0.1:
+    resolution: {integrity: sha512-QYBxdBtA4Tl5rFPuqmbmdrS9kbtren74RTJTcs0VSQNVV5iRhJD4QlYTLD0+81SBwUQctjEQzjTRI3WG4DzICA==}
+    engines: {node: '>= 14', npm: '>=6'}
+
   stylehacks@6.1.1:
     resolution: {integrity: sha512-gSTTEQ670cJNoaeIp9KX6lZmm8LJ3jPB5yJmX8Zq/wQxOsAFXV3qjWzHas3YYk1qesuVIyYWWUpZ0vSE/dTSGg==}
     engines: {node: ^14 || ^16 || >=18.0}
@@ -14642,6 +14654,8 @@ snapshots:
 
   '@kurkle/color@0.3.2': {}
 
+  '@lapo/asn1js@2.0.4': {}
+
   '@levischuck/tiny-cbor@0.2.2': {}
 
   '@lukeed/csprng@1.0.1': {}
@@ -14722,6 +14736,12 @@ snapshots:
       eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)
       globals: 15.7.0
 
+  '@misskey-dev/node-http-message-signatures@0.0.10':
+    dependencies:
+      '@lapo/asn1js': 2.0.4
+      rfc4648: 1.5.3
+      structured-headers: 1.0.1
+
   '@misskey-dev/sharp-read-bmp@1.2.0':
     dependencies:
       decode-bmp: 0.2.1
@@ -15182,12 +15202,6 @@ snapshots:
       pvtsutils: 1.3.5
       tslib: 2.6.2
 
-  '@peertube/http-signature@1.7.0':
-    dependencies:
-      assert-plus: 1.0.0
-      jsprim: 1.4.2
-      sshpk: 1.17.0
-
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
@@ -23879,6 +23893,8 @@ snapshots:
 
   reusify@1.0.4: {}
 
+  rfc4648@1.5.3: {}
+
   rfdc@1.3.0: {}
 
   rimraf@2.6.3:
@@ -24474,6 +24490,8 @@ snapshots:
       '@tokenizer/token': 0.3.0
       peek-readable: 5.0.0
 
+  structured-headers@1.0.1: {}
+
   stylehacks@6.1.1(postcss@8.4.38):
     dependencies:
       browserslist: 4.23.0

From 25b65925f76f2be1f28e20f36405f8b9d104665e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Thu, 18 Jul 2024 01:47:11 +0900
Subject: [PATCH 070/221] =?UTF-8?q?refactor:=20misskey-assets=E3=82=B5?=
 =?UTF-8?q?=E3=83=96=E3=83=A2=E3=82=B8=E3=83=A5=E3=83=BC=E3=83=AB=E3=82=92?=
 =?UTF-8?q?=E5=89=8A=E9=99=A4=20(#12818)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* (change) misskey-assetsサブモジュールを削除

* なんか残ってた
---
 .dockerignore                           | 1 -
 .gitmodules                             | 3 ---
 misskey-assets                          | 1 -
 packages/frontend/.storybook/changes.ts | 1 -
 4 files changed, 6 deletions(-)
 delete mode 160000 misskey-assets

diff --git a/.dockerignore b/.dockerignore
index 7dbb06e1d0..f204349160 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -12,7 +12,6 @@ node_modules/
 packages/*/node_modules
 redis/
 files/
-misskey-assets/
 fluent-emojis/
 .pnp.*
 
diff --git a/.gitmodules b/.gitmodules
index 225a69a652..3218575273 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "misskey-assets"]
-	path = misskey-assets
-	url = https://github.com/misskey-dev/assets.git
 [submodule "fluent-emojis"]
 	path = fluent-emojis
 	url = https://github.com/misskey-dev/emojis.git
diff --git a/misskey-assets b/misskey-assets
deleted file mode 160000
index 0179793ec8..0000000000
--- a/misskey-assets
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0179793ec891856d6f37a3be16ba4c22f67a81b5
diff --git a/packages/frontend/.storybook/changes.ts b/packages/frontend/.storybook/changes.ts
index bc7601441c..1299910499 100644
--- a/packages/frontend/.storybook/changes.ts
+++ b/packages/frontend/.storybook/changes.ts
@@ -53,7 +53,6 @@ await fs.readFile(
 			'../../assets/**',
 			'../../fluent-emojis/**',
 			'../../locales/ja-JP.yml',
-			'../../misskey-assets/**',
 			'assets/**',
 			'public/**',
 			'../../pnpm-lock.yaml',

From ec91e1889907c3c1512ad8d750817596d022188c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Thu, 18 Jul 2024 01:56:02 +0900
Subject: [PATCH 071/221] fix(frontend): add missing import (follow-up of
 #12265)

---
 packages/frontend/src/pages/user/home.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index 1b4ec47469..3039ec7499 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -167,6 +167,7 @@ import number from '@/filters/number.js';
 import { userPage } from '@/filters/user.js';
 import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
+import { defaultStore } from '@/store.js';
 import { $i, iAmModerator } from '@/account.js';
 import { dateString } from '@/filters/date.js';
 import { confetti } from '@/scripts/confetti.js';

From a54d04392378b640249083f6f5cad31c707e5c5d Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 18 Jul 2024 02:05:40 +0900
Subject: [PATCH 072/221] chore: ignore misskey-assets (follow-up of #12818 )

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 3466984cf6..45170902b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,6 +59,7 @@ ormconfig.json
 temp
 /packages/frontend/src/**/*.stories.ts
 tsdoc-metadata.json
+misskey-assets
 
 # blender backups
 *.blend1

From cfdad45092ac2497a66b6b25f90bef7c466292a8 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Thu, 18 Jul 2024 02:06:31 +0900
Subject: [PATCH 073/221] =?UTF-8?q?fix:=20=E3=82=BD=E3=83=BC=E3=82=B7?=
 =?UTF-8?q?=E3=83=A3=E3=83=AB=E3=82=BF=E3=82=A4=E3=83=A0=E3=83=A9=E3=82=A4?=
 =?UTF-8?q?=E3=83=B3=E3=81=AB=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=AB=E3=82=BF?=
 =?UTF-8?q?=E3=82=A4=E3=83=A0=E3=83=A9=E3=82=A4=E3=83=B3=E3=81=AB=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E3=81=95=E3=82=8C=E3=82=8B=E8=87=AA=E5=88=86=E3=81=B8?=
 =?UTF-8?q?=E3=81=AE=E3=83=AA=E3=83=97=E3=83=A9=E3=82=A4=E3=81=8C=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20(#13978)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
---
 CHANGELOG.md                                                     | 1 +
 .../backend/src/server/api/endpoints/notes/hybrid-timeline.ts    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 395716bbe2..10c44c4f8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@
   (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/652)
 - Fix: ユーザーのリアクション一覧でミュート/ブロックが機能していなかった問題を修正
 - Fix: エラーメッセージの誤字を修正 (#14213)
+- Fix: ソーシャルタイムラインにローカルタイムラインに表示される自分へのリプライが表示されない問題を修正
 
 ### Misskey.js
 - Feat: `/drive/files/create` のリクエストに対応（`multipart/form-data`に対応）
diff --git a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
index 5acc9706d3..f6084b5763 100644
--- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -139,6 +139,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				timelineConfig = [
 					`homeTimeline:${me.id}`,
 					'localTimeline',
+					`localTimelineWithReplyTo:${me.id}`,
 				];
 			}
 

From 73a42ea2ee448ae085b6bd39bf56ca6c6189f3a3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Jul 2024 17:23:58 +0000
Subject: [PATCH 074/221] Bump version to 2024.7.0-beta.1

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 0dd7afb9e9..44466aaae6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.7.0-beta.0",
+	"version": "2024.7.0-beta.1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 1567ed7e61..d494b6b58e 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.7.0-beta.0",
+	"version": "2024.7.0-beta.1",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From c3a6da19d79c69f7a60157f48398b76345ced31f Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 18 Jul 2024 08:53:45 +0900
Subject: [PATCH 075/221] =?UTF-8?q?chore:=20CHANGELOG=E3=81=AB=E3=82=B8?=
 =?UTF-8?q?=E3=83=A7=E3=83=96=E3=82=AD=E3=83=A5=E3=83=BC=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=E8=BF=BD=E8=A8=98=20(follo?=
 =?UTF-8?q?w-up=20of=20#13464)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10c44c4f8b..ad0a88e949 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,12 @@
   - 変更不可となっていても、設定済みのものを解除してデフォルト画像に戻すことは出来ます
 - Feat: 連合に使うHTTP SignaturesがEd25519鍵に対応するように #13464
   - Ed25519署名に対応するサーバーが増えると、deliverで要求されるサーバーリソースが削減されます
+	- ジョブキューのconfig設定のデフォルト値を変更しました。  
+	  default.ymlでジョブキューの並列度を設定している場合は、従前よりもconcurrencyの値をより下げるとパフォーマンスが改善する可能性があります。
+		* deliverJobConcurrency: 16 (←128)
+		* deliverJobPerSec: 1024 (←128)
+		* inboxJobConcurrency: 4 (←16)
+		* inboxJobPerSec: 64 (←32)
 - Fix: 配信停止したインスタンス一覧が見れなくなる問題を修正
 - Fix: Dockerコンテナの立ち上げ時に`pnpm`のインストールで固まることがある問題
 - Fix: デフォルトテーマに無効なテーマコードを入力するとUIが使用できなくなる問題を修正

From de166a8ed4b0e185e49c71825c92b4f94e2f350f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Thu, 18 Jul 2024 08:55:36 +0900
Subject: [PATCH 076/221] =?UTF-8?q?fix(backend):=20=E3=83=AA=E3=83=8E?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=83=9F=E3=83=A5=E3=83=BC=E3=83=88=E3=81=8C?=
 =?UTF-8?q?=E3=82=AD=E3=83=A3=E3=83=83=E3=82=B7=E3=83=A5=E3=81=8C=E5=88=87?=
 =?UTF-8?q?=E3=82=8C=E3=82=8B=E3=81=BE=E3=81=A7=E5=8A=B9=E3=81=8B=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(#1424?=
 =?UTF-8?q?2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix: RenoteMuteがキャッシュが切れるまで効かない問題を修正

(cherry picked from commit e9601029b52e0ad43d9131b555b614e56c84ebc1)

* update changelog

* :art:

* remove unused import

* 消したときもキャッシュを飛ばすように

* lint

---------

Co-authored-by: mattyatea <mattyacocacora0@gmail.com>
---
 CHANGELOG.md                                  |  2 +
 packages/backend/src/core/CoreModule.ts       |  6 +++
 .../src/core/UserRenoteMutingService.ts       | 52 +++++++++++++++++++
 .../api/endpoints/renote-mute/create.ts       | 23 ++++----
 .../api/endpoints/renote-mute/delete.ts       |  8 +--
 5 files changed, 74 insertions(+), 17 deletions(-)
 create mode 100644 packages/backend/src/core/UserRenoteMutingService.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad0a88e949..8728ebf733 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,8 @@
 - Fix: ユーザーのリアクション一覧でミュート/ブロックが機能していなかった問題を修正
 - Fix: エラーメッセージの誤字を修正 (#14213)
 - Fix: ソーシャルタイムラインにローカルタイムラインに表示される自分へのリプライが表示されない問題を修正
+- Fix: リノートのミュートが適用されるまでに時間がかかることがある問題を修正  
+  (Cherry-picked from https://github.com/Type4ny-Project/Type4ny/commit/e9601029b52e0ad43d9131b555b614e56c84ebc1)
 
 ### Misskey.js
 - Feat: `/drive/files/create` のリクエストに対応（`multipart/form-data`に対応）
diff --git a/packages/backend/src/core/CoreModule.ts b/packages/backend/src/core/CoreModule.ts
index 0208540afa..c9427bbeb7 100644
--- a/packages/backend/src/core/CoreModule.ts
+++ b/packages/backend/src/core/CoreModule.ts
@@ -61,6 +61,7 @@ import { UserFollowingService } from './UserFollowingService.js';
 import { UserKeypairService } from './UserKeypairService.js';
 import { UserListService } from './UserListService.js';
 import { UserMutingService } from './UserMutingService.js';
+import { UserRenoteMutingService } from './UserRenoteMutingService.js';
 import { UserSuspendService } from './UserSuspendService.js';
 import { UserAuthService } from './UserAuthService.js';
 import { VideoProcessingService } from './VideoProcessingService.js';
@@ -203,6 +204,7 @@ const $UserFollowingService: Provider = { provide: 'UserFollowingService', useEx
 const $UserKeypairService: Provider = { provide: 'UserKeypairService', useExisting: UserKeypairService };
 const $UserListService: Provider = { provide: 'UserListService', useExisting: UserListService };
 const $UserMutingService: Provider = { provide: 'UserMutingService', useExisting: UserMutingService };
+const $UserRenoteMutingService: Provider = { provide: 'UserRenoteMutingService', useExisting: UserRenoteMutingService };
 const $UserSearchService: Provider = { provide: 'UserSearchService', useExisting: UserSearchService };
 const $UserSuspendService: Provider = { provide: 'UserSuspendService', useExisting: UserSuspendService };
 const $UserAuthService: Provider = { provide: 'UserAuthService', useExisting: UserAuthService };
@@ -350,6 +352,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		UserKeypairService,
 		UserListService,
 		UserMutingService,
+		UserRenoteMutingService,
 		UserSearchService,
 		UserSuspendService,
 		UserAuthService,
@@ -493,6 +496,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$UserKeypairService,
 		$UserListService,
 		$UserMutingService,
+		$UserRenoteMutingService,
 		$UserSearchService,
 		$UserSuspendService,
 		$UserAuthService,
@@ -637,6 +641,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		UserKeypairService,
 		UserListService,
 		UserMutingService,
+		UserRenoteMutingService,
 		UserSearchService,
 		UserSuspendService,
 		UserAuthService,
@@ -779,6 +784,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$UserKeypairService,
 		$UserListService,
 		$UserMutingService,
+		$UserRenoteMutingService,
 		$UserSearchService,
 		$UserSuspendService,
 		$UserAuthService,
diff --git a/packages/backend/src/core/UserRenoteMutingService.ts b/packages/backend/src/core/UserRenoteMutingService.ts
new file mode 100644
index 0000000000..bdc5e23f4b
--- /dev/null
+++ b/packages/backend/src/core/UserRenoteMutingService.ts
@@ -0,0 +1,52 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project , Type4ny-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { In } from 'typeorm';
+import type { RenoteMutingsRepository } from '@/models/_.js';
+import type { MiRenoteMuting } from '@/models/RenoteMuting.js';
+
+import { IdService } from '@/core/IdService.js';
+import type { MiUser } from '@/models/User.js';
+import { DI } from '@/di-symbols.js';
+import { bindThis } from '@/decorators.js';
+import { CacheService } from '@/core/CacheService.js';
+
+@Injectable()
+export class UserRenoteMutingService {
+	constructor(
+		@Inject(DI.renoteMutingsRepository)
+		private renoteMutingsRepository: RenoteMutingsRepository,
+
+		private idService: IdService,
+		private cacheService: CacheService,
+	) {
+	}
+
+	@bindThis
+	public async mute(user: MiUser, target: MiUser, expiresAt: Date | null = null): Promise<void> {
+		await this.renoteMutingsRepository.insert({
+			id: this.idService.gen(),
+			muterId: user.id,
+			muteeId: target.id,
+		});
+
+		await this.cacheService.renoteMutingsCache.refresh(user.id);
+	}
+
+	@bindThis
+	public async unmute(mutings: MiRenoteMuting[]): Promise<void> {
+		if (mutings.length === 0) return;
+
+		await this.renoteMutingsRepository.delete({
+			id: In(mutings.map(m => m.id)),
+		});
+
+		const muterIds = [...new Set(mutings.map(m => m.muterId))];
+		for (const muterId of muterIds) {
+			await this.cacheService.renoteMutingsCache.refresh(muterId);
+		}
+	}
+}
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 39bf0cc428..84a1f010d4 100644
--- a/packages/backend/src/server/api/endpoints/renote-mute/create.ts
+++ b/packages/backend/src/server/api/endpoints/renote-mute/create.ts
@@ -6,12 +6,11 @@
 import { Inject, Injectable } from '@nestjs/common';
 import ms from 'ms';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import { IdService } from '@/core/IdService.js';
-import type { RenoteMutingsRepository } from '@/models/_.js';
-import type { MiRenoteMuting } from '@/models/RenoteMuting.js';
 import { DI } from '@/di-symbols.js';
 import { GetterService } from '@/server/api/GetterService.js';
 import { ApiError } from '../../error.js';
+import { UserRenoteMutingService } from "@/core/UserRenoteMutingService.js";
+import type { RenoteMutingsRepository } from '@/models/_.js';
 
 export const meta = {
 	tags: ['account'],
@@ -62,7 +61,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private renoteMutingsRepository: RenoteMutingsRepository,
 
 		private getterService: GetterService,
-		private idService: IdService,
+		private userRenoteMutingService: UserRenoteMutingService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const muter = me;
@@ -79,21 +78,19 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			});
 
 			// Check if already muting
-			const exist = await this.renoteMutingsRepository.findOneBy({
-				muterId: muter.id,
-				muteeId: mutee.id,
+			const exist = await this.renoteMutingsRepository.exists({
+				where: {
+					muterId: muter.id,
+					muteeId: mutee.id,
+				},
 			});
 
-			if (exist != null) {
+			if (exist === true) {
 				throw new ApiError(meta.errors.alreadyMuting);
 			}
 
 			// Create mute
-			await this.renoteMutingsRepository.insert({
-				id: this.idService.gen(),
-				muterId: muter.id,
-				muteeId: mutee.id,
-			} as MiRenoteMuting);
+			await this.userRenoteMutingService.mute(muter, mutee);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/renote-mute/delete.ts b/packages/backend/src/server/api/endpoints/renote-mute/delete.ts
index 6e037cc07e..1a584b8404 100644
--- a/packages/backend/src/server/api/endpoints/renote-mute/delete.ts
+++ b/packages/backend/src/server/api/endpoints/renote-mute/delete.ts
@@ -5,10 +5,11 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { RenoteMutingsRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
 import { GetterService } from '@/server/api/GetterService.js';
 import { ApiError } from '../../error.js';
+import { UserRenoteMutingService } from "@/core/UserRenoteMutingService.js";
+import type { RenoteMutingsRepository } from '@/models/_.js';
 
 export const meta = {
 	tags: ['account'],
@@ -53,6 +54,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private renoteMutingsRepository: RenoteMutingsRepository,
 
 		private getterService: GetterService,
+		private userRenoteMutingService: UserRenoteMutingService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const muter = me;
@@ -79,9 +81,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}
 
 			// Delete mute
-			await this.renoteMutingsRepository.delete({
-				id: exist.id,
-			});
+			await this.userRenoteMutingService.unmute([exist]);
 		});
 	}
 }

From e716c201c65128bb04299f509c5ccedbc7061a64 Mon Sep 17 00:00:00 2001
From: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>
Date: Thu, 18 Jul 2024 08:57:02 +0900
Subject: [PATCH 077/221] =?UTF-8?q?docs:=20=E9=96=8B=E7=99=BA=E7=92=B0?=
 =?UTF-8?q?=E5=A2=83=E3=81=AE=E3=82=BB=E3=83=83=E3=83=88=E3=82=A2=E3=83=83?=
 =?UTF-8?q?=E3=83=97=E6=89=8B=E9=A0=86=E3=82=92=E8=A9=B3=E7=B4=B0=E3=81=AB?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=20(#14235)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* docs: mentioning Devcontainer

fix #13753

* revise

* revise 2

* Apply suggestions from code review
per https://github.com/misskey-dev/misskey/pull/14235#discussion_r1680883942

Co-authored-by: anatawa12 <anatawa12@icloud.com>

* 下の方にあったDevcontainerのセクションをマージ

* revise 3

* Update CONTRIBUTING.md

https://github.com/misskey-dev/misskey/pull/14235#discussion_r1680928026

Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>

* mention Meilisearch

* Update CONTRIBUTING.md

---------

Co-authored-by: anatawa12 <anatawa12@icloud.com>
Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>
---
 CONTRIBUTING.md | 52 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 532a2dc66f..9a56345e6e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -106,6 +106,38 @@ If your language is not listed in Crowdin, please open an issue.
 ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)
 
 ## Development
+### Setup
+Before developing, you have to set up environment. Misskey requires Redis, PostgreSQL, and FFmpeg.
+
+You would want to install Meilisearch to experiment related features. Technically, meilisearch is not strict requirement, but some features and tests require it.
+
+There are a few ways to proceed.
+
+#### Use system-wide software
+You could install them in system-wide (such as from package manager).
+
+#### Use `docker compose`
+You could obtain middleware container by typing `docker compose -f $PROJECT_ROOT/compose.local-db.yml up -d`.
+
+#### Use Devcontainer
+Devcontainer also has necessary setting. This method can be done by connecting from VSCode.
+
+Instead of running `pnpm` locally, you can use Dev Container to set up your development environment.
+To use Dev Container, open the project directory on VSCode with Dev Containers installed.  
+**Note:** If you are using Windows, please clone the repository with WSL. Using Git for Windows will result in broken files due to the difference in how newlines are handled.
+
+It will run the following command automatically inside the container.
+``` bash
+git submodule update --init
+pnpm install --frozen-lockfile
+cp .devcontainer/devcontainer.yml .config/default.yml
+pnpm build
+pnpm migrate
+```
+
+After finishing the migration, you can proceed.
+
+### Start developing
 During development, it is useful to use the
 
 ```
@@ -135,26 +167,6 @@ MK_DEV_PREFER=backend pnpm dev
 - To change the port of Vite, specify with `VITE_PORT` environment variable.
 - HMR may not work in some environments such as Windows.
 
-### Dev Container
-Instead of running `pnpm` locally, you can use Dev Container to set up your development environment.
-To use Dev Container, open the project directory on VSCode with Dev Containers installed.  
-**Note:** If you are using Windows, please clone the repository with WSL. Using Git for Windows will result in broken files due to the difference in how newlines are handled.
-
-It will run the following command automatically inside the container.
-``` bash
-git submodule update --init
-pnpm install --frozen-lockfile
-cp .devcontainer/devcontainer.yml .config/default.yml
-pnpm build
-pnpm migrate
-```
-
-After finishing the migration, run the `pnpm dev` command to start the development server.
-
-``` bash
-pnpm dev
-```
-
 ## Testing
 - Test codes are located in [`/packages/backend/test`](/packages/backend/test).
 

From cd95a6e9c9ec0661892d824f520a48416e96adef Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Thu, 18 Jul 2024 14:23:47 +0900
Subject: [PATCH 078/221] fix: remove unreleased section (#14246)

---
 CHANGELOG.md | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d4ef23d27..9f78ba677d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,3 @@
-## Unreleased
-
-### General
--
-
-### Client
--
-
-### Server
--
-
-
 ## 2024.5.0
 
 ### Note

From 4f85b6aa9158190bbdd9246bb8565d5c80081706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Thu, 18 Jul 2024 15:41:32 +0900
Subject: [PATCH 079/221] =?UTF-8?q?fix(frontend):=20Twitch=E3=81=AE?=
 =?UTF-8?q?=E5=9F=8B=E3=82=81=E8=BE=BC=E3=81=BF=E3=81=8C=E9=96=8B=E3=81=91?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20(#14247)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): twitchの埋め込みが開けない問題を修正

* Update Changelog

* fix test
---
 CHANGELOG.md                                  |  1 +
 .../frontend/src/components/MkUrlPreview.vue  |  3 ++-
 .../src/components/MkYouTubePlayer.vue        |  3 ++-
 .../src/scripts/player-url-transform.ts       | 26 +++++++++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 packages/frontend/src/scripts/player-url-transform.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8728ebf733..60bc28e077 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@
 - Fix: MkSignin.vueのcredentialRequestからReactivityを削除（ProxyがPasskey認証処理に渡ることを避けるため）
 - Fix: 「アニメーション画像を再生しない」がオンのときでもサーバーのバナー画像・背景画像がアニメーションしてしまう問題を修正  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/574)
+- Fix: Twitchの埋め込みが開けない問題を修正
 
 ### Server
 - Feat: レートリミット制限に引っかかったときに`Retry-After`ヘッダーを返すように (#13949)
diff --git a/packages/frontend/src/components/MkUrlPreview.vue b/packages/frontend/src/components/MkUrlPreview.vue
index 8df5e0fe40..c868a22045 100644
--- a/packages/frontend/src/components/MkUrlPreview.vue
+++ b/packages/frontend/src/components/MkUrlPreview.vue
@@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			scrolling="no"
 			:allow="player.allow == null ? 'autoplay;encrypted-media;fullscreen' : player.allow.filter(x => ['autoplay', 'clipboard-write', 'fullscreen', 'encrypted-media', 'picture-in-picture', 'web-share'].includes(x)).join(';')"
 			:class="$style.playerIframe"
-			:src="player.url + (player.url.match(/\?/) ? '&autoplay=1&auto_play=1' : '?autoplay=1&auto_play=1')"
+			:src="transformPlayerUrl(player.url)"
 			:style="{ border: 0 }"
 		></iframe>
 		<span v-else>invalid url</span>
@@ -91,6 +91,7 @@ import * as os from '@/os.js';
 import { deviceKind } from '@/scripts/device-kind.js';
 import MkButton from '@/components/MkButton.vue';
 import { versatileLang } from '@/scripts/intl-const.js';
+import { transformPlayerUrl } from '@/scripts/player-url-transform.js';
 import { defaultStore } from '@/store.js';
 
 type SummalyResult = Awaited<ReturnType<typeof summaly>>;
diff --git a/packages/frontend/src/components/MkYouTubePlayer.vue b/packages/frontend/src/components/MkYouTubePlayer.vue
index 1fad222fc5..e3711b3463 100644
--- a/packages/frontend/src/components/MkYouTubePlayer.vue
+++ b/packages/frontend/src/components/MkYouTubePlayer.vue
@@ -13,7 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<div class="poamfof">
 		<Transition :name="defaultStore.state.animation ? 'fade' : ''" mode="out-in">
 			<div v-if="player.url && (player.url.startsWith('http://') || player.url.startsWith('https://'))" class="player">
-				<iframe v-if="!fetching" :src="player.url + (player.url.match(/\?/) ? '&autoplay=1&auto_play=1' : '?autoplay=1&auto_play=1')" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen/>
+				<iframe v-if="!fetching" :src="transformPlayerUrl(player.url)" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
 			</div>
 			<span v-else>invalid url</span>
 		</Transition>
@@ -27,6 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { ref } from 'vue';
 import MkWindow from '@/components/MkWindow.vue';
 import { versatileLang } from '@/scripts/intl-const.js';
+import { transformPlayerUrl } from '@/scripts/player-url-transform.js';
 import { defaultStore } from '@/store.js';
 
 const props = defineProps<{
diff --git a/packages/frontend/src/scripts/player-url-transform.ts b/packages/frontend/src/scripts/player-url-transform.ts
new file mode 100644
index 0000000000..53b2a9e441
--- /dev/null
+++ b/packages/frontend/src/scripts/player-url-transform.ts
@@ -0,0 +1,26 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+import { hostname } from '@/config.js';
+
+export function transformPlayerUrl(url: string): string {
+	const urlObj = new URL(url);
+	if (!['https:', 'http:'].includes(urlObj.protocol)) throw new Error('Invalid protocol');
+
+	const urlParams = new URLSearchParams(urlObj.search);
+
+	if (urlObj.hostname === 'player.twitch.tv') {
+		// TwitchはCSPの制約あり
+		// https://dev.twitch.tv/docs/embed/video-and-clips/
+		urlParams.set('parent', hostname);
+		urlParams.set('allowfullscreen', '');
+		urlParams.set('autoplay', 'true');
+	} else {
+		urlParams.set('autoplay', '1');
+		urlParams.set('auto_play', '1');
+	}
+	urlObj.search = urlParams.toString();
+
+	return urlObj.toString();
+}

From ec1c392f1e409e707ba81dfcd45112efb418c7aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Thu, 18 Jul 2024 15:44:18 +0900
Subject: [PATCH 080/221] =?UTF-8?q?fix(frontend):=20=E5=AD=90=E3=83=A1?=
 =?UTF-8?q?=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=AE=E6=9C=80=E5=A4=A7=E9=95=B7?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4=E3=81=8C=E8=A1=8C=E3=82=8F=E3=82=8C=E3=81=A6?=
 =?UTF-8?q?=E3=81=84=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20(#14003)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): 子メニューの最大長調整が行われていない問題を修正

* Update Changelog

* fix

* changelog

* Revert "fix"

This reverts commit 39fb326d49eedf484342c78a61c0dba8e223e596.

* Revert "fix(frontend): 子メニューの最大長調整が行われていない問題を修正"

This reverts commit ea58bf7a53fc8a254b7fbdf222a676e23527358c.

* use css

* maxHeightをchildから定義するように

* use css min
---
 CHANGELOG.md                                | 1 +
 packages/frontend/src/components/MkMenu.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60bc28e077..8ed34ab050 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@
 - Fix: 「アニメーション画像を再生しない」がオンのときでもサーバーのバナー画像・背景画像がアニメーションしてしまう問題を修正  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/574)
 - Fix: Twitchの埋め込みが開けない問題を修正
+- Fix: 子メニューの高さがウィンドウからはみ出ることがある問題を修正
 
 ### Server
 - Feat: レートリミット制限に引っかかったときに`Retry-After`ヘッダーを返すように (#13949)
diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue
index 2276da1d21..c0728d56fa 100644
--- a/packages/frontend/src/components/MkMenu.vue
+++ b/packages/frontend/src/components/MkMenu.vue
@@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		}"
 		:style="{
 			width: (width && !asDrawer) ? `${width}px` : '',
-			maxHeight: maxHeight ? `${maxHeight}px` : '',
+			maxHeight: maxHeight ? `min(${maxHeight}px, calc(100dvh - 32px))` : 'calc(100dvh - 32px)',
 		}"
 		@keydown.stop="() => {}"
 		@contextmenu.self.prevent="() => {}"

From 10ce7bf3c45c3e09dc86f1b9c3a0d7e79c23f5ee Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Thu, 18 Jul 2024 20:04:23 +0900
Subject: [PATCH 081/221] kill any from streaming API Implementation (#14251)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: add JsonValue type

* refactor: kill any from Connection.ts

* refactor: fix StreamEventEmitter contains undefined instead of null

* refactor: kill any from channels

* docs(changelog): Fix: Steaming APIが不正なデータを受けた場合の動作が不安定である問題

* fix license header

* fix lints
---
 CHANGELOG.md                                  |  2 +
 .../backend/src/core/GlobalEventService.ts    | 28 +++++----
 packages/backend/src/misc/json-value.ts       |  8 +++
 .../src/server/api/stream/Connection.ts       | 57 ++++++++++++-------
 .../backend/src/server/api/stream/channel.ts  | 13 +++--
 .../src/server/api/stream/channels/admin.ts   |  3 +-
 .../src/server/api/stream/channels/antenna.ts |  6 +-
 .../src/server/api/stream/channels/channel.ts |  6 +-
 .../src/server/api/stream/channels/drive.ts   |  3 +-
 .../api/stream/channels/global-timeline.ts    |  7 ++-
 .../src/server/api/stream/channels/hashtag.ts |  7 ++-
 .../api/stream/channels/home-timeline.ts      |  7 ++-
 .../api/stream/channels/hybrid-timeline.ts    |  9 +--
 .../api/stream/channels/local-timeline.ts     |  9 +--
 .../src/server/api/stream/channels/main.ts    |  3 +-
 .../server/api/stream/channels/queue-stats.ts | 10 +++-
 .../api/stream/channels/reversi-game.ts       | 33 ++++++++---
 .../src/server/api/stream/channels/reversi.ts |  3 +-
 .../api/stream/channels/role-timeline.ts      |  6 +-
 .../api/stream/channels/server-stats.ts       |  8 ++-
 .../server/api/stream/channels/user-list.ts   | 10 ++--
 21 files changed, 155 insertions(+), 83 deletions(-)
 create mode 100644 packages/backend/src/misc/json-value.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ed34ab050..14d638ebe1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### Note
 - デッキUIの新着ノートをサウンドで通知する機能の追加（v2024.5.0）に伴い、以前から動作しなくなっていたクライアント設定内の「アンテナ受信」「チャンネル通知」サウンドを削除しました。
+- Streaming APIにて入力が不正な場合にはそのメッセージを無視するようになりました。 #14251
 
 ### General
 - Feat: 通報を受けた際、または解決した際に、予め登録した宛先に通知を飛ばせるように(mail or webhook) #13705
@@ -76,6 +77,7 @@
 - Fix: ソーシャルタイムラインにローカルタイムラインに表示される自分へのリプライが表示されない問題を修正
 - Fix: リノートのミュートが適用されるまでに時間がかかることがある問題を修正  
   (Cherry-picked from https://github.com/Type4ny-Project/Type4ny/commit/e9601029b52e0ad43d9131b555b614e56c84ebc1)
+- Fix: Steaming APIが不正なデータを受けた場合の動作が不安定である問題 #14251
 
 ### Misskey.js
 - Feat: `/drive/files/create` のリクエストに対応（`multipart/form-data`に対応）
diff --git a/packages/backend/src/core/GlobalEventService.ts b/packages/backend/src/core/GlobalEventService.ts
index 2a7d8d4bbe..312bcfb3b5 100644
--- a/packages/backend/src/core/GlobalEventService.ts
+++ b/packages/backend/src/core/GlobalEventService.ts
@@ -209,6 +209,10 @@ type SerializedAll<T> = {
 	[K in keyof T]: Serialized<T[K]>;
 };
 
+type UndefinedAsNullAll<T> = {
+	[K in keyof T]: T[K] extends undefined ? null : T[K];
+}
+
 export interface InternalEventTypes {
 	userChangeSuspendedState: { id: MiUser['id']; isSuspended: MiUser['isSuspended']; };
 	userChangeDeletedState: { id: MiUser['id']; isDeleted: MiUser['isDeleted']; };
@@ -248,43 +252,45 @@ export interface InternalEventTypes {
 	userKeypairUpdated: { userId: MiUser['id']; };
 }
 
+type EventTypesToEventPayload<T> = EventUnionFromDictionary<UndefinedAsNullAll<SerializedAll<T>>>;
+
 // name/messages(spec) pairs dictionary
 export type GlobalEvents = {
 	internal: {
 		name: 'internal';
-		payload: EventUnionFromDictionary<SerializedAll<InternalEventTypes>>;
+		payload: EventTypesToEventPayload<InternalEventTypes>;
 	};
 	broadcast: {
 		name: 'broadcast';
-		payload: EventUnionFromDictionary<SerializedAll<BroadcastTypes>>;
+		payload: EventTypesToEventPayload<BroadcastTypes>;
 	};
 	main: {
 		name: `mainStream:${MiUser['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<MainEventTypes>>;
+		payload: EventTypesToEventPayload<MainEventTypes>;
 	};
 	drive: {
 		name: `driveStream:${MiUser['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<DriveEventTypes>>;
+		payload: EventTypesToEventPayload<DriveEventTypes>;
 	};
 	note: {
 		name: `noteStream:${MiNote['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<NoteStreamEventTypes>>;
+		payload: EventTypesToEventPayload<NoteStreamEventTypes>;
 	};
 	userList: {
 		name: `userListStream:${MiUserList['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<UserListEventTypes>>;
+		payload: EventTypesToEventPayload<UserListEventTypes>;
 	};
 	roleTimeline: {
 		name: `roleTimelineStream:${MiRole['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<RoleTimelineEventTypes>>;
+		payload: EventTypesToEventPayload<RoleTimelineEventTypes>;
 	};
 	antenna: {
 		name: `antennaStream:${MiAntenna['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<AntennaEventTypes>>;
+		payload: EventTypesToEventPayload<AntennaEventTypes>;
 	};
 	admin: {
 		name: `adminStream:${MiUser['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<AdminEventTypes>>;
+		payload: EventTypesToEventPayload<AdminEventTypes>;
 	};
 	notes: {
 		name: 'notesStream';
@@ -292,11 +298,11 @@ export type GlobalEvents = {
 	};
 	reversi: {
 		name: `reversiStream:${MiUser['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<ReversiEventTypes>>;
+		payload: EventTypesToEventPayload<ReversiEventTypes>;
 	};
 	reversiGame: {
 		name: `reversiGameStream:${MiReversiGame['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<ReversiGameEventTypes>>;
+		payload: EventTypesToEventPayload<ReversiGameEventTypes>;
 	};
 };
 
diff --git a/packages/backend/src/misc/json-value.ts b/packages/backend/src/misc/json-value.ts
new file mode 100644
index 0000000000..7994441791
--- /dev/null
+++ b/packages/backend/src/misc/json-value.ts
@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export type JsonValue = JsonArray | JsonObject | string | number | boolean | null;
+export type JsonObject = {[K in string]?: JsonValue};
+export type JsonArray = JsonValue[];
diff --git a/packages/backend/src/server/api/stream/Connection.ts b/packages/backend/src/server/api/stream/Connection.ts
index 41c0feccc7..96082827f8 100644
--- a/packages/backend/src/server/api/stream/Connection.ts
+++ b/packages/backend/src/server/api/stream/Connection.ts
@@ -14,6 +14,7 @@ import { CacheService } from '@/core/CacheService.js';
 import { MiFollowing, MiUserProfile } from '@/models/_.js';
 import type { StreamEventEmitter, GlobalEvents } from '@/core/GlobalEventService.js';
 import { ChannelFollowingService } from '@/core/ChannelFollowingService.js';
+import type { JsonObject } from '@/misc/json-value.js';
 import type { ChannelsService } from './ChannelsService.js';
 import type { EventEmitter } from 'events';
 import type Channel from './channel.js';
@@ -28,7 +29,7 @@ export default class Connection {
 	private wsConnection: WebSocket.WebSocket;
 	public subscriber: StreamEventEmitter;
 	private channels: Channel[] = [];
-	private subscribingNotes: any = {};
+	private subscribingNotes: Partial<Record<string, number>> = {};
 	private cachedNotes: Packed<'Note'>[] = [];
 	public userProfile: MiUserProfile | null = null;
 	public following: Record<string, Pick<MiFollowing, 'withReplies'> | undefined> = {};
@@ -101,7 +102,7 @@ export default class Connection {
 	 */
 	@bindThis
 	private async onWsConnectionMessage(data: WebSocket.RawData) {
-		let obj: Record<string, any>;
+		let obj: JsonObject;
 
 		try {
 			obj = JSON.parse(data.toString());
@@ -111,6 +112,8 @@ export default class Connection {
 
 		const { type, body } = obj;
 
+		if (typeof body !== 'object' || body === null || Array.isArray(body)) return;
+
 		switch (type) {
 			case 'readNotification': this.onReadNotification(body); break;
 			case 'subNote': this.onSubscribeNote(body); break;
@@ -151,7 +154,7 @@ export default class Connection {
 	}
 
 	@bindThis
-	private readNote(body: any) {
+	private readNote(body: JsonObject) {
 		const id = body.id;
 
 		const note = this.cachedNotes.find(n => n.id === id);
@@ -163,7 +166,7 @@ export default class Connection {
 	}
 
 	@bindThis
-	private onReadNotification(payload: any) {
+	private onReadNotification(payload: JsonObject) {
 		this.notificationService.readAllNotification(this.user!.id);
 	}
 
@@ -171,16 +174,14 @@ export default class Connection {
 	 * 投稿購読要求時
 	 */
 	@bindThis
-	private onSubscribeNote(payload: any) {
-		if (!payload.id) return;
+	private onSubscribeNote(payload: JsonObject) {
+		if (!payload.id || typeof payload.id !== 'string') return;
 
-		if (this.subscribingNotes[payload.id] == null) {
-			this.subscribingNotes[payload.id] = 0;
-		}
+		const current = this.subscribingNotes[payload.id] ?? 0;
+		const updated = current + 1;
+		this.subscribingNotes[payload.id] = updated;
 
-		this.subscribingNotes[payload.id]++;
-
-		if (this.subscribingNotes[payload.id] === 1) {
+		if (updated === 1) {
 			this.subscriber.on(`noteStream:${payload.id}`, this.onNoteStreamMessage);
 		}
 	}
@@ -189,11 +190,14 @@ export default class Connection {
 	 * 投稿購読解除要求時
 	 */
 	@bindThis
-	private onUnsubscribeNote(payload: any) {
-		if (!payload.id) return;
+	private onUnsubscribeNote(payload: JsonObject) {
+		if (!payload.id || typeof payload.id !== 'string') return;
 
-		this.subscribingNotes[payload.id]--;
-		if (this.subscribingNotes[payload.id] <= 0) {
+		const current = this.subscribingNotes[payload.id];
+		if (current == null) return;
+		const updated = current - 1;
+		this.subscribingNotes[payload.id] = updated;
+		if (updated <= 0) {
 			delete this.subscribingNotes[payload.id];
 			this.subscriber.off(`noteStream:${payload.id}`, this.onNoteStreamMessage);
 		}
@@ -212,17 +216,22 @@ export default class Connection {
 	 * チャンネル接続要求時
 	 */
 	@bindThis
-	private onChannelConnectRequested(payload: any) {
+	private onChannelConnectRequested(payload: JsonObject) {
 		const { channel, id, params, pong } = payload;
-		this.connectChannel(id, params, channel, pong);
+		if (typeof id !== 'string') return;
+		if (typeof channel !== 'string') return;
+		if (typeof pong !== 'boolean' && typeof pong !== 'undefined' && pong !== null) return;
+		if (typeof params !== 'undefined' && (typeof params !== 'object' || params === null || Array.isArray(params))) return;
+		this.connectChannel(id, params, channel, pong ?? undefined);
 	}
 
 	/**
 	 * チャンネル切断要求時
 	 */
 	@bindThis
-	private onChannelDisconnectRequested(payload: any) {
+	private onChannelDisconnectRequested(payload: JsonObject) {
 		const { id } = payload;
+		if (typeof id !== 'string') return;
 		this.disconnectChannel(id);
 	}
 
@@ -230,7 +239,7 @@ export default class Connection {
 	 * クライアントにメッセージ送信
 	 */
 	@bindThis
-	public sendMessageToWs(type: string, payload: any) {
+	public sendMessageToWs(type: string, payload: JsonObject) {
 		this.wsConnection.send(JSON.stringify({
 			type: type,
 			body: payload,
@@ -241,7 +250,7 @@ export default class Connection {
 	 * チャンネルに接続
 	 */
 	@bindThis
-	public connectChannel(id: string, params: any, channel: string, pong = false) {
+	public connectChannel(id: string, params: JsonObject | undefined, channel: string, pong = false) {
 		const channelService = this.channelsService.getChannelService(channel);
 
 		if (channelService.requireCredential && this.user == null) {
@@ -288,7 +297,11 @@ export default class Connection {
 	 * @param data メッセージ
 	 */
 	@bindThis
-	private onChannelMessageRequested(data: any) {
+	private onChannelMessageRequested(data: JsonObject) {
+		if (typeof data.id !== 'string') return;
+		if (typeof data.type !== 'string') return;
+		if (typeof data.body === 'undefined') return;
+
 		const channel = this.channels.find(c => c.id === data.id);
 		if (channel != null && channel.onMessage != null) {
 			channel.onMessage(data.type, data.body);
diff --git a/packages/backend/src/server/api/stream/channel.ts b/packages/backend/src/server/api/stream/channel.ts
index a267d27fba..84cb552369 100644
--- a/packages/backend/src/server/api/stream/channel.ts
+++ b/packages/backend/src/server/api/stream/channel.ts
@@ -8,6 +8,7 @@ import { isInstanceMuted } from '@/misc/is-instance-muted.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
 import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
 import type { Packed } from '@/misc/json-schema.js';
+import type { JsonObject, JsonValue } from '@/misc/json-value.js';
 import type Connection from './Connection.js';
 
 /**
@@ -81,10 +82,12 @@ export default abstract class Channel {
 		this.connection = connection;
 	}
 
+	public send(payload: { type: string, body: JsonValue }): void
+	public send(type: string, payload: JsonValue): void
 	@bindThis
-	public send(typeOrPayload: any, payload?: any) {
-		const type = payload === undefined ? typeOrPayload.type : typeOrPayload;
-		const body = payload === undefined ? typeOrPayload.body : payload;
+	public send(typeOrPayload: { type: string, body: JsonValue } | string, payload?: JsonValue) {
+		const type = payload === undefined ? (typeOrPayload as { type: string, body: JsonValue }).type : (typeOrPayload as string);
+		const body = payload === undefined ? (typeOrPayload as { type: string, body: JsonValue }).body : payload;
 
 		this.connection.sendMessageToWs('channel', {
 			id: this.id,
@@ -93,11 +96,11 @@ export default abstract class Channel {
 		});
 	}
 
-	public abstract init(params: any): void;
+	public abstract init(params: JsonObject): void;
 
 	public dispose?(): void;
 
-	public onMessage?(type: string, body: any): void;
+	public onMessage?(type: string, body: JsonValue): void;
 }
 
 export type MiChannelService<T extends boolean> = {
diff --git a/packages/backend/src/server/api/stream/channels/admin.ts b/packages/backend/src/server/api/stream/channels/admin.ts
index 92b6d2ac04..355d5dba21 100644
--- a/packages/backend/src/server/api/stream/channels/admin.ts
+++ b/packages/backend/src/server/api/stream/channels/admin.ts
@@ -5,6 +5,7 @@
 
 import { Injectable } from '@nestjs/common';
 import { bindThis } from '@/decorators.js';
+import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
 class AdminChannel extends Channel {
@@ -14,7 +15,7 @@ class AdminChannel extends Channel {
 	public static kind = 'read:admin:stream';
 
 	@bindThis
-	public async init(params: any) {
+	public async init(params: JsonObject) {
 		// Subscribe admin stream
 		this.subscriber.on(`adminStream:${this.user!.id}`, data => {
 			this.send(data);
diff --git a/packages/backend/src/server/api/stream/channels/antenna.ts b/packages/backend/src/server/api/stream/channels/antenna.ts
index 4a1d2dd109..53dc7f18b6 100644
--- a/packages/backend/src/server/api/stream/channels/antenna.ts
+++ b/packages/backend/src/server/api/stream/channels/antenna.ts
@@ -7,6 +7,7 @@ import { Injectable } from '@nestjs/common';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { bindThis } from '@/decorators.js';
 import type { GlobalEvents } from '@/core/GlobalEventService.js';
+import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
 class AntennaChannel extends Channel {
@@ -27,8 +28,9 @@ class AntennaChannel extends Channel {
 	}
 
 	@bindThis
-	public async init(params: any) {
-		this.antennaId = params.antennaId as string;
+	public async init(params: JsonObject) {
+		if (typeof params.antennaId !== 'string') return;
+		this.antennaId = params.antennaId;
 
 		// Subscribe stream
 		this.subscriber.on(`antennaStream:${this.antennaId}`, this.onEvent);
diff --git a/packages/backend/src/server/api/stream/channels/channel.ts b/packages/backend/src/server/api/stream/channels/channel.ts
index 140dd3dd9b..7108e0cd6e 100644
--- a/packages/backend/src/server/api/stream/channels/channel.ts
+++ b/packages/backend/src/server/api/stream/channels/channel.ts
@@ -8,6 +8,7 @@ import type { Packed } from '@/misc/json-schema.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { bindThis } from '@/decorators.js';
 import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
+import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
 class ChannelChannel extends Channel {
@@ -27,8 +28,9 @@ class ChannelChannel extends Channel {
 	}
 
 	@bindThis
-	public async init(params: any) {
-		this.channelId = params.channelId as string;
+	public async init(params: JsonObject) {
+		if (typeof params.channelId !== 'string') return;
+		this.channelId = params.channelId;
 
 		// Subscribe stream
 		this.subscriber.on('notesStream', this.onNote);
diff --git a/packages/backend/src/server/api/stream/channels/drive.ts b/packages/backend/src/server/api/stream/channels/drive.ts
index 0d9b486305..03768f3d23 100644
--- a/packages/backend/src/server/api/stream/channels/drive.ts
+++ b/packages/backend/src/server/api/stream/channels/drive.ts
@@ -5,6 +5,7 @@
 
 import { Injectable } from '@nestjs/common';
 import { bindThis } from '@/decorators.js';
+import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
 class DriveChannel extends Channel {
@@ -14,7 +15,7 @@ class DriveChannel extends Channel {
 	public static kind = 'read:account';
 
 	@bindThis
-	public async init(params: any) {
+	public async init(params: JsonObject) {
 		// Subscribe drive stream
 		this.subscriber.on(`driveStream:${this.user!.id}`, data => {
 			this.send(data);
diff --git a/packages/backend/src/server/api/stream/channels/global-timeline.ts b/packages/backend/src/server/api/stream/channels/global-timeline.ts
index 17116258d8..ed56fe0d40 100644
--- a/packages/backend/src/server/api/stream/channels/global-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/global-timeline.ts
@@ -10,6 +10,7 @@ import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
 import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
+import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
 class GlobalTimelineChannel extends Channel {
@@ -32,12 +33,12 @@ class GlobalTimelineChannel extends Channel {
 	}
 
 	@bindThis
-	public async init(params: any) {
+	public async init(params: JsonObject) {
 		const policies = await this.roleService.getUserPolicies(this.user ? this.user.id : null);
 		if (!policies.gtlAvailable) return;
 
-		this.withRenotes = params.withRenotes ?? true;
-		this.withFiles = params.withFiles ?? false;
+		this.withRenotes = !!(params.withRenotes ?? true);
+		this.withFiles = !!(params.withFiles ?? false);
 
 		// Subscribe events
 		this.subscriber.on('notesStream', this.onNote);
diff --git a/packages/backend/src/server/api/stream/channels/hashtag.ts b/packages/backend/src/server/api/stream/channels/hashtag.ts
index 57bada5d9c..8105f15cb1 100644
--- a/packages/backend/src/server/api/stream/channels/hashtag.ts
+++ b/packages/backend/src/server/api/stream/channels/hashtag.ts
@@ -9,6 +9,7 @@ import type { Packed } from '@/misc/json-schema.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { bindThis } from '@/decorators.js';
 import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
+import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
 class HashtagChannel extends Channel {
@@ -28,11 +29,11 @@ class HashtagChannel extends Channel {
 	}
 
 	@bindThis
-	public async init(params: any) {
+	public async init(params: JsonObject) {
+		if (!Array.isArray(params.q)) return;
+		if (!params.q.every(x => Array.isArray(x) && x.every(y => typeof y === 'string'))) return;
 		this.q = params.q;
 
-		if (this.q == null) return;
-
 		// Subscribe stream
 		this.subscriber.on('notesStream', this.onNote);
 	}
diff --git a/packages/backend/src/server/api/stream/channels/home-timeline.ts b/packages/backend/src/server/api/stream/channels/home-timeline.ts
index 878a3180cb..1f440732a6 100644
--- a/packages/backend/src/server/api/stream/channels/home-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/home-timeline.ts
@@ -8,6 +8,7 @@ import type { Packed } from '@/misc/json-schema.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { bindThis } from '@/decorators.js';
 import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
+import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
 class HomeTimelineChannel extends Channel {
@@ -29,9 +30,9 @@ class HomeTimelineChannel extends Channel {
 	}
 
 	@bindThis
-	public async init(params: any) {
-		this.withRenotes = params.withRenotes ?? true;
-		this.withFiles = params.withFiles ?? false;
+	public async init(params: JsonObject) {
+		this.withRenotes = !!(params.withRenotes ?? true);
+		this.withFiles = !!(params.withFiles ?? false);
 
 		this.subscriber.on('notesStream', this.onNote);
 	}
diff --git a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
index 575d23d53c..6938b6e3ea 100644
--- a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
@@ -10,6 +10,7 @@ import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
 import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
+import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
 class HybridTimelineChannel extends Channel {
@@ -34,13 +35,13 @@ class HybridTimelineChannel extends Channel {
 	}
 
 	@bindThis
-	public async init(params: any): Promise<void> {
+	public async init(params: JsonObject): Promise<void> {
 		const policies = await this.roleService.getUserPolicies(this.user ? this.user.id : null);
 		if (!policies.ltlAvailable) return;
 
-		this.withRenotes = params.withRenotes ?? true;
-		this.withReplies = params.withReplies ?? false;
-		this.withFiles = params.withFiles ?? false;
+		this.withRenotes = !!(params.withRenotes ?? true);
+		this.withReplies = !!(params.withReplies ?? false);
+		this.withFiles = !!(params.withFiles ?? false);
 
 		// Subscribe events
 		this.subscriber.on('notesStream', this.onNote);
diff --git a/packages/backend/src/server/api/stream/channels/local-timeline.ts b/packages/backend/src/server/api/stream/channels/local-timeline.ts
index 442d08ae51..491029f5de 100644
--- a/packages/backend/src/server/api/stream/channels/local-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/local-timeline.ts
@@ -10,6 +10,7 @@ import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
 import { isQuotePacked, isRenotePacked } from '@/misc/is-renote.js';
+import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
 class LocalTimelineChannel extends Channel {
@@ -33,13 +34,13 @@ class LocalTimelineChannel extends Channel {
 	}
 
 	@bindThis
-	public async init(params: any) {
+	public async init(params: JsonObject) {
 		const policies = await this.roleService.getUserPolicies(this.user ? this.user.id : null);
 		if (!policies.ltlAvailable) return;
 
-		this.withRenotes = params.withRenotes ?? true;
-		this.withReplies = params.withReplies ?? false;
-		this.withFiles = params.withFiles ?? false;
+		this.withRenotes = !!(params.withRenotes ?? true);
+		this.withReplies = !!(params.withReplies ?? false);
+		this.withFiles = !!(params.withFiles ?? false);
 
 		// Subscribe events
 		this.subscriber.on('notesStream', this.onNote);
diff --git a/packages/backend/src/server/api/stream/channels/main.ts b/packages/backend/src/server/api/stream/channels/main.ts
index a12976d69d..863d7f4c4e 100644
--- a/packages/backend/src/server/api/stream/channels/main.ts
+++ b/packages/backend/src/server/api/stream/channels/main.ts
@@ -7,6 +7,7 @@ import { Injectable } from '@nestjs/common';
 import { isInstanceMuted, isUserFromMutedInstance } from '@/misc/is-instance-muted.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { bindThis } from '@/decorators.js';
+import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
 class MainChannel extends Channel {
@@ -25,7 +26,7 @@ class MainChannel extends Channel {
 	}
 
 	@bindThis
-	public async init(params: any) {
+	public async init(params: JsonObject) {
 		// Subscribe main stream channel
 		this.subscriber.on(`mainStream:${this.user!.id}`, async data => {
 			switch (data.type) {
diff --git a/packages/backend/src/server/api/stream/channels/queue-stats.ts b/packages/backend/src/server/api/stream/channels/queue-stats.ts
index 061aa76904..ff7e740226 100644
--- a/packages/backend/src/server/api/stream/channels/queue-stats.ts
+++ b/packages/backend/src/server/api/stream/channels/queue-stats.ts
@@ -6,6 +6,7 @@
 import Xev from 'xev';
 import { Injectable } from '@nestjs/common';
 import { bindThis } from '@/decorators.js';
+import type { JsonObject, JsonValue } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
 const ev = new Xev();
@@ -22,19 +23,22 @@ class QueueStatsChannel extends Channel {
 	}
 
 	@bindThis
-	public async init(params: any) {
+	public async init(params: JsonObject) {
 		ev.addListener('queueStats', this.onStats);
 	}
 
 	@bindThis
-	private onStats(stats: any) {
+	private onStats(stats: JsonObject) {
 		this.send('stats', stats);
 	}
 
 	@bindThis
-	public onMessage(type: string, body: any) {
+	public onMessage(type: string, body: JsonValue) {
 		switch (type) {
 			case 'requestLog':
+				if (typeof body !== 'object' || body === null || Array.isArray(body)) return;
+				if (typeof body.id !== 'string') return;
+				if (typeof body.length !== 'number') return;
 				ev.once(`queueStatsLog:${body.id}`, statsLog => {
 					this.send('statsLog', statsLog);
 				});
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 f4a3a09367..17823a164a 100644
--- a/packages/backend/src/server/api/stream/channels/reversi-game.ts
+++ b/packages/backend/src/server/api/stream/channels/reversi-game.ts
@@ -9,6 +9,7 @@ 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 type { JsonObject, JsonValue } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
 class ReversiGameChannel extends Channel {
@@ -28,25 +29,41 @@ class ReversiGameChannel extends Channel {
 	}
 
 	@bindThis
-	public async init(params: any) {
-		this.gameId = params.gameId as string;
+	public async init(params: JsonObject) {
+		if (typeof params.gameId !== 'string') return;
+		this.gameId = params.gameId;
 
 		this.subscriber.on(`reversiGameStream:${this.gameId}`, this.send);
 	}
 
 	@bindThis
-	public onMessage(type: string, body: any) {
+	public onMessage(type: string, body: JsonValue) {
 		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 'ready':
+				if (typeof body !== 'boolean') return;
+				this.ready(body);
+				break;
+			case 'updateSettings':
+				if (typeof body !== 'object' || body === null || Array.isArray(body)) return;
+				if (typeof body.key !== 'string') return;
+				if (typeof body.value !== 'object' || body.value === null || Array.isArray(body.value)) return;
+				this.updateSettings(body.key, body.value);
+				break;
+			case 'cancel':
+				this.cancelGame();
+				break;
+			case 'putStone':
+				if (typeof body !== 'object' || body === null || Array.isArray(body)) return;
+				if (typeof body.pos !== 'number') return;
+				if (typeof body.id !== 'string') return;
+				this.putStone(body.pos, body.id);
+				break;
 			case 'claimTimeIsUp': this.claimTimeIsUp(); break;
 		}
 	}
 
 	@bindThis
-	private async updateSettings(key: string, value: any) {
+	private async updateSettings(key: string, value: JsonObject) {
 		if (this.user == null) return;
 
 		this.reversiService.updateSettings(this.gameId!, this.user, key, value);
diff --git a/packages/backend/src/server/api/stream/channels/reversi.ts b/packages/backend/src/server/api/stream/channels/reversi.ts
index 3998a0fd36..6e88939724 100644
--- a/packages/backend/src/server/api/stream/channels/reversi.ts
+++ b/packages/backend/src/server/api/stream/channels/reversi.ts
@@ -5,6 +5,7 @@
 
 import { Injectable } from '@nestjs/common';
 import { bindThis } from '@/decorators.js';
+import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
 class ReversiChannel extends Channel {
@@ -21,7 +22,7 @@ class ReversiChannel extends Channel {
 	}
 
 	@bindThis
-	public async init(params: any) {
+	public async init(params: JsonObject) {
 		this.subscriber.on(`reversiStream:${this.user!.id}`, this.send);
 	}
 
diff --git a/packages/backend/src/server/api/stream/channels/role-timeline.ts b/packages/backend/src/server/api/stream/channels/role-timeline.ts
index 6a4ad22460..fcfa26c38b 100644
--- a/packages/backend/src/server/api/stream/channels/role-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/role-timeline.ts
@@ -8,6 +8,7 @@ import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
 import type { GlobalEvents } from '@/core/GlobalEventService.js';
+import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
 class RoleTimelineChannel extends Channel {
@@ -28,8 +29,9 @@ class RoleTimelineChannel extends Channel {
 	}
 
 	@bindThis
-	public async init(params: any) {
-		this.roleId = params.roleId as string;
+	public async init(params: JsonObject) {
+		if (typeof params.roleId !== 'string') return;
+		this.roleId = params.roleId;
 
 		this.subscriber.on(`roleTimelineStream:${this.roleId}`, this.onEvent);
 	}
diff --git a/packages/backend/src/server/api/stream/channels/server-stats.ts b/packages/backend/src/server/api/stream/channels/server-stats.ts
index eb4d8c9992..6258afba35 100644
--- a/packages/backend/src/server/api/stream/channels/server-stats.ts
+++ b/packages/backend/src/server/api/stream/channels/server-stats.ts
@@ -6,6 +6,7 @@
 import Xev from 'xev';
 import { Injectable } from '@nestjs/common';
 import { bindThis } from '@/decorators.js';
+import type { JsonObject, JsonValue } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
 const ev = new Xev();
@@ -22,19 +23,20 @@ class ServerStatsChannel extends Channel {
 	}
 
 	@bindThis
-	public async init(params: any) {
+	public async init(params: JsonObject) {
 		ev.addListener('serverStats', this.onStats);
 	}
 
 	@bindThis
-	private onStats(stats: any) {
+	private onStats(stats: JsonObject) {
 		this.send('stats', stats);
 	}
 
 	@bindThis
-	public onMessage(type: string, body: any) {
+	public onMessage(type: string, body: JsonValue) {
 		switch (type) {
 			case 'requestLog':
+				if (typeof body !== 'object' || body === null || Array.isArray(body)) return;
 				ev.once(`serverStatsLog:${body.id}`, statsLog => {
 					this.send('statsLog', statsLog);
 				});
diff --git a/packages/backend/src/server/api/stream/channels/user-list.ts b/packages/backend/src/server/api/stream/channels/user-list.ts
index 14b30a157c..4f38351e94 100644
--- a/packages/backend/src/server/api/stream/channels/user-list.ts
+++ b/packages/backend/src/server/api/stream/channels/user-list.ts
@@ -10,6 +10,7 @@ import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
+import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
 class UserListChannel extends Channel {
@@ -36,10 +37,11 @@ class UserListChannel extends Channel {
 	}
 
 	@bindThis
-	public async init(params: any) {
-		this.listId = params.listId as string;
-		this.withFiles = params.withFiles ?? false;
-		this.withRenotes = params.withRenotes ?? true;
+	public async init(params: JsonObject) {
+		if (typeof params.listId !== 'string') return;
+		this.listId = params.listId;
+		this.withFiles = !!(params.withFiles ?? false);
+		this.withRenotes = !!(params.withRenotes ?? true);
 
 		// Check existence and owner
 		const listExist = await this.userListsRepository.exists({

From 615e60f25cde9115f0e044200e8adcab5eb5004d Mon Sep 17 00:00:00 2001
From: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>
Date: Fri, 19 Jul 2024 09:52:39 +0900
Subject: [PATCH 082/221] chore: modernize issue template (#14263)

---
 .github/ISSUE_TEMPLATE/01_bug-report.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/01_bug-report.yml b/.github/ISSUE_TEMPLATE/01_bug-report.yml
index ac2b39cc12..315e712c30 100644
--- a/.github/ISSUE_TEMPLATE/01_bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/01_bug-report.yml
@@ -53,8 +53,8 @@ body:
         Examples:
           * Model and OS of the device(s): MacBook Pro (14inch, 2021), macOS Ventura 13.4
           * Browser: Chrome 113.0.5672.126
-          * Server URL: misskey.io
-          * Misskey: 13.x.x
+          * Server URL: misskey.example.com
+          * Misskey: 2024.x.x
       value: |
         * Model and OS of the device(s):
         * Browser:
@@ -74,11 +74,11 @@ body:
 
         Examples:
           * Installation Method or Hosting Service: docker compose, k8s/docker, systemd, "Misskey install shell script", development environment
-          * Misskey: 13.x.x
+          * Misskey: 2024.x.x
           * Node: 20.x.x
           * PostgreSQL: 15.x.x
           * Redis: 7.x.x
-          * OS and Architecture: Ubuntu 22.04.2 LTS aarch64
+          * OS and Architecture: Ubuntu 24.04.2 LTS aarch64
       value: |
         * Installation Method or Hosting Service:
         * Misskey:

From 54d0a4637847aa13700b40ecb1d5edabd048cc2c Mon Sep 17 00:00:00 2001
From: taichan <40626578+tai-cha@users.noreply.github.com>
Date: Fri, 19 Jul 2024 09:53:49 +0900
Subject: [PATCH 083/221] =?UTF-8?q?fix(frontend):=20=E5=80=8B=E4=BA=BA?=
 =?UTF-8?q?=E5=AE=9B=E3=81=A6=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0?=
 =?UTF-8?q?=E3=81=8A=E7=9F=A5=E3=82=89=E3=81=9B=E3=81=8C=E5=8D=B3=E6=99=82?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C=20(#14260)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): 個人向けお知らせが即時ダイアログで出ない問題

* Update CHANGELOG
---
 CHANGELOG.md                            |  1 +
 packages/frontend/src/boot/main-boot.ts | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14d638ebe1..1e06f16bdf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/574)
 - Fix: Twitchの埋め込みが開けない問題を修正
 - Fix: 子メニューの高さがウィンドウからはみ出ることがある問題を修正
+- Fix: 個人宛てのダイアログ形式のお知らせが即時表示されない問題を修正
 
 ### Server
 - Feat: レートリミット制限に引っかかったときに`Retry-After`ヘッダーを返すように (#13949)
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index d327016317..2a549d1e8b 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -5,6 +5,7 @@
 
 import { createApp, defineAsyncComponent, markRaw } from 'vue';
 import { common } from './common.js';
+import type * as Misskey from 'misskey-js';
 import { ui } from '@/config.js';
 import { i18n } from '@/i18n.js';
 import { alert, confirm, popup, post, toast } from '@/os.js';
@@ -113,7 +114,7 @@ export async function mainBoot() {
 			});
 		}
 
-		stream.on('announcementCreated', (ev) => {
+		function onAnnouncementCreated (ev: { announcement: Misskey.entities.Announcement }) {
 			const announcement = ev.announcement;
 			if (announcement.display === 'dialog') {
 				const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkAnnouncementDialog.vue')), {
@@ -122,7 +123,9 @@ export async function mainBoot() {
 					closed: () => dispose(),
 				});
 			}
-		});
+		}
+
+		stream.on('announcementCreated', onAnnouncementCreated);
 
 		if ($i.isDeleted) {
 			alert({
@@ -315,6 +318,9 @@ export async function mainBoot() {
 			updateAccount({ hasUnreadAnnouncement: false });
 		});
 
+		// 個人宛てお知らせが発行されたとき
+		main.on('announcementCreated', onAnnouncementCreated);
+
 		// トークンが再生成されたとき
 		// このままではMisskeyが利用できないので強制的にサインアウトさせる
 		main.on('myTokenRegenerated', () => {

From 1f24a8cb5a307c3ff621577189a2a618b9dcfdc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 19 Jul 2024 09:57:01 +0900
Subject: [PATCH 084/221] =?UTF-8?q?enhance(frontend):=20=E3=82=BB=E3=83=B3?=
 =?UTF-8?q?=E3=82=B7=E3=83=86=E3=82=A3=E3=83=96=E3=81=AA=E3=83=A1=E3=83=87?=
 =?UTF-8?q?=E3=82=A3=E3=82=A2=E3=82=92=E9=96=8B=E3=81=8F=E9=9A=9B=E3=81=AB?=
 =?UTF-8?q?=E7=A2=BA=E8=AA=8D=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0?=
 =?UTF-8?q?=E3=82=92=E5=87=BA=E3=81=9B=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=20(#14115)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance(frontend): センシティブなメディアを開く際に確認ダイアログを出せるように

* Update Changelog
---
 CHANGELOG.md                                  |  1 +
 locales/index.d.ts                            |  8 ++++++
 locales/ja-JP.yml                             |  2 ++
 .../frontend/src/components/MkMediaAudio.vue  | 14 +++++++++-
 .../frontend/src/components/MkMediaBanner.vue | 26 ++++++++++++-------
 .../frontend/src/components/MkMediaImage.vue  | 12 ++++++++-
 .../frontend/src/components/MkMediaList.vue   |  8 +++---
 .../frontend/src/components/MkMediaVideo.vue  | 14 +++++++++-
 .../frontend/src/pages/settings/general.vue   |  3 +++
 packages/frontend/src/store.ts                |  4 +++
 10 files changed, 75 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e06f16bdf..7cf77d6083 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
   (Cherry-picked from https://github.com/taiyme/misskey/pull/238)
 - Enhance: AiScriptを0.19.0にアップデート
 - Enhance: Allow negative delay for MFM animation elements (`tada`, `jelly`, `twitch`, `shake`, `spin`, `jump`, `bounce`, `rainbow`)
+- Enhance: センシティブなメディアを開く際に確認ダイアログを出せるように
 - Fix: `/about#federation` ページなどで各インスタンスのチャートが表示されなくなっていた問題を修正
 - Fix: ユーザーページの追加情報のラベルを投稿者のサーバーの絵文字で表示する (#13968)
 - Fix: リバーシの対局を正しく共有できないことがある問題を修正
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 694ee53a1f..55c65f2aed 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -5008,6 +5008,14 @@ export interface Locale extends ILocale {
      * もう一度お試しください。
      */
     "tryAgain": string;
+    /**
+     * センシティブなメディアを表示するとき確認する
+     */
+    "confirmWhenRevealingSensitiveMedia": string;
+    /**
+     * センシティブなメディアです。表示しますか？
+     */
+    "sensitiveMediaRevealConfirm": string;
     "_delivery": {
         /**
          * 配信状態
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index bb3999f0e3..3ca4b46682 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1248,6 +1248,8 @@ noDescription: "説明文はありません"
 alwaysConfirmFollow: "フォローの際常に確認する"
 inquiry: "お問い合わせ"
 tryAgain: "もう一度お試しください。"
+confirmWhenRevealingSensitiveMedia: "センシティブなメディアを表示するとき確認する"
+sensitiveMediaRevealConfirm: "センシティブなメディアです。表示しますか？"
 
 _delivery:
   status: "配信状態"
diff --git a/packages/frontend/src/components/MkMediaAudio.vue b/packages/frontend/src/components/MkMediaAudio.vue
index 582cf238c0..a080550ddf 100644
--- a/packages/frontend/src/components/MkMediaAudio.vue
+++ b/packages/frontend/src/components/MkMediaAudio.vue
@@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	@contextmenu.stop
 	@keydown.stop
 >
-	<button v-if="hide" :class="$style.hidden" @click="hide = false">
+	<button v-if="hide" :class="$style.hidden" @click="show">
 		<div :class="$style.hiddenTextWrapper">
 			<b v-if="audio.isSensitive" style="display: block;"><i class="ti ti-eye-exclamation"></i> {{ i18n.ts.sensitive }}{{ defaultStore.state.dataSaver.media ? ` (${i18n.ts.audio}${audio.size ? ' ' + bytes(audio.size) : ''})` : '' }}</b>
 			<b v-else style="display: block;"><i class="ti ti-music"></i> {{ defaultStore.state.dataSaver.media && audio.size ? bytes(audio.size) : i18n.ts.audio }}</b>
@@ -156,6 +156,18 @@ const audioEl = shallowRef<HTMLAudioElement>();
 // eslint-disable-next-line vue/no-setup-props-reactivity-loss
 const hide = ref((defaultStore.state.nsfw === 'force' || defaultStore.state.dataSaver.media) ? true : (props.audio.isSensitive && defaultStore.state.nsfw !== 'ignore'));
 
+async function show() {
+	if (props.audio.isSensitive && defaultStore.state.confirmWhenRevealingSensitiveMedia) {
+		const { canceled } = await os.confirm({
+			type: 'question',
+			text: i18n.ts.sensitiveMediaRevealConfirm,
+		});
+		if (canceled) return;
+	}
+
+	hide.value = false;
+}
+
 // Menu
 const menuShowing = ref(false);
 
diff --git a/packages/frontend/src/components/MkMediaBanner.vue b/packages/frontend/src/components/MkMediaBanner.vue
index a219848b7f..11995e1f3b 100644
--- a/packages/frontend/src/components/MkMediaBanner.vue
+++ b/packages/frontend/src/components/MkMediaBanner.vue
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <div :class="$style.root">
 	<MkMediaAudio v-if="media.type.startsWith('audio') && media.type !== 'audio/midi'" :audio="media"/>
-	<div v-else-if="media.isSensitive && hide" :class="$style.sensitive" @click="hide = false">
+	<div v-else-if="media.isSensitive && hide" :class="$style.sensitive" @click="show">
 		<span style="font-size: 1.6em;"><i class="ti ti-alert-triangle"></i></span>
 		<b>{{ i18n.ts.sensitive }}</b>
 		<span>{{ i18n.ts.clickToShow }}</span>
@@ -24,24 +24,30 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, watch, ref } from 'vue';
+import { ref } from 'vue';
 import * as Misskey from 'misskey-js';
 import { i18n } from '@/i18n.js';
+import { defaultStore } from '@/store.js';
+import * as os from '@/os.js';
 import MkMediaAudio from '@/components/MkMediaAudio.vue';
 
-const props = withDefaults(defineProps<{
+const props = defineProps<{
 	media: Misskey.entities.DriveFile;
-}>(), {
-});
+}>();
 
-const audioEl = shallowRef<HTMLAudioElement>();
 const hide = ref(true);
 
-watch(audioEl, () => {
-	if (audioEl.value) {
-		audioEl.value.volume = 0.3;
+async function show() {
+	if (props.media.isSensitive && defaultStore.state.confirmWhenRevealingSensitiveMedia) {
+		const { canceled } = await os.confirm({
+			type: 'question',
+			text: i18n.ts.sensitiveMediaRevealConfirm,
+		});
+		if (canceled) return;
 	}
-});
+
+	hide.value = false;
+}
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/components/MkMediaImage.vue b/packages/frontend/src/components/MkMediaImage.vue
index 82f36fe5c4..0d1409e2c8 100644
--- a/packages/frontend/src/components/MkMediaImage.vue
+++ b/packages/frontend/src/components/MkMediaImage.vue
@@ -83,11 +83,21 @@ const url = computed(() => (props.raw || defaultStore.state.loadRawImages)
 		: props.image.thumbnailUrl,
 );
 
-function onclick() {
+async function onclick(ev: MouseEvent) {
 	if (!props.controls) {
 		return;
 	}
+
 	if (hide.value) {
+		ev.stopPropagation();
+		if (props.image.isSensitive && defaultStore.state.confirmWhenRevealingSensitiveMedia) {
+			const { canceled } = await os.confirm({
+				type: 'question',
+				text: i18n.ts.sensitiveMediaRevealConfirm,
+			});
+			if (canceled) return;
+		}
+
 		hide.value = false;
 	}
 }
diff --git a/packages/frontend/src/components/MkMediaList.vue b/packages/frontend/src/components/MkMediaList.vue
index 24b177d255..2300802dcf 100644
--- a/packages/frontend/src/components/MkMediaList.vue
+++ b/packages/frontend/src/components/MkMediaList.vue
@@ -138,15 +138,13 @@ onMounted(() => {
 		pswpModule: PhotoSwipe,
 	});
 
-	lightbox.on('itemData', (ev) => {
-		const { itemData } = ev;
-
+	lightbox.addFilter('itemData', (itemData) => {
 		// element is children
 		const { element } = itemData;
 
 		const id = element?.dataset.id;
 		const file = props.mediaList.find(media => media.id === id);
-		if (!file) return;
+		if (!file) return itemData;
 
 		itemData.src = file.url;
 		itemData.w = Number(file.properties.width);
@@ -158,6 +156,8 @@ onMounted(() => {
 		itemData.alt = file.comment ?? file.name;
 		itemData.comment = file.comment ?? file.name;
 		itemData.thumbCropped = true;
+
+		return itemData;
 	});
 
 	lightbox.on('uiRegister', () => {
diff --git a/packages/frontend/src/components/MkMediaVideo.vue b/packages/frontend/src/components/MkMediaVideo.vue
index 0ec0039df4..7c5a365148 100644
--- a/packages/frontend/src/components/MkMediaVideo.vue
+++ b/packages/frontend/src/components/MkMediaVideo.vue
@@ -18,7 +18,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	@contextmenu.stop
 	@keydown.stop
 >
-	<button v-if="hide" :class="$style.hidden" @click="hide = false">
+	<button v-if="hide" :class="$style.hidden" @click="show">
 		<div :class="$style.hiddenTextWrapper">
 			<b v-if="video.isSensitive" style="display: block;"><i class="ti ti-eye-exclamation"></i> {{ i18n.ts.sensitive }}{{ defaultStore.state.dataSaver.media ? ` (${i18n.ts.video}${video.size ? ' ' + bytes(video.size) : ''})` : '' }}</b>
 			<b v-else style="display: block;"><i class="ti ti-movie"></i> {{ defaultStore.state.dataSaver.media && video.size ? bytes(video.size) : i18n.ts.video }}</b>
@@ -176,6 +176,18 @@ function hasFocus() {
 // eslint-disable-next-line vue/no-setup-props-reactivity-loss
 const hide = ref((defaultStore.state.nsfw === 'force' || defaultStore.state.dataSaver.media) ? true : (props.video.isSensitive && defaultStore.state.nsfw !== 'ignore'));
 
+async function show() {
+	if (props.video.isSensitive && defaultStore.state.confirmWhenRevealingSensitiveMedia) {
+		const { canceled } = await os.confirm({
+			type: 'question',
+			text: i18n.ts.sensitiveMediaRevealConfirm,
+		});
+		if (canceled) return;
+	}
+
+	hide.value = false;
+}
+
 // Menu
 const menuShowing = ref(false);
 
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index cfc63f2a08..9e429f8dbd 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -169,6 +169,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkSwitch v-model="disableStreamingTimeline">{{ i18n.ts.disableStreamingTimeline }}</MkSwitch>
 				<MkSwitch v-model="enableHorizontalSwipe">{{ i18n.ts.enableHorizontalSwipe }}</MkSwitch>
 				<MkSwitch v-model="alwaysConfirmFollow">{{ i18n.ts.alwaysConfirmFollow }}</MkSwitch>
+				<MkSwitch v-model="confirmWhenRevealingSensitiveMedia">{{ i18n.ts.confirmWhenRevealingSensitiveMedia }}</MkSwitch>
 			</div>
 			<MkSelect v-model="serverDisconnectedBehavior">
 				<template #label>{{ i18n.ts.whenServerDisconnected }}</template>
@@ -315,6 +316,7 @@ const enableSeasonalScreenEffect = computed(defaultStore.makeGetterSetter('enabl
 const enableHorizontalSwipe = computed(defaultStore.makeGetterSetter('enableHorizontalSwipe'));
 const useNativeUIForVideoAudioPlayer = computed(defaultStore.makeGetterSetter('useNativeUIForVideoAudioPlayer'));
 const alwaysConfirmFollow = computed(defaultStore.makeGetterSetter('alwaysConfirmFollow'));
+const confirmWhenRevealingSensitiveMedia = computed(defaultStore.makeGetterSetter('confirmWhenRevealingSensitiveMedia'));
 
 watch(lang, () => {
 	miLocalStorage.setItem('lang', lang.value as string);
@@ -357,6 +359,7 @@ watch([
 	disableStreamingTimeline,
 	enableSeasonalScreenEffect,
 	alwaysConfirmFollow,
+	confirmWhenRevealingSensitiveMedia,
 ], async () => {
 	await reloadAsk();
 });
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 9cb2742069..dbf6b8716f 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -454,6 +454,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: true,
 	},
+	confirmWhenRevealingSensitiveMedia: {
+		where: 'device',
+		default: false,
+	},
 
 	sound_masterVolume: {
 		where: 'device',

From 6920f0fa7e5b0919572ee4ebaeb92a617ec344d1 Mon Sep 17 00:00:00 2001
From: woxtu <woxtup@gmail.com>
Date: Fri, 19 Jul 2024 10:05:34 +0900
Subject: [PATCH 085/221] Disable ESLint for migration files (#14262)

---
 packages/backend/eslint.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/eslint.config.js b/packages/backend/eslint.config.js
index 318b7fd340..4fd9f0cd51 100644
--- a/packages/backend/eslint.config.js
+++ b/packages/backend/eslint.config.js
@@ -4,7 +4,7 @@ import sharedConfig from '../shared/eslint.config.js';
 export default [
 	...sharedConfig,
 	{
-		ignores: ['**/node_modules', 'built', '@types/**/*'],
+		ignores: ['**/node_modules', 'built', '@types/**/*', 'migration'],
 	},
 	{
 		files: ['**/*.ts', '**/*.tsx'],

From 56a43dc01d15f1d41bbda9a973da18294389d7c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 19 Jul 2024 10:11:44 +0900
Subject: [PATCH 086/221] =?UTF-8?q?fix(frontend):=20blurhash=E3=81=8C?=
 =?UTF-8?q?=E7=84=A1=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AB=E4=BD=95=E3=82=82?=
 =?UTF-8?q?=E5=87=BA=E5=8A=9B=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=81=AE?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20(#14250)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): blurhashが無い場合に何も出力されないのを修正

* Update Changelog

* Update packages/frontend/src/components/MkImgWithBlurhash.vue

Co-authored-by: tamaina <tamaina@hotmail.co.jp>

* attempt to fix test

* Update packages/frontend/src/components/MkImgWithBlurhash.vue

Co-authored-by: tamaina <tamaina@hotmail.co.jp>

* attempt to ignore test

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
---
 CHANGELOG.md                                           |  1 +
 packages/frontend/src/components/MkImgWithBlurhash.vue | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cf77d6083..b020c214bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@
 - Fix: Twitchの埋め込みが開けない問題を修正
 - Fix: 子メニューの高さがウィンドウからはみ出ることがある問題を修正
 - Fix: 個人宛てのダイアログ形式のお知らせが即時表示されない問題を修正
+- Fix: 一部の画像がセンシティブ指定されているときに画面に何も表示されないことがあるのを修正
 
 ### Server
 - Feat: レートリミット制限に引っかかったときに`Retry-After`ヘッダーを返すように (#13949)
diff --git a/packages/frontend/src/components/MkImgWithBlurhash.vue b/packages/frontend/src/components/MkImgWithBlurhash.vue
index 617404f5c4..8d301f16bd 100644
--- a/packages/frontend/src/components/MkImgWithBlurhash.vue
+++ b/packages/frontend/src/components/MkImgWithBlurhash.vue
@@ -151,22 +151,26 @@ function drawImage(bitmap: CanvasImageSource) {
 }
 
 function drawAvg() {
-	if (!canvas.value || !props.hash) return;
+	if (!canvas.value) return;
+
+	const color = (props.hash != null && extractAvgColorFromBlurhash(props.hash)) || '#888';
 
 	const ctx = canvas.value.getContext('2d');
 	if (!ctx) return;
 
 	// avgColorでお茶をにごす
 	ctx.beginPath();
-	ctx.fillStyle = extractAvgColorFromBlurhash(props.hash) ?? '#888';
+	ctx.fillStyle = color;
 	ctx.fillRect(0, 0, canvasWidth.value, canvasHeight.value);
 }
 
 async function draw() {
-	if (props.hash == null) return;
+	if (import.meta.env.MODE === 'test' && props.hash == null) return;
 
 	drawAvg();
 
+	if (props.hash == null) return;
+
 	if (props.onlyAvgColor) return;
 
 	const work = await canvasPromise;

From efb04293bb01fba6d7d31278d6a8546eae2d9503 Mon Sep 17 00:00:00 2001
From: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
Date: Fri, 19 Jul 2024 16:47:12 +0900
Subject: [PATCH 087/221] docs(misskey-js): fix broken i-want-you image link in
 README.md (#14265)

---
 packages/misskey-js/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/misskey-js/README.md b/packages/misskey-js/README.md
index 63d4b36c56..4753e2434b 100644
--- a/packages/misskey-js/README.md
+++ b/packages/misskey-js/README.md
@@ -154,5 +154,5 @@ stream.on('_disconnected_', () => {
 ---
 
 <div align="center">
-	<a href="https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md"><img src="https://raw.githubusercontent.com/misskey-dev/assets/main/i-want-you.png" width="300"></a>
+	<a href="https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md"><img src="https://assets.misskey-hub.net/public/i-want-you.png" width="300"></a>
 </div>

From 337b42bcb179bdfb993888ed94342a0158e8f3cb Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 20 Jul 2024 21:33:20 +0900
Subject: [PATCH 088/221] revert 5f88d56d96
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

バグがある(かつすぐに修正できそうにない) & まだレビュー途中で意図せずマージされたため
---
 .config/docker_example.yml                    |   6 +-
 .config/example.yml                           |   8 +-
 .devcontainer/devcontainer.yml                |   8 +-
 CHANGELOG.md                                  |   8 -
 CONTRIBUTING.md                               |   2 +-
 chart/files/default.yml                       |   8 +-
 .../migration/1708980134301-APMultipleKeys.js |  39 ----
 .../migration/1709242519122-HttpSignImplLv.js |  16 --
 .../1709269211718-APMultipleKeysFix1.js       |  16 --
 packages/backend/package.json                 |   2 +-
 .../backend/src/@types/http-signature.d.ts    |  82 +++++++
 packages/backend/src/const.ts                 |   5 -
 .../backend/src/core/AccountUpdateService.ts  |  27 +--
 .../src/core/CreateSystemUserService.ts       |   7 +-
 .../src/core/FetchInstanceMetadataService.ts  |  61 ++---
 .../backend/src/core/GlobalEventService.ts    |   1 -
 .../backend/src/core/HttpRequestService.ts    |   2 +-
 packages/backend/src/core/QueueService.ts     |  17 +-
 packages/backend/src/core/RelayService.ts     |  13 +-
 packages/backend/src/core/SignupService.ts    |  22 +-
 .../backend/src/core/UserKeypairService.ts    | 155 +------------
 .../backend/src/core/UserSuspendService.ts    |  66 ++++--
 packages/backend/src/core/WebfingerService.ts |   2 +-
 .../core/activitypub/ApDbResolverService.ts   | 178 ++++-----------
 .../activitypub/ApDeliverManagerService.ts    |  95 +-------
 .../src/core/activitypub/ApInboxService.ts    |  11 +-
 .../src/core/activitypub/ApRendererService.ts |  21 +-
 .../src/core/activitypub/ApRequestService.ts  | 212 +++++++++++-------
 .../src/core/activitypub/ApResolverService.ts |   8 +-
 .../src/core/activitypub/misc/contexts.ts     |   1 -
 .../activitypub/models/ApPersonService.ts     | 114 ++--------
 packages/backend/src/core/activitypub/type.ts |  11 +-
 .../core/entities/InstanceEntityService.ts    |   1 -
 packages/backend/src/misc/cache.ts            |   3 -
 packages/backend/src/misc/gen-key-pair.ts     |  43 +++-
 packages/backend/src/models/Instance.ts       |   5 -
 packages/backend/src/models/UserKeypair.ts    |  24 +-
 packages/backend/src/models/UserPublickey.ts  |  14 +-
 .../models/json-schema/federation-instance.ts |   4 -
 .../src/queue/QueueProcessorService.ts        |   8 +-
 .../processors/DeliverProcessorService.ts     |  38 ++--
 .../queue/processors/InboxProcessorService.ts | 132 +++++------
 packages/backend/src/queue/types.ts           |  23 +-
 .../src/server/ActivityPubServerService.ts    |  91 +++++---
 .../src/server/NodeinfoServerService.ts       |   7 -
 .../endpoints/admin/queue/inbox-delayed.ts    |   3 +-
 packages/backend/test/e2e/timelines.ts        |  10 +-
 packages/backend/test/misc/mock-resolver.ts   |   2 -
 .../test/unit/FetchInstanceMetadataService.ts |  23 +-
 packages/backend/test/unit/ap-request.ts      |  90 +++-----
 packages/misskey-js/src/autogen/types.ts      |   1 -
 pnpm-lock.yaml                                |  44 ++--
 52 files changed, 691 insertions(+), 1099 deletions(-)
 delete mode 100644 packages/backend/migration/1708980134301-APMultipleKeys.js
 delete mode 100644 packages/backend/migration/1709242519122-HttpSignImplLv.js
 delete mode 100644 packages/backend/migration/1709269211718-APMultipleKeysFix1.js
 create mode 100644 packages/backend/src/@types/http-signature.d.ts

diff --git a/.config/docker_example.yml b/.config/docker_example.yml
index bd0ad2872a..d347882d1a 100644
--- a/.config/docker_example.yml
+++ b/.config/docker_example.yml
@@ -164,12 +164,12 @@ id: 'aidx'
 #clusterLimit: 1
 
 # Job concurrency per worker
-# deliverJobConcurrency: 16
-# inboxJobConcurrency: 4
+# deliverJobConcurrency: 128
+# inboxJobConcurrency: 16
 
 # Job rate limiter
 # deliverJobPerSec: 128
-# inboxJobPerSec: 64
+# inboxJobPerSec: 32
 
 # Job attempts
 # deliverJobMaxAttempts: 12
diff --git a/.config/example.yml b/.config/example.yml
index 0d525f61c4..b11cbd1373 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -230,15 +230,15 @@ id: 'aidx'
 #clusterLimit: 1
 
 # Job concurrency per worker
-#deliverJobConcurrency: 16
-#inboxJobConcurrency: 4
+#deliverJobConcurrency: 128
+#inboxJobConcurrency: 16
 #relationshipJobConcurrency: 16
 # What's relationshipJob?:
 #  Follow, unfollow, block and unblock(ings) while following-imports, etc. or account migrations.
 
 # Job rate limiter
-#deliverJobPerSec: 1024
-#inboxJobPerSec: 64
+#deliverJobPerSec: 128
+#inboxJobPerSec: 32
 #relationshipJobPerSec: 64
 
 # Job attempts
diff --git a/.devcontainer/devcontainer.yml b/.devcontainer/devcontainer.yml
index d74d741e02..beefcfd0a2 100644
--- a/.devcontainer/devcontainer.yml
+++ b/.devcontainer/devcontainer.yml
@@ -157,12 +157,12 @@ id: 'aidx'
 #clusterLimit: 1
 
 # Job concurrency per worker
-# deliverJobConcurrency: 16
-# inboxJobConcurrency: 4
+# deliverJobConcurrency: 128
+# inboxJobConcurrency: 16
 
 # Job rate limiter
-# deliverJobPerSec: 1024
-# inboxJobPerSec: 64
+# deliverJobPerSec: 128
+# inboxJobPerSec: 32
 
 # Job attempts
 # deliverJobMaxAttempts: 12
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b020c214bc..f429033aa0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,14 +8,6 @@
 - Feat: 通報を受けた際、または解決した際に、予め登録した宛先に通知を飛ばせるように(mail or webhook) #13705
 - Feat: ユーザーのアイコン/バナーの変更可否をロールで設定可能に
   - 変更不可となっていても、設定済みのものを解除してデフォルト画像に戻すことは出来ます
-- Feat: 連合に使うHTTP SignaturesがEd25519鍵に対応するように #13464
-  - Ed25519署名に対応するサーバーが増えると、deliverで要求されるサーバーリソースが削減されます
-	- ジョブキューのconfig設定のデフォルト値を変更しました。  
-	  default.ymlでジョブキューの並列度を設定している場合は、従前よりもconcurrencyの値をより下げるとパフォーマンスが改善する可能性があります。
-		* deliverJobConcurrency: 16 (←128)
-		* deliverJobPerSec: 1024 (←128)
-		* inboxJobConcurrency: 4 (←16)
-		* inboxJobPerSec: 64 (←32)
 - Fix: 配信停止したインスタンス一覧が見れなくなる問題を修正
 - Fix: Dockerコンテナの立ち上げ時に`pnpm`のインストールで固まることがある問題
 - Fix: デフォルトテーマに無効なテーマコードを入力するとUIが使用できなくなる問題を修正
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9a56345e6e..afc21ea594 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -197,7 +197,7 @@ TODO
 ## Environment Variable
 
 - `MISSKEY_CONFIG_YML`: Specify the file path of config.yml instead of default.yml (e.g. `2nd.yml`).
-- `MISSKEY_USE_HTTP`: If it's set true, federation requests (like nodeinfo and webfinger) will be http instead of https, useful for testing federation between servers in localhost. NEVER USE IN PRODUCTION. (was `MISSKEY_WEBFINGER_USE_HTTP`)
+- `MISSKEY_WEBFINGER_USE_HTTP`: If it's set true, WebFinger requests will be http instead of https, useful for testing federation between servers in localhost. NEVER USE IN PRODUCTION.
 
 ## Continuous integration
 Misskey uses GitHub Actions for executing automated tests.
diff --git a/chart/files/default.yml b/chart/files/default.yml
index 4017588fa0..f98b8ebfee 100644
--- a/chart/files/default.yml
+++ b/chart/files/default.yml
@@ -178,12 +178,12 @@ id: "aidx"
 #clusterLimit: 1
 
 # Job concurrency per worker
-# deliverJobConcurrency: 16
-# inboxJobConcurrency: 4
+# deliverJobConcurrency: 128
+# inboxJobConcurrency: 16
 
 # Job rate limiter
-# deliverJobPerSec: 1024
-# inboxJobPerSec: 64
+# deliverJobPerSec: 128
+# inboxJobPerSec: 32
 
 # Job attempts
 # deliverJobMaxAttempts: 12
diff --git a/packages/backend/migration/1708980134301-APMultipleKeys.js b/packages/backend/migration/1708980134301-APMultipleKeys.js
deleted file mode 100644
index ca55526c6e..0000000000
--- a/packages/backend/migration/1708980134301-APMultipleKeys.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class APMultipleKeys1708980134301 {
-    name = 'APMultipleKeys1708980134301'
-
-    async up(queryRunner) {
-        await queryRunner.query(`DROP INDEX "public"."IDX_171e64971c780ebd23fae140bb"`);
-        await queryRunner.query(`ALTER TABLE "user_keypair" ADD "ed25519PublicKey" character varying(128)`);
-        await queryRunner.query(`ALTER TABLE "user_keypair" ADD "ed25519PrivateKey" character varying(128)`);
-        await queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "FK_10c146e4b39b443ede016f6736d"`);
-        await queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "PK_10c146e4b39b443ede016f6736d"`);
-        await queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "PK_0db6a5fdb992323449edc8ee421" PRIMARY KEY ("userId", "keyId")`);
-        await queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "PK_0db6a5fdb992323449edc8ee421"`);
-        await queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "PK_171e64971c780ebd23fae140bba" PRIMARY KEY ("keyId")`);
-        await queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "UQ_10c146e4b39b443ede016f6736d" UNIQUE ("userId")`);
-        await queryRunner.query(`CREATE INDEX "IDX_10c146e4b39b443ede016f6736" ON "user_publickey" ("userId") `);
-        await queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "FK_10c146e4b39b443ede016f6736d" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "FK_10c146e4b39b443ede016f6736d"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_10c146e4b39b443ede016f6736"`);
-        await queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "UQ_10c146e4b39b443ede016f6736d"`);
-        await queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "PK_171e64971c780ebd23fae140bba"`);
-        await queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "PK_0db6a5fdb992323449edc8ee421" PRIMARY KEY ("userId", "keyId")`);
-        await queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "PK_0db6a5fdb992323449edc8ee421"`);
-        await queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "PK_10c146e4b39b443ede016f6736d" PRIMARY KEY ("userId")`);
-        await queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "FK_10c146e4b39b443ede016f6736d" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "followersVisibility" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "followersVisibility" TYPE "public"."user_profile_followersVisibility_enum_old" USING "followersVisibility"::"text"::"public"."user_profile_followersVisibility_enum_old"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "followersVisibility" SET DEFAULT 'public'`);
-        await queryRunner.query(`ALTER TABLE "user_keypair" DROP COLUMN "ed25519PrivateKey"`);
-        await queryRunner.query(`ALTER TABLE "user_keypair" DROP COLUMN "ed25519PublicKey"`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_171e64971c780ebd23fae140bb" ON "user_publickey" ("keyId") `);
-    }
-}
diff --git a/packages/backend/migration/1709242519122-HttpSignImplLv.js b/packages/backend/migration/1709242519122-HttpSignImplLv.js
deleted file mode 100644
index 7748bae006..0000000000
--- a/packages/backend/migration/1709242519122-HttpSignImplLv.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class HttpSignImplLv1709242519122 {
-    name = 'HttpSignImplLv1709242519122'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "instance" ADD "httpMessageSignaturesImplementationLevel" character varying(16) NOT NULL DEFAULT '00'`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "httpMessageSignaturesImplementationLevel"`);
-    }
-}
diff --git a/packages/backend/migration/1709269211718-APMultipleKeysFix1.js b/packages/backend/migration/1709269211718-APMultipleKeysFix1.js
deleted file mode 100644
index d2011802f2..0000000000
--- a/packages/backend/migration/1709269211718-APMultipleKeysFix1.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class APMultipleKeys1709269211718 {
-    name = 'APMultipleKeys1709269211718'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_publickey" DROP CONSTRAINT "UQ_10c146e4b39b443ede016f6736d"`);
-    }
-
-    async down(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "user_publickey" ADD CONSTRAINT "UQ_10c146e4b39b443ede016f6736d" UNIQUE ("userId")`);
-    }
-}
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 893171ebd6..22fdc5cf16 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -79,13 +79,13 @@
 		"@fastify/multipart": "8.3.0",
 		"@fastify/static": "7.0.4",
 		"@fastify/view": "9.1.0",
-		"@misskey-dev/node-http-message-signatures": "0.0.10",
 		"@misskey-dev/sharp-read-bmp": "1.2.0",
 		"@misskey-dev/summaly": "5.1.0",
 		"@napi-rs/canvas": "^0.1.53",
 		"@nestjs/common": "10.3.10",
 		"@nestjs/core": "10.3.10",
 		"@nestjs/testing": "10.3.10",
+		"@peertube/http-signature": "1.7.0",
 		"@sentry/node": "8.13.0",
 		"@sentry/profiling-node": "8.13.0",
 		"@simplewebauthn/server": "10.0.0",
diff --git a/packages/backend/src/@types/http-signature.d.ts b/packages/backend/src/@types/http-signature.d.ts
new file mode 100644
index 0000000000..75b62e55f0
--- /dev/null
+++ b/packages/backend/src/@types/http-signature.d.ts
@@ -0,0 +1,82 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare module '@peertube/http-signature' {
+	import type { IncomingMessage, ClientRequest } from 'node:http';
+
+	interface ISignature {
+		keyId: string;
+		algorithm: string;
+		headers: string[];
+		signature: string;
+	}
+
+	interface IOptions {
+		headers?: string[];
+		algorithm?: string;
+		strict?: boolean;
+		authorizationHeaderName?: string;
+	}
+
+	interface IParseRequestOptions extends IOptions {
+		clockSkew?: number;
+	}
+
+	interface IParsedSignature {
+		scheme: string;
+		params: ISignature;
+		signingString: string;
+		algorithm: string;
+		keyId: string;
+	}
+
+	type RequestSignerConstructorOptions =
+		IRequestSignerConstructorOptionsFromProperties |
+		IRequestSignerConstructorOptionsFromFunction;
+
+	interface IRequestSignerConstructorOptionsFromProperties {
+		keyId: string;
+		key: string | Buffer;
+		algorithm?: string;
+	}
+
+	interface IRequestSignerConstructorOptionsFromFunction {
+		sign?: (data: string, cb: (err: any, sig: ISignature) => void) => void;
+	}
+
+	class RequestSigner {
+		constructor(options: RequestSignerConstructorOptions);
+
+		public writeHeader(header: string, value: string): string;
+
+		public writeDateHeader(): string;
+
+		public writeTarget(method: string, path: string): void;
+
+		public sign(cb: (err: any, authz: string) => void): void;
+	}
+
+	interface ISignRequestOptions extends IOptions {
+		keyId: string;
+		key: string;
+		httpVersion?: string;
+	}
+
+	export function parse(request: IncomingMessage, options?: IParseRequestOptions): IParsedSignature;
+	export function parseRequest(request: IncomingMessage, options?: IParseRequestOptions): IParsedSignature;
+
+	export function sign(request: ClientRequest, options: ISignRequestOptions): boolean;
+	export function signRequest(request: ClientRequest, options: ISignRequestOptions): boolean;
+	export function createSigner(): RequestSigner;
+	export function isSigner(obj: any): obj is RequestSigner;
+
+	export function sshKeyToPEM(key: string): string;
+	export function sshKeyFingerprint(key: string): string;
+	export function pemToRsaSSHKey(pem: string, comment: string): string;
+
+	export function verify(parsedSignature: IParsedSignature, pubkey: string | Buffer): boolean;
+	export function verifySignature(parsedSignature: IParsedSignature, pubkey: string | Buffer): boolean;
+	export function verifyHMAC(parsedSignature: IParsedSignature, secret: string): boolean;
+}
diff --git a/packages/backend/src/const.ts b/packages/backend/src/const.ts
index c132cc7e7b..4dc689238b 100644
--- a/packages/backend/src/const.ts
+++ b/packages/backend/src/const.ts
@@ -9,11 +9,6 @@ export const MAX_NOTE_TEXT_LENGTH = 3000;
 export const USER_ONLINE_THRESHOLD = 1000 * 60 * 10; // 10min
 export const USER_ACTIVE_THRESHOLD = 1000 * 60 * 60 * 24 * 3; // 3days
 
-export const REMOTE_USER_CACHE_TTL = 1000 * 60 * 60 * 3; // 3hours
-export const REMOTE_USER_MOVE_COOLDOWN = 1000 * 60 * 60 * 24 * 14; // 14days
-
-export const REMOTE_SERVER_CACHE_TTL = 1000 * 60 * 60 * 3; // 3hours
-
 //#region hard limits
 // If you change DB_* values, you must also change the DB schema.
 
diff --git a/packages/backend/src/core/AccountUpdateService.ts b/packages/backend/src/core/AccountUpdateService.ts
index ca0864f679..69a57b4854 100644
--- a/packages/backend/src/core/AccountUpdateService.ts
+++ b/packages/backend/src/core/AccountUpdateService.ts
@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
-import { ModuleRef } from '@nestjs/core';
+import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { UsersRepository } from '@/models/_.js';
 import type { MiUser } from '@/models/User.js';
@@ -13,44 +12,30 @@ import { RelayService } from '@/core/RelayService.js';
 import { ApDeliverManagerService } from '@/core/activitypub/ApDeliverManagerService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
-import type { PrivateKeyWithPem } from '@misskey-dev/node-http-message-signatures';
 
 @Injectable()
-export class AccountUpdateService implements OnModuleInit {
-	private apDeliverManagerService: ApDeliverManagerService;
+export class AccountUpdateService {
 	constructor(
-		private moduleRef: ModuleRef,
-
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
 		private userEntityService: UserEntityService,
 		private apRendererService: ApRendererService,
+		private apDeliverManagerService: ApDeliverManagerService,
 		private relayService: RelayService,
 	) {
 	}
 
-	async onModuleInit() {
-		this.apDeliverManagerService = this.moduleRef.get(ApDeliverManagerService.name);
-	}
-
 	@bindThis
-	/**
-	 * Deliver account update to followers
-	 * @param userId user id
-	 * @param deliverKey optional. Private key to sign the deliver.
-	 */
-	public async publishToFollowers(userId: MiUser['id'], deliverKey?: PrivateKeyWithPem) {
+	public async publishToFollowers(userId: MiUser['id']) {
 		const user = await this.usersRepository.findOneBy({ id: userId });
 		if (user == null) throw new Error('user not found');
 
 		// フォロワーがリモートユーザーかつ投稿者がローカルユーザーならUpdateを配信
 		if (this.userEntityService.isLocalUser(user)) {
 			const content = this.apRendererService.addContext(this.apRendererService.renderUpdate(await this.apRendererService.renderPerson(user), user));
-			await Promise.allSettled([
-				this.apDeliverManagerService.deliverToFollowers(user, content, deliverKey),
-				this.relayService.deliverToRelays(user, content, deliverKey),
-			]);
+			this.apDeliverManagerService.deliverToFollowers(user, content);
+			this.relayService.deliverToRelays(user, content);
 		}
 	}
 }
diff --git a/packages/backend/src/core/CreateSystemUserService.ts b/packages/backend/src/core/CreateSystemUserService.ts
index 60ddc9cde2..6c5b0f6a36 100644
--- a/packages/backend/src/core/CreateSystemUserService.ts
+++ b/packages/backend/src/core/CreateSystemUserService.ts
@@ -7,7 +7,7 @@ import { randomUUID } from 'node:crypto';
 import { Inject, Injectable } from '@nestjs/common';
 import bcrypt from 'bcryptjs';
 import { IsNull, DataSource } from 'typeorm';
-import { genRSAAndEd25519KeyPair } from '@/misc/gen-key-pair.js';
+import { genRsaKeyPair } from '@/misc/gen-key-pair.js';
 import { MiUser } from '@/models/User.js';
 import { MiUserProfile } from '@/models/UserProfile.js';
 import { IdService } from '@/core/IdService.js';
@@ -38,7 +38,7 @@ export class CreateSystemUserService {
 		// Generate secret
 		const secret = generateNativeUserToken();
 
-		const keyPair = await genRSAAndEd25519KeyPair();
+		const keyPair = await genRsaKeyPair();
 
 		let account!: MiUser;
 
@@ -64,8 +64,9 @@ export class CreateSystemUserService {
 			}).then(x => transactionalEntityManager.findOneByOrFail(MiUser, x.identifiers[0]));
 
 			await transactionalEntityManager.insert(MiUserKeypair, {
+				publicKey: keyPair.publicKey,
+				privateKey: keyPair.privateKey,
 				userId: account.id,
-				...keyPair,
 			});
 
 			await transactionalEntityManager.insert(MiUserProfile, {
diff --git a/packages/backend/src/core/FetchInstanceMetadataService.ts b/packages/backend/src/core/FetchInstanceMetadataService.ts
index dc53c8711d..aa16468ecb 100644
--- a/packages/backend/src/core/FetchInstanceMetadataService.ts
+++ b/packages/backend/src/core/FetchInstanceMetadataService.ts
@@ -15,7 +15,6 @@ import { LoggerService } from '@/core/LoggerService.js';
 import { HttpRequestService } from '@/core/HttpRequestService.js';
 import { bindThis } from '@/decorators.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
-import { REMOTE_SERVER_CACHE_TTL } from '@/const.js';
 import type { DOMWindow } from 'jsdom';
 
 type NodeInfo = {
@@ -25,7 +24,6 @@ type NodeInfo = {
 		version?: unknown;
 	};
 	metadata?: {
-		httpMessageSignaturesImplementationLevel?: unknown,
 		name?: unknown;
 		nodeName?: unknown;
 		nodeDescription?: unknown;
@@ -41,7 +39,6 @@ type NodeInfo = {
 @Injectable()
 export class FetchInstanceMetadataService {
 	private logger: Logger;
-	private httpColon = 'https://';
 
 	constructor(
 		private httpRequestService: HttpRequestService,
@@ -51,7 +48,6 @@ export class FetchInstanceMetadataService {
 		private redisClient: Redis.Redis,
 	) {
 		this.logger = this.loggerService.getLogger('metadata', 'cyan');
-		this.httpColon = process.env.MISSKEY_USE_HTTP?.toLowerCase() === 'true' ? 'http://' : 'https://';
 	}
 
 	@bindThis
@@ -63,7 +59,7 @@ export class FetchInstanceMetadataService {
 		return await this.redisClient.set(
 			`fetchInstanceMetadata:mutex:v2:${host}`, '1',
 			'EX', 30, // 30秒したら自動でロック解除 https://github.com/misskey-dev/misskey/issues/13506#issuecomment-1975375395
-			'GET', // 古い値を返す（なかったらnull）
+			'GET' // 古い値を返す（なかったらnull）
 		);
 	}
 
@@ -77,24 +73,23 @@ export class FetchInstanceMetadataService {
 	public async fetchInstanceMetadata(instance: MiInstance, force = false): Promise<void> {
 		const host = instance.host;
 
-		if (!force) {
-			// キャッシュ有効チェックはロック取得前に行う
-			const _instance = await this.federatedInstanceService.fetch(host);
-			const now = Date.now();
-			if (_instance && _instance.infoUpdatedAt != null && (now - _instance.infoUpdatedAt.getTime() < REMOTE_SERVER_CACHE_TTL)) {
-				this.logger.debug(`Skip because updated recently ${_instance.infoUpdatedAt.toJSON()}`);
-				return;
-			}
-
-			// finallyでunlockされてしまうのでtry内でロックチェックをしない
-			// （returnであってもfinallyは実行される）
-			if (await this.tryLock(host) === '1') {
-				// 1が返ってきていたら他にロックされているという意味なので、何もしない
-				return;
-			}
+		// finallyでunlockされてしまうのでtry内でロックチェックをしない
+		// （returnであってもfinallyは実行される）
+		if (!force && await this.tryLock(host) === '1') {
+			// 1が返ってきていたらロックされているという意味なので、何もしない
+			return;
 		}
 
 		try {
+			if (!force) {
+				const _instance = await this.federatedInstanceService.fetch(host);
+				const now = Date.now();
+				if (_instance && _instance.infoUpdatedAt && (now - _instance.infoUpdatedAt.getTime() < 1000 * 60 * 60 * 24)) {
+					// unlock at the finally caluse
+					return;
+				}
+			}
+
 			this.logger.info(`Fetching metadata of ${instance.host} ...`);
 
 			const [info, dom, manifest] = await Promise.all([
@@ -123,14 +118,6 @@ export class FetchInstanceMetadataService {
 				updates.openRegistrations = info.openRegistrations;
 				updates.maintainerName = info.metadata ? info.metadata.maintainer ? (info.metadata.maintainer.name ?? null) : null : null;
 				updates.maintainerEmail = info.metadata ? info.metadata.maintainer ? (info.metadata.maintainer.email ?? null) : null : null;
-				if (info.metadata && info.metadata.httpMessageSignaturesImplementationLevel && (
-					info.metadata.httpMessageSignaturesImplementationLevel === '01' ||
-					info.metadata.httpMessageSignaturesImplementationLevel === '11'
-				)) {
-					updates.httpMessageSignaturesImplementationLevel = info.metadata.httpMessageSignaturesImplementationLevel;
-				} else {
-					updates.httpMessageSignaturesImplementationLevel = '00';
-				}
 			}
 
 			if (name) updates.name = name;
@@ -142,12 +129,6 @@ export class FetchInstanceMetadataService {
 			await this.federatedInstanceService.update(instance.id, updates);
 
 			this.logger.succ(`Successfuly updated metadata of ${instance.host}`);
-			this.logger.debug('Updated metadata:', {
-				info: !!info,
-				dom: !!dom,
-				manifest: !!manifest,
-				updates,
-			});
 		} catch (e) {
 			this.logger.error(`Failed to update metadata of ${instance.host}: ${e}`);
 		} finally {
@@ -160,7 +141,7 @@ export class FetchInstanceMetadataService {
 		this.logger.info(`Fetching nodeinfo of ${instance.host} ...`);
 
 		try {
-			const wellknown = await this.httpRequestService.getJson(this.httpColon + instance.host + '/.well-known/nodeinfo')
+			const wellknown = await this.httpRequestService.getJson('https://' + instance.host + '/.well-known/nodeinfo')
 				.catch(err => {
 					if (err.statusCode === 404) {
 						throw new Error('No nodeinfo provided');
@@ -203,7 +184,7 @@ export class FetchInstanceMetadataService {
 	private async fetchDom(instance: MiInstance): Promise<DOMWindow['document']> {
 		this.logger.info(`Fetching HTML of ${instance.host} ...`);
 
-		const url = this.httpColon + instance.host;
+		const url = 'https://' + instance.host;
 
 		const html = await this.httpRequestService.getHtml(url);
 
@@ -215,7 +196,7 @@ export class FetchInstanceMetadataService {
 
 	@bindThis
 	private async fetchManifest(instance: MiInstance): Promise<Record<string, unknown> | null> {
-		const url = this.httpColon + instance.host;
+		const url = 'https://' + instance.host;
 
 		const manifestUrl = url + '/manifest.json';
 
@@ -226,7 +207,7 @@ export class FetchInstanceMetadataService {
 
 	@bindThis
 	private async fetchFaviconUrl(instance: MiInstance, doc: DOMWindow['document'] | null): Promise<string | null> {
-		const url = this.httpColon + instance.host;
+		const url = 'https://' + instance.host;
 
 		if (doc) {
 			// https://github.com/misskey-dev/misskey/pull/8220#issuecomment-1025104043
@@ -253,12 +234,12 @@ export class FetchInstanceMetadataService {
 	@bindThis
 	private async fetchIconUrl(instance: MiInstance, doc: DOMWindow['document'] | null, manifest: Record<string, any> | null): Promise<string | null> {
 		if (manifest && manifest.icons && manifest.icons.length > 0 && manifest.icons[0].src) {
-			const url = this.httpColon + instance.host;
+			const url = 'https://' + instance.host;
 			return (new URL(manifest.icons[0].src, url)).href;
 		}
 
 		if (doc) {
-			const url = this.httpColon + instance.host;
+			const url = 'https://' + instance.host;
 
 			// https://github.com/misskey-dev/misskey/pull/8220#issuecomment-1025104043
 			const links = Array.from(doc.getElementsByTagName('link')).reverse();
diff --git a/packages/backend/src/core/GlobalEventService.ts b/packages/backend/src/core/GlobalEventService.ts
index 312bcfb3b5..87aa70713e 100644
--- a/packages/backend/src/core/GlobalEventService.ts
+++ b/packages/backend/src/core/GlobalEventService.ts
@@ -249,7 +249,6 @@ export interface InternalEventTypes {
 	unmute: { muterId: MiUser['id']; muteeId: MiUser['id']; };
 	userListMemberAdded: { userListId: MiUserList['id']; memberId: MiUser['id']; };
 	userListMemberRemoved: { userListId: MiUserList['id']; memberId: MiUser['id']; };
-	userKeypairUpdated: { userId: MiUser['id']; };
 }
 
 type EventTypesToEventPayload<T> = EventUnionFromDictionary<UndefinedAsNullAll<SerializedAll<T>>>;
diff --git a/packages/backend/src/core/HttpRequestService.ts b/packages/backend/src/core/HttpRequestService.ts
index 4249c158d7..7f3cac7c58 100644
--- a/packages/backend/src/core/HttpRequestService.ts
+++ b/packages/backend/src/core/HttpRequestService.ts
@@ -70,7 +70,7 @@ export class HttpRequestService {
 			localAddress: config.outgoingAddress,
 		});
 
-		const maxSockets = Math.max(256, config.deliverJobConcurrency ?? 16);
+		const maxSockets = Math.max(256, config.deliverJobConcurrency ?? 128);
 
 		this.httpAgent = config.proxy
 			? new HttpProxyAgent({
diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
index dd3f2182b4..80827a500b 100644
--- a/packages/backend/src/core/QueueService.ts
+++ b/packages/backend/src/core/QueueService.ts
@@ -13,6 +13,7 @@ import type { Config } from '@/config.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import type { Antenna } from '@/server/api/endpoints/i/import-antennas.js';
+import { ApRequestCreator } from '@/core/activitypub/ApRequestService.js';
 import type {
 	DbJobData,
 	DeliverJobData,
@@ -32,7 +33,7 @@ import type {
 	UserWebhookDeliverQueue,
 	SystemWebhookDeliverQueue,
 } from './QueueModule.js';
-import { genRFC3230DigestHeader, type PrivateKeyWithPem, type ParsedSignature } from '@misskey-dev/node-http-message-signatures';
+import type httpSignature from '@peertube/http-signature';
 import type * as Bull from 'bullmq';
 
 @Injectable()
@@ -89,21 +90,21 @@ export class QueueService {
 	}
 
 	@bindThis
-	public async deliver(user: ThinUser, content: IActivity | null, to: string | null, isSharedInbox: boolean, privateKey?: PrivateKeyWithPem) {
+	public deliver(user: ThinUser, content: IActivity | null, to: string | null, isSharedInbox: boolean) {
 		if (content == null) return null;
 		if (to == null) return null;
 
 		const contentBody = JSON.stringify(content);
+		const digest = ApRequestCreator.createDigest(contentBody);
 
 		const data: DeliverJobData = {
 			user: {
 				id: user.id,
 			},
 			content: contentBody,
-			digest: await genRFC3230DigestHeader(contentBody, 'SHA-256'),
+			digest,
 			to,
 			isSharedInbox,
-			privateKey: privateKey && { keyId: privateKey.keyId, privateKeyPem: privateKey.privateKeyPem },
 		};
 
 		return this.deliverQueue.add(to, data, {
@@ -121,13 +122,13 @@ export class QueueService {
 	 * @param user `{ id: string; }` この関数ではThinUserに変換しないので前もって変換してください
 	 * @param content IActivity | null
 	 * @param inboxes `Map<string, boolean>` / key: to (inbox url), value: isSharedInbox (whether it is sharedInbox)
-	 * @param forceMainKey boolean | undefined, force to use main (rsa) key
 	 * @returns void
 	 */
 	@bindThis
-	public async deliverMany(user: ThinUser, content: IActivity | null, inboxes: Map<string, boolean>, privateKey?: PrivateKeyWithPem) {
+	public async deliverMany(user: ThinUser, content: IActivity | null, inboxes: Map<string, boolean>) {
 		if (content == null) return null;
 		const contentBody = JSON.stringify(content);
+		const digest = ApRequestCreator.createDigest(contentBody);
 
 		const opts = {
 			attempts: this.config.deliverJobMaxAttempts ?? 12,
@@ -143,9 +144,9 @@ export class QueueService {
 			data: {
 				user,
 				content: contentBody,
+				digest,
 				to: d[0],
 				isSharedInbox: d[1],
-				privateKey: privateKey && { keyId: privateKey.keyId, privateKeyPem: privateKey.privateKeyPem },
 			} as DeliverJobData,
 			opts,
 		})));
@@ -154,7 +155,7 @@ export class QueueService {
 	}
 
 	@bindThis
-	public inbox(activity: IActivity, signature: ParsedSignature | null) {
+	public inbox(activity: IActivity, signature: httpSignature.IParsedSignature) {
 		const data = {
 			activity: activity,
 			signature,
diff --git a/packages/backend/src/core/RelayService.ts b/packages/backend/src/core/RelayService.ts
index ad01f98902..8dd3d64f5b 100644
--- a/packages/backend/src/core/RelayService.ts
+++ b/packages/backend/src/core/RelayService.ts
@@ -16,8 +16,6 @@ import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
 import { DI } from '@/di-symbols.js';
 import { deepClone } from '@/misc/clone.js';
 import { bindThis } from '@/decorators.js';
-import { UserKeypairService } from './UserKeypairService.js';
-import type { PrivateKeyWithPem } from '@misskey-dev/node-http-message-signatures';
 
 const ACTOR_USERNAME = 'relay.actor' as const;
 
@@ -36,7 +34,6 @@ export class RelayService {
 		private queueService: QueueService,
 		private createSystemUserService: CreateSystemUserService,
 		private apRendererService: ApRendererService,
-		private userKeypairService: UserKeypairService,
 	) {
 		this.relaysCache = new MemorySingleCache<MiRelay[]>(1000 * 60 * 10);
 	}
@@ -114,7 +111,7 @@ export class RelayService {
 	}
 
 	@bindThis
-	public async deliverToRelays(user: { id: MiUser['id']; host: null; }, activity: any, privateKey?: PrivateKeyWithPem): Promise<void> {
+	public async deliverToRelays(user: { id: MiUser['id']; host: null; }, activity: any): Promise<void> {
 		if (activity == null) return;
 
 		const relays = await this.relaysCache.fetch(() => this.relaysRepository.findBy({
@@ -124,9 +121,11 @@ export class RelayService {
 
 		const copy = deepClone(activity);
 		if (!copy.to) copy.to = ['https://www.w3.org/ns/activitystreams#Public'];
-		privateKey = privateKey ?? await this.userKeypairService.getLocalUserPrivateKeyPem(user.id);
-		const signed = await this.apRendererService.attachLdSignature(copy, privateKey);
 
-		this.queueService.deliverMany(user, signed, new Map(relays.map(({ inbox }) => [inbox, false])), privateKey);
+		const signed = await this.apRendererService.attachLdSignature(copy, user);
+
+		for (const relay of relays) {
+			this.queueService.deliver(user, signed, relay.inbox, false);
+		}
 	}
 }
diff --git a/packages/backend/src/core/SignupService.ts b/packages/backend/src/core/SignupService.ts
index 54c6170062..5522ecd6cc 100644
--- a/packages/backend/src/core/SignupService.ts
+++ b/packages/backend/src/core/SignupService.ts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import { generateKeyPair } from 'node:crypto';
 import { Inject, Injectable } from '@nestjs/common';
 import bcrypt from 'bcryptjs';
 import { DataSource, IsNull } from 'typeorm';
@@ -20,7 +21,6 @@ import { bindThis } from '@/decorators.js';
 import UsersChart from '@/core/chart/charts/users.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { MetaService } from '@/core/MetaService.js';
-import { genRSAAndEd25519KeyPair } from '@/misc/gen-key-pair.js';
 
 @Injectable()
 export class SignupService {
@@ -93,7 +93,22 @@ export class SignupService {
 			}
 		}
 
-		const keyPair = await genRSAAndEd25519KeyPair();
+		const keyPair = await new Promise<string[]>((res, rej) =>
+			generateKeyPair('rsa', {
+				modulusLength: 2048,
+				publicKeyEncoding: {
+					type: 'spki',
+					format: 'pem',
+				},
+				privateKeyEncoding: {
+					type: 'pkcs8',
+					format: 'pem',
+					cipher: undefined,
+					passphrase: undefined,
+				},
+			}, (err, publicKey, privateKey) =>
+				err ? rej(err) : res([publicKey, privateKey]),
+			));
 
 		let account!: MiUser;
 
@@ -116,8 +131,9 @@ export class SignupService {
 			}));
 
 			await transactionalEntityManager.save(new MiUserKeypair({
+				publicKey: keyPair[0],
+				privateKey: keyPair[1],
 				userId: account.id,
-				...keyPair,
 			}));
 
 			await transactionalEntityManager.save(new MiUserProfile({
diff --git a/packages/backend/src/core/UserKeypairService.ts b/packages/backend/src/core/UserKeypairService.ts
index aa90f1e209..51ac99179a 100644
--- a/packages/backend/src/core/UserKeypairService.ts
+++ b/packages/backend/src/core/UserKeypairService.ts
@@ -5,184 +5,41 @@
 
 import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
 import * as Redis from 'ioredis';
-import { genEd25519KeyPair, importPrivateKey, PrivateKey, PrivateKeyWithPem } from '@misskey-dev/node-http-message-signatures';
 import type { MiUser } from '@/models/User.js';
 import type { UserKeypairsRepository } from '@/models/_.js';
-import { RedisKVCache, MemoryKVCache } from '@/misc/cache.js';
+import { RedisKVCache } from '@/misc/cache.js';
 import type { MiUserKeypair } from '@/models/UserKeypair.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
-import { GlobalEventService, GlobalEvents } from '@/core/GlobalEventService.js';
-import { UserEntityService } from '@/core/entities/UserEntityService.js';
-import type { webcrypto } from 'node:crypto';
 
 @Injectable()
 export class UserKeypairService implements OnApplicationShutdown {
-	private keypairEntityCache: RedisKVCache<MiUserKeypair>;
-	private privateKeyObjectCache: MemoryKVCache<webcrypto.CryptoKey>;
+	private cache: RedisKVCache<MiUserKeypair>;
 
 	constructor(
 		@Inject(DI.redis)
 		private redisClient: Redis.Redis,
-		@Inject(DI.redisForSub)
-		private redisForSub: Redis.Redis,
+
 		@Inject(DI.userKeypairsRepository)
 		private userKeypairsRepository: UserKeypairsRepository,
-
-		private globalEventService: GlobalEventService,
-		private userEntityService: UserEntityService,
 	) {
-		this.keypairEntityCache = new RedisKVCache<MiUserKeypair>(this.redisClient, 'userKeypair', {
+		this.cache = new RedisKVCache<MiUserKeypair>(this.redisClient, 'userKeypair', {
 			lifetime: 1000 * 60 * 60 * 24, // 24h
 			memoryCacheLifetime: Infinity,
 			fetcher: (key) => this.userKeypairsRepository.findOneByOrFail({ userId: key }),
 			toRedisConverter: (value) => JSON.stringify(value),
 			fromRedisConverter: (value) => JSON.parse(value),
 		});
-		this.privateKeyObjectCache = new MemoryKVCache<webcrypto.CryptoKey>(1000 * 60 * 60 * 1);
-
-		this.redisForSub.on('message', this.onMessage);
 	}
 
 	@bindThis
 	public async getUserKeypair(userId: MiUser['id']): Promise<MiUserKeypair> {
-		return await this.keypairEntityCache.fetch(userId);
+		return await this.cache.fetch(userId);
 	}
 
-	/**
-	 * Get private key [Only PrivateKeyWithPem for queue data etc.]
-	 * @param userIdOrHint user id or MiUserKeypair
-	 * @param preferType
-	 *		If ed25519-like(`ed25519`, `01`, `11`) is specified, ed25519 keypair will be returned if exists.
-	 *		Otherwise, main keypair will be returned.
-	 * @returns
-	 */
-	@bindThis
-	public async getLocalUserPrivateKeyPem(
-		userIdOrHint: MiUser['id'] | MiUserKeypair,
-		preferType?: string,
-	): Promise<PrivateKeyWithPem> {
-		const keypair = typeof userIdOrHint === 'string' ? await this.getUserKeypair(userIdOrHint) : userIdOrHint;
-		if (
-			preferType && ['01', '11', 'ed25519'].includes(preferType.toLowerCase()) &&
-			keypair.ed25519PublicKey != null && keypair.ed25519PrivateKey != null
-		) {
-			return {
-				keyId: `${this.userEntityService.genLocalUserUri(keypair.userId)}#ed25519-key`,
-				privateKeyPem: keypair.ed25519PrivateKey,
-			};
-		}
-		return {
-			keyId: `${this.userEntityService.genLocalUserUri(keypair.userId)}#main-key`,
-			privateKeyPem: keypair.privateKey,
-		};
-	}
-
-	/**
-	 * Get private key [Only PrivateKey for ap request]
-	 * Using cache due to performance reasons of `crypto.subtle.importKey`
-	 * @param userIdOrHint user id, MiUserKeypair, or PrivateKeyWithPem
-	 * @param preferType
-	 * 		If ed25519-like(`ed25519`, `01`, `11`) is specified, ed25519 keypair will be returned if exists.
-	 *		Otherwise, main keypair will be returned. (ignored if userIdOrHint is PrivateKeyWithPem)
-	 * @returns
-	 */
-	@bindThis
-	public async getLocalUserPrivateKey(
-		userIdOrHint: MiUser['id'] | MiUserKeypair | PrivateKeyWithPem,
-		preferType?: string,
-	): Promise<PrivateKey> {
-		if (typeof userIdOrHint === 'object' && 'privateKeyPem' in userIdOrHint) {
-			// userIdOrHint is PrivateKeyWithPem
-			return {
-				keyId: userIdOrHint.keyId,
-				privateKey: await this.privateKeyObjectCache.fetch(userIdOrHint.keyId, async () => {
-					return await importPrivateKey(userIdOrHint.privateKeyPem);
-				}),
-			};
-		}
-
-		const userId = typeof userIdOrHint === 'string' ? userIdOrHint : userIdOrHint.userId;
-		const getKeypair = () => typeof userIdOrHint === 'string' ? this.getUserKeypair(userId) : userIdOrHint;
-
-		if (preferType && ['01', '11', 'ed25519'].includes(preferType.toLowerCase())) {
-			const keyId = `${this.userEntityService.genLocalUserUri(userId)}#ed25519-key`;
-			const fetched = await this.privateKeyObjectCache.fetchMaybe(keyId, async () => {
-				const keypair = await getKeypair();
-				if (keypair.ed25519PublicKey != null && keypair.ed25519PrivateKey != null) {
-					return await importPrivateKey(keypair.ed25519PrivateKey);
-				}
-				return;
-			});
-			if (fetched) {
-				return {
-					keyId,
-					privateKey: fetched,
-				};
-			}
-		}
-
-		const keyId = `${this.userEntityService.genLocalUserUri(userId)}#main-key`;
-		return {
-			keyId,
-			privateKey: await this.privateKeyObjectCache.fetch(keyId, async () => {
-				const keypair = await getKeypair();
-				return await importPrivateKey(keypair.privateKey);
-			}),
-		};
-	}
-
-	@bindThis
-	public async refresh(userId: MiUser['id']): Promise<void> {
-		return await this.keypairEntityCache.refresh(userId);
-	}
-
-	/**
-	 * If DB has ed25519 keypair, refresh cache and return it.
-	 * If not, create, save and return ed25519 keypair.
-	 * @param userId user id
-	 * @returns MiUserKeypair if keypair is created, void if keypair is already exists
-	 */
-	@bindThis
-	public async refreshAndPrepareEd25519KeyPair(userId: MiUser['id']): Promise<MiUserKeypair | void> {
-		await this.refresh(userId);
-		const keypair = await this.keypairEntityCache.fetch(userId);
-		if (keypair.ed25519PublicKey != null) {
-			return;
-		}
-
-		const ed25519 = await genEd25519KeyPair();
-		await this.userKeypairsRepository.update({ userId }, {
-			ed25519PublicKey: ed25519.publicKey,
-			ed25519PrivateKey: ed25519.privateKey,
-		});
-		this.globalEventService.publishInternalEvent('userKeypairUpdated', { userId });
-		const result = {
-			...keypair,
-			ed25519PublicKey: ed25519.publicKey,
-			ed25519PrivateKey: ed25519.privateKey,
-		};
-		this.keypairEntityCache.set(userId, result);
-		return result;
-	}
-
-	@bindThis
-	private async onMessage(_: string, data: string): Promise<void> {
-		const obj = JSON.parse(data);
-
-		if (obj.channel === 'internal') {
-			const { type, body } = obj.message as GlobalEvents['internal']['payload'];
-			switch (type) {
-				case 'userKeypairUpdated': {
-					this.refresh(body.userId);
-					break;
-				}
-			}
-		}
-	}
 	@bindThis
 	public dispose(): void {
-		this.keypairEntityCache.dispose();
+		this.cache.dispose();
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/UserSuspendService.ts b/packages/backend/src/core/UserSuspendService.ts
index fc5a68c72e..d594a223f4 100644
--- a/packages/backend/src/core/UserSuspendService.ts
+++ b/packages/backend/src/core/UserSuspendService.ts
@@ -3,23 +3,27 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { Injectable } from '@nestjs/common';
+import { Inject, Injectable } from '@nestjs/common';
+import { Not, IsNull } from 'typeorm';
+import type { FollowingsRepository } from '@/models/_.js';
 import type { MiUser } from '@/models/User.js';
+import { QueueService } from '@/core/QueueService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
+import { DI } from '@/di-symbols.js';
 import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
-import { UserKeypairService } from './UserKeypairService.js';
-import { ApDeliverManagerService } from './activitypub/ApDeliverManagerService.js';
 
 @Injectable()
 export class UserSuspendService {
 	constructor(
+		@Inject(DI.followingsRepository)
+		private followingsRepository: FollowingsRepository,
+
 		private userEntityService: UserEntityService,
+		private queueService: QueueService,
 		private globalEventService: GlobalEventService,
 		private apRendererService: ApRendererService,
-		private userKeypairService: UserKeypairService,
-		private apDeliverManagerService: ApDeliverManagerService,
 	) {
 	}
 
@@ -28,12 +32,28 @@ export class UserSuspendService {
 		this.globalEventService.publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: true });
 
 		if (this.userEntityService.isLocalUser(user)) {
+			// 知り得る全SharedInboxにDelete配信
 			const content = this.apRendererService.addContext(this.apRendererService.renderDelete(this.userEntityService.genLocalUserUri(user.id), user));
-			const manager = this.apDeliverManagerService.createDeliverManager(user, content);
-			manager.addAllKnowingSharedInboxRecipe();
-			// process deliver時にはキーペアが消去されているはずなので、ここで挿入する
-			const privateKey = await this.userKeypairService.getLocalUserPrivateKeyPem(user.id, 'main');
-			manager.execute({ privateKey });
+
+			const queue: string[] = [];
+
+			const followings = await this.followingsRepository.find({
+				where: [
+					{ followerSharedInbox: Not(IsNull()) },
+					{ followeeSharedInbox: Not(IsNull()) },
+				],
+				select: ['followerSharedInbox', 'followeeSharedInbox'],
+			});
+
+			const inboxes = followings.map(x => x.followerSharedInbox ?? x.followeeSharedInbox);
+
+			for (const inbox of inboxes) {
+				if (inbox != null && !queue.includes(inbox)) queue.push(inbox);
+			}
+
+			for (const inbox of queue) {
+				this.queueService.deliver(user, content, inbox, true);
+			}
 		}
 	}
 
@@ -42,12 +62,28 @@ export class UserSuspendService {
 		this.globalEventService.publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: false });
 
 		if (this.userEntityService.isLocalUser(user)) {
+			// 知り得る全SharedInboxにUndo Delete配信
 			const content = this.apRendererService.addContext(this.apRendererService.renderUndo(this.apRendererService.renderDelete(this.userEntityService.genLocalUserUri(user.id), user), user));
-			const manager = this.apDeliverManagerService.createDeliverManager(user, content);
-			manager.addAllKnowingSharedInboxRecipe();
-			// process deliver時にはキーペアが消去されているはずなので、ここで挿入する
-			const privateKey = await this.userKeypairService.getLocalUserPrivateKeyPem(user.id, 'main');
-			manager.execute({ privateKey });
+
+			const queue: string[] = [];
+
+			const followings = await this.followingsRepository.find({
+				where: [
+					{ followerSharedInbox: Not(IsNull()) },
+					{ followeeSharedInbox: Not(IsNull()) },
+				],
+				select: ['followerSharedInbox', 'followeeSharedInbox'],
+			});
+
+			const inboxes = followings.map(x => x.followerSharedInbox ?? x.followeeSharedInbox);
+
+			for (const inbox of inboxes) {
+				if (inbox != null && !queue.includes(inbox)) queue.push(inbox);
+			}
+
+			for (const inbox of queue) {
+				this.queueService.deliver(user as any, content, inbox, true);
+			}
 		}
 	}
 }
diff --git a/packages/backend/src/core/WebfingerService.ts b/packages/backend/src/core/WebfingerService.ts
index aa1144778c..374536a741 100644
--- a/packages/backend/src/core/WebfingerService.ts
+++ b/packages/backend/src/core/WebfingerService.ts
@@ -46,7 +46,7 @@ export class WebfingerService {
 		const m = query.match(mRegex);
 		if (m) {
 			const hostname = m[2];
-			const useHttp = process.env.MISSKEY_USE_HTTP && process.env.MISSKEY_USE_HTTP.toLowerCase() === 'true';
+			const useHttp = process.env.MISSKEY_WEBFINGER_USE_HTTP && process.env.MISSKEY_WEBFINGER_USE_HTTP.toLowerCase() === 'true';
 			return `http${useHttp ? '' : 's'}://${hostname}/.well-known/webfinger?${urlQuery({ resource: `acct:${query}` })}`;
 		}
 
diff --git a/packages/backend/src/core/activitypub/ApDbResolverService.ts b/packages/backend/src/core/activitypub/ApDbResolverService.ts
index 973394683f..f6b70ead44 100644
--- a/packages/backend/src/core/activitypub/ApDbResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApDbResolverService.ts
@@ -5,7 +5,7 @@
 
 import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
-import type { MiUser, NotesRepository, UserPublickeysRepository, UsersRepository } from '@/models/_.js';
+import type { NotesRepository, UserPublickeysRepository, UsersRepository } from '@/models/_.js';
 import type { Config } from '@/config.js';
 import { MemoryKVCache } from '@/misc/cache.js';
 import type { MiUserPublickey } from '@/models/UserPublickey.js';
@@ -13,12 +13,9 @@ import { CacheService } from '@/core/CacheService.js';
 import type { MiNote } from '@/models/Note.js';
 import { bindThis } from '@/decorators.js';
 import { MiLocalUser, MiRemoteUser } from '@/models/User.js';
-import Logger from '@/logger.js';
 import { getApId } from './type.js';
 import { ApPersonService } from './models/ApPersonService.js';
-import { ApLoggerService } from './ApLoggerService.js';
 import type { IObject } from './type.js';
-import { UtilityService } from '../UtilityService.js';
 
 export type UriParseResult = {
 	/** wether the URI was generated by us */
@@ -38,8 +35,8 @@ export type UriParseResult = {
 
 @Injectable()
 export class ApDbResolverService implements OnApplicationShutdown {
-	private publicKeyByUserIdCache: MemoryKVCache<MiUserPublickey[] | null>;
-	private logger: Logger;
+	private publicKeyCache: MemoryKVCache<MiUserPublickey | null>;
+	private publicKeyByUserIdCache: MemoryKVCache<MiUserPublickey | null>;
 
 	constructor(
 		@Inject(DI.config)
@@ -56,17 +53,9 @@ export class ApDbResolverService implements OnApplicationShutdown {
 
 		private cacheService: CacheService,
 		private apPersonService: ApPersonService,
-		private apLoggerService: ApLoggerService,
-		private utilityService: UtilityService,
 	) {
-		this.publicKeyByUserIdCache = new MemoryKVCache<MiUserPublickey[] | null>(Infinity);
-		this.logger = this.apLoggerService.logger.createSubLogger('db-resolver');
-	}
-
-	private punyHost(url: string): string {
-		const urlObj = new URL(url);
-		const host = `${this.utilityService.toPuny(urlObj.hostname)}${urlObj.port.length > 0 ? ':' + urlObj.port : ''}`;
-		return host;
+		this.publicKeyCache = new MemoryKVCache<MiUserPublickey | null>(Infinity);
+		this.publicKeyByUserIdCache = new MemoryKVCache<MiUserPublickey | null>(Infinity);
 	}
 
 	@bindThis
@@ -127,141 +116,62 @@ export class ApDbResolverService implements OnApplicationShutdown {
 		}
 	}
 
+	/**
+	 * AP KeyId => Misskey User and Key
+	 */
 	@bindThis
-	private async refreshAndFindKey(userId: MiUser['id'], keyId: string): Promise<MiUserPublickey | null> {
-		this.refreshCacheByUserId(userId);
-		const keys = await this.getPublicKeyByUserId(userId);
-		if (keys == null || !Array.isArray(keys) || keys.length === 0) {
-			this.logger.warn(`No key found (refreshAndFindKey) userId=${userId} keyId=${keyId} keys=${JSON.stringify(keys)}`);
-			return null;
-		}
-		const exactKey = keys.find(x => x.keyId === keyId);
-		if (exactKey) return exactKey;
-		this.logger.warn(`No exact key found (refreshAndFindKey) userId=${userId} keyId=${keyId} keys=${JSON.stringify(keys)}`);
-		return null;
+	public async getAuthUserFromKeyId(keyId: string): Promise<{
+		user: MiRemoteUser;
+		key: MiUserPublickey;
+	} | null> {
+		const key = await this.publicKeyCache.fetch(keyId, async () => {
+			const key = await this.userPublickeysRepository.findOneBy({
+				keyId,
+			});
+
+			if (key == null) return null;
+
+			return key;
+		}, key => key != null);
+
+		if (key == null) return null;
+
+		const user = await this.cacheService.findUserById(key.userId).catch(() => null) as MiRemoteUser | null;
+		if (user == null) return null;
+		if (user.isDeleted) return null;
+
+		return {
+			user,
+			key,
+		};
 	}
 
 	/**
 	 * AP Actor id => Misskey User and Key
-	 * @param uri AP Actor id
-	 * @param keyId Key id to find. If not specified, main key will be selected.
-	 * @returns
-	 *	1. `null` if the user and key host do not match
-	 *	2. `{ user: null, key: null }` if the user is not found
-	 *	3. `{ user: MiRemoteUser, key: null }` if key is not found
-	 *  4. `{ user: MiRemoteUser, key: MiUserPublickey }` if both are found
 	 */
 	@bindThis
-	public async getAuthUserFromApId(uri: string, keyId?: string): Promise<{
+	public async getAuthUserFromApId(uri: string): Promise<{
 		user: MiRemoteUser;
 		key: MiUserPublickey | null;
-	} | {
-		user: null;
-		key: null;
-	} |
-	null> {
-		if (keyId) {
-			if (this.punyHost(uri) !== this.punyHost(keyId)) {
-				/**
-				 * keyIdはURL形式かつkeyIdのホストはuriのホストと一致するはず
-				 * （ApPersonService.validateActorに由来）
-				 *
-				 * ただ、Mastodonはリプライ関連で他人のトゥートをHTTP Signature署名して送ってくることがある
-				 * そのような署名は有効性に疑問があるので無視することにする
-				 * ここではuriとkeyIdのホストが一致しない場合は無視する
-				 * ハッシュをなくしたkeyIdとuriの同一性を比べてみてもいいが、`uri#*-key`というkeyIdを設定するのが
-				 * 決まりごとというわけでもないため幅を持たせることにする
-				 *
-				 *
-				 * The keyId should be in URL format and its host should match the host of the uri
-				 * (derived from ApPersonService.validateActor)
-				 *
-				 * However, Mastodon sometimes sends toots from other users with HTTP Signature signing for reply-related purposes
-				 * Such signatures are of questionable validity, so we choose to ignore them
-				 * Here, we ignore cases where the hosts of uri and keyId do not match
-				 * We could also compare the equality of keyId without the hash and uri, but since setting a keyId like `uri#*-key`
-				 * is not a strict rule, we decide to allow for some flexibility
-				 */
-				this.logger.warn(`actor uri and keyId are not matched uri=${uri} keyId=${keyId}`);
-				return null;
-			}
-		}
+	} | null> {
+		const user = await this.apPersonService.resolvePerson(uri) as MiRemoteUser;
+		if (user.isDeleted) return null;
 
-		const user = await this.apPersonService.resolvePerson(uri, undefined, true) as MiRemoteUser;
-		if (user.isDeleted) return { user: null, key: null };
-
-		const keys = await this.getPublicKeyByUserId(user.id);
-
-		if (keys == null || !Array.isArray(keys) || keys.length === 0) {
-			this.logger.warn(`No key found uri=${uri} userId=${user.id} keys=${JSON.stringify(keys)}`);
-			return { user, key: null };
-		}
-
-		if (!keyId) {
-			// Choose the main-like
-			const mainKey = keys.find(x => {
-				try {
-					const url = new URL(x.keyId);
-					const path = url.pathname.split('/').pop()?.toLowerCase();
-					if (url.hash) {
-						if (url.hash.toLowerCase().includes('main')) {
-							return true;
-						}
-					} else if (path?.includes('main') || path === 'publickey') {
-						return true;
-					}
-				} catch { /* noop */ }
-
-				return false;
-			});
-			return { user, key: mainKey ?? keys[0] };
-		}
-
-		const exactKey = keys.find(x => x.keyId === keyId);
-		if (exactKey) return { user, key: exactKey };
-
-		/**
-		 * keyIdで見つからない場合、まずはキャッシュを更新して再取得
-		 * If not found with keyId, update cache and reacquire
-		 */
-		const cacheRaw = this.publicKeyByUserIdCache.cache.get(user.id);
-		if (cacheRaw && cacheRaw.date > Date.now() - 1000 * 60 * 12) {
-			const exactKey = await this.refreshAndFindKey(user.id, keyId);
-			if (exactKey) return { user, key: exactKey };
-		}
-
-		/**
-		 * lastFetchedAtでの更新制限を弱めて再取得
-		 * Reacquisition with weakened update limit at lastFetchedAt
-		 */
-		if (user.lastFetchedAt == null || user.lastFetchedAt < new Date(Date.now() - 1000 * 60 * 12)) {
-			this.logger.info(`Fetching user to find public key uri=${uri} userId=${user.id} keyId=${keyId}`);
-			const renewed = await this.apPersonService.fetchPersonWithRenewal(uri, 0);
-			if (renewed == null || renewed.isDeleted) return null;
-
-			return { user, key: await this.refreshAndFindKey(user.id, keyId) };
-		}
-
-		this.logger.warn(`No key found uri=${uri} userId=${user.id} keyId=${keyId}`);
-		return { user, key: null };
-	}
-
-	@bindThis
-	public async getPublicKeyByUserId(userId: MiUser['id']): Promise<MiUserPublickey[] | null> {
-		return await this.publicKeyByUserIdCache.fetch(
-			userId,
-			() => this.userPublickeysRepository.find({ where: { userId } }),
+		const key = await this.publicKeyByUserIdCache.fetch(
+			user.id,
+			() => this.userPublickeysRepository.findOneBy({ userId: user.id }),
 			v => v != null,
 		);
-	}
 
-	@bindThis
-	public refreshCacheByUserId(userId: MiUser['id']): void {
-		this.publicKeyByUserIdCache.delete(userId);
+		return {
+			user,
+			key,
+		};
 	}
 
 	@bindThis
 	public dispose(): void {
+		this.publicKeyCache.dispose();
 		this.publicKeyByUserIdCache.dispose();
 	}
 
diff --git a/packages/backend/src/core/activitypub/ApDeliverManagerService.ts b/packages/backend/src/core/activitypub/ApDeliverManagerService.ts
index db3302e6ff..5d07cd8e8f 100644
--- a/packages/backend/src/core/activitypub/ApDeliverManagerService.ts
+++ b/packages/backend/src/core/activitypub/ApDeliverManagerService.ts
@@ -9,14 +9,10 @@ import { DI } from '@/di-symbols.js';
 import type { FollowingsRepository } from '@/models/_.js';
 import type { MiLocalUser, MiRemoteUser, MiUser } from '@/models/User.js';
 import { QueueService } from '@/core/QueueService.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
 import type { IActivity } from '@/core/activitypub/type.js';
 import { ThinUser } from '@/queue/types.js';
-import { AccountUpdateService } from '@/core/AccountUpdateService.js';
-import type Logger from '@/logger.js';
-import { UserKeypairService } from '../UserKeypairService.js';
-import { ApLoggerService } from './ApLoggerService.js';
-import type { PrivateKeyWithPem } from '@misskey-dev/node-http-message-signatures';
 
 interface IRecipe {
 	type: string;
@@ -31,19 +27,12 @@ interface IDirectRecipe extends IRecipe {
 	to: MiRemoteUser;
 }
 
-interface IAllKnowingSharedInboxRecipe extends IRecipe {
-	type: 'AllKnowingSharedInbox';
-}
-
 const isFollowers = (recipe: IRecipe): recipe is IFollowersRecipe =>
 	recipe.type === 'Followers';
 
 const isDirect = (recipe: IRecipe): recipe is IDirectRecipe =>
 	recipe.type === 'Direct';
 
-const isAllKnowingSharedInbox = (recipe: IRecipe): recipe is IAllKnowingSharedInboxRecipe =>
-	recipe.type === 'AllKnowingSharedInbox';
-
 class DeliverManager {
 	private actor: ThinUser;
 	private activity: IActivity | null;
@@ -51,18 +40,16 @@ class DeliverManager {
 
 	/**
 	 * Constructor
-	 * @param userKeypairService
+	 * @param userEntityService
 	 * @param followingsRepository
 	 * @param queueService
 	 * @param actor Actor
 	 * @param activity Activity to deliver
 	 */
 	constructor(
-		private userKeypairService: UserKeypairService,
+		private userEntityService: UserEntityService,
 		private followingsRepository: FollowingsRepository,
 		private queueService: QueueService,
-		private accountUpdateService: AccountUpdateService,
-		private logger: Logger,
 
 		actor: { id: MiUser['id']; host: null; },
 		activity: IActivity | null,
@@ -104,18 +91,6 @@ class DeliverManager {
 		this.addRecipe(recipe);
 	}
 
-	/**
-	 * Add recipe for all-knowing shared inbox deliver
-	 */
-	@bindThis
-	public addAllKnowingSharedInboxRecipe(): void {
-		const deliver: IAllKnowingSharedInboxRecipe = {
-			type: 'AllKnowingSharedInbox',
-		};
-
-		this.addRecipe(deliver);
-	}
-
 	/**
 	 * Add recipe
 	 * @param recipe Recipe
@@ -129,44 +104,11 @@ class DeliverManager {
 	 * Execute delivers
 	 */
 	@bindThis
-	public async execute(opts?: { privateKey?: PrivateKeyWithPem }): Promise<void> {
-		//#region MIGRATION
-		if (!opts?.privateKey) {
-			/**
-			 * ed25519の署名がなければ追加する
-			 */
-			const created = await this.userKeypairService.refreshAndPrepareEd25519KeyPair(this.actor.id);
-			if (created) {
-				// createdが存在するということは新規作成されたということなので、フォロワーに配信する
-				this.logger.info(`ed25519 key pair created for user ${this.actor.id} and publishing to followers`);
-				// リモートに配信
-				const keyPair = await this.userKeypairService.getLocalUserPrivateKeyPem(created, 'main');
-				await this.accountUpdateService.publishToFollowers(this.actor.id, keyPair);
-			}
-		}
-		//#endregion
-
-		//#region collect inboxes by recipes
+	public async execute(): Promise<void> {
 		// The value flags whether it is shared or not.
 		// key: inbox URL, value: whether it is sharedInbox
 		const inboxes = new Map<string, boolean>();
 
-		if (this.recipes.some(r => isAllKnowingSharedInbox(r))) {
-			// all-knowing shared inbox
-			const followings = await this.followingsRepository.find({
-				where: [
-					{ followerSharedInbox: Not(IsNull()) },
-					{ followeeSharedInbox: Not(IsNull()) },
-				],
-				select: ['followerSharedInbox', 'followeeSharedInbox'],
-			});
-
-			for (const following of followings) {
-				if (following.followeeSharedInbox) inboxes.set(following.followeeSharedInbox, true);
-				if (following.followerSharedInbox) inboxes.set(following.followerSharedInbox, true);
-			}
-		}
-
 		// build inbox list
 		// Process follower recipes first to avoid duplication when processing direct recipes later.
 		if (this.recipes.some(r => isFollowers(r))) {
@@ -200,49 +142,39 @@ class DeliverManager {
 
 			inboxes.set(recipe.to.inbox, false);
 		}
-		//#endregion
 
 		// deliver
-		await this.queueService.deliverMany(this.actor, this.activity, inboxes, opts?.privateKey);
-		this.logger.info(`Deliver queues dispatched: inboxes=${inboxes.size} actorId=${this.actor.id} activityId=${this.activity?.id}`);
+		await this.queueService.deliverMany(this.actor, this.activity, inboxes);
 	}
 }
 
 @Injectable()
 export class ApDeliverManagerService {
-	private logger: Logger;
-
 	constructor(
 		@Inject(DI.followingsRepository)
 		private followingsRepository: FollowingsRepository,
 
-		private userKeypairService: UserKeypairService,
+		private userEntityService: UserEntityService,
 		private queueService: QueueService,
-		private accountUpdateService: AccountUpdateService,
-		private apLoggerService: ApLoggerService,
 	) {
-		this.logger = this.apLoggerService.logger.createSubLogger('deliver-manager');
 	}
 
 	/**
 	 * Deliver activity to followers
 	 * @param actor
 	 * @param activity Activity
-	 * @param forceMainKey Force to use main (rsa) key
 	 */
 	@bindThis
-	public async deliverToFollowers(actor: { id: MiLocalUser['id']; host: null; }, activity: IActivity, privateKey?: PrivateKeyWithPem): Promise<void> {
+	public async deliverToFollowers(actor: { id: MiLocalUser['id']; host: null; }, activity: IActivity): Promise<void> {
 		const manager = new DeliverManager(
-			this.userKeypairService,
+			this.userEntityService,
 			this.followingsRepository,
 			this.queueService,
-			this.accountUpdateService,
-			this.logger,
 			actor,
 			activity,
 		);
 		manager.addFollowersRecipe();
-		await manager.execute({ privateKey });
+		await manager.execute();
 	}
 
 	/**
@@ -254,11 +186,9 @@ export class ApDeliverManagerService {
 	@bindThis
 	public async deliverToUser(actor: { id: MiLocalUser['id']; host: null; }, activity: IActivity, to: MiRemoteUser): Promise<void> {
 		const manager = new DeliverManager(
-			this.userKeypairService,
+			this.userEntityService,
 			this.followingsRepository,
 			this.queueService,
-			this.accountUpdateService,
-			this.logger,
 			actor,
 			activity,
 		);
@@ -269,11 +199,10 @@ export class ApDeliverManagerService {
 	@bindThis
 	public createDeliverManager(actor: { id: MiUser['id']; host: null; }, activity: IActivity | null): DeliverManager {
 		return new DeliverManager(
-			this.userKeypairService,
+			this.userEntityService,
 			this.followingsRepository,
 			this.queueService,
-			this.accountUpdateService,
-			this.logger,
+
 			actor,
 			activity,
 		);
diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts
index 1bef9fe071..e2164fec1d 100644
--- a/packages/backend/src/core/activitypub/ApInboxService.ts
+++ b/packages/backend/src/core/activitypub/ApInboxService.ts
@@ -114,8 +114,15 @@ export class ApInboxService {
 			result = await this.performOneActivity(actor, activity);
 		}
 
-		// ついでにリモートユーザーの情報が古かったら更新しておく?
-		// → No, この関数が呼び出される前に署名検証で更新されているはず
+		// ついでにリモートユーザーの情報が古かったら更新しておく
+		if (actor.uri) {
+			if (actor.lastFetchedAt == null || Date.now() - actor.lastFetchedAt.getTime() > 1000 * 60 * 60 * 24) {
+				setImmediate(() => {
+					this.apPersonService.updatePerson(actor.uri);
+				});
+			}
+		}
+		return result;
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts
index 5d7419f934..98e944f347 100644
--- a/packages/backend/src/core/activitypub/ApRendererService.ts
+++ b/packages/backend/src/core/activitypub/ApRendererService.ts
@@ -22,6 +22,7 @@ import { UserKeypairService } from '@/core/UserKeypairService.js';
 import { MfmService } from '@/core/MfmService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
+import type { MiUserKeypair } from '@/models/UserKeypair.js';
 import type { UsersRepository, UserProfilesRepository, NotesRepository, DriveFilesRepository, PollsRepository } from '@/models/_.js';
 import { bindThis } from '@/decorators.js';
 import { CustomEmojiService } from '@/core/CustomEmojiService.js';
@@ -30,7 +31,6 @@ import { JsonLdService } from './JsonLdService.js';
 import { ApMfmService } from './ApMfmService.js';
 import { CONTEXT } from './misc/contexts.js';
 import type { IAccept, IActivity, IAdd, IAnnounce, IApDocument, IApEmoji, IApHashtag, IApImage, IApMention, IBlock, ICreate, IDelete, IFlag, IFollow, IKey, ILike, IMove, IObject, IPost, IQuestion, IReject, IRemove, ITombstone, IUndo, IUpdate } from './type.js';
-import type { PrivateKeyWithPem } from '@misskey-dev/node-http-message-signatures';
 
 @Injectable()
 export class ApRendererService {
@@ -251,15 +251,15 @@ export class ApRendererService {
 	}
 
 	@bindThis
-	public renderKey(user: MiLocalUser, publicKey: string, postfix?: string): IKey {
+	public renderKey(user: MiLocalUser, key: MiUserKeypair, postfix?: string): IKey {
 		return {
-			id: `${this.userEntityService.genLocalUserUri(user.id)}${postfix ?? '/publickey'}`,
+			id: `${this.config.url}/users/${user.id}${postfix ?? '/publickey'}`,
 			type: 'Key',
 			owner: this.userEntityService.genLocalUserUri(user.id),
-			publicKeyPem: createPublicKey(publicKey).export({
+			publicKeyPem: createPublicKey(key.publicKey).export({
 				type: 'spki',
 				format: 'pem',
-			}) as string,
+			}),
 		};
 	}
 
@@ -499,10 +499,7 @@ export class ApRendererService {
 			tag,
 			manuallyApprovesFollowers: user.isLocked,
 			discoverable: user.isExplorable,
-			publicKey: this.renderKey(user, keypair.publicKey, '#main-key'),
-			additionalPublicKeys: [
-				...(keypair.ed25519PublicKey ? [this.renderKey(user, keypair.ed25519PublicKey, '#ed25519-key')] : []),
-			],
+			publicKey: this.renderKey(user, keypair, '#main-key'),
 			isCat: user.isCat,
 			attachment: attachment.length ? attachment : undefined,
 		};
@@ -625,10 +622,12 @@ export class ApRendererService {
 	}
 
 	@bindThis
-	public async attachLdSignature(activity: any, key: PrivateKeyWithPem): Promise<IActivity> {
+	public async attachLdSignature(activity: any, user: { id: MiUser['id']; host: null; }): Promise<IActivity> {
+		const keypair = await this.userKeypairService.getUserKeypair(user.id);
+
 		const jsonLd = this.jsonLdService.use();
 		jsonLd.debug = false;
-		activity = await jsonLd.signRsaSignature2017(activity, key.privateKeyPem, key.keyId);
+		activity = await jsonLd.signRsaSignature2017(activity, keypair.privateKey, `${this.config.url}/users/${user.id}#main-key`);
 
 		return activity;
 	}
diff --git a/packages/backend/src/core/activitypub/ApRequestService.ts b/packages/backend/src/core/activitypub/ApRequestService.ts
index 0cae91316b..93ac8ce9a7 100644
--- a/packages/backend/src/core/activitypub/ApRequestService.ts
+++ b/packages/backend/src/core/activitypub/ApRequestService.ts
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import * as crypto from 'node:crypto';
 import { URL } from 'node:url';
 import { Inject, Injectable } from '@nestjs/common';
-import { genRFC3230DigestHeader, signAsDraftToRequest } from '@misskey-dev/node-http-message-signatures';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import type { MiUser } from '@/models/User.js';
@@ -15,61 +15,122 @@ import { LoggerService } from '@/core/LoggerService.js';
 import { bindThis } from '@/decorators.js';
 import type Logger from '@/logger.js';
 import { validateContentTypeSetAsActivityPub } from '@/core/activitypub/misc/validator.js';
-import type { PrivateKeyWithPem, PrivateKey } from '@misskey-dev/node-http-message-signatures';
 
-export async function createSignedPost(args: { level: string; key: PrivateKey; url: string; body: string; digest?: string, additionalHeaders: Record<string, string> }) {
-	const u = new URL(args.url);
-	const request = {
-		url: u.href,
-		method: 'POST',
-		headers: {
-			'Date': new Date().toUTCString(),
-			'Host': u.host,
-			'Content-Type': 'application/activity+json',
-			...args.additionalHeaders,
-		} as Record<string, string>,
-	};
+type Request = {
+	url: string;
+	method: string;
+	headers: Record<string, string>;
+};
 
-	// TODO: httpMessageSignaturesImplementationLevelによって新規格で通信をするようにする
-	const digestHeader = args.digest ?? await genRFC3230DigestHeader(args.body, 'SHA-256');
-	request.headers['Digest'] = digestHeader;
+type Signed = {
+	request: Request;
+	signingString: string;
+	signature: string;
+	signatureHeader: string;
+};
 
-	const result = await signAsDraftToRequest(
-		request,
-		args.key,
-		['(request-target)', 'date', 'host', 'digest'],
-	);
+type PrivateKey = {
+	privateKeyPem: string;
+	keyId: string;
+};
 
-	return {
-		request,
-		...result,
-	};
-}
+export class ApRequestCreator {
+	static createSignedPost(args: { key: PrivateKey, url: string, body: string, digest?: string, additionalHeaders: Record<string, string> }): Signed {
+		const u = new URL(args.url);
+		const digestHeader = args.digest ?? this.createDigest(args.body);
 
-export async function createSignedGet(args: { level: string; key: PrivateKey; url: string; additionalHeaders: Record<string, string> }) {
-	const u = new URL(args.url);
-	const request = {
-		url: u.href,
-		method: 'GET',
-		headers: {
-			'Accept': 'application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
-			'Date': new Date().toUTCString(),
-			'Host': new URL(args.url).host,
-			...args.additionalHeaders,
-		} as Record<string, string>,
-	};
+		const request: Request = {
+			url: u.href,
+			method: 'POST',
+			headers: this.#objectAssignWithLcKey({
+				'Date': new Date().toUTCString(),
+				'Host': u.host,
+				'Content-Type': 'application/activity+json',
+				'Digest': digestHeader,
+			}, args.additionalHeaders),
+		};
 
-	// TODO: httpMessageSignaturesImplementationLevelによって新規格で通信をするようにする
-	const result = await signAsDraftToRequest(
-		request,
-		args.key,
-		['(request-target)', 'date', 'host', 'accept'],
-	);
+		const result = this.#signToRequest(request, args.key, ['(request-target)', 'date', 'host', 'digest']);
 
-	return {
-		request,
-		...result,
-	};
+		return {
+			request,
+			signingString: result.signingString,
+			signature: result.signature,
+			signatureHeader: result.signatureHeader,
+		};
+	}
+
+	static createDigest(body: string) {
+		return `SHA-256=${crypto.createHash('sha256').update(body).digest('base64')}`;
+	}
+
+	static createSignedGet(args: { key: PrivateKey, url: string, additionalHeaders: Record<string, string> }): Signed {
+		const u = new URL(args.url);
+
+		const request: Request = {
+			url: u.href,
+			method: 'GET',
+			headers: this.#objectAssignWithLcKey({
+				'Accept': 'application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+				'Date': new Date().toUTCString(),
+				'Host': new URL(args.url).host,
+			}, args.additionalHeaders),
+		};
+
+		const result = this.#signToRequest(request, args.key, ['(request-target)', 'date', 'host', 'accept']);
+
+		return {
+			request,
+			signingString: result.signingString,
+			signature: result.signature,
+			signatureHeader: result.signatureHeader,
+		};
+	}
+
+	static #signToRequest(request: Request, key: PrivateKey, includeHeaders: string[]): Signed {
+		const signingString = this.#genSigningString(request, includeHeaders);
+		const signature = crypto.sign('sha256', Buffer.from(signingString), key.privateKeyPem).toString('base64');
+		const signatureHeader = `keyId="${key.keyId}",algorithm="rsa-sha256",headers="${includeHeaders.join(' ')}",signature="${signature}"`;
+
+		request.headers = this.#objectAssignWithLcKey(request.headers, {
+			Signature: signatureHeader,
+		});
+		// node-fetch will generate this for us. if we keep 'Host', it won't change with redirects!
+		delete request.headers['host'];
+
+		return {
+			request,
+			signingString,
+			signature,
+			signatureHeader,
+		};
+	}
+
+	static #genSigningString(request: Request, includeHeaders: string[]): string {
+		request.headers = this.#lcObjectKey(request.headers);
+
+		const results: string[] = [];
+
+		for (const key of includeHeaders.map(x => x.toLowerCase())) {
+			if (key === '(request-target)') {
+				results.push(`(request-target): ${request.method.toLowerCase()} ${new URL(request.url).pathname}`);
+			} else {
+				results.push(`${key}: ${request.headers[key]}`);
+			}
+		}
+
+		return results.join('\n');
+	}
+
+	static #lcObjectKey(src: Record<string, string>): Record<string, string> {
+		const dst: Record<string, string> = {};
+		for (const key of Object.keys(src).filter(x => x !== '__proto__' && typeof src[x] === 'string')) dst[key.toLowerCase()] = src[key];
+		return dst;
+	}
+
+	static #objectAssignWithLcKey(a: Record<string, string>, b: Record<string, string>): Record<string, string> {
+		return Object.assign(this.#lcObjectKey(a), this.#lcObjectKey(b));
+	}
 }
 
 @Injectable()
@@ -89,28 +150,21 @@ export class ApRequestService {
 	}
 
 	@bindThis
-	public async signedPost(user: { id: MiUser['id'] }, url: string, object: unknown, level: string, digest?: string, key?: PrivateKeyWithPem): Promise<void> {
+	public async signedPost(user: { id: MiUser['id'] }, url: string, object: unknown, digest?: string): Promise<void> {
 		const body = typeof object === 'string' ? object : JSON.stringify(object);
-		const keyFetched = await this.userKeypairService.getLocalUserPrivateKey(key ?? user.id, level);
-		const req = await createSignedPost({
-			level,
-			key: keyFetched,
+
+		const keypair = await this.userKeypairService.getUserKeypair(user.id);
+
+		const req = ApRequestCreator.createSignedPost({
+			key: {
+				privateKeyPem: keypair.privateKey,
+				keyId: `${this.config.url}/users/${user.id}#main-key`,
+			},
 			url,
 			body,
-			additionalHeaders: {
-				'User-Agent': this.config.userAgent,
-			},
 			digest,
-		});
-
-		// node-fetch will generate this for us. if we keep 'Host', it won't change with redirects!
-		delete req.request.headers['Host'];
-
-		this.logger.debug('create signed post', {
-			version: 'draft',
-			level,
-			url,
-			keyId: keyFetched.keyId,
+			additionalHeaders: {
+			},
 		});
 
 		await this.httpRequestService.send(url, {
@@ -126,27 +180,19 @@ export class ApRequestService {
 	 * @param url URL to fetch
 	 */
 	@bindThis
-	public async signedGet(url: string, user: { id: MiUser['id'] }, level: string): Promise<unknown> {
-		const key = await this.userKeypairService.getLocalUserPrivateKey(user.id, level);
-		const req = await createSignedGet({
-			level,
-			key,
+	public async signedGet(url: string, user: { id: MiUser['id'] }): Promise<unknown> {
+		const keypair = await this.userKeypairService.getUserKeypair(user.id);
+
+		const req = ApRequestCreator.createSignedGet({
+			key: {
+				privateKeyPem: keypair.privateKey,
+				keyId: `${this.config.url}/users/${user.id}#main-key`,
+			},
 			url,
 			additionalHeaders: {
-				'User-Agent': this.config.userAgent,
 			},
 		});
 
-		// node-fetch will generate this for us. if we keep 'Host', it won't change with redirects!
-		delete req.request.headers['Host'];
-
-		this.logger.debug('create signed get', {
-			version: 'draft',
-			level,
-			url,
-			keyId: key.keyId,
-		});
-
 		const res = await this.httpRequestService.send(url, {
 			method: req.request.method,
 			headers: req.request.headers,
diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts
index 727ff6f956..bb3c40f093 100644
--- a/packages/backend/src/core/activitypub/ApResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApResolverService.ts
@@ -16,7 +16,6 @@ import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import type Logger from '@/logger.js';
-import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import { isCollectionOrOrderedCollection } from './type.js';
 import { ApDbResolverService } from './ApDbResolverService.js';
 import { ApRendererService } from './ApRendererService.js';
@@ -42,7 +41,6 @@ export class Resolver {
 		private httpRequestService: HttpRequestService,
 		private apRendererService: ApRendererService,
 		private apDbResolverService: ApDbResolverService,
-		private federatedInstanceService: FederatedInstanceService,
 		private loggerService: LoggerService,
 		private recursionLimit = 100,
 	) {
@@ -105,10 +103,8 @@ export class Resolver {
 			this.user = await this.instanceActorService.getInstanceActor();
 		}
 
-		const server = await this.federatedInstanceService.fetch(host);
-
 		const object = (this.user
-			? await this.apRequestService.signedGet(value, this.user, server.httpMessageSignaturesImplementationLevel) as IObject
+			? await this.apRequestService.signedGet(value, this.user) as IObject
 			: await this.httpRequestService.getActivityJson(value)) as IObject;
 
 		if (
@@ -204,7 +200,6 @@ export class ApResolverService {
 		private httpRequestService: HttpRequestService,
 		private apRendererService: ApRendererService,
 		private apDbResolverService: ApDbResolverService,
-		private federatedInstanceService: FederatedInstanceService,
 		private loggerService: LoggerService,
 	) {
 	}
@@ -225,7 +220,6 @@ export class ApResolverService {
 			this.httpRequestService,
 			this.apRendererService,
 			this.apDbResolverService,
-			this.federatedInstanceService,
 			this.loggerService,
 		);
 	}
diff --git a/packages/backend/src/core/activitypub/misc/contexts.ts b/packages/backend/src/core/activitypub/misc/contexts.ts
index fc4e3e3bef..feb8c42c56 100644
--- a/packages/backend/src/core/activitypub/misc/contexts.ts
+++ b/packages/backend/src/core/activitypub/misc/contexts.ts
@@ -134,7 +134,6 @@ const security_v1 = {
 		'privateKey': { '@id': 'sec:privateKey', '@type': '@id' },
 		'privateKeyPem': 'sec:privateKeyPem',
 		'publicKey': { '@id': 'sec:publicKey', '@type': '@id' },
-		'additionalPublicKeys': { '@id': 'sec:publicKey', '@type': '@id' },
 		'publicKeyBase58': 'sec:publicKeyBase58',
 		'publicKeyPem': 'sec:publicKeyPem',
 		'publicKeyWif': 'sec:publicKeyWif',
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index c41fc713d5..457205e023 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -3,10 +3,9 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { verify } from 'crypto';
 import { Inject, Injectable } from '@nestjs/common';
 import promiseLimit from 'promise-limit';
-import { DataSource, In, Not } from 'typeorm';
+import { DataSource } from 'typeorm';
 import { ModuleRef } from '@nestjs/core';
 import { DI } from '@/di-symbols.js';
 import type { FollowingsRepository, InstancesRepository, UserProfilesRepository, UserPublickeysRepository, UsersRepository } from '@/models/_.js';
@@ -40,7 +39,6 @@ import { MetaService } from '@/core/MetaService.js';
 import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
 import type { AccountMoveService } from '@/core/AccountMoveService.js';
 import { checkHttps } from '@/misc/check-https.js';
-import { REMOTE_USER_CACHE_TTL, REMOTE_USER_MOVE_COOLDOWN } from '@/const.js';
 import { getApId, getApType, getOneApHrefNullable, isActor, isCollection, isCollectionOrOrderedCollection, isPropertyValue } from '../type.js';
 import { extractApHashtags } from './tag.js';
 import type { OnModuleInit } from '@nestjs/common';
@@ -50,7 +48,7 @@ import type { ApResolverService, Resolver } from '../ApResolverService.js';
 import type { ApLoggerService } from '../ApLoggerService.js';
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import type { ApImageService } from './ApImageService.js';
-import type { IActor, IKey, IObject } from '../type.js';
+import type { IActor, IObject } from '../type.js';
 
 const nameLength = 128;
 const summaryLength = 2048;
@@ -187,38 +185,13 @@ export class ApPersonService implements OnModuleInit {
 		}
 
 		if (x.publicKey) {
-			const publicKeys = Array.isArray(x.publicKey) ? x.publicKey : [x.publicKey];
-
-			for (const publicKey of publicKeys) {
-				if (typeof publicKey.id !== 'string') {
-					throw new Error('invalid Actor: publicKey.id is not a string');
-				}
-
-				const publicKeyIdHost = this.punyHost(publicKey.id);
-				if (publicKeyIdHost !== expectHost) {
-					throw new Error('invalid Actor: publicKey.id has different host');
-				}
-			}
-		}
-
-		if (x.additionalPublicKeys) {
-			if (!x.publicKey) {
-				throw new Error('invalid Actor: additionalPublicKeys is set but publicKey is not');
+			if (typeof x.publicKey.id !== 'string') {
+				throw new Error('invalid Actor: publicKey.id is not a string');
 			}
 
-			if (!Array.isArray(x.additionalPublicKeys)) {
-				throw new Error('invalid Actor: additionalPublicKeys is not an array');
-			}
-
-			for (const key of x.additionalPublicKeys) {
-				if (typeof key.id !== 'string') {
-					throw new Error('invalid Actor: additionalPublicKeys.id is not a string');
-				}
-
-				const keyIdHost = this.punyHost(key.id);
-				if (keyIdHost !== expectHost) {
-					throw new Error('invalid Actor: additionalPublicKeys.id has different host');
-				}
+			const publicKeyIdHost = this.punyHost(x.publicKey.id);
+			if (publicKeyIdHost !== expectHost) {
+				throw new Error('invalid Actor: publicKey.id has different host');
 			}
 		}
 
@@ -255,33 +228,6 @@ export class ApPersonService implements OnModuleInit {
 		return null;
 	}
 
-	/**
-	 * uriからUser(Person)をフェッチします。
-	 *
-	 * Misskeyに対象のPersonが登録されていればそれを返し、登録がなければnullを返します。
-	 * また、TTLが0でない場合、TTLを過ぎていた場合はupdatePersonを実行します。
-	 */
-	@bindThis
-	async fetchPersonWithRenewal(uri: string, TTL = REMOTE_USER_CACHE_TTL): Promise<MiLocalUser | MiRemoteUser | null> {
-		const exist = await this.fetchPerson(uri);
-		if (exist == null) return null;
-
-		if (this.userEntityService.isRemoteUser(exist)) {
-			if (TTL === 0 || exist.lastFetchedAt == null || Date.now() - exist.lastFetchedAt.getTime() > TTL) {
-				this.logger.debug('fetchPersonWithRenewal: renew', { uri, TTL, lastFetchedAt: exist.lastFetchedAt });
-				try {
-					await this.updatePerson(exist.uri);
-					return await this.fetchPerson(uri);
-				} catch (err) {
-					this.logger.error('error occurred while renewing user', { err });
-				}
-			}
-			this.logger.debug('fetchPersonWithRenewal: use cache', { uri, TTL, lastFetchedAt: exist.lastFetchedAt });
-		}
-
-		return exist;
-	}
-
 	private async resolveAvatarAndBanner(user: MiRemoteUser, icon: any, image: any): Promise<Partial<Pick<MiRemoteUser, 'avatarId' | 'bannerId' | 'avatarUrl' | 'bannerUrl' | 'avatarBlurhash' | 'bannerBlurhash'>>> {
 		if (user == null) throw new Error('failed to create user: user is null');
 
@@ -417,15 +363,11 @@ export class ApPersonService implements OnModuleInit {
 				}));
 
 				if (person.publicKey) {
-					const publicKeys = new Map<string, IKey>();
-					(person.additionalPublicKeys ?? []).forEach(key => publicKeys.set(key.id, key));
-					(Array.isArray(person.publicKey) ? person.publicKey : [person.publicKey]).forEach(key => publicKeys.set(key.id, key));
-
-					await transactionalEntityManager.save(Array.from(publicKeys.values(), key => new MiUserPublickey({
-						keyId: key.id,
-						userId: user!.id,
-						keyPem: key.publicKeyPem,
-					})));
+					await transactionalEntityManager.save(new MiUserPublickey({
+						userId: user.id,
+						keyId: person.publicKey.id,
+						keyPem: person.publicKey.publicKeyPem,
+					}));
 				}
 			});
 		} catch (e) {
@@ -571,29 +513,11 @@ export class ApPersonService implements OnModuleInit {
 		// Update user
 		await this.usersRepository.update(exist.id, updates);
 
-		try {
-			// Deleteアクティビティ受信時にもここが走ってsaveがuserforeign key制約エラーを吐くことがある
-			// とりあえずtry-catchで囲っておく
-			const publicKeys = new Map<string, IKey>();
-			if (person.publicKey) {
-				(person.additionalPublicKeys ?? []).forEach(key => publicKeys.set(key.id, key));
-				(Array.isArray(person.publicKey) ? person.publicKey : [person.publicKey]).forEach(key => publicKeys.set(key.id, key));
-
-				await this.userPublickeysRepository.save(Array.from(publicKeys.values(), key => ({
-					keyId: key.id,
-					userId: exist.id,
-					keyPem: key.publicKeyPem,
-				})));
-			}
-
-			this.userPublickeysRepository.delete({
-				keyId: Not(In(Array.from(publicKeys.keys()))),
-				userId: exist.id,
-			}).catch(err => {
-				this.logger.error('something happened while deleting remote user public keys:', { userId: exist.id, err });
+		if (person.publicKey) {
+			await this.userPublickeysRepository.update({ userId: exist.id }, {
+				keyId: person.publicKey.id,
+				keyPem: person.publicKey.publicKeyPem,
 			});
-		} catch (err) {
-			this.logger.error('something happened while updating remote user public keys:', { userId: exist.id, err });
 		}
 
 		let _description: string | null = null;
@@ -635,7 +559,7 @@ export class ApPersonService implements OnModuleInit {
 			exist.movedAt == null ||
 			// 以前のmovingから14日以上経過した場合のみ移行処理を許可
 			// （Mastodonのクールダウン期間は30日だが若干緩めに設定しておく）
-			exist.movedAt.getTime() + REMOTE_USER_MOVE_COOLDOWN < updated.movedAt.getTime()
+			exist.movedAt.getTime() + 1000 * 60 * 60 * 24 * 14 < updated.movedAt.getTime()
 		)) {
 			this.logger.info(`Start to process Move of @${updated.username}@${updated.host} (${uri})`);
 			return this.processRemoteMove(updated, movePreventUris)
@@ -658,9 +582,9 @@ export class ApPersonService implements OnModuleInit {
 	 * リモートサーバーからフェッチしてMisskeyに登録しそれを返します。
 	 */
 	@bindThis
-	public async resolvePerson(uri: string, resolver?: Resolver, withRenewal = false): Promise<MiLocalUser | MiRemoteUser> {
+	public async resolvePerson(uri: string, resolver?: Resolver): Promise<MiLocalUser | MiRemoteUser> {
 		//#region このサーバーに既に登録されていたらそれを返す
-		const exist = withRenewal ? await this.fetchPersonWithRenewal(uri) : await this.fetchPerson(uri);
+		const exist = await this.fetchPerson(uri);
 		if (exist) return exist;
 		//#endregion
 
diff --git a/packages/backend/src/core/activitypub/type.ts b/packages/backend/src/core/activitypub/type.ts
index 1d55971660..5b6c6c8ca6 100644
--- a/packages/backend/src/core/activitypub/type.ts
+++ b/packages/backend/src/core/activitypub/type.ts
@@ -55,7 +55,7 @@ export function getOneApId(value: ApObject): string {
 export function getApId(value: string | IObject): string {
 	if (typeof value === 'string') return value;
 	if (typeof value.id === 'string') return value.id;
-	throw new Error('cannot determine id');
+	throw new Error('cannot detemine id');
 }
 
 /**
@@ -169,8 +169,10 @@ export interface IActor extends IObject {
 	discoverable?: boolean;
 	inbox: string;
 	sharedInbox?: string;	// 後方互換性のため
-	publicKey?: IKey | IKey[];
-	additionalPublicKeys?: IKey[];
+	publicKey?: {
+		id: string;
+		publicKeyPem: string;
+	};
 	followers?: string | ICollection | IOrderedCollection;
 	following?: string | ICollection | IOrderedCollection;
 	featured?: string | IOrderedCollection;
@@ -234,9 +236,8 @@ export const isEmoji = (object: IObject): object is IApEmoji =>
 
 export interface IKey extends IObject {
 	type: 'Key';
-	id: string;
 	owner: string;
-	publicKeyPem: string;
+	publicKeyPem: string | Buffer;
 }
 
 export interface IApDocument extends IObject {
diff --git a/packages/backend/src/core/entities/InstanceEntityService.ts b/packages/backend/src/core/entities/InstanceEntityService.ts
index fd0f55c6ab..9117b13914 100644
--- a/packages/backend/src/core/entities/InstanceEntityService.ts
+++ b/packages/backend/src/core/entities/InstanceEntityService.ts
@@ -56,7 +56,6 @@ export class InstanceEntityService {
 			infoUpdatedAt: instance.infoUpdatedAt ? instance.infoUpdatedAt.toISOString() : null,
 			latestRequestReceivedAt: instance.latestRequestReceivedAt ? instance.latestRequestReceivedAt.toISOString() : null,
 			moderationNote: iAmModerator ? instance.moderationNote : null,
-			httpMessageSignaturesImplementationLevel: instance.httpMessageSignaturesImplementationLevel,
 		};
 	}
 
diff --git a/packages/backend/src/misc/cache.ts b/packages/backend/src/misc/cache.ts
index f498c110bf..bba64a06ef 100644
--- a/packages/backend/src/misc/cache.ts
+++ b/packages/backend/src/misc/cache.ts
@@ -195,9 +195,6 @@ export class MemoryKVCache<T> {
 	private lifetime: number;
 	private gcIntervalHandle: NodeJS.Timeout;
 
-	/**
-	 * @param lifetime キャッシュの生存期間 (ms)
-	 */
 	constructor(lifetime: MemoryKVCache<never>['lifetime']) {
 		this.cache = new Map();
 		this.lifetime = lifetime;
diff --git a/packages/backend/src/misc/gen-key-pair.ts b/packages/backend/src/misc/gen-key-pair.ts
index 0b033ec33e..02a303dc0a 100644
--- a/packages/backend/src/misc/gen-key-pair.ts
+++ b/packages/backend/src/misc/gen-key-pair.ts
@@ -3,14 +3,39 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { genEd25519KeyPair, genRsaKeyPair } from '@misskey-dev/node-http-message-signatures';
+import * as crypto from 'node:crypto';
+import * as util from 'node:util';
 
-export async function genRSAAndEd25519KeyPair(rsaModulusLength = 4096) {
-	const [rsa, ed25519] = await Promise.all([genRsaKeyPair(rsaModulusLength), genEd25519KeyPair()]);
-	return {
-		publicKey: rsa.publicKey,
-		privateKey: rsa.privateKey,
-		ed25519PublicKey: ed25519.publicKey,
-		ed25519PrivateKey: ed25519.privateKey,
-	};
+const generateKeyPair = util.promisify(crypto.generateKeyPair);
+
+export async function genRsaKeyPair(modulusLength = 2048) {
+	return await generateKeyPair('rsa', {
+		modulusLength,
+		publicKeyEncoding: {
+			type: 'spki',
+			format: 'pem',
+		},
+		privateKeyEncoding: {
+			type: 'pkcs8',
+			format: 'pem',
+			cipher: undefined,
+			passphrase: undefined,
+		},
+	});
+}
+
+export async function genEcKeyPair(namedCurve: 'prime256v1' | 'secp384r1' | 'secp521r1' | 'curve25519' = 'prime256v1') {
+	return await generateKeyPair('ec', {
+		namedCurve,
+		publicKeyEncoding: {
+			type: 'spki',
+			format: 'pem',
+		},
+		privateKeyEncoding: {
+			type: 'pkcs8',
+			format: 'pem',
+			cipher: undefined,
+			passphrase: undefined,
+		},
+	});
 }
diff --git a/packages/backend/src/models/Instance.ts b/packages/backend/src/models/Instance.ts
index f2f2831cf1..17cd5c6665 100644
--- a/packages/backend/src/models/Instance.ts
+++ b/packages/backend/src/models/Instance.ts
@@ -158,9 +158,4 @@ export class MiInstance {
 		length: 16384, default: '',
 	})
 	public moderationNote: string;
-
-	@Column('varchar', {
-		length: 16, default: '00', nullable: false,
-	})
-	public httpMessageSignaturesImplementationLevel: string;
 }
diff --git a/packages/backend/src/models/UserKeypair.ts b/packages/backend/src/models/UserKeypair.ts
index afa74ef11a..f5252d126c 100644
--- a/packages/backend/src/models/UserKeypair.ts
+++ b/packages/backend/src/models/UserKeypair.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { PrimaryColumn, Entity, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { PrimaryColumn, Entity, JoinColumn, Column, OneToOne } from 'typeorm';
 import { id } from './util/id.js';
 import { MiUser } from './User.js';
 
@@ -12,42 +12,22 @@ export class MiUserKeypair {
 	@PrimaryColumn(id())
 	public userId: MiUser['id'];
 
-	@ManyToOne(type => MiUser, {
+	@OneToOne(type => MiUser, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
 	public user: MiUser | null;
 
-	/**
-	 * RSA public key
-	 */
 	@Column('varchar', {
 		length: 4096,
 	})
 	public publicKey: string;
 
-	/**
-	 * RSA private key
-	 */
 	@Column('varchar', {
 		length: 4096,
 	})
 	public privateKey: string;
 
-	@Column('varchar', {
-		length: 128,
-		nullable: true,
-		default: null,
-	})
-	public ed25519PublicKey: string | null;
-
-	@Column('varchar', {
-		length: 128,
-		nullable: true,
-		default: null,
-	})
-	public ed25519PrivateKey: string | null;
-
 	constructor(data: Partial<MiUserKeypair>) {
 		if (data == null) return;
 
diff --git a/packages/backend/src/models/UserPublickey.ts b/packages/backend/src/models/UserPublickey.ts
index 0ecff2bcbe..6bcd785304 100644
--- a/packages/backend/src/models/UserPublickey.ts
+++ b/packages/backend/src/models/UserPublickey.ts
@@ -9,13 +9,7 @@ import { MiUser } from './User.js';
 
 @Entity('user_publickey')
 export class MiUserPublickey {
-	@PrimaryColumn('varchar', {
-		length: 256,
-	})
-	public keyId: string;
-
-	@Index()
-	@Column(id())
+	@PrimaryColumn(id())
 	public userId: MiUser['id'];
 
 	@OneToOne(type => MiUser, {
@@ -24,6 +18,12 @@ export class MiUserPublickey {
 	@JoinColumn()
 	public user: MiUser | null;
 
+	@Index({ unique: true })
+	@Column('varchar', {
+		length: 256,
+	})
+	public keyId: string;
+
 	@Column('varchar', {
 		length: 4096,
 	})
diff --git a/packages/backend/src/models/json-schema/federation-instance.ts b/packages/backend/src/models/json-schema/federation-instance.ts
index c02e7f557a..ed40d405c6 100644
--- a/packages/backend/src/models/json-schema/federation-instance.ts
+++ b/packages/backend/src/models/json-schema/federation-instance.ts
@@ -116,9 +116,5 @@ export const packedFederationInstanceSchema = {
 			type: 'string',
 			optional: true, nullable: true,
 		},
-		httpMessageSignaturesImplementationLevel: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
 	},
 } as const;
diff --git a/packages/backend/src/queue/QueueProcessorService.ts b/packages/backend/src/queue/QueueProcessorService.ts
index 169b22c3f5..7bd74f3210 100644
--- a/packages/backend/src/queue/QueueProcessorService.ts
+++ b/packages/backend/src/queue/QueueProcessorService.ts
@@ -250,9 +250,9 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			}, {
 				...baseQueueOptions(this.config, QUEUE.DELIVER),
 				autorun: false,
-				concurrency: this.config.deliverJobConcurrency ?? 16,
+				concurrency: this.config.deliverJobConcurrency ?? 128,
 				limiter: {
-					max: this.config.deliverJobPerSec ?? 1024,
+					max: this.config.deliverJobPerSec ?? 128,
 					duration: 1000,
 				},
 				settings: {
@@ -290,9 +290,9 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			}, {
 				...baseQueueOptions(this.config, QUEUE.INBOX),
 				autorun: false,
-				concurrency: this.config.inboxJobConcurrency ?? 4,
+				concurrency: this.config.inboxJobConcurrency ?? 16,
 				limiter: {
-					max: this.config.inboxJobPerSec ?? 64,
+					max: this.config.inboxJobPerSec ?? 32,
 					duration: 1000,
 				},
 				settings: {
diff --git a/packages/backend/src/queue/processors/DeliverProcessorService.ts b/packages/backend/src/queue/processors/DeliverProcessorService.ts
index 3bd9187e8b..d665945861 100644
--- a/packages/backend/src/queue/processors/DeliverProcessorService.ts
+++ b/packages/backend/src/queue/processors/DeliverProcessorService.ts
@@ -73,33 +73,25 @@ export class DeliverProcessorService {
 		}
 
 		try {
-			const _server = await this.federatedInstanceService.fetch(host);
-			await this.fetchInstanceMetadataService.fetchInstanceMetadata(_server).then(() => {});
-			const server = await this.federatedInstanceService.fetch(host);
-
-			await this.apRequestService.signedPost(
-				job.data.user,
-				job.data.to,
-				job.data.content,
-				server.httpMessageSignaturesImplementationLevel,
-				job.data.digest,
-				job.data.privateKey,
-			);
+			await this.apRequestService.signedPost(job.data.user, job.data.to, job.data.content, job.data.digest);
 
 			// Update stats
-			if (server.isNotResponding) {
-				this.federatedInstanceService.update(server.id, {
-					isNotResponding: false,
-					notRespondingSince: null,
-				});
-			}
+			this.federatedInstanceService.fetch(host).then(i => {
+				if (i.isNotResponding) {
+					this.federatedInstanceService.update(i.id, {
+						isNotResponding: false,
+						notRespondingSince: null,
+					});
+				}
 
-			this.apRequestChart.deliverSucc();
-			this.federationChart.deliverd(server.host, true);
+				this.fetchInstanceMetadataService.fetchInstanceMetadata(i);
+				this.apRequestChart.deliverSucc();
+				this.federationChart.deliverd(i.host, true);
 
-			if (meta.enableChartsForFederatedInstances) {
-				this.instanceChart.requestSent(server.host, true);
-			}
+				if (meta.enableChartsForFederatedInstances) {
+					this.instanceChart.requestSent(i.host, true);
+				}
+			});
 
 			return 'Success';
 		} catch (res) {
diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts
index 935c623df1..fa7009f8f5 100644
--- a/packages/backend/src/queue/processors/InboxProcessorService.ts
+++ b/packages/backend/src/queue/processors/InboxProcessorService.ts
@@ -5,8 +5,8 @@
 
 import { URL } from 'node:url';
 import { Injectable } from '@nestjs/common';
+import httpSignature from '@peertube/http-signature';
 import * as Bull from 'bullmq';
-import { verifyDraftSignature } from '@misskey-dev/node-http-message-signatures';
 import type Logger from '@/logger.js';
 import { MetaService } from '@/core/MetaService.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
@@ -20,7 +20,6 @@ import type { MiRemoteUser } from '@/models/User.js';
 import type { MiUserPublickey } from '@/models/UserPublickey.js';
 import { ApDbResolverService } from '@/core/activitypub/ApDbResolverService.js';
 import { StatusError } from '@/misc/status-error.js';
-import * as Acct from '@/misc/acct.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
 import { JsonLdService } from '@/core/activitypub/JsonLdService.js';
@@ -53,15 +52,8 @@ export class InboxProcessorService {
 
 	@bindThis
 	public async process(job: Bull.Job<InboxJobData>): Promise<string> {
-		const signature = job.data.signature ?
-			'version' in job.data.signature ? job.data.signature.value : job.data.signature
-			: null;
-		if (Array.isArray(signature)) {
-			// RFC 9401はsignatureが配列になるが、とりあえずエラーにする
-			throw new Error('signature is array');
-		}
+		const signature = job.data.signature;	// HTTP-signature
 		let activity = job.data.activity;
-		let actorUri = getApId(activity.actor);
 
 		//#region Log
 		const info = Object.assign({}, activity);
@@ -69,7 +61,7 @@ export class InboxProcessorService {
 		this.logger.debug(JSON.stringify(info, null, 2));
 		//#endregion
 
-		const host = this.utilityService.toPuny(new URL(actorUri).hostname);
+		const host = this.utilityService.toPuny(new URL(signature.keyId).hostname);
 
 		// ブロックしてたら中断
 		const meta = await this.metaService.fetch();
@@ -77,76 +69,69 @@ export class InboxProcessorService {
 			return `Blocked request: ${host}`;
 		}
 
-		// HTTP-Signature keyIdを元にDBから取得
-		let authUser: Awaited<ReturnType<typeof this.apDbResolverService.getAuthUserFromApId>> = null;
-		let httpSignatureIsValid = null as boolean | null;
+		const keyIdLower = signature.keyId.toLowerCase();
+		if (keyIdLower.startsWith('acct:')) {
+			return `Old keyId is no longer supported. ${keyIdLower}`;
+		}
 
-		try {
-			authUser = await this.apDbResolverService.getAuthUserFromApId(actorUri, signature?.keyId);
-		} catch (err) {
-			// 対象が4xxならスキップ
-			if (err instanceof StatusError) {
-				if (!err.isRetryable) {
-					throw new Bull.UnrecoverableError(`skip: Ignored deleted actors on both ends ${activity.actor} - ${err.statusCode}`);
+		// HTTP-Signature keyIdを元にDBから取得
+		let authUser: {
+			user: MiRemoteUser;
+			key: MiUserPublickey | null;
+		} | null = await this.apDbResolverService.getAuthUserFromKeyId(signature.keyId);
+
+		// keyIdでわからなければ、activity.actorを元にDBから取得 || activity.actorを元にリモートから取得
+		if (authUser == null) {
+			try {
+				authUser = await this.apDbResolverService.getAuthUserFromApId(getApId(activity.actor));
+			} catch (err) {
+				// 対象が4xxならスキップ
+				if (err instanceof StatusError) {
+					if (!err.isRetryable) {
+						throw new Bull.UnrecoverableError(`skip: Ignored deleted actors on both ends ${activity.actor} - ${err.statusCode}`);
+					}
+					throw new Error(`Error in actor ${activity.actor} - ${err.statusCode}`);
 				}
-				throw new Error(`Error in actor ${activity.actor} - ${err.statusCode}`);
 			}
 		}
 
-		// authUser.userがnullならスキップ
-		if (authUser != null && authUser.user == null) {
+		// それでもわからなければ終了
+		if (authUser == null) {
 			throw new Bull.UnrecoverableError('skip: failed to resolve user');
 		}
 
-		if (signature != null && authUser != null) {
-			if (signature.keyId.toLowerCase().startsWith('acct:')) {
-				this.logger.warn(`Old keyId is no longer supported. lowerKeyId=${signature.keyId.toLowerCase()}`);
-			} else if (authUser.key != null) {
-				// keyがなかったらLD Signatureで検証するべき
-				// HTTP-Signatureの検証
-				const errorLogger = (ms: any) => this.logger.error(ms);
-				httpSignatureIsValid = await verifyDraftSignature(signature, authUser.key.keyPem, errorLogger);
-				this.logger.debug('Inbox message validation: ', {
-					userId: authUser.user.id,
-					userAcct: Acct.toString(authUser.user),
-					parsedKeyId: signature.keyId,
-					foundKeyId: authUser.key.keyId,
-					httpSignatureValid: httpSignatureIsValid,
-				});
-			}
+		// publicKey がなくても終了
+		if (authUser.key == null) {
+			throw new Bull.UnrecoverableError('skip: failed to resolve user publicKey');
 		}
 
-		if (
-			authUser == null ||
-			httpSignatureIsValid !== true ||
-			authUser.user.uri !== actorUri // 一応チェック
-		) {
+		// HTTP-Signatureの検証
+		const httpSignatureValidated = httpSignature.verifySignature(signature, authUser.key.keyPem);
+
+		// また、signatureのsignerは、activity.actorと一致する必要がある
+		if (!httpSignatureValidated || authUser.user.uri !== activity.actor) {
 			// 一致しなくても、でもLD-Signatureがありそうならそっちも見る
 			const ldSignature = activity.signature;
-
-			if (ldSignature && ldSignature.creator) {
+			if (ldSignature) {
 				if (ldSignature.type !== 'RsaSignature2017') {
 					throw new Bull.UnrecoverableError(`skip: unsupported LD-signature type ${ldSignature.type}`);
 				}
 
-				if (ldSignature.creator.toLowerCase().startsWith('acct:')) {
-					throw new Bull.UnrecoverableError(`old key not supported ${ldSignature.creator}`);
+				// ldSignature.creator: https://example.oom/users/user#main-key
+				// みたいになっててUserを引っ張れば公開キーも入ることを期待する
+				if (ldSignature.creator) {
+					const candicate = ldSignature.creator.replace(/#.*/, '');
+					await this.apPersonService.resolvePerson(candicate).catch(() => null);
 				}
 
-				authUser = await this.apDbResolverService.getAuthUserFromApId(actorUri, ldSignature.creator);
-
+				// keyIdからLD-Signatureのユーザーを取得
+				authUser = await this.apDbResolverService.getAuthUserFromKeyId(ldSignature.creator);
 				if (authUser == null) {
-					throw new Bull.UnrecoverableError(`skip: LD-Signatureのactorとcreatorが一致しませんでした uri=${actorUri} creator=${ldSignature.creator}`);
-				}
-				if (authUser.user == null) {
-					throw new Bull.UnrecoverableError(`skip: LD-Signatureのユーザーが取得できませんでした uri=${actorUri} creator=${ldSignature.creator}`);
-				}
-				// 一応actorチェック
-				if (authUser.user.uri !== actorUri) {
-					throw new Bull.UnrecoverableError(`skip: LD-Signature user(${authUser.user.uri}) !== activity.actor(${actorUri})`);
+					throw new Bull.UnrecoverableError('skip: LD-Signatureのユーザーが取得できませんでした');
 				}
+
 				if (authUser.key == null) {
-					throw new Bull.UnrecoverableError(`skip: LD-SignatureのユーザーはpublicKeyを持っていませんでした uri=${actorUri} creator=${ldSignature.creator}`);
+					throw new Bull.UnrecoverableError('skip: LD-SignatureのユーザーはpublicKeyを持っていませんでした');
 				}
 
 				const jsonLd = this.jsonLdService.use();
@@ -157,27 +142,13 @@ export class InboxProcessorService {
 					throw new Bull.UnrecoverableError('skip: LD-Signatureの検証に失敗しました');
 				}
 
-				// ブロックしてたら中断
-				const ldHost = this.utilityService.extractDbHost(authUser.user.uri);
-				if (this.utilityService.isBlockedHost(meta.blockedHosts, ldHost)) {
-					throw new Bull.UnrecoverableError(`Blocked request: ${ldHost}`);
-				}
-
 				// アクティビティを正規化
-				// GHSA-2vxv-pv3m-3wvj
 				delete activity.signature;
 				try {
 					activity = await jsonLd.compact(activity) as IActivity;
 				} catch (e) {
 					throw new Bull.UnrecoverableError(`skip: failed to compact activity: ${e}`);
 				}
-
-				// actorが正規化前後で一致しているか確認
-				actorUri = getApId(activity.actor);
-				if (authUser.user.uri !== actorUri) {
-					throw new Bull.UnrecoverableError(`skip: LD-Signature user(${authUser.user.uri}) !== activity(after normalization).actor(${actorUri})`);
-				}
-
 				// TODO: 元のアクティビティと非互換な形に正規化される場合は転送をスキップする
 				// https://github.com/mastodon/mastodon/blob/664b0ca/app/services/activitypub/process_collection_service.rb#L24-L29
 				activity.signature = ldSignature;
@@ -187,8 +158,19 @@ export class InboxProcessorService {
 				delete compactedInfo['@context'];
 				this.logger.debug(`compacted: ${JSON.stringify(compactedInfo, null, 2)}`);
 				//#endregion
+
+				// もう一度actorチェック
+				if (authUser.user.uri !== activity.actor) {
+					throw new Bull.UnrecoverableError(`skip: LD-Signature user(${authUser.user.uri}) !== activity.actor(${activity.actor})`);
+				}
+
+				// ブロックしてたら中断
+				const ldHost = this.utilityService.extractDbHost(authUser.user.uri);
+				if (this.utilityService.isBlockedHost(meta.blockedHosts, ldHost)) {
+					throw new Bull.UnrecoverableError(`Blocked request: ${ldHost}`);
+				}
 			} else {
-				throw new Bull.UnrecoverableError(`skip: http-signature verification failed and no LD-Signature. http_signature_keyId=${signature?.keyId}`);
+				throw new Bull.UnrecoverableError(`skip: http-signature verification failed and no LD-Signature. keyId=${signature.keyId}`);
 			}
 		}
 
diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts
index f2466f2e3d..a4077a0547 100644
--- a/packages/backend/src/queue/types.ts
+++ b/packages/backend/src/queue/types.ts
@@ -9,24 +9,7 @@ import type { MiNote } from '@/models/Note.js';
 import type { MiUser } from '@/models/User.js';
 import type { MiWebhook } from '@/models/Webhook.js';
 import type { IActivity } from '@/core/activitypub/type.js';
-import type { ParsedSignature, PrivateKeyWithPem } from '@misskey-dev/node-http-message-signatures';
-
-/**
- * @peertube/http-signature 時代の古いデータにも対応しておく
- * TODO: 2026年ぐらいには消す
- */
-export interface OldParsedSignature {
-	scheme: 'Signature';
-	params: {
-		keyId: string;
-		algorithm: string;
-		headers: string[];
-		signature: string;
-	};
-	signingString: string;
-	algorithm: string;
-	keyId: string;
-}
+import type httpSignature from '@peertube/http-signature';
 
 export type DeliverJobData = {
 	/** Actor */
@@ -39,13 +22,11 @@ export type DeliverJobData = {
 	to: string;
 	/** whether it is sharedInbox */
 	isSharedInbox: boolean;
-	/** force to use main (rsa) key */
-	privateKey?: PrivateKeyWithPem;
 };
 
 export type InboxJobData = {
 	activity: IActivity;
-	signature: ParsedSignature | OldParsedSignature | null;
+	signature: httpSignature.IParsedSignature;
 };
 
 export type RelationshipJobData = {
diff --git a/packages/backend/src/server/ActivityPubServerService.ts b/packages/backend/src/server/ActivityPubServerService.ts
index 753eaad047..3255d64621 100644
--- a/packages/backend/src/server/ActivityPubServerService.ts
+++ b/packages/backend/src/server/ActivityPubServerService.ts
@@ -3,10 +3,11 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import * as crypto from 'node:crypto';
 import { IncomingMessage } from 'node:http';
 import { Inject, Injectable } from '@nestjs/common';
 import fastifyAccepts from '@fastify/accepts';
-import { verifyDigestHeader, parseRequestSignature } from '@misskey-dev/node-http-message-signatures';
+import httpSignature from '@peertube/http-signature';
 import { Brackets, In, IsNull, LessThan, Not } from 'typeorm';
 import accepts from 'accepts';
 import vary from 'vary';
@@ -30,17 +31,12 @@ import { IActivity } from '@/core/activitypub/type.js';
 import { isQuote, isRenote } from '@/misc/is-renote.js';
 import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions, FastifyBodyParser } from 'fastify';
 import type { FindOptionsWhere } from 'typeorm';
-import { LoggerService } from '@/core/LoggerService.js';
-import Logger from '@/logger.js';
 
 const ACTIVITY_JSON = 'application/activity+json; charset=utf-8';
 const LD_JSON = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"; charset=utf-8';
 
 @Injectable()
 export class ActivityPubServerService {
-	private logger: Logger;
-	private inboxLogger: Logger;
-
 	constructor(
 		@Inject(DI.config)
 		private config: Config,
@@ -75,11 +71,8 @@ export class ActivityPubServerService {
 		private queueService: QueueService,
 		private userKeypairService: UserKeypairService,
 		private queryService: QueryService,
-		private loggerService: LoggerService,
 	) {
 		//this.createServer = this.createServer.bind(this);
-		this.logger = this.loggerService.getLogger('server-ap', 'gray');
-		this.inboxLogger = this.logger.createSubLogger('inbox', 'gray');
 	}
 
 	@bindThis
@@ -107,44 +100,70 @@ export class ActivityPubServerService {
 	}
 
 	@bindThis
-	private async inbox(request: FastifyRequest, reply: FastifyReply) {
-		if (request.body == null) {
-			this.inboxLogger.warn('request body is empty');
-			reply.code(400);
-			return;
-		}
+	private inbox(request: FastifyRequest, reply: FastifyReply) {
+		let signature;
 
-		let signature: ReturnType<typeof parseRequestSignature>;
-
-		const verifyDigest = await verifyDigestHeader(request.raw, request.rawBody || '', true);
-		if (verifyDigest !== true) {
-			this.inboxLogger.warn('digest verification failed');
+		try {
+			signature = httpSignature.parseRequest(request.raw, { 'headers': [] });
+		} catch (e) {
 			reply.code(401);
 			return;
 		}
 
-		try {
-			signature = parseRequestSignature(request.raw, {
-				requiredInputs: {
-					draft: ['(request-target)', 'digest', 'host', 'date'],
-				},
-			});
-		} catch (err) {
-			this.inboxLogger.warn('signature header parsing failed', { err });
+		if (signature.params.headers.indexOf('host') === -1
+			|| request.headers.host !== this.config.host) {
+			// Host not specified or not match.
+			reply.code(401);
+			return;
+		}
 
-			if (typeof request.body === 'object' && 'signature' in request.body) {
-				// LD SignatureがあればOK
-				this.queueService.inbox(request.body as IActivity, null);
-				reply.code(202);
+		if (signature.params.headers.indexOf('digest') === -1) {
+			// Digest not found.
+			reply.code(401);
+		} else {
+			const digest = request.headers.digest;
+
+			if (typeof digest !== 'string') {
+				// Huh?
+				reply.code(401);
 				return;
 			}
 
-			this.inboxLogger.warn('signature header parsing failed and LD signature not found');
-			reply.code(401);
-			return;
+			const re = /^([a-zA-Z0-9\-]+)=(.+)$/;
+			const match = digest.match(re);
+
+			if (match == null) {
+				// Invalid digest
+				reply.code(401);
+				return;
+			}
+
+			const algo = match[1].toUpperCase();
+			const digestValue = match[2];
+
+			if (algo !== 'SHA-256') {
+				// Unsupported digest algorithm
+				reply.code(401);
+				return;
+			}
+
+			if (request.rawBody == null) {
+				// Bad request
+				reply.code(400);
+				return;
+			}
+
+			const hash = crypto.createHash('sha256').update(request.rawBody).digest('base64');
+
+			if (hash !== digestValue) {
+				// Invalid digest
+				reply.code(401);
+				return;
+			}
 		}
 
 		this.queueService.inbox(request.body as IActivity, signature);
+
 		reply.code(202);
 	}
 
@@ -621,7 +640,7 @@ export class ActivityPubServerService {
 			if (this.userEntityService.isLocalUser(user)) {
 				reply.header('Cache-Control', 'public, max-age=180');
 				this.setResponseType(request, reply);
-				return (this.apRendererService.addContext(this.apRendererService.renderKey(user, keypair.publicKey)));
+				return (this.apRendererService.addContext(this.apRendererService.renderKey(user, keypair)));
 			} else {
 				reply.code(400);
 				return;
diff --git a/packages/backend/src/server/NodeinfoServerService.ts b/packages/backend/src/server/NodeinfoServerService.ts
index c0f8084768..cc18997fdc 100644
--- a/packages/backend/src/server/NodeinfoServerService.ts
+++ b/packages/backend/src/server/NodeinfoServerService.ts
@@ -94,13 +94,6 @@ export class NodeinfoServerService {
 					localComments: 0,
 				},
 				metadata: {
-					/**
-					 * '00': Draft, RSA only
-					 * '01': Draft, Ed25519 suported
-					 * '11': RFC 9421, Ed25519 supported
-					 */
-					httpMessageSignaturesImplementationLevel: '01',
-
 					nodeName: meta.name,
 					nodeDescription: meta.description,
 					nodeAdmins: [{
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts b/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts
index bfe230da8d..305ae1af1d 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts
@@ -56,8 +56,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const res = [] as [string, number][];
 
 			for (const job of jobs) {
-				const signature = job.data.signature ? 'version' in job.data.signature ? job.data.signature.value : job.data.signature : null;
-				const host = signature ? Array.isArray(signature) ? 'TODO' : new URL(signature.keyId).host : new URL(job.data.activity.actor).host;
+				const host = new URL(job.data.signature.keyId).host;
 				if (res.find(x => x[0] === host)) {
 					res.find(x => x[0] === host)![1]++;
 				} else {
diff --git a/packages/backend/test/e2e/timelines.ts b/packages/backend/test/e2e/timelines.ts
index fce1eacf00..540b866b28 100644
--- a/packages/backend/test/e2e/timelines.ts
+++ b/packages/backend/test/e2e/timelines.ts
@@ -378,7 +378,7 @@ describe('Timelines', () => {
 			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
 			assert.strictEqual(res.body.some(note => note.id === carolNote1.id), false);
 			assert.strictEqual(res.body.some(note => note.id === carolNote2.id), false);
-		});
+		}, 1000 * 10);
 
 		test.concurrent('フォローしているユーザーのチャンネル投稿が含まれない', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
@@ -672,7 +672,7 @@ describe('Timelines', () => {
 
 			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), false);
 			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
-		});
+		}, 1000 * 10);
 	});
 
 	describe('Social TL', () => {
@@ -812,7 +812,7 @@ describe('Timelines', () => {
 
 			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), false);
 			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
-		});
+		}, 1000 * 10);
 	});
 
 	describe('User List TL', () => {
@@ -1025,7 +1025,7 @@ describe('Timelines', () => {
 
 			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), false);
 			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
-		});
+		}, 1000 * 10);
 
 		test.concurrent('リスインしているユーザーの自身宛ての visibility: specified なノートが含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
@@ -1184,7 +1184,7 @@ describe('Timelines', () => {
 
 			assert.strictEqual(res.body.some(note => note.id === bobNote1.id), false);
 			assert.strictEqual(res.body.some(note => note.id === bobNote2.id), true);
-		});
+		}, 1000 * 10);
 
 		test.concurrent('[withChannelNotes: true] チャンネル投稿が含まれる', async () => {
 			const [alice, bob] = await Promise.all([signup(), signup()]);
diff --git a/packages/backend/test/misc/mock-resolver.ts b/packages/backend/test/misc/mock-resolver.ts
index 485506ee64..3c7e796700 100644
--- a/packages/backend/test/misc/mock-resolver.ts
+++ b/packages/backend/test/misc/mock-resolver.ts
@@ -14,7 +14,6 @@ import type { InstanceActorService } from '@/core/InstanceActorService.js';
 import type { LoggerService } from '@/core/LoggerService.js';
 import type { MetaService } from '@/core/MetaService.js';
 import type { UtilityService } from '@/core/UtilityService.js';
-import type { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import { bindThis } from '@/decorators.js';
 import type {
 	FollowRequestsRepository,
@@ -48,7 +47,6 @@ export class MockResolver extends Resolver {
 			{} as HttpRequestService,
 			{} as ApRendererService,
 			{} as ApDbResolverService,
-			{} as FederatedInstanceService,
 			loggerService,
 		);
 	}
diff --git a/packages/backend/test/unit/FetchInstanceMetadataService.ts b/packages/backend/test/unit/FetchInstanceMetadataService.ts
index 2e66b81fcd..bf8f3ab0e3 100644
--- a/packages/backend/test/unit/FetchInstanceMetadataService.ts
+++ b/packages/backend/test/unit/FetchInstanceMetadataService.ts
@@ -75,61 +75,62 @@ describe('FetchInstanceMetadataService', () => {
 	test('Lock and update', async () => {
 		redisClient.set = mockRedis();
 		const now = Date.now();
-		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: new Date(now - 10 * 1000 * 60 * 60 * 24) } as any);
+		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: { getTime: () => { return now - 10 * 1000 * 60 * 60 * 24; } } } as any);
 		httpRequestService.getJson.mockImplementation(() => { throw Error(); });
 		const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
 		const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
 
 		await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' } as any);
-		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(1);
 		expect(tryLockSpy).toHaveBeenCalledTimes(1);
 		expect(unlockSpy).toHaveBeenCalledTimes(1);
+		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(1);
 		expect(httpRequestService.getJson).toHaveBeenCalled();
 	});
 
-	test('Don\'t lock and update if recently updated', async () => {
+	test('Lock and don\'t update', async () => {
 		redisClient.set = mockRedis();
-		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: new Date() } as any);
+		const now = Date.now();
+		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: { getTime: () => now } } as any);
 		httpRequestService.getJson.mockImplementation(() => { throw Error(); });
 		const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
 		const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
 
 		await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' } as any);
+		expect(tryLockSpy).toHaveBeenCalledTimes(1);
+		expect(unlockSpy).toHaveBeenCalledTimes(1);
 		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(1);
-		expect(tryLockSpy).toHaveBeenCalledTimes(0);
-		expect(unlockSpy).toHaveBeenCalledTimes(0);
 		expect(httpRequestService.getJson).toHaveBeenCalledTimes(0);
 	});
 
 	test('Do nothing when lock not acquired', async () => {
 		redisClient.set = mockRedis();
 		const now = Date.now();
-		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: new Date(now - 10 * 1000 * 60 * 60 * 24) } as any);
+		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: { getTime: () => now - 10 * 1000 * 60 * 60 * 24 } } as any);
 		httpRequestService.getJson.mockImplementation(() => { throw Error(); });
 		await fetchInstanceMetadataService.tryLock('example.com');
 		const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
 		const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
 
 		await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' } as any);
-		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(1);
 		expect(tryLockSpy).toHaveBeenCalledTimes(1);
 		expect(unlockSpy).toHaveBeenCalledTimes(0);
+		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(0);
 		expect(httpRequestService.getJson).toHaveBeenCalledTimes(0);
 	});
 
-	test('Do when forced', async () => {
+	test('Do when lock not acquired but forced', async () => {
 		redisClient.set = mockRedis();
 		const now = Date.now();
-		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: new Date(now - 10 * 1000 * 60 * 60 * 24) } as any);
+		federatedInstanceService.fetch.mockResolvedValue({ infoUpdatedAt: { getTime: () => now - 10 * 1000 * 60 * 60 * 24 } } as any);
 		httpRequestService.getJson.mockImplementation(() => { throw Error(); });
 		await fetchInstanceMetadataService.tryLock('example.com');
 		const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
 		const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
 
 		await fetchInstanceMetadataService.fetchInstanceMetadata({ host: 'example.com' } as any, true);
-		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(0);
 		expect(tryLockSpy).toHaveBeenCalledTimes(0);
 		expect(unlockSpy).toHaveBeenCalledTimes(1);
+		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(0);
 		expect(httpRequestService.getJson).toHaveBeenCalled();
 	});
 });
diff --git a/packages/backend/test/unit/ap-request.ts b/packages/backend/test/unit/ap-request.ts
index 50894c8b81..d3d39240dc 100644
--- a/packages/backend/test/unit/ap-request.ts
+++ b/packages/backend/test/unit/ap-request.ts
@@ -4,8 +4,10 @@
  */
 
 import * as assert from 'assert';
-import { verifyDraftSignature, parseRequestSignature, genEd25519KeyPair, genRsaKeyPair, importPrivateKey } from '@misskey-dev/node-http-message-signatures';
-import { createSignedGet, createSignedPost } from '@/core/activitypub/ApRequestService.js';
+import httpSignature from '@peertube/http-signature';
+
+import { genRsaKeyPair } from '@/misc/gen-key-pair.js';
+import { ApRequestCreator } from '@/core/activitypub/ApRequestService.js';
 
 export const buildParsedSignature = (signingString: string, signature: string, algorithm: string) => {
 	return {
@@ -22,68 +24,38 @@ export const buildParsedSignature = (signingString: string, signature: string, a
 	};
 };
 
-async function getKeyPair(level: string) {
-	if (level === '00') {
-		return await genRsaKeyPair();
-	} else if (level === '01') {
-		return await genEd25519KeyPair();
-	}
-	throw new Error('Invalid level');
-}
+describe('ap-request', () => {
+	test('createSignedPost with verify', async () => {
+		const keypair = await genRsaKeyPair();
+		const key = { keyId: 'x', 'privateKeyPem': keypair.privateKey };
+		const url = 'https://example.com/inbox';
+		const activity = { a: 1 };
+		const body = JSON.stringify(activity);
+		const headers = {
+			'User-Agent': 'UA',
+		};
 
-describe('ap-request post', () => {
-	const url = 'https://example.com/inbox';
-	const activity = { a: 1 };
-	const body = JSON.stringify(activity);
-	const headers = {
-		'User-Agent': 'UA',
-	};
+		const req = ApRequestCreator.createSignedPost({ key, url, body, additionalHeaders: headers });
 
-	describe.each(['00', '01'])('createSignedPost with verify', (level) => {
-		test('pem', async () => {
-			const keypair = await getKeyPair(level);
-			const key = { keyId: 'x', 'privateKeyPem': keypair.privateKey };
+		const parsed = buildParsedSignature(req.signingString, req.signature, 'rsa-sha256');
 
-			const req = await createSignedPost({ level, key, url, body, additionalHeaders: headers });
+		const result = httpSignature.verifySignature(parsed, keypair.publicKey);
+		assert.deepStrictEqual(result, true);
+	});
 
-			const parsed = parseRequestSignature(req.request);
-			expect(parsed.version).toBe('draft');
-			expect(Array.isArray(parsed.value)).toBe(false);
-			const verify = await verifyDraftSignature(parsed.value as any, keypair.publicKey);
-			assert.deepStrictEqual(verify, true);
-		});
-		test('imported', async () => {
-			const keypair = await getKeyPair(level);
-			const key = { keyId: 'x', 'privateKey': await importPrivateKey(keypair.privateKey) };
+	test('createSignedGet with verify', async () => {
+		const keypair = await genRsaKeyPair();
+		const key = { keyId: 'x', 'privateKeyPem': keypair.privateKey };
+		const url = 'https://example.com/outbox';
+		const headers = {
+			'User-Agent': 'UA',
+		};
 
-			const req = await createSignedPost({ level, key, url, body, additionalHeaders: headers });
+		const req = ApRequestCreator.createSignedGet({ key, url, additionalHeaders: headers });
 
-			const parsed = parseRequestSignature(req.request);
-			expect(parsed.version).toBe('draft');
-			expect(Array.isArray(parsed.value)).toBe(false);
-			const verify = await verifyDraftSignature(parsed.value as any, keypair.publicKey);
-			assert.deepStrictEqual(verify, true);
-		});
-	});
-});
-
-describe('ap-request get', () => {
-	describe.each(['00', '01'])('createSignedGet with verify', (level) => {
-		test('pass', async () => {
-			const keypair = await getKeyPair(level);
-			const key = { keyId: 'x', 'privateKeyPem': keypair.privateKey };
-			const url = 'https://example.com/outbox';
-			const headers = {
-				'User-Agent': 'UA',
-			};
-
-			const req = await createSignedGet({ level, key, url, additionalHeaders: headers });
-
-			const parsed = parseRequestSignature(req.request);
-			expect(parsed.version).toBe('draft');
-			expect(Array.isArray(parsed.value)).toBe(false);
-			const verify = await verifyDraftSignature(parsed.value as any, keypair.publicKey);
-			assert.deepStrictEqual(verify, true);
-		});
+		const parsed = buildParsedSignature(req.signingString, req.signature, 'rsa-sha256');
+
+		const result = httpSignature.verifySignature(parsed, keypair.publicKey);
+		assert.deepStrictEqual(result, true);
 	});
 });
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 2a7e5a323d..d3c857219b 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4608,7 +4608,6 @@ export type components = {
       /** Format: date-time */
       latestRequestReceivedAt: string | null;
       moderationNote?: string | null;
-      httpMessageSignaturesImplementationLevel: string;
     };
     GalleryPost: {
       /**
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2d426c2fa8..7d3fec8596 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -125,9 +125,6 @@ importers:
       '@fastify/view':
         specifier: 9.1.0
         version: 9.1.0
-      '@misskey-dev/node-http-message-signatures':
-        specifier: 0.0.10
-        version: 0.0.10
       '@misskey-dev/sharp-read-bmp':
         specifier: 1.2.0
         version: 1.2.0
@@ -146,6 +143,9 @@ importers:
       '@nestjs/testing':
         specifier: 10.3.10
         version: 10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.10)(encoding@0.1.13)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.3.10(@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.3.10))
+      '@peertube/http-signature':
+        specifier: 1.7.0
+        version: 1.7.0
       '@sentry/node':
         specifier: 8.13.0
         version: 8.13.0
@@ -3228,11 +3228,6 @@ packages:
   '@kurkle/color@0.3.2':
     resolution: {integrity: sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==}
 
-  '@lapo/asn1js@2.0.4':
-    resolution: {integrity: sha512-KJD3wQAZxozcraJdWp3utDU6DEZgAVBGp9INCdptUpZaXCEYkpwNb7h7wyYh5y6DxtpvIud8k0suhWJ/z2rKvw==}
-    engines: {node: '>=12.20.0'}
-    hasBin: true
-
   '@levischuck/tiny-cbor@0.2.2':
     resolution: {integrity: sha512-f5CnPw997Y2GQ8FAvtuVVC19FX8mwNNC+1XJcIi16n/LTJifKO6QBgGLgN3YEmqtGMk17SKSuoWES3imJVxAVw==}
 
@@ -3286,10 +3281,6 @@ packages:
       eslint-plugin-import: '>= 2'
       globals: '>= 15'
 
-  '@misskey-dev/node-http-message-signatures@0.0.10':
-    resolution: {integrity: sha512-HiAuc//tOU077KFUJhHYLAPWku9enTpOFIqQiK6l2i2mIizRvv7HhV7Y+yuav5quDOAz+WZGK/i5C9OR5fkKIg==}
-    engines: {node: '>=18.4.0'}
-
   '@misskey-dev/sharp-read-bmp@1.2.0':
     resolution: {integrity: sha512-er4pRakXzHYfEgOFAFfQagqDouG+wLm+kwNq1I30oSdIHDa0wM3KjFpfIGQ25Fks4GcmOl1s7Zh6xoQu5dNjTw==}
 
@@ -3680,6 +3671,10 @@ packages:
   '@peculiar/asn1-x509@2.3.8':
     resolution: {integrity: sha512-voKxGfDU1c6r9mKiN5ZUsZWh3Dy1BABvTM3cimf0tztNwyMJPhiXY94eRTgsMQe6ViLfT6EoXxkWVzcm3mFAFw==}
 
+  '@peertube/http-signature@1.7.0':
+    resolution: {integrity: sha512-aGQIwo6/sWtyyqhVK4e1MtxYz4N1X8CNt6SOtCc+Wnczs5S5ONaLHDDR8LYaGn0MgOwvGgXyuZ5sJIfd7iyoUw==}
+    engines: {node: '>=0.10'}
+
   '@pkgjs/parseargs@0.11.0':
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
@@ -10529,9 +10524,6 @@ packages:
     resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
 
-  rfc4648@1.5.3:
-    resolution: {integrity: sha512-MjOWxM065+WswwnmNONOT+bD1nXzY9Km6u3kzvnx8F8/HXGZdz3T6e6vZJ8Q/RIMUSp/nxqjH3GwvJDy8ijeQQ==}
-
   rfdc@1.3.0:
     resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==}
 
@@ -11083,10 +11075,6 @@ packages:
     resolution: {integrity: sha512-pQ+V+nYQdC5H3Q7qBZAz/MO6lwGhoC2gOAjuouGf/VO0m7vQRh8QNMl2Uf6SwAtzZ9bOw3UIeBukEGNJl5dtXQ==}
     engines: {node: '>=14.16'}
 
-  structured-headers@1.0.1:
-    resolution: {integrity: sha512-QYBxdBtA4Tl5rFPuqmbmdrS9kbtren74RTJTcs0VSQNVV5iRhJD4QlYTLD0+81SBwUQctjEQzjTRI3WG4DzICA==}
-    engines: {node: '>= 14', npm: '>=6'}
-
   stylehacks@6.1.1:
     resolution: {integrity: sha512-gSTTEQ670cJNoaeIp9KX6lZmm8LJ3jPB5yJmX8Zq/wQxOsAFXV3qjWzHas3YYk1qesuVIyYWWUpZ0vSE/dTSGg==}
     engines: {node: ^14 || ^16 || >=18.0}
@@ -14654,8 +14642,6 @@ snapshots:
 
   '@kurkle/color@0.3.2': {}
 
-  '@lapo/asn1js@2.0.4': {}
-
   '@levischuck/tiny-cbor@0.2.2': {}
 
   '@lukeed/csprng@1.0.1': {}
@@ -14736,12 +14722,6 @@ snapshots:
       eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)
       globals: 15.7.0
 
-  '@misskey-dev/node-http-message-signatures@0.0.10':
-    dependencies:
-      '@lapo/asn1js': 2.0.4
-      rfc4648: 1.5.3
-      structured-headers: 1.0.1
-
   '@misskey-dev/sharp-read-bmp@1.2.0':
     dependencies:
       decode-bmp: 0.2.1
@@ -15202,6 +15182,12 @@ snapshots:
       pvtsutils: 1.3.5
       tslib: 2.6.2
 
+  '@peertube/http-signature@1.7.0':
+    dependencies:
+      assert-plus: 1.0.0
+      jsprim: 1.4.2
+      sshpk: 1.17.0
+
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
@@ -23893,8 +23879,6 @@ snapshots:
 
   reusify@1.0.4: {}
 
-  rfc4648@1.5.3: {}
-
   rfdc@1.3.0: {}
 
   rimraf@2.6.3:
@@ -24490,8 +24474,6 @@ snapshots:
       '@tokenizer/token': 0.3.0
       peek-readable: 5.0.0
 
-  structured-headers@1.0.1: {}
-
   stylehacks@6.1.1(postcss@8.4.38):
     dependencies:
       browserslist: 4.23.0

From 32651aba677c957bcd9c734eef9806375413dbc5 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 23 Jul 2024 18:39:59 +0900
Subject: [PATCH 089/221] Update about-misskey.vue

---
 packages/frontend/src/pages/about-misskey.vue | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index cc0394f401..8459f0f9d5 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -243,6 +243,21 @@ const patronsWithIcon = [{
 }, {
 	name: '越貝鯛丸',
 	icon: 'https://assets.misskey-hub.net/patrons/86c7374de37849b882d8ebbc833dc968.jpg',
+}, {
+	name: '☔あめ🍬(灬˘╰╯˘灬)',
+	icon: 'https://assets.misskey-hub.net/patrons/676eea72d4884d3f89aababbb62533fb.jpg',
+}, {
+	name: '貯水よび',
+	icon: 'https://assets.misskey-hub.net/patrons/2974506d53244bbe94a67707b27099e2.jpg',
+}, {
+	name: 'はるかさ',
+	icon: 'https://assets.misskey-hub.net/patrons/26ce2432739a400aa3aa0de0ef67a107.jpg',
+}, {
+	name: '天鈴のあ',
+	icon: 'https://assets.misskey-hub.net/patrons/995cdbb00bd6421184461a883adfe1d9.jpg',
+}, {
+	name: 'えとゔぁす',
+	icon: 'https://assets.misskey-hub.net/patrons/2578f441b82a44cfaa55ba83a318b26e.jpg',
 }];
 
 const patrons = [
@@ -347,6 +362,7 @@ const patrons = [
 	'SHO SEKIGUCHI',
 	'塩キャベツ',
 	'はとぽぷさん',
+	'100の人 (エスパー・イーシア)',
 ];
 
 const thereIsTreasure = ref($i && !claimedAchievements.includes('foundTreasure'));

From aa3ea2b57a4f51a98449d6fc901037dcb1c3a23d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Thu, 25 Jul 2024 16:30:29 +0900
Subject: [PATCH 090/221] =?UTF-8?q?fix(frontend):=20=E5=88=9D=E6=9C=9F?=
 =?UTF-8?q?=E5=8C=96=E6=99=82=E3=81=A8route=E5=A4=89=E6=9B=B4=E6=99=82?=
 =?UTF-8?q?=E3=81=A7key=E3=81=AE=E6=B1=BA=E5=AE=9A=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E3=81=8C=E9=81=95=E3=81=86=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20(#14283)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/global/RouterView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/global/RouterView.vue b/packages/frontend/src/components/global/RouterView.vue
index 02a2edee3f..19bd794a5d 100644
--- a/packages/frontend/src/components/global/RouterView.vue
+++ b/packages/frontend/src/components/global/RouterView.vue
@@ -53,7 +53,7 @@ function resolveNested(current: Resolved, d = 0): Resolved | null {
 const current = resolveNested(router.current)!;
 const currentPageComponent = shallowRef('component' in current.route ? current.route.component : MkLoadingPage);
 const currentPageProps = ref(current.props);
-const key = ref(current.route.path + JSON.stringify(Object.fromEntries(current.props)));
+const key = ref(router.getCurrentKey() + JSON.stringify(Object.fromEntries(current.props)));
 
 function onChange({ resolved, key: newKey }) {
 	const current = resolveNested(resolved);

From fc71bcc98e14f9c3c13ba74ade9245d64bd4b633 Mon Sep 17 00:00:00 2001
From: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
Date: Thu, 25 Jul 2024 16:32:07 +0900
Subject: [PATCH 091/221] fix(backend): avoid notifying to remote users on
 local (#13774)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(backend): avoid notifying to remote users on local

* Update CHANGELOG.md

* refactor: check before calling method

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
 CHANGELOG.md                                          |  1 +
 packages/backend/src/core/RoleService.ts              |  5 +++--
 packages/backend/src/core/UserFollowingService.ts     |  6 ++++--
 .../EndedPollNotificationProcessorService.ts          | 11 ++++++++---
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f429033aa0..787784ef3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,7 @@
 - Fix: 一般ユーザーから見たユーザーのバッジの一覧に公開されていないものが含まれることがある問題を修正  
   (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/652)
 - Fix: ユーザーのリアクション一覧でミュート/ブロックが機能していなかった問題を修正
+- Fix: 一部の通知がローカル上のリモートユーザーに対して行われていた問題を修正
 - Fix: エラーメッセージの誤字を修正 (#14213)
 - Fix: ソーシャルタイムラインにローカルタイムラインに表示される自分へのリプライが表示されない問題を修正
 - Fix: リノートのミュートが適用されるまでに時間がかかることがある問題を修正  
diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts
index 94026fd503..7966774673 100644
--- a/packages/backend/src/core/RoleService.ts
+++ b/packages/backend/src/core/RoleService.ts
@@ -505,14 +505,15 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 
 		this.globalEventService.publishInternalEvent('userRoleAssigned', created);
 
-		if (role.isPublic) {
+		const user = await this.usersRepository.findOneByOrFail({ id: userId });
+
+		if (role.isPublic && user.host === null) {
 			this.notificationService.createNotification(userId, 'roleAssigned', {
 				roleId: roleId,
 			});
 		}
 
 		if (moderator) {
-			const user = await this.usersRepository.findOneByOrFail({ id: userId });
 			this.moderationLogService.log(moderator, 'assignRole', {
 				roleId: roleId,
 				roleName: role.name,
diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts
index 267a6a3f1b..6aab8fde70 100644
--- a/packages/backend/src/core/UserFollowingService.ts
+++ b/packages/backend/src/core/UserFollowingService.ts
@@ -279,8 +279,10 @@ export class UserFollowingService implements OnModuleInit {
 			});
 
 			// 通知を作成
-			this.notificationService.createNotification(follower.id, 'followRequestAccepted', {
-			}, followee.id);
+			if (follower.host === null) {
+				this.notificationService.createNotification(follower.id, 'followRequestAccepted', {
+				}, followee.id);
+			}
 		}
 
 		if (alreadyFollowed) return;
diff --git a/packages/backend/src/queue/processors/EndedPollNotificationProcessorService.ts b/packages/backend/src/queue/processors/EndedPollNotificationProcessorService.ts
index 29c1f27bb1..34180e5f2b 100644
--- a/packages/backend/src/queue/processors/EndedPollNotificationProcessorService.ts
+++ b/packages/backend/src/queue/processors/EndedPollNotificationProcessorService.ts
@@ -7,6 +7,7 @@ import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { PollVotesRepository, NotesRepository } from '@/models/_.js';
 import type Logger from '@/logger.js';
+import { CacheService } from '@/core/CacheService.js';
 import { NotificationService } from '@/core/NotificationService.js';
 import { bindThis } from '@/decorators.js';
 import { QueueLoggerService } from '../QueueLoggerService.js';
@@ -24,6 +25,7 @@ export class EndedPollNotificationProcessorService {
 		@Inject(DI.pollVotesRepository)
 		private pollVotesRepository: PollVotesRepository,
 
+		private cacheService: CacheService,
 		private notificationService: NotificationService,
 		private queueLoggerService: QueueLoggerService,
 	) {
@@ -47,9 +49,12 @@ export class EndedPollNotificationProcessorService {
 		const userIds = [...new Set([note.userId, ...votes.map(v => v.userId)])];
 
 		for (const userId of userIds) {
-			this.notificationService.createNotification(userId, 'pollEnded', {
-				noteId: note.id,
-			});
+			const profile = await this.cacheService.userProfileCache.fetch(userId);
+			if (profile.userHost === null) {
+				this.notificationService.createNotification(userId, 'pollEnded', {
+					noteId: note.id,
+				});
+			}
 		}
 	}
 }

From befa8e4a7f91ee6f13ea6179a8a45dc84764b1f7 Mon Sep 17 00:00:00 2001
From: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
Date: Thu, 25 Jul 2024 16:37:46 +0900
Subject: [PATCH 092/221] fix(backend): avoid caching remote user's HTL when
 receiving Note (#13772)

* fix(backend): avoid caching remote user's HTL when receiving Note

* test(backend): add test for FFT

* Update CHANGELOG.md

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
 CHANGELOG.md                                  |  1 +
 .../backend/src/core/NoteCreateService.ts     | 11 +++--
 packages/backend/test/e2e/timelines.ts        | 40 ++++++++++++++++++-
 3 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 787784ef3c..21d25fe0de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,7 @@
 - Fix: 一般ユーザーから見たユーザーのバッジの一覧に公開されていないものが含まれることがある問題を修正  
   (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/652)
 - Fix: ユーザーのリアクション一覧でミュート/ブロックが機能していなかった問題を修正
+- Fix: FTT有効時にリモートユーザーのノートがHTLにキャッシュされる問題を修正
 - Fix: 一部の通知がローカル上のリモートユーザーに対して行われていた問題を修正
 - Fix: エラーメッセージの誤字を修正 (#14213)
 - Fix: ソーシャルタイムラインにローカルタイムラインに表示される自分へのリプライが表示されない問題を修正
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index a2c3aaa701..fd9fac357f 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -933,10 +933,13 @@ export class NoteCreateService implements OnApplicationShutdown {
 				}
 			}
 
-			if (note.visibility !== 'specified' || !note.visibleUserIds.some(v => v === user.id)) { // 自分自身のHTL
-				this.fanoutTimelineService.push(`homeTimeline:${user.id}`, note.id, meta.perUserHomeTimelineCacheMax, r);
-				if (note.fileIds.length > 0) {
-					this.fanoutTimelineService.push(`homeTimelineWithFiles:${user.id}`, note.id, meta.perUserHomeTimelineCacheMax / 2, r);
+			// 自分自身のHTL
+			if (note.userHost == null) {
+				if (note.visibility !== 'specified' || !note.visibleUserIds.some(v => v === user.id)) {
+					this.fanoutTimelineService.push(`homeTimeline:${user.id}`, note.id, meta.perUserHomeTimelineCacheMax, r);
+					if (note.fileIds.length > 0) {
+						this.fanoutTimelineService.push(`homeTimelineWithFiles:${user.id}`, note.id, meta.perUserHomeTimelineCacheMax / 2, r);
+					}
 				}
 			}
 
diff --git a/packages/backend/test/e2e/timelines.ts b/packages/backend/test/e2e/timelines.ts
index 540b866b28..ab65781f70 100644
--- a/packages/backend/test/e2e/timelines.ts
+++ b/packages/backend/test/e2e/timelines.ts
@@ -9,8 +9,8 @@
 import * as assert from 'assert';
 import { setTimeout } from 'node:timers/promises';
 import { Redis } from 'ioredis';
-import { loadConfig } from '@/config.js';
 import { api, post, randomString, sendEnvUpdateRequest, signup, uploadUrl } from '../utils.js';
+import { loadConfig } from '@/config.js';
 
 function genHost() {
 	return randomString() + '.example.com';
@@ -492,6 +492,44 @@ describe('Timelines', () => {
 
 			assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
 		});
+
+		test.concurrent('FTT: ローカルユーザーの HTL にはプッシュされる', async () => {
+			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
+
+			await api('following/create', {
+				userId: alice.id,
+			}, bob);
+
+			const aliceNote = await post(alice, { text: 'I\'m Alice.' });
+			const bobNote = await post(bob, { text: 'I\'m Bob.' });
+			const carolNote = await post(carol, { text: 'I\'m Carol.' });
+
+			await waitForPushToTl();
+
+			// NOTE: notes/timeline だと DB へのフォールバックが効くので Redis を直接見て確かめる
+			assert.strictEqual(await redisForTimelines.exists(`list:homeTimeline:${bob.id}`), 1);
+
+			const bobHTL = await redisForTimelines.lrange(`list:homeTimeline:${bob.id}`, 0, -1);
+			assert.strictEqual(bobHTL.includes(aliceNote.id), true);
+			assert.strictEqual(bobHTL.includes(bobNote.id), true);
+			assert.strictEqual(bobHTL.includes(carolNote.id), false);
+		});
+
+		test.concurrent('FTT: リモートユーザーの HTL にはプッシュされない', async () => {
+			const [alice, bob] = await Promise.all([signup(), signup({ host: genHost() })]);
+
+			await api('following/create', {
+				userId: alice.id,
+			}, bob);
+
+			await post(alice, { text: 'I\'m Alice.' });
+			await post(bob, { text: 'I\'m Bob.' });
+
+			await waitForPushToTl();
+
+			// NOTE: notes/timeline だと DB へのフォールバックが効くので Redis を直接見て確かめる
+			assert.strictEqual(await redisForTimelines.exists(`list:homeTimeline:${bob.id}`), 0);
+		});
 	});
 
 	describe('Local TL', () => {

From 3d8eda14a299dbf97cd135f7087c1797bd1ebb37 Mon Sep 17 00:00:00 2001
From: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
Date: Thu, 25 Jul 2024 16:40:14 +0900
Subject: [PATCH 093/221] =?UTF-8?q?[Re]=20refactor(misskey-js):=20?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A=E3=82=92=E3=81=99=E3=81=B9=E3=81=A6=E8=A7=A3?=
 =?UTF-8?q?=E6=B1=BA=20(#14277)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(misskey-js): Unchanged files with check annotationsで紛らわしい部分の警告を抑制 ロジック面は後で直す

* dummy change to see if the feature do not report them (to be reverted after the check)

* refactor: 型合わせ

* refactor: fix warnings from c22dd6358ba4e068c49be033a07d9fbb001f2347

* lint

* 型合わせ

* キャスト

* pnpm build-misskey-js-with-types

* Revert "dummy change to see if the feature do not report them (to be reverted after the check)"

This reverts commit 67072e3ca6e3e16342ca3b35feadcb41afcbe04f.

* eliminate reversiGame any

* move reversiGame types

* lint

* Update packages/misskey-js/src/streaming.ts

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>

* Update acct.ts

* run api extractor

* re-run api extractor

---------

Co-authored-by: Kisaragi Marine <kisaragi.effective@gmail.com>
Co-authored-by: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
---
 packages/misskey-js/eslint.config.js       |   1 +
 packages/misskey-js/etc/misskey-js.api.md  |  27 +++---
 packages/misskey-js/src/acct.ts            |   3 +-
 packages/misskey-js/src/api.ts             |   3 +
 packages/misskey-js/src/api.types.ts       |   2 +
 packages/misskey-js/src/consts.ts          | 104 +++++++++++++--------
 packages/misskey-js/src/entities.ts        |   3 +-
 packages/misskey-js/src/streaming.ts       |  30 +++---
 packages/misskey-js/src/streaming.types.ts |  18 ++--
 9 files changed, 118 insertions(+), 73 deletions(-)

diff --git a/packages/misskey-js/eslint.config.js b/packages/misskey-js/eslint.config.js
index e34e7510b2..d8173f30e9 100644
--- a/packages/misskey-js/eslint.config.js
+++ b/packages/misskey-js/eslint.config.js
@@ -1,6 +1,7 @@
 import tsParser from '@typescript-eslint/parser';
 import sharedConfig from '../shared/eslint.config.js';
 
+// eslint-disable-next-line import/no-default-export
 export default [
 	...sharedConfig,
 	{
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index d11d2a4f06..377dd6f658 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -551,7 +551,7 @@ type Channel = components['schemas']['Channel'];
 // Warning: (ae-forgotten-export) The symbol "AnyOf" needs to be exported by the entry point index.d.ts
 //
 // @public (undocumented)
-export abstract class ChannelConnection<Channel extends AnyOf<Channels> = any> extends EventEmitter<Channel['events']> {
+export abstract class ChannelConnection<Channel extends AnyOf<Channels> = AnyOf<Channels>> extends EventEmitter<Channel['events']> {
     constructor(stream: Stream, channel: string, name?: string);
     // (undocumented)
     channel: string;
@@ -771,12 +771,12 @@ export type Channels = {
                 user1: boolean;
                 user2: boolean;
             }) => void;
-            updateSettings: (payload: {
+            updateSettings: <K extends ReversiUpdateKey>(payload: {
                 userId: User['id'];
-                key: string;
-                value: any;
+                key: K;
+                value: ReversiGameDetailed[K];
             }) => void;
-            log: (payload: Record<string, any>) => void;
+            log: (payload: Record<string, unknown>) => void;
         };
         receives: {
             putStone: {
@@ -785,10 +785,7 @@ export type Channels = {
             };
             ready: boolean;
             cancel: null | Record<string, never>;
-            updateSettings: {
-                key: string;
-                value: any;
-            };
+            updateSettings: ReversiUpdateSettings<ReversiUpdateKey>;
             claimTimeIsUp: null | Record<string, never>;
         };
     };
@@ -2730,7 +2727,7 @@ type PagesUnlikeRequest = operations['pages___unlike']['requestBody']['content']
 type PagesUpdateRequest = operations['pages___update']['requestBody']['content']['application/json'];
 
 // @public (undocumented)
-function parse(acct: string): Acct;
+function parse(_acct: string): Acct;
 
 // Warning: (ae-forgotten-export) The symbol "Values" needs to be exported by the entry point index.d.ts
 //
@@ -2969,7 +2966,7 @@ export class Stream extends EventEmitter<StreamEvents> {
     constructor(origin: string, user: {
         token: string;
     } | null, options?: {
-        WebSocket?: any;
+        WebSocket?: WebSocket;
     });
     // (undocumented)
     close(): void;
@@ -2992,9 +2989,9 @@ export class Stream extends EventEmitter<StreamEvents> {
     // (undocumented)
     send(typeOrPayload: string): void;
     // (undocumented)
-    send(typeOrPayload: string, payload: any): void;
+    send(typeOrPayload: string, payload: unknown): void;
     // (undocumented)
-    send(typeOrPayload: Record<string, any> | any[]): void;
+    send(typeOrPayload: Record<string, unknown> | unknown[]): void;
     // (undocumented)
     state: 'initializing' | 'reconnecting' | 'connected';
     // (undocumented)
@@ -3229,7 +3226,9 @@ type UsersUpdateMemoRequest = operations['users___update-memo']['requestBody']['
 
 // Warnings were encountered during analysis:
 //
-// src/entities.ts:34:2 - (ae-forgotten-export) The symbol "ModerationLogPayloads" needs to be exported by the entry point index.d.ts
+// src/entities.ts:35:2 - (ae-forgotten-export) The symbol "ModerationLogPayloads" needs to be exported by the entry point index.d.ts
+// src/streaming.types.ts:220:4 - (ae-forgotten-export) The symbol "ReversiUpdateKey" needs to be exported by the entry point index.d.ts
+// src/streaming.types.ts:230:4 - (ae-forgotten-export) The symbol "ReversiUpdateSettings" needs to be exported by the entry point index.d.ts
 
 // (No @packageDocumentation comment for this package)
 
diff --git a/packages/misskey-js/src/acct.ts b/packages/misskey-js/src/acct.ts
index b25bc564ea..aa8658cdbd 100644
--- a/packages/misskey-js/src/acct.ts
+++ b/packages/misskey-js/src/acct.ts
@@ -3,7 +3,8 @@ export type Acct = {
 	host: string | null;
 };
 
-export function parse(acct: string): Acct {
+export function parse(_acct: string): Acct {
+	let acct = _acct;
 	if (acct.startsWith('@')) acct = acct.substring(1);
 	const split = acct.split('@', 2);
 	return { username: split[0], host: split[1] || null };
diff --git a/packages/misskey-js/src/api.ts b/packages/misskey-js/src/api.ts
index 76d055cbe4..ea1df57f3d 100644
--- a/packages/misskey-js/src/api.ts
+++ b/packages/misskey-js/src/api.ts
@@ -14,6 +14,7 @@ export type APIError = {
 	code: string;
 	message: string;
 	kind: 'client' | 'server';
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	info: Record<string, any>;
 };
 
@@ -29,6 +30,7 @@ export type FetchLike = (input: string, init?: {
 	headers: { [key in string]: string }
 }) => Promise<{
 	status: number;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	json(): Promise<any>;
 }>;
 
@@ -49,6 +51,7 @@ export class APIClient {
 		this.fetch = opts.fetch ?? ((...args) => fetch(...args));
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	private assertIsRecord<T>(obj: T): obj is T & Record<string, any> {
 		return obj !== null && typeof obj === 'object' && !Array.isArray(obj);
 	}
diff --git a/packages/misskey-js/src/api.types.ts b/packages/misskey-js/src/api.types.ts
index 8c403639b7..5ee4194db2 100644
--- a/packages/misskey-js/src/api.types.ts
+++ b/packages/misskey-js/src/api.types.ts
@@ -28,11 +28,13 @@ type StrictExtract<Union, Cond> = Cond extends Union ? Union : never;
 
 type IsCaseMatched<E extends keyof Endpoints, P extends Endpoints[E]['req'], C extends number> =
 	Endpoints[E]['res'] extends SwitchCase
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		? IsNeverType<StrictExtract<Endpoints[E]['res']['$switch']['$cases'][C], [P, any]>> extends false ? true : false
 		: false
 
 type GetCaseResult<E extends keyof Endpoints, P extends Endpoints[E]['req'], C extends number> =
 	Endpoints[E]['res'] extends SwitchCase
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		? StrictExtract<Endpoints[E]['res']['$switch']['$cases'][C], [P, any]>[1]
 		: never
 
diff --git a/packages/misskey-js/src/consts.ts b/packages/misskey-js/src/consts.ts
index 03b9069290..b509d3280c 100644
--- a/packages/misskey-js/src/consts.ts
+++ b/packages/misskey-js/src/consts.ts
@@ -1,3 +1,13 @@
+import type { operations } from './autogen/types.js';
+import type {
+	AbuseReportNotificationRecipient, Ad,
+	Announcement,
+	EmojiDetailed, InviteCode,
+	MetaDetailed,
+	Note,
+	Role, SystemWebhook, UserLite,
+} from './autogen/models.js';
+
 export const notificationTypes = ['note', 'follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app', 'roleAssigned', 'achievementEarned'] as const;
 
 export const noteVisibilities = ['public', 'home', 'followers', 'specified'] as const;
@@ -135,10 +145,30 @@ export const moderationLogTypes = [
 	'unsetUserBanner',
 ] as const;
 
+// See: packages/backend/src/core/ReversiService.ts@L410
+export const reversiUpdateKeys = [
+	'map',
+	'bw',
+	'isLlotheo',
+	'canPutEverywhere',
+	'loopedBoard',
+	'timeLimitForEachTurn',
+] as const;
+
+export type ReversiUpdateKey = typeof reversiUpdateKeys[number];
+
+type AvatarDecoration = UserLite['avatarDecorations'][number];
+
+type ReceivedAbuseReport = {
+	reportId: AbuseReportNotificationRecipient['id'];
+	report: operations['admin___abuse-user-reports']['responses'][200]['content']['application/json'];
+	forwarded: boolean;
+};
+
 export type ModerationLogPayloads = {
 	updateServerSettings: {
-		before: any | null;
-		after: any | null;
+		before: MetaDetailed | null;
+		after: MetaDetailed | null;
 	};
 	suspend: {
 		userId: string;
@@ -159,16 +189,16 @@ export type ModerationLogPayloads = {
 	};
 	addCustomEmoji: {
 		emojiId: string;
-		emoji: any;
+		emoji: EmojiDetailed;
 	};
 	updateCustomEmoji: {
 		emojiId: string;
-		before: any;
-		after: any;
+		before: EmojiDetailed;
+		after: EmojiDetailed;
 	};
 	deleteCustomEmoji: {
 		emojiId: string;
-		emoji: any;
+		emoji: EmojiDetailed;
 	};
 	assignRole: {
 		userId: string;
@@ -187,16 +217,16 @@ export type ModerationLogPayloads = {
 	};
 	createRole: {
 		roleId: string;
-		role: any;
+		role: Role;
 	};
 	updateRole: {
 		roleId: string;
-		before: any;
-		after: any;
+		before: Role;
+		after: Role;
 	};
 	deleteRole: {
 		roleId: string;
-		role: any;
+		role: Role;
 	};
 	clearQueue: Record<string, never>;
 	promoteQueue: Record<string, never>;
@@ -211,39 +241,39 @@ export type ModerationLogPayloads = {
 		noteUserId: string;
 		noteUserUsername: string;
 		noteUserHost: string | null;
-		note: any;
+		note: Note;
 	};
 	createGlobalAnnouncement: {
 		announcementId: string;
-		announcement: any;
+		announcement: Announcement;
 	};
 	createUserAnnouncement: {
 		announcementId: string;
-		announcement: any;
+		announcement: Announcement;
 		userId: string;
 		userUsername: string;
 		userHost: string | null;
 	};
 	updateGlobalAnnouncement: {
 		announcementId: string;
-		before: any;
-		after: any;
+		before: Announcement;
+		after: Announcement;
 	};
 	updateUserAnnouncement: {
 		announcementId: string;
-		before: any;
-		after: any;
+		before: Announcement;
+		after: Announcement;
 		userId: string;
 		userUsername: string;
 		userHost: string | null;
 	};
 	deleteGlobalAnnouncement: {
 		announcementId: string;
-		announcement: any;
+		announcement: Announcement;
 	};
 	deleteUserAnnouncement: {
 		announcementId: string;
-		announcement: any;
+		announcement: Announcement;
 		userId: string;
 		userUsername: string;
 		userHost: string | null;
@@ -281,37 +311,37 @@ export type ModerationLogPayloads = {
 	};
 	resolveAbuseReport: {
 		reportId: string;
-		report: any;
+		report: ReceivedAbuseReport;
 		forwarded: boolean;
 	};
 	createInvitation: {
-		invitations: any[];
+		invitations: InviteCode[];
 	};
 	createAd: {
 		adId: string;
-		ad: any;
+		ad: Ad;
 	};
 	updateAd: {
 		adId: string;
-		before: any;
-		after: any;
+		before: Ad;
+		after: Ad;
 	};
 	deleteAd: {
 		adId: string;
-		ad: any;
+		ad: Ad;
 	};
 	createAvatarDecoration: {
 		avatarDecorationId: string;
-		avatarDecoration: any;
+		avatarDecoration: AvatarDecoration;
 	};
 	updateAvatarDecoration: {
 		avatarDecorationId: string;
-		before: any;
-		after: any;
+		before: AvatarDecoration;
+		after: AvatarDecoration;
 	};
 	deleteAvatarDecoration: {
 		avatarDecorationId: string;
-		avatarDecoration: any;
+		avatarDecoration: AvatarDecoration;
 	};
 	unsetUserAvatar: {
 		userId: string;
@@ -327,28 +357,28 @@ export type ModerationLogPayloads = {
 	};
 	createSystemWebhook: {
 		systemWebhookId: string;
-		webhook: any;
+		webhook: SystemWebhook;
 	};
 	updateSystemWebhook: {
 		systemWebhookId: string;
-		before: any;
-		after: any;
+		before: SystemWebhook;
+		after: SystemWebhook;
 	};
 	deleteSystemWebhook: {
 		systemWebhookId: string;
-		webhook: any;
+		webhook: SystemWebhook;
 	};
 	createAbuseReportNotificationRecipient: {
 		recipientId: string;
-		recipient: any;
+		recipient: AbuseReportNotificationRecipient;
 	};
 	updateAbuseReportNotificationRecipient: {
 		recipientId: string;
-		before: any;
-		after: any;
+		before: AbuseReportNotificationRecipient;
+		after: AbuseReportNotificationRecipient;
 	};
 	deleteAbuseReportNotificationRecipient: {
 		recipientId: string;
-		recipient: any;
+		recipient: AbuseReportNotificationRecipient;
 	};
 };
diff --git a/packages/misskey-js/src/entities.ts b/packages/misskey-js/src/entities.ts
index 7331a55a1c..ce58fb2970 100644
--- a/packages/misskey-js/src/entities.ts
+++ b/packages/misskey-js/src/entities.ts
@@ -7,7 +7,7 @@ import {
 	Role,
 	RolePolicies,
 	User,
-	UserDetailedNotMe
+	UserDetailedNotMe,
 } from './autogen/models.js';
 
 export * from './autogen/entities.js';
@@ -19,6 +19,7 @@ export type DateString = string;
 export type PageEvent = {
 	pageId: Page['id'];
 	event: string;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	var: any;
 	userId: User['id'];
 	user: User;
diff --git a/packages/misskey-js/src/streaming.ts b/packages/misskey-js/src/streaming.ts
index 83930e621c..d1d131cfc1 100644
--- a/packages/misskey-js/src/streaming.ts
+++ b/packages/misskey-js/src/streaming.ts
@@ -15,7 +15,7 @@ export function urlQuery(obj: Record<string, string | number | boolean | undefin
 		.join('&');
 }
 
-type AnyOf<T extends Record<any, any>> = T[keyof T];
+type AnyOf<T extends Record<PropertyKey, unknown>> = T[keyof T];
 
 type StreamEvents = {
 	_connected_: void;
@@ -25,6 +25,7 @@ type StreamEvents = {
 /**
  * Misskey stream connection
  */
+// eslint-disable-next-line import/no-default-export
 export default class Stream extends EventEmitter<StreamEvents> {
 	private stream: _ReconnectingWebsocket.default;
 	public state: 'initializing' | 'reconnecting' | 'connected' = 'initializing';
@@ -34,7 +35,7 @@ export default class Stream extends EventEmitter<StreamEvents> {
 	private idCounter = 0;
 
 	constructor(origin: string, user: { token: string; } | null, options?: {
-		WebSocket?: any;
+		WebSocket?: WebSocket;
 	}) {
 		super();
 
@@ -51,6 +52,7 @@ export default class Stream extends EventEmitter<StreamEvents> {
 		this.send = this.send.bind(this);
 		this.close = this.close.bind(this);
 
+		// eslint-disable-next-line no-param-reassign
 		options = options ?? { };
 
 		const query = urlQuery({
@@ -91,8 +93,8 @@ export default class Stream extends EventEmitter<StreamEvents> {
 			this.sharedConnectionPools.push(pool);
 		}
 
-		const connection = new SharedConnection(this, channel, pool, name);
-		this.sharedConnections.push(connection);
+		const connection = new SharedConnection<Channels[C]>(this, channel, pool, name);
+		this.sharedConnections.push(connection as unknown as SharedConnection);
 		return connection;
 	}
 
@@ -106,7 +108,7 @@ export default class Stream extends EventEmitter<StreamEvents> {
 
 	private connectToChannel<C extends keyof Channels>(channel: C, params: Channels[C]['params']): NonSharedConnection<Channels[C]> {
 		const connection = new NonSharedConnection(this, channel, this.genId(), params);
-		this.nonSharedConnections.push(connection);
+		this.nonSharedConnections.push(connection as unknown as NonSharedConnection);
 		return connection;
 	}
 
@@ -174,9 +176,9 @@ export default class Stream extends EventEmitter<StreamEvents> {
 	 * ! ストリーム上のやり取りはすべてJSONで行われます !
 	 */
 	public send(typeOrPayload: string): void
-	public send(typeOrPayload: string, payload: any): void
-	public send(typeOrPayload: Record<string, any> | any[]): void
-	public send(typeOrPayload: string | Record<string, any> | any[], payload?: any): void {
+	public send(typeOrPayload: string, payload: unknown): void
+	public send(typeOrPayload: Record<string, unknown> | unknown[]): void
+	public send(typeOrPayload: string | Record<string, unknown> | unknown[], payload?: unknown): void {
 		if (typeof typeOrPayload === 'string') {
 			this.stream.send(JSON.stringify({
 				type: typeOrPayload,
@@ -211,7 +213,7 @@ class Pool {
 	public id: string;
 	protected stream: Stream;
 	public users = 0;
-	private disposeTimerId: any;
+	private disposeTimerId: ReturnType<typeof setTimeout> | null = null;
 	private isConnected = false;
 
 	constructor(stream: Stream, channel: string, id: string) {
@@ -275,7 +277,7 @@ class Pool {
 	}
 }
 
-export abstract class Connection<Channel extends AnyOf<Channels> = any> extends EventEmitter<Channel['events']> {
+export abstract class Connection<Channel extends AnyOf<Channels> = AnyOf<Channels>> extends EventEmitter<Channel['events']> {
 	public channel: string;
 	protected stream: Stream;
 	public abstract id: string;
@@ -309,7 +311,7 @@ export abstract class Connection<Channel extends AnyOf<Channels> = any> extends
 	public abstract dispose(): void;
 }
 
-class SharedConnection<Channel extends AnyOf<Channels> = any> extends Connection<Channel> {
+class SharedConnection<Channel extends AnyOf<Channels> = AnyOf<Channels>> extends Connection<Channel> {
 	private pool: Pool;
 
 	public get id(): string {
@@ -328,11 +330,11 @@ class SharedConnection<Channel extends AnyOf<Channels> = any> extends Connection
 	public dispose(): void {
 		this.pool.dec();
 		this.removeAllListeners();
-		this.stream.removeSharedConnection(this);
+		this.stream.removeSharedConnection(this as unknown as SharedConnection);
 	}
 }
 
-class NonSharedConnection<Channel extends AnyOf<Channels> = any> extends Connection<Channel> {
+class NonSharedConnection<Channel extends AnyOf<Channels> = AnyOf<Channels>> extends Connection<Channel> {
 	public id: string;
 	protected params: Channel['params'];
 
@@ -359,6 +361,6 @@ class NonSharedConnection<Channel extends AnyOf<Channels> = any> extends Connect
 	public dispose(): void {
 		this.removeAllListeners();
 		this.stream.send('disconnect', { id: this.id });
-		this.stream.disconnectToChannel(this);
+		this.stream.disconnectToChannel(this as unknown as NonSharedConnection);
 	}
 }
diff --git a/packages/misskey-js/src/streaming.types.ts b/packages/misskey-js/src/streaming.types.ts
index 9a86e03d69..4447a2e8fc 100644
--- a/packages/misskey-js/src/streaming.types.ts
+++ b/packages/misskey-js/src/streaming.types.ts
@@ -21,6 +21,14 @@ import {
 	ServerStatsLog,
 	ReversiGameDetailed,
 } from './entities.js';
+import {
+	ReversiUpdateKey,
+} from './consts.js';
+
+type ReversiUpdateSettings<K extends ReversiUpdateKey> = {
+	key: K;
+	value: ReversiGameDetailed[K];
+};
 
 export type Channels = {
 	main: {
@@ -51,6 +59,7 @@ export type Channels = {
 			registryUpdated: (payload: {
 				scope?: string[];
 				key: string;
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any
 				value: any | null;
 			}) => void;
 			driveFileCreated: (payload: DriveFile) => void;
@@ -208,8 +217,8 @@ export type Channels = {
 			ended: (payload: { winnerId: User['id'] | null; game: ReversiGameDetailed; }) => void;
 			canceled: (payload: { userId: User['id']; }) => void;
 			changeReadyStates: (payload: { user1: boolean; user2: boolean; }) => void;
-			updateSettings: (payload: { userId: User['id']; key: string; value: any; }) => void;
-			log: (payload: Record<string, any>) => void;
+			updateSettings: <K extends ReversiUpdateKey>(payload: { userId: User['id']; key: K; value: ReversiGameDetailed[K]; }) => void;
+			log: (payload: Record<string, unknown>) => void;
 		};
 		receives: {
 			putStone: {
@@ -218,10 +227,7 @@ export type Channels = {
 			};
 			ready: boolean;
 			cancel: null | Record<string, never>;
-			updateSettings: {
-				key: string;
-				value: any;
-			};
+			updateSettings: ReversiUpdateSettings<ReversiUpdateKey>;
 			claimTimeIsUp: null | Record<string, never>;
 		}
 	}

From 7c67d3a5aae29317902d73ced1fe1ec28a209e32 Mon Sep 17 00:00:00 2001
From: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
Date: Thu, 25 Jul 2024 16:44:38 +0900
Subject: [PATCH 094/221] fix(frontend): emoji picker not opening on `/share`
 page (#14295)

* fix(frontend): emoji picker not opening on `/share` page

* Update CHANGELOG.md
---
 CHANGELOG.md                           | 1 +
 packages/frontend/src/boot/sub-boot.ts | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21d25fe0de..1521e88fcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@
 - Fix: 子メニューの高さがウィンドウからはみ出ることがある問題を修正
 - Fix: 個人宛てのダイアログ形式のお知らせが即時表示されない問題を修正
 - Fix: 一部の画像がセンシティブ指定されているときに画面に何も表示されないことがあるのを修正
+- Fix: `/share`ページにおいて絵文字ピッカーを開くことができない問題を修正
 
 ### Server
 - Feat: レートリミット制限に引っかかったときに`Retry-After`ヘッダーを返すように (#13949)
diff --git a/packages/frontend/src/boot/sub-boot.ts b/packages/frontend/src/boot/sub-boot.ts
index 017457822b..35c84d5568 100644
--- a/packages/frontend/src/boot/sub-boot.ts
+++ b/packages/frontend/src/boot/sub-boot.ts
@@ -5,9 +5,12 @@
 
 import { createApp, defineAsyncComponent } from 'vue';
 import { common } from './common.js';
+import { emojiPicker } from '@/scripts/emoji-picker.js';
 
 export async function subBoot() {
 	const { isClientUpdated } = await common(() => createApp(
 		defineAsyncComponent(() => import('@/ui/minimum.vue')),
 	));
+
+	emojiPicker.init();
 }

From ed6dc84c5f92c00c92bb2fa17b5f5aa81c21429e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Thu, 25 Jul 2024 17:03:00 +0900
Subject: [PATCH 095/221] =?UTF-8?q?fix(frontend):=20=E3=83=AA=E3=82=A2?=
 =?UTF-8?q?=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=97=E3=81=9F=E3=83=A6?=
 =?UTF-8?q?=E3=83=BC=E3=82=B6=E3=83=BC=E4=B8=80=E8=A6=A7=E3=81=AE=E3=83=A6?=
 =?UTF-8?q?=E3=83=BC=E3=82=B6=E3=83=BC=E5=90=8D=E3=81=8C=E3=81=AF=E3=81=BF?=
 =?UTF-8?q?=E5=87=BA=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20(#14294)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* pnpm dev で絵文字が表示されない問題を解決

(cherry picked from commit 22fcafbf55830922efe75d129f48b4d8c11724e6)

* リアクションしたユーザー一覧のユーザーネームがはみ出る問題を解決

(cherry picked from commit 46458b190e2b4ccfc8b50b6857ee9a5a6fd09fe9)

* Update Changelog

---------

Co-authored-by: 6wFh3kVo <yukikum57@gmail.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
 CHANGELOG.md                                                   | 2 ++
 packages/frontend/src/components/MkReactionsViewer.details.vue | 1 +
 packages/frontend/vite.config.local-dev.ts                     | 1 +
 3 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1521e88fcb..7d48d14c71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,8 @@
 - Fix: 子メニューの高さがウィンドウからはみ出ることがある問題を修正
 - Fix: 個人宛てのダイアログ形式のお知らせが即時表示されない問題を修正
 - Fix: 一部の画像がセンシティブ指定されているときに画面に何も表示されないことがあるのを修正
+- Fix: リアクションしたユーザー一覧のユーザー名がはみ出る問題を修正  
+  (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/672)
 - Fix: `/share`ページにおいて絵文字ピッカーを開くことができない問題を修正
 
 ### Server
diff --git a/packages/frontend/src/components/MkReactionsViewer.details.vue b/packages/frontend/src/components/MkReactionsViewer.details.vue
index 8b5e6efdf3..60118fadd2 100644
--- a/packages/frontend/src/components/MkReactionsViewer.details.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.details.vue
@@ -81,6 +81,7 @@ function getReactionName(reaction: string): string {
 }
 
 .user {
+	display: flex;
 	line-height: 24px;
 	padding-top: 4px;
 	white-space: nowrap;
diff --git a/packages/frontend/vite.config.local-dev.ts b/packages/frontend/vite.config.local-dev.ts
index 0a88e489c1..887ab7927e 100644
--- a/packages/frontend/vite.config.local-dev.ts
+++ b/packages/frontend/vite.config.local-dev.ts
@@ -62,6 +62,7 @@ const devConfig: UserConfig = {
 			'/bios': httpUrl,
 			'/cli': httpUrl,
 			'/inbox': httpUrl,
+			'/emoji/': httpUrl,
 			'/notes': {
 				target: httpUrl,
 				bypass: varyHandler,

From ee2f0f3a21bbe978483ebe28a38806431c972405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Thu, 25 Jul 2024 17:03:55 +0900
Subject: [PATCH 096/221] =?UTF-8?q?fix(frontend):=20=E3=81=84=E3=81=8F?=
 =?UTF-8?q?=E3=81=A4=E3=81=8B=E3=81=AE`number`=20input=E3=81=AB=E6=9C=80?=
 =?UTF-8?q?=E5=B0=8F=E5=80=A4=E3=82=92=E8=A8=AD=E5=AE=9A=20(#14284)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkPollEditor.vue            | 2 +-
 packages/frontend/src/pages/admin/invites.vue                | 2 +-
 packages/frontend/src/pages/settings/statusbar.statusbar.vue | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/components/MkPollEditor.vue b/packages/frontend/src/components/MkPollEditor.vue
index db74354bbb..3726ddf822 100644
--- a/packages/frontend/src/components/MkPollEditor.vue
+++ b/packages/frontend/src/components/MkPollEditor.vue
@@ -37,7 +37,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</MkInput>
 			</section>
 			<section v-else-if="expiration === 'after'">
-				<MkInput v-model="after" small type="number" class="input">
+				<MkInput v-model="after" small type="number" min="1" class="input">
 					<template #label>{{ i18n.ts._poll.duration }}</template>
 				</MkInput>
 				<MkSelect v-model="unit" small>
diff --git a/packages/frontend/src/pages/admin/invites.vue b/packages/frontend/src/pages/admin/invites.vue
index 95727fb14c..9cb430b0fe 100644
--- a/packages/frontend/src/pages/admin/invites.vue
+++ b/packages/frontend/src/pages/admin/invites.vue
@@ -19,7 +19,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkInput v-if="!noExpirationDate" v-model="expiresAt" type="datetime-local">
 						<template #label>{{ i18n.ts.expirationDate }}</template>
 					</MkInput>
-					<MkInput v-model="createCount" type="number">
+					<MkInput v-model="createCount" type="number" min="1">
 						<template #label>{{ i18n.ts.createCount }}</template>
 					</MkInput>
 					<MkButton primary rounded @click="createWithOptions">{{ i18n.ts.create }}</MkButton>
diff --git a/packages/frontend/src/pages/settings/statusbar.statusbar.vue b/packages/frontend/src/pages/settings/statusbar.statusbar.vue
index 92e389a288..67943524ef 100644
--- a/packages/frontend/src/pages/settings/statusbar.statusbar.vue
+++ b/packages/frontend/src/pages/settings/statusbar.statusbar.vue
@@ -36,7 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkSwitch v-model="statusbar.props.shuffle">
 			<template #label>{{ i18n.ts.shuffle }}</template>
 		</MkSwitch>
-		<MkInput v-model="statusbar.props.refreshIntervalSec" manualSave type="number">
+		<MkInput v-model="statusbar.props.refreshIntervalSec" manualSave type="number" min="1">
 			<template #label>{{ i18n.ts.refreshInterval }}</template>
 		</MkInput>
 		<MkRange v-model="statusbar.props.marqueeDuration" :min="5" :max="150" :step="1">
@@ -48,7 +48,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</MkSwitch>
 	</template>
 	<template v-else-if="statusbar.type === 'federation'">
-		<MkInput v-model="statusbar.props.refreshIntervalSec" manualSave type="number">
+		<MkInput v-model="statusbar.props.refreshIntervalSec" manualSave type="number" min="1">
 			<template #label>{{ i18n.ts.refreshInterval }}</template>
 		</MkInput>
 		<MkRange v-model="statusbar.props.marqueeDuration" :min="5" :max="150" :step="1">

From 8959ff89d033d20ca1ab75e6d314be7953ed60ae Mon Sep 17 00:00:00 2001
From: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>
Date: Thu, 25 Jul 2024 17:12:06 +0900
Subject: [PATCH 097/221] chore: reflect actual policy about Committers' rights
 (#14267)

* Update CONTRIBUTING.md

* member -> commiter

* apply suggestions

Co-authored-by: Marie <robloxfilmcam@gmail.com>

* Update CONTRIBUTING.md

---------

Co-authored-by: Marie <robloxfilmcam@gmail.com>
---
 CONTRIBUTING.md | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index afc21ea594..784d56d08c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,13 +20,29 @@ Before creating an issue, please check the following:
 > **Warning**
 > Do not close issues that are about to be resolved. It should remain open until a commit that actually resolves it is merged.
 
-## Before implementation
+
+### Recommended discussing before implementation
+We welcome your purposal.
+
 When you want to add a feature or fix a bug, **first have the design and policy reviewed in an Issue** (if it is not there, please make one). Without this step, there is a high possibility that the PR will not be merged even if it is implemented.
 
 At this point, you also need to clarify the goals of the PR you will create, and make sure that the other members of the team are aware of them.
 PRs that do not have a clear set of do's and don'ts tend to be bloated and difficult to review.
 
-Also, when you start implementation, assign yourself to the Issue (if you cannot do it yourself, ask another member to assign you). By expressing your intention to work the Issue, you can prevent conflicts in the work.
+Also, when you start implementation, assign yourself to the Issue (if you cannot do it yourself, ask Commiter to assign you). 
+By expressing your intention to work on the Issue, you can prevent conflicts in the work.
+
+To the Committers: you should not assign someone on it before the Final Decision.
+
+### How issues are triaged
+
+The Commiters may:
+* close an issue that is not reproducible on latest stable release,
+* merge an issue into another issue,
+* split an issue into multiple issues,
+* or re-open that has been closed for some reason which is not applicable anymore.
+
+@syuilo reserves the Final Desicion rights including whether the project will implement feature and how to implement, these rights are not always exercised.
 
 ## Well-known branches
 - **`master`** branch is tracking the latest release and used for production purposes.

From 908d3ecb5cb9e510e06818c145aaba6664829773 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 12:02:12 +0000
Subject: [PATCH 098/221] Bump version to 2024.7.0-beta.2

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 44466aaae6..510b96aa01 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.7.0-beta.1",
+	"version": "2024.7.0-beta.2",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index d494b6b58e..aa2e0e781b 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.7.0-beta.1",
+	"version": "2024.7.0-beta.2",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 0d76842abefa32cb22ed2e224122337bccce693d Mon Sep 17 00:00:00 2001
From: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
Date: Fri, 26 Jul 2024 10:16:27 +0900
Subject: [PATCH 099/221] docs: format `CONTRIBUTING.md` (#14302)

* fix: correct typos

* chore: convert indentation to tabs

* fix: missing lang

* chore: trim unnecessary whitespaces and newlines

* chore: use local path

* chore: use GFM alerts

* fix: missing use GFM alerts
---
 CONTRIBUTING.md | 45 +++++++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 784d56d08c..72c84c2f18 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,7 +1,7 @@
 # Contribution guide
 We're glad you're interested in contributing Misskey! In this document you will find the information you need to contribute to the project.
 
-> **Note**
+> [!NOTE]
 > This project uses Japanese as its major language, **but you do not need to translate and write the Issues/PRs in Japanese.**
 > Also, you might receive comments on your Issue/PR in Japanese, but you do not need to reply to them in Japanese as well.\
 > The accuracy of machine translation into Japanese is not high, so it will be easier for us to understand if you write it in the original language.
@@ -17,32 +17,31 @@ Before creating an issue, please check the following:
 	- Issues should only be used to feature requests, suggestions, and bug tracking.
 	- Please ask questions or troubleshooting in [GitHub Discussions](https://github.com/misskey-dev/misskey/discussions) or [Discord](https://discord.gg/Wp8gVStHW3).
 
-> **Warning**
+> [!WARNING]
 > Do not close issues that are about to be resolved. It should remain open until a commit that actually resolves it is merged.
 
-
 ### Recommended discussing before implementation
-We welcome your purposal.
+We welcome your proposal.
 
 When you want to add a feature or fix a bug, **first have the design and policy reviewed in an Issue** (if it is not there, please make one). Without this step, there is a high possibility that the PR will not be merged even if it is implemented.
 
 At this point, you also need to clarify the goals of the PR you will create, and make sure that the other members of the team are aware of them.
 PRs that do not have a clear set of do's and don'ts tend to be bloated and difficult to review.
 
-Also, when you start implementation, assign yourself to the Issue (if you cannot do it yourself, ask Commiter to assign you). 
+Also, when you start implementation, assign yourself to the Issue (if you cannot do it yourself, ask Committer to assign you).
 By expressing your intention to work on the Issue, you can prevent conflicts in the work.
 
 To the Committers: you should not assign someone on it before the Final Decision.
 
 ### How issues are triaged
 
-The Commiters may:
+The Committers may:
 * close an issue that is not reproducible on latest stable release,
 * merge an issue into another issue,
 * split an issue into multiple issues,
 * or re-open that has been closed for some reason which is not applicable anymore.
 
-@syuilo reserves the Final Desicion rights including whether the project will implement feature and how to implement, these rights are not always exercised.
+@syuilo reserves the Final Decision rights including whether the project will implement feature and how to implement, these rights are not always exercised.
 
 ## Well-known branches
 - **`master`** branch is tracking the latest release and used for production purposes.
@@ -53,14 +52,14 @@ The Commiters may:
 ## Creating a PR
 Thank you for your PR! Before creating a PR, please check the following:
 - If possible, prefix the title with a keyword that identifies the type of this PR, as shown below.
-  - `fix` / `refactor` / `feat` / `enhance` / `perf` / `chore` etc
-  - Also, make sure that the granularity of this PR is appropriate. Please do not include more than one type of change or interest in a single PR.
+	- `fix` / `refactor` / `feat` / `enhance` / `perf` / `chore` etc
+	- Also, make sure that the granularity of this PR is appropriate. Please do not include more than one type of change or interest in a single PR.
 - If there is an Issue which will be resolved by this PR, please include a reference to the Issue in the text.
 - Please add the summary of the changes to [`CHANGELOG.md`](/CHANGELOG.md). However, this is not necessary for changes that do not affect the users, such as refactoring.
 - Check if there are any documents that need to be created or updated due to this change.
 - If you have added a feature or fixed a bug, please add a test case if possible.
 - Please make sure that tests and Lint are passed in advance.
-  - You can run it with `pnpm test` and `pnpm lint`. [See more info](#testing)
+	- You can run it with `pnpm test` and `pnpm lint`. [See more info](#testing)
 - If this PR includes UI changes, please attach a screenshot in the text.
 
 Thanks for your cooperation 🤗
@@ -70,8 +69,8 @@ Be willing to comment on the good points and not just the things you want fixed
 
 ### Review perspective
 - Scope
-  - Are the goals of the PR clear?
-  - Is the granularity of the PR appropriate?
+	- Are the goals of the PR clear?
+	- Is the granularity of the PR appropriate?
 - Security
 	- Does merging this PR create a vulnerability?
 - Performance
@@ -93,7 +92,7 @@ An actual domain will be assigned so you can test the federation.
 
 ## Release
 ### Release Instructions
-1. Commit version changes in the `develop` branch ([package.json](https://github.com/misskey-dev/misskey/blob/develop/package.json))
+1. Commit version changes in the `develop` branch ([package.json](package.json))
 2. Create a release PR.
 	- Into `master` from `develop` branch.
 	- The title must be in the format `Release: x.y.z`.
@@ -104,7 +103,7 @@ An actual domain will be assigned so you can test the federation.
 	- The target branch must be `master`
 	- The tag name must be the version
 
-> **Note**
+> [!NOTE]
 > Why this instruction is necessary:
 > - To perform final QA checks
 > - To distribute responsibility
@@ -139,7 +138,7 @@ You could obtain middleware container by typing `docker compose -f $PROJECT_ROOT
 Devcontainer also has necessary setting. This method can be done by connecting from VSCode.
 
 Instead of running `pnpm` locally, you can use Dev Container to set up your development environment.
-To use Dev Container, open the project directory on VSCode with Dev Containers installed.  
+To use Dev Container, open the project directory on VSCode with Dev Containers installed.
 **Note:** If you are using Windows, please clone the repository with WSL. Using Git for Windows will result in broken files due to the difference in how newlines are handled.
 
 It will run the following command automatically inside the container.
@@ -155,11 +154,9 @@ After finishing the migration, you can proceed.
 
 ### Start developing
 During development, it is useful to use the
-
 ```
 pnpm dev
 ```
-
 command.
 
 - Server-side source files and automatically builds them if they are modified. Automatically start the server process(es).
@@ -232,7 +229,7 @@ niraxは、Misskeyで使用しているオリジナルのフロントエンド
 ### ルート定義
 ルート定義は、以下の形式のオブジェクトの配列です。
 
-``` ts
+```ts
 {
 	name?: string;
 	path: string;
@@ -245,7 +242,7 @@ niraxは、Misskeyで使用しているオリジナルのフロントエンド
 }
 ```
 
-> **Warning**
+> [!WARNING]
 > 現状、ルートは定義された順に評価されます。
 > たとえば、`/foo/:id`ルート定義の次に`/foo/bar`ルート定義がされていた場合、後者がマッチすることはありません。
 
@@ -307,7 +304,7 @@ export const Default = {
 	parameters: {
 		layout: 'centered',
 	},
-} satisfies StoryObj<typeof MkAvatar>;
+} satisfies StoryObj<typeof MyComponent>;
 ```
 
 If you want to opt-out from the automatic generation, create a `MyComponent.stories.impl.ts` file and add the following line to the file.
@@ -418,7 +415,7 @@ describe('test', () => {
 		})
 			.useMocker(...
 			.compile();
-	
+
 		fooService = app.get<FooService>(FooService);
 		barService = app.get<BarService>(BarService) as jest.Mocked<BarService>;
 
@@ -539,13 +536,13 @@ pnpm dlx typeorm migration:generate -d ormconfig.js -o <migration name>
 - 作成されたスクリプトは不必要な変更を含むため除去してください
 
 ### JSON SchemaのobjectでanyOfを使うとき
-JSON Schemaで、objectに対してanyOfを使う場合、anyOfの中でpropertiesを定義しないこと。  
-バリデーションが効かないため。（SchemaTypeもそのように作られており、objectのanyOf内のpropertiesは捨てられます）  
+JSON Schemaで、objectに対してanyOfを使う場合、anyOfの中でpropertiesを定義しないこと。
+バリデーションが効かないため。（SchemaTypeもそのように作られており、objectのanyOf内のpropertiesは捨てられます）
 https://github.com/misskey-dev/misskey/pull/10082
 
 テキストhogeおよびfugaについて、片方を必須としつつ両方の指定もありうる場合:
 
-```
+```ts
 export const paramDef = {
 	type: 'object',
 	properties: {

From 46d96c7412f85990d01006fbb548178c8cfdf827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 27 Jul 2024 18:09:15 +0900
Subject: [PATCH 100/221] =?UTF-8?q?fix(build):=20autogen=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=99=82=E3=81=ABbackend=E3=82=922=E5=BA=A6build=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20(#14309)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(build): autogen生成時にbackendを2度buildしているのを修正

* fix

* fix
---
 package.json                                  |  2 +-
 packages/backend/package.json                 |  2 +-
 packages/backend/scripts/generate_api_json.js | 35 +++++++++++++++----
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 510b96aa01..ecf2de39d3 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
 		"build-assets": "node ./scripts/build-assets.mjs",
 		"build": "pnpm build-pre && pnpm -r build && pnpm build-assets",
 		"build-storybook": "pnpm --filter frontend build-storybook",
-		"build-misskey-js-with-types": "pnpm build-pre && pnpm --filter backend... --filter=!misskey-js build && pnpm --filter backend generate-api-json && ncp packages/backend/built/api.json packages/misskey-js/generator/api.json && pnpm --filter misskey-js update-autogen-code && pnpm --filter misskey-js build && pnpm --filter misskey-js api",
+		"build-misskey-js-with-types": "pnpm build-pre && pnpm --filter backend... --filter=!misskey-js build && pnpm --filter backend generate-api-json --no-build && ncp packages/backend/built/api.json packages/misskey-js/generator/api.json && pnpm --filter misskey-js update-autogen-code && pnpm --filter misskey-js build && pnpm --filter misskey-js api",
 		"start": "pnpm check:connect && cd packages/backend && node ./built/boot/entry.js",
 		"start:test": "cd packages/backend && cross-env NODE_ENV=test node ./built/boot/entry.js",
 		"init": "pnpm migrate",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 22fdc5cf16..b99717d15c 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -31,7 +31,7 @@
 		"test:e2e": "pnpm build && pnpm build:test && pnpm jest:e2e",
 		"test-and-coverage": "pnpm jest-and-coverage",
 		"test-and-coverage:e2e": "pnpm build && pnpm build:test && pnpm jest-and-coverage:e2e",
-		"generate-api-json": "pnpm build && node ./scripts/generate_api_json.js"
+		"generate-api-json": "node ./scripts/generate_api_json.js"
 	},
 	"optionalDependencies": {
 		"@swc/core-android-arm64": "1.3.11",
diff --git a/packages/backend/scripts/generate_api_json.js b/packages/backend/scripts/generate_api_json.js
index b4769ef801..798e243004 100644
--- a/packages/backend/scripts/generate_api_json.js
+++ b/packages/backend/scripts/generate_api_json.js
@@ -3,11 +3,34 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { loadConfig } from '../built/config.js'
-import { genOpenapiSpec } from '../built/server/api/openapi/gen-spec.js'
-import { writeFileSync } from "node:fs";
+import { execa } from 'execa';
+import { writeFileSync, existsSync } from "node:fs";
 
-const config = loadConfig();
-const spec = genOpenapiSpec(config, true);
+async function main() {
+	if (!process.argv.includes('--no-build')) {
+		await execa('pnpm', ['run', 'build'], {
+			stdout: process.stdout,
+			stderr: process.stderr,
+		});
+	}
 
-writeFileSync('./built/api.json', JSON.stringify(spec), 'utf-8');
+	if (!existsSync('./built')) {
+		throw new Error('`built` directory does not exist.');
+	}
+
+	/** @type {import('../src/config.js')} */
+	const { loadConfig } = await import('../built/config.js');
+
+	/** @type {import('../src/server/api/openapi/gen-spec.js')} */
+	const { genOpenapiSpec } = await import('../built/server/api/openapi/gen-spec.js');
+
+	const config = loadConfig();
+	const spec = genOpenapiSpec(config, true);
+
+	writeFileSync('./built/api.json', JSON.stringify(spec), 'utf-8');
+}
+
+main().catch(e => {
+	console.error(e);
+	process.exit(1);
+});

From 22c4e9d7ecf5a659832ea32244e46a40627bfc8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 27 Jul 2024 18:09:57 +0900
Subject: [PATCH 101/221] =?UTF-8?q?fix(frontend):=20modal=E3=81=8C?=
 =?UTF-8?q?=E6=AD=A3=E3=81=97=E3=81=8F=E9=96=89=E3=81=98=E3=82=89=E3=82=8C?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E3=81=AE=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20(#14307)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): modalが正しく閉じられていないのを修正

* Update packages/frontend/src/components/MkSystemWebhookEditor.vue

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
 .../components/MkSystemWebhookEditor.impl.ts  | 13 +++++----
 .../src/components/MkSystemWebhookEditor.vue  | 22 +++++++++-----
 .../src/components/MkUserSelectDialog.vue     |  8 ++---
 .../notification-recipient.editor.vue         | 29 ++++++++++++-------
 .../abuse-report/notification-recipient.vue   | 15 +++++-----
 5 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/packages/frontend/src/components/MkSystemWebhookEditor.impl.ts b/packages/frontend/src/components/MkSystemWebhookEditor.impl.ts
index 76f54e8d37..69b8edd85a 100644
--- a/packages/frontend/src/components/MkSystemWebhookEditor.impl.ts
+++ b/packages/frontend/src/components/MkSystemWebhookEditor.impl.ts
@@ -24,22 +24,23 @@ export type MkSystemWebhookResult = {
 };
 
 export async function showSystemWebhookEditorDialog(props: MkSystemWebhookEditorProps): Promise<MkSystemWebhookResult | null> {
-	const { dispose, result } = await new Promise<{ dispose: () => void, result: MkSystemWebhookResult | null }>(async resolve => {
-		const { dispose: _dispose } = os.popup(
+	const { result } = await new Promise<{ result: MkSystemWebhookResult | null }>(async resolve => {
+		const { dispose } = os.popup(
 			defineAsyncComponent(() => import('@/components/MkSystemWebhookEditor.vue')),
 			props,
 			{
 				submitted: (ev: MkSystemWebhookResult) => {
-					resolve({ dispose: _dispose, result: ev });
+					resolve({ result: ev });
+				},
+				canceled: () => {
+					resolve({ result: null });
 				},
 				closed: () => {
-					resolve({ dispose: _dispose, result: null });
+					dispose();
 				},
 			},
 		);
 	});
 
-	dispose();
-
 	return result;
 }
diff --git a/packages/frontend/src/components/MkSystemWebhookEditor.vue b/packages/frontend/src/components/MkSystemWebhookEditor.vue
index 007d841f00..3e6a015018 100644
--- a/packages/frontend/src/components/MkSystemWebhookEditor.vue
+++ b/packages/frontend/src/components/MkSystemWebhookEditor.vue
@@ -5,6 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <MkModalWindow
+	ref="dialogEl"
 	:width="450"
 	:height="590"
 	:canClose="true"
@@ -12,7 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	:okButtonDisabled="false"
 	@click="onCancelClicked"
 	@close="onCancelClicked"
-	@closed="onCancelClicked"
+	@closed="emit('closed')"
 >
 	<template #header>
 		{{ mode === 'create' ? i18n.ts._webhookSettings.createWebhook : i18n.ts._webhookSettings.modifyWebhook }}
@@ -59,8 +60,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, ref, toRefs } from 'vue';
-import FormSection from '@/components/form/section.vue';
+import { computed, onMounted, ref, shallowRef, toRefs } from 'vue';
 import MkInput from '@/components/MkInput.vue';
 import MkSwitch from '@/components/MkSwitch.vue';
 import {
@@ -82,9 +82,12 @@ type EventType = {
 
 const emit = defineEmits<{
 	(ev: 'submitted', result: MkSystemWebhookResult): void;
+	(ev: 'canceled'): void;
 	(ev: 'closed'): void;
 }>();
 
+const dialogEl = shallowRef<InstanceType<typeof MkModalWindow>>();
+
 const props = defineProps<MkSystemWebhookEditorProps>();
 
 const { mode, id, requiredEvents } = toRefs(props);
@@ -133,12 +136,14 @@ async function onSubmitClicked() {
 			switch (mode.value) {
 				case 'create': {
 					const result = await misskeyApi('admin/system-webhook/create', params);
+					dialogEl.value?.close();
 					emit('submitted', result);
 					break;
 				}
 				case 'edit': {
 					// eslint-disable-next-line
 					const result = await misskeyApi('admin/system-webhook/update', { id: id.value!, ...params });
+					dialogEl.value?.close();
 					emit('submitted', result);
 					break;
 				}
@@ -147,13 +152,15 @@ async function onSubmitClicked() {
 		} catch (ex: any) {
 			const msg = ex.message ?? i18n.ts.internalServerErrorDescription;
 			await os.alert({ type: 'error', title: i18n.ts.error, text: msg });
-			emit('closed');
+			dialogEl.value?.close();
+			emit('canceled');
 		}
 	});
 }
 
 function onCancelClicked() {
-	emit('closed');
+	dialogEl.value?.close();
+	emit('canceled');
 }
 
 async function loadingScope<T>(fn: () => Promise<T>): Promise<T> {
@@ -183,11 +190,12 @@ onMounted(async () => {
 					for (const ev of Object.keys(events.value)) {
 						events.value[ev] = res.on.includes(ev as SystemWebhookEventType);
 					}
-					// eslint-disable-next-line
+					// eslint-disable-next-line @typescript-eslint/no-explicit-any
 				} catch (ex: any) {
 					const msg = ex.message ?? i18n.ts.internalServerErrorDescription;
 					await os.alert({ type: 'error', title: i18n.ts.error, text: msg });
-					emit('closed');
+					dialogEl.value?.close();
+					emit('canceled');
 				}
 				break;
 			}
diff --git a/packages/frontend/src/components/MkUserSelectDialog.vue b/packages/frontend/src/components/MkUserSelectDialog.vue
index cc3ea78ffe..cbb40924f6 100644
--- a/packages/frontend/src/components/MkUserSelectDialog.vue
+++ b/packages/frontend/src/components/MkUserSelectDialog.vue
@@ -61,7 +61,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, shallowRef } from 'vue';
 import * as Misskey from 'misskey-js';
 import MkInput from '@/components/MkInput.vue';
 import FormSplit from '@/components/form/split.vue';
@@ -91,7 +91,7 @@ const host = ref('');
 const users = ref<Misskey.entities.UserLite[]>([]);
 const recentUsers = ref<Misskey.entities.UserDetailed[]>([]);
 const selected = ref<Misskey.entities.UserLite | null>(null);
-const dialogEl = ref();
+const dialogEl = shallowRef<InstanceType<typeof MkModalWindow>>();
 
 function search() {
 	if (username.value === '' && host.value === '') {
@@ -122,7 +122,7 @@ async function ok() {
 	});
 	emit('ok', user);
 
-	dialogEl.value.close();
+	dialogEl.value?.close();
 
 	// 最近使ったユーザー更新
 	let recents = defaultStore.state.recentlyUsedUsers;
@@ -133,7 +133,7 @@ async function ok() {
 
 function cancel() {
 	emit('cancel');
-	dialogEl.value.close();
+	dialogEl.value?.close();
 }
 
 onMounted(() => {
diff --git a/packages/frontend/src/pages/admin/abuse-report/notification-recipient.editor.vue b/packages/frontend/src/pages/admin/abuse-report/notification-recipient.editor.vue
index ffe9c620d6..015109f54e 100644
--- a/packages/frontend/src/pages/admin/abuse-report/notification-recipient.editor.vue
+++ b/packages/frontend/src/pages/admin/abuse-report/notification-recipient.editor.vue
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <MkModalWindow
-	ref="dialog"
+	ref="dialogEl"
 	:width="400"
 	:height="490"
 	:withOkButton="false"
@@ -71,7 +71,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, ref, toRefs } from 'vue';
+import { computed, onMounted, ref, shallowRef, toRefs } from 'vue';
 import { entities } from 'misskey-js';
 import MkButton from '@/components/MkButton.vue';
 import MkModalWindow from '@/components/MkModalWindow.vue';
@@ -88,6 +88,7 @@ type NotificationRecipientMethod = 'email' | 'webhook';
 
 const emit = defineEmits<{
 	(ev: 'submitted'): void;
+	(ev: 'canceled'): void;
 	(ev: 'closed'): void;
 }>();
 
@@ -98,6 +99,8 @@ const props = defineProps<{
 
 const { mode, id } = toRefs(props);
 
+const dialogEl = shallowRef<InstanceType<typeof MkModalWindow>>();
+
 const loading = ref<number>(0);
 
 const title = ref<string>('');
@@ -166,18 +169,21 @@ async function onSubmitClicked() {
 				}
 			}
 
+			dialogEl.value?.close();
 			emit('submitted');
-			// eslint-disable-next-line
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		} catch (ex: any) {
 			const msg = ex.message ?? i18n.ts.internalServerErrorDescription;
 			await os.alert({ type: 'error', title: i18n.ts.error, text: msg });
-			emit('closed');
+			dialogEl.value?.close();
+			emit('canceled');
 		}
 	});
 }
 
 function onCancelClicked() {
-	emit('closed');
+	dialogEl.value?.close();
+	emit('canceled');
 }
 
 async function onEditSystemWebhookClicked() {
@@ -262,7 +268,8 @@ onMounted(async () => {
 			} catch (ex: any) {
 				const msg = ex.message ?? i18n.ts.internalServerErrorDescription;
 				await os.alert({ type: 'error', title: i18n.ts.error, text: msg });
-				emit('closed');
+				dialogEl.value?.close();
+				emit('canceled');
 			}
 		} else {
 			userId.value = moderators.value[0]?.id ?? null;
@@ -296,11 +303,13 @@ onMounted(async () => {
 	gap: 8px;
 
 	button {
-		width: 2.5em;
-		height: 2.5em;
-		min-width: 2.5em;
-		min-height: 2.5em;
+		min-width: 0;
+		min-height: 0;
+		width: 34px;
+		height: 34px;
+		flex-shrink: 0;
 		box-sizing: border-box;
+		margin: 1px 0;
 		padding: 6px;
 	}
 }
diff --git a/packages/frontend/src/pages/admin/abuse-report/notification-recipient.vue b/packages/frontend/src/pages/admin/abuse-report/notification-recipient.vue
index 93800873f9..f5249261be 100644
--- a/packages/frontend/src/pages/admin/abuse-report/notification-recipient.vue
+++ b/packages/frontend/src/pages/admin/abuse-report/notification-recipient.vue
@@ -108,26 +108,27 @@ async function onDeleteButtonClicked(id: string) {
 }
 
 async function showEditor(mode: 'create' | 'edit', id?: string) {
-	const { dispose, needLoad } = await new Promise<{ dispose: () => void, needLoad: boolean }>(async resolve => {
-		const { dispose: _dispose } = os.popup(
+	const { needLoad } = await new Promise<{ needLoad: boolean }>(async resolve => {
+		const { dispose } = os.popup(
 			defineAsyncComponent(() => import('./notification-recipient.editor.vue')),
 			{
 				mode,
 				id,
 			},
 			{
-				submitted: async () => {
-					resolve({ dispose: _dispose, needLoad: true });
+				submitted: () => {
+					resolve({ needLoad: true });
+				},
+				canceled: () => {
+					resolve({ needLoad: false });
 				},
 				closed: () => {
-					resolve({ dispose: _dispose, needLoad: false });
+					dispose();
 				},
 			},
 		);
 	});
 
-	dispose();
-
 	if (needLoad) {
 		await fetchRecipients();
 	}

From 02ecd1b3712cd6fe011a00cefec6ce3d1cc9db36 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 28 Jul 2024 10:36:12 +0900
Subject: [PATCH 102/221] refactor

---
 packages/frontend/src/components/MkModalWindow.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/components/MkModalWindow.vue b/packages/frontend/src/components/MkModalWindow.vue
index 78053c8cfd..9dcdf3dcfd 100644
--- a/packages/frontend/src/components/MkModalWindow.vue
+++ b/packages/frontend/src/components/MkModalWindow.vue
@@ -7,12 +7,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 <MkModal ref="modal" :preferType="'dialog'" @click="onBgClick" @closed="emit('closed')" @esc="emit('esc')">
 	<div ref="rootEl" :class="$style.root" :style="{ width: `${width}px`, height: `min(${height}px, 100%)` }">
 		<div ref="headerEl" :class="$style.header">
-			<button v-if="withOkButton" :class="$style.headerButton" class="_button" @click="$emit('close')"><i class="ti ti-x"></i></button>
+			<button v-if="withOkButton" :class="$style.headerButton" class="_button" @click="emit('close')"><i class="ti ti-x"></i></button>
 			<span :class="$style.title">
 				<slot name="header"></slot>
 			</span>
-			<button v-if="!withOkButton" :class="$style.headerButton" class="_button" data-cy-modal-window-close @click="$emit('close')"><i class="ti ti-x"></i></button>
-			<button v-if="withOkButton" :class="$style.headerButton" class="_button" :disabled="okButtonDisabled" @click="$emit('ok')"><i class="ti ti-check"></i></button>
+			<button v-if="!withOkButton" :class="$style.headerButton" class="_button" data-cy-modal-window-close @click="emit('close')"><i class="ti ti-x"></i></button>
+			<button v-if="withOkButton" :class="$style.headerButton" class="_button" :disabled="okButtonDisabled" @click="emit('ok')"><i class="ti ti-check"></i></button>
 		</div>
 		<div :class="$style.body">
 			<slot :width="bodyWidth" :height="bodyHeight"></slot>

From 5df85b8be140171c90057b6af4c8827f6e2a93bc Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 28 Jul 2024 10:39:31 +0900
Subject: [PATCH 103/221] enhance(frontend): add withCloseButton option for
 MkModalWindow

---
 packages/frontend/src/components/MkModalWindow.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/src/components/MkModalWindow.vue b/packages/frontend/src/components/MkModalWindow.vue
index 9dcdf3dcfd..c3c7812036 100644
--- a/packages/frontend/src/components/MkModalWindow.vue
+++ b/packages/frontend/src/components/MkModalWindow.vue
@@ -7,11 +7,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 <MkModal ref="modal" :preferType="'dialog'" @click="onBgClick" @closed="emit('closed')" @esc="emit('esc')">
 	<div ref="rootEl" :class="$style.root" :style="{ width: `${width}px`, height: `min(${height}px, 100%)` }">
 		<div ref="headerEl" :class="$style.header">
-			<button v-if="withOkButton" :class="$style.headerButton" class="_button" @click="emit('close')"><i class="ti ti-x"></i></button>
+			<button v-if="withOkButton && withCloseButton" :class="$style.headerButton" class="_button" @click="emit('close')"><i class="ti ti-x"></i></button>
 			<span :class="$style.title">
 				<slot name="header"></slot>
 			</span>
-			<button v-if="!withOkButton" :class="$style.headerButton" class="_button" data-cy-modal-window-close @click="emit('close')"><i class="ti ti-x"></i></button>
+			<button v-if="!withOkButton && withCloseButton" :class="$style.headerButton" class="_button" data-cy-modal-window-close @click="emit('close')"><i class="ti ti-x"></i></button>
 			<button v-if="withOkButton" :class="$style.headerButton" class="_button" :disabled="okButtonDisabled" @click="emit('ok')"><i class="ti ti-check"></i></button>
 		</div>
 		<div :class="$style.body">
@@ -27,11 +27,13 @@ import MkModal from './MkModal.vue';
 
 const props = withDefaults(defineProps<{
 	withOkButton: boolean;
+	withCloseButton: boolean;
 	okButtonDisabled: boolean;
 	width: number;
 	height: number;
 }>(), {
 	withOkButton: false,
+	withCloseButton: true,
 	okButtonDisabled: false,
 	width: 400,
 	height: 500,
@@ -51,13 +53,13 @@ const headerEl = shallowRef<HTMLElement>();
 const bodyWidth = ref(0);
 const bodyHeight = ref(0);
 
-const close = () => {
+function close() {
 	modal.value?.close();
-};
+}
 
-const onBgClick = () => {
+function onBgClick() {
 	emit('click');
-};
+}
 
 const ro = new ResizeObserver((entries, observer) => {
 	if (rootEl.value == null || headerEl.value == null) return;

From 085b3abf26d0a7f6de80746a6b3c935814b48836 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 28 Jul 2024 11:14:31 +0900
Subject: [PATCH 104/221] update deps (#14312)

---
 package.json                     |   26 +-
 packages/backend/package.json    |   44 +-
 packages/frontend/package.json   |   88 +-
 packages/misskey-js/package.json |   16 +-
 packages/sw/package.json         |    6 +-
 pnpm-lock.yaml                   | 5436 ++++++++++++++----------------
 6 files changed, 2557 insertions(+), 3059 deletions(-)

diff --git a/package.json b/package.json
index ecf2de39d3..8c04c6a806 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
 		"type": "git",
 		"url": "https://github.com/misskey-dev/misskey.git"
 	},
-	"packageManager": "pnpm@9.5.0",
+	"packageManager": "pnpm@9.6.0",
 	"workspaces": [
 		"packages/frontend",
 		"packages/backend",
@@ -51,24 +51,24 @@
 		"cssnano": "6.1.2",
 		"execa": "8.0.1",
 		"fast-glob": "3.3.2",
-		"ignore-walk": "6.0.4",
+		"ignore-walk": "6.0.5",
 		"js-yaml": "4.1.0",
-		"postcss": "8.4.38",
+		"postcss": "8.4.40",
 		"tar": "6.2.1",
-		"terser": "5.31.1",
-		"typescript": "5.5.3",
-		"esbuild": "0.22.0",
-		"glob": "10.3.12"
+		"terser": "5.31.3",
+		"typescript": "5.5.4",
+		"esbuild": "0.23.0",
+		"glob": "11.0.0"
 	},
 	"devDependencies": {
 		"@misskey-dev/eslint-plugin": "2.0.2",
-		"@types/node": "20.14.9",
-		"@typescript-eslint/eslint-plugin": "7.15.0",
-		"@typescript-eslint/parser": "7.15.0",
+		"@types/node": "20.14.12",
+		"@typescript-eslint/eslint-plugin": "7.17.0",
+		"@typescript-eslint/parser": "7.17.0",
 		"cross-env": "7.0.3",
-		"cypress": "13.13.0",
-		"eslint": "9.6.0",
-		"globals": "15.7.0",
+		"cypress": "13.13.1",
+		"eslint": "9.8.0",
+		"globals": "15.8.0",
 		"ncp": "2.0.0",
 		"start-server-and-test": "2.0.4"
 	},
diff --git a/packages/backend/package.json b/packages/backend/package.json
index b99717d15c..f497610af9 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -65,11 +65,11 @@
 		"utf-8-validate": "6.0.3"
 	},
 	"dependencies": {
-		"@aws-sdk/client-s3": "3.600.0",
-		"@aws-sdk/lib-storage": "3.600.0",
-		"@bull-board/api": "5.20.5",
-		"@bull-board/fastify": "5.20.5",
-		"@bull-board/ui": "5.20.5",
+		"@aws-sdk/client-s3": "3.620.0",
+		"@aws-sdk/lib-storage": "3.620.0",
+		"@bull-board/api": "5.21.1",
+		"@bull-board/fastify": "5.21.1",
+		"@bull-board/ui": "5.21.1",
 		"@discordapp/twemoji": "15.0.3",
 		"@fastify/accepts": "4.3.0",
 		"@fastify/cookie": "9.3.1",
@@ -86,22 +86,22 @@
 		"@nestjs/core": "10.3.10",
 		"@nestjs/testing": "10.3.10",
 		"@peertube/http-signature": "1.7.0",
-		"@sentry/node": "8.13.0",
-		"@sentry/profiling-node": "8.13.0",
-		"@simplewebauthn/server": "10.0.0",
+		"@sentry/node": "8.20.0",
+		"@sentry/profiling-node": "8.20.0",
+		"@simplewebauthn/server": "10.0.1",
 		"@sinonjs/fake-timers": "11.2.2",
 		"@smithy/node-http-handler": "2.5.0",
 		"@swc/cli": "0.3.12",
 		"@swc/core": "1.6.6",
 		"@twemoji/parser": "15.1.1",
 		"accepts": "1.3.8",
-		"ajv": "8.16.0",
+		"ajv": "8.17.1",
 		"archiver": "7.0.1",
 		"async-mutex": "0.5.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
 		"body-parser": "1.20.2",
-		"bullmq": "5.8.3",
+		"bullmq": "5.10.4",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "9.0.2",
 		"chalk": "5.3.0",
@@ -115,10 +115,10 @@
 		"fastify": "4.28.1",
 		"fastify-raw-body": "4.3.0",
 		"feed": "4.2.2",
-		"file-type": "19.0.0",
+		"file-type": "19.3.0",
 		"fluent-ffmpeg": "2.1.3",
 		"form-data": "4.0.0",
-		"got": "14.4.1",
+		"got": "14.4.2",
 		"happy-dom": "10.0.3",
 		"hpagent": "1.2.0",
 		"htmlescape": "1.1.1",
@@ -128,7 +128,7 @@
 		"ipaddr.js": "2.2.0",
 		"is-svg": "5.0.1",
 		"js-yaml": "4.1.0",
-		"jsdom": "24.1.0",
+		"jsdom": "24.1.1",
 		"json5": "2.2.3",
 		"jsonld": "8.3.2",
 		"jsrsasign": "11.1.0",
@@ -177,11 +177,11 @@
 		"tsc-alias": "1.8.10",
 		"tsconfig-paths": "4.2.0",
 		"typeorm": "0.3.20",
-		"typescript": "5.5.3",
+		"typescript": "5.5.4",
 		"ulid": "2.3.0",
 		"vary": "1.1.2",
 		"web-push": "3.6.7",
-		"ws": "8.17.1",
+		"ws": "8.18.0",
 		"xev": "3.0.2"
 	},
 	"devDependencies": {
@@ -201,11 +201,11 @@
 		"@types/jest": "29.5.12",
 		"@types/js-yaml": "4.0.9",
 		"@types/jsdom": "21.1.7",
-		"@types/jsonld": "1.5.14",
+		"@types/jsonld": "1.5.15",
 		"@types/jsrsasign": "10.5.14",
 		"@types/mime-types": "2.1.4",
 		"@types/ms": "0.7.34",
-		"@types/node": "20.14.9",
+		"@types/node": "20.14.12",
 		"@types/nodemailer": "6.4.15",
 		"@types/oauth": "0.9.5",
 		"@types/oauth2orize": "1.11.5",
@@ -225,18 +225,18 @@
 		"@types/tmp": "0.2.6",
 		"@types/vary": "1.1.3",
 		"@types/web-push": "3.6.3",
-		"@types/ws": "8.5.10",
-		"@typescript-eslint/eslint-plugin": "7.15.0",
-		"@typescript-eslint/parser": "7.15.0",
+		"@types/ws": "8.5.11",
+		"@typescript-eslint/eslint-plugin": "7.17.0",
+		"@typescript-eslint/parser": "7.17.0",
 		"aws-sdk-client-mock": "4.0.1",
 		"cross-env": "7.0.3",
 		"eslint-plugin-import": "2.29.1",
-		"execa": "9.2.0",
+		"execa": "9.3.0",
 		"fkill": "9.0.0",
 		"jest": "29.7.0",
 		"jest-mock": "29.7.0",
 		"nodemon": "3.1.4",
 		"pid-port": "1.0.0",
-		"simple-oauth2": "5.0.1"
+		"simple-oauth2": "5.1.0"
 	}
 }
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index fbeae08aa0..244d117de2 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -27,8 +27,8 @@
 		"@syuilo/aiscript": "0.19.0",
 		"@tabler/icons-webfont": "3.3.0",
 		"@twemoji/parser": "15.1.1",
-		"@vitejs/plugin-vue": "5.0.5",
-		"@vue/compiler-sfc": "3.4.31",
+		"@vitejs/plugin-vue": "5.1.0",
+		"@vue/compiler-sfc": "3.4.34",
 		"aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.1.11",
 		"astring": "1.8.6",
 		"broadcast-channel": "7.0.0",
@@ -39,9 +39,9 @@
 		"chartjs-chart-matrix": "2.0.1",
 		"chartjs-plugin-gradient": "0.6.1",
 		"chartjs-plugin-zoom": "2.0.1",
-		"chromatic": "11.5.4",
-		"compare-versions": "6.1.0",
-		"cropperjs": "2.0.0-beta.5",
+		"chromatic": "11.5.6",
+		"compare-versions": "6.1.1",
+		"cropperjs": "2.0.0-rc.1",
 		"date-fns": "2.30.0",
 		"escape-regexp": "0.0.1",
 		"estree-walker": "3.0.3",
@@ -57,85 +57,85 @@
 		"misskey-reversi": "workspace:*",
 		"photoswipe": "5.4.4",
 		"punycode": "2.3.1",
-		"rollup": "4.18.0",
+		"rollup": "4.19.1",
 		"sanitize-html": "2.13.0",
-		"sass": "1.77.6",
-		"shiki": "1.10.0",
+		"sass": "1.77.8",
+		"shiki": "1.12.0",
 		"strict-event-emitter-types": "2.0.0",
 		"textarea-caret": "3.1.0",
-		"three": "0.165.0",
+		"three": "0.167.0",
 		"throttle-debounce": "5.0.2",
 		"tinycolor2": "1.6.0",
 		"tsc-alias": "1.8.10",
 		"tsconfig-paths": "4.2.0",
-		"typescript": "5.5.3",
+		"typescript": "5.5.4",
 		"uuid": "10.0.0",
 		"v-code-diff": "1.12.0",
-		"vite": "5.3.2",
-		"vue": "3.4.31",
+		"vite": "5.3.5",
+		"vue": "3.4.34",
 		"vuedraggable": "next"
 	},
 	"devDependencies": {
 		"@misskey-dev/summaly": "5.1.0",
-		"@storybook/addon-actions": "8.1.11",
-		"@storybook/addon-essentials": "8.1.11",
-		"@storybook/addon-interactions": "8.1.11",
-		"@storybook/addon-links": "8.1.11",
-		"@storybook/addon-mdx-gfm": "8.1.11",
-		"@storybook/addon-storysource": "8.1.11",
-		"@storybook/blocks": "8.1.11",
-		"@storybook/components": "8.1.11",
-		"@storybook/core-events": "8.1.11",
-		"@storybook/manager-api": "8.1.11",
-		"@storybook/preview-api": "8.1.11",
-		"@storybook/react": "8.1.11",
-		"@storybook/react-vite": "8.1.11",
-		"@storybook/test": "8.1.11",
-		"@storybook/theming": "8.1.11",
-		"@storybook/types": "8.1.11",
-		"@storybook/vue3": "8.1.11",
+		"@storybook/addon-actions": "8.2.6",
+		"@storybook/addon-essentials": "8.2.6",
+		"@storybook/addon-interactions": "8.2.6",
+		"@storybook/addon-links": "8.2.6",
+		"@storybook/addon-mdx-gfm": "8.2.6",
+		"@storybook/addon-storysource": "8.2.6",
+		"@storybook/blocks": "8.2.6",
+		"@storybook/components": "8.2.6",
+		"@storybook/core-events": "8.2.6",
+		"@storybook/manager-api": "8.2.6",
+		"@storybook/preview-api": "8.2.6",
+		"@storybook/react": "8.2.6",
+		"@storybook/react-vite": "8.2.6",
+		"@storybook/test": "8.2.6",
+		"@storybook/theming": "8.2.6",
+		"@storybook/types": "8.2.6",
+		"@storybook/vue3": "8.2.6",
 		"@storybook/vue3-vite": "8.1.11",
 		"@testing-library/vue": "8.1.0",
 		"@types/escape-regexp": "0.0.3",
 		"@types/estree": "1.0.5",
-		"@types/matter-js": "0.19.6",
+		"@types/matter-js": "0.19.7",
 		"@types/micromatch": "4.0.9",
-		"@types/node": "20.14.9",
+		"@types/node": "20.14.12",
 		"@types/punycode": "2.1.4",
 		"@types/sanitize-html": "2.11.0",
 		"@types/seedrandom": "3.0.8",
 		"@types/throttle-debounce": "5.0.2",
 		"@types/tinycolor2": "1.4.6",
 		"@types/uuid": "10.0.0",
-		"@types/ws": "8.5.10",
-		"@typescript-eslint/eslint-plugin": "7.15.0",
-		"@typescript-eslint/parser": "7.15.0",
+		"@types/ws": "8.5.11",
+		"@typescript-eslint/eslint-plugin": "7.17.0",
+		"@typescript-eslint/parser": "7.17.0",
 		"@vitest/coverage-v8": "1.6.0",
-		"@vue/runtime-core": "3.4.31",
-		"acorn": "8.12.0",
+		"@vue/runtime-core": "3.4.34",
+		"acorn": "8.12.1",
 		"cross-env": "7.0.3",
-		"cypress": "13.13.0",
+		"cypress": "13.13.1",
 		"eslint-plugin-import": "2.29.1",
-		"eslint-plugin-vue": "9.26.0",
+		"eslint-plugin-vue": "9.27.0",
 		"fast-glob": "3.3.2",
 		"happy-dom": "10.0.3",
 		"intersection-observer": "0.12.2",
 		"micromatch": "4.0.7",
-		"msw": "2.3.1",
-		"msw-storybook-addon": "2.0.2",
+		"msw": "2.3.4",
+		"msw-storybook-addon": "2.0.3",
 		"nodemon": "3.1.4",
-		"prettier": "3.3.2",
+		"prettier": "3.3.3",
 		"react": "18.3.1",
 		"react-dom": "18.3.1",
 		"seedrandom": "3.0.5",
 		"start-server-and-test": "2.0.4",
-		"storybook": "8.1.11",
+		"storybook": "8.2.6",
 		"storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme",
 		"vite-plugin-turbosnap": "1.0.3",
 		"vitest": "1.6.0",
 		"vitest-fetch-mock": "0.2.2",
-		"vue-component-type-helpers": "2.0.24",
+		"vue-component-type-helpers": "2.0.29",
 		"vue-eslint-parser": "9.4.3",
-		"vue-tsc": "2.0.24"
+		"vue-tsc": "2.0.29"
 	}
 }
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index aa2e0e781b..a047e50063 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -35,23 +35,23 @@
 		"directory": "packages/misskey-js"
 	},
 	"devDependencies": {
-		"@microsoft/api-extractor": "7.47.0",
+		"@microsoft/api-extractor": "7.47.4",
 		"@swc/jest": "0.2.36",
 		"@types/jest": "29.5.12",
-		"@types/node": "20.14.9",
-		"@typescript-eslint/eslint-plugin": "7.15.0",
-		"@typescript-eslint/parser": "7.15.0",
+		"@types/node": "20.14.12",
+		"@typescript-eslint/eslint-plugin": "7.17.0",
+		"@typescript-eslint/parser": "7.17.0",
 		"jest": "29.7.0",
 		"jest-fetch-mock": "3.0.3",
 		"jest-websocket-mock": "2.5.0",
 		"mock-socket": "9.3.1",
 		"ncp": "2.0.0",
 		"nodemon": "3.1.4",
-		"execa": "9.2.0",
+		"execa": "9.3.0",
 		"tsd": "0.31.1",
-		"typescript": "5.5.3",
-		"esbuild": "0.22.0",
-		"glob": "10.4.2"
+		"typescript": "5.5.4",
+		"esbuild": "0.23.0",
+		"glob": "11.0.0"
 	},
 	"files": [
 		"built"
diff --git a/packages/sw/package.json b/packages/sw/package.json
index bcd642ffc4..9174f50ae3 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -9,16 +9,16 @@
 		"lint": "pnpm typecheck && pnpm eslint"
 	},
 	"dependencies": {
-		"esbuild": "0.22.0",
+		"esbuild": "0.23.0",
 		"idb-keyval": "6.2.1",
 		"misskey-js": "workspace:*"
 	},
 	"devDependencies": {
-		"@typescript-eslint/parser": "7.15.0",
+		"@typescript-eslint/parser": "7.17.0",
 		"@typescript/lib-webworker": "npm:@types/serviceworker@0.0.67",
 		"eslint-plugin-import": "2.29.1",
 		"nodemon": "3.1.4",
-		"typescript": "5.5.3"
+		"typescript": "5.5.4"
 	},
 	"type": "module"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7d3fec8596..eb8047cde5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -14,10 +14,10 @@ importers:
     dependencies:
       cssnano:
         specifier: 6.1.2
-        version: 6.1.2(postcss@8.4.38)
+        version: 6.1.2(postcss@8.4.40)
       esbuild:
-        specifier: 0.22.0
-        version: 0.22.0
+        specifier: 0.23.0
+        version: 0.23.0
       execa:
         specifier: 8.0.1
         version: 8.0.1
@@ -25,55 +25,55 @@ importers:
         specifier: 3.3.2
         version: 3.3.2
       glob:
-        specifier: 10.3.12
-        version: 10.3.12
+        specifier: 11.0.0
+        version: 11.0.0
       ignore-walk:
-        specifier: 6.0.4
-        version: 6.0.4
+        specifier: 6.0.5
+        version: 6.0.5
       js-yaml:
         specifier: 4.1.0
         version: 4.1.0
       postcss:
-        specifier: 8.4.38
-        version: 8.4.38
+        specifier: 8.4.40
+        version: 8.4.40
       tar:
         specifier: 6.2.1
         version: 6.2.1
       terser:
-        specifier: 5.31.1
-        version: 5.31.1
+        specifier: 5.31.3
+        version: 5.31.3
       typescript:
-        specifier: 5.5.3
-        version: 5.5.3
+        specifier: 5.5.4
+        version: 5.5.4
     optionalDependencies:
       '@tensorflow/tfjs-core':
         specifier: 4.4.0
-        version: 4.20.0(encoding@0.1.13)
+        version: 4.4.0(encoding@0.1.13)
     devDependencies:
       '@misskey-dev/eslint-plugin':
         specifier: 2.0.2
-        version: 2.0.2(@eslint/compat@1.1.1)(@typescript-eslint/eslint-plugin@7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3))(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0))(eslint@9.6.0)(globals@15.7.0)
+        version: 2.0.2(@eslint/compat@1.1.1)(@typescript-eslint/eslint-plugin@7.17.0(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0)(typescript@5.5.4))(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0))(eslint@9.8.0)(globals@15.8.0)
       '@types/node':
-        specifier: 20.14.9
-        version: 20.14.9
+        specifier: 20.14.12
+        version: 20.14.12
       '@typescript-eslint/eslint-plugin':
-        specifier: 7.15.0
-        version: 7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3)
+        specifier: 7.17.0
+        version: 7.17.0(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0)(typescript@5.5.4)
       '@typescript-eslint/parser':
-        specifier: 7.15.0
-        version: 7.15.0(eslint@9.6.0)(typescript@5.5.3)
+        specifier: 7.17.0
+        version: 7.17.0(eslint@9.8.0)(typescript@5.5.4)
       cross-env:
         specifier: 7.0.3
         version: 7.0.3
       cypress:
-        specifier: 13.13.0
-        version: 13.13.0
+        specifier: 13.13.1
+        version: 13.13.1
       eslint:
-        specifier: 9.6.0
-        version: 9.6.0
+        specifier: 9.8.0
+        version: 9.8.0
       globals:
-        specifier: 15.7.0
-        version: 15.7.0
+        specifier: 15.8.0
+        version: 15.8.0
       ncp:
         specifier: 2.0.0
         version: 2.0.0
@@ -84,20 +84,20 @@ importers:
   packages/backend:
     dependencies:
       '@aws-sdk/client-s3':
-        specifier: 3.600.0
-        version: 3.600.0
+        specifier: 3.620.0
+        version: 3.620.0
       '@aws-sdk/lib-storage':
-        specifier: 3.600.0
-        version: 3.600.0(@aws-sdk/client-s3@3.600.0)
+        specifier: 3.620.0
+        version: 3.620.0(@aws-sdk/client-s3@3.620.0)
       '@bull-board/api':
-        specifier: 5.20.5
-        version: 5.20.5(@bull-board/ui@5.20.5)
+        specifier: 5.21.1
+        version: 5.21.1(@bull-board/ui@5.21.1)
       '@bull-board/fastify':
-        specifier: 5.20.5
-        version: 5.20.5
+        specifier: 5.21.1
+        version: 5.21.1
       '@bull-board/ui':
-        specifier: 5.20.5
-        version: 5.20.5
+        specifier: 5.21.1
+        version: 5.21.1
       '@discordapp/twemoji':
         specifier: 15.0.3
         version: 15.0.3
@@ -115,7 +115,7 @@ importers:
         version: 3.0.0
       '@fastify/http-proxy':
         specifier: 9.5.0
-        version: 9.5.0(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+        version: 9.5.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
       '@fastify/multipart':
         specifier: 8.3.0
         version: 8.3.0
@@ -147,14 +147,14 @@ importers:
         specifier: 1.7.0
         version: 1.7.0
       '@sentry/node':
-        specifier: 8.13.0
-        version: 8.13.0
+        specifier: 8.20.0
+        version: 8.20.0
       '@sentry/profiling-node':
-        specifier: 8.13.0
-        version: 8.13.0
+        specifier: 8.20.0
+        version: 8.20.0
       '@simplewebauthn/server':
-        specifier: 10.0.0
-        version: 10.0.0(encoding@0.1.13)
+        specifier: 10.0.1
+        version: 10.0.1(encoding@0.1.13)
       '@sinonjs/fake-timers':
         specifier: 11.2.2
         version: 11.2.2
@@ -174,8 +174,8 @@ importers:
         specifier: 1.3.8
         version: 1.3.8
       ajv:
-        specifier: 8.16.0
-        version: 8.16.0
+        specifier: 8.17.1
+        version: 8.17.1
       archiver:
         specifier: 7.0.1
         version: 7.0.1
@@ -192,8 +192,8 @@ importers:
         specifier: 1.20.2
         version: 1.20.2
       bullmq:
-        specifier: 5.8.3
-        version: 5.8.3
+        specifier: 5.10.4
+        version: 5.10.4
       cacheable-lookup:
         specifier: 7.0.0
         version: 7.0.0
@@ -234,8 +234,8 @@ importers:
         specifier: 4.2.2
         version: 4.2.2
       file-type:
-        specifier: 19.0.0
-        version: 19.0.0
+        specifier: 19.3.0
+        version: 19.3.0
       fluent-ffmpeg:
         specifier: 2.1.3
         version: 2.1.3
@@ -243,8 +243,8 @@ importers:
         specifier: 4.0.0
         version: 4.0.0
       got:
-        specifier: 14.4.1
-        version: 14.4.1
+        specifier: 14.4.2
+        version: 14.4.2
       happy-dom:
         specifier: 10.0.3
         version: 10.0.3
@@ -273,8 +273,8 @@ importers:
         specifier: 4.1.0
         version: 4.1.0
       jsdom:
-        specifier: 24.1.0
-        version: 24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+        specifier: 24.1.1
+        version: 24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3)
       json5:
         specifier: 2.2.3
         version: 2.2.3
@@ -319,7 +319,7 @@ importers:
         version: 6.9.14
       nsfwjs:
         specifier: 2.4.2
-        version: 2.4.2(@tensorflow/tfjs@4.20.0(encoding@0.1.13)(seedrandom@3.0.5))
+        version: 2.4.2(@tensorflow/tfjs@4.4.0(encoding@0.1.13)(seedrandom@3.0.5))
       oauth:
         specifier: 0.10.0
         version: 0.10.0
@@ -420,8 +420,8 @@ importers:
         specifier: 0.3.20
         version: 0.3.20(ioredis@5.4.1)(pg@8.12.0)
       typescript:
-        specifier: 5.5.3
-        version: 5.5.3
+        specifier: 5.5.4
+        version: 5.5.4
       ulid:
         specifier: 2.3.0
         version: 2.3.0
@@ -432,8 +432,8 @@ importers:
         specifier: 3.6.7
         version: 3.6.7
       ws:
-        specifier: 8.17.1
-        version: 8.17.1(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+        specifier: 8.18.0
+        version: 8.18.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
       xev:
         specifier: 3.0.2
         version: 3.0.2
@@ -443,46 +443,46 @@ importers:
         version: 1.3.11
       '@swc/core-darwin-arm64':
         specifier: 1.3.56
-        version: 1.7.0-nightly-20240715.2
+        version: 1.3.56
       '@swc/core-darwin-x64':
         specifier: 1.3.56
-        version: 1.7.0-nightly-20240715.2
+        version: 1.3.56
       '@swc/core-freebsd-x64':
         specifier: 1.3.11
         version: 1.3.11
       '@swc/core-linux-arm-gnueabihf':
         specifier: 1.3.56
-        version: 1.7.0-nightly-20240715.2
+        version: 1.3.56
       '@swc/core-linux-arm64-gnu':
         specifier: 1.3.56
-        version: 1.7.0-nightly-20240715.2
+        version: 1.3.56
       '@swc/core-linux-arm64-musl':
         specifier: 1.3.56
-        version: 1.7.0-nightly-20240715.2
+        version: 1.3.56
       '@swc/core-linux-x64-gnu':
         specifier: 1.3.56
-        version: 1.7.0-nightly-20240715.2
+        version: 1.3.56
       '@swc/core-linux-x64-musl':
         specifier: 1.3.56
-        version: 1.7.0-nightly-20240715.2
+        version: 1.3.56
       '@swc/core-win32-arm64-msvc':
         specifier: 1.3.56
-        version: 1.7.0-nightly-20240715.2
+        version: 1.3.56
       '@swc/core-win32-ia32-msvc':
         specifier: 1.3.56
-        version: 1.7.0-nightly-20240715.2
+        version: 1.3.56
       '@swc/core-win32-x64-msvc':
         specifier: 1.3.56
-        version: 1.7.0-nightly-20240715.2
+        version: 1.3.56
       '@tensorflow/tfjs':
         specifier: 4.4.0
-        version: 4.20.0(encoding@0.1.13)(seedrandom@3.0.5)
+        version: 4.4.0(encoding@0.1.13)(seedrandom@3.0.5)
       '@tensorflow/tfjs-node':
         specifier: 4.4.0
-        version: 4.20.0(encoding@0.1.13)(seedrandom@3.0.5)
+        version: 4.4.0(encoding@0.1.13)(seedrandom@3.0.5)
       bufferutil:
         specifier: 4.0.7
-        version: 4.0.8
+        version: 4.0.7
       slacc-android-arm-eabi:
         specifier: 0.0.10
         version: 0.0.10
@@ -524,7 +524,7 @@ importers:
         version: 0.0.10
       utf-8-validate:
         specifier: 6.0.3
-        version: 6.0.4
+        version: 6.0.3
     devDependencies:
       '@jest/globals':
         specifier: 29.7.0
@@ -575,8 +575,8 @@ importers:
         specifier: 21.1.7
         version: 21.1.7
       '@types/jsonld':
-        specifier: 1.5.14
-        version: 1.5.14
+        specifier: 1.5.15
+        version: 1.5.15
       '@types/jsrsasign':
         specifier: 10.5.14
         version: 10.5.14
@@ -587,8 +587,8 @@ importers:
         specifier: 0.7.34
         version: 0.7.34
       '@types/node':
-        specifier: 20.14.9
-        version: 20.14.9
+        specifier: 20.14.12
+        version: 20.14.12
       '@types/nodemailer':
         specifier: 6.4.15
         version: 6.4.15
@@ -647,14 +647,14 @@ importers:
         specifier: 3.6.3
         version: 3.6.3
       '@types/ws':
-        specifier: 8.5.10
-        version: 8.5.10
+        specifier: 8.5.11
+        version: 8.5.11
       '@typescript-eslint/eslint-plugin':
-        specifier: 7.15.0
-        version: 7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint@9.7.0)(typescript@5.5.3)
+        specifier: 7.17.0
+        version: 7.17.0(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0)(typescript@5.5.4)
       '@typescript-eslint/parser':
-        specifier: 7.15.0
-        version: 7.15.0(eslint@9.7.0)(typescript@5.5.3)
+        specifier: 7.17.0
+        version: 7.17.0(eslint@9.8.0)(typescript@5.5.4)
       aws-sdk-client-mock:
         specifier: 4.0.1
         version: 4.0.1
@@ -663,16 +663,16 @@ importers:
         version: 7.0.3
       eslint-plugin-import:
         specifier: 2.29.1
-        version: 2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint@9.7.0)
+        version: 2.29.1(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0)
       execa:
-        specifier: 9.2.0
-        version: 9.2.0
+        specifier: 9.3.0
+        version: 9.3.0
       fkill:
         specifier: 9.0.0
         version: 9.0.0
       jest:
         specifier: 29.7.0
-        version: 29.7.0(@types/node@20.14.9)
+        version: 29.7.0(@types/node@20.14.12)
       jest-mock:
         specifier: 29.7.0
         version: 29.7.0
@@ -683,8 +683,8 @@ importers:
         specifier: 1.0.0
         version: 1.0.0
       simple-oauth2:
-        specifier: 5.0.1
-        version: 5.0.1
+        specifier: 5.1.0
+        version: 5.1.0
 
   packages/frontend:
     dependencies:
@@ -702,13 +702,13 @@ importers:
         version: 2024.1.0
       '@rollup/plugin-json':
         specifier: 6.1.0
-        version: 6.1.0(rollup@4.18.0)
+        version: 6.1.0(rollup@4.19.1)
       '@rollup/plugin-replace':
         specifier: 5.0.7
-        version: 5.0.7(rollup@4.18.0)
+        version: 5.0.7(rollup@4.19.1)
       '@rollup/pluginutils':
         specifier: 5.1.0
-        version: 5.1.0(rollup@4.18.0)
+        version: 5.1.0(rollup@4.19.1)
       '@syuilo/aiscript':
         specifier: 0.19.0
         version: 0.19.0
@@ -719,11 +719,11 @@ importers:
         specifier: 15.1.1
         version: 15.1.1
       '@vitejs/plugin-vue':
-        specifier: 5.0.5
-        version: 5.0.5(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))(vue@3.4.31(typescript@5.5.3))
+        specifier: 5.1.0
+        version: 5.1.0(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))(vue@3.4.34(typescript@5.5.4))
       '@vue/compiler-sfc':
-        specifier: 3.4.31
-        version: 3.4.31
+        specifier: 3.4.34
+        version: 3.4.34
       aiscript-vscode:
         specifier: github:aiscript-dev/aiscript-vscode#v0.1.11
         version: https://codeload.github.com/aiscript-dev/aiscript-vscode/tar.gz/e1e1b27f2f72cd28a473e004b6da0d8fc0bd40d9
@@ -755,14 +755,14 @@ importers:
         specifier: 2.0.1
         version: 2.0.1(chart.js@4.4.3)
       chromatic:
-        specifier: 11.5.4
-        version: 11.5.4
+        specifier: 11.5.6
+        version: 11.5.6
       compare-versions:
-        specifier: 6.1.0
-        version: 6.1.0
+        specifier: 6.1.1
+        version: 6.1.1
       cropperjs:
-        specifier: 2.0.0-beta.5
-        version: 2.0.0-beta.5
+        specifier: 2.0.0-rc.1
+        version: 2.0.0-rc.1
       date-fns:
         specifier: 2.30.0
         version: 2.30.0
@@ -809,17 +809,17 @@ importers:
         specifier: 2.3.1
         version: 2.3.1
       rollup:
-        specifier: 4.18.0
-        version: 4.18.0
+        specifier: 4.19.1
+        version: 4.19.1
       sanitize-html:
         specifier: 2.13.0
         version: 2.13.0
       sass:
-        specifier: 1.77.6
-        version: 1.77.6
+        specifier: 1.77.8
+        version: 1.77.8
       shiki:
-        specifier: 1.10.0
-        version: 1.10.0
+        specifier: 1.12.0
+        version: 1.12.0
       strict-event-emitter-types:
         specifier: 2.0.0
         version: 2.0.0
@@ -827,8 +827,8 @@ importers:
         specifier: 3.1.0
         version: 3.1.0
       three:
-        specifier: 0.165.0
-        version: 0.165.0
+        specifier: 0.167.0
+        version: 0.167.0
       throttle-debounce:
         specifier: 5.0.2
         version: 5.0.2
@@ -842,84 +842,84 @@ importers:
         specifier: 4.2.0
         version: 4.2.0
       typescript:
-        specifier: 5.5.3
-        version: 5.5.3
+        specifier: 5.5.4
+        version: 5.5.4
       uuid:
         specifier: 10.0.0
         version: 10.0.0
       v-code-diff:
         specifier: 1.12.0
-        version: 1.12.0(vue@3.4.31(typescript@5.5.3))
+        version: 1.12.0(vue@3.4.34(typescript@5.5.4))
       vite:
-        specifier: 5.3.2
-        version: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2)
+        specifier: 5.3.5
+        version: 5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3)
       vue:
-        specifier: 3.4.31
-        version: 3.4.31(typescript@5.5.3)
+        specifier: 3.4.34
+        version: 3.4.34(typescript@5.5.4)
       vuedraggable:
         specifier: next
-        version: 4.1.0(vue@3.4.31(typescript@5.5.3))
+        version: 4.1.0(vue@3.4.34(typescript@5.5.4))
     devDependencies:
       '@misskey-dev/summaly':
         specifier: 5.1.0
         version: 5.1.0
       '@storybook/addon-actions':
-        specifier: 8.1.11
-        version: 8.1.11
+        specifier: 8.2.6
+        version: 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@storybook/addon-essentials':
-        specifier: 8.1.11
-        version: 8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: 8.2.6
+        version: 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@storybook/addon-interactions':
-        specifier: 8.1.11
-        version: 8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))
+        specifier: 8.2.6
+        version: 8.2.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12))(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3))
       '@storybook/addon-links':
-        specifier: 8.1.11
-        version: 8.1.11(react@18.3.1)
+        specifier: 8.2.6
+        version: 8.2.6(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@storybook/addon-mdx-gfm':
-        specifier: 8.1.11
-        version: 8.1.11
+        specifier: 8.2.6
+        version: 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@storybook/addon-storysource':
-        specifier: 8.1.11
-        version: 8.1.11
+        specifier: 8.2.6
+        version: 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@storybook/blocks':
-        specifier: 8.1.11
-        version: 8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: 8.2.6
+        version: 8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@storybook/components':
-        specifier: 8.1.11
-        version: 8.1.11(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: 8.2.6
+        version: 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@storybook/core-events':
-        specifier: 8.1.11
-        version: 8.1.11
+        specifier: 8.2.6
+        version: 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@storybook/manager-api':
-        specifier: 8.1.11
-        version: 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: 8.2.6
+        version: 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@storybook/preview-api':
-        specifier: 8.1.11
-        version: 8.1.11
+        specifier: 8.2.6
+        version: 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@storybook/react':
-        specifier: 8.1.11
-        version: 8.1.11(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.3)
+        specifier: 8.2.6
+        version: 8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))(typescript@5.5.4)
       '@storybook/react-vite':
-        specifier: 8.1.11
-        version: 8.1.11(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.18.0)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))
+        specifier: 8.2.6
+        version: 8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.19.1)(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))(typescript@5.5.4)(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))
       '@storybook/test':
-        specifier: 8.1.11
-        version: 8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))
+        specifier: 8.2.6
+        version: 8.2.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12))(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3))
       '@storybook/theming':
-        specifier: 8.1.11
-        version: 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: 8.2.6
+        version: 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@storybook/types':
-        specifier: 8.1.11
-        version: 8.1.11
+        specifier: 8.2.6
+        version: 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@storybook/vue3':
-        specifier: 8.1.11
-        version: 8.1.11(encoding@0.1.13)(prettier@3.3.2)(vue@3.4.31(typescript@5.5.3))
+        specifier: 8.2.6
+        version: 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))(vue@3.4.34(typescript@5.5.4))
       '@storybook/vue3-vite':
         specifier: 8.1.11
-        version: 8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))(vue@3.4.31(typescript@5.5.3))
+        version: 8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))(vue@3.4.34(typescript@5.5.4))
       '@testing-library/vue':
         specifier: 8.1.0
-        version: 8.1.0(@vue/compiler-sfc@3.4.31)(@vue/server-renderer@3.4.31(vue@3.4.31(typescript@5.5.3)))(vue@3.4.31(typescript@5.5.3))
+        version: 8.1.0(@vue/compiler-sfc@3.4.34)(@vue/server-renderer@3.4.34(vue@3.4.34(typescript@5.5.4)))(vue@3.4.34(typescript@5.5.4))
       '@types/escape-regexp':
         specifier: 0.0.3
         version: 0.0.3
@@ -927,14 +927,14 @@ importers:
         specifier: 1.0.5
         version: 1.0.5
       '@types/matter-js':
-        specifier: 0.19.6
-        version: 0.19.6
+        specifier: 0.19.7
+        version: 0.19.7
       '@types/micromatch':
         specifier: 4.0.9
         version: 4.0.9
       '@types/node':
-        specifier: 20.14.9
-        version: 20.14.9
+        specifier: 20.14.12
+        version: 20.14.12
       '@types/punycode':
         specifier: 2.1.4
         version: 2.1.4
@@ -954,35 +954,35 @@ importers:
         specifier: 10.0.0
         version: 10.0.0
       '@types/ws':
-        specifier: 8.5.10
-        version: 8.5.10
+        specifier: 8.5.11
+        version: 8.5.11
       '@typescript-eslint/eslint-plugin':
-        specifier: 7.15.0
-        version: 7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint@9.7.0)(typescript@5.5.3)
+        specifier: 7.17.0
+        version: 7.17.0(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0)(typescript@5.5.4)
       '@typescript-eslint/parser':
-        specifier: 7.15.0
-        version: 7.15.0(eslint@9.7.0)(typescript@5.5.3)
+        specifier: 7.17.0
+        version: 7.17.0(eslint@9.8.0)(typescript@5.5.4)
       '@vitest/coverage-v8':
         specifier: 1.6.0
-        version: 1.6.0(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))
+        version: 1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3))
       '@vue/runtime-core':
-        specifier: 3.4.31
-        version: 3.4.31
+        specifier: 3.4.34
+        version: 3.4.34
       acorn:
-        specifier: 8.12.0
-        version: 8.12.0
+        specifier: 8.12.1
+        version: 8.12.1
       cross-env:
         specifier: 7.0.3
         version: 7.0.3
       cypress:
-        specifier: 13.13.0
-        version: 13.13.0
+        specifier: 13.13.1
+        version: 13.13.1
       eslint-plugin-import:
         specifier: 2.29.1
-        version: 2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint@9.7.0)
+        version: 2.29.1(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0)
       eslint-plugin-vue:
-        specifier: 9.26.0
-        version: 9.26.0(eslint@9.7.0)
+        specifier: 9.27.0
+        version: 9.27.0(eslint@9.8.0)
       fast-glob:
         specifier: 3.3.2
         version: 3.3.2
@@ -996,17 +996,17 @@ importers:
         specifier: 4.0.7
         version: 4.0.7
       msw:
-        specifier: 2.3.1
-        version: 2.3.1(typescript@5.5.3)
+        specifier: 2.3.4
+        version: 2.3.4(typescript@5.5.4)
       msw-storybook-addon:
-        specifier: 2.0.2
-        version: 2.0.2(msw@2.3.1(typescript@5.5.3))
+        specifier: 2.0.3
+        version: 2.0.3(msw@2.3.4(typescript@5.5.4))
       nodemon:
         specifier: 3.1.4
         version: 3.1.4
       prettier:
-        specifier: 3.3.2
-        version: 3.3.2
+        specifier: 3.3.3
+        version: 3.3.3
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -1020,29 +1020,29 @@ importers:
         specifier: 2.0.4
         version: 2.0.4
       storybook:
-        specifier: 8.1.11
-        version: 8.1.11(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)
+        specifier: 8.2.6
+        version: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       storybook-addon-misskey-theme:
         specifier: github:misskey-dev/storybook-addon-misskey-theme
-        version: https://codeload.github.com/misskey-dev/storybook-addon-misskey-theme/tar.gz/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/components@8.1.11(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/core-events@8.1.11)(@storybook/manager-api@8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/preview-api@8.1.11)(@storybook/theming@8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/types@8.1.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: https://codeload.github.com/misskey-dev/storybook-addon-misskey-theme/tar.gz/cf583db098365b2ccc81a82f63ca9c93bc32b640(3rvqj7p7l43ansgshs3zbslm7u)
       vite-plugin-turbosnap:
         specifier: 1.0.3
         version: 1.0.3
       vitest:
         specifier: 1.6.0
-        version: 1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2)
+        version: 1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3)
       vitest-fetch-mock:
         specifier: 0.2.2
-        version: 0.2.2(encoding@0.1.13)(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))
+        version: 0.2.2(encoding@0.1.13)(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3))
       vue-component-type-helpers:
-        specifier: 2.0.24
-        version: 2.0.24
+        specifier: 2.0.29
+        version: 2.0.29
       vue-eslint-parser:
         specifier: 9.4.3
-        version: 9.4.3(eslint@9.7.0)
+        version: 9.4.3(eslint@9.8.0)
       vue-tsc:
-        specifier: 2.0.24
-        version: 2.0.24(typescript@5.5.3)
+        specifier: 2.0.29
+        version: 2.0.29(typescript@5.5.4)
 
   packages/misskey-bubble-game:
     dependencies:
@@ -1067,10 +1067,10 @@ importers:
         version: 3.0.8
       '@typescript-eslint/eslint-plugin':
         specifier: 7.1.0
-        version: 7.1.0(@typescript-eslint/parser@7.1.0(eslint@9.7.0)(typescript@5.3.3))(eslint@9.7.0)(typescript@5.3.3)
+        version: 7.1.0(@typescript-eslint/parser@7.1.0(eslint@9.8.0)(typescript@5.3.3))(eslint@9.8.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
         specifier: 7.1.0
-        version: 7.1.0(eslint@9.7.0)(typescript@5.3.3)
+        version: 7.1.0(eslint@9.8.0)(typescript@5.3.3)
       esbuild:
         specifier: 0.19.11
         version: 0.19.11
@@ -1097,8 +1097,8 @@ importers:
         version: 4.4.0
     devDependencies:
       '@microsoft/api-extractor':
-        specifier: 7.47.0
-        version: 7.47.0(@types/node@20.14.9)
+        specifier: 7.47.4
+        version: 7.47.4(@types/node@20.14.12)
       '@swc/jest':
         specifier: 0.2.36
         version: 0.2.36(@swc/core@1.6.13)
@@ -1106,26 +1106,26 @@ importers:
         specifier: 29.5.12
         version: 29.5.12
       '@types/node':
-        specifier: 20.14.9
-        version: 20.14.9
+        specifier: 20.14.12
+        version: 20.14.12
       '@typescript-eslint/eslint-plugin':
-        specifier: 7.15.0
-        version: 7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint@9.7.0)(typescript@5.5.3)
+        specifier: 7.17.0
+        version: 7.17.0(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0)(typescript@5.5.4)
       '@typescript-eslint/parser':
-        specifier: 7.15.0
-        version: 7.15.0(eslint@9.7.0)(typescript@5.5.3)
+        specifier: 7.17.0
+        version: 7.17.0(eslint@9.8.0)(typescript@5.5.4)
       esbuild:
-        specifier: 0.22.0
-        version: 0.22.0
+        specifier: 0.23.0
+        version: 0.23.0
       execa:
-        specifier: 9.2.0
-        version: 9.2.0
+        specifier: 9.3.0
+        version: 9.3.0
       glob:
-        specifier: 10.4.2
-        version: 10.4.2
+        specifier: 11.0.0
+        version: 11.0.0
       jest:
         specifier: 29.7.0
-        version: 29.7.0(@types/node@20.14.9)
+        version: 29.7.0(@types/node@20.14.12)
       jest-fetch-mock:
         specifier: 3.0.3
         version: 3.0.3(encoding@0.1.13)
@@ -1145,8 +1145,8 @@ importers:
         specifier: 0.31.1
         version: 0.31.1
       typescript:
-        specifier: 5.5.3
-        version: 5.5.3
+        specifier: 5.5.4
+        version: 5.5.4
 
   packages/misskey-js/generator:
     devDependencies:
@@ -1158,10 +1158,10 @@ importers:
         version: 20.9.1
       '@typescript-eslint/eslint-plugin':
         specifier: 6.11.0
-        version: 6.11.0(@typescript-eslint/parser@6.11.0(eslint@9.7.0)(typescript@5.3.3))(eslint@9.7.0)(typescript@5.3.3)
+        version: 6.11.0(@typescript-eslint/parser@6.11.0(eslint@9.8.0)(typescript@5.3.3))(eslint@9.8.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
         specifier: 6.11.0
-        version: 6.11.0(eslint@9.7.0)(typescript@5.3.3)
+        version: 6.11.0(eslint@9.8.0)(typescript@5.3.3)
       openapi-types:
         specifier: 12.1.3
         version: 12.1.3
@@ -1189,10 +1189,10 @@ importers:
         version: 20.11.5
       '@typescript-eslint/eslint-plugin':
         specifier: 7.1.0
-        version: 7.1.0(@typescript-eslint/parser@7.1.0(eslint@9.7.0)(typescript@5.3.3))(eslint@9.7.0)(typescript@5.3.3)
+        version: 7.1.0(@typescript-eslint/parser@7.1.0(eslint@9.8.0)(typescript@5.3.3))(eslint@9.8.0)(typescript@5.3.3)
       '@typescript-eslint/parser':
         specifier: 7.1.0
-        version: 7.1.0(eslint@9.7.0)(typescript@5.3.3)
+        version: 7.1.0(eslint@9.8.0)(typescript@5.3.3)
       esbuild:
         specifier: 0.19.11
         version: 0.19.11
@@ -1212,8 +1212,8 @@ importers:
   packages/sw:
     dependencies:
       esbuild:
-        specifier: 0.22.0
-        version: 0.22.0
+        specifier: 0.23.0
+        version: 0.23.0
       idb-keyval:
         specifier: 6.2.1
         version: 6.2.1
@@ -1222,27 +1222,23 @@ importers:
         version: link:../misskey-js
     devDependencies:
       '@typescript-eslint/parser':
-        specifier: 7.15.0
-        version: 7.15.0(eslint@9.7.0)(typescript@5.5.3)
+        specifier: 7.17.0
+        version: 7.17.0(eslint@9.8.0)(typescript@5.5.4)
       '@typescript/lib-webworker':
         specifier: npm:@types/serviceworker@0.0.67
         version: '@types/serviceworker@0.0.67'
       eslint-plugin-import:
         specifier: 2.29.1
-        version: 2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint@9.7.0)
+        version: 2.29.1(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0)
       nodemon:
         specifier: 3.1.4
         version: 3.1.4
       typescript:
-        specifier: 5.5.3
-        version: 5.5.3
+        specifier: 5.5.4
+        version: 5.5.4
 
 packages:
 
-  '@aashutoshrathi/word-wrap@1.2.6':
-    resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}
-    engines: {node: '>=0.10.0'}
-
   '@adobe/css-tools@4.3.3':
     resolution: {integrity: sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ==}
 
@@ -1289,143 +1285,145 @@ packages:
   '@aws-crypto/util@5.2.0':
     resolution: {integrity: sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==}
 
-  '@aws-sdk/client-s3@3.600.0':
-    resolution: {integrity: sha512-iYoKbJTputbf+ubkX6gSK/y/4uJEBRaXZ18jykLdBQ8UJuGrk2gqvV8h7OlGAhToCeysmmMqM0vDWyLt6lP8nw==}
+  '@aws-sdk/client-s3@3.620.0':
+    resolution: {integrity: sha512-kf3Lqvuq/ciUn4myQjd1a9nhVg95+FEWkIq7pdkgxFoKow8HKj3nuiwI7zYBRTfk0RKXRkJca3GE+3RXpeZSiA==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/client-sso-oidc@3.600.0':
-    resolution: {integrity: sha512-7+I8RWURGfzvChyNQSyj5/tKrqRbzRl7H+BnTOf/4Vsw1nFOi5ROhlhD4X/Y0QCTacxnaoNcIrqnY7uGGvVRzw==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/client-sso@3.598.0':
-    resolution: {integrity: sha512-nOI5lqPYa+YZlrrzwAJywJSw3MKVjvu6Ge2fCqQUNYMfxFB0NAaDFnl0EPjXi+sEbtCuz/uWE77poHbqiZ+7Iw==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/client-sts@3.600.0':
-    resolution: {integrity: sha512-KQG97B7LvTtTiGmjlrG1LRAY8wUvCQzrmZVV5bjrJ/1oXAU7DITYwVbSJeX9NWg6hDuSk0VE3MFwIXS2SvfLIA==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/core@3.598.0':
-    resolution: {integrity: sha512-HaSjt7puO5Cc7cOlrXFCW0rtA0BM9lvzjl56x0A20Pt+0wxXGeTOZZOkXQIepbrFkV2e/HYukuT9e99vXDm59g==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/credential-provider-env@3.598.0':
-    resolution: {integrity: sha512-vi1khgn7yXzLCcgSIzQrrtd2ilUM0dWodxj3PQ6BLfP0O+q1imO3hG1nq7DVyJtq7rFHs6+9N8G4mYvTkxby2w==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/credential-provider-http@3.598.0':
-    resolution: {integrity: sha512-N7cIafi4HVlQvEgvZSo1G4T9qb/JMLGMdBsDCT5XkeJrF0aptQWzTFH0jIdZcLrMYvzPcuEyO3yCBe6cy/ba0g==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/credential-provider-ini@3.598.0':
-    resolution: {integrity: sha512-/ppcIVUbRwDIwJDoYfp90X3+AuJo2mvE52Y1t2VSrvUovYn6N4v95/vXj6LS8CNDhz2jvEJYmu+0cTMHdhI6eA==}
+  '@aws-sdk/client-sso-oidc@3.620.0':
+    resolution: {integrity: sha512-CWL8aJa6rrNaQXNsLhblGZzbFBrRz4BXAsFBbyqAZEmryr9q/IC7z/ww3nq8CD2UsW+bn89U/XcoP5r1KWUHuQ==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
-      '@aws-sdk/client-sts': ^3.598.0
+      '@aws-sdk/client-sts': ^3.620.0
 
-  '@aws-sdk/credential-provider-node@3.600.0':
-    resolution: {integrity: sha512-1pC7MPMYD45J7yFjA90SxpR0yaSvy+yZiq23aXhAPZLYgJBAxHLu0s0mDCk/piWGPh8+UGur5K0bVdx4B1D5hw==}
+  '@aws-sdk/client-sso@3.620.0':
+    resolution: {integrity: sha512-J1CvF7u39XwtCK9rPlkW2AA631EPqkb4PjOOj9aZ9LjQmkJ0DkL+9tEqU2XIWcjDd2Z3hS3LBuS8uN7upIkEnQ==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/credential-provider-process@3.598.0':
-    resolution: {integrity: sha512-rM707XbLW8huMk722AgjVyxu2tMZee++fNA8TJVNgs1Ma02Wx6bBrfIvlyK0rCcIRb0WdQYP6fe3Xhiu4e8IBA==}
+  '@aws-sdk/client-sts@3.620.0':
+    resolution: {integrity: sha512-pG4SqDHZV/ZbpoVoVtpxo6ZZoqVDbVItC3QUO73UJ3Gemxznd/Ck7kAsyb6/dJkV/Aqm3gt2O5UL7vzQLNHSjw==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/credential-provider-sso@3.598.0':
-    resolution: {integrity: sha512-5InwUmrAuqQdOOgxTccRayMMkSmekdLk6s+az9tmikq0QFAHUCtofI+/fllMXSR9iL6JbGYi1940+EUmS4pHJA==}
+  '@aws-sdk/core@3.620.0':
+    resolution: {integrity: sha512-5D9tMahxIDDFLULS9/ULa0HuIu7CZSshfj6wmDSmigXzkWyUvHoVIrme2z6eM3Icat/MO3d4WEy3445Vk385gQ==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/credential-provider-web-identity@3.598.0':
-    resolution: {integrity: sha512-GV5GdiMbz5Tz9JO4NJtRoFXjW0GPEujA0j+5J/B723rTN+REHthJu48HdBKouHGhdzkDWkkh1bu52V02Wprw8w==}
+  '@aws-sdk/credential-provider-env@3.609.0':
+    resolution: {integrity: sha512-v69ZCWcec2iuV9vLVJMa6fAb5xwkzN4jYIT8yjo2c4Ia/j976Q+TPf35Pnz5My48Xr94EFcaBazrWedF+kwfuQ==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/credential-provider-http@3.620.0':
+    resolution: {integrity: sha512-BI2BdrSKDmB/2ouB/NJR0PT0x/+5fmoF6XOE78hFBb4F5w/yynGgcJY936dF+oREfpME6ehjB2b0okGg78Scpw==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/credential-provider-ini@3.620.0':
+    resolution: {integrity: sha512-P9fYi6dzZIl8ITC7qAPf5DX9omI3LfA91g3KH+0OUmS3ctP7tN+gNo3HmqlzoqnwPe0pXn1FumYAe1qFl6Yjjg==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
-      '@aws-sdk/client-sts': ^3.598.0
+      '@aws-sdk/client-sts': ^3.620.0
 
-  '@aws-sdk/lib-storage@3.600.0':
-    resolution: {integrity: sha512-jjgGMmFykXBAs8YO3ghgnVSjM/uf99jvVQqKJfDjwXUCLPrsZqk14v2WcDCWAXzeAroDvIOVQO1V/RR8fK18Pw==}
+  '@aws-sdk/credential-provider-node@3.620.0':
+    resolution: {integrity: sha512-or8ahy4ysURcWgKX00367DMDTTyMynDEl+FQh4wce66fMyePhFVuoPcRgXzWsi8KYmL95sPCfJFNqBMyFNcgvQ==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/credential-provider-process@3.614.0':
+    resolution: {integrity: sha512-Q0SI0sTRwi8iNODLs5+bbv8vgz8Qy2QdxbCHnPk/6Cx6LMf7i3dqmWquFbspqFRd8QiqxStrblwxrUYZi09tkA==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/credential-provider-sso@3.620.0':
+    resolution: {integrity: sha512-xtIj2hmq3jcKwvGmqhoYapbWeQfFyoQgKBtwD6nx0M6oS5lbFH4rzHhj0gBwatZDjMa35cWtcYVUJCv2/9mWvA==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/credential-provider-web-identity@3.609.0':
+    resolution: {integrity: sha512-U+PG8NhlYYF45zbr1km3ROtBMYqyyj/oK8NRp++UHHeuavgrP+4wJ4wQnlEaKvJBjevfo3+dlIBcaeQ7NYejWg==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
-      '@aws-sdk/client-s3': ^3.600.0
+      '@aws-sdk/client-sts': ^3.609.0
 
-  '@aws-sdk/middleware-bucket-endpoint@3.598.0':
-    resolution: {integrity: sha512-PM7BcFfGUSkmkT6+LU9TyJiB4S8yI7dfuKQDwK5ZR3P7MKaK4Uj4yyDiv0oe5xvkF6+O2+rShj+eh8YuWkOZ/Q==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/middleware-expect-continue@3.598.0':
-    resolution: {integrity: sha512-ZuHW18kaeHR8TQyhEOYMr8VwiIh0bMvF7J1OTqXHxDteQIavJWA3CbfZ9sgS4XGtrBZDyHJhjZKeCfLhN2rq3w==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/middleware-flexible-checksums@3.598.0':
-    resolution: {integrity: sha512-xukAzds0GQXvMEY9G6qt+CzwVzTx8NyKKh04O2Q+nOch6QQ8Rs+2kTRy3Z4wQmXq2pK9hlOWb5nXA7HWpmz6Ng==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/middleware-host-header@3.598.0':
-    resolution: {integrity: sha512-WiaG059YBQwQraNejLIi0gMNkX7dfPZ8hDIhvMr5aVPRbaHH8AYF3iNSsXYCHvA2Cfa1O9haYXsuMF9flXnCmA==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/middleware-location-constraint@3.598.0':
-    resolution: {integrity: sha512-8oybQxN3F1ISOMULk7JKJz5DuAm5hCUcxMW9noWShbxTJuStNvuHf/WLUzXrf8oSITyYzIHPtf8VPlKR7I3orQ==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/middleware-logger@3.598.0':
-    resolution: {integrity: sha512-bxBjf/VYiu3zfu8SYM2S9dQQc3tz5uBAOcPz/Bt8DyyK3GgOpjhschH/2XuUErsoUO1gDJqZSdGOmuHGZQn00Q==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/middleware-recursion-detection@3.598.0':
-    resolution: {integrity: sha512-vjT9BeFY9FeN0f8hm2l6F53tI0N5bUq6RcDkQXKNabXBnQxKptJRad6oP2X5y3FoVfBLOuDkQgiC2940GIPxtQ==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/middleware-sdk-s3@3.598.0':
-    resolution: {integrity: sha512-5AGtLAh9wyK6ANPYfaKTqJY1IFJyePIxsEbxa7zS6REheAqyVmgJFaGu3oQ5XlxfGr5Uq59tFTRkyx26G1HkHA==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/middleware-signing@3.598.0':
-    resolution: {integrity: sha512-XKb05DYx/aBPqz6iCapsCbIl8aD8EihTuPCs51p75QsVfbQoVr4TlFfIl5AooMSITzojdAQqxt021YtvxjtxIQ==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/middleware-ssec@3.598.0':
-    resolution: {integrity: sha512-f0p2xP8IC1uJ5e/tND1l81QxRtRFywEdnbtKCE0H6RSn4UIt2W3Dohe1qQDbnh27okF0PkNW6BJGdSAz3p7qbA==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/middleware-user-agent@3.598.0':
-    resolution: {integrity: sha512-4tjESlHG5B5MdjUaLK7tQs/miUtHbb6deauQx8ryqSBYOhfHVgb1ZnzvQR0bTrhpqUg0WlybSkDaZAICf9xctg==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/region-config-resolver@3.598.0':
-    resolution: {integrity: sha512-oYXhmTokSav4ytmWleCr3rs/1nyvZW/S0tdi6X7u+dLNL5Jee+uMxWGzgOrWK6wrQOzucLVjS4E/wA11Kv2GTw==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/signature-v4-multi-region@3.598.0':
-    resolution: {integrity: sha512-1r/EyTrO1gSa1FirnR8V7mabr7gk+l+HkyTI0fcTSr8ucB7gmYyW6WjkY8JCz13VYHFK62usCEDS7yoJoJOzTA==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/token-providers@3.598.0':
-    resolution: {integrity: sha512-TKY1EVdHVBnZqpyxyTHdpZpa1tUpb6nxVeRNn1zWG8QB5MvH4ALLd/jR+gtmWDNQbIG4cVuBOZFVL8hIYicKTA==}
+  '@aws-sdk/lib-storage@3.620.0':
+    resolution: {integrity: sha512-xUeKH8RrPQqE6J49Yun0qCdu5SGaN5LgyyjWutLeElqR0G3jhmPVrRzFXsHDXbr9S0QVE4V8DjeC17bkEdG4dw==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
-      '@aws-sdk/client-sso-oidc': ^3.598.0
+      '@aws-sdk/client-s3': ^3.620.0
 
-  '@aws-sdk/types@3.598.0':
-    resolution: {integrity: sha512-742uRl6z7u0LFmZwDrFP6r1wlZcgVPw+/TilluDJmCAR8BgRw3IR+743kUXKBGd8QZDRW2n6v/PYsi/AWCDDMQ==}
+  '@aws-sdk/middleware-bucket-endpoint@3.620.0':
+    resolution: {integrity: sha512-eGLL0W6L3HDb3OACyetZYOWpHJ+gLo0TehQKeQyy2G8vTYXqNTeqYhuI6up9HVjBzU9eQiULVQETmgQs7TFaRg==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/middleware-expect-continue@3.620.0':
+    resolution: {integrity: sha512-QXeRFMLfyQ31nAHLbiTLtk0oHzG9QLMaof5jIfqcUwnOkO8YnQdeqzakrg1Alpy/VQ7aqzIi8qypkBe2KXZz0A==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/middleware-flexible-checksums@3.620.0':
+    resolution: {integrity: sha512-ftz+NW7qka2sVuwnnO1IzBku5ccP+s5qZGeRTPgrKB7OzRW85gthvIo1vQR2w+OwHFk7WJbbhhWwbCbktnP4UA==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/middleware-host-header@3.620.0':
+    resolution: {integrity: sha512-VMtPEZwqYrII/oUkffYsNWY9PZ9xpNJpMgmyU0rlDQ25O1c0Hk3fJmZRe6pEkAJ0omD7kLrqGl1DUjQVxpd/Rg==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/middleware-location-constraint@3.609.0':
+    resolution: {integrity: sha512-xzsdoTkszGVqGVPjUmgoP7TORiByLueMHieI1fhQL888WPdqctwAx3ES6d/bA9Q/i8jnc6hs+Fjhy8UvBTkE9A==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/middleware-logger@3.609.0':
+    resolution: {integrity: sha512-S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/middleware-recursion-detection@3.620.0':
+    resolution: {integrity: sha512-nh91S7aGK3e/o1ck64sA/CyoFw+gAYj2BDOnoNa6ouyCrVJED96ZXWbhye/fz9SgmNUZR2g7GdVpiLpMKZoI5w==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/middleware-sdk-s3@3.620.0':
+    resolution: {integrity: sha512-AAZ6NLVOx/bP97PYj/afCMeySzxOHocgJG3ZXh6f8MnJcGpZgx8NyRm0vtiYUTFrS2JtU4xV05Dl3j4afV3s4A==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/middleware-signing@3.620.0':
+    resolution: {integrity: sha512-gxI7rubiaanUXaLfJ4NybERa9MGPNg2Ycl/OqANsozrBnR3Pw8vqy3EuVImQOyn2pJ2IFvl8ZPoSMHf4pX56FQ==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/middleware-ssec@3.609.0':
+    resolution: {integrity: sha512-GZSD1s7+JswWOTamVap79QiDaIV7byJFssBW68GYjyRS5EBjNfwA/8s+6uE6g39R3ojyTbYOmvcANoZEhSULXg==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/middleware-user-agent@3.620.0':
+    resolution: {integrity: sha512-bvS6etn+KsuL32ubY5D3xNof1qkenpbJXf/ugGXbg0n98DvDFQ/F+SMLxHgbnER5dsKYchNnhmtI6/FC3HFu/A==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/region-config-resolver@3.614.0':
+    resolution: {integrity: sha512-vDCeMXvic/LU0KFIUjpC3RiSTIkkvESsEfbVHiHH0YINfl8HnEqR5rj+L8+phsCeVg2+LmYwYxd5NRz4PHxt5g==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/signature-v4-multi-region@3.620.0':
+    resolution: {integrity: sha512-yu1pTCqIbkSdaOvmyfW9vV9jWe3pDApkQPZLg4VEN5dXDWRtgQ/amv88myyCEoG14irUN1tsbvytcKzGyEXnhA==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/token-providers@3.614.0':
+    resolution: {integrity: sha512-okItqyY6L9IHdxqs+Z116y5/nda7rHxLvROxtAJdLavWTYDydxrZstImNgGWTeVdmc0xX2gJCI77UYUTQWnhRw==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      '@aws-sdk/client-sso-oidc': ^3.614.0
+
+  '@aws-sdk/types@3.609.0':
+    resolution: {integrity: sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==}
     engines: {node: '>=16.0.0'}
 
   '@aws-sdk/util-arn-parser@3.568.0':
     resolution: {integrity: sha512-XUKJWWo+KOB7fbnPP0+g/o5Ulku/X53t7i/h+sPHr5xxYTJJ9CYnbToo95mzxe7xWvkLrsNtJ8L+MnNn9INs2w==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/util-endpoints@3.598.0':
-    resolution: {integrity: sha512-Qo9UoiVVZxcOEdiOMZg3xb1mzkTxrhd4qSlg5QQrfWPJVx/QOg+Iy0NtGxPtHtVZNHZxohYwDwV/tfsnDSE2gQ==}
+  '@aws-sdk/util-endpoints@3.614.0':
+    resolution: {integrity: sha512-wK2cdrXHH4oz4IomV/yrGkftU9A+ITB6nFL+rxxyO78is2ifHJpFdV4aqk4LSkXYPi6CXWNru/Dqc7yiKXgJPw==}
     engines: {node: '>=16.0.0'}
 
   '@aws-sdk/util-locate-window@3.208.0':
     resolution: {integrity: sha512-iua1A2+P7JJEDHVgvXrRJSvsnzG7stYSGQnBVphIUlemwl6nN5D+QrgbjECtrbxRz8asYFHSzhdhECqN+tFiBg==}
     engines: {node: '>=14.0.0'}
 
-  '@aws-sdk/util-user-agent-browser@3.598.0':
-    resolution: {integrity: sha512-36Sxo6F+ykElaL1mWzWjlg+1epMpSe8obwhCN1yGE7Js9ywy5U6k6l+A3q3YM9YRbm740sNxncbwLklMvuhTKw==}
+  '@aws-sdk/util-user-agent-browser@3.609.0':
+    resolution: {integrity: sha512-fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA==}
 
-  '@aws-sdk/util-user-agent-node@3.598.0':
-    resolution: {integrity: sha512-oyWGcOlfTdzkC6SVplyr0AGh54IMrDxbhg5RxJ5P+V4BKfcDoDcZV9xenUk9NsOi9MuUjxMumb9UJGkDhM1m0A==}
+  '@aws-sdk/util-user-agent-node@3.614.0':
+    resolution: {integrity: sha512-15ElZT88peoHnq5TEoEtZwoXTXRxNrk60TZNdpl/TUBJ5oNJ9Dqb5Z4ryb8ofN6nm9aFf59GVAerFDz8iUoHBA==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
       aws-crt: '>=1.0.0'
@@ -1433,8 +1431,8 @@ packages:
       aws-crt:
         optional: true
 
-  '@aws-sdk/xml-builder@3.598.0':
-    resolution: {integrity: sha512-ZIa2RK7CHFTZ4gwK77WRtsZ6vF7xwRXxJ8KQIxK2duhoTVcn0xYxpFLdW9WZZZvdP9GIF3Loqvf8DRdeU5Jc7Q==}
+  '@aws-sdk/xml-builder@3.609.0':
+    resolution: {integrity: sha512-l9XxNcA4HX98rwCC2/KoiWcmEiRfZe4G+mYwDbCFT87JIMj6GBhLDkAzr/W8KAaA2IDr8Vc6J8fZPgVulxxfMA==}
     engines: {node: '>=16.0.0'}
 
   '@babel/code-frame@7.23.5':
@@ -2176,16 +2174,16 @@ packages:
   '@bcoe/v8-coverage@0.2.3':
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
 
-  '@bull-board/api@5.20.5':
-    resolution: {integrity: sha512-YI95JK5A4/K4KB5VWbQn/CYNB+AO5cZ/BnZ77LxAhsaJ3ssHBN3Au0n3Z4wD7O+78+W3ON9uqGjKnHV6rXBGcQ==}
+  '@bull-board/api@5.21.1':
+    resolution: {integrity: sha512-anzTfhOJ93eraT/GYeyxWpxRMarHwuevn6pPBfdOj0LC2eg98OPnkfdMSjcrpL3qrqsxON0RslS7kuPfCEnX6A==}
     peerDependencies:
-      '@bull-board/ui': 5.20.5
+      '@bull-board/ui': 5.21.1
 
-  '@bull-board/fastify@5.20.5':
-    resolution: {integrity: sha512-tdMR97xbzEzBbMJiJQreJHGdhfOocQn61K/WqM9I038Dk1dBHM5phQJxRJhspvwEJV4jwAayNOZbzuETI7QKwA==}
+  '@bull-board/fastify@5.21.1':
+    resolution: {integrity: sha512-We33yolc70SALjDdF3cjEaLn1L/vrw85eFCsrviESaW3dFVIdB+xn0fdqMFK6NnaC0JjBa3Ypfev4Co+eaZ+1A==}
 
-  '@bull-board/ui@5.20.5':
-    resolution: {integrity: sha512-RV9VlW4qVL1A0Dewpsor4z7ZL9D56OW9LcRYjvXrIU5FSzvTvYKofmrUYoVrNQDs6jGMwJic+dMiW9K8GUU15A==}
+  '@bull-board/ui@5.21.1':
+    resolution: {integrity: sha512-JBDeCqG7j/c3WE0uGMN9snPkRJz9/D6MpTZzyVj7KOxIJwNKPOICNFZbCrCNi7bcJYHDJ2xGTN9OO1mw7i43BQ==}
 
   '@bundled-es-modules/cookie@2.0.0':
     resolution: {integrity: sha512-Or6YHg/kamKHpxULAdSqhGqnWFneIXu1NKvvfBBzKGwpVsYuFIQ5aBPHDnnoR3ghW1nvSkALd+EF9iMtY7Vjxw==}
@@ -2193,6 +2191,9 @@ packages:
   '@bundled-es-modules/statuses@1.0.1':
     resolution: {integrity: sha512-yn7BklA5acgcBr+7w064fGV+SGIFySjCKpqjcWgBAIfrAkY+4GQTJJHQMeT3V/sgz23VTEVV8TtOmkvJAhFVfg==}
 
+  '@bundled-es-modules/tough-cookie@0.1.6':
+    resolution: {integrity: sha512-dvMHbL464C0zI+Yqxbz6kZ5TOEp7GLW+pry/RWndAR8MJQAXZ2rPmIs8tziTZjeIyhSNZgZbCePtfSbdWqStJw==}
+
   '@canvas/image-data@1.0.0':
     resolution: {integrity: sha512-BxOqI5LgsIQP1odU5KMwV9yoijleOPzHL18/YvNqF9KFSGF2K/DLlYAbDQsWqd/1nbaFuSkYD/191dpMtNh4vw==}
 
@@ -2200,38 +2201,38 @@ packages:
     resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
     engines: {node: '>=0.1.90'}
 
-  '@cropper/element-canvas@2.0.0-beta.5':
-    resolution: {integrity: sha512-TS+NTVQAyLKBFLIjzFcaFK6V5GaNCNSp8FBjApTD/AosV/dPRlNCsgmdJ/BugwJTJUSowVnLrPmulI35z4npAg==}
+  '@cropper/element-canvas@2.0.0-rc.1':
+    resolution: {integrity: sha512-jRt9OM7cls+zch8U2m7pA9wp8dNOz0EtedGKkqH+DInUYw1+UtonEJirrxyl1YHRgOme5M5DTsDmkUSrUiZN6g==}
 
-  '@cropper/element-crosshair@2.0.0-beta.5':
-    resolution: {integrity: sha512-en3EjiqS/O/uVPVLUanx2ZxvE2n3J5VxGABvBTwQimX4c3kNixq8TUVlsaLdcG7jbehxFpT3S19+tiuZudHqxg==}
+  '@cropper/element-crosshair@2.0.0-rc.1':
+    resolution: {integrity: sha512-xfLelqM8EnRZUf7xEE88RWQQx5erUv7jrzni52bAw3/Ua8HXIz3uAMnkrGKOTBj8K4Rv/mNJY8k1DVAEfHY6Lg==}
 
-  '@cropper/element-grid@2.0.0-beta.5':
-    resolution: {integrity: sha512-uKQExNTOMOGo5d6Tv1NJDbjJHRR/0NgqeROUSt2J8g9ymPP+/MoFdCCf+Nj/KM5pk7/fBEV3HhzUnO8jh1hZfQ==}
+  '@cropper/element-grid@2.0.0-rc.1':
+    resolution: {integrity: sha512-U/BYPl76upd9sXT+pZTFoQzUqWyNxdGs4YR2UtaVCfTMHLDTrssPAedmqEEnHgbqVcr325sIEfVmwWVA+v+8Dg==}
 
-  '@cropper/element-handle@2.0.0-beta.5':
-    resolution: {integrity: sha512-SlaV5/qbEBQLHnuaGD8J0EqSp797m/MMB8V10EUZpv6cznSRxg/SXOj6ROE0ePzo5+0i96Dw+8ZukLilDgc1Xw==}
+  '@cropper/element-handle@2.0.0-rc.1':
+    resolution: {integrity: sha512-GuOHbjkg5CP1+oFzWQeD7VZffUE86dp4gKv5egLxkBEwnQp1VQxjO7L1Wkgj+KsQymoDczsl+x4bF12KDyDg2g==}
 
-  '@cropper/element-image@2.0.0-beta.5':
-    resolution: {integrity: sha512-369ztVaoRS2DN8SaiHZ/bRCz0Snw9ss7PZrX1OQK86fwVhCoeRqCHj48ayfLMdchx+J3RbM5f2g8ePf7ejwOKw==}
+  '@cropper/element-image@2.0.0-rc.1':
+    resolution: {integrity: sha512-ttzawKbUkR2A9U3bc2AN/jbNdszBP/yb83PIc5jekjOs+Z7kUBVdOo1SLIewpQ0DjUzhfCRXWUowP1McVQUXZw==}
 
-  '@cropper/element-selection@2.0.0-beta.5':
-    resolution: {integrity: sha512-l8DvOBAZYytTarpkfhCglhxD+zDQ2acVwIzGwp5r9xR+ERleJHxr2rHYVhowRHT/JZRd94DJBlye91c1uO/XGg==}
+  '@cropper/element-selection@2.0.0-rc.1':
+    resolution: {integrity: sha512-AcRHRbsyt9xRfBD1QRyNDTS+vaYg6uAeuqhk/Ra58pqxlhtoimAV3oQ7uc/edwOlK60f/DxtKCc8rSOYFQ85bQ==}
 
-  '@cropper/element-shade@2.0.0-beta.5':
-    resolution: {integrity: sha512-LGSVLAD1lasFrS+Pd7JnQSJRCMSNnc40UCcjLhscDuRcRHK/ViMglnwCfFxeGnS26kugbDLF5IbYDCLCbykUog==}
+  '@cropper/element-shade@2.0.0-rc.1':
+    resolution: {integrity: sha512-nHv2WujETENoIfxWQn7TYiOnXm5YUnZsoG4r6njK5cxj0gIUfPudUSbjWCQSuB2oxxpeEK8oyTdfOZtP9cxK4g==}
 
-  '@cropper/element-viewer@2.0.0-beta.5':
-    resolution: {integrity: sha512-i4cc+L+j8Gq1L8g1BQWfQ842QxH5T9v2EkIeGuW66SVSBglafxu8gxmSOyRD3hDAMHM3wbJ+XVmFwBHZzlYCvQ==}
+  '@cropper/element-viewer@2.0.0-rc.1':
+    resolution: {integrity: sha512-xTj0BObCygbVWXc7t7FYZ9k2eFyWN360it5uGeAkImXcwINRQGTFcLLOjs6i3SwedI7F1a1yNcTBfoT1B/sNAg==}
 
-  '@cropper/element@2.0.0-beta.5':
-    resolution: {integrity: sha512-+pHX/iYw+Y/HxgpcjvSPBc3+hvJaycznbZdWifnChmDkpLStd6Xu9gO2ful9sSL0uGSjQxUYV4xPyikYJOnfug==}
+  '@cropper/element@2.0.0-rc.1':
+    resolution: {integrity: sha512-OPKgjUgYC2Xmv77vEqtAR6bdfKOW+v9FrSjr4re3u95rcVj6NJ0JidIta41Ipp8KydHTXSmLetq4XDrA+vuIJQ==}
 
-  '@cropper/elements@2.0.0-beta.5':
-    resolution: {integrity: sha512-KWa5/dmJpLcKDJpNlbEQzO9Shz+f4aB0I3y97CqqTf8JSGS6CEKOd9uLywd1eow1r4O0Hwo65ktXPwAEhMWDZg==}
+  '@cropper/elements@2.0.0-rc.1':
+    resolution: {integrity: sha512-6qbtCq3iL3dETVav2XA03a8iLkHXWMIqHFxViMjlLr9CSuDjjaS5wp0JDuGtPv5FHxjsjyQ8Yayt8Ak5p09Zxg==}
 
-  '@cropper/utils@2.0.0-beta.5':
-    resolution: {integrity: sha512-xE7Klel/4WSjhLUeldfROwbWqV/1A3YKrQLqTrs5/X0ath7B05Fmvhr3TNFvN51v2KSx46Ug6xDJzmbg772m1g==}
+  '@cropper/utils@2.0.0-rc.1':
+    resolution: {integrity: sha512-kreB3wdrAhmTEscfB8/j7ksGBgYSKN+28t37CAI0Vb5DvX/aUDPDH+3e2kyD7YE+DIZgdnuY2FsMYJAQ9sTThg==}
 
   '@cypress/request@3.0.0':
     resolution: {integrity: sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==}
@@ -2271,8 +2272,8 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/aix-ppc64@0.22.0':
-    resolution: {integrity: sha512-uvQR2crZ/zgzSHDvdygHyNI+ze9zwS8mqz0YtGXotSqvEE0UkYE9s+FZKQNTt1VtT719mfP3vHrUdCpxBNQZhQ==}
+  '@esbuild/aix-ppc64@0.23.0':
+    resolution: {integrity: sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [aix]
@@ -2295,8 +2296,8 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm64@0.22.0':
-    resolution: {integrity: sha512-UKhPb3o2gAB/bfXcl58ZXTn1q2oVu1rEu/bKrCtmm+Nj5MKUbrOwR5WAixE2v+lk0amWuwPvhnPpBRLIGiq7ig==}
+  '@esbuild/android-arm64@0.23.0':
+    resolution: {integrity: sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [android]
@@ -2319,8 +2320,8 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-arm@0.22.0':
-    resolution: {integrity: sha512-PBnyP+r8vJE4ifxsWys9l+Mc2UY/yYZOpX82eoyGISXXb3dRr0M21v+s4fgRKWMFPMSf/iyowqPW/u7ScSUkjQ==}
+  '@esbuild/android-arm@0.23.0':
+    resolution: {integrity: sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [android]
@@ -2343,8 +2344,8 @@ packages:
     cpu: [x64]
     os: [android]
 
-  '@esbuild/android-x64@0.22.0':
-    resolution: {integrity: sha512-IjTYtvIrjhR41Ijy2dDPgYjQHWG/x/A4KXYbs1fiU3efpRdoxMChK3oEZV6GPzVEzJqxFgcuBaiX1kwEvWUxSw==}
+  '@esbuild/android-x64@0.23.0':
+    resolution: {integrity: sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [android]
@@ -2367,8 +2368,8 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-arm64@0.22.0':
-    resolution: {integrity: sha512-mqt+Go4y9wRvEz81bhKd9RpHsQR1LwU8Xm6jZRUV/xpM7cIQFbFH6wBCLPTNsdELBvfoHeumud7X78jQQJv2TA==}
+  '@esbuild/darwin-arm64@0.23.0':
+    resolution: {integrity: sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [darwin]
@@ -2391,8 +2392,8 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.22.0':
-    resolution: {integrity: sha512-vTaTQ9OgYc3VTaWtOE5pSuDT6H3d/qSRFRfSBbnxFfzAvYoB3pqKXA0LEbi/oT8GUOEAutspfRMqPj2ezdFaMw==}
+  '@esbuild/darwin-x64@0.23.0':
+    resolution: {integrity: sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [darwin]
@@ -2415,8 +2416,8 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-arm64@0.22.0':
-    resolution: {integrity: sha512-0e1ZgoobJzaGnR4reD7I9rYZ7ttqdh1KPvJWnquUoDJhL0rYwdneeLailBzd2/4g/U5p4e5TIHEWa68NF2hFpQ==}
+  '@esbuild/freebsd-arm64@0.23.0':
+    resolution: {integrity: sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [freebsd]
@@ -2439,8 +2440,8 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.22.0':
-    resolution: {integrity: sha512-BFgyYwlCwRWyPQJtkzqq2p6pJbiiWgp0P9PNf7a5FQ1itKY4czPuOMAlFVItirSmEpRPCeImuwePNScZS0pL5Q==}
+  '@esbuild/freebsd-x64@0.23.0':
+    resolution: {integrity: sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [freebsd]
@@ -2463,8 +2464,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm64@0.22.0':
-    resolution: {integrity: sha512-V/K2rctCUgC0PCXpN7AqT4hoazXKgIYugFGu/myk2+pfe6jTW2guz/TBwq4cZ7ESqusR/IzkcQaBkcjquuBWsw==}
+  '@esbuild/linux-arm64@0.23.0':
+    resolution: {integrity: sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [linux]
@@ -2487,8 +2488,8 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-arm@0.22.0':
-    resolution: {integrity: sha512-KEMWiA9aGuPUD4BH5yjlhElLgaRXe+Eri6gKBoDazoPBTo1BXc/e6IW5FcJO9DoL19FBeCxgONyh95hLDNepIg==}
+  '@esbuild/linux-arm@0.23.0':
+    resolution: {integrity: sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [linux]
@@ -2511,8 +2512,8 @@ packages:
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.22.0':
-    resolution: {integrity: sha512-r2ZZqkOMOrpUhzNwxI7uLAHIDwkfeqmTnrv1cjpL/rjllPWszgqmprd/om9oviKXUBpMqHbXmppvjAYgISb26Q==}
+  '@esbuild/linux-ia32@0.23.0':
+    resolution: {integrity: sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [linux]
@@ -2535,8 +2536,8 @@ packages:
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.22.0':
-    resolution: {integrity: sha512-qaowLrV/YOMAL2RfKQ4C/VaDzAuLDuylM2sd/LH+4OFirMl6CuDpRlCq4u49ZBaVV8pkI/Y+hTdiibvQRhojCA==}
+  '@esbuild/linux-loong64@0.23.0':
+    resolution: {integrity: sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==}
     engines: {node: '>=18'}
     cpu: [loong64]
     os: [linux]
@@ -2559,8 +2560,8 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.22.0':
-    resolution: {integrity: sha512-hgrezzjQTRxjkQ5k08J6rtZN5PNnkWx/Rz6Kmj9gnsdCAX1I4Dn4ZPqvFRkXo55Q3pnVQJBwbdtrTO7tMGtyVA==}
+  '@esbuild/linux-mips64el@0.23.0':
+    resolution: {integrity: sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==}
     engines: {node: '>=18'}
     cpu: [mips64el]
     os: [linux]
@@ -2583,8 +2584,8 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.22.0':
-    resolution: {integrity: sha512-ewxg6FLLUio883XgSjfULEmDl3VPv/TYNnRprVAS3QeGFLdCYdx1tIudBcd7n9jIdk82v1Ajov4jx87qW7h9+g==}
+  '@esbuild/linux-ppc64@0.23.0':
+    resolution: {integrity: sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [linux]
@@ -2607,8 +2608,8 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.22.0':
-    resolution: {integrity: sha512-Az5XbgSJC2lE8XK8pdcutsf9RgdafWdTpUK/+6uaDdfkviw/B4JCwAfh1qVeRWwOohwdsl4ywZrWBNWxwrPLFg==}
+  '@esbuild/linux-riscv64@0.23.0':
+    resolution: {integrity: sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==}
     engines: {node: '>=18'}
     cpu: [riscv64]
     os: [linux]
@@ -2631,8 +2632,8 @@ packages:
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.22.0':
-    resolution: {integrity: sha512-8j4a2ChT9+V34NNNY9c/gMldutaJFmfMacTPq4KfNKwv2fitBCLYjee7c+Vxaha2nUhPK7cXcZpJtJ3+Y7ZdVQ==}
+  '@esbuild/linux-s390x@0.23.0':
+    resolution: {integrity: sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==}
     engines: {node: '>=18'}
     cpu: [s390x]
     os: [linux]
@@ -2655,8 +2656,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/linux-x64@0.22.0':
-    resolution: {integrity: sha512-JUQyOnpbAkkRFOk/AhsEemz5TfWN4FJZxVObUlnlNCbe7QBl61ZNfM4cwBXayQA6laMJMUcqLHaYQHAB6YQ95Q==}
+  '@esbuild/linux-x64@0.23.0':
+    resolution: {integrity: sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [linux]
@@ -2679,14 +2680,14 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.22.0':
-    resolution: {integrity: sha512-11PoCoHXo4HFNbLsXuMB6bpMPWGDiw7xETji6COdJss4SQZLvcgNoeSqWtATRm10Jj1uEHiaIk4N0PiN6x4Fcg==}
+  '@esbuild/netbsd-x64@0.23.0':
+    resolution: {integrity: sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/openbsd-arm64@0.22.0':
-    resolution: {integrity: sha512-Ezlhu/YyITmXwKSB+Zu/QqD7cxrjrpiw85cc0Rbd3AWr2wsgp+dWbWOE8MqHaLW9NKMZvuL0DhbJbvzR7F6Zvg==}
+  '@esbuild/openbsd-arm64@0.23.0':
+    resolution: {integrity: sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openbsd]
@@ -2709,8 +2710,8 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.22.0':
-    resolution: {integrity: sha512-ufjdW5tFJGUjlH9j/5cCE9lrwRffyZh+T4vYvoDKoYsC6IXbwaFeV/ENxeNXcxotF0P8CDzoICXVSbJaGBhkrw==}
+  '@esbuild/openbsd-x64@0.23.0':
+    resolution: {integrity: sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [openbsd]
@@ -2733,8 +2734,8 @@ packages:
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/sunos-x64@0.22.0':
-    resolution: {integrity: sha512-zY6ly/AoSmKnmNTowDJsK5ehra153/5ZhqxNLfq9NRsTTltetr+yHHcQ4RW7QDqw4JC8A1uC1YmeSfK9NRcK1w==}
+  '@esbuild/sunos-x64@0.23.0':
+    resolution: {integrity: sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
@@ -2757,8 +2758,8 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-arm64@0.22.0':
-    resolution: {integrity: sha512-Kml5F7tv/1Maam0pbbCrvkk9vj046dPej30kFzlhXnhuCtYYBP6FGy/cLbc5yUT1lkZznGLf2OvuvmLjscO5rw==}
+  '@esbuild/win32-arm64@0.23.0':
+    resolution: {integrity: sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
@@ -2781,8 +2782,8 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.22.0':
-    resolution: {integrity: sha512-IOgwn+mYTM3RrcydP4Og5IpXh+ftN8oF+HELTXSmbWBlujuci4Qa3DTeO+LEErceisI7KUSfEIiX+WOUlpELkw==}
+  '@esbuild/win32-ia32@0.23.0':
+    resolution: {integrity: sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
@@ -2805,8 +2806,8 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@esbuild/win32-x64@0.22.0':
-    resolution: {integrity: sha512-4bDHJrk2WHBXJPhy1y80X7/5b5iZTZP3LGcKIlAP1J+KqZ4zQAPMLEzftGyjjfcKbA4JDlPt/+2R/F1ZTeRgrw==}
+  '@esbuild/win32-x64@0.23.0':
+    resolution: {integrity: sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [win32]
@@ -2817,10 +2818,6 @@ packages:
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
 
-  '@eslint-community/regexpp@4.10.0':
-    resolution: {integrity: sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==}
-    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
-
   '@eslint-community/regexpp@4.11.0':
     resolution: {integrity: sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
@@ -2833,20 +2830,16 @@ packages:
     resolution: {integrity: sha512-lpHyRyplhGPL5mGEh6M9O5nnKk0Gz4bFI+Zu6tKlPpDUN7XshWvH9C/px4UVm87IAANE0W81CEsNGbS1KlzXpA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/config-array@0.17.0':
-    resolution: {integrity: sha512-A68TBu6/1mHHuc5YJL0U0VVeGNiklLAL6rRmhTCP2B5XjWLMnrX+HkO+IAXyHvks5cyyY1jjK5ITPQ1HGS2EVA==}
+  '@eslint/config-array@0.17.1':
+    resolution: {integrity: sha512-BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@eslint/eslintrc@3.1.0':
     resolution: {integrity: sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/js@9.6.0':
-    resolution: {integrity: sha512-D9B0/3vNg44ZeWbYMpBoXqNP4j6eQD5vNwIlGAuFRRzK/WtT/jvDQW3Bi9kkf3PMDMlM7Yi+73VLUsn5bJcl8A==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@eslint/js@9.7.0':
-    resolution: {integrity: sha512-ChuWDQenef8OSFnvuxv0TCVxEwmu3+hPNKvM9B34qpM0rDRbjL8t5QkQeHHeAfsKQjuH9wS82WeCi1J/owatng==}
+  '@eslint/js@9.8.0':
+    resolution: {integrity: sha512-MfluB7EUfxXtv3i/++oh89uzAr4PDI4nn201hsp+qaXqsjAWzinlZEHEfPgAX4doIlKvPG/i0A9dpKxOLII8yA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@eslint/object-schema@2.1.4':
@@ -3204,9 +3197,6 @@ packages:
     resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==}
     engines: {node: '>=6.0.0'}
 
-  '@jridgewell/source-map@0.3.5':
-    resolution: {integrity: sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==}
-
   '@jridgewell/source-map@0.3.6':
     resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}
 
@@ -3255,11 +3245,11 @@ packages:
       '@types/react': '>=16'
       react: '>=16'
 
-  '@microsoft/api-extractor-model@7.29.2':
-    resolution: {integrity: sha512-hAYajOjQan3uslhKJRwvvHIdLJ+ZByKqdSsJ/dgHFxPtEbdKpzMDO8zuW4K5gkSMYl5D0LbNwxkhxr51P2zsmw==}
+  '@microsoft/api-extractor-model@7.29.4':
+    resolution: {integrity: sha512-LHOMxmT8/tU1IiiiHOdHFF83Qsi+V8d0kLfscG4EvQE9cafiR8blOYr8SfkQKWB1wgEilQgXJX3MIA4vetDLZw==}
 
-  '@microsoft/api-extractor@7.47.0':
-    resolution: {integrity: sha512-LT8yvcWNf76EpDC+8/ArTVSYePvuDQ+YbAUrsTcpg3ptiZ93HIcMCozP/JOxDt+rrsFfFHcpfoselKfPyRI0GQ==}
+  '@microsoft/api-extractor@7.47.4':
+    resolution: {integrity: sha512-HKm+P4VNzWwvq1Ey+Jfhhj/3MjsD+ka2hbt8L5AcRM95lu1MFOYnz3XlU7Gr79Q/ZhOb7W/imAKeYrOI0bFydg==}
     hasBin: true
 
   '@microsoft/tsdoc-config@0.17.0':
@@ -3321,10 +3311,6 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@mswjs/cookies@1.1.0':
-    resolution: {integrity: sha512-0ZcCVQxifZmhwNBoQIrystCb+2sWBY2Zw8lpfJBPCHGCA/HWqehITeCRVIv4VMy8MPlaHo2w2pTHFV2pFfqKPw==}
-    engines: {node: '>=18'}
-
   '@mswjs/interceptors@0.29.1':
     resolution: {integrity: sha512-3rDakgJZ77+RiQUuSK69t1F0m8BQKA8Vh5DCS5V0DWvNY67zob2JhhQrhCO0AKLGINTRSFd1tBaHcJTkhefoSw==}
     engines: {node: '>=18'}
@@ -3387,9 +3373,6 @@ packages:
     resolution: {integrity: sha512-XsEZi97+kKykmAiPpY+IpZoHxJY1srqFZp8jDt1/RySzC0kB0iZYt/VMIFqQKpLCARZjD7SOAz2AULtwYlesCA==}
     engines: {node: '>= 10'}
 
-  '@ndelangen/get-tarball@3.0.7':
-    resolution: {integrity: sha512-NqGfTZIZpRFef1GoVaShSSRwDC3vde3ThtTeqFdcYd6ipKqnfEVhjK2hUeHjCQUcptyZr2TONqcloFXM+5QBrQ==}
-
   '@nestjs/common@10.3.10':
     resolution: {integrity: sha512-H8k0jZtxk1IdtErGDmxFRy0PfcOAUg41Prrqpx76DQusGGJjsaovs1zjXVD1rZWaVYchfT1uczJ6L4Kio10VNg==}
     peerDependencies:
@@ -3512,32 +3495,32 @@ packages:
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
 
-  '@opentelemetry/instrumentation-connect@0.37.0':
-    resolution: {integrity: sha512-SeQktDIH5rNzjiEiazWiJAIXkmnLOnNV7wwHpahrqE0Ph+Z3heqMfxRtoMtbdJSIYLfcNZYO51AjxZ00IXufdw==}
+  '@opentelemetry/instrumentation-connect@0.38.0':
+    resolution: {integrity: sha512-2/nRnx3pjYEmdPIaBwtgtSviTKHWnDZN3R+TkRUnhIVrvBKVcq+I5B2rtd6mr6Fe9cHlZ9Ojcuh7pkNh/xdWWg==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-express@0.40.1':
-    resolution: {integrity: sha512-+RKMvVe2zw3kIXRup9c1jFu3T4d0fs5aKy015TpiMyoCKX1UMu3Z0lfgYtuyiSTANvg5hZnDbWmQmqSPj9VTvg==}
+  '@opentelemetry/instrumentation-express@0.41.0':
+    resolution: {integrity: sha512-/B7fbMdaf3SYe5f1P973tkqd6s7XZirjpfkoJ63E7nltU30qmlgm9tY5XwZOzAFI0rHS9tbrFI2HFPAvQUFe/A==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-fastify@0.37.0':
-    resolution: {integrity: sha512-WRjwzNZgupSzbEYvo9s+QuHJRqZJjVdNxSEpGBwWK8RKLlHGwGVAu0gcc2gPamJWUJsGqPGvahAPWM18ZkWj6A==}
+  '@opentelemetry/instrumentation-fastify@0.38.0':
+    resolution: {integrity: sha512-HBVLpTSYpkQZ87/Df3N0gAw7VzYZV3n28THIBrJWfuqw3Or7UqdhnjeuMIPQ04BKk3aZc0cWn2naSQObbh5vXw==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-graphql@0.41.0':
-    resolution: {integrity: sha512-R/gXeljgIhaRDKquVkKYT5QHPnFouM8ooyePZEP0kqyaVAedtR1V7NfAUJbxfTG5fBQa5wdmLjvu63+tzRXZCA==}
+  '@opentelemetry/instrumentation-graphql@0.42.0':
+    resolution: {integrity: sha512-N8SOwoKL9KQSX7z3gOaw5UaTeVQcfDO1c21csVHnmnmGUoqsXbArK2B8VuwPWcv6/BC/i3io+xTo7QGRZ/z28Q==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-hapi@0.39.0':
-    resolution: {integrity: sha512-ik2nA9Yj2s2ay+aNY+tJsKCsEx6Tsc2g/MK0iWBW5tibwrWKTy1pdVt5sB3kd5Gkimqj23UV5+FH2JFcQLeKug==}
+  '@opentelemetry/instrumentation-hapi@0.40.0':
+    resolution: {integrity: sha512-8U/w7Ifumtd2bSN1OLaSwAAFhb9FyqWUki3lMMB0ds+1+HdSxYBe9aspEJEgvxAqOkrQnVniAPTEGf1pGM7SOw==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
@@ -3548,62 +3531,62 @@ packages:
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-ioredis@0.41.0':
-    resolution: {integrity: sha512-rxiLloU8VyeJGm5j2fZS8ShVdB82n7VNP8wTwfUQqDwRfHCnkzGr+buKoxuhGD91gtwJ91RHkjHA1Eg6RqsUTg==}
+  '@opentelemetry/instrumentation-ioredis@0.42.0':
+    resolution: {integrity: sha512-P11H168EKvBB9TUSasNDOGJCSkpT44XgoM6d3gRIWAa9ghLpYhl0uRkS8//MqPzcJVHr3h3RmfXIpiYLjyIZTw==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-koa@0.41.0':
-    resolution: {integrity: sha512-mbPnDt7ELvpM2S0vixYUsde7122lgegLOJQxx8iJQbB8YHal/xnTh9v7IfArSVzIDo+E+080hxZyUZD4boOWkw==}
+  '@opentelemetry/instrumentation-koa@0.42.0':
+    resolution: {integrity: sha512-H1BEmnMhho8o8HuNRq5zEI4+SIHDIglNB7BPKohZyWG4fWNuR7yM4GTlR01Syq21vODAS7z5omblScJD/eZdKw==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-mongodb@0.45.0':
-    resolution: {integrity: sha512-xnZP9+ayeB1JJyNE9cIiwhOJTzNEsRhXVdLgfzmrs48Chhhk026mQdM5CITfyXSCfN73FGAIB8d91+pflJEfWQ==}
+  '@opentelemetry/instrumentation-mongodb@0.46.0':
+    resolution: {integrity: sha512-VF/MicZ5UOBiXrqBslzwxhN7TVqzu1/LN/QDpkskqM0Zm0aZ4CVRbUygL8d7lrjLn15x5kGIe8VsSphMfPJzlA==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-mongoose@0.39.0':
-    resolution: {integrity: sha512-J1r66A7zJklPPhMtrFOO7/Ud2p0Pv5u8+r23Cd1JUH6fYPmftNJVsLp2urAt6PHK4jVqpP/YegN8wzjJ2mZNPQ==}
+  '@opentelemetry/instrumentation-mongoose@0.40.0':
+    resolution: {integrity: sha512-niRi5ZUnkgzRhIGMOozTyoZIvJKNJyhijQI4nF4iFSb+FUx2v5fngfR+8XLmdQAO7xmsD8E5vEGdDVYVtKbZew==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-mysql2@0.39.0':
-    resolution: {integrity: sha512-Iypuq2z6TCfriAXCIZjRq8GTFCKhQv5SpXbmI+e60rYdXw8NHtMH4NXcGF0eKTuoCsC59IYSTUvDQYDKReaszA==}
+  '@opentelemetry/instrumentation-mysql2@0.40.0':
+    resolution: {integrity: sha512-0xfS1xcqUmY7WE1uWjlmI67Xg3QsSUlNT+AcXHeA4BDUPwZtWqF4ezIwLgpVZfHOnkAEheqGfNSWd1PIu3Wnfg==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-mysql@0.39.0':
-    resolution: {integrity: sha512-8snHPh83rhrDf31v9Kq0Nf+ts8hdr7NguuszRqZomZBHgE0+UyXZSkXHAAFZoBPPRMGyM68uaFE5hVtFl+wOcA==}
+  '@opentelemetry/instrumentation-mysql@0.40.0':
+    resolution: {integrity: sha512-d7ja8yizsOCNMYIJt5PH/fKZXjb/mS48zLROO4BzZTtDfhNCl2UM/9VIomP2qkGIFVouSJrGr/T00EzY7bPtKA==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-nestjs-core@0.38.0':
-    resolution: {integrity: sha512-M381Df1dM8aqihZz2yK+ugvMFK5vlHG/835dc67Sx2hH4pQEQYDA2PpFPTgc9AYYOydQaj7ClFQunESimjXDgg==}
+  '@opentelemetry/instrumentation-nestjs-core@0.39.0':
+    resolution: {integrity: sha512-mewVhEXdikyvIZoMIUry8eb8l3HUjuQjSjVbmLVTt4NQi35tkpnHQrG9bTRBrl3403LoWZ2njMPJyg4l6HfKvA==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-pg@0.42.0':
-    resolution: {integrity: sha512-sjgcM8CswYy8zxHgXv4RAZ09DlYhQ+9TdlourUs63Df/ek5RrB1ZbjznqW7PB6c3TyJJmX6AVtPTjAsROovEjA==}
+  '@opentelemetry/instrumentation-pg@0.43.0':
+    resolution: {integrity: sha512-og23KLyoxdnAeFs1UWqzSonuCkePUzCX30keSYigIzJe/6WSYA8rnEI5lobcxPEzg+GcU06J7jzokuEHbjVJNw==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-redis-4@0.40.0':
-    resolution: {integrity: sha512-0ieQYJb6yl35kXA75LQUPhHtGjtQU9L85KlWa7d4ohBbk/iQKZ3X3CFl5jC5vNMq/GGPB3+w3IxNvALlHtrp7A==}
+  '@opentelemetry/instrumentation-redis-4@0.41.0':
+    resolution: {integrity: sha512-H7IfGTqW2reLXqput4yzAe8YpDC0fmVNal95GHMLOrS89W+qWUKIqxolSh63hJyfmwPSFwXASzj7wpSk8Az+Dg==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation@0.43.0':
-    resolution: {integrity: sha512-S1uHE+sxaepgp+t8lvIDuRgyjJWisAb733198kwQTUc9ZtYQ2V2gmyCtR1x21ePGVLoMiX/NWY7WA290hwkjJQ==}
+  '@opentelemetry/instrumentation@0.46.0':
+    resolution: {integrity: sha512-a9TijXZZbk0vI5TGLZl+0kxyFfrXHhX6Svtz7Pp2/VBlCSKrazuULEyoJQrOknJyFWNMEmbbJgOciHCCpQcisw==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
@@ -3679,170 +3662,8 @@ packages:
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
 
-  '@prisma/instrumentation@5.16.0':
-    resolution: {integrity: sha512-MVzNRW2ikWvVNnMIEgQMcwWxpFD+XF2U2h0Qz7MjutRqJxrhWexWV2aSi2OXRaU8UL5wzWw7pnjdKUzYhWauLg==}
-
-  '@radix-ui/primitive@1.1.0':
-    resolution: {integrity: sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==}
-
-  '@radix-ui/react-compose-refs@1.1.0':
-    resolution: {integrity: sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-context@1.1.0':
-    resolution: {integrity: sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-dialog@1.1.1':
-    resolution: {integrity: sha512-zysS+iU4YP3STKNS6USvFVqI4qqx8EpiwmT5TuCApVEBca+eRCbONi4EgzfNSuVnOXvC5UPHHMjs8RXO6DH9Bg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-dismissable-layer@1.1.0':
-    resolution: {integrity: sha512-/UovfmmXGptwGcBQawLzvn2jOfM0t4z3/uKffoBlj724+n3FvBbZ7M0aaBOmkp6pqFYpO4yx8tSVJjx3Fl2jig==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-focus-guards@1.1.0':
-    resolution: {integrity: sha512-w6XZNUPVv6xCpZUqb/yN9DL6auvpGX3C/ee6Hdi16v2UUy25HV2Q5bcflsiDyT/g5RwbPQ/GIT1vLkeRb+ITBw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-focus-scope@1.1.0':
-    resolution: {integrity: sha512-200UD8zylvEyL8Bx+z76RJnASR2gRMuxlgFCPAe/Q/679a/r0eK3MBVYMb7vZODZcffZBdob1EGnky78xmVvcA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-id@1.1.0':
-    resolution: {integrity: sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-portal@1.1.1':
-    resolution: {integrity: sha512-A3UtLk85UtqhzFqtoC8Q0KvR2GbXF3mtPgACSazajqq6A41mEQgo53iPzY4i6BwDxlIFqWIhiQ2G729n+2aw/g==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-presence@1.1.0':
-    resolution: {integrity: sha512-Gq6wuRN/asf9H/E/VzdKoUtT8GC9PQc9z40/vEr0VCJ4u5XvvhWIrSsCB6vD2/cH7ugTdSfYq9fLJCcM00acrQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-primitive@2.0.0':
-    resolution: {integrity: sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-slot@1.1.0':
-    resolution: {integrity: sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-use-callback-ref@1.1.0':
-    resolution: {integrity: sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-use-controllable-state@1.1.0':
-    resolution: {integrity: sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-use-escape-keydown@1.1.0':
-    resolution: {integrity: sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@radix-ui/react-use-layout-effect@1.1.0':
-    resolution: {integrity: sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@prisma/instrumentation@5.17.0':
+    resolution: {integrity: sha512-c1Sle4ji8aasMcYfBBHFM56We4ljfenVtRmS8aY06BllS7SoU6SmJBwG7vil+GHiR0Yrh+t9iBwt4AY0Jr4KNQ==}
 
   '@readme/better-ajv-errors@1.6.0':
     resolution: {integrity: sha512-9gO9rld84Jgu13kcbKRU+WHseNhaVt76wYMeRDGsUGYxwJtI3RmEJ9LY9dZCYQGI8eUZLuxb5qDja0nqklpFjQ==}
@@ -3886,121 +3707,121 @@ packages:
       rollup:
         optional: true
 
-  '@rollup/rollup-android-arm-eabi@4.18.0':
-    resolution: {integrity: sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==}
+  '@rollup/rollup-android-arm-eabi@4.19.1':
+    resolution: {integrity: sha512-XzqSg714++M+FXhHfXpS1tDnNZNpgxxuGZWlRG/jSj+VEPmZ0yg6jV4E0AL3uyBKxO8mO3xtOsP5mQ+XLfrlww==}
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.18.0':
-    resolution: {integrity: sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==}
+  '@rollup/rollup-android-arm64@4.19.1':
+    resolution: {integrity: sha512-thFUbkHteM20BGShD6P08aungq4irbIZKUNbG70LN8RkO7YztcGPiKTTGZS7Kw+x5h8hOXs0i4OaHwFxlpQN6A==}
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-darwin-arm64@4.18.0':
-    resolution: {integrity: sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==}
+  '@rollup/rollup-darwin-arm64@4.19.1':
+    resolution: {integrity: sha512-8o6eqeFZzVLia2hKPUZk4jdE3zW7LCcZr+MD18tXkgBBid3lssGVAYuox8x6YHoEPDdDa9ixTaStcmx88lio5Q==}
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.18.0':
-    resolution: {integrity: sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==}
+  '@rollup/rollup-darwin-x64@4.19.1':
+    resolution: {integrity: sha512-4T42heKsnbjkn7ovYiAdDVRRWZLU9Kmhdt6HafZxFcUdpjlBlxj4wDrt1yFWLk7G4+E+8p2C9tcmSu0KA6auGA==}
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.18.0':
-    resolution: {integrity: sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==}
+  '@rollup/rollup-linux-arm-gnueabihf@4.19.1':
+    resolution: {integrity: sha512-MXg1xp+e5GhZ3Vit1gGEyoC+dyQUBy2JgVQ+3hUrD9wZMkUw/ywgkpK7oZgnB6kPpGrxJ41clkPPnsknuD6M2Q==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.18.0':
-    resolution: {integrity: sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==}
+  '@rollup/rollup-linux-arm-musleabihf@4.19.1':
+    resolution: {integrity: sha512-DZNLwIY4ftPSRVkJEaxYkq7u2zel7aah57HESuNkUnz+3bZHxwkCUkrfS2IWC1sxK6F2QNIR0Qr/YXw7nkF3Pw==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-gnu@4.18.0':
-    resolution: {integrity: sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==}
+  '@rollup/rollup-linux-arm64-gnu@4.19.1':
+    resolution: {integrity: sha512-C7evongnjyxdngSDRRSQv5GvyfISizgtk9RM+z2biV5kY6S/NF/wta7K+DanmktC5DkuaJQgoKGf7KUDmA7RUw==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-musl@4.18.0':
-    resolution: {integrity: sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==}
+  '@rollup/rollup-linux-arm64-musl@4.19.1':
+    resolution: {integrity: sha512-89tFWqxfxLLHkAthAcrTs9etAoBFRduNfWdl2xUs/yLV+7XDrJ5yuXMHptNqf1Zw0UCA3cAutkAiAokYCkaPtw==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.18.0':
-    resolution: {integrity: sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==}
+  '@rollup/rollup-linux-powerpc64le-gnu@4.19.1':
+    resolution: {integrity: sha512-PromGeV50sq+YfaisG8W3fd+Cl6mnOOiNv2qKKqKCpiiEke2KiKVyDqG/Mb9GWKbYMHj5a01fq/qlUR28PFhCQ==}
     cpu: [ppc64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.18.0':
-    resolution: {integrity: sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==}
+  '@rollup/rollup-linux-riscv64-gnu@4.19.1':
+    resolution: {integrity: sha512-/1BmHYh+iz0cNCP0oHCuF8CSiNj0JOGf0jRlSo3L/FAyZyG2rGBuKpkZVH9YF+x58r1jgWxvm1aRg3DHrLDt6A==}
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-s390x-gnu@4.18.0':
-    resolution: {integrity: sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==}
+  '@rollup/rollup-linux-s390x-gnu@4.19.1':
+    resolution: {integrity: sha512-0cYP5rGkQWRZKy9/HtsWVStLXzCF3cCBTRI+qRL8Z+wkYlqN7zrSYm6FuY5Kd5ysS5aH0q5lVgb/WbG4jqXN1Q==}
     cpu: [s390x]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-gnu@4.18.0':
-    resolution: {integrity: sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==}
+  '@rollup/rollup-linux-x64-gnu@4.19.1':
+    resolution: {integrity: sha512-XUXeI9eM8rMP8aGvii/aOOiMvTs7xlCosq9xCjcqI9+5hBxtjDpD+7Abm1ZhVIFE1J2h2VIg0t2DX/gjespC2Q==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-musl@4.18.0':
-    resolution: {integrity: sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==}
+  '@rollup/rollup-linux-x64-musl@4.19.1':
+    resolution: {integrity: sha512-V7cBw/cKXMfEVhpSvVZhC+iGifD6U1zJ4tbibjjN+Xi3blSXaj/rJynAkCFFQfoG6VZrAiP7uGVzL440Q6Me2Q==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-win32-arm64-msvc@4.18.0':
-    resolution: {integrity: sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==}
+  '@rollup/rollup-win32-arm64-msvc@4.19.1':
+    resolution: {integrity: sha512-88brja2vldW/76jWATlBqHEoGjJLRnP0WOEKAUbMcXaAZnemNhlAHSyj4jIwMoP2T750LE9lblvD4e2jXleZsA==}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.18.0':
-    resolution: {integrity: sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==}
+  '@rollup/rollup-win32-ia32-msvc@4.19.1':
+    resolution: {integrity: sha512-LdxxcqRVSXi6k6JUrTah1rHuaupoeuiv38du8Mt4r4IPer3kwlTo+RuvfE8KzZ/tL6BhaPlzJ3835i6CxrFIRQ==}
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.18.0':
-    resolution: {integrity: sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==}
+  '@rollup/rollup-win32-x64-msvc@4.19.1':
+    resolution: {integrity: sha512-2bIrL28PcK3YCqD9anGxDxamxdiJAxA+l7fWIwM5o8UqNy1t3d1NdAweO2XhA0KTDJ5aH1FsuiT5+7VhtHliXg==}
     cpu: [x64]
     os: [win32]
 
-  '@rushstack/node-core-library@5.4.1':
-    resolution: {integrity: sha512-WNnwdS8r9NZ/2K3u29tNoSRldscFa7SxU0RT+82B6Dy2I4Hl2MeCSKm4EXLXPKeNzLGvJ1cqbUhTLviSF8E6iA==}
+  '@rushstack/node-core-library@5.5.1':
+    resolution: {integrity: sha512-ZutW56qIzH8xIOlfyaLQJFx+8IBqdbVCZdnj+XT1MorQ1JqqxHse8vbCpEM+2MjsrqcbxcgDIbfggB1ZSQ2A3g==}
     peerDependencies:
       '@types/node': '*'
     peerDependenciesMeta:
       '@types/node':
         optional: true
 
-  '@rushstack/rig-package@0.5.2':
-    resolution: {integrity: sha512-mUDecIJeH3yYGZs2a48k+pbhM6JYwWlgjs2Ca5f2n1G2/kgdgP9D/07oglEGf6mRyXEnazhEENeYTSNDRCwdqA==}
+  '@rushstack/rig-package@0.5.3':
+    resolution: {integrity: sha512-olzSSjYrvCNxUFZowevC3uz8gvKr3WTpHQ7BkpjtRpA3wK+T0ybep/SRUMfr195gBzJm5gaXw0ZMgjIyHqJUow==}
 
-  '@rushstack/terminal@0.13.0':
-    resolution: {integrity: sha512-Ou44Q2s81BqJu3dpYedAX54am9vn245F0HzqVrfJCMQk5pGgoKKOBOjkbfZC9QKcGNaECh6pwH2s5noJt7X6ew==}
+  '@rushstack/terminal@0.13.3':
+    resolution: {integrity: sha512-fc3zjXOw8E0pXS5t9vTiIPx9gHA0fIdTXsu9mT4WbH+P3mYvnrX0iAQ5a6NvyK1+CqYWBTw/wVNx7SDJkI+WYQ==}
     peerDependencies:
       '@types/node': '*'
     peerDependenciesMeta:
       '@types/node':
         optional: true
 
-  '@rushstack/ts-command-line@4.22.0':
-    resolution: {integrity: sha512-Qj28t6MO3HRgAZ72FDeFsrpdE6wBWxF3VENgvrXh7JF2qIT+CrXiOJIesW80VFZB9QwObSpkB1ilx794fGQg6g==}
+  '@rushstack/ts-command-line@4.22.3':
+    resolution: {integrity: sha512-edMpWB3QhFFZ4KtSzS8WNjBgR4PXPPOVrOHMbb7kNpmQ1UFS9HdVtjCXg1H5fG+xYAbeE+TMPcVPUyX2p84STA==}
 
   '@sec-ant/readable-stream@0.4.1':
     resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==}
 
-  '@sentry/core@8.13.0':
-    resolution: {integrity: sha512-N9Qg4ZGxZWp8eb2eUUHVVKgjBLtFIjS805nG92s6yJmkvOpKm6mLtcUaT/iDf3Hta6nG+xRkhbE3r+Z4cbXG8w==}
+  '@sentry/core@8.20.0':
+    resolution: {integrity: sha512-R81snuw+67VT4aCxr6ShST/s0Y6FlwN2YczhDwaGyzumn5rlvA6A4JtQDeExduNoDDyv4T3LrmW8wlYZn3CJJw==}
     engines: {node: '>=14.18'}
 
-  '@sentry/node@8.13.0':
-    resolution: {integrity: sha512-OeZ7K90RhyxfwfreerIi4cszzHrPRRH36STJno2+p3sIGbG5VScOccqXzYEOAqHpByxnti4KQN34BLAT2BFOEA==}
+  '@sentry/node@8.20.0':
+    resolution: {integrity: sha512-i4ywT2m0Gw65U3uwI4NwiNcyqp9YF6/RsusfH1pg4YkiL/RYp7FS0MPVgMggfvoue9S3KjCgRVlzTLwFATyPXQ==}
     engines: {node: '>=14.18'}
 
-  '@sentry/opentelemetry@8.13.0':
-    resolution: {integrity: sha512-NYn/HNE/SxFXe8pfnxJknhrrRzYRMHNssCoi5M1CeR5G7F2BGxxVmaGsd8j0WyTCpUS4i97G4vhYtDGxHvWN6w==}
+  '@sentry/opentelemetry@8.20.0':
+    resolution: {integrity: sha512-NFcLK6+t9wUc4HlGKeuDn6W4KjZxZfZmWlrK2/tgC5KzG1cnVeOnWUrJzGHTa+YDDdIijpjiFUcpXGPkX3rmIg==}
     engines: {node: '>=14.18'}
     peerDependencies:
       '@opentelemetry/api': ^1.9.0
@@ -4009,21 +3830,21 @@ packages:
       '@opentelemetry/sdk-trace-base': ^1.25.1
       '@opentelemetry/semantic-conventions': ^1.25.1
 
-  '@sentry/profiling-node@8.13.0':
-    resolution: {integrity: sha512-6qirN71xlMahcm4m25XZLnjQdvs0EaFym/9MdLqcsAa3gAHZtw6h+IDapUzBWRXVOrU1OR5oQdh2tlFthsDtew==}
+  '@sentry/profiling-node@8.20.0':
+    resolution: {integrity: sha512-vQaMYjPM7o0qvmj4atxXZywIDhnxMwTlc6x24eKqT8zN0OFBuIc1nYIacT7pEmd7R6e/mXdiG04GH1Vg0bHfOQ==}
     engines: {node: '>=14.18'}
     hasBin: true
 
-  '@sentry/types@8.13.0':
-    resolution: {integrity: sha512-r63s/H5gvQnQM9tTGBXz2xErUbxZALh4e2Lg/1aHj4zIvGLBjA2z5qWsh6TEZYbpmgAyGShLDr6+rWeUVf9yBQ==}
+  '@sentry/types@8.20.0':
+    resolution: {integrity: sha512-6IP278KojOpiAA7vrd1hjhUyn26cl0n0nGsShzic5ztCVs92sTeVRnh7MTB9irDVtAbOEyt/YH6go3h+Jia1pA==}
     engines: {node: '>=14.18'}
 
-  '@sentry/utils@8.13.0':
-    resolution: {integrity: sha512-PxV0v9VbGWH9zP37P5w2msLUFDr287nYjoY2XVF+RSolyiTs1CQNI5ZMUO3o4MsSac/dpXxjyrZXQd72t/jRYA==}
+  '@sentry/utils@8.20.0':
+    resolution: {integrity: sha512-+1I5H8dojURiEUGPliDwheQk8dhjp8uV1sMccR/W/zjFrt4wZyPs+Ttp/V7gzm9LDJoNek9tmELert/jQqWTgg==}
     engines: {node: '>=14.18'}
 
-  '@shikijs/core@1.10.0':
-    resolution: {integrity: sha512-BZcr6FCmPfP6TXaekvujZcnkFmJHZ/Yglu97r/9VjzVndQA56/F4WjUKtJRQUnK59Wi7p/UTAOekMfCJv7jnYg==}
+  '@shikijs/core@1.12.0':
+    resolution: {integrity: sha512-mc1cLbm6UQ8RxLc0dZES7v5rkH+99LxQp/ZvTqV3NLyYsO/fD6JhEflP1H5b2SDq9gI0+0G36AVZWxvounfR9w==}
 
   '@sideway/address@4.1.4':
     resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==}
@@ -4034,8 +3855,8 @@ packages:
   '@sideway/pinpoint@2.0.0':
     resolution: {integrity: sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==}
 
-  '@simplewebauthn/server@10.0.0':
-    resolution: {integrity: sha512-w5eIoiF7ltg1sgggjY5Tx654j+DBuyEx2B3869jjmPp0xl2Z4BUP4kJ3yJ6DnZIv+ZYYntT3E6nZXNjPOQbrtw==}
+  '@simplewebauthn/server@10.0.1':
+    resolution: {integrity: sha512-djNWcRn+H+6zvihBFJSpG3fzb0NQS9c/Mw5dYOtZ9H+oDw8qn9Htqxt4cpqRvSOAfwqP7rOvE9rwqVaoGGc3hg==}
     engines: {node: '>=20.0.0'}
 
   '@simplewebauthn/types@10.0.0':
@@ -4052,9 +3873,9 @@ packages:
     resolution: {integrity: sha512-CX6t4SYQ37lzxicAqsBtxA3OseeoVrh9cSJ5PFYam0GksYlupRfy1A+Q4aYD3zvcfECLc0zO2u+ZnR2UYKvCrw==}
     engines: {node: '>=14.16'}
 
-  '@sindresorhus/is@6.3.1':
-    resolution: {integrity: sha512-FX4MfcifwJyFOI2lPoX7PQxCqx8BG1HCho7WdiXwpEQx1Ycij0JxkfYtGK7yqNScrZGSlt6RE6sw8QYoH7eKnQ==}
-    engines: {node: '>=16'}
+  '@sindresorhus/is@7.0.0':
+    resolution: {integrity: sha512-WDTlVTyvFivSOuyvMeedzg2hdoBLZ3f1uNVuEida2Rl9BrfjrIRjWA/VZIrMRLvSwJYCAlCRA3usDt1THytxWQ==}
+    engines: {node: '>=18'}
 
   '@sindresorhus/merge-streams@2.3.0':
     resolution: {integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==}
@@ -4096,23 +3917,23 @@ packages:
   '@smithy/chunked-blob-reader@3.0.0':
     resolution: {integrity: sha512-sbnURCwjF0gSToGlsBiAmd1lRCmSn72nu9axfJu5lIx6RUEgHu6GwTMbqCdhQSi0Pumcm5vFxsi9XWXb2mTaoA==}
 
-  '@smithy/config-resolver@3.0.4':
-    resolution: {integrity: sha512-VwiOk7TwXoE7NlNguV/aPq1hFH72tqkHCw8eWXbr2xHspRyyv9DLpLXhq+Ieje+NwoqXrY0xyQjPXdOE6cGcHA==}
+  '@smithy/config-resolver@3.0.5':
+    resolution: {integrity: sha512-SkW5LxfkSI1bUC74OtfBbdz+grQXYiPYolyu8VfpLIjEoN/sHVBlLeGXMQ1vX4ejkgfv6sxVbQJ32yF2cl1veA==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/core@2.2.4':
-    resolution: {integrity: sha512-qdY3LpMOUyLM/gfjjMQZui+UTNS7kBRDWlvyIhVOql5dn2J3isk9qUTBtQ1CbDH8MTugHis1zu3h4rH+Qmmh4g==}
+  '@smithy/core@2.3.1':
+    resolution: {integrity: sha512-BC7VMXx/1BCmRPCVzzn4HGWAtsrb7/0758EtwOGFJQrlSwJBEjCcDLNZLFoL/68JexYa2s+KmgL/UfmXdG6v1w==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/credential-provider-imds@3.1.3':
-    resolution: {integrity: sha512-U1Yrv6hx/mRK6k8AncuI6jLUx9rn0VVSd9NPEX6pyYFBfkSkChOc/n4zUb8alHUVg83TbI4OdZVo1X0Zfj3ijA==}
+  '@smithy/credential-provider-imds@3.2.0':
+    resolution: {integrity: sha512-0SCIzgd8LYZ9EJxUjLXBmEKSZR/P/w6l7Rz/pab9culE/RWuqelAKGJvn5qUOl8BgX8Yj5HWM50A5hiB/RzsgA==}
     engines: {node: '>=16.0.0'}
 
   '@smithy/eventstream-codec@3.1.2':
     resolution: {integrity: sha512-0mBcu49JWt4MXhrhRAlxASNy0IjDRFU+aWNDRal9OtUJvJNiwDuyKMUONSOjLjSCeGwZaE0wOErdqULer8r7yw==}
 
-  '@smithy/eventstream-serde-browser@3.0.4':
-    resolution: {integrity: sha512-Eo4anLZX6ltGJTZ5yJMc80gZPYYwBn44g0h7oFq6et+TYr5dUsTpIcDbz2evsOKIZhZ7zBoFWHtBXQ4QQeb5xA==}
+  '@smithy/eventstream-serde-browser@3.0.5':
+    resolution: {integrity: sha512-dEyiUYL/ekDfk+2Ra4GxV+xNnFoCmk1nuIXg+fMChFTrM2uI/1r9AdiTYzPqgb72yIv/NtAj6C3dG//1wwgakQ==}
     engines: {node: '>=16.0.0'}
 
   '@smithy/eventstream-serde-config-resolver@3.0.3':
@@ -4127,8 +3948,8 @@ packages:
     resolution: {integrity: sha512-Od9dv8zh3PgOD7Vj4T3HSuox16n0VG8jJIM2gvKASL6aCtcS8CfHZDWe1Ik3ZXW6xBouU+45Q5wgoliWDZiJ0A==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/fetch-http-handler@3.2.0':
-    resolution: {integrity: sha512-vFvDxMrc6sO5Atec8PaISckMcAwsCrRhYxwUylg97bRT2KZoumOF7qk5+6EVUtuM1IG9AJV5aqXnHln9ZdXHpg==}
+  '@smithy/fetch-http-handler@3.2.4':
+    resolution: {integrity: sha512-kBprh5Gs5h7ug4nBWZi1FZthdqSM+T7zMmsZxx0IBvWUn7dK3diz2SHn7Bs4dQGFDk8plDv375gzenDoNwrXjg==}
 
   '@smithy/hash-blob-browser@3.1.2':
     resolution: {integrity: sha512-hAbfqN2UbISltakCC2TP0kx4LqXBttEv2MqSPE98gVuDFMf05lU+TpC41QtqGP3Ff5A3GwZMPfKnEy0VmEUpmg==}
@@ -4155,16 +3976,16 @@ packages:
   '@smithy/md5-js@3.0.3':
     resolution: {integrity: sha512-O/SAkGVwpWmelpj/8yDtsaVe6sINHLB1q8YE/+ZQbDxIw3SRLbTZuRaI10K12sVoENdnHqzPp5i3/H+BcZ3m3Q==}
 
-  '@smithy/middleware-content-length@3.0.3':
-    resolution: {integrity: sha512-Dbz2bzexReYIQDWMr+gZhpwBetNXzbhnEMhYKA6urqmojO14CsXjnsoPYO8UL/xxcawn8ZsuVU61ElkLSltIUQ==}
+  '@smithy/middleware-content-length@3.0.5':
+    resolution: {integrity: sha512-ILEzC2eyxx6ncej3zZSwMpB5RJ0zuqH7eMptxC4KN3f+v9bqT8ohssKbhNR78k/2tWW+KS5Spw+tbPF4Ejyqvw==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/middleware-endpoint@3.0.4':
-    resolution: {integrity: sha512-whUJMEPwl3ANIbXjBXZVdJNgfV2ZU8ayln7xUM47rXL2txuenI7jQ/VFFwCzy5lCmXScjp6zYtptW5Evud8e9g==}
+  '@smithy/middleware-endpoint@3.1.0':
+    resolution: {integrity: sha512-5y5aiKCEwg9TDPB4yFE7H6tYvGFf1OJHNczeY10/EFF8Ir8jZbNntQJxMWNfeQjC1mxPsaQ6mR9cvQbf+0YeMw==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/middleware-retry@3.0.7':
-    resolution: {integrity: sha512-f5q7Y09G+2h5ivkSx5CHvlAT4qRR3jBFEsfXyQ9nFNiWQlr8c48blnu5cmbTQ+p1xmIO14UXzKoF8d7Tm0Gsjw==}
+  '@smithy/middleware-retry@3.0.13':
+    resolution: {integrity: sha512-zvCLfaRYCaUmjbF2yxShGZdolSHft7NNCTA28HVN9hKcEbOH+g5irr1X9s+in8EpambclGnevZY4A3lYpvDCFw==}
     engines: {node: '>=16.0.0'}
 
   '@smithy/middleware-serde@3.0.3':
@@ -4175,16 +3996,16 @@ packages:
     resolution: {integrity: sha512-r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/node-config-provider@3.1.3':
-    resolution: {integrity: sha512-rxdpAZczzholz6CYZxtqDu/aKTxATD5DAUDVj7HoEulq+pDSQVWzbg0btZDlxeFfa6bb2b5tUvgdX5+k8jUqcg==}
+  '@smithy/node-config-provider@3.1.4':
+    resolution: {integrity: sha512-YvnElQy8HR4vDcAjoy7Xkx9YT8xZP4cBXcbJSgm/kxmiQu08DwUwj8rkGnyoJTpfl/3xYHH+d8zE+eHqoDCSdQ==}
     engines: {node: '>=16.0.0'}
 
   '@smithy/node-http-handler@2.5.0':
     resolution: {integrity: sha512-mVGyPBzkkGQsPoxQUbxlEfRjrj6FPyA3u3u2VXGr9hT8wilsoQdZdvKpMBFMB8Crfhv5dNkKHIW0Yyuc7eABqA==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/node-http-handler@3.1.1':
-    resolution: {integrity: sha512-L71NLyPeP450r2J/mfu1jMc//Z1YnqJt2eSNw7uhiItaONnBLDA68J5jgxq8+MBDsYnFwNAIc7dBG1ImiWBiwg==}
+  '@smithy/node-http-handler@3.1.4':
+    resolution: {integrity: sha512-+UmxgixgOr/yLsUxcEKGH0fMNVteJFGkmRltYFHnBMlogyFdpzn2CwqWmxOrfJELhV34v0WSlaqG1UtE1uXlJg==}
     engines: {node: '>=16.0.0'}
 
   '@smithy/property-provider@3.1.3':
@@ -4195,8 +4016,8 @@ packages:
     resolution: {integrity: sha512-Xy5XK1AFWW2nlY/biWZXu6/krgbaf2dg0q492D8M5qthsnU2H+UgFeZLbM76FnH7s6RO/xhQRkj+T6KBO3JzgQ==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/protocol-http@4.0.3':
-    resolution: {integrity: sha512-x5jmrCWwQlx+Zv4jAtc33ijJ+vqqYN+c/ZkrnpvEe/uDas7AT7A/4Rc2CdfxgWv4WFGmEqODIrrUToPN6DDkGw==}
+  '@smithy/protocol-http@4.1.0':
+    resolution: {integrity: sha512-dPVoHYQ2wcHooGXg3LQisa1hH0e4y0pAddPMeeUPipI1tEOqL6A4N0/G7abeq+K8wrwSgjk4C0wnD1XZpJm5aA==}
     engines: {node: '>=16.0.0'}
 
   '@smithy/querystring-builder@2.2.0':
@@ -4215,16 +4036,16 @@ packages:
     resolution: {integrity: sha512-Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/shared-ini-file-loader@3.1.3':
-    resolution: {integrity: sha512-Z8Y3+08vgoDgl4HENqNnnzSISAaGrF2RoKupoC47u2wiMp+Z8P/8mDh1CL8+8ujfi2U5naNvopSBmP/BUj8b5w==}
+  '@smithy/shared-ini-file-loader@3.1.4':
+    resolution: {integrity: sha512-qMxS4hBGB8FY2GQqshcRUy1K6k8aBWP5vwm8qKkCT3A9K2dawUwOIJfqh9Yste/Bl0J2lzosVyrXDj68kLcHXQ==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/signature-v4@3.1.2':
-    resolution: {integrity: sha512-3BcPylEsYtD0esM4Hoyml/+s7WP2LFhcM3J2AGdcL2vx9O60TtfpDOL72gjb4lU8NeRPeKAwR77YNyyGvMbuEA==}
+  '@smithy/signature-v4@4.1.0':
+    resolution: {integrity: sha512-aRryp2XNZeRcOtuJoxjydO6QTaVhxx/vjaR+gx7ZjaFgrgPRyZ3HCTbfwqYj6ZWEBHkCSUfcaymKPURaByukag==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/smithy-client@3.1.5':
-    resolution: {integrity: sha512-x9bL9Mx2CT2P1OiUlHM+ZNpbVU6TgT32f9CmTRzqIHA7M4vYrROCWEoC3o4xHNJASoGd4Opos3cXYPgh+/m4Ww==}
+  '@smithy/smithy-client@3.1.11':
+    resolution: {integrity: sha512-l0BpyYkciNyMaS+PnFFz4aO5sBcXvGLoJd7mX9xrMBIm2nIQBVvYgp2ZpPDMzwjKCavsXu06iuCm0F6ZJZc6yQ==}
     engines: {node: '>=16.0.0'}
 
   '@smithy/types@2.12.0':
@@ -4261,16 +4082,16 @@ packages:
     resolution: {integrity: sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/util-defaults-mode-browser@3.0.7':
-    resolution: {integrity: sha512-Q2txLyvQyGfmjsaDbVV7Sg8psefpFcrnlGapDzXGFRPFKRBeEg6OvFK8FljqjeHSaCZ6/UuzQExUPqBR/2qlDA==}
+  '@smithy/util-defaults-mode-browser@3.0.13':
+    resolution: {integrity: sha512-ZIRSUsnnMRStOP6OKtW+gCSiVFkwnfQF2xtf32QKAbHR6ACjhbAybDvry+3L5qQYdh3H6+7yD/AiUE45n8mTTw==}
     engines: {node: '>= 10.0.0'}
 
-  '@smithy/util-defaults-mode-node@3.0.7':
-    resolution: {integrity: sha512-F4Qcj1fG6MGi2BSWCslfsMSwllws/WzYONBGtLybyY+halAcXdWhcew+mej8M5SKd5hqPYp4f7b+ABQEaeytgg==}
+  '@smithy/util-defaults-mode-node@3.0.13':
+    resolution: {integrity: sha512-voUa8TFJGfD+U12tlNNLCDlXibt9vRdNzRX45Onk/WxZe7TS+hTOZouEZRa7oARGicdgeXvt1A0W45qLGYdy+g==}
     engines: {node: '>= 10.0.0'}
 
-  '@smithy/util-endpoints@2.0.4':
-    resolution: {integrity: sha512-ZAtNf+vXAsgzgRutDDiklU09ZzZiiV/nATyqde4Um4priTmasDH+eLpp3tspL0hS2dEootyFMhu1Y6Y+tzpWBQ==}
+  '@smithy/util-endpoints@2.0.5':
+    resolution: {integrity: sha512-ReQP0BWihIE68OAblC/WQmDD40Gx+QY1Ez8mTdFMXpmjfxSyz2fVQu3A4zXRfQU9sZXtewk3GmhfOHswvX+eNg==}
     engines: {node: '>=16.0.0'}
 
   '@smithy/util-hex-encoding@3.0.0':
@@ -4285,8 +4106,8 @@ packages:
     resolution: {integrity: sha512-AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/util-stream@3.0.5':
-    resolution: {integrity: sha512-xC3L5PKMAT/Bh8fmHNXP9sdQ4+4aKVUU3EEJ2CF/lLk7R+wtMJM+v/1B4en7jO++Wa5spGzFDBCl0QxgbUc5Ug==}
+  '@smithy/util-stream@3.1.3':
+    resolution: {integrity: sha512-FIv/bRhIlAxC0U7xM1BCnF2aDRPq0UaelqBHkM2lsCp26mcBbgI0tCVTv+jGdsQLUmAMybua/bjDsSu8RQHbmw==}
     engines: {node: '>=16.0.0'}
 
   '@smithy/util-uri-escape@2.2.0':
@@ -4312,58 +4133,86 @@ packages:
   '@sqltools/formatter@1.2.5':
     resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
 
-  '@storybook/addon-actions@8.1.11':
-    resolution: {integrity: sha512-jqYXgBgOVInStOCk//AA+dGkrfN8R7rDXA4lyu82zM59kvICtG9iqgmkSRDn0Z3zUkM+lIHZGoz0aLVQ8pxsgw==}
+  '@storybook/addon-actions@8.2.6':
+    resolution: {integrity: sha512-iCsf3V28/jJ95w2zd8aSvR4denoA2UYV3fpNCTGOURqICyKOG3cyVxvqKp8Hhcwn7trNOsK+HlL6q5gpv56ViA==}
+    peerDependencies:
+      storybook: ^8.2.6
 
-  '@storybook/addon-backgrounds@8.1.11':
-    resolution: {integrity: sha512-naGf1ovmsU2pSWb270yRO1IidnO+0YCZ5Tcb8I4rPhZ0vsdXNURYKS1LPSk1OZkvaUXdeB4Im9HhHfUBJOW9oQ==}
+  '@storybook/addon-backgrounds@8.2.6':
+    resolution: {integrity: sha512-61NFowA6EmCw+Eyzp0U4fat9MlPDdnT7aoDyzqSImLwWLITY9IvmWuTeo7XKJZN3fe22z1r7cZseKdYrtaHcKw==}
+    peerDependencies:
+      storybook: ^8.2.6
 
-  '@storybook/addon-controls@8.1.11':
-    resolution: {integrity: sha512-q/Vt4meNVlFlBWIMCJhx6r+bqiiYocCta2RoUK5nyIZUiLzHncKHX6JnCU36EmJzRyah9zkwjfCb2G1r9cjnoQ==}
+  '@storybook/addon-controls@8.2.6':
+    resolution: {integrity: sha512-EHUwHy+oZZv3pXzN7fuXWrS/meHFjqcELY3RBvOyEkGf21agl6co6R1tnf6d5N5QoYAGfIbDO7dkauSL2RfNAw==}
+    peerDependencies:
+      storybook: ^8.2.6
 
-  '@storybook/addon-docs@8.1.11':
-    resolution: {integrity: sha512-69dv+CE4R5wFU7xnJmhuyEbLN2PEVDV3N/BbgJqeucIYPmm6zDV83Q66teCHKYtRln3BFUqPH5mxsjiHobxfJQ==}
+  '@storybook/addon-docs@8.2.6':
+    resolution: {integrity: sha512-qe7hxntaezqjKdU9QS+Q9NFL6i/uNdBxdvOnCKgPhBAY/zY6yhk5t3sOvonynPK5nkaNAowfSNPIzNxAXlJ1sA==}
+    peerDependencies:
+      storybook: ^8.2.6
 
-  '@storybook/addon-essentials@8.1.11':
-    resolution: {integrity: sha512-uRTpcIZQnflML8H+2onicUNIIssKfuviW8Lyrs/KFwSZ1rMcYzhwzCNbGlIbAv04tgHe5NqEyNhb+DVQcZQBzg==}
+  '@storybook/addon-essentials@8.2.6':
+    resolution: {integrity: sha512-diGjGZcZNov+RCAVQBTm8JKP2kUtMRuJIQFBeXdPWpu6hYBk6lw1FlAf2GywWGCvdny1pJT90hfoD33qUMNuDg==}
+    peerDependencies:
+      storybook: ^8.2.6
 
-  '@storybook/addon-highlight@8.1.11':
-    resolution: {integrity: sha512-Iu8FCAd4ETsB6QF4xDE/OLLZY3HOFopuLM5KE0f58jnccF5zAVGr1Rj/54p6TeK0PEou0tLRPFuZs+LPlEzrSw==}
+  '@storybook/addon-highlight@8.2.6':
+    resolution: {integrity: sha512-03cV9USsfP3bS4wYV06DYcIaGPfoheQe53Q0Jr1B2yJUVyIPKvmO2nGjLBsqzeL3Wl7vSfLQn0/dUdxCcbqLsw==}
+    peerDependencies:
+      storybook: ^8.2.6
 
-  '@storybook/addon-interactions@8.1.11':
-    resolution: {integrity: sha512-nkc01z61mYM1kxf0ncBQLlFnnwW4RAVPfRSxK9BdbFN3AAvFiHCwVZdn71mi+C3L8oTqYR6o32e0RlXk+AjhHA==}
+  '@storybook/addon-interactions@8.2.6':
+    resolution: {integrity: sha512-YXpHf8jWPz9HJV+Fw4GaunaCWeE6uqF24aLXdAd8xuhN1UfWJeNV6AwAvFQ0hTLqvmz0yMhX/5JXDKeKESoYDA==}
+    peerDependencies:
+      storybook: ^8.2.6
 
-  '@storybook/addon-links@8.1.11':
-    resolution: {integrity: sha512-HlV2RQSrZyi+55W1B1a9eWNuJdNpWx0g3j7s2arNlNmbd6/kfWAp84axBstI1tL0nW4svut7bWlCsMSOIden+A==}
+  '@storybook/addon-links@8.2.6':
+    resolution: {integrity: sha512-CUuU3nk8wyZ3bljCmOG/OCKazan+bPuNbCph8N763zyzdEx5M/CbBxV9d3pi3zjYpix7txlqrl2/YdMCejfyFw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+      storybook: ^8.2.6
     peerDependenciesMeta:
       react:
         optional: true
 
-  '@storybook/addon-mdx-gfm@8.1.11':
-    resolution: {integrity: sha512-0/4Xaisvmoi26iK1ezTOB9dN2b0JbgWKzO2PO6att2Jh7lplLCf1QeoE8Y4SgCh0brage+mA8mKI8NrT7d18pg==}
+  '@storybook/addon-mdx-gfm@8.2.6':
+    resolution: {integrity: sha512-PFVfJeuydxlV1VmxEuKNQ7z2vCDvQtHa2GB0ANM11ahxDSUz8QxsO0Y/L3LOn2JjJGYiVFrsHAaC+8NW43iArQ==}
+    peerDependencies:
+      storybook: ^8.2.6
 
-  '@storybook/addon-measure@8.1.11':
-    resolution: {integrity: sha512-LkQD3SiLWaWt53aLB3EnmhD9Im8EOO+HKSUE+XGnIJRUcHHRqHfvDkN9KX7T1DCWbfRE5WzMHF5o23b3UiAANw==}
+  '@storybook/addon-measure@8.2.6':
+    resolution: {integrity: sha512-neI8YeSOAtOmzasLxo6O8ZLr2ebMaD7XVF+kYatl5+SpyuwwvUGcP9NkKe5S+mB8V2zxFUIsXS74XrhmQhRoaQ==}
+    peerDependencies:
+      storybook: ^8.2.6
 
-  '@storybook/addon-outline@8.1.11':
-    resolution: {integrity: sha512-vco3RLVjkcS25dNtj1lxmjq4fC0Nq08KNLMS5cbNPVJWNTuSUi/2EthSTQQCdpfMV/p6u+D5uF20A9Pl0xJFXw==}
+  '@storybook/addon-outline@8.2.6':
+    resolution: {integrity: sha512-uAlPtqDWlq7MQQ4zJT80qdjbSdLF/zsvtPhidX6h9cjLKNPWAv79xJQ14AJHaMv+Hzy5xKnM4wdEhgPbzKabQg==}
+    peerDependencies:
+      storybook: ^8.2.6
 
-  '@storybook/addon-storysource@8.1.11':
-    resolution: {integrity: sha512-b2K3+ZzfANDTTeN1jnqNgAQ5ZIhnhIAv89gC/36cOhSK5NLyKmyVKLGQmR3fVqX3URpnz9xccst2JNXopvtccw==}
+  '@storybook/addon-storysource@8.2.6':
+    resolution: {integrity: sha512-8H2kvRIM12oXN4kO/oowABu88IOY9Je7PphCUUs/nIfTIB+Ck1GrLxx5fCNNCSwUrTBEZY8bDOfxmkf9d4qngw==}
+    peerDependencies:
+      storybook: ^8.2.6
 
-  '@storybook/addon-toolbars@8.1.11':
-    resolution: {integrity: sha512-reIKB0+JTiP+GNzynlDcRf4xmv9+j/DQ94qiXl2ZG5+ufKilH8DiRZpVA/i0x+4+TxdGdOJr1/pOf8tAmhNEoQ==}
+  '@storybook/addon-toolbars@8.2.6':
+    resolution: {integrity: sha512-0JmRirMpxHS6VZzBk0kY871xWTpkk3TN4S1sxoFf5fcnCfVTHDjEJ5Ws/QWru1RJlIZHuJKRdQIA6Vuq5X+KfQ==}
+    peerDependencies:
+      storybook: ^8.2.6
 
-  '@storybook/addon-viewport@8.1.11':
-    resolution: {integrity: sha512-qk4IcGnAgiAUQxt8l5PIQ293Za+w6wxlJQIpxr7+QM8OVkADPzXY0MmQfYWU9EQplrxAC2MSx3/C1gZeq+MDOQ==}
+  '@storybook/addon-viewport@8.2.6':
+    resolution: {integrity: sha512-IAxH9H8tVFzSmZhKf5E+EALiAdkp19RzGqP/rWluD8LH7oW5HumQE/4oN0ZhVMy1RxYsCKFYjWyAp7AuxeMRSw==}
+    peerDependencies:
+      storybook: ^8.2.6
 
-  '@storybook/blocks@8.1.11':
-    resolution: {integrity: sha512-eMed7PpL/hAVM6tBS7h70bEAyzbiSU9I/kye4jZ7DkCbAsrX6OKmC7pcHSDn712WTcf3vVqxy5jOKUmOXpc0eg==}
+  '@storybook/blocks@8.2.6':
+    resolution: {integrity: sha512-nMlZJjVTyfOJ6xwORptsNuS1AZZlDbJUVXc2R8uukGd5GIXxxCdrPk4NvUsjfQslMT9LhYuFld3z62FATsM2rw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+      storybook: ^8.2.6
     peerDependenciesMeta:
       react:
         optional: true
@@ -4388,24 +4237,35 @@ packages:
       vite-plugin-glimmerx:
         optional: true
 
+  '@storybook/builder-vite@8.2.6':
+    resolution: {integrity: sha512-3PrsPZAedpQUbzRBEl23Fi1zG5bkQD76JsygVwmfiSm4Est4K8kW2AIB2ht9cIfKXh3mfQkyQlxXKHeQEHeQwQ==}
+    peerDependencies:
+      '@preact/preset-vite': '*'
+      storybook: ^8.2.6
+      typescript: '>= 4.3.x'
+      vite: ^4.0.0 || ^5.0.0
+      vite-plugin-glimmerx: '*'
+    peerDependenciesMeta:
+      '@preact/preset-vite':
+        optional: true
+      typescript:
+        optional: true
+      vite-plugin-glimmerx:
+        optional: true
+
   '@storybook/channels@8.1.11':
     resolution: {integrity: sha512-fu5FTqo6duOqtJFa6gFzKbiSLJoia+8Tibn3xFfB6BeifWrH81hc+AZq0lTmHo5qax2G5t8ZN8JooHjMw6k2RA==}
 
-  '@storybook/cli@8.1.11':
-    resolution: {integrity: sha512-4U48w9C7mVEKrykcPcfHwJkRyCqJ28XipbElACbjIIkQEqaHaOVtP3GeKIrgkoOXe/HK3O4zKWRP2SqlVS0r4A==}
-    hasBin: true
-
   '@storybook/client-logger@8.1.11':
     resolution: {integrity: sha512-DVMh2usz3yYmlqCLCiCKy5fT8/UR9aTh+gSqwyNFkGZrIM4otC5A8eMXajXifzotQLT5SaOEnM3WzHwmpvMIEA==}
 
-  '@storybook/codemod@8.1.11':
-    resolution: {integrity: sha512-/LCozjH1IQ1TOs9UQV59BE0X6UZ9q+C0NEUz7qmJZPrwAii3FkW4l7D/fwxblpMExaoxv0oE8NQfUz49U/5Ymg==}
+  '@storybook/codemod@8.2.6':
+    resolution: {integrity: sha512-+mFJ6R+JhJLpU7VPDlXU5Yn6nqIBq745GaEosnIiFOdNo3jaxJ58wq/sGhbQvoCHPUxMA+sDQvR7pS62YFoLRQ==}
 
-  '@storybook/components@8.1.11':
-    resolution: {integrity: sha512-iXKsNu7VmrLBtjMfPj7S4yJ6T13GU6joKcVcrcw8wfrQJGlPFp4YaURPBUEDxvCt1XWi5JkaqJBvb48kIrROEQ==}
+  '@storybook/components@8.2.6':
+    resolution: {integrity: sha512-H8ckH1AnLkHtMtvJ3J8LxnmDtHxkJ7NJacGctHMRrsBIvdKTVwlT4su5nAVVJlan/PrEou+jESfw+OjjBYE5PA==}
     peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+      storybook: ^8.2.6
 
   '@storybook/core-common@8.1.11':
     resolution: {integrity: sha512-Ix0nplD4I4DrV2t9B+62jaw1baKES9UbR/Jz9LVKFF9nsua3ON0aVe73dOjMxFWBngpzBYWe+zYBTZ7aQtDH4Q==}
@@ -4418,15 +4278,31 @@ packages:
   '@storybook/core-events@8.1.11':
     resolution: {integrity: sha512-vXaNe2KEW9BGlLrg0lzmf5cJ0xt+suPjWmEODH5JqBbrdZ67X6ApA2nb6WcxDQhykesWCuFN5gp1l+JuDOBi7A==}
 
+  '@storybook/core-events@8.2.6':
+    resolution: {integrity: sha512-bmtm7sHBExKCSGiCIyhwfHKFIsdrRQqd8ZEb/iNWsR93AxHszcf/adYAVynencdWKipw1haIWBNaiDhnsOBVPA==}
+    peerDependencies:
+      storybook: ^8.2.6
+
   '@storybook/core-server@8.1.11':
     resolution: {integrity: sha512-L6dzQTmR0np/kagNONvvlm6lSvF1FNc9js3vxsEEPnEypLbhx8bDZaHmuhmBpYUzKyUMpRVQTE/WgjHLuBBuxA==}
 
+  '@storybook/core@8.2.6':
+    resolution: {integrity: sha512-XY71g3AcpD6IiER9k9Lt+vlUMYfPIYgWekd7e0Ggzz2gJkPuLunKEdQccLGDSHf5OFAobHhrTJc7ZsvWhmDMag==}
+
   '@storybook/csf-plugin@8.1.11':
     resolution: {integrity: sha512-hkA8gjFtSN/tabG0cuvmEqanMXtxPr3qTkp4UNSt1R6jBEgFHRG2y/KYLl367kDwOSFTT987ZgRfJJruU66Fvw==}
 
+  '@storybook/csf-plugin@8.2.6':
+    resolution: {integrity: sha512-USn7E/bMQYVqvFBuW6d9rKoSuCImjk0BAmc/0wIOuMQ/yQNp2Xze0m8eVkNHUIUDokyx0TXDjRjwq10Xxk16ag==}
+    peerDependencies:
+      storybook: ^8.2.6
+
   '@storybook/csf-tools@8.1.11':
     resolution: {integrity: sha512-6qMWAg/dBwCVIHzANM9lSHoirwqSS+wWmv+NwAs0t9S94M75IttHYxD3IyzwaSYCC5llp0EQFvtXXAuSfFbibg==}
 
+  '@storybook/csf@0.1.11':
+    resolution: {integrity: sha512-dHYFQH3mA+EtnCkHXzicbLgsvzYjcDJ1JWsogbItZogkPHgSJM/Wr71uMkcvw8v9mmCyP4NpXJuu6bPoVsOnzg==}
+
   '@storybook/csf@0.1.9':
     resolution: {integrity: sha512-JlZ6v/iFn+iKohKGpYXnMeNeTiiAMeFoDhYnPLIC8GnyyIWqEI9wJYrOK9i9rxlJ8NZAH/ojGC/u/xVC41qSgQ==}
 
@@ -4446,12 +4322,19 @@ packages:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
 
-  '@storybook/instrumenter@8.1.11':
-    resolution: {integrity: sha512-r/U9hcqnodNMHuzRt1g56mWrVsDazR85Djz64M3KOwBhrTj5d46DF4/EE80w/5zR5JOrT7p8WmjJRowiVteOCQ==}
+  '@storybook/instrumenter@8.2.6':
+    resolution: {integrity: sha512-RxtpcMTUSq8/wPM6cR6EXVrPEiNuRbC71cIFVFZagOFYvnnOKwSPV+GOLPK0wxMbGB4c5/+Xe8ADefmZTvxOsA==}
+    peerDependencies:
+      storybook: ^8.2.6
 
   '@storybook/manager-api@8.1.11':
     resolution: {integrity: sha512-QSgwKfAw01K9YvvZj30iGBMgQ4YaCT3vojmttuqdH5ukyXkiO7pENLJj4Y+alwUeSi0g+SJeadCI3PXySBHOGg==}
 
+  '@storybook/manager-api@8.2.6':
+    resolution: {integrity: sha512-uv36h/b5RhlajWtEg4cVPBYV8gZs6juux0nIE+6G9i7vt8Ild6gM9tW1KNabgZcaHFiyWJYCNWxJZoKjgUmXDg==}
+    peerDependencies:
+      storybook: ^8.2.6
+
   '@storybook/manager@8.1.11':
     resolution: {integrity: sha512-e02y9dmxowo7cTKYm9am7UO6NOHoHy6Xi7xZf/UA932qLwFZUtk5pnwIEFaZWI3OQsRUCGhP+FL5zizU7uVZeg==}
 
@@ -4461,29 +4344,37 @@ packages:
   '@storybook/preview-api@8.1.11':
     resolution: {integrity: sha512-8ZChmFV56GKppCJ0hnBd/kNTfGn2gWVq1242kuet13pbJtBpvOhyq4W01e/Yo14tAPXvgz8dSnMvWLbJx4QfhQ==}
 
+  '@storybook/preview-api@8.2.6':
+    resolution: {integrity: sha512-5vTj2ndX5ng4nDntZYe+r8UwLjCIGFymhq5/r2adAvRKL+Bo4zQDWGO7bhvGJk16do2THb2JvPz49ComW9LLZw==}
+    peerDependencies:
+      storybook: ^8.2.6
+
   '@storybook/preview@8.1.11':
     resolution: {integrity: sha512-K/9NZmjnL0D1BROkTNWNoPqgL2UaocALRSqCARmkBLgU2Rn/FuZgEclHkWlYo6pUrmLNK+bZ+XzpNMu12iTbpg==}
 
-  '@storybook/react-dom-shim@8.1.11':
-    resolution: {integrity: sha512-KVDSuipqkFjpGfldoRM5xR/N1/RNmbr+sVXqMmelr0zV2jGnexEZnoa7wRHk7IuXuivLWe8BxMxzvQWqjIa4GA==}
+  '@storybook/react-dom-shim@8.2.6':
+    resolution: {integrity: sha512-B+x8UAEQPDp1yhN3tMh09NvSL38QNfJB7PAyLgKrfE7xIAzvewq+RLW2DfGkoZCy+Zr7QSHm1p7NOgud8+sQCg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+      storybook: ^8.2.6
 
-  '@storybook/react-vite@8.1.11':
-    resolution: {integrity: sha512-QqkE6QKsIDthXtps9+YSBQ39O4VvU7Uu3y6WSA3IPgKTtGnmIvhwXtapjf7WQ2cNb5KY1JksFxHXbDe0i5IL4g==}
+  '@storybook/react-vite@8.2.6':
+    resolution: {integrity: sha512-BpbteaIzsJZL1QN3iR7uuslrPfdtbZYXPhcU9awpfl5pW5MOQThuvl7728mwT8V7KdANeikJPgsnlETOb/afDA==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+      storybook: ^8.2.6
       vite: ^4.0.0 || ^5.0.0
 
-  '@storybook/react@8.1.11':
-    resolution: {integrity: sha512-t+EYXOkgwg3ropLGS9y8gGvX5/Okffu/6JYL3YWksrBGAZSqVV4NkxCnVJZepS717SyhR0tN741gv/SxxFPJMg==}
+  '@storybook/react@8.2.6':
+    resolution: {integrity: sha512-awJlzfiAMrf8l9AgiLhjXEJ+HvS3VKPxNNQaRwBELGq/vigjJe656tMrhvg4OIlJXtlS+6XPshd2knLwjIWNLw==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
+      storybook: ^8.2.6
       typescript: '>= 4.2.x'
     peerDependenciesMeta:
       typescript:
@@ -4492,14 +4383,18 @@ packages:
   '@storybook/router@8.1.11':
     resolution: {integrity: sha512-nU5lsBvy0L8wBYOkjagh29ztZicDATpZNYrHuavlhQ2jznmmHdJvXKYk+VrMAbthjQ6ZBqfeeMNPR1UlnqR5Rw==}
 
-  '@storybook/source-loader@8.1.11':
-    resolution: {integrity: sha512-4cfJ7aPjtniIdDGiFjdFpO47byHOl4RKYCJEHf9t+j0xHmlXe4B9aAinxuFfv3GKAXfLvSbbwGO0cDZQRj+brw==}
+  '@storybook/source-loader@8.2.6':
+    resolution: {integrity: sha512-mOVf+TJhlQywCymFMs7l604CxEZRKZRKVQojrrgU6CH6EhhLx/q6BT8tf1CakY9JO3Ey+PhUMBBCerYiDaHLcQ==}
+    peerDependencies:
+      storybook: ^8.2.6
 
   '@storybook/telemetry@8.1.11':
     resolution: {integrity: sha512-Jqvm7HcZismKzPuebhyLECO6KjGiSk4ycbca1WUM/TUvifxCXqgoUPlHHQEEfaRdHS63/MSqtMNjLsQRLC/vNQ==}
 
-  '@storybook/test@8.1.11':
-    resolution: {integrity: sha512-k+V3HemF2/I8fkRxRqM8uH8ULrpBSAAdBOtWSHWLvHguVcb2YA4g4kKo6tXBB9256QfyDW4ZiaAj0/9TMxmJPQ==}
+  '@storybook/test@8.2.6':
+    resolution: {integrity: sha512-nTzNxReBcMRlX1+8PNU/MuA9ArFbeQhfZXMBIwJJoHOhnNe1knYpyn1++xINxAHKOh0BBhQ0NIMoKdcGmW3V6w==}
+    peerDependencies:
+      storybook: ^8.2.6
 
   '@storybook/theming@8.1.11':
     resolution: {integrity: sha512-Chn/opjO6Rl1isNobutYqAH2PjKNkj09YBw/8noomk6gElSa3JbUTyaG/+JCHA6OG/9kUsqoKDb5cZmAKNq/jA==}
@@ -4512,9 +4407,19 @@ packages:
       react-dom:
         optional: true
 
+  '@storybook/theming@8.2.6':
+    resolution: {integrity: sha512-ICnYuLIVsYifVCMQljdHgrp+5vAquNybHxDGWiPeOxBicotwHF8rLhTckD2CdVQbMp0jk6r6jetvjXbFJ2MbvQ==}
+    peerDependencies:
+      storybook: ^8.2.6
+
   '@storybook/types@8.1.11':
     resolution: {integrity: sha512-k9N5iRuY2+t7lVRL6xeu6diNsxO3YI3lS4Juv3RZ2K4QsE/b3yG5ElfJB8DjHDSHwRH4ORyrU71KkOCUVfvtnw==}
 
+  '@storybook/types@8.2.6':
+    resolution: {integrity: sha512-9Kb5+nui8M7TP/EDGwiuOAHYQPg9U6iQl0OWwgbDIYGBpldwlCwVKAoQWzXz/LlhQijULXIpe1cLvEvJN2Uwhg==}
+    peerDependencies:
+      storybook: ^8.2.6
+
   '@storybook/vue3-vite@8.1.11':
     resolution: {integrity: sha512-q0bqh8XEEunaTmp4YiDqM2+YZLwEIevTb5PnNe7G7f2qOiSCE1ncBDnBK717UlCd+iYr34NTztgV2/jIhz1i5w==}
     engines: {node: '>=18.0.0'}
@@ -4527,6 +4432,13 @@ packages:
     peerDependencies:
       vue: ^3.0.0
 
+  '@storybook/vue3@8.2.6':
+    resolution: {integrity: sha512-j4gMuWc1ZDzqWSdf79YswcZmcbhmbByq/6upqxwqXtjv1mHAiBnEs8bbnnylDrzg4GOvBC8w+FjArkzlFA7uXg==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      storybook: ^8.2.6
+      vue: ^3.0.0
+
   '@swc/cli@0.3.12':
     resolution: {integrity: sha512-h7bvxT+4+UDrLWJLFHt6V+vNAcUNii2G4aGSSotKz1ECEk4MyEh5CWxmeSscwuz5K3i+4DWTgm4+4EyMCQKn+g==}
     engines: {node: '>= 16.14.0'}
@@ -4544,6 +4456,12 @@ packages:
     cpu: [arm64]
     os: [android]
 
+  '@swc/core-darwin-arm64@1.3.56':
+    resolution: {integrity: sha512-DZcu7BzDaLEdWHabz9DRTP0yEBLqkrWmskFcD5BX0lGAvoIvE4duMnAqi5F2B3X7630QioHRCYFoRw2WkeE3Cw==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [darwin]
+
   '@swc/core-darwin-arm64@1.6.13':
     resolution: {integrity: sha512-SOF4buAis72K22BGJ3N8y88mLNfxLNprTuJUpzikyMGrvkuBFNcxYtMhmomO0XHsgLDzOJ+hWzcgjRNzjMsUcQ==}
     engines: {node: '>=10'}
@@ -4556,10 +4474,10 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@swc/core-darwin-arm64@1.7.0-nightly-20240715.2':
-    resolution: {integrity: sha512-tOMR9yVA1MD320KySitaRT5yUvdzdmuUjX4+sOw2UKHqgk2s68j6JlBHZjdmqpviXXH5qwXWH3ui8ElcHcpN0Q==}
+  '@swc/core-darwin-x64@1.3.56':
+    resolution: {integrity: sha512-VH5saqYFasdRXJy6RAT+MXm0+IjkMZvOkohJwUei+oA65cKJofQwrJ1jZro8yOJFYvUSI3jgNRGsdBkmo/4hMw==}
     engines: {node: '>=10'}
-    cpu: [arm64]
+    cpu: [x64]
     os: [darwin]
 
   '@swc/core-darwin-x64@1.6.13':
@@ -4574,18 +4492,18 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@swc/core-darwin-x64@1.7.0-nightly-20240715.2':
-    resolution: {integrity: sha512-GVQqC/vSOS/LPXYEF00/+JMwXIFBquIhBy4HEdfybkoRaoeLUHxdqkUhI6dW0lRe85QUrSkg69ylAXwD4foU8Q==}
-    engines: {node: '>=10'}
-    cpu: [x64]
-    os: [darwin]
-
   '@swc/core-freebsd-x64@1.3.11':
     resolution: {integrity: sha512-02uqYktPp6WmZfZ2Crc/yIVOcgANtjo8ciHcT7yLHvz7v+S7gx1I2tyNGUFtTX5hcR2IFNGrL8Yj4DvpTABFHg==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [freebsd]
 
+  '@swc/core-linux-arm-gnueabihf@1.3.56':
+    resolution: {integrity: sha512-LWwPo6NnJkH01+ukqvkoNIOpMdw+Zundm4vBeicwyVrkP+mC3kwVfi03TUFpQUz3kRKdw/QEnxGTj+MouCPbtw==}
+    engines: {node: '>=10'}
+    cpu: [arm]
+    os: [linux]
+
   '@swc/core-linux-arm-gnueabihf@1.6.13':
     resolution: {integrity: sha512-f4gxxvDXVUm2HLYXRd311mSrmbpQF2MZ4Ja6XCQz1hWAxXdhRl1gpnZ+LH/xIfGSwQChrtLLVrkxdYUCVuIjFg==}
     engines: {node: '>=10'}
@@ -4598,10 +4516,10 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@swc/core-linux-arm-gnueabihf@1.7.0-nightly-20240715.2':
-    resolution: {integrity: sha512-r2VnlO7ABL+fUAEJa/qJeqBKG2lxQV9XcgHIyeWHzcyf9G9frcevcXSHbJSGBIIxiADRuoyrYGfRwzsLXDt7jA==}
+  '@swc/core-linux-arm64-gnu@1.3.56':
+    resolution: {integrity: sha512-GzsUy/4egJ4cMlxbM+Ub7AMi5CKAc+pxBxrh8MUPQbyStW8jGgnQsJouTnGy0LHawtdEnsCOl6PcO6OgvktXuQ==}
     engines: {node: '>=10'}
-    cpu: [arm]
+    cpu: [arm64]
     os: [linux]
 
   '@swc/core-linux-arm64-gnu@1.6.13':
@@ -4616,8 +4534,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@swc/core-linux-arm64-gnu@1.7.0-nightly-20240715.2':
-    resolution: {integrity: sha512-Pk+RwrvsY1fB2PE3b/RcIbVfvzc3pO8WcTvZjmXQENQ0Af0R+pIR+tnnXweZB48ZdfoBE0sPE3Du1SntoZOcnA==}
+  '@swc/core-linux-arm64-musl@1.3.56':
+    resolution: {integrity: sha512-9gxL09BIiAv8zY0DjfnFf19bo8+P4T9tdhzPwcm+1yPJcY5yr1+YFWLNFzz01agtOj6VlZ2/wUJTaOfdjjtc+A==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
@@ -4634,10 +4552,10 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@swc/core-linux-arm64-musl@1.7.0-nightly-20240715.2':
-    resolution: {integrity: sha512-spizj6AJ3xxVz/+7sbeXeqkiGrks4u451gGf4pzlhYqWZzxsWjSS9lZXVGJ6vHslofYsQEK0pIsN+F/wOIspUg==}
+  '@swc/core-linux-x64-gnu@1.3.56':
+    resolution: {integrity: sha512-n0ORNknl50vMRkll3BDO1E4WOqY6iISlPV1ZQCRLWQ6YQ2q8/WAryBxc2OAybcGHBUFkxyACpJukeU1QZ/9tNw==}
     engines: {node: '>=10'}
-    cpu: [arm64]
+    cpu: [x64]
     os: [linux]
 
   '@swc/core-linux-x64-gnu@1.6.13':
@@ -4652,8 +4570,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@swc/core-linux-x64-gnu@1.7.0-nightly-20240715.2':
-    resolution: {integrity: sha512-08zfcePPoBBBcoSHvNWK2OZk4EQtwB/tgFstDf5HROOKr9YqCxVYemWCwBFuqVHr6ALAoEeizPOqCilvk0jQnw==}
+  '@swc/core-linux-x64-musl@1.3.56':
+    resolution: {integrity: sha512-r+D34WLAOAlJtfw1gaVWpHRwCncU9nzW9i7w9kSw4HpWYnHJOz54jLGSEmNsrhdTCz1VK2ar+V2ktFUsrlGlDA==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
@@ -4670,11 +4588,11 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@swc/core-linux-x64-musl@1.7.0-nightly-20240715.2':
-    resolution: {integrity: sha512-hrkT5htUfC4DWHI8tI6DxBHQpw6LU6AuWjMuEJcHtGnHA3BeXxXrZsCPpuxKfUHEEQbdijK67pWWh5SCfrX+Lw==}
+  '@swc/core-win32-arm64-msvc@1.3.56':
+    resolution: {integrity: sha512-29Yt75Is6X24z3x8h/xZC1HnDPkPpyLH9mDQiM6Cuc0I9mVr1XSriPEUB2N/awf5IE4SA8c+3IVq1DtKWbkJIw==}
     engines: {node: '>=10'}
-    cpu: [x64]
-    os: [linux]
+    cpu: [arm64]
+    os: [win32]
 
   '@swc/core-win32-arm64-msvc@1.6.13':
     resolution: {integrity: sha512-ap6uNmYjwk9M/+bFEuWRNl3hq4VqgQ/Lk+ID/F5WGqczNr0L7vEf+pOsRAn0F6EV+o/nyb3ePt8rLhE/wjHpPg==}
@@ -4688,10 +4606,10 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@swc/core-win32-arm64-msvc@1.7.0-nightly-20240715.2':
-    resolution: {integrity: sha512-3SQj5cKo91+cNorNvOne2cqHW3Wcg+/irYts0lCGy3pruZXcgUKeTQ3kmV8pRPtXCs17YLysZOSyCF9DQIbacw==}
+  '@swc/core-win32-ia32-msvc@1.3.56':
+    resolution: {integrity: sha512-mplp0zbYDrcHtfvkniXlXdB04e2qIjz2Gq/XHKr4Rnc6xVORJjjXF91IemXKpavx2oZYJws+LNJL7UFQ8jyCdQ==}
     engines: {node: '>=10'}
-    cpu: [arm64]
+    cpu: [ia32]
     os: [win32]
 
   '@swc/core-win32-ia32-msvc@1.6.13':
@@ -4706,10 +4624,10 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@swc/core-win32-ia32-msvc@1.7.0-nightly-20240715.2':
-    resolution: {integrity: sha512-BiHjqoPhodpgrNXoPaflvpC98NXLa3jI6vV5ZSTLkpJ1JR+T9RcB+unkllr/mjqUZaqafW9AE784A9+wHzja3Q==}
+  '@swc/core-win32-x64-msvc@1.3.56':
+    resolution: {integrity: sha512-zp8MBnrw/bjdLenO/ifYzHrImSjKunqL0C2IF4LXYNRfcbYFh2NwobsVQMZ20IT0474lKRdlP8Oxdt+bHuXrzA==}
     engines: {node: '>=10'}
-    cpu: [ia32]
+    cpu: [x64]
     os: [win32]
 
   '@swc/core-win32-x64-msvc@1.6.13':
@@ -4724,12 +4642,6 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@swc/core-win32-x64-msvc@1.7.0-nightly-20240715.2':
-    resolution: {integrity: sha512-bfSnQxYLOKRakwQo/sJA8I/krU/TfxdlER41OlvEiBXVYEjJFMb7z9NyPsk/DBbqeaA1ywHun8ohBhuEwJWpDQ==}
-    engines: {node: '>=10'}
-    cpu: [x64]
-    os: [win32]
-
   '@swc/core@1.6.13':
     resolution: {integrity: sha512-eailUYex6fkfaQTev4Oa3mwn0/e3mQU4H8y1WPuImYQESOQDtVrowwUGDSc19evpBbHpKtwM+hw8nLlhIsF+Tw==}
     engines: {node: '>=10'}
@@ -4780,44 +4692,44 @@ packages:
   '@tabler/icons@3.3.0':
     resolution: {integrity: sha512-PLVe9d7b59sKytbx00KgeGhQG3N176Ezv8YMmsnSz4s0ifDzMWlp/h2wEfQZ0ZNe8e377GY2OW6kovUe3Rnd0g==}
 
-  '@tensorflow/tfjs-backend-cpu@4.20.0':
-    resolution: {integrity: sha512-1QRQ6AqAa/VB8JOArf5nY3Dc/QQHXbfuxgdIdQhKrABEHgvlaWt2Vv696UhIlVl75YoNY+vWlCwBdGQIKYfFGw==}
+  '@tensorflow/tfjs-backend-cpu@4.4.0':
+    resolution: {integrity: sha512-d4eln500/qNym78z9IrUUzF0ITBoJGLrxV8xd92kLVoXhg35Mm+zqUXShjFcrH8joOHOFuST0qZ0TbDDqcPzPA==}
     engines: {yarn: '>= 1.3.2'}
     peerDependencies:
-      '@tensorflow/tfjs-core': 4.20.0
+      '@tensorflow/tfjs-core': 4.4.0
 
-  '@tensorflow/tfjs-backend-webgl@4.20.0':
-    resolution: {integrity: sha512-M03fJonJGxm2u3SCzRNA2JLh0gxaAye64SEmGAXOehizowxy42l+lMsPWU8xU7r7mN6PEilBNkuKAf5YJ7Xumg==}
+  '@tensorflow/tfjs-backend-webgl@4.4.0':
+    resolution: {integrity: sha512-TzQKvfAPgGt9cMG+5bVoTckoG1xr/PVJM/uODkPvzcMqi3j97kuWDXwkYJIgXldStmfiKkU7f5CmyD3Cq3E6BA==}
     engines: {yarn: '>= 1.3.2'}
     peerDependencies:
-      '@tensorflow/tfjs-core': 4.20.0
+      '@tensorflow/tfjs-core': 4.4.0
 
-  '@tensorflow/tfjs-converter@4.20.0':
-    resolution: {integrity: sha512-UJ2ntQ1TNtVHB5qGMwB0j306bs3KH1E1HKJ9Dxvrc6PUaivOV+CPKqmbidOFG5LylXeRC36JBdhe+gVT2nFHNw==}
+  '@tensorflow/tfjs-converter@4.4.0':
+    resolution: {integrity: sha512-JUjpRStrAuw37tgPd5UENu0UjQVuJT09yF7KpOur4BriJ0uQqrbEZHMPHmvUtr5nYzkqlXJTuXIyxvEY/olNpg==}
     peerDependencies:
-      '@tensorflow/tfjs-core': 4.20.0
+      '@tensorflow/tfjs-core': 4.4.0
 
-  '@tensorflow/tfjs-core@4.20.0':
-    resolution: {integrity: sha512-m/cc9qDc63al9UhdbXRUYTLGfJJlhuN5tylAX/2pJMLj32c8a6ThGDJYoKzpf32n5g3MQGYLchjClDxeGdXMPQ==}
+  '@tensorflow/tfjs-core@4.4.0':
+    resolution: {integrity: sha512-Anxpc7cAOA0Q7EUXdTbQKMg3reFvrdkgDlaYzH9ZfkMq2CgLV4Au6E/s6HmbYn/VrAtWy9mLY5c/lLJqh4764g==}
     engines: {yarn: '>= 1.3.2'}
 
-  '@tensorflow/tfjs-data@4.20.0':
-    resolution: {integrity: sha512-k6S8joXhoXkatcoT6mYCxBzRCsnrLfnl6xjLe46SnXO0oEEy4Vuzbmp5Ydl1uU2hHr73zL91EdAC1k8Hng/+oA==}
+  '@tensorflow/tfjs-data@4.4.0':
+    resolution: {integrity: sha512-aY4eq4cgrsrXeBU6ABZAAN3tV0fG4YcHd0z+cYuNXnCo+VEQLJnPmhn+xymZ4VQZQH4GXbVS4dV9pXMclFNRFw==}
     peerDependencies:
-      '@tensorflow/tfjs-core': 4.20.0
+      '@tensorflow/tfjs-core': 4.4.0
       seedrandom: ^3.0.5
 
-  '@tensorflow/tfjs-layers@4.20.0':
-    resolution: {integrity: sha512-SCHZH29Vyw+Y9eoaJHiaNo6yqM9vD3XCKncoczonRRywejm3FFqddg1AuWAfSE9XoNPE21o9PsknvKLl/Uh+Cg==}
+  '@tensorflow/tfjs-layers@4.4.0':
+    resolution: {integrity: sha512-OGC7shfiD9Gc698hINHK4y9slOJvu5m54tVNm4xf+WSNrw/avvgpar6yyoL5bakYIZNQvFNK75Yr8VRPR7oPeQ==}
     peerDependencies:
-      '@tensorflow/tfjs-core': 4.20.0
+      '@tensorflow/tfjs-core': 4.4.0
 
-  '@tensorflow/tfjs-node@4.20.0':
-    resolution: {integrity: sha512-pVSOlzsVqh5ck3aiNPJCltB3ASKjsLqNPvJ28lXn9Xg648U4eHDk8G47m9w4uf0FdVcWDfjPM3hDCbBZ/E2KXg==}
+  '@tensorflow/tfjs-node@4.4.0':
+    resolution: {integrity: sha512-+JSAddsupjSQUDZeb7QGOFkL3Tty3kjPHx8ethiYFzwTZJHCMvM7wZJd0Fqnjxym6A0KpsmB7SPZgwRRXVIlPA==}
     engines: {node: '>=8.11.0'}
 
-  '@tensorflow/tfjs@4.20.0':
-    resolution: {integrity: sha512-+ZLfJq2jyIOE2/+yKPoyD/gfy3RZypbfMrlzvBDgodTK5jnexprihhX38hxilh9HPWvWQXJqiUjKJP5ECCikrw==}
+  '@tensorflow/tfjs@4.4.0':
+    resolution: {integrity: sha512-EmCsnzdvawyk4b+4JKaLLuicHcJQRZtL1zSy9AWJLiiHTbDDseYgLxfaCEfLk8v2bUe7SBXwl3n3B7OjgvH11Q==}
     hasBin: true
 
   '@testing-library/dom@10.1.0':
@@ -4936,9 +4848,6 @@ packages:
   '@types/cookie@0.6.0':
     resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==}
 
-  '@types/cookies@0.9.0':
-    resolution: {integrity: sha512-40Zk8qR147RABiQ7NQnBzWzDcjKzNrntB5BAmeGCb2p/MIyOE+4BVvc17wumsUqUw00bJYqoXFHYygQnEFh4/Q==}
-
   '@types/cross-spawn@6.0.2':
     resolution: {integrity: sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==}
 
@@ -4987,6 +4896,9 @@ packages:
   '@types/express@4.17.17':
     resolution: {integrity: sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==}
 
+  '@types/express@4.17.21':
+    resolution: {integrity: sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==}
+
   '@types/find-cache-dir@3.2.1':
     resolution: {integrity: sha512-frsJrz2t/CeGifcu/6uRo4b+SzAwT4NYCVPu1GN8IB9XTzrpPkGuV0tmh9mN+/L0PklAlsC3u5Fxt0ju00LXIw==}
 
@@ -5005,15 +4917,9 @@ packages:
   '@types/htmlescape@1.1.3':
     resolution: {integrity: sha512-tuC81YJXGUe0q8WRtBNW+uyx79rkkzWK651ALIXXYq5/u/IxjX4iHneGF2uUqzsNp+F+9J2mFZOv9jiLTtIq0w==}
 
-  '@types/http-assert@1.5.5':
-    resolution: {integrity: sha512-4+tE/lwdAahgZT1g30Jkdm9PzFRde0xwxBNUyRsCitRvCQB90iuA2uJYdUnhnANRcqGXaWOGY4FEoxeElNAK2g==}
-
   '@types/http-cache-semantics@4.0.4':
     resolution: {integrity: sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==}
 
-  '@types/http-errors@2.0.4':
-    resolution: {integrity: sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==}
-
   '@types/http-link-header@1.0.7':
     resolution: {integrity: sha512-snm5oLckop0K3cTDAiBnZDy6ncx9DJ3mCRDvs42C884MbVYPP74Tiq2hFsSDRTyjK6RyDYDIulPiW23ge+g5Lw==}
 
@@ -5044,27 +4950,15 @@ packages:
   '@types/json5@0.0.29':
     resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
 
-  '@types/jsonld@1.5.14':
-    resolution: {integrity: sha512-z4IRf5oRgjPTkazDDv94sjzI5iK3DrDEW7Y5Gk4VO4+ANymgtHtNaXWi93+BmiAoG3PB9QTv5DgSpKWGYVvysA==}
+  '@types/jsonld@1.5.15':
+    resolution: {integrity: sha512-PlAFPZjL+AuGYmwlqwKEL0IMP8M8RexH0NIPGfCVWSQ041H2rR/8OlyZSD7KsCVoN8vCfWdtWDBxX8yBVP+xow==}
 
   '@types/jsrsasign@10.5.14':
     resolution: {integrity: sha512-lppSlfK6etu+cuKs40K4rg8As79PH6hzIB+v55zSqImbSH3SE6Fm8MBHCiI91cWlAP3Z4igtJK1VL3fSN09blQ==}
 
-  '@types/keygrip@1.0.6':
-    resolution: {integrity: sha512-lZuNAY9xeJt7Bx4t4dx0rYCDqGPW8RXhQZK1td7d4H6E9zYbLoOtjBvfwdTKpsyxQI/2jv+armjX/RW+ZNpXOQ==}
-
   '@types/keyv@3.1.4':
     resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
 
-  '@types/koa-compose@3.2.8':
-    resolution: {integrity: sha512-4Olc63RY+MKvxMwVknCUDhRQX1pFQoBZ/lXcRLP69PQkEpze/0cr8LNqJQe5NFb/b19DWi2a5bTi2VAlQzhJuA==}
-
-  '@types/koa@2.14.0':
-    resolution: {integrity: sha512-DTDUyznHGNHAl+wd1n0z1jxNajduyTh8R53xoewuerdBzGo6Ogj6F2299BFtrexJw4NtgjsI5SMPCmV9gZwGXA==}
-
-  '@types/koa__router@12.0.3':
-    resolution: {integrity: sha512-5YUJVv6NwM1z7m6FuYpKfNLTZ932Z6EF6xy2BbtpJSyn13DKNQEkXVffFVSnJHxvwwWh2SAeumpjAYUELqgjyw==}
-
   '@types/lodash@4.14.191':
     resolution: {integrity: sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==}
 
@@ -5074,6 +4968,9 @@ packages:
   '@types/matter-js@0.19.6':
     resolution: {integrity: sha512-ffk6tqJM5scla+ThXmnox+mdfCo3qYk6yMjQsNcrbo6eQ5DqorVdtnaL+1agCoYzxUjmHeiNB7poBMAmhuLY7w==}
 
+  '@types/matter-js@0.19.7':
+    resolution: {integrity: sha512-dlh50YEh1lQS4fiCDGBnK75ocHQIq/1E371Qk6hASJImICIivdZQC2GkOqnfBm0Hac2xLk5+yrqRFDAEfj/yLA==}
+
   '@types/mdast@4.0.3':
     resolution: {integrity: sha512-LsjtqsyF+d2/yFOYaN22dHZI1Cpwkrj+g06G8+qtUKlhovPW89YhqSnfKtMbkgmEtYpH2gydRNULd6y8mciAFg==}
 
@@ -5113,8 +5010,8 @@ packages:
   '@types/node@20.11.5':
     resolution: {integrity: sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==}
 
-  '@types/node@20.14.9':
-    resolution: {integrity: sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==}
+  '@types/node@20.14.12':
+    resolution: {integrity: sha512-r7wNXakLeSsGT0H1AU863vS2wa5wBOK4bWMjZz2wj+8nBx+m5PeIn0k8AloSLpRuiwdRQZwarZqHE4FNArPuJQ==}
 
   '@types/node@20.9.1':
     resolution: {integrity: sha512-HhmzZh5LSJNS5O8jQKpJ/3ZcrrlG6L70hpGqMIAoM9YVD0YBRNWYsfwcXq8VnSjlNpCpgLzMXdiPo+dxcvSmiA==}
@@ -5197,9 +5094,6 @@ packages:
   '@types/scheduler@0.16.2':
     resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==}
 
-  '@types/seedrandom@2.4.30':
-    resolution: {integrity: sha512-AnxLHewubLVzoF/A4qdxBGHCKifw8cY32iro3DQX9TPcetE95zBeVt3jnsvtvAUf1vwzMfwzp4t/L2yqPlnjkQ==}
-
   '@types/seedrandom@2.4.34':
     resolution: {integrity: sha512-ytDiArvrn/3Xk6/vtylys5tlY6eo7Ane0hvcx++TKo6RxQXuVfW0AF/oeWqAj9dN29SyhtawuXstgmPlwNcv/A==}
 
@@ -5251,6 +5145,9 @@ packages:
   '@types/tough-cookie@4.0.2':
     resolution: {integrity: sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==}
 
+  '@types/tough-cookie@4.0.5':
+    resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==}
+
   '@types/unist@3.0.2':
     resolution: {integrity: sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==}
 
@@ -5266,11 +5163,14 @@ packages:
   '@types/web-push@3.6.3':
     resolution: {integrity: sha512-v3oT4mMJsHeJ/rraliZ+7TbZtr5bQQuxcgD7C3/1q/zkAj29c8RE0F9lVZVu3hiQe5Z9fYcBreV7TLnfKR+4mg==}
 
+  '@types/webgl-ext@0.0.30':
+    resolution: {integrity: sha512-LKVgNmBxN0BbljJrVUwkxwRYqzsAEPcZOe6S2T6ZaBDIrFp0qu4FNlpc5sM1tGbXUYFgdVQIoeLk1Y1UoblyEg==}
+
   '@types/wrap-ansi@3.0.0':
     resolution: {integrity: sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==}
 
-  '@types/ws@8.5.10':
-    resolution: {integrity: sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==}
+  '@types/ws@8.5.11':
+    resolution: {integrity: sha512-4+q7P5h3SpJxaBft0Dzpbr6lmMaqh0Jr2tbhJZ/luAwvD7ohSCniYkwz/pLxuT2h0EOa6QADgJj1Ko+TzRfZ+w==}
 
   '@types/yargs-parser@21.0.0':
     resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==}
@@ -5303,8 +5203,8 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/eslint-plugin@7.15.0':
-    resolution: {integrity: sha512-uiNHpyjZtFrLwLDpHnzaDlP3Tt6sGMqTCiqmxaN4n4RP0EfYZDODJyddiFDF44Hjwxr5xAcaYxVKm9QKQFJFLA==}
+  '@typescript-eslint/eslint-plugin@7.17.0':
+    resolution: {integrity: sha512-pyiDhEuLM3PuANxH7uNYan1AaFs5XE0zw1hq69JBvGvE7gSuEoQl1ydtEe/XQeoC3GQxLXyOVa5kNOATgM638A==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       '@typescript-eslint/parser': ^7.0.0
@@ -5334,8 +5234,8 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/parser@7.15.0':
-    resolution: {integrity: sha512-k9fYuQNnypLFcqORNClRykkGOMOj+pV6V91R4GO/l1FDGwpqmSwoOQrOHo3cGaH63e+D3ZiCAOsuS/D2c99j/A==}
+  '@typescript-eslint/parser@7.17.0':
+    resolution: {integrity: sha512-puiYfGeg5Ydop8eusb/Hy1k7QmOU6X3nvsqCgzrB2K4qMavK//21+PzNE8qeECgNOIoertJPUC1SpegHDI515A==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       eslint: ^8.56.0
@@ -5352,8 +5252,8 @@ packages:
     resolution: {integrity: sha512-6TmN4OJiohHfoOdGZ3huuLhpiUgOGTpgXNUPJgeZOZR3DnIpdSgtt83RS35OYNNXxM4TScVlpVKC9jyQSETR1A==}
     engines: {node: ^16.0.0 || >=18.0.0}
 
-  '@typescript-eslint/scope-manager@7.15.0':
-    resolution: {integrity: sha512-Q/1yrF/XbxOTvttNVPihxh1b9fxamjEoz2Os/Pe38OHwxC24CyCqXxGTOdpb4lt6HYtqw9HetA/Rf6gDGaMPlw==}
+  '@typescript-eslint/scope-manager@7.17.0':
+    resolution: {integrity: sha512-0P2jTTqyxWp9HiKLu/Vemr2Rg1Xb5B7uHItdVZ6iAenXmPo4SZ86yOPCJwMqpCyaMiEHTNqizHfsbmCFT1x9SA==}
     engines: {node: ^18.18.0 || >=20.0.0}
 
   '@typescript-eslint/type-utils@6.11.0':
@@ -5376,8 +5276,8 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/type-utils@7.15.0':
-    resolution: {integrity: sha512-SkgriaeV6PDvpA6253PDVep0qCqgbO1IOBiycjnXsszNTVQe5flN5wR5jiczoEoDEnAqYFSFFc9al9BSGVltkg==}
+  '@typescript-eslint/type-utils@7.17.0':
+    resolution: {integrity: sha512-XD3aaBt+orgkM/7Cei0XNEm1vwUxQ958AOLALzPlbPqb8C1G8PZK85tND7Jpe69Wualri81PLU+Zc48GVKIMMA==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       eslint: ^8.56.0
@@ -5394,8 +5294,8 @@ packages:
     resolution: {integrity: sha512-qTWjWieJ1tRJkxgZYXx6WUYtWlBc48YRxgY2JN1aGeVpkhmnopq+SUC8UEVGNXIvWH7XyuTjwALfG6bFEgCkQA==}
     engines: {node: ^16.0.0 || >=18.0.0}
 
-  '@typescript-eslint/types@7.15.0':
-    resolution: {integrity: sha512-aV1+B1+ySXbQH0pLK0rx66I3IkiZNidYobyfn0WFsdGhSXw+P3YOqeTq5GED458SfB24tg+ux3S+9g118hjlTw==}
+  '@typescript-eslint/types@7.17.0':
+    resolution: {integrity: sha512-a29Ir0EbyKTKHnZWbNsrc/gqfIBqYPwj3F2M+jWE/9bqfEHg0AMtXzkbUkOG6QgEScxh2+Pz9OXe11jHDnHR7A==}
     engines: {node: ^18.18.0 || >=20.0.0}
 
   '@typescript-eslint/typescript-estree@6.11.0':
@@ -5416,8 +5316,8 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/typescript-estree@7.15.0':
-    resolution: {integrity: sha512-gjyB/rHAopL/XxfmYThQbXbzRMGhZzGw6KpcMbfe8Q3nNQKStpxnUKeXb0KiN/fFDR42Z43szs6rY7eHk0zdGQ==}
+  '@typescript-eslint/typescript-estree@7.17.0':
+    resolution: {integrity: sha512-72I3TGq93t2GoSBWI093wmKo0n6/b7O4j9o8U+f65TVD0FS6bI2180X5eGEr8MA8PhKMvYe9myZJquUT2JkCZw==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       typescript: '*'
@@ -5437,8 +5337,8 @@ packages:
     peerDependencies:
       eslint: ^8.56.0
 
-  '@typescript-eslint/utils@7.15.0':
-    resolution: {integrity: sha512-hfDMDqaqOqsUVGiEPSMLR/AjTSCsmJwjpKkYQRo1FNbmW4tBwBspYDwO9eh7sKSTwMQgBw9/T4DHudPaqshRWA==}
+  '@typescript-eslint/utils@7.17.0':
+    resolution: {integrity: sha512-r+JFlm5NdB+JXc7aWWZ3fKSm1gn0pkswEwIYsrGPdsT2GjsRATAKXiNtp3vgAAO1xZhX8alIOEQnNMl3kbTgJw==}
     engines: {node: ^18.18.0 || >=20.0.0}
     peerDependencies:
       eslint: ^8.56.0
@@ -5451,15 +5351,15 @@ packages:
     resolution: {integrity: sha512-FhUqNWluiGNzlvnDZiXad4mZRhtghdoKW6e98GoEOYSu5cND+E39rG5KwJMUzeENwm1ztYBRqof8wMLP+wNPIA==}
     engines: {node: ^16.0.0 || >=18.0.0}
 
-  '@typescript-eslint/visitor-keys@7.15.0':
-    resolution: {integrity: sha512-Hqgy/ETgpt2L5xueA/zHHIl4fJI2O4XUE9l4+OIfbJIRSnTJb/QscncdqqZzofQegIJugRIF57OJea1khw2SDw==}
+  '@typescript-eslint/visitor-keys@7.17.0':
+    resolution: {integrity: sha512-RVGC9UhPOCsfCdI9pU++K4nD7to+jTcMIbXTSOcrLqUEW6gF2pU1UUbYJKc9cvcRSK1UDeMJ7pdMxf4bhMpV/A==}
     engines: {node: ^18.18.0 || >=20.0.0}
 
   '@ungap/structured-clone@1.2.0':
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
 
-  '@vitejs/plugin-vue@5.0.5':
-    resolution: {integrity: sha512-LOjm7XeIimLBZyzinBQ6OSm3UBCNVCpLkxGC0oWmm2YPzVZoxMsdvNVimLTBzpAnR9hl/yn1SHGuRfe6/Td9rQ==}
+  '@vitejs/plugin-vue@5.1.0':
+    resolution: {integrity: sha512-QMRxARyrdiwi1mj3AW4fLByoHTavreXq0itdEW696EihXglf1MB3D4C2gBvE0jMPH29ZjC3iK8aIaUMLf4EOGA==}
     engines: {node: ^18.0.0 || >=20.0.0}
     peerDependencies:
       vite: ^5.0.0
@@ -5488,20 +5388,20 @@ packages:
   '@volar/language-core@2.2.0':
     resolution: {integrity: sha512-a8WG9+4OdeNDW4ywABZIM6S6UN7em8uIlM/BZ2pWQUYrVmX+m8sj/X+QadvO+Li/t/LjAqbWJQtVgxdpEWLALQ==}
 
-  '@volar/language-core@2.4.0-alpha.11':
-    resolution: {integrity: sha512-DtftH0DtpksK1y+de/kLnu8CHcFQ7huKXi7cyxH9R0PbOOTSGXd31kijBeKNzyoXRp8dqGpu/7WhOlCWXQR62w==}
+  '@volar/language-core@2.4.0-alpha.18':
+    resolution: {integrity: sha512-JAYeJvYQQROmVRtSBIczaPjP3DX4QW1fOqW1Ebs0d3Y3EwSNRglz03dSv0Dm61dzd0Yx3WgTW3hndDnTQqgmyg==}
 
   '@volar/source-map@2.2.0':
     resolution: {integrity: sha512-HQlPRlHOVqCCHK8wI76ZldHkEwKsjp7E6idUc36Ekni+KJDNrqgSqPvyHQixybXPHNU7CI9Uxd9/IkxO7LuNBw==}
 
-  '@volar/source-map@2.4.0-alpha.11':
-    resolution: {integrity: sha512-yyjmv8KUkTcxXzwme9qUMl6Szdji9JUQa8eadE4ib/spFXXZGq6QOX8cgSu5UQ0ooyBJFO1zdVH5otBJyZE3Ew==}
+  '@volar/source-map@2.4.0-alpha.18':
+    resolution: {integrity: sha512-MTeCV9MUwwsH0sNFiZwKtFrrVZUK6p8ioZs3xFzHc2cvDXHWlYN3bChdQtwKX+FY2HG6H3CfAu1pKijolzIQ8g==}
 
   '@volar/typescript@2.2.0':
     resolution: {integrity: sha512-wC6l4zLiiCLxF+FGaHCbWlQYf4vMsnRxYhcI6WgvaNppOD6r1g+Ef1RKRJUApALWU46Yy/JDU/TbdV6w/X6Liw==}
 
-  '@volar/typescript@2.4.0-alpha.11':
-    resolution: {integrity: sha512-N/v+wSddhtsNtfv2w0Bxj2QQWURN5budGzpyBTrlcXxz2dnvB0eAMqrEQbBi6rCOVHlRaXbh+wyTRdAcB/FHrg==}
+  '@volar/typescript@2.4.0-alpha.18':
+    resolution: {integrity: sha512-sXh5Y8sqGUkgxpMWUGvRXggxYHAVxg0Pa1C42lQZuPDrW6vHJPR0VCK8Sr7WJsAW530HuNQT/ZIskmXtxjybMQ==}
 
   '@vue/compiler-core@3.4.29':
     resolution: {integrity: sha512-TFKiRkKKsRCKvg/jTSSKK7mYLJEQdUiUfykbG49rubC9SfDyvT2JrzTReopWlz2MxqeLyxh9UZhvxEIBgAhtrg==}
@@ -5509,17 +5409,26 @@ packages:
   '@vue/compiler-core@3.4.31':
     resolution: {integrity: sha512-skOiodXWTV3DxfDhB4rOf3OGalpITLlgCeOwb+Y9GJpfQ8ErigdBUHomBzvG78JoVE8MJoQsb+qhZiHfKeNeEg==}
 
+  '@vue/compiler-core@3.4.34':
+    resolution: {integrity: sha512-Z0izUf32+wAnQewjHu+pQf1yw00EGOmevl1kE+ljjjMe7oEfpQ+BI3/JNK7yMB4IrUsqLDmPecUrpj3mCP+yJQ==}
+
   '@vue/compiler-dom@3.4.29':
     resolution: {integrity: sha512-A6+iZ2fKIEGnfPJejdB7b1FlJzgiD+Y/sxxKwJWg1EbJu6ZPgzaPQQ51ESGNv0CP6jm6Z7/pO6Ia8Ze6IKrX7w==}
 
   '@vue/compiler-dom@3.4.31':
     resolution: {integrity: sha512-wK424WMXsG1IGMyDGyLqB+TbmEBFM78hIsOJ9QwUVLGrcSk0ak6zYty7Pj8ftm7nEtdU/DGQxAXp0/lM/2cEpQ==}
 
-  '@vue/compiler-sfc@3.4.31':
-    resolution: {integrity: sha512-einJxqEw8IIJxzmnxmJBuK2usI+lJonl53foq+9etB2HAzlPjAS/wa7r0uUpXw5ByX3/0uswVSrjNb17vJm1kQ==}
+  '@vue/compiler-dom@3.4.34':
+    resolution: {integrity: sha512-3PUOTS1h5cskdOJMExCu2TInXuM0j60DRPpSCJDqOCupCfUZCJoyQmKtRmA8EgDNZ5kcEE7vketamRZfrEuVDw==}
 
-  '@vue/compiler-ssr@3.4.31':
-    resolution: {integrity: sha512-RtefmITAje3fJ8FSg1gwgDhdKhZVntIVbwupdyZDSifZTRMiWxWehAOTCc8/KZDnBOcYQ4/9VWxsTbd3wT0hAA==}
+  '@vue/compiler-sfc@3.4.34':
+    resolution: {integrity: sha512-x6lm0UrM03jjDXTPZgD9Ad8bIVD1ifWNit2EaWQIZB5CULr46+FbLQ5RpK7AXtDHGjx9rmvC7QRCTjsiGkAwRw==}
+
+  '@vue/compiler-ssr@3.4.34':
+    resolution: {integrity: sha512-8TDBcLaTrFm5rnF+Qm4BlliaopJgqJ28Nsrc80qazynm5aJO+Emu7y0RWw34L8dNnTRdcVBpWzJxhGYzsoVu4g==}
+
+  '@vue/compiler-vue2@2.7.16':
+    resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==}
 
   '@vue/devtools-api@6.6.1':
     resolution: {integrity: sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA==}
@@ -5532,27 +5441,27 @@ packages:
       typescript:
         optional: true
 
-  '@vue/language-core@2.0.24':
-    resolution: {integrity: sha512-997YD6Lq/66LXr3ZOLNxDCmyn13z9NP8LU1UZn9hGCDWhzlbXAIP0hOgL3w3x4RKEaWTaaRtsHP9DzHvmduruQ==}
+  '@vue/language-core@2.0.29':
+    resolution: {integrity: sha512-o2qz9JPjhdoVj8D2+9bDXbaI4q2uZTHQA/dbyZT4Bj1FR9viZxDJnLcKVHfxdn6wsOzRgpqIzJEEmSSvgMvDTQ==}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
 
-  '@vue/reactivity@3.4.31':
-    resolution: {integrity: sha512-VGkTani8SOoVkZNds1PfJ/T1SlAIOf8E58PGAhIOUDYPC4GAmFA2u/E14TDAFcf3vVDKunc4QqCe/SHr8xC65Q==}
+  '@vue/reactivity@3.4.34':
+    resolution: {integrity: sha512-ua+Lo+wBRlBEX9TtgPOShE2JwIO7p6BTZ7t1KZVPoaBRfqbC7N3c8Mpzicx173fXxx5VXeU6ykiHo7WgLzJQDA==}
 
-  '@vue/runtime-core@3.4.31':
-    resolution: {integrity: sha512-LDkztxeUPazxG/p8c5JDDKPfkCDBkkiNLVNf7XZIUnJ+66GVGkP+TIh34+8LtPisZ+HMWl2zqhIw0xN5MwU1cw==}
+  '@vue/runtime-core@3.4.34':
+    resolution: {integrity: sha512-PXhkiRPwcPGJ1BnyBZFI96GfInCVskd0HPNIAZn7i3YOmLbtbTZpB7/kDTwC1W7IqdGPkTVC63IS7J2nZs4Ebg==}
 
-  '@vue/runtime-dom@3.4.31':
-    resolution: {integrity: sha512-2Auws3mB7+lHhTFCg8E9ZWopA6Q6L455EcU7bzcQ4x6Dn4cCPuqj6S2oBZgN2a8vJRS/LSYYxwFFq2Hlx3Fsaw==}
+  '@vue/runtime-dom@3.4.34':
+    resolution: {integrity: sha512-dXqIe+RqFAK2Euak4UsvbIupalrhc67OuQKpD7HJ3W2fv8jlqvI7szfBCsAEcE8o/wyNpkloxB6J8viuF/E3gw==}
 
-  '@vue/server-renderer@3.4.31':
-    resolution: {integrity: sha512-D5BLbdvrlR9PE3by9GaUp1gQXlCNadIZytMIb8H2h3FMWJd4oUfkUTEH2wAr3qxoRz25uxbTcbqd3WKlm9EHQA==}
+  '@vue/server-renderer@3.4.34':
+    resolution: {integrity: sha512-GeyEUfMVRZMD/mZcNONEqg7MiU10QQ1DB3O/Qr6+8uXpbwdlmVgQ5Qs1/ZUAFX1X2UUtqMoGrDRbxdWfOJFT7Q==}
     peerDependencies:
-      vue: 3.4.31
+      vue: 3.4.34
 
   '@vue/shared@3.4.29':
     resolution: {integrity: sha512-hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA==}
@@ -5560,6 +5469,9 @@ packages:
   '@vue/shared@3.4.31':
     resolution: {integrity: sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA==}
 
+  '@vue/shared@3.4.34':
+    resolution: {integrity: sha512-x5LmiRLpRsd9KTjAB8MPKf0CDPMcuItjP0gbNqFCIgL1I8iYp4zglhj9w9FPCdIbHG2M91RVeIbArFfFTz9I3A==}
+
   '@vue/test-utils@2.4.1':
     resolution: {integrity: sha512-VO8nragneNzUZUah6kOjiFmD/gwRjUauG9DROh6oaOeFwX1cZRUNHhdeogE8635cISigXFTtGLUQWx5KCb0xeg==}
     peerDependencies:
@@ -5569,8 +5481,8 @@ packages:
       '@vue/server-renderer':
         optional: true
 
-  '@webgpu/types@0.1.38':
-    resolution: {integrity: sha512-7LrhVKz2PRh+DD7+S+PVaFd5HxaWQvoMqBbsV9fNJO1pjUs1P8bM2vQVNfk+3URTqbuTI7gkXi0rfsN0IadoBA==}
+  '@webgpu/types@0.1.30':
+    resolution: {integrity: sha512-9AXJSmL3MzY8ZL//JjudA//q+2kBRGhLBFpkdGksWIuxrMy81nFrCzj2Am+mbh8WoU6rXmv7cY5E3rdlyru2Qg==}
 
   '@yarnpkg/esbuild-plugin-pnp@3.0.0-rc.15':
     resolution: {integrity: sha512-kYzDJO5CA9sy+on/s2aIW0411AklfCi8Ck/4QDivOqsMKpStZA2SsR+X27VTggGwpStWaLrjJcDcdDMowtG8MA==}
@@ -5632,8 +5544,8 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
-  acorn@8.12.0:
-    resolution: {integrity: sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==}
+  acorn@8.12.1:
+    resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==}
     engines: {node: '>=0.4.0'}
     hasBin: true
 
@@ -5703,8 +5615,8 @@ packages:
   ajv@8.13.0:
     resolution: {integrity: sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==}
 
-  ajv@8.16.0:
-    resolution: {integrity: sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==}
+  ajv@8.17.1:
+    resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
 
   ansi-colors@4.1.3:
     resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
@@ -5775,6 +5687,7 @@ packages:
   are-we-there-yet@2.0.0:
     resolution: {integrity: sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==}
     engines: {node: '>=10'}
+    deprecated: This package is no longer supported.
 
   arg@5.0.2:
     resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
@@ -5785,10 +5698,6 @@ packages:
   argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
-  aria-hidden@1.2.4:
-    resolution: {integrity: sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==}
-    engines: {node: '>=10'}
-
   aria-query@5.1.3:
     resolution: {integrity: sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==}
 
@@ -6049,9 +5958,6 @@ packages:
   browser-assert@1.2.1:
     resolution: {integrity: sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ==}
 
-  browserify-zlib@0.1.4:
-    resolution: {integrity: sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==}
-
   browserslist@4.22.2:
     resolution: {integrity: sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
@@ -6087,12 +5993,16 @@ packages:
   buffer@6.0.3:
     resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
 
+  bufferutil@4.0.7:
+    resolution: {integrity: sha512-kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw==}
+    engines: {node: '>=6.14.2'}
+
   bufferutil@4.0.8:
     resolution: {integrity: sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw==}
     engines: {node: '>=6.14.2'}
 
-  bullmq@5.8.3:
-    resolution: {integrity: sha512-RJgQu/vgSZqjOYrZ7F1UJsSAzveNx7FFpR3Tp/1TxOMXXN9TtZMSly5MT+vjzOhQX//3+YWNRbMWpC1mkqBc9w==}
+  bullmq@5.10.4:
+    resolution: {integrity: sha512-YEssEbWBbPXvSW2YMjIBKZdkIPZsOaTGWo1y2wpCFv/wUY+tRLKiSVuHgv09x0QEieybx844f9//UWuarG1JHg==}
 
   buraha@0.0.1:
     resolution: {integrity: sha512-G563A0mTbzknm2jDaNxfZuNKIdeArs8T+XQN6t+KbmgnOoevXSXhKDkyf8Md/36Jrx99ikwbCag37VGe3myExQ==}
@@ -6272,8 +6182,8 @@ packages:
     resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
     engines: {node: '>=10'}
 
-  chromatic@11.5.4:
-    resolution: {integrity: sha512-+J+CopeUSyGUIQJsU6X7CfvSmeVBs0j6LZ9AgF4+XTjI4pFmUiUXsTc00rH9x9W1jCppOaqDXv2kqJJXGDK3mA==}
+  chromatic@11.5.6:
+    resolution: {integrity: sha512-ycX/hlZLs69BltwwBNsEXr+As6x5/0rlwp6W/CiHMZ3tpm7dmkd+hQCsb8JGHb1h49W3qPOKQ/Lh9evqcJ1yeQ==}
     hasBin: true
     peerDependencies:
       '@chromatic-com/cypress': ^0.*.* || ^1.0.0
@@ -6424,8 +6334,8 @@ packages:
   commondir@1.0.1:
     resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==}
 
-  compare-versions@6.1.0:
-    resolution: {integrity: sha512-LNZQXhqUvqUTotpZ00qLSaify3b4VFD588aRr8MKFw4CMUr98ytzCW5wDH5qx/DEY5kCDXcbcRuCqL0szEf2tg==}
+  compare-versions@6.1.1:
+    resolution: {integrity: sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==}
 
   compress-commons@6.0.2:
     resolution: {integrity: sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==}
@@ -6521,8 +6431,8 @@ packages:
     resolution: {integrity: sha512-jbokKWGcyU4gl6jAfX97E1gDpY12DJ1cLJZmoDzaAln/shZ+S3KBFBuA2Q6WeUN4gJf/8klnV1EfvhA2lK5IRQ==}
     engines: {node: '>=12.0.0'}
 
-  cropperjs@2.0.0-beta.5:
-    resolution: {integrity: sha512-8RIynsyHV7KyCxbjV4fCQubGiM6sHMgYvRPKkzuUQSTYHK6shoUNvdvbBekwAwS8QRLsxEBcJ5lvl0W3dvkDQA==}
+  cropperjs@2.0.0-rc.1:
+    resolution: {integrity: sha512-Y9ciurIuK6G1vy0ErHC8Gt6wHWvsHWJ5fgE60GL6vsuF2WzHwDpH7F1yof40XAEheeSN4v3rD09D1VZ7kiiSOA==}
 
   cross-env@7.0.3:
     resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
@@ -6607,8 +6517,8 @@ packages:
   cwise-compiler@1.1.3:
     resolution: {integrity: sha512-WXlK/m+Di8DMMcCjcWr4i+XzcQra9eCdXIJrgh4TUgh0pIS/yJduLxS9JgefsHJ/YVLdgPtXm9r62W92MvanEQ==}
 
-  cypress@13.13.0:
-    resolution: {integrity: sha512-ou/MQUDq4tcDJI2FsPaod2FZpex4kpIK43JJlcBgWrX8WX7R/05ZxGTuxedOuZBfxjZxja+fbijZGyxiLP6CFA==}
+  cypress@13.13.1:
+    resolution: {integrity: sha512-8F9UjL5MDUdgC/S5hr8CGLHbS5gGht5UOV184qc2pFny43fnkoaKxlzH/U6//zmGu/xRTaKimNfjknLT8+UDFg==}
     engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0}
     hasBin: true
 
@@ -6771,10 +6681,6 @@ packages:
     resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
     engines: {node: '>=8'}
 
-  detect-libc@2.0.2:
-    resolution: {integrity: sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==}
-    engines: {node: '>=8'}
-
   detect-libc@2.0.3:
     resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==}
     engines: {node: '>=8'}
@@ -6783,9 +6689,6 @@ packages:
     resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
     engines: {node: '>=8'}
 
-  detect-node-es@1.1.0:
-    resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==}
-
   detect-package-manager@2.0.1:
     resolution: {integrity: sha512-j/lJHyoLlWi6G1LDdLgvUtz60Zo5GEj+sVYtTVXnYLDPuzgC3llMxonXym9zIwhhUII8vjdw0LXxavpLqTbl1A==}
     engines: {node: '>=12'}
@@ -6863,9 +6766,6 @@ packages:
   duplexer@0.1.2:
     resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
 
-  duplexify@3.7.1:
-    resolution: {integrity: sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==}
-
   eastasianwidth@0.2.0:
     resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
 
@@ -6993,8 +6893,8 @@ packages:
     engines: {node: '>=12'}
     hasBin: true
 
-  esbuild@0.22.0:
-    resolution: {integrity: sha512-zNYA6bFZsVnsU481FnGAQjLDW0Pl/8BGG7EvAp15RzUvGC+ME7hf1q7LvIfStEQBz/iEHuBJCYcOwPmNCf1Tlw==}
+  esbuild@0.23.0:
+    resolution: {integrity: sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -7067,8 +6967,8 @@ packages:
       '@typescript-eslint/parser':
         optional: true
 
-  eslint-plugin-vue@9.26.0:
-    resolution: {integrity: sha512-eTvlxXgd4ijE1cdur850G6KalZqk65k1JKoOI2d1kT3hr8sPD07j1q98FRFdNnpxBELGPWxZmInxeHGF/GxtqQ==}
+  eslint-plugin-vue@9.27.0:
+    resolution: {integrity: sha512-5Dw3yxEyuBSXTzT5/Ge1X5kIkRTQ3nvBn/VwPwInNiZBSJOO/timWMUaflONnFBzU6NhB68lxnCda7ULV5N7LA==}
     engines: {node: ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
@@ -7080,10 +6980,6 @@ packages:
     resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
-  eslint-scope@8.0.1:
-    resolution: {integrity: sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
   eslint-scope@8.0.2:
     resolution: {integrity: sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -7096,13 +6992,8 @@ packages:
     resolution: {integrity: sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  eslint@9.6.0:
-    resolution: {integrity: sha512-ElQkdLMEEqQNM9Njff+2Y4q2afHk7JpkPvrd7Xh7xefwgQynqPxwf55J7di9+MEibWUGdNjFF9ITG9Pck5M84w==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    hasBin: true
-
-  eslint@9.7.0:
-    resolution: {integrity: sha512-FzJ9D/0nGiCGBf8UXO/IGLTgLVzIxze1zpfA8Ton2mjLovXdAPlYDv+MQDcqj3TmrhAGYfOpz9RfR+ent0AgAw==}
+  eslint@9.8.0:
+    resolution: {integrity: sha512-K8qnZ/QJzT2dLKdZJVX6W4XOwBzutMYmt0lqUS+JdXgd+HTYFlonFgkJ8s44d/zMPPCnOOk0kMWCApCPhiOy9A==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     hasBin: true
 
@@ -7123,10 +7014,6 @@ packages:
     resolution: {integrity: sha512-JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng==}
     engines: {node: '>=0.10'}
 
-  esquery@1.5.0:
-    resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
-    engines: {node: '>=0.10'}
-
   esquery@1.6.0:
     resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==}
     engines: {node: '>=0.10'}
@@ -7193,8 +7080,8 @@ packages:
     resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}
     engines: {node: '>=16.17'}
 
-  execa@9.2.0:
-    resolution: {integrity: sha512-vpOyYg7UAVKLAWWtRS2gAdgkT7oJbCn0me3gmUmxZih4kd3MF/oo8kNTBTIbkO3yuuF5uB4ZCZfn8BOolITYhg==}
+  execa@9.3.0:
+    resolution: {integrity: sha512-l6JFbqnHEadBoVAVpN5dl2yCyfX28WoBAGaoQcNmLLSedOxTxcn2Qa83s8I/PA5i56vWru2OHOtrwF7Om2vqlg==}
     engines: {node: ^18.19.0 || >=20.5.0}
 
   executable@4.1.1:
@@ -7274,6 +7161,9 @@ packages:
   fast-uri@2.2.0:
     resolution: {integrity: sha512-cIusKBIt/R/oI6z/1nyfe2FvGKVTohVRfvkOhvx0nCEW+xf5NoCXjAHcWp93uOUBchzYcsvPlrapAdX1uW+YGg==}
 
+  fast-uri@3.0.1:
+    resolution: {integrity: sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==}
+
   fast-xml-parser@4.2.5:
     resolution: {integrity: sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==}
     hasBin: true
@@ -7294,6 +7184,9 @@ packages:
   fb-watchman@2.0.2:
     resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==}
 
+  fd-package-json@1.2.0:
+    resolution: {integrity: sha512-45LSPmWf+gC5tdCQMNH4s9Sr00bIkiD9aN7dc5hqkrEw1geRYyDQS1v1oMHAW3ysfxfndqGsrDREHHjNNbKUfA==}
+
   fd-slicer@1.1.0:
     resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
 
@@ -7327,8 +7220,8 @@ packages:
     resolution: {integrity: sha512-hlDw5Ev+9e883s0pwUsuuYNu4tD7GgpUnOvykjv1Gya0ZIjuKumthDRua90VUn6/nlRKAjcxLUnHNTIUWwWIiw==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  file-type@19.0.0:
-    resolution: {integrity: sha512-s7cxa7/leUWLiXO78DVVfBVse+milos9FitauDLG1pI7lNaJ2+5lzPnr2N24ym+84HVwJL6hVuGfgVE+ALvU8Q==}
+  file-type@19.3.0:
+    resolution: {integrity: sha512-mROwiKLZf/Kwa/2Rol+OOZQn1eyTkPB3ZTwC0ExY6OLFCbgxHYZvBm7xI77NvfZFMKBsmuXfmLJnD4eEftEhrA==}
     engines: {node: '>=18'}
 
   filelist@1.0.4:
@@ -7454,9 +7347,6 @@ packages:
   from@0.1.7:
     resolution: {integrity: sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==}
 
-  fs-constants@1.0.0:
-    resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
-
   fs-extra@11.1.1:
     resolution: {integrity: sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==}
     engines: {node: '>=14.14'}
@@ -7473,6 +7363,9 @@ packages:
     resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
     engines: {node: '>=10'}
 
+  fs-minipass@1.2.7:
+    resolution: {integrity: sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==}
+
   fs-minipass@2.1.0:
     resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
     engines: {node: '>= 8'}
@@ -7502,6 +7395,7 @@ packages:
   gauge@3.0.2:
     resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==}
     engines: {node: '>=10'}
+    deprecated: This package is no longer supported.
 
   gensync@1.0.0-beta.2:
     resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
@@ -7517,14 +7411,6 @@ packages:
   get-intrinsic@1.2.1:
     resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==}
 
-  get-nonce@1.0.1:
-    resolution: {integrity: sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==}
-    engines: {node: '>=6'}
-
-  get-npm-tarball-url@2.0.3:
-    resolution: {integrity: sha512-R/PW6RqyaBQNWYaSyfrh54/qtcnOp22FHCCiRhSSZj0FP3KQWCsxxt0DzIdVTbwTqe9CtQfvl/FPD4UIPt4pqw==}
-    engines: {node: '>=12.17'}
-
   get-package-type@0.1.0:
     resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
     engines: {node: '>=8.0.0'}
@@ -7598,16 +7484,16 @@ packages:
     engines: {node: '>=16 || 14 >=14.17'}
     hasBin: true
 
-  glob@10.3.12:
-    resolution: {integrity: sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==}
-    engines: {node: '>=16 || 14 >=14.17'}
-    hasBin: true
-
   glob@10.4.2:
     resolution: {integrity: sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==}
     engines: {node: '>=16 || 14 >=14.18'}
     hasBin: true
 
+  glob@11.0.0:
+    resolution: {integrity: sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==}
+    engines: {node: 20 || >=22}
+    hasBin: true
+
   glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
     deprecated: Glob versions prior to v9 are no longer supported
@@ -7633,8 +7519,8 @@ packages:
     resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==}
     engines: {node: '>=18'}
 
-  globals@15.7.0:
-    resolution: {integrity: sha512-ivatRXWwKC6ImcdKO7dOwXuXR5XFrdwo45qFwD7D0qOkEPzzJdLXC3BHceBdyrPOD3p1suPaWi4Y4NMm2D++AQ==}
+  globals@15.8.0:
+    resolution: {integrity: sha512-VZAJ4cewHTExBWDHR6yptdIBlx9YSSZuwojj9Nt5mBRXQzrKakDsVKQ1J63sklLvzAJm0X5+RpO4i3Y2hcOnFw==}
     engines: {node: '>=18'}
 
   globalthis@1.0.3:
@@ -7663,8 +7549,8 @@ packages:
     resolution: {integrity: sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==}
     engines: {node: '>=14.16'}
 
-  got@14.4.1:
-    resolution: {integrity: sha512-IvDJbJBUeexX74xNQuMIVgCRRuNOm5wuK+OC3Dc2pnSoh1AOmgc7JVj7WC+cJ4u0aPcO9KZ2frTXcqK4W/5qTQ==}
+  got@14.4.2:
+    resolution: {integrity: sha512-+Te/qEZ6hr7i+f0FNgXx/6WQteSM/QqueGvxeYQQFm0GDfoxLVJ/oiwUKYMTeioColWUTdewZ06hmrBjw6F7tw==}
     engines: {node: '>=20'}
 
   graceful-fs@4.2.11:
@@ -7680,10 +7566,6 @@ packages:
     resolution: {integrity: sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==}
     engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0}
 
-  gunzip-maybe@1.4.2:
-    resolution: {integrity: sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==}
-    hasBin: true
-
   hammerjs@2.0.8:
     resolution: {integrity: sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==}
     engines: {node: '>=0.8.0'}
@@ -7818,10 +7700,6 @@ packages:
     resolution: {integrity: sha512-3cZ0SRL8fb9MUlU3mKM61FcQvPfXx2dBrZW3Vbg5CXa8jFlK8OaEpePenLe1oEXQduhz8b0QjsqfS59QP4AJDQ==}
     engines: {node: '>=6.0.0'}
 
-  http-proxy-agent@7.0.0:
-    resolution: {integrity: sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==}
-    engines: {node: '>= 14'}
-
   http-proxy-agent@7.0.2:
     resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
     engines: {node: '>= 14'}
@@ -7862,6 +7740,10 @@ packages:
     resolution: {integrity: sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==}
     engines: {node: '>= 14'}
 
+  https-proxy-agent@7.0.5:
+    resolution: {integrity: sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==}
+    engines: {node: '>= 14'}
+
   human-signals@1.1.1:
     resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==}
     engines: {node: '>=8.12.0'}
@@ -7899,8 +7781,8 @@ packages:
   ignore-by-default@1.0.1:
     resolution: {integrity: sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==}
 
-  ignore-walk@6.0.4:
-    resolution: {integrity: sha512-t7sv42WkwFkyKbivUCglsQW5YWMskWtbEf4MNKX5u/CCWHKSPzN4FtBQGsQZgCLbxOzpVlcbWVK5KB3auIOjSw==}
+  ignore-walk@6.0.5:
+    resolution: {integrity: sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
 
   ignore@5.2.4:
@@ -7918,11 +7800,11 @@ packages:
     resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
     engines: {node: '>=6'}
 
-  import-in-the-middle@1.4.2:
-    resolution: {integrity: sha512-9WOz1Yh/cvO/p69sxRmhyQwrIGGSp7EIdcb+fFNVi7CzQGQB8U1/1XrKVSbEd/GNOAeM0peJtmi7+qphe7NvAw==}
+  import-in-the-middle@1.10.0:
+    resolution: {integrity: sha512-Z1jumVdF2GwnnYfM0a/y2ts7mZbwFMgt5rRuVmLgobgahC6iKgN5MBuXjzfTIOUpq5LSU10vJIPpVKe0X89fIw==}
 
-  import-in-the-middle@1.8.1:
-    resolution: {integrity: sha512-yhRwoHtiLGvmSozNOALgjRPFI6uYsds60EoMqqnXyyv+JOIW/BrrLejuTGBt+bq0T5tLzOHrN0T7xYTm4Qt/ng==}
+  import-in-the-middle@1.7.1:
+    resolution: {integrity: sha512-1LrZPDtW+atAxH42S6288qyDFNQ2YCty+2mxEPRtfazH6Z5QwkaBSTS2ods7hnVJioF6rkRfNoA6A/MstpFXLg==}
 
   import-lazy@4.0.0:
     resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
@@ -7972,9 +7854,6 @@ packages:
   intersection-observer@0.12.2:
     resolution: {integrity: sha512-7m1vEcPCxXYI8HqnL8CKI6siDyD+eIWSwgB3DZA+ZTogxk9I4CDnj4wilt9x/+/QbHI4YG5YZNmC6458/e9Ktg==}
 
-  invariant@2.2.4:
-    resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==}
-
   ioredis@5.4.1:
     resolution: {integrity: sha512-2YZsvl7jopIa1gaePkeMtd9rAcSjOOjPtpcLlOeusyO+XH2SK5ZcT+UCrElPP+WVIInh2TzeI4XW9ENaSLVVHA==}
     engines: {node: '>=12.22.0'}
@@ -8055,9 +7934,6 @@ packages:
     resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
     engines: {node: '>= 0.4'}
 
-  is-deflate@1.0.0:
-    resolution: {integrity: sha512-YDoFpuZWu1VRXlsnlYMzKyVRITXj7Ej/V9gXQ2/pAe7X1J7M/RNOqaIYi6qUn+B7nGyB9pDXrv02dsB58d2ZAQ==}
-
   is-docker@2.2.1:
     resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==}
     engines: {node: '>=8'}
@@ -8089,10 +7965,6 @@ packages:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
 
-  is-gzip@1.0.0:
-    resolution: {integrity: sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ==}
-    engines: {node: '>=0.10.0'}
-
   is-installed-globally@0.4.0:
     resolution: {integrity: sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==}
     engines: {node: '>=10'}
@@ -8285,6 +8157,10 @@ packages:
     resolution: {integrity: sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==}
     engines: {node: '>=14'}
 
+  jackspeak@4.0.1:
+    resolution: {integrity: sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==}
+    engines: {node: 20 || >=22}
+
   jake@10.8.5:
     resolution: {integrity: sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==}
     engines: {node: '>=10'}
@@ -8475,8 +8351,8 @@ packages:
       '@babel/preset-env':
         optional: true
 
-  jsdom@24.1.0:
-    resolution: {integrity: sha512-6gpM7pRXCwIOKxX47cgOyvyQDN/Eh0f1MeKySBV2xGdKtqJBLj8P25eY3EVCWo2mglDDzozR2r2MW4T+JiNUZA==}
+  jsdom@24.1.1:
+    resolution: {integrity: sha512-5O1wWV99Jhq4DV7rCLIoZ/UIhyQeDR7wHVyZAHAshbrvZsLs+Xzz7gtwnlJTJDjleiTKh54F4dXrX70vJQTyJQ==}
     engines: {node: '>=18'}
     peerDependencies:
       canvas: ^2.11.2
@@ -8714,6 +8590,10 @@ packages:
     resolution: {integrity: sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==}
     engines: {node: 14 || >=16.14}
 
+  lru-cache@11.0.0:
+    resolution: {integrity: sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==}
+    engines: {node: 20 || >=22}
+
   lru-cache@4.1.5:
     resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==}
 
@@ -8785,8 +8665,8 @@ packages:
   markdown-table@3.0.3:
     resolution: {integrity: sha512-Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw==}
 
-  markdown-to-jsx@7.3.2:
-    resolution: {integrity: sha512-B+28F5ucp83aQm+OxNrPkS8z0tMKaeHiy0lHJs3LqCyDQFtWuenaIrkaVTgAm1pf1AU85LXltva86hlaT17i8Q==}
+  markdown-to-jsx@7.4.7:
+    resolution: {integrity: sha512-0+ls1IQZdU6cwM1yu0ZjjiVWYtkbExSyUIFU2ZeDIFuZM1W42Mh4OlJ4nb4apX4H8smxDHRdFaoIVJGwfv5hkg==}
     engines: {node: '>= 10'}
     peerDependencies:
       react: '>= 0.14.0'
@@ -9001,6 +8881,10 @@ packages:
   minimalistic-assert@1.0.1:
     resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==}
 
+  minimatch@10.0.1:
+    resolution: {integrity: sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==}
+    engines: {node: 20 || >=22}
+
   minimatch@3.0.8:
     resolution: {integrity: sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==}
 
@@ -9050,6 +8934,9 @@ packages:
     resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==}
     engines: {node: '>=8'}
 
+  minipass@2.9.0:
+    resolution: {integrity: sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==}
+
   minipass@3.3.6:
     resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==}
     engines: {node: '>=8'}
@@ -9066,13 +8953,13 @@ packages:
     resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
     engines: {node: '>=16 || 14 >=14.17'}
 
+  minizlib@1.3.3:
+    resolution: {integrity: sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==}
+
   minizlib@2.1.2:
     resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
     engines: {node: '>= 8'}
 
-  mkdirp-classic@0.5.3:
-    resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
-
   mkdirp@0.5.6:
     resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
     hasBin: true
@@ -9124,13 +9011,13 @@ packages:
   msgpackr@1.10.1:
     resolution: {integrity: sha512-r5VRLv9qouXuLiIBrLpl2d5ZvPt8svdQTl5/vMvE4nzDMyEX4sgW5yWhuBBj5UmgwOTWj8CIdSXn5sAfsHAWIQ==}
 
-  msw-storybook-addon@2.0.2:
-    resolution: {integrity: sha512-sdw++X+AoUbaG2ku493ViVqCA/LfqnybXsKXyPUrF3ZS/x8BqGBnkBLmT/0SHCC5zIO3Vfm5zlclAxnhqOOikQ==}
+  msw-storybook-addon@2.0.3:
+    resolution: {integrity: sha512-CzHmGO32JeOPnyUnRWnB0PFTXCY1HKfHiEB/6fYoUYiFm2NYosLjzs9aBd3XJUryYEN0avJqMNh7nCRDxE5JjQ==}
     peerDependencies:
       msw: ^2.0.0
 
-  msw@2.3.1:
-    resolution: {integrity: sha512-ocgvBCLn/5l3jpl1lssIb3cniuACJLoOfZu01e3n5dbJrpA5PeeWn28jCLgQDNt6d7QT8tF2fYRzm9JoEHtiig==}
+  msw@2.3.4:
+    resolution: {integrity: sha512-sHMlwrajgmZSA2l1o7qRSe+azm/I+x9lvVVcOxAzi4vCtH8uVPJk1K5BQYDkzGl+tt0RvM9huEXXdeGrgcc79g==}
     engines: {node: '>=18'}
     hasBin: true
     peerDependencies:
@@ -9243,15 +9130,6 @@ packages:
   node-fetch-native@1.0.2:
     resolution: {integrity: sha512-KIkvH1jl6b3O7es/0ShyCgWLcfXxlBrLBbP3rOr23WArC66IMcU4DeZEeYEOwnopYhawLTn7/y+YtmASe8DFVQ==}
 
-  node-fetch@2.6.11:
-    resolution: {integrity: sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==}
-    engines: {node: 4.x || >=6.0.0}
-    peerDependencies:
-      encoding: ^0.1.0
-    peerDependenciesMeta:
-      encoding:
-        optional: true
-
   node-fetch@2.6.13:
     resolution: {integrity: sha512-StxNAxh15zr77QvvkmveSQ8uCQ4+v5FkvNTj0OESmiHu+VRi/gXArXtkWMElOsOUNLtUEvI4yS+rdtOHZTwlQA==}
     engines: {node: 4.x || >=6.0.0}
@@ -9371,6 +9249,7 @@ packages:
 
   npmlog@5.0.1:
     resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==}
+    deprecated: This package is no longer supported.
 
   nsfwjs@2.4.2:
     resolution: {integrity: sha512-i4Pp2yt59qPQgeZFyg3wXFBX52uSeu/hkDoqdZfe+sILRxNBUu0VDogj7Lmqak0GlrXviS/wLiVeIx40IDUu7A==}
@@ -9380,8 +9259,8 @@ packages:
   nth-check@2.1.1:
     resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
 
-  nwsapi@2.2.10:
-    resolution: {integrity: sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ==}
+  nwsapi@2.2.12:
+    resolution: {integrity: sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==}
 
   oauth-sign@0.9.0:
     resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==}
@@ -9472,13 +9351,11 @@ packages:
     resolution: {integrity: sha512-es3mGcDXV6TKPo6n3aohzHm0qxhLyR39MhF6mkD1FwFGjhxnqMqfSIgM0eCpInZvqatve4CxmXcMZw3jnnsaXw==}
     hasBin: true
 
-  opentelemetry-instrumentation-fetch-node@1.2.0:
-    resolution: {integrity: sha512-aiSt/4ubOTyb1N5C2ZbGrBvaJOXIZhZvpRPYuUVxQJe27wJZqf/o65iPrqgLcgfeOLaQ8cS2Q+762jrYvniTrA==}
+  opentelemetry-instrumentation-fetch-node@1.2.3:
+    resolution: {integrity: sha512-Qb11T7KvoCevMaSeuamcLsAD+pZnavkhDnlVL0kRozfhl42dKG5Q3anUklAFKJZjY3twLR+BnRa6DlwwkIE/+A==}
     engines: {node: '>18.0.0'}
-
-  optionator@0.9.3:
-    resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
-    engines: {node: '>= 0.8.0'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.6.0
 
   optionator@0.9.4:
     resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
@@ -9563,9 +9440,6 @@ packages:
   package-json-from-dist@1.0.0:
     resolution: {integrity: sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==}
 
-  pako@0.2.9:
-    resolution: {integrity: sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==}
-
   parent-module@1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
     engines: {node: '>=6'}
@@ -9637,14 +9511,14 @@ packages:
     resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==}
     engines: {node: '>=16 || 14 >=14.17'}
 
-  path-scurry@1.10.2:
-    resolution: {integrity: sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==}
-    engines: {node: '>=16 || 14 >=14.17'}
-
   path-scurry@1.11.1:
     resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
     engines: {node: '>=16 || 14 >=14.18'}
 
+  path-scurry@2.0.0:
+    resolution: {integrity: sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==}
+    engines: {node: 20 || >=22}
+
   path-to-regexp@0.1.7:
     resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==}
 
@@ -9678,8 +9552,9 @@ packages:
     resolution: {integrity: sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A==}
     engines: {node: '>=14.16'}
 
-  peek-stream@1.1.3:
-    resolution: {integrity: sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==}
+  peek-readable@5.1.3:
+    resolution: {integrity: sha512-kCsc9HwH5RgVA3H3VqkWFyGQwsxUxLdiSX1d5nqAm7hnMFjNFX1VhBLmJoUY0hZNc8gmDNgBkLjfhiWPsziXWA==}
+    engines: {node: '>=14.16'}
 
   pend@1.2.0:
     resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
@@ -9736,6 +9611,9 @@ packages:
   picocolors@1.0.0:
     resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
 
+  picocolors@1.0.1:
+    resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==}
+
   picomatch@2.3.1:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
@@ -9988,6 +9866,10 @@ packages:
     resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==}
     engines: {node: ^10 || ^12 || >=14}
 
+  postcss@8.4.40:
+    resolution: {integrity: sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==}
+    engines: {node: ^10 || ^12 || >=14}
+
   postgres-array@2.0.0:
     resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
     engines: {node: '>=4'}
@@ -10027,8 +9909,8 @@ packages:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
 
-  prettier@3.3.2:
-    resolution: {integrity: sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==}
+  prettier@3.3.3:
+    resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -10173,15 +10055,9 @@ packages:
   pug@3.0.3:
     resolution: {integrity: sha512-uBi6kmc9f3SZ3PXxqcHiUZLmIXgfgWooKWXcwSGwQd2Zi5Rb0bT14+8CJjJgI8AB+nndLaNgHGrcc6bPIB665g==}
 
-  pump@2.0.1:
-    resolution: {integrity: sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==}
-
   pump@3.0.0:
     resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
 
-  pumpify@1.5.1:
-    resolution: {integrity: sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==}
-
   punycode@2.3.1:
     resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
     engines: {node: '>=6'}
@@ -10303,36 +10179,6 @@ packages:
   react-is@18.2.0:
     resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==}
 
-  react-remove-scroll-bar@2.3.6:
-    resolution: {integrity: sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  react-remove-scroll@2.5.7:
-    resolution: {integrity: sha512-FnrTWO4L7/Bhhf3CYBNArEG/yROV0tKmTv7/3h9QCFvH6sndeFf1wPqOcbFVu5VAulS5dV1wGT3GZZ/1GawqiA==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  react-style-singleton@2.2.1:
-    resolution: {integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
   react@18.3.1:
     resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==}
     engines: {node: '>=0.10.0'}
@@ -10534,14 +10380,16 @@ packages:
 
   rimraf@2.7.1:
     resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==}
+    deprecated: Rimraf versions prior to v4 are no longer supported
     hasBin: true
 
   rimraf@3.0.2:
     resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
+    deprecated: Rimraf versions prior to v4 are no longer supported
     hasBin: true
 
-  rollup@4.18.0:
-    resolution: {integrity: sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==}
+  rollup@4.19.1:
+    resolution: {integrity: sha512-K5vziVlg7hTpYfFBI+91zHBEMo6jafYXpkMlqZjg7/zhIG9iHqazBf4xz9AVdjS9BruRn280ROqLI7G3OFRIlw==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
@@ -10586,8 +10434,8 @@ packages:
   sanitize-html@2.13.0:
     resolution: {integrity: sha512-Xff91Z+4Mz5QiNSLdLWwjgBDm5b1RU6xBT0+12rapjiaR7SwfRdjw8f+6Rir2MXKLrDicRFHdb51hGOAxmsUIA==}
 
-  sass@1.77.6:
-    resolution: {integrity: sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==}
+  sass@1.77.8:
+    resolution: {integrity: sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==}
     engines: {node: '>=14.0.0'}
     hasBin: true
 
@@ -10681,8 +10529,8 @@ packages:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
 
-  shiki@1.10.0:
-    resolution: {integrity: sha512-YD2sXQ+TMD/F9BimV9Jn0wj35pqOvywvOG/3PB6hGHyGKlM7TJ9tyJ02jOb2kF8F0HfJwKNYrh3sW7jEcuRlXA==}
+  shiki@1.12.0:
+    resolution: {integrity: sha512-BuAxWOm5JhRcbSOl7XCei8wGjgJJonnV0oipUupPY58iULxUGyHhW5CF+9FRMuM1pcJ5cGEJGll1LusX6FwpPA==}
 
   shimmer@1.2.1:
     resolution: {integrity: sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==}
@@ -10700,8 +10548,8 @@ packages:
     resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
     engines: {node: '>=14'}
 
-  simple-oauth2@5.0.1:
-    resolution: {integrity: sha512-JcmGdzvbHKU3GegF3BK6zNi46DqFTxPMjwYddu2bgYqZuy7Gtm8U8wdedkVE4lI4LEqXocmPBLAvC4BIiiBc5w==}
+  simple-oauth2@5.1.0:
+    resolution: {integrity: sha512-gWDa38Ccm4MwlG5U7AlcJxPv3lvr80dU7ARJWrGdgvOKyzSj1gr3GBPN1rABTedAYvC/LsGYoFuFxwDBPtGEbw==}
 
   simple-swizzle@0.2.2:
     resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==}
@@ -10946,8 +10794,8 @@ packages:
       react-dom:
         optional: true
 
-  storybook@8.1.11:
-    resolution: {integrity: sha512-3KjIhF8lczXhKKHyHbOqV30dvuRYJSxc0d1as/C8kybuwE7cLaydhWGma7VBv5bTSPv0rDzucx7KcO+achArPg==}
+  storybook@8.2.6:
+    resolution: {integrity: sha512-8j30wDxQmkcqI0fWcSYFsUCjErsY1yTWbTW+yjbwM8DyW18Cud6CwbFRCxjFsH+2M0CjP6Pqs/m1PGI0vcQscQ==}
     hasBin: true
 
   stream-browserify@3.0.0:
@@ -10959,9 +10807,6 @@ packages:
   stream-parser@0.3.1:
     resolution: {integrity: sha512-bJ/HgKq41nlKvlhccD5kaCr/P+Hu0wPNKPJOH7en+YrJu/9EgqUF+88w5Jb6KNcjOFMhfX4B2asfeAtIGuHObQ==}
 
-  stream-shift@1.0.1:
-    resolution: {integrity: sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==}
-
   stream-wormhole@1.1.0:
     resolution: {integrity: sha512-gHFfL3px0Kctd6Po0M8TzEvt3De/xu6cnRrjlfYNhwbhLPLwigI2t1nc6jrzNuaYg5C4YF78PPFuQPzRiqn9ew==}
     engines: {node: '>=4.0.0'}
@@ -11075,6 +10920,10 @@ packages:
     resolution: {integrity: sha512-pQ+V+nYQdC5H3Q7qBZAz/MO6lwGhoC2gOAjuouGf/VO0m7vQRh8QNMl2Uf6SwAtzZ9bOw3UIeBukEGNJl5dtXQ==}
     engines: {node: '>=14.16'}
 
+  strtok3@8.0.1:
+    resolution: {integrity: sha512-HNkTAnNWQj2YBzfTtoC5OQyu1QwPsMwiB7VyQmNvQKCrmEDSvFB857Vh97UY9InGLNRAB91sdS1ztifRo/3hdA==}
+    engines: {node: '>=16'}
+
   stylehacks@6.1.1:
     resolution: {integrity: sha512-gSTTEQ670cJNoaeIp9KX6lZmm8LJ3jPB5yJmX8Zq/wQxOsAFXV3qjWzHas3YYk1qesuVIyYWWUpZ0vSE/dTSGg==}
     engines: {node: ^14 || ^16 || >=18.0}
@@ -11119,16 +10968,13 @@ packages:
     os: [darwin, linux, win32, freebsd, openbsd, netbsd, sunos, android]
     hasBin: true
 
-  tar-fs@2.1.1:
-    resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==}
-
-  tar-stream@2.2.0:
-    resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
-    engines: {node: '>=6'}
-
   tar-stream@3.1.6:
     resolution: {integrity: sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==}
 
+  tar@4.4.19:
+    resolution: {integrity: sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==}
+    engines: {node: '>=4.5'}
+
   tar@6.2.1:
     resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
     engines: {node: '>=10'}
@@ -11152,13 +10998,8 @@ packages:
     resolution: {integrity: sha512-7jDLIdD2Zp0bDe5r3D2qtkd1QOCacylBuL7oa4udvN6v2pqr4+LcCr67C8DR1zkpaZ8XosF5m1yQSabKAW6f2g==}
     engines: {node: '>=14.16'}
 
-  terser@5.31.1:
-    resolution: {integrity: sha512-37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg==}
-    engines: {node: '>=10'}
-    hasBin: true
-
-  terser@5.31.2:
-    resolution: {integrity: sha512-LGyRZVFm/QElZHy/CPr/O4eNZOZIzsrQ92y4v9UJe/pFJjypje2yI3C2FmPtvUEnhadlSbmG2nXtdcjHOjCfxw==}
+  terser@5.31.3:
+    resolution: {integrity: sha512-pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -11182,8 +11023,8 @@ packages:
   thread-stream@3.1.0:
     resolution: {integrity: sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==}
 
-  three@0.165.0:
-    resolution: {integrity: sha512-cc96IlVYGydeceu0e5xq70H8/yoVT/tXBxV/W8A/U6uOq7DXc4/s1Mkmnu6SqoYGhSRWWYFOhVwvq6V0VtbplA==}
+  three@0.167.0:
+    resolution: {integrity: sha512-9Y1a66fpjqF3rhq7ivKTaKtjQLZ97Hj/lZ00DmZWaKHaQFH4uzYT1znwRDWQOcgMmCcOloQzo61gDmqO8l9xmA==}
 
   throttle-debounce@5.0.2:
     resolution: {integrity: sha512-B71/4oyj61iNH0KeCamLuE2rmKuTO5byTOSVwECM5FA7TiAiAW+UqTKZ9ERueC4qvgSttUhdmq1mXC3kJqGX7A==}
@@ -11192,9 +11033,6 @@ packages:
   throttleit@1.0.0:
     resolution: {integrity: sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==}
 
-  through2@2.0.5:
-    resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==}
-
   through@2.3.4:
     resolution: {integrity: sha512-DwbmSAcABsMazNkLOJJSLRC3gfh4cPxUxJCn9npmvbcI6undhgoJ2ShvEOgZrW8BH62Gyr9jKboGbfFcmY5VsQ==}
 
@@ -11244,9 +11082,6 @@ packages:
     resolution: {integrity: sha512-/m8M+2BJUpoJdgAHoG+baCwBT+tf2VraSfkBgl0Y00qIWt41DJ8R5B8nsEw0I58YwF5IZH6z24/2TobDKnqSWw==}
     engines: {node: '>=12'}
 
-  tocbot@4.21.1:
-    resolution: {integrity: sha512-IfajhBTeg0HlMXu1f+VMbPef05QpDTsZ9X2Yn1+8npdaXsXg/+wrm9Ze1WG5OS1UDC3qJ5EQN/XOZ3gfXjPFCw==}
-
   toidentifier@1.0.1:
     resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
     engines: {node: '>=0.6'}
@@ -11258,6 +11093,10 @@ packages:
     resolution: {integrity: sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg==}
     engines: {node: '>=14.16'}
 
+  token-types@6.0.0:
+    resolution: {integrity: sha512-lbDrTLVsHhOMljPscd0yitpozq7Ga2M5Cvez5AjGg8GASBjtt6iERCAJ93yommPmz62fb45oFIXHEZ3u9bfJEA==}
+    engines: {node: '>=14.16'}
+
   touch@3.1.0:
     resolution: {integrity: sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==}
     hasBin: true
@@ -11390,10 +11229,6 @@ packages:
     resolution: {integrity: sha512-R6wDsVsoS9xYOpy8vgeBlqpdOyzJ12HNfQhC/aAKWM3YoCV9TtunJzh/QpkMgeDhkoynDcw5f1y+qF9yc/HHyg==}
     engines: {node: '>=16'}
 
-  type-fest@4.9.0:
-    resolution: {integrity: sha512-KS/6lh/ynPGiHD/LnAobrEFq3Ad4pBzOlJ1wAnJx9N4EYoqFhMfLIBjUT2UEx4wg5ZE+cC1ob6DCSpppVo+rtg==}
-    engines: {node: '>=16'}
-
   type-is@1.6.18:
     resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
     engines: {node: '>= 0.6'}
@@ -11484,8 +11319,8 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
-  typescript@5.5.3:
-    resolution: {integrity: sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==}
+  typescript@5.5.4:
+    resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -11504,6 +11339,10 @@ packages:
     resolution: {integrity: sha512-u3xV3X7uzvi5b1MncmZo3i2Aw222Zk1keqLA1YkHldREkAhAqi65wuPfe7lHx8H/Wzy+8CE7S7uS3jekIM5s8g==}
     engines: {node: '>=8'}
 
+  uint8array-extras@1.4.0:
+    resolution: {integrity: sha512-ZPtzy0hu4cZjv3z5NW9gfKnNLjoz4y6uv4HlelAjDK7sY/xOkKZv9xK/WQpcsBB3jEybChz9DPC2U/+cusjJVQ==}
+    engines: {node: '>=18'}
+
   ulid@2.3.0:
     resolution: {integrity: sha512-keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw==}
     hasBin: true
@@ -11609,25 +11448,9 @@ packages:
   url-parse@1.5.10:
     resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
 
-  use-callback-ref@1.3.2:
-    resolution: {integrity: sha512-elOQwe6Q8gqZgDA8mrh44qRTQqpIHDcZ3hXTLjBe1i4ph8XpNJnO+aQf3NaG+lriLopI4HMx9VjQLfPQ6vhnoA==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  use-sidecar@1.1.2:
-    resolution: {integrity: sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': ^16.9.0 || ^17.0.0 || ^18.0.0
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  utf-8-validate@6.0.3:
+    resolution: {integrity: sha512-uIuGf9TWQ/y+0Lp+KGZCMuJWc3N9BHA+l/UmHd/oUHwJJDeysyTRxNQVkbzsIWfGFbRe3OcgML/i0mvVRPOyDA==}
+    engines: {node: '>=6.14.2'}
 
   utf-8-validate@6.0.4:
     resolution: {integrity: sha512-xu9GQDeFp+eZ6LnCywXN/zBancWvOpUMzgjLPSjy4BRHSmTelvn2E0DG0o1sTiw5hkCKBHo8rwSKncfRfv2EEQ==}
@@ -11698,8 +11521,8 @@ packages:
   vite-plugin-turbosnap@1.0.3:
     resolution: {integrity: sha512-p4D8CFVhZS412SyQX125qxyzOgIFouwOcvjZWk6bQbNPR1wtaEzFT6jZxAjf1dejlGqa6fqHcuCvQea6EWUkUA==}
 
-  vite@5.3.2:
-    resolution: {integrity: sha512-6lA7OBHBlXUxiJxbO5aAY2fsHHzDr1q7DvXYnyZycRs2Dz+dXBWuhpWHvmljTRTpQC2uvGmUFFkSHF2vGo90MA==}
+  vite@5.3.5:
+    resolution: {integrity: sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -11799,11 +11622,8 @@ packages:
   vue-component-type-helpers@2.0.16:
     resolution: {integrity: sha512-qisL/iAfdO++7w+SsfYQJVPj6QKvxp4i1MMxvsNO41z/8zu3KuAw9LkhKUfP/kcOWGDxESp+pQObWppXusejCA==}
 
-  vue-component-type-helpers@2.0.24:
-    resolution: {integrity: sha512-Jr5N8QVYEcbQuMN1LRgvg61758G8HTnzUlQsAFOxx6Y6X8kmhJ7C+jOvWsQruYxi3uHhhS6BghyRlyiwO99DBg==}
-
-  vue-component-type-helpers@2.0.26:
-    resolution: {integrity: sha512-sO9qQ8oC520SW6kqlls0iqDak53gsTVSrYylajgjmkt1c0vcgjsGSy1KzlDrbEx8pm02IEYhlUkU5hCYf8rwtg==}
+  vue-component-type-helpers@2.0.29:
+    resolution: {integrity: sha512-58i+ZhUAUpwQ+9h5Hck0D+jr1qbYl4voRt5KffBx8qzELViQ4XdT/Tuo+mzq8u63teAG8K0lLaOiL5ofqW38rg==}
 
   vue-demi@0.14.7:
     resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==}
@@ -11841,14 +11661,14 @@ packages:
   vue-template-compiler@2.7.14:
     resolution: {integrity: sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==}
 
-  vue-tsc@2.0.24:
-    resolution: {integrity: sha512-1qi4P8L7yS78A7OJ7CDDxUIZPD6nVxoQEgX3DkRZNi1HI1qOfzOJwQlNpmwkogSVD6S/XcanbW9sktzpSxz6rA==}
+  vue-tsc@2.0.29:
+    resolution: {integrity: sha512-MHhsfyxO3mYShZCGYNziSbc63x7cQ5g9kvijV7dRe1TTXBRLxXyL0FnXWpUF1xII2mJ86mwYpYsUmMwkmerq7Q==}
     hasBin: true
     peerDependencies:
       typescript: '>=5.0.0'
 
-  vue@3.4.31:
-    resolution: {integrity: sha512-njqRrOy7W3YLAlVqSKpBebtZpDVg21FPoaq1I7f/+qqBThK9ChAIjkRWgeP6Eat+8C+iia4P3OYqpATP21BCoQ==}
+  vue@3.4.34:
+    resolution: {integrity: sha512-VZze05HWlA3ItreQ/ka7Sx7PoD0/3St8FEiSlSTVgb6l4hL+RjtP2/8g5WQBzZgyf8WG2f+g1bXzC7zggLhAJA==}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
@@ -11869,6 +11689,9 @@ packages:
     engines: {node: '>=12.0.0'}
     hasBin: true
 
+  walk-up-path@3.0.1:
+    resolution: {integrity: sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==}
+
   walker@1.0.8:
     resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}
 
@@ -11997,8 +11820,8 @@ packages:
     resolution: {integrity: sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
 
-  ws@8.17.1:
-    resolution: {integrity: sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==}
+  ws@8.18.0:
+    resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
       bufferutil: ^4.0.1
@@ -12103,8 +11926,6 @@ packages:
 
 snapshots:
 
-  '@aashutoshrathi/word-wrap@1.2.6': {}
-
   '@adobe/css-tools@4.3.3': {}
 
   '@aiscript-dev/aiscript-languageserver@https://github.com/aiscript-dev/aiscript-languageserver/releases/download/0.1.6/aiscript-dev-aiscript-languageserver-0.1.6.tgz':
@@ -12131,508 +11952,509 @@ snapshots:
   '@aws-crypto/crc32@5.2.0':
     dependencies:
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/types': 3.598.0
-      tslib: 2.6.2
+      '@aws-sdk/types': 3.609.0
+      tslib: 2.6.3
 
   '@aws-crypto/crc32c@5.2.0':
     dependencies:
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/types': 3.598.0
-      tslib: 2.6.2
+      '@aws-sdk/types': 3.609.0
+      tslib: 2.6.3
 
   '@aws-crypto/sha1-browser@5.2.0':
     dependencies:
       '@aws-crypto/supports-web-crypto': 5.2.0
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/types': 3.609.0
       '@aws-sdk/util-locate-window': 3.208.0
       '@smithy/util-utf8': 2.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@aws-crypto/sha256-browser@5.2.0':
     dependencies:
       '@aws-crypto/sha256-js': 5.2.0
       '@aws-crypto/supports-web-crypto': 5.2.0
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/types': 3.609.0
       '@aws-sdk/util-locate-window': 3.208.0
       '@smithy/util-utf8': 2.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@aws-crypto/sha256-js@5.2.0':
     dependencies:
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/types': 3.598.0
-      tslib: 2.6.2
+      '@aws-sdk/types': 3.609.0
+      tslib: 2.6.3
 
   '@aws-crypto/supports-web-crypto@5.2.0':
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@aws-crypto/util@5.2.0':
     dependencies:
-      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/types': 3.609.0
       '@smithy/util-utf8': 2.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/client-s3@3.600.0':
+  '@aws-sdk/client-s3@3.620.0':
     dependencies:
       '@aws-crypto/sha1-browser': 5.2.0
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sso-oidc': 3.600.0(@aws-sdk/client-sts@3.600.0)
-      '@aws-sdk/client-sts': 3.600.0
-      '@aws-sdk/core': 3.598.0
-      '@aws-sdk/credential-provider-node': 3.600.0(@aws-sdk/client-sso-oidc@3.600.0)(@aws-sdk/client-sts@3.600.0)
-      '@aws-sdk/middleware-bucket-endpoint': 3.598.0
-      '@aws-sdk/middleware-expect-continue': 3.598.0
-      '@aws-sdk/middleware-flexible-checksums': 3.598.0
-      '@aws-sdk/middleware-host-header': 3.598.0
-      '@aws-sdk/middleware-location-constraint': 3.598.0
-      '@aws-sdk/middleware-logger': 3.598.0
-      '@aws-sdk/middleware-recursion-detection': 3.598.0
-      '@aws-sdk/middleware-sdk-s3': 3.598.0
-      '@aws-sdk/middleware-signing': 3.598.0
-      '@aws-sdk/middleware-ssec': 3.598.0
-      '@aws-sdk/middleware-user-agent': 3.598.0
-      '@aws-sdk/region-config-resolver': 3.598.0
-      '@aws-sdk/signature-v4-multi-region': 3.598.0
-      '@aws-sdk/types': 3.598.0
-      '@aws-sdk/util-endpoints': 3.598.0
-      '@aws-sdk/util-user-agent-browser': 3.598.0
-      '@aws-sdk/util-user-agent-node': 3.598.0
-      '@aws-sdk/xml-builder': 3.598.0
-      '@smithy/config-resolver': 3.0.4
-      '@smithy/core': 2.2.4
-      '@smithy/eventstream-serde-browser': 3.0.4
+      '@aws-sdk/client-sso-oidc': 3.620.0(@aws-sdk/client-sts@3.620.0)
+      '@aws-sdk/client-sts': 3.620.0
+      '@aws-sdk/core': 3.620.0
+      '@aws-sdk/credential-provider-node': 3.620.0(@aws-sdk/client-sso-oidc@3.620.0(@aws-sdk/client-sts@3.620.0))(@aws-sdk/client-sts@3.620.0)
+      '@aws-sdk/middleware-bucket-endpoint': 3.620.0
+      '@aws-sdk/middleware-expect-continue': 3.620.0
+      '@aws-sdk/middleware-flexible-checksums': 3.620.0
+      '@aws-sdk/middleware-host-header': 3.620.0
+      '@aws-sdk/middleware-location-constraint': 3.609.0
+      '@aws-sdk/middleware-logger': 3.609.0
+      '@aws-sdk/middleware-recursion-detection': 3.620.0
+      '@aws-sdk/middleware-sdk-s3': 3.620.0
+      '@aws-sdk/middleware-signing': 3.620.0
+      '@aws-sdk/middleware-ssec': 3.609.0
+      '@aws-sdk/middleware-user-agent': 3.620.0
+      '@aws-sdk/region-config-resolver': 3.614.0
+      '@aws-sdk/signature-v4-multi-region': 3.620.0
+      '@aws-sdk/types': 3.609.0
+      '@aws-sdk/util-endpoints': 3.614.0
+      '@aws-sdk/util-user-agent-browser': 3.609.0
+      '@aws-sdk/util-user-agent-node': 3.614.0
+      '@aws-sdk/xml-builder': 3.609.0
+      '@smithy/config-resolver': 3.0.5
+      '@smithy/core': 2.3.1
+      '@smithy/eventstream-serde-browser': 3.0.5
       '@smithy/eventstream-serde-config-resolver': 3.0.3
       '@smithy/eventstream-serde-node': 3.0.4
-      '@smithy/fetch-http-handler': 3.2.0
+      '@smithy/fetch-http-handler': 3.2.4
       '@smithy/hash-blob-browser': 3.1.2
       '@smithy/hash-node': 3.0.3
       '@smithy/hash-stream-node': 3.1.2
       '@smithy/invalid-dependency': 3.0.3
       '@smithy/md5-js': 3.0.3
-      '@smithy/middleware-content-length': 3.0.3
-      '@smithy/middleware-endpoint': 3.0.4
-      '@smithy/middleware-retry': 3.0.7
+      '@smithy/middleware-content-length': 3.0.5
+      '@smithy/middleware-endpoint': 3.1.0
+      '@smithy/middleware-retry': 3.0.13
       '@smithy/middleware-serde': 3.0.3
       '@smithy/middleware-stack': 3.0.3
-      '@smithy/node-config-provider': 3.1.3
-      '@smithy/node-http-handler': 3.1.1
-      '@smithy/protocol-http': 4.0.3
-      '@smithy/smithy-client': 3.1.5
+      '@smithy/node-config-provider': 3.1.4
+      '@smithy/node-http-handler': 3.1.4
+      '@smithy/protocol-http': 4.1.0
+      '@smithy/smithy-client': 3.1.11
       '@smithy/types': 3.3.0
       '@smithy/url-parser': 3.0.3
       '@smithy/util-base64': 3.0.0
       '@smithy/util-body-length-browser': 3.0.0
       '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.7
-      '@smithy/util-defaults-mode-node': 3.0.7
-      '@smithy/util-endpoints': 2.0.4
+      '@smithy/util-defaults-mode-browser': 3.0.13
+      '@smithy/util-defaults-mode-node': 3.0.13
+      '@smithy/util-endpoints': 2.0.5
       '@smithy/util-retry': 3.0.3
-      '@smithy/util-stream': 3.0.5
+      '@smithy/util-stream': 3.1.3
       '@smithy/util-utf8': 3.0.0
       '@smithy/util-waiter': 3.1.2
-      tslib: 2.6.2
+      tslib: 2.6.3
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/client-sso-oidc@3.600.0(@aws-sdk/client-sts@3.600.0)':
+  '@aws-sdk/client-sso-oidc@3.620.0(@aws-sdk/client-sts@3.620.0)':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sts': 3.600.0
-      '@aws-sdk/core': 3.598.0
-      '@aws-sdk/credential-provider-node': 3.600.0(@aws-sdk/client-sso-oidc@3.600.0)(@aws-sdk/client-sts@3.600.0)
-      '@aws-sdk/middleware-host-header': 3.598.0
-      '@aws-sdk/middleware-logger': 3.598.0
-      '@aws-sdk/middleware-recursion-detection': 3.598.0
-      '@aws-sdk/middleware-user-agent': 3.598.0
-      '@aws-sdk/region-config-resolver': 3.598.0
-      '@aws-sdk/types': 3.598.0
-      '@aws-sdk/util-endpoints': 3.598.0
-      '@aws-sdk/util-user-agent-browser': 3.598.0
-      '@aws-sdk/util-user-agent-node': 3.598.0
-      '@smithy/config-resolver': 3.0.4
-      '@smithy/core': 2.2.4
-      '@smithy/fetch-http-handler': 3.2.0
+      '@aws-sdk/client-sts': 3.620.0
+      '@aws-sdk/core': 3.620.0
+      '@aws-sdk/credential-provider-node': 3.620.0(@aws-sdk/client-sso-oidc@3.620.0(@aws-sdk/client-sts@3.620.0))(@aws-sdk/client-sts@3.620.0)
+      '@aws-sdk/middleware-host-header': 3.620.0
+      '@aws-sdk/middleware-logger': 3.609.0
+      '@aws-sdk/middleware-recursion-detection': 3.620.0
+      '@aws-sdk/middleware-user-agent': 3.620.0
+      '@aws-sdk/region-config-resolver': 3.614.0
+      '@aws-sdk/types': 3.609.0
+      '@aws-sdk/util-endpoints': 3.614.0
+      '@aws-sdk/util-user-agent-browser': 3.609.0
+      '@aws-sdk/util-user-agent-node': 3.614.0
+      '@smithy/config-resolver': 3.0.5
+      '@smithy/core': 2.3.1
+      '@smithy/fetch-http-handler': 3.2.4
       '@smithy/hash-node': 3.0.3
       '@smithy/invalid-dependency': 3.0.3
-      '@smithy/middleware-content-length': 3.0.3
-      '@smithy/middleware-endpoint': 3.0.4
-      '@smithy/middleware-retry': 3.0.7
+      '@smithy/middleware-content-length': 3.0.5
+      '@smithy/middleware-endpoint': 3.1.0
+      '@smithy/middleware-retry': 3.0.13
       '@smithy/middleware-serde': 3.0.3
       '@smithy/middleware-stack': 3.0.3
-      '@smithy/node-config-provider': 3.1.3
-      '@smithy/node-http-handler': 3.1.1
-      '@smithy/protocol-http': 4.0.3
-      '@smithy/smithy-client': 3.1.5
+      '@smithy/node-config-provider': 3.1.4
+      '@smithy/node-http-handler': 3.1.4
+      '@smithy/protocol-http': 4.1.0
+      '@smithy/smithy-client': 3.1.11
       '@smithy/types': 3.3.0
       '@smithy/url-parser': 3.0.3
       '@smithy/util-base64': 3.0.0
       '@smithy/util-body-length-browser': 3.0.0
       '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.7
-      '@smithy/util-defaults-mode-node': 3.0.7
-      '@smithy/util-endpoints': 2.0.4
+      '@smithy/util-defaults-mode-browser': 3.0.13
+      '@smithy/util-defaults-mode-node': 3.0.13
+      '@smithy/util-endpoints': 2.0.5
       '@smithy/util-middleware': 3.0.3
       '@smithy/util-retry': 3.0.3
       '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
     transitivePeerDependencies:
-      - '@aws-sdk/client-sts'
       - aws-crt
 
-  '@aws-sdk/client-sso@3.598.0':
+  '@aws-sdk/client-sso@3.620.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/core': 3.598.0
-      '@aws-sdk/middleware-host-header': 3.598.0
-      '@aws-sdk/middleware-logger': 3.598.0
-      '@aws-sdk/middleware-recursion-detection': 3.598.0
-      '@aws-sdk/middleware-user-agent': 3.598.0
-      '@aws-sdk/region-config-resolver': 3.598.0
-      '@aws-sdk/types': 3.598.0
-      '@aws-sdk/util-endpoints': 3.598.0
-      '@aws-sdk/util-user-agent-browser': 3.598.0
-      '@aws-sdk/util-user-agent-node': 3.598.0
-      '@smithy/config-resolver': 3.0.4
-      '@smithy/core': 2.2.4
-      '@smithy/fetch-http-handler': 3.2.0
+      '@aws-sdk/core': 3.620.0
+      '@aws-sdk/middleware-host-header': 3.620.0
+      '@aws-sdk/middleware-logger': 3.609.0
+      '@aws-sdk/middleware-recursion-detection': 3.620.0
+      '@aws-sdk/middleware-user-agent': 3.620.0
+      '@aws-sdk/region-config-resolver': 3.614.0
+      '@aws-sdk/types': 3.609.0
+      '@aws-sdk/util-endpoints': 3.614.0
+      '@aws-sdk/util-user-agent-browser': 3.609.0
+      '@aws-sdk/util-user-agent-node': 3.614.0
+      '@smithy/config-resolver': 3.0.5
+      '@smithy/core': 2.3.1
+      '@smithy/fetch-http-handler': 3.2.4
       '@smithy/hash-node': 3.0.3
       '@smithy/invalid-dependency': 3.0.3
-      '@smithy/middleware-content-length': 3.0.3
-      '@smithy/middleware-endpoint': 3.0.4
-      '@smithy/middleware-retry': 3.0.7
+      '@smithy/middleware-content-length': 3.0.5
+      '@smithy/middleware-endpoint': 3.1.0
+      '@smithy/middleware-retry': 3.0.13
       '@smithy/middleware-serde': 3.0.3
       '@smithy/middleware-stack': 3.0.3
-      '@smithy/node-config-provider': 3.1.3
-      '@smithy/node-http-handler': 3.1.1
-      '@smithy/protocol-http': 4.0.3
-      '@smithy/smithy-client': 3.1.5
+      '@smithy/node-config-provider': 3.1.4
+      '@smithy/node-http-handler': 3.1.4
+      '@smithy/protocol-http': 4.1.0
+      '@smithy/smithy-client': 3.1.11
       '@smithy/types': 3.3.0
       '@smithy/url-parser': 3.0.3
       '@smithy/util-base64': 3.0.0
       '@smithy/util-body-length-browser': 3.0.0
       '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.7
-      '@smithy/util-defaults-mode-node': 3.0.7
-      '@smithy/util-endpoints': 2.0.4
+      '@smithy/util-defaults-mode-browser': 3.0.13
+      '@smithy/util-defaults-mode-node': 3.0.13
+      '@smithy/util-endpoints': 2.0.5
       '@smithy/util-middleware': 3.0.3
       '@smithy/util-retry': 3.0.3
       '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/client-sts@3.600.0':
+  '@aws-sdk/client-sts@3.620.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sso-oidc': 3.600.0(@aws-sdk/client-sts@3.600.0)
-      '@aws-sdk/core': 3.598.0
-      '@aws-sdk/credential-provider-node': 3.600.0(@aws-sdk/client-sso-oidc@3.600.0)(@aws-sdk/client-sts@3.600.0)
-      '@aws-sdk/middleware-host-header': 3.598.0
-      '@aws-sdk/middleware-logger': 3.598.0
-      '@aws-sdk/middleware-recursion-detection': 3.598.0
-      '@aws-sdk/middleware-user-agent': 3.598.0
-      '@aws-sdk/region-config-resolver': 3.598.0
-      '@aws-sdk/types': 3.598.0
-      '@aws-sdk/util-endpoints': 3.598.0
-      '@aws-sdk/util-user-agent-browser': 3.598.0
-      '@aws-sdk/util-user-agent-node': 3.598.0
-      '@smithy/config-resolver': 3.0.4
-      '@smithy/core': 2.2.4
-      '@smithy/fetch-http-handler': 3.2.0
+      '@aws-sdk/client-sso-oidc': 3.620.0(@aws-sdk/client-sts@3.620.0)
+      '@aws-sdk/core': 3.620.0
+      '@aws-sdk/credential-provider-node': 3.620.0(@aws-sdk/client-sso-oidc@3.620.0(@aws-sdk/client-sts@3.620.0))(@aws-sdk/client-sts@3.620.0)
+      '@aws-sdk/middleware-host-header': 3.620.0
+      '@aws-sdk/middleware-logger': 3.609.0
+      '@aws-sdk/middleware-recursion-detection': 3.620.0
+      '@aws-sdk/middleware-user-agent': 3.620.0
+      '@aws-sdk/region-config-resolver': 3.614.0
+      '@aws-sdk/types': 3.609.0
+      '@aws-sdk/util-endpoints': 3.614.0
+      '@aws-sdk/util-user-agent-browser': 3.609.0
+      '@aws-sdk/util-user-agent-node': 3.614.0
+      '@smithy/config-resolver': 3.0.5
+      '@smithy/core': 2.3.1
+      '@smithy/fetch-http-handler': 3.2.4
       '@smithy/hash-node': 3.0.3
       '@smithy/invalid-dependency': 3.0.3
-      '@smithy/middleware-content-length': 3.0.3
-      '@smithy/middleware-endpoint': 3.0.4
-      '@smithy/middleware-retry': 3.0.7
+      '@smithy/middleware-content-length': 3.0.5
+      '@smithy/middleware-endpoint': 3.1.0
+      '@smithy/middleware-retry': 3.0.13
       '@smithy/middleware-serde': 3.0.3
       '@smithy/middleware-stack': 3.0.3
-      '@smithy/node-config-provider': 3.1.3
-      '@smithy/node-http-handler': 3.1.1
-      '@smithy/protocol-http': 4.0.3
-      '@smithy/smithy-client': 3.1.5
+      '@smithy/node-config-provider': 3.1.4
+      '@smithy/node-http-handler': 3.1.4
+      '@smithy/protocol-http': 4.1.0
+      '@smithy/smithy-client': 3.1.11
       '@smithy/types': 3.3.0
       '@smithy/url-parser': 3.0.3
       '@smithy/util-base64': 3.0.0
       '@smithy/util-body-length-browser': 3.0.0
       '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.7
-      '@smithy/util-defaults-mode-node': 3.0.7
-      '@smithy/util-endpoints': 2.0.4
+      '@smithy/util-defaults-mode-browser': 3.0.13
+      '@smithy/util-defaults-mode-node': 3.0.13
+      '@smithy/util-endpoints': 2.0.5
       '@smithy/util-middleware': 3.0.3
       '@smithy/util-retry': 3.0.3
       '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/core@3.598.0':
+  '@aws-sdk/core@3.620.0':
     dependencies:
-      '@smithy/core': 2.2.4
-      '@smithy/protocol-http': 4.0.3
-      '@smithy/signature-v4': 3.1.2
-      '@smithy/smithy-client': 3.1.5
+      '@smithy/core': 2.3.1
+      '@smithy/protocol-http': 4.1.0
+      '@smithy/signature-v4': 4.1.0
+      '@smithy/smithy-client': 3.1.11
       '@smithy/types': 3.3.0
       fast-xml-parser: 4.2.5
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/credential-provider-env@3.598.0':
+  '@aws-sdk/credential-provider-env@3.609.0':
     dependencies:
-      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/types': 3.609.0
       '@smithy/property-provider': 3.1.3
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/credential-provider-http@3.598.0':
+  '@aws-sdk/credential-provider-http@3.620.0':
     dependencies:
-      '@aws-sdk/types': 3.598.0
-      '@smithy/fetch-http-handler': 3.2.0
-      '@smithy/node-http-handler': 3.1.1
+      '@aws-sdk/types': 3.609.0
+      '@smithy/fetch-http-handler': 3.2.4
+      '@smithy/node-http-handler': 3.1.4
       '@smithy/property-provider': 3.1.3
-      '@smithy/protocol-http': 4.0.3
-      '@smithy/smithy-client': 3.1.5
+      '@smithy/protocol-http': 4.1.0
+      '@smithy/smithy-client': 3.1.11
       '@smithy/types': 3.3.0
-      '@smithy/util-stream': 3.0.5
-      tslib: 2.6.2
+      '@smithy/util-stream': 3.1.3
+      tslib: 2.6.3
 
-  '@aws-sdk/credential-provider-ini@3.598.0(@aws-sdk/client-sso-oidc@3.600.0)(@aws-sdk/client-sts@3.600.0)':
+  '@aws-sdk/credential-provider-ini@3.620.0(@aws-sdk/client-sso-oidc@3.620.0(@aws-sdk/client-sts@3.620.0))(@aws-sdk/client-sts@3.620.0)':
     dependencies:
-      '@aws-sdk/client-sts': 3.600.0
-      '@aws-sdk/credential-provider-env': 3.598.0
-      '@aws-sdk/credential-provider-http': 3.598.0
-      '@aws-sdk/credential-provider-process': 3.598.0
-      '@aws-sdk/credential-provider-sso': 3.598.0(@aws-sdk/client-sso-oidc@3.600.0)
-      '@aws-sdk/credential-provider-web-identity': 3.598.0(@aws-sdk/client-sts@3.600.0)
-      '@aws-sdk/types': 3.598.0
-      '@smithy/credential-provider-imds': 3.1.3
+      '@aws-sdk/client-sts': 3.620.0
+      '@aws-sdk/credential-provider-env': 3.609.0
+      '@aws-sdk/credential-provider-http': 3.620.0
+      '@aws-sdk/credential-provider-process': 3.614.0
+      '@aws-sdk/credential-provider-sso': 3.620.0(@aws-sdk/client-sso-oidc@3.620.0(@aws-sdk/client-sts@3.620.0))
+      '@aws-sdk/credential-provider-web-identity': 3.609.0(@aws-sdk/client-sts@3.620.0)
+      '@aws-sdk/types': 3.609.0
+      '@smithy/credential-provider-imds': 3.2.0
       '@smithy/property-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.3
+      '@smithy/shared-ini-file-loader': 3.1.4
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
     transitivePeerDependencies:
       - '@aws-sdk/client-sso-oidc'
       - aws-crt
 
-  '@aws-sdk/credential-provider-node@3.600.0(@aws-sdk/client-sso-oidc@3.600.0)(@aws-sdk/client-sts@3.600.0)':
+  '@aws-sdk/credential-provider-node@3.620.0(@aws-sdk/client-sso-oidc@3.620.0(@aws-sdk/client-sts@3.620.0))(@aws-sdk/client-sts@3.620.0)':
     dependencies:
-      '@aws-sdk/credential-provider-env': 3.598.0
-      '@aws-sdk/credential-provider-http': 3.598.0
-      '@aws-sdk/credential-provider-ini': 3.598.0(@aws-sdk/client-sso-oidc@3.600.0)(@aws-sdk/client-sts@3.600.0)
-      '@aws-sdk/credential-provider-process': 3.598.0
-      '@aws-sdk/credential-provider-sso': 3.598.0(@aws-sdk/client-sso-oidc@3.600.0)
-      '@aws-sdk/credential-provider-web-identity': 3.598.0(@aws-sdk/client-sts@3.600.0)
-      '@aws-sdk/types': 3.598.0
-      '@smithy/credential-provider-imds': 3.1.3
+      '@aws-sdk/credential-provider-env': 3.609.0
+      '@aws-sdk/credential-provider-http': 3.620.0
+      '@aws-sdk/credential-provider-ini': 3.620.0(@aws-sdk/client-sso-oidc@3.620.0(@aws-sdk/client-sts@3.620.0))(@aws-sdk/client-sts@3.620.0)
+      '@aws-sdk/credential-provider-process': 3.614.0
+      '@aws-sdk/credential-provider-sso': 3.620.0(@aws-sdk/client-sso-oidc@3.620.0(@aws-sdk/client-sts@3.620.0))
+      '@aws-sdk/credential-provider-web-identity': 3.609.0(@aws-sdk/client-sts@3.620.0)
+      '@aws-sdk/types': 3.609.0
+      '@smithy/credential-provider-imds': 3.2.0
       '@smithy/property-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.3
+      '@smithy/shared-ini-file-loader': 3.1.4
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
     transitivePeerDependencies:
       - '@aws-sdk/client-sso-oidc'
       - '@aws-sdk/client-sts'
       - aws-crt
 
-  '@aws-sdk/credential-provider-process@3.598.0':
+  '@aws-sdk/credential-provider-process@3.614.0':
     dependencies:
-      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/types': 3.609.0
       '@smithy/property-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.3
+      '@smithy/shared-ini-file-loader': 3.1.4
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/credential-provider-sso@3.598.0(@aws-sdk/client-sso-oidc@3.600.0)':
+  '@aws-sdk/credential-provider-sso@3.620.0(@aws-sdk/client-sso-oidc@3.620.0(@aws-sdk/client-sts@3.620.0))':
     dependencies:
-      '@aws-sdk/client-sso': 3.598.0
-      '@aws-sdk/token-providers': 3.598.0(@aws-sdk/client-sso-oidc@3.600.0)
-      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/client-sso': 3.620.0
+      '@aws-sdk/token-providers': 3.614.0(@aws-sdk/client-sso-oidc@3.620.0(@aws-sdk/client-sts@3.620.0))
+      '@aws-sdk/types': 3.609.0
       '@smithy/property-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.3
+      '@smithy/shared-ini-file-loader': 3.1.4
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
     transitivePeerDependencies:
       - '@aws-sdk/client-sso-oidc'
       - aws-crt
 
-  '@aws-sdk/credential-provider-web-identity@3.598.0(@aws-sdk/client-sts@3.600.0)':
+  '@aws-sdk/credential-provider-web-identity@3.609.0(@aws-sdk/client-sts@3.620.0)':
     dependencies:
-      '@aws-sdk/client-sts': 3.600.0
-      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/client-sts': 3.620.0
+      '@aws-sdk/types': 3.609.0
       '@smithy/property-provider': 3.1.3
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/lib-storage@3.600.0(@aws-sdk/client-s3@3.600.0)':
+  '@aws-sdk/lib-storage@3.620.0(@aws-sdk/client-s3@3.620.0)':
     dependencies:
-      '@aws-sdk/client-s3': 3.600.0
+      '@aws-sdk/client-s3': 3.620.0
       '@smithy/abort-controller': 3.1.1
-      '@smithy/middleware-endpoint': 3.0.4
-      '@smithy/smithy-client': 3.1.5
+      '@smithy/middleware-endpoint': 3.1.0
+      '@smithy/smithy-client': 3.1.11
       buffer: 5.6.0
       events: 3.3.0
       stream-browserify: 3.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/middleware-bucket-endpoint@3.598.0':
+  '@aws-sdk/middleware-bucket-endpoint@3.620.0':
     dependencies:
-      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/types': 3.609.0
       '@aws-sdk/util-arn-parser': 3.568.0
-      '@smithy/node-config-provider': 3.1.3
-      '@smithy/protocol-http': 4.0.3
+      '@smithy/node-config-provider': 3.1.4
+      '@smithy/protocol-http': 4.1.0
       '@smithy/types': 3.3.0
       '@smithy/util-config-provider': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/middleware-expect-continue@3.598.0':
+  '@aws-sdk/middleware-expect-continue@3.620.0':
     dependencies:
-      '@aws-sdk/types': 3.598.0
-      '@smithy/protocol-http': 4.0.3
+      '@aws-sdk/types': 3.609.0
+      '@smithy/protocol-http': 4.1.0
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/middleware-flexible-checksums@3.598.0':
+  '@aws-sdk/middleware-flexible-checksums@3.620.0':
     dependencies:
       '@aws-crypto/crc32': 5.2.0
       '@aws-crypto/crc32c': 5.2.0
-      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/types': 3.609.0
       '@smithy/is-array-buffer': 3.0.0
-      '@smithy/protocol-http': 4.0.3
+      '@smithy/protocol-http': 4.1.0
       '@smithy/types': 3.3.0
       '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/middleware-host-header@3.598.0':
+  '@aws-sdk/middleware-host-header@3.620.0':
     dependencies:
-      '@aws-sdk/types': 3.598.0
-      '@smithy/protocol-http': 4.0.3
+      '@aws-sdk/types': 3.609.0
+      '@smithy/protocol-http': 4.1.0
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/middleware-location-constraint@3.598.0':
+  '@aws-sdk/middleware-location-constraint@3.609.0':
     dependencies:
-      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/types': 3.609.0
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/middleware-logger@3.598.0':
+  '@aws-sdk/middleware-logger@3.609.0':
     dependencies:
-      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/types': 3.609.0
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/middleware-recursion-detection@3.598.0':
+  '@aws-sdk/middleware-recursion-detection@3.620.0':
     dependencies:
-      '@aws-sdk/types': 3.598.0
-      '@smithy/protocol-http': 4.0.3
+      '@aws-sdk/types': 3.609.0
+      '@smithy/protocol-http': 4.1.0
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/middleware-sdk-s3@3.598.0':
+  '@aws-sdk/middleware-sdk-s3@3.620.0':
     dependencies:
-      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/types': 3.609.0
       '@aws-sdk/util-arn-parser': 3.568.0
-      '@smithy/node-config-provider': 3.1.3
-      '@smithy/protocol-http': 4.0.3
-      '@smithy/signature-v4': 3.1.2
-      '@smithy/smithy-client': 3.1.5
+      '@smithy/node-config-provider': 3.1.4
+      '@smithy/protocol-http': 4.1.0
+      '@smithy/signature-v4': 4.1.0
+      '@smithy/smithy-client': 3.1.11
       '@smithy/types': 3.3.0
       '@smithy/util-config-provider': 3.0.0
-      tslib: 2.6.2
+      '@smithy/util-stream': 3.1.3
+      '@smithy/util-utf8': 3.0.0
+      tslib: 2.6.3
 
-  '@aws-sdk/middleware-signing@3.598.0':
+  '@aws-sdk/middleware-signing@3.620.0':
     dependencies:
-      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/types': 3.609.0
       '@smithy/property-provider': 3.1.3
-      '@smithy/protocol-http': 4.0.3
-      '@smithy/signature-v4': 3.1.2
+      '@smithy/protocol-http': 4.1.0
+      '@smithy/signature-v4': 4.1.0
       '@smithy/types': 3.3.0
       '@smithy/util-middleware': 3.0.3
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/middleware-ssec@3.598.0':
+  '@aws-sdk/middleware-ssec@3.609.0':
     dependencies:
-      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/types': 3.609.0
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/middleware-user-agent@3.598.0':
+  '@aws-sdk/middleware-user-agent@3.620.0':
     dependencies:
-      '@aws-sdk/types': 3.598.0
-      '@aws-sdk/util-endpoints': 3.598.0
-      '@smithy/protocol-http': 4.0.3
+      '@aws-sdk/types': 3.609.0
+      '@aws-sdk/util-endpoints': 3.614.0
+      '@smithy/protocol-http': 4.1.0
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/region-config-resolver@3.598.0':
+  '@aws-sdk/region-config-resolver@3.614.0':
     dependencies:
-      '@aws-sdk/types': 3.598.0
-      '@smithy/node-config-provider': 3.1.3
+      '@aws-sdk/types': 3.609.0
+      '@smithy/node-config-provider': 3.1.4
       '@smithy/types': 3.3.0
       '@smithy/util-config-provider': 3.0.0
       '@smithy/util-middleware': 3.0.3
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/signature-v4-multi-region@3.598.0':
+  '@aws-sdk/signature-v4-multi-region@3.620.0':
     dependencies:
-      '@aws-sdk/middleware-sdk-s3': 3.598.0
-      '@aws-sdk/types': 3.598.0
-      '@smithy/protocol-http': 4.0.3
-      '@smithy/signature-v4': 3.1.2
+      '@aws-sdk/middleware-sdk-s3': 3.620.0
+      '@aws-sdk/types': 3.609.0
+      '@smithy/protocol-http': 4.1.0
+      '@smithy/signature-v4': 4.1.0
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/token-providers@3.598.0(@aws-sdk/client-sso-oidc@3.600.0)':
+  '@aws-sdk/token-providers@3.614.0(@aws-sdk/client-sso-oidc@3.620.0(@aws-sdk/client-sts@3.620.0))':
     dependencies:
-      '@aws-sdk/client-sso-oidc': 3.600.0(@aws-sdk/client-sts@3.600.0)
-      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/client-sso-oidc': 3.620.0(@aws-sdk/client-sts@3.620.0)
+      '@aws-sdk/types': 3.609.0
       '@smithy/property-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.3
+      '@smithy/shared-ini-file-loader': 3.1.4
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/types@3.598.0':
+  '@aws-sdk/types@3.609.0':
     dependencies:
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@aws-sdk/util-arn-parser@3.568.0':
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/util-endpoints@3.598.0':
+  '@aws-sdk/util-endpoints@3.614.0':
     dependencies:
-      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/types': 3.609.0
       '@smithy/types': 3.3.0
-      '@smithy/util-endpoints': 2.0.4
-      tslib: 2.6.2
+      '@smithy/util-endpoints': 2.0.5
+      tslib: 2.6.3
 
   '@aws-sdk/util-locate-window@3.208.0':
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/util-user-agent-browser@3.598.0':
+  '@aws-sdk/util-user-agent-browser@3.609.0':
     dependencies:
-      '@aws-sdk/types': 3.598.0
+      '@aws-sdk/types': 3.609.0
       '@smithy/types': 3.3.0
       bowser: 2.11.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/util-user-agent-node@3.598.0':
+  '@aws-sdk/util-user-agent-node@3.614.0':
     dependencies:
-      '@aws-sdk/types': 3.598.0
-      '@smithy/node-config-provider': 3.1.3
+      '@aws-sdk/types': 3.609.0
+      '@smithy/node-config-provider': 3.1.4
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@aws-sdk/xml-builder@3.598.0':
+  '@aws-sdk/xml-builder@3.609.0':
     dependencies:
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@babel/code-frame@7.23.5':
     dependencies:
@@ -13677,22 +13499,22 @@ snapshots:
 
   '@bcoe/v8-coverage@0.2.3': {}
 
-  '@bull-board/api@5.20.5(@bull-board/ui@5.20.5)':
+  '@bull-board/api@5.21.1(@bull-board/ui@5.21.1)':
     dependencies:
-      '@bull-board/ui': 5.20.5
+      '@bull-board/ui': 5.21.1
       redis-info: 3.1.0
 
-  '@bull-board/fastify@5.20.5':
+  '@bull-board/fastify@5.21.1':
     dependencies:
-      '@bull-board/api': 5.20.5(@bull-board/ui@5.20.5)
-      '@bull-board/ui': 5.20.5
+      '@bull-board/api': 5.21.1(@bull-board/ui@5.21.1)
+      '@bull-board/ui': 5.21.1
       '@fastify/static': 6.12.0
       '@fastify/view': 8.2.0
       ejs: 3.1.10
 
-  '@bull-board/ui@5.20.5':
+  '@bull-board/ui@5.21.1':
     dependencies:
-      '@bull-board/api': 5.20.5(@bull-board/ui@5.20.5)
+      '@bull-board/api': 5.21.1(@bull-board/ui@5.21.1)
 
   '@bundled-es-modules/cookie@2.0.0':
     dependencies:
@@ -13702,76 +13524,81 @@ snapshots:
     dependencies:
       statuses: 2.0.1
 
+  '@bundled-es-modules/tough-cookie@0.1.6':
+    dependencies:
+      '@types/tough-cookie': 4.0.5
+      tough-cookie: 4.1.4
+
   '@canvas/image-data@1.0.0': {}
 
   '@colors/colors@1.5.0':
     optional: true
 
-  '@cropper/element-canvas@2.0.0-beta.5':
+  '@cropper/element-canvas@2.0.0-rc.1':
     dependencies:
-      '@cropper/element': 2.0.0-beta.5
-      '@cropper/utils': 2.0.0-beta.5
+      '@cropper/element': 2.0.0-rc.1
+      '@cropper/utils': 2.0.0-rc.1
 
-  '@cropper/element-crosshair@2.0.0-beta.5':
+  '@cropper/element-crosshair@2.0.0-rc.1':
     dependencies:
-      '@cropper/element': 2.0.0-beta.5
-      '@cropper/utils': 2.0.0-beta.5
+      '@cropper/element': 2.0.0-rc.1
+      '@cropper/utils': 2.0.0-rc.1
 
-  '@cropper/element-grid@2.0.0-beta.5':
+  '@cropper/element-grid@2.0.0-rc.1':
     dependencies:
-      '@cropper/element': 2.0.0-beta.5
-      '@cropper/utils': 2.0.0-beta.5
+      '@cropper/element': 2.0.0-rc.1
+      '@cropper/utils': 2.0.0-rc.1
 
-  '@cropper/element-handle@2.0.0-beta.5':
+  '@cropper/element-handle@2.0.0-rc.1':
     dependencies:
-      '@cropper/element': 2.0.0-beta.5
-      '@cropper/utils': 2.0.0-beta.5
+      '@cropper/element': 2.0.0-rc.1
+      '@cropper/utils': 2.0.0-rc.1
 
-  '@cropper/element-image@2.0.0-beta.5':
+  '@cropper/element-image@2.0.0-rc.1':
     dependencies:
-      '@cropper/element': 2.0.0-beta.5
-      '@cropper/element-canvas': 2.0.0-beta.5
-      '@cropper/utils': 2.0.0-beta.5
+      '@cropper/element': 2.0.0-rc.1
+      '@cropper/element-canvas': 2.0.0-rc.1
+      '@cropper/utils': 2.0.0-rc.1
 
-  '@cropper/element-selection@2.0.0-beta.5':
+  '@cropper/element-selection@2.0.0-rc.1':
     dependencies:
-      '@cropper/element': 2.0.0-beta.5
-      '@cropper/element-canvas': 2.0.0-beta.5
-      '@cropper/element-image': 2.0.0-beta.5
-      '@cropper/utils': 2.0.0-beta.5
+      '@cropper/element': 2.0.0-rc.1
+      '@cropper/element-canvas': 2.0.0-rc.1
+      '@cropper/element-image': 2.0.0-rc.1
+      '@cropper/utils': 2.0.0-rc.1
 
-  '@cropper/element-shade@2.0.0-beta.5':
+  '@cropper/element-shade@2.0.0-rc.1':
     dependencies:
-      '@cropper/element': 2.0.0-beta.5
-      '@cropper/element-canvas': 2.0.0-beta.5
-      '@cropper/element-selection': 2.0.0-beta.5
-      '@cropper/utils': 2.0.0-beta.5
+      '@cropper/element': 2.0.0-rc.1
+      '@cropper/element-canvas': 2.0.0-rc.1
+      '@cropper/element-selection': 2.0.0-rc.1
+      '@cropper/utils': 2.0.0-rc.1
 
-  '@cropper/element-viewer@2.0.0-beta.5':
+  '@cropper/element-viewer@2.0.0-rc.1':
     dependencies:
-      '@cropper/element': 2.0.0-beta.5
-      '@cropper/element-canvas': 2.0.0-beta.5
-      '@cropper/element-image': 2.0.0-beta.5
-      '@cropper/element-selection': 2.0.0-beta.5
-      '@cropper/utils': 2.0.0-beta.5
+      '@cropper/element': 2.0.0-rc.1
+      '@cropper/element-canvas': 2.0.0-rc.1
+      '@cropper/element-image': 2.0.0-rc.1
+      '@cropper/element-selection': 2.0.0-rc.1
+      '@cropper/utils': 2.0.0-rc.1
 
-  '@cropper/element@2.0.0-beta.5':
+  '@cropper/element@2.0.0-rc.1':
     dependencies:
-      '@cropper/utils': 2.0.0-beta.5
+      '@cropper/utils': 2.0.0-rc.1
 
-  '@cropper/elements@2.0.0-beta.5':
+  '@cropper/elements@2.0.0-rc.1':
     dependencies:
-      '@cropper/element': 2.0.0-beta.5
-      '@cropper/element-canvas': 2.0.0-beta.5
-      '@cropper/element-crosshair': 2.0.0-beta.5
-      '@cropper/element-grid': 2.0.0-beta.5
-      '@cropper/element-handle': 2.0.0-beta.5
-      '@cropper/element-image': 2.0.0-beta.5
-      '@cropper/element-selection': 2.0.0-beta.5
-      '@cropper/element-shade': 2.0.0-beta.5
-      '@cropper/element-viewer': 2.0.0-beta.5
+      '@cropper/element': 2.0.0-rc.1
+      '@cropper/element-canvas': 2.0.0-rc.1
+      '@cropper/element-crosshair': 2.0.0-rc.1
+      '@cropper/element-grid': 2.0.0-rc.1
+      '@cropper/element-handle': 2.0.0-rc.1
+      '@cropper/element-image': 2.0.0-rc.1
+      '@cropper/element-selection': 2.0.0-rc.1
+      '@cropper/element-shade': 2.0.0-rc.1
+      '@cropper/element-viewer': 2.0.0-rc.1
 
-  '@cropper/utils@2.0.0-beta.5': {}
+  '@cropper/utils@2.0.0-rc.1': {}
 
   '@cypress/request@3.0.0':
     dependencies:
@@ -13820,7 +13647,7 @@ snapshots:
 
   '@emnapi/runtime@1.1.1':
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.6.3
     optional: true
 
   '@emotion/use-insertion-effect-with-fallbacks@1.0.1(react@18.3.1)':
@@ -13833,7 +13660,7 @@ snapshots:
   '@esbuild/aix-ppc64@0.21.5':
     optional: true
 
-  '@esbuild/aix-ppc64@0.22.0':
+  '@esbuild/aix-ppc64@0.23.0':
     optional: true
 
   '@esbuild/android-arm64@0.18.20':
@@ -13845,7 +13672,7 @@ snapshots:
   '@esbuild/android-arm64@0.21.5':
     optional: true
 
-  '@esbuild/android-arm64@0.22.0':
+  '@esbuild/android-arm64@0.23.0':
     optional: true
 
   '@esbuild/android-arm@0.18.20':
@@ -13857,7 +13684,7 @@ snapshots:
   '@esbuild/android-arm@0.21.5':
     optional: true
 
-  '@esbuild/android-arm@0.22.0':
+  '@esbuild/android-arm@0.23.0':
     optional: true
 
   '@esbuild/android-x64@0.18.20':
@@ -13869,7 +13696,7 @@ snapshots:
   '@esbuild/android-x64@0.21.5':
     optional: true
 
-  '@esbuild/android-x64@0.22.0':
+  '@esbuild/android-x64@0.23.0':
     optional: true
 
   '@esbuild/darwin-arm64@0.18.20':
@@ -13881,7 +13708,7 @@ snapshots:
   '@esbuild/darwin-arm64@0.21.5':
     optional: true
 
-  '@esbuild/darwin-arm64@0.22.0':
+  '@esbuild/darwin-arm64@0.23.0':
     optional: true
 
   '@esbuild/darwin-x64@0.18.20':
@@ -13893,7 +13720,7 @@ snapshots:
   '@esbuild/darwin-x64@0.21.5':
     optional: true
 
-  '@esbuild/darwin-x64@0.22.0':
+  '@esbuild/darwin-x64@0.23.0':
     optional: true
 
   '@esbuild/freebsd-arm64@0.18.20':
@@ -13905,7 +13732,7 @@ snapshots:
   '@esbuild/freebsd-arm64@0.21.5':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.22.0':
+  '@esbuild/freebsd-arm64@0.23.0':
     optional: true
 
   '@esbuild/freebsd-x64@0.18.20':
@@ -13917,7 +13744,7 @@ snapshots:
   '@esbuild/freebsd-x64@0.21.5':
     optional: true
 
-  '@esbuild/freebsd-x64@0.22.0':
+  '@esbuild/freebsd-x64@0.23.0':
     optional: true
 
   '@esbuild/linux-arm64@0.18.20':
@@ -13929,7 +13756,7 @@ snapshots:
   '@esbuild/linux-arm64@0.21.5':
     optional: true
 
-  '@esbuild/linux-arm64@0.22.0':
+  '@esbuild/linux-arm64@0.23.0':
     optional: true
 
   '@esbuild/linux-arm@0.18.20':
@@ -13941,7 +13768,7 @@ snapshots:
   '@esbuild/linux-arm@0.21.5':
     optional: true
 
-  '@esbuild/linux-arm@0.22.0':
+  '@esbuild/linux-arm@0.23.0':
     optional: true
 
   '@esbuild/linux-ia32@0.18.20':
@@ -13953,7 +13780,7 @@ snapshots:
   '@esbuild/linux-ia32@0.21.5':
     optional: true
 
-  '@esbuild/linux-ia32@0.22.0':
+  '@esbuild/linux-ia32@0.23.0':
     optional: true
 
   '@esbuild/linux-loong64@0.18.20':
@@ -13965,7 +13792,7 @@ snapshots:
   '@esbuild/linux-loong64@0.21.5':
     optional: true
 
-  '@esbuild/linux-loong64@0.22.0':
+  '@esbuild/linux-loong64@0.23.0':
     optional: true
 
   '@esbuild/linux-mips64el@0.18.20':
@@ -13977,7 +13804,7 @@ snapshots:
   '@esbuild/linux-mips64el@0.21.5':
     optional: true
 
-  '@esbuild/linux-mips64el@0.22.0':
+  '@esbuild/linux-mips64el@0.23.0':
     optional: true
 
   '@esbuild/linux-ppc64@0.18.20':
@@ -13989,7 +13816,7 @@ snapshots:
   '@esbuild/linux-ppc64@0.21.5':
     optional: true
 
-  '@esbuild/linux-ppc64@0.22.0':
+  '@esbuild/linux-ppc64@0.23.0':
     optional: true
 
   '@esbuild/linux-riscv64@0.18.20':
@@ -14001,7 +13828,7 @@ snapshots:
   '@esbuild/linux-riscv64@0.21.5':
     optional: true
 
-  '@esbuild/linux-riscv64@0.22.0':
+  '@esbuild/linux-riscv64@0.23.0':
     optional: true
 
   '@esbuild/linux-s390x@0.18.20':
@@ -14013,7 +13840,7 @@ snapshots:
   '@esbuild/linux-s390x@0.21.5':
     optional: true
 
-  '@esbuild/linux-s390x@0.22.0':
+  '@esbuild/linux-s390x@0.23.0':
     optional: true
 
   '@esbuild/linux-x64@0.18.20':
@@ -14025,7 +13852,7 @@ snapshots:
   '@esbuild/linux-x64@0.21.5':
     optional: true
 
-  '@esbuild/linux-x64@0.22.0':
+  '@esbuild/linux-x64@0.23.0':
     optional: true
 
   '@esbuild/netbsd-x64@0.18.20':
@@ -14037,10 +13864,10 @@ snapshots:
   '@esbuild/netbsd-x64@0.21.5':
     optional: true
 
-  '@esbuild/netbsd-x64@0.22.0':
+  '@esbuild/netbsd-x64@0.23.0':
     optional: true
 
-  '@esbuild/openbsd-arm64@0.22.0':
+  '@esbuild/openbsd-arm64@0.23.0':
     optional: true
 
   '@esbuild/openbsd-x64@0.18.20':
@@ -14052,7 +13879,7 @@ snapshots:
   '@esbuild/openbsd-x64@0.21.5':
     optional: true
 
-  '@esbuild/openbsd-x64@0.22.0':
+  '@esbuild/openbsd-x64@0.23.0':
     optional: true
 
   '@esbuild/sunos-x64@0.18.20':
@@ -14064,7 +13891,7 @@ snapshots:
   '@esbuild/sunos-x64@0.21.5':
     optional: true
 
-  '@esbuild/sunos-x64@0.22.0':
+  '@esbuild/sunos-x64@0.23.0':
     optional: true
 
   '@esbuild/win32-arm64@0.18.20':
@@ -14076,7 +13903,7 @@ snapshots:
   '@esbuild/win32-arm64@0.21.5':
     optional: true
 
-  '@esbuild/win32-arm64@0.22.0':
+  '@esbuild/win32-arm64@0.23.0':
     optional: true
 
   '@esbuild/win32-ia32@0.18.20':
@@ -14088,7 +13915,7 @@ snapshots:
   '@esbuild/win32-ia32@0.21.5':
     optional: true
 
-  '@esbuild/win32-ia32@0.22.0':
+  '@esbuild/win32-ia32@0.23.0':
     optional: true
 
   '@esbuild/win32-x64@0.18.20':
@@ -14100,28 +13927,21 @@ snapshots:
   '@esbuild/win32-x64@0.21.5':
     optional: true
 
-  '@esbuild/win32-x64@0.22.0':
+  '@esbuild/win32-x64@0.23.0':
     optional: true
 
-  '@eslint-community/eslint-utils@4.4.0(eslint@9.6.0)':
+  '@eslint-community/eslint-utils@4.4.0(eslint@9.8.0)':
     dependencies:
-      eslint: 9.6.0
+      eslint: 9.8.0
       eslint-visitor-keys: 3.4.3
 
-  '@eslint-community/eslint-utils@4.4.0(eslint@9.7.0)':
-    dependencies:
-      eslint: 9.7.0
-      eslint-visitor-keys: 3.4.3
-
-  '@eslint-community/regexpp@4.10.0': {}
-
   '@eslint-community/regexpp@4.11.0': {}
 
   '@eslint-community/regexpp@4.6.2': {}
 
   '@eslint/compat@1.1.1': {}
 
-  '@eslint/config-array@0.17.0':
+  '@eslint/config-array@0.17.1':
     dependencies:
       '@eslint/object-schema': 2.1.4
       debug: 4.3.5(supports-color@8.1.1)
@@ -14143,9 +13963,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint/js@9.6.0': {}
-
-  '@eslint/js@9.7.0': {}
+  '@eslint/js@9.8.0': {}
 
   '@eslint/object-schema@2.1.4': {}
 
@@ -14160,8 +13978,8 @@ snapshots:
 
   '@fastify/ajv-compiler@3.5.0':
     dependencies:
-      ajv: 8.16.0
-      ajv-formats: 2.1.1(ajv@8.16.0)
+      ajv: 8.17.1
+      ajv-formats: 2.1.1(ajv@8.17.1)
       fast-uri: 2.2.0
 
   '@fastify/busboy@2.1.0': {}
@@ -14191,12 +14009,12 @@ snapshots:
     dependencies:
       fast-json-stringify: 5.8.0
 
-  '@fastify/http-proxy@9.5.0(bufferutil@4.0.8)(utf-8-validate@6.0.4)':
+  '@fastify/http-proxy@9.5.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)':
     dependencies:
       '@fastify/reply-from': 9.0.1
       fast-querystring: 1.1.2
       fastify-plugin: 4.5.0
-      ws: 8.17.1(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+      ws: 8.18.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
@@ -14371,7 +14189,7 @@ snapshots:
       '@inquirer/figures': 1.0.1
       '@inquirer/type': 1.3.1
       '@types/mute-stream': 0.0.4
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       '@types/wrap-ansi': 3.0.0
       ansi-escapes: 4.3.2
       chalk: 4.1.2
@@ -14422,7 +14240,7 @@ snapshots:
   '@jest/console@29.7.0':
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       chalk: 4.1.2
       jest-message-util: 29.7.0
       jest-util: 29.7.0
@@ -14435,14 +14253,14 @@ snapshots:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       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.14.9)
+      jest-config: 29.7.0(@types/node@20.14.12)
       jest-haste-map: 29.7.0
       jest-message-util: 29.7.0
       jest-regex-util: 29.6.3
@@ -14471,7 +14289,7 @@ snapshots:
     dependencies:
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       jest-mock: 29.7.0
 
   '@jest/expect-utils@29.7.0':
@@ -14489,7 +14307,7 @@ snapshots:
     dependencies:
       '@jest/types': 29.6.3
       '@sinonjs/fake-timers': 10.3.0
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       jest-message-util: 29.7.0
       jest-mock: 29.7.0
       jest-util: 29.7.0
@@ -14511,7 +14329,7 @@ snapshots:
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
       '@jridgewell/trace-mapping': 0.3.18
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       chalk: 4.1.2
       collect-v8-coverage: 1.0.1
       exit: 0.1.2
@@ -14558,7 +14376,7 @@ snapshots:
 
   '@jest/transform@29.7.0':
     dependencies:
-      '@babel/core': 7.23.5
+      '@babel/core': 7.24.7
       '@jest/types': 29.6.3
       '@jridgewell/trace-mapping': 0.3.18
       babel-plugin-istanbul: 6.1.1
@@ -14581,19 +14399,19 @@ snapshots:
       '@jest/schemas': 29.6.3
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       '@types/yargs': 17.0.19
       chalk: 4.1.2
 
-  '@joshwooding/vite-plugin-react-docgen-typescript@0.3.1(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))':
+  '@joshwooding/vite-plugin-react-docgen-typescript@0.3.1(typescript@5.5.4)(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))':
     dependencies:
       glob: 7.2.3
       glob-promise: 4.2.2(glob@7.2.3)
       magic-string: 0.27.0
-      react-docgen-typescript: 2.2.2(typescript@5.5.3)
-      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2)
+      react-docgen-typescript: 2.2.2(typescript@5.5.4)
+      vite: 5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3)
     optionalDependencies:
-      typescript: 5.5.3
+      typescript: 5.5.4
 
   '@jridgewell/gen-mapping@0.3.2':
     dependencies:
@@ -14613,16 +14431,10 @@ snapshots:
 
   '@jridgewell/set-array@1.2.1': {}
 
-  '@jridgewell/source-map@0.3.5':
-    dependencies:
-      '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
-
   '@jridgewell/source-map@0.3.6':
     dependencies:
       '@jridgewell/gen-mapping': 0.3.5
       '@jridgewell/trace-mapping': 0.3.25
-    optional: true
 
   '@jridgewell/sourcemap-codec@1.4.14': {}
 
@@ -14650,14 +14462,14 @@ snapshots:
 
   '@mapbox/node-pre-gyp@1.0.9(encoding@0.1.13)':
     dependencies:
-      detect-libc: 2.0.2
+      detect-libc: 2.0.3
       https-proxy-agent: 5.0.1
       make-dir: 3.1.0
       node-fetch: 2.7.0(encoding@0.1.13)
       nopt: 5.0.0
       npmlog: 5.0.1
       rimraf: 3.0.2
-      semver: 7.5.4
+      semver: 7.6.0
       tar: 6.2.1
     transitivePeerDependencies:
       - encoding
@@ -14676,23 +14488,23 @@ snapshots:
       '@types/react': 18.0.28
       react: 18.3.1
 
-  '@microsoft/api-extractor-model@7.29.2(@types/node@20.14.9)':
+  '@microsoft/api-extractor-model@7.29.4(@types/node@20.14.12)':
     dependencies:
       '@microsoft/tsdoc': 0.15.0
       '@microsoft/tsdoc-config': 0.17.0
-      '@rushstack/node-core-library': 5.4.1(@types/node@20.14.9)
+      '@rushstack/node-core-library': 5.5.1(@types/node@20.14.12)
     transitivePeerDependencies:
       - '@types/node'
 
-  '@microsoft/api-extractor@7.47.0(@types/node@20.14.9)':
+  '@microsoft/api-extractor@7.47.4(@types/node@20.14.12)':
     dependencies:
-      '@microsoft/api-extractor-model': 7.29.2(@types/node@20.14.9)
+      '@microsoft/api-extractor-model': 7.29.4(@types/node@20.14.12)
       '@microsoft/tsdoc': 0.15.0
       '@microsoft/tsdoc-config': 0.17.0
-      '@rushstack/node-core-library': 5.4.1(@types/node@20.14.9)
-      '@rushstack/rig-package': 0.5.2
-      '@rushstack/terminal': 0.13.0(@types/node@20.14.9)
-      '@rushstack/ts-command-line': 4.22.0(@types/node@20.14.9)
+      '@rushstack/node-core-library': 5.5.1(@types/node@20.14.12)
+      '@rushstack/rig-package': 0.5.3
+      '@rushstack/terminal': 0.13.3(@types/node@20.14.12)
+      '@rushstack/ts-command-line': 4.22.3(@types/node@20.14.12)
       lodash: 4.17.21
       minimatch: 3.0.8
       resolve: 1.22.8
@@ -14713,14 +14525,14 @@ snapshots:
 
   '@misskey-dev/browser-image-resizer@2024.1.0': {}
 
-  '@misskey-dev/eslint-plugin@2.0.2(@eslint/compat@1.1.1)(@typescript-eslint/eslint-plugin@7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3))(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0))(eslint@9.6.0)(globals@15.7.0)':
+  '@misskey-dev/eslint-plugin@2.0.2(@eslint/compat@1.1.1)(@typescript-eslint/eslint-plugin@7.17.0(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0)(typescript@5.5.4))(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0))(eslint@9.8.0)(globals@15.8.0)':
     dependencies:
       '@eslint/compat': 1.1.1
-      '@typescript-eslint/eslint-plugin': 7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3)
-      '@typescript-eslint/parser': 7.15.0(eslint@9.6.0)(typescript@5.5.3)
-      eslint: 9.6.0
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)
-      globals: 15.7.0
+      '@typescript-eslint/eslint-plugin': 7.17.0(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0)(typescript@5.5.4)
+      '@typescript-eslint/parser': 7.17.0(eslint@9.8.0)(typescript@5.5.4)
+      eslint: 9.8.0
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0)
+      globals: 15.8.0
 
   '@misskey-dev/sharp-read-bmp@1.2.0':
     dependencies:
@@ -14768,8 +14580,6 @@ snapshots:
   '@msgpackr-extract/msgpackr-extract-win32-x64@3.0.2':
     optional: true
 
-  '@mswjs/cookies@1.1.0': {}
-
   '@mswjs/interceptors@0.29.1':
     dependencies:
       '@open-draft/deferred-promise': 2.2.0
@@ -14818,12 +14628,6 @@ snapshots:
       '@napi-rs/canvas-linux-x64-musl': 0.1.53
       '@napi-rs/canvas-win32-x64-msvc': 0.1.53
 
-  '@ndelangen/get-tarball@3.0.7':
-    dependencies:
-      gunzip-maybe: 1.4.2
-      pump: 3.0.0
-      tar-fs: 2.1.1
-
   '@nestjs/common@10.3.10(reflect-metadata@0.2.2)(rxjs@7.8.1)':
     dependencies:
       iterare: 1.2.1
@@ -14885,8 +14689,8 @@ snapshots:
   '@npmcli/agent@2.2.0':
     dependencies:
       agent-base: 7.1.0
-      http-proxy-agent: 7.0.0
-      https-proxy-agent: 7.0.2
+      http-proxy-agent: 7.0.2
+      https-proxy-agent: 7.0.4
       lru-cache: 10.2.2
       socks-proxy-agent: 8.0.2
     transitivePeerDependencies:
@@ -14949,7 +14753,7 @@ snapshots:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/semantic-conventions': 1.25.1
 
-  '@opentelemetry/instrumentation-connect@0.37.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-connect@0.38.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
@@ -14959,7 +14763,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-express@0.40.1(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-express@0.41.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
@@ -14968,7 +14772,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-fastify@0.37.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-fastify@0.38.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
@@ -14977,14 +14781,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-graphql@0.41.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-graphql@0.42.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-hapi@0.39.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-hapi@0.40.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
@@ -15003,7 +14807,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-ioredis@0.41.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-ioredis@0.42.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
@@ -15012,18 +14816,16 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-koa@0.41.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-koa@0.42.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.25.1
-      '@types/koa': 2.14.0
-      '@types/koa__router': 12.0.3
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-mongodb@0.45.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-mongodb@0.46.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
@@ -15032,7 +14834,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-mongoose@0.39.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-mongoose@0.40.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
@@ -15041,7 +14843,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-mysql2@0.39.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-mysql2@0.40.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
@@ -15050,7 +14852,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-mysql@0.39.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-mysql@0.40.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
@@ -15059,7 +14861,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-nestjs-core@0.38.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-nestjs-core@0.39.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
@@ -15067,7 +14869,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-pg@0.42.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-pg@0.43.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
@@ -15078,7 +14880,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-redis-4@0.40.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-redis-4@0.41.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
@@ -15087,11 +14889,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation@0.43.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation@0.46.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@types/shimmer': 1.0.5
-      import-in-the-middle: 1.4.2
+      import-in-the-middle: 1.7.1
       require-in-the-middle: 7.3.0
       semver: 7.6.0
       shimmer: 1.2.1
@@ -15104,7 +14906,7 @@ snapshots:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/api-logs': 0.52.1
       '@types/shimmer': 1.0.5
-      import-in-the-middle: 1.8.1
+      import-in-the-middle: 1.10.0
       require-in-the-middle: 7.3.0
       semver: 7.6.0
       shimmer: 1.2.1
@@ -15152,27 +14954,27 @@ snapshots:
     dependencies:
       '@peculiar/asn1-schema': 2.3.8
       asn1js: 3.0.5
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@peculiar/asn1-ecc@2.3.8':
     dependencies:
       '@peculiar/asn1-schema': 2.3.8
       '@peculiar/asn1-x509': 2.3.8
       asn1js: 3.0.5
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@peculiar/asn1-rsa@2.3.8':
     dependencies:
       '@peculiar/asn1-schema': 2.3.8
       '@peculiar/asn1-x509': 2.3.8
       asn1js: 3.0.5
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@peculiar/asn1-schema@2.3.8':
     dependencies:
       asn1js: 3.0.5
       pvtsutils: 1.3.5
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@peculiar/asn1-x509@2.3.8':
     dependencies:
@@ -15180,7 +14982,7 @@ snapshots:
       asn1js: 3.0.5
       ipaddr.js: 2.2.0
       pvtsutils: 1.3.5
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@peertube/http-signature@1.7.0':
     dependencies:
@@ -15191,7 +14993,7 @@ snapshots:
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
-  '@prisma/instrumentation@5.16.0':
+  '@prisma/instrumentation@5.17.0':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
@@ -15199,141 +15001,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@radix-ui/primitive@1.1.0': {}
-
-  '@radix-ui/react-compose-refs@1.1.0(@types/react@18.0.28)(react@18.3.1)':
-    dependencies:
-      react: 18.3.1
-    optionalDependencies:
-      '@types/react': 18.0.28
-
-  '@radix-ui/react-context@1.1.0(@types/react@18.0.28)(react@18.3.1)':
-    dependencies:
-      react: 18.3.1
-    optionalDependencies:
-      '@types/react': 18.0.28
-
-  '@radix-ui/react-dialog@1.1.1(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      '@radix-ui/react-context': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      '@radix-ui/react-dismissable-layer': 1.1.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-focus-guards': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      '@radix-ui/react-focus-scope': 1.1.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-id': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      '@radix-ui/react-portal': 1.1.1(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-presence': 1.1.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-primitive': 2.0.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      aria-hidden: 1.2.4
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-      react-remove-scroll: 2.5.7(@types/react@18.0.28)(react@18.3.1)
-    optionalDependencies:
-      '@types/react': 18.0.28
-
-  '@radix-ui/react-dismissable-layer@1.1.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      '@radix-ui/react-primitive': 2.0.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      '@radix-ui/react-use-escape-keydown': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-    optionalDependencies:
-      '@types/react': 18.0.28
-
-  '@radix-ui/react-focus-guards@1.1.0(@types/react@18.0.28)(react@18.3.1)':
-    dependencies:
-      react: 18.3.1
-    optionalDependencies:
-      '@types/react': 18.0.28
-
-  '@radix-ui/react-focus-scope@1.1.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
-    dependencies:
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      '@radix-ui/react-primitive': 2.0.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-    optionalDependencies:
-      '@types/react': 18.0.28
-
-  '@radix-ui/react-id@1.1.0(@types/react@18.0.28)(react@18.3.1)':
-    dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      react: 18.3.1
-    optionalDependencies:
-      '@types/react': 18.0.28
-
-  '@radix-ui/react-portal@1.1.1(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
-    dependencies:
-      '@radix-ui/react-primitive': 2.0.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-    optionalDependencies:
-      '@types/react': 18.0.28
-
-  '@radix-ui/react-presence@1.1.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
-    dependencies:
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-    optionalDependencies:
-      '@types/react': 18.0.28
-
-  '@radix-ui/react-primitive@2.0.0(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
-    dependencies:
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-    optionalDependencies:
-      '@types/react': 18.0.28
-
-  '@radix-ui/react-slot@1.1.0(@types/react@18.0.28)(react@18.3.1)':
-    dependencies:
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      react: 18.3.1
-    optionalDependencies:
-      '@types/react': 18.0.28
-
-  '@radix-ui/react-use-callback-ref@1.1.0(@types/react@18.0.28)(react@18.3.1)':
-    dependencies:
-      react: 18.3.1
-    optionalDependencies:
-      '@types/react': 18.0.28
-
-  '@radix-ui/react-use-controllable-state@1.1.0(@types/react@18.0.28)(react@18.3.1)':
-    dependencies:
-      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      react: 18.3.1
-    optionalDependencies:
-      '@types/react': 18.0.28
-
-  '@radix-ui/react-use-escape-keydown@1.1.0(@types/react@18.0.28)(react@18.3.1)':
-    dependencies:
-      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      react: 18.3.1
-    optionalDependencies:
-      '@types/react': 18.0.28
-
-  '@radix-ui/react-use-layout-effect@1.1.0(@types/react@18.0.28)(react@18.3.1)':
-    dependencies:
-      react: 18.3.1
-    optionalDependencies:
-      '@types/react': 18.0.28
-
-  '@readme/better-ajv-errors@1.6.0(ajv@8.16.0)':
+  '@readme/better-ajv-errors@1.6.0(ajv@8.17.1)':
     dependencies:
       '@babel/code-frame': 7.23.5
       '@babel/runtime': 7.23.4
       '@humanwhocodes/momoa': 2.0.4
-      ajv: 8.16.0
+      ajv: 8.17.1
       chalk: 4.1.2
       json-to-ast: 2.1.0
       jsonpointer: 5.0.1
@@ -15351,83 +15024,83 @@ snapshots:
       '@apidevtools/openapi-schemas': 2.1.0
       '@apidevtools/swagger-methods': 3.0.2
       '@jsdevtools/ono': 7.1.3
-      '@readme/better-ajv-errors': 1.6.0(ajv@8.16.0)
+      '@readme/better-ajv-errors': 1.6.0(ajv@8.17.1)
       '@readme/json-schema-ref-parser': 1.2.0
-      ajv: 8.16.0
-      ajv-draft-04: 1.0.0(ajv@8.16.0)
+      ajv: 8.17.1
+      ajv-draft-04: 1.0.0(ajv@8.17.1)
       call-me-maybe: 1.0.2
       openapi-types: 12.1.3
 
-  '@rollup/plugin-json@6.1.0(rollup@4.18.0)':
+  '@rollup/plugin-json@6.1.0(rollup@4.19.1)':
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.18.0)
+      '@rollup/pluginutils': 5.1.0(rollup@4.19.1)
     optionalDependencies:
-      rollup: 4.18.0
+      rollup: 4.19.1
 
-  '@rollup/plugin-replace@5.0.7(rollup@4.18.0)':
+  '@rollup/plugin-replace@5.0.7(rollup@4.19.1)':
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.18.0)
+      '@rollup/pluginutils': 5.1.0(rollup@4.19.1)
       magic-string: 0.30.10
     optionalDependencies:
-      rollup: 4.18.0
+      rollup: 4.19.1
 
-  '@rollup/pluginutils@5.1.0(rollup@4.18.0)':
+  '@rollup/pluginutils@5.1.0(rollup@4.19.1)':
     dependencies:
       '@types/estree': 1.0.5
       estree-walker: 2.0.2
       picomatch: 2.3.1
     optionalDependencies:
-      rollup: 4.18.0
+      rollup: 4.19.1
 
-  '@rollup/rollup-android-arm-eabi@4.18.0':
+  '@rollup/rollup-android-arm-eabi@4.19.1':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.18.0':
+  '@rollup/rollup-android-arm64@4.19.1':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.18.0':
+  '@rollup/rollup-darwin-arm64@4.19.1':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.18.0':
+  '@rollup/rollup-darwin-x64@4.19.1':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.18.0':
+  '@rollup/rollup-linux-arm-gnueabihf@4.19.1':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.18.0':
+  '@rollup/rollup-linux-arm-musleabihf@4.19.1':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.18.0':
+  '@rollup/rollup-linux-arm64-gnu@4.19.1':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.18.0':
+  '@rollup/rollup-linux-arm64-musl@4.19.1':
     optional: true
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.18.0':
+  '@rollup/rollup-linux-powerpc64le-gnu@4.19.1':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.18.0':
+  '@rollup/rollup-linux-riscv64-gnu@4.19.1':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.18.0':
+  '@rollup/rollup-linux-s390x-gnu@4.19.1':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.18.0':
+  '@rollup/rollup-linux-x64-gnu@4.19.1':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.18.0':
+  '@rollup/rollup-linux-x64-musl@4.19.1':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.18.0':
+  '@rollup/rollup-win32-arm64-msvc@4.19.1':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.18.0':
+  '@rollup/rollup-win32-ia32-msvc@4.19.1':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.18.0':
+  '@rollup/rollup-win32-x64-msvc@4.19.1':
     optional: true
 
-  '@rushstack/node-core-library@5.4.1(@types/node@20.14.9)':
+  '@rushstack/node-core-library@5.5.1(@types/node@20.14.12)':
     dependencies:
       ajv: 8.13.0
       ajv-draft-04: 1.0.0(ajv@8.13.0)
@@ -15438,23 +15111,23 @@ snapshots:
       resolve: 1.22.8
       semver: 7.5.4
     optionalDependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
-  '@rushstack/rig-package@0.5.2':
+  '@rushstack/rig-package@0.5.3':
     dependencies:
       resolve: 1.22.8
       strip-json-comments: 3.1.1
 
-  '@rushstack/terminal@0.13.0(@types/node@20.14.9)':
+  '@rushstack/terminal@0.13.3(@types/node@20.14.12)':
     dependencies:
-      '@rushstack/node-core-library': 5.4.1(@types/node@20.14.9)
+      '@rushstack/node-core-library': 5.5.1(@types/node@20.14.12)
       supports-color: 8.1.1
     optionalDependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
-  '@rushstack/ts-command-line@4.22.0(@types/node@20.14.9)':
+  '@rushstack/ts-command-line@4.22.3(@types/node@20.14.12)':
     dependencies:
-      '@rushstack/terminal': 0.13.0(@types/node@20.14.9)
+      '@rushstack/terminal': 0.13.3(@types/node@20.14.12)
       '@types/argparse': 1.0.38
       argparse: 1.0.10
       string-argv: 0.3.1
@@ -15463,74 +15136,77 @@ snapshots:
 
   '@sec-ant/readable-stream@0.4.1': {}
 
-  '@sentry/core@8.13.0':
+  '@sentry/core@8.20.0':
     dependencies:
-      '@sentry/types': 8.13.0
-      '@sentry/utils': 8.13.0
+      '@sentry/types': 8.20.0
+      '@sentry/utils': 8.20.0
 
-  '@sentry/node@8.13.0':
+  '@sentry/node@8.20.0':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/context-async-hooks': 1.25.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-connect': 0.37.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-express': 0.40.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-fastify': 0.37.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-graphql': 0.41.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-hapi': 0.39.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-connect': 0.38.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-express': 0.41.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-fastify': 0.38.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-graphql': 0.42.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-hapi': 0.40.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/instrumentation-http': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-ioredis': 0.41.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-koa': 0.41.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-mongodb': 0.45.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-mongoose': 0.39.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-mysql': 0.39.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-mysql2': 0.39.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-nestjs-core': 0.38.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-pg': 0.42.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-redis-4': 0.40.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-ioredis': 0.42.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-koa': 0.42.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mongodb': 0.46.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mongoose': 0.40.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mysql': 0.40.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mysql2': 0.40.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-nestjs-core': 0.39.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-pg': 0.43.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-redis-4': 0.41.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.25.1
-      '@prisma/instrumentation': 5.16.0
-      '@sentry/core': 8.13.0
-      '@sentry/opentelemetry': 8.13.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.25.1)
-      '@sentry/types': 8.13.0
-      '@sentry/utils': 8.13.0
+      '@prisma/instrumentation': 5.17.0
+      '@sentry/core': 8.20.0
+      '@sentry/opentelemetry': 8.20.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.25.1)
+      '@sentry/types': 8.20.0
+      '@sentry/utils': 8.20.0
+      import-in-the-middle: 1.10.0
     optionalDependencies:
-      opentelemetry-instrumentation-fetch-node: 1.2.0
+      opentelemetry-instrumentation-fetch-node: 1.2.3(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@sentry/opentelemetry@8.13.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.25.1)':
+  '@sentry/opentelemetry@8.20.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.25.1)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.25.1
-      '@sentry/core': 8.13.0
-      '@sentry/types': 8.13.0
-      '@sentry/utils': 8.13.0
+      '@sentry/core': 8.20.0
+      '@sentry/types': 8.20.0
+      '@sentry/utils': 8.20.0
 
-  '@sentry/profiling-node@8.13.0':
+  '@sentry/profiling-node@8.20.0':
     dependencies:
-      '@sentry/core': 8.13.0
-      '@sentry/node': 8.13.0
-      '@sentry/types': 8.13.0
-      '@sentry/utils': 8.13.0
+      '@sentry/core': 8.20.0
+      '@sentry/node': 8.20.0
+      '@sentry/types': 8.20.0
+      '@sentry/utils': 8.20.0
       detect-libc: 2.0.3
       node-abi: 3.62.0
     transitivePeerDependencies:
       - supports-color
 
-  '@sentry/types@8.13.0': {}
+  '@sentry/types@8.20.0': {}
 
-  '@sentry/utils@8.13.0':
+  '@sentry/utils@8.20.0':
     dependencies:
-      '@sentry/types': 8.13.0
+      '@sentry/types': 8.20.0
 
-  '@shikijs/core@1.10.0': {}
+  '@shikijs/core@1.12.0':
+    dependencies:
+      '@types/hast': 3.0.4
 
   '@sideway/address@4.1.4':
     dependencies:
@@ -15540,7 +15216,7 @@ snapshots:
 
   '@sideway/pinpoint@2.0.0': {}
 
-  '@simplewebauthn/server@10.0.0(encoding@0.1.13)':
+  '@simplewebauthn/server@10.0.1(encoding@0.1.13)':
     dependencies:
       '@hexagon/base64': 1.1.27
       '@levischuck/tiny-cbor': 0.2.2
@@ -15562,7 +15238,7 @@ snapshots:
 
   '@sindresorhus/is@5.3.0': {}
 
-  '@sindresorhus/is@6.3.1': {}
+  '@sindresorhus/is@7.0.0': {}
 
   '@sindresorhus/merge-streams@2.3.0': {}
 
@@ -15600,165 +15276,165 @@ snapshots:
   '@smithy/abort-controller@3.1.1':
     dependencies:
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/chunked-blob-reader-native@3.0.0':
     dependencies:
       '@smithy/util-base64': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/chunked-blob-reader@3.0.0':
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@smithy/config-resolver@3.0.4':
+  '@smithy/config-resolver@3.0.5':
     dependencies:
-      '@smithy/node-config-provider': 3.1.3
+      '@smithy/node-config-provider': 3.1.4
       '@smithy/types': 3.3.0
       '@smithy/util-config-provider': 3.0.0
       '@smithy/util-middleware': 3.0.3
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@smithy/core@2.2.4':
+  '@smithy/core@2.3.1':
     dependencies:
-      '@smithy/middleware-endpoint': 3.0.4
-      '@smithy/middleware-retry': 3.0.7
+      '@smithy/middleware-endpoint': 3.1.0
+      '@smithy/middleware-retry': 3.0.13
       '@smithy/middleware-serde': 3.0.3
-      '@smithy/protocol-http': 4.0.3
-      '@smithy/smithy-client': 3.1.5
+      '@smithy/protocol-http': 4.1.0
+      '@smithy/smithy-client': 3.1.11
       '@smithy/types': 3.3.0
       '@smithy/util-middleware': 3.0.3
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@smithy/credential-provider-imds@3.1.3':
+  '@smithy/credential-provider-imds@3.2.0':
     dependencies:
-      '@smithy/node-config-provider': 3.1.3
+      '@smithy/node-config-provider': 3.1.4
       '@smithy/property-provider': 3.1.3
       '@smithy/types': 3.3.0
       '@smithy/url-parser': 3.0.3
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/eventstream-codec@3.1.2':
     dependencies:
       '@aws-crypto/crc32': 5.2.0
       '@smithy/types': 3.3.0
       '@smithy/util-hex-encoding': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@smithy/eventstream-serde-browser@3.0.4':
+  '@smithy/eventstream-serde-browser@3.0.5':
     dependencies:
       '@smithy/eventstream-serde-universal': 3.0.4
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/eventstream-serde-config-resolver@3.0.3':
     dependencies:
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/eventstream-serde-node@3.0.4':
     dependencies:
       '@smithy/eventstream-serde-universal': 3.0.4
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/eventstream-serde-universal@3.0.4':
     dependencies:
       '@smithy/eventstream-codec': 3.1.2
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@smithy/fetch-http-handler@3.2.0':
+  '@smithy/fetch-http-handler@3.2.4':
     dependencies:
-      '@smithy/protocol-http': 4.0.3
+      '@smithy/protocol-http': 4.1.0
       '@smithy/querystring-builder': 3.0.3
       '@smithy/types': 3.3.0
       '@smithy/util-base64': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/hash-blob-browser@3.1.2':
     dependencies:
       '@smithy/chunked-blob-reader': 3.0.0
       '@smithy/chunked-blob-reader-native': 3.0.0
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/hash-node@3.0.3':
     dependencies:
       '@smithy/types': 3.3.0
       '@smithy/util-buffer-from': 3.0.0
       '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/hash-stream-node@3.1.2':
     dependencies:
       '@smithy/types': 3.3.0
       '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/invalid-dependency@3.0.3':
     dependencies:
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/is-array-buffer@2.0.0':
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/is-array-buffer@3.0.0':
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/md5-js@3.0.3':
     dependencies:
       '@smithy/types': 3.3.0
       '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@smithy/middleware-content-length@3.0.3':
+  '@smithy/middleware-content-length@3.0.5':
     dependencies:
-      '@smithy/protocol-http': 4.0.3
+      '@smithy/protocol-http': 4.1.0
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@smithy/middleware-endpoint@3.0.4':
+  '@smithy/middleware-endpoint@3.1.0':
     dependencies:
       '@smithy/middleware-serde': 3.0.3
-      '@smithy/node-config-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.3
+      '@smithy/node-config-provider': 3.1.4
+      '@smithy/shared-ini-file-loader': 3.1.4
       '@smithy/types': 3.3.0
       '@smithy/url-parser': 3.0.3
       '@smithy/util-middleware': 3.0.3
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@smithy/middleware-retry@3.0.7':
+  '@smithy/middleware-retry@3.0.13':
     dependencies:
-      '@smithy/node-config-provider': 3.1.3
-      '@smithy/protocol-http': 4.0.3
+      '@smithy/node-config-provider': 3.1.4
+      '@smithy/protocol-http': 4.1.0
       '@smithy/service-error-classification': 3.0.3
-      '@smithy/smithy-client': 3.1.5
+      '@smithy/smithy-client': 3.1.11
       '@smithy/types': 3.3.0
       '@smithy/util-middleware': 3.0.3
       '@smithy/util-retry': 3.0.3
-      tslib: 2.6.2
+      tslib: 2.6.3
       uuid: 9.0.1
 
   '@smithy/middleware-serde@3.0.3':
     dependencies:
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/middleware-stack@3.0.3':
     dependencies:
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@smithy/node-config-provider@3.1.3':
+  '@smithy/node-config-provider@3.1.4':
     dependencies:
       '@smithy/property-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.3
+      '@smithy/shared-ini-file-loader': 3.1.4
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/node-http-handler@2.5.0':
     dependencies:
@@ -15768,28 +15444,28 @@ snapshots:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/node-http-handler@3.1.1':
+  '@smithy/node-http-handler@3.1.4':
     dependencies:
       '@smithy/abort-controller': 3.1.1
-      '@smithy/protocol-http': 4.0.3
+      '@smithy/protocol-http': 4.1.0
       '@smithy/querystring-builder': 3.0.3
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/property-provider@3.1.3':
     dependencies:
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/protocol-http@3.3.0':
     dependencies:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
 
-  '@smithy/protocol-http@4.0.3':
+  '@smithy/protocol-http@4.1.0':
     dependencies:
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/querystring-builder@2.2.0':
     dependencies:
@@ -15801,40 +15477,41 @@ snapshots:
     dependencies:
       '@smithy/types': 3.3.0
       '@smithy/util-uri-escape': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/querystring-parser@3.0.3':
     dependencies:
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/service-error-classification@3.0.3':
     dependencies:
       '@smithy/types': 3.3.0
 
-  '@smithy/shared-ini-file-loader@3.1.3':
+  '@smithy/shared-ini-file-loader@3.1.4':
     dependencies:
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@smithy/signature-v4@3.1.2':
+  '@smithy/signature-v4@4.1.0':
     dependencies:
       '@smithy/is-array-buffer': 3.0.0
+      '@smithy/protocol-http': 4.1.0
       '@smithy/types': 3.3.0
       '@smithy/util-hex-encoding': 3.0.0
       '@smithy/util-middleware': 3.0.3
       '@smithy/util-uri-escape': 3.0.0
       '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@smithy/smithy-client@3.1.5':
+  '@smithy/smithy-client@3.1.11':
     dependencies:
-      '@smithy/middleware-endpoint': 3.0.4
+      '@smithy/middleware-endpoint': 3.1.0
       '@smithy/middleware-stack': 3.0.3
-      '@smithy/protocol-http': 4.0.3
+      '@smithy/protocol-http': 4.1.0
       '@smithy/types': 3.3.0
-      '@smithy/util-stream': 3.0.5
-      tslib: 2.6.2
+      '@smithy/util-stream': 3.1.3
+      tslib: 2.6.3
 
   '@smithy/types@2.12.0':
     dependencies:
@@ -15842,91 +15519,91 @@ snapshots:
 
   '@smithy/types@3.3.0':
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/url-parser@3.0.3':
     dependencies:
       '@smithy/querystring-parser': 3.0.3
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/util-base64@3.0.0':
     dependencies:
       '@smithy/util-buffer-from': 3.0.0
       '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/util-body-length-browser@3.0.0':
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/util-body-length-node@3.0.0':
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/util-buffer-from@2.0.0':
     dependencies:
       '@smithy/is-array-buffer': 2.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/util-buffer-from@3.0.0':
     dependencies:
       '@smithy/is-array-buffer': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/util-config-provider@3.0.0':
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@smithy/util-defaults-mode-browser@3.0.7':
+  '@smithy/util-defaults-mode-browser@3.0.13':
     dependencies:
       '@smithy/property-provider': 3.1.3
-      '@smithy/smithy-client': 3.1.5
+      '@smithy/smithy-client': 3.1.11
       '@smithy/types': 3.3.0
       bowser: 2.11.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@smithy/util-defaults-mode-node@3.0.7':
+  '@smithy/util-defaults-mode-node@3.0.13':
     dependencies:
-      '@smithy/config-resolver': 3.0.4
-      '@smithy/credential-provider-imds': 3.1.3
-      '@smithy/node-config-provider': 3.1.3
+      '@smithy/config-resolver': 3.0.5
+      '@smithy/credential-provider-imds': 3.2.0
+      '@smithy/node-config-provider': 3.1.4
       '@smithy/property-provider': 3.1.3
-      '@smithy/smithy-client': 3.1.5
+      '@smithy/smithy-client': 3.1.11
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@smithy/util-endpoints@2.0.4':
+  '@smithy/util-endpoints@2.0.5':
     dependencies:
-      '@smithy/node-config-provider': 3.1.3
+      '@smithy/node-config-provider': 3.1.4
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/util-hex-encoding@3.0.0':
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/util-middleware@3.0.3':
     dependencies:
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/util-retry@3.0.3':
     dependencies:
       '@smithy/service-error-classification': 3.0.3
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
-  '@smithy/util-stream@3.0.5':
+  '@smithy/util-stream@3.1.3':
     dependencies:
-      '@smithy/fetch-http-handler': 3.2.0
-      '@smithy/node-http-handler': 3.1.1
+      '@smithy/fetch-http-handler': 3.2.4
+      '@smithy/node-http-handler': 3.1.4
       '@smithy/types': 3.3.0
       '@smithy/util-base64': 3.0.0
       '@smithy/util-buffer-from': 3.0.0
       '@smithy/util-hex-encoding': 3.0.0
       '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/util-uri-escape@2.2.0':
     dependencies:
@@ -15934,120 +15611,96 @@ snapshots:
 
   '@smithy/util-uri-escape@3.0.0':
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/util-utf8@2.0.0':
     dependencies:
       '@smithy/util-buffer-from': 2.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/util-utf8@3.0.0':
     dependencies:
       '@smithy/util-buffer-from': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@smithy/util-waiter@3.1.2':
     dependencies:
       '@smithy/abort-controller': 3.1.1
       '@smithy/types': 3.3.0
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@sqltools/formatter@1.2.5': {}
 
-  '@storybook/addon-actions@8.1.11':
+  '@storybook/addon-actions@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
     dependencies:
-      '@storybook/core-events': 8.1.11
       '@storybook/global': 5.0.0
       '@types/uuid': 9.0.8
       dequal: 2.0.3
       polished: 4.2.2
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       uuid: 9.0.1
 
-  '@storybook/addon-backgrounds@8.1.11':
+  '@storybook/addon-backgrounds@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
     dependencies:
       '@storybook/global': 5.0.0
       memoizerific: 1.11.3
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       ts-dedent: 2.2.0
 
-  '@storybook/addon-controls@8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@storybook/addon-controls@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
     dependencies:
-      '@storybook/blocks': 8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       dequal: 2.0.3
       lodash: 4.17.21
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       ts-dedent: 2.2.0
-    transitivePeerDependencies:
-      - '@types/react'
-      - '@types/react-dom'
-      - encoding
-      - prettier
-      - react
-      - react-dom
-      - supports-color
 
-  '@storybook/addon-docs@8.1.11(encoding@0.1.13)(prettier@3.3.2)':
+  '@storybook/addon-docs@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
     dependencies:
       '@babel/core': 7.24.7
       '@mdx-js/react': 3.0.1(@types/react@18.0.28)(react@18.3.1)
-      '@storybook/blocks': 8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/client-logger': 8.1.11
-      '@storybook/components': 8.1.11(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/csf-plugin': 8.1.11
-      '@storybook/csf-tools': 8.1.11
+      '@storybook/blocks': 8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/csf-plugin': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@storybook/global': 5.0.0
-      '@storybook/node-logger': 8.1.11
-      '@storybook/preview-api': 8.1.11
-      '@storybook/react-dom-shim': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/theming': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/types': 8.1.11
+      '@storybook/react-dom-shim': 8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@types/react': 18.0.28
       fs-extra: 11.1.1
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
       rehype-external-links: 3.0.0
       rehype-slug: 6.0.0
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
-      - '@types/react-dom'
-      - encoding
-      - prettier
       - supports-color
 
-  '@storybook/addon-essentials@8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@storybook/addon-essentials@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
     dependencies:
-      '@storybook/addon-actions': 8.1.11
-      '@storybook/addon-backgrounds': 8.1.11
-      '@storybook/addon-controls': 8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/addon-docs': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
-      '@storybook/addon-highlight': 8.1.11
-      '@storybook/addon-measure': 8.1.11
-      '@storybook/addon-outline': 8.1.11
-      '@storybook/addon-toolbars': 8.1.11
-      '@storybook/addon-viewport': 8.1.11
-      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
-      '@storybook/manager-api': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/node-logger': 8.1.11
-      '@storybook/preview-api': 8.1.11
+      '@storybook/addon-actions': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/addon-backgrounds': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/addon-controls': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/addon-docs': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/addon-highlight': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/addon-measure': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/addon-outline': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/addon-toolbars': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/addon-viewport': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
-      - '@types/react'
-      - '@types/react-dom'
-      - encoding
-      - prettier
-      - react
-      - react-dom
       - supports-color
 
-  '@storybook/addon-highlight@8.1.11':
+  '@storybook/addon-highlight@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
     dependencies:
       '@storybook/global': 5.0.0
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
 
-  '@storybook/addon-interactions@8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))':
+  '@storybook/addon-interactions@8.2.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12))(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3))':
     dependencies:
       '@storybook/global': 5.0.0
-      '@storybook/instrumenter': 8.1.11
-      '@storybook/test': 8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))
-      '@storybook/types': 8.1.11
+      '@storybook/instrumenter': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/test': 8.2.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12))(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3))
       polished: 4.2.2
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - '@jest/globals'
@@ -16056,84 +15709,76 @@ snapshots:
       - jest
       - vitest
 
-  '@storybook/addon-links@8.1.11(react@18.3.1)':
+  '@storybook/addon-links@8.2.6(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
     dependencies:
-      '@storybook/csf': 0.1.9
+      '@storybook/csf': 0.1.11
       '@storybook/global': 5.0.0
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       ts-dedent: 2.2.0
     optionalDependencies:
       react: 18.3.1
 
-  '@storybook/addon-mdx-gfm@8.1.11':
+  '@storybook/addon-mdx-gfm@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
     dependencies:
-      '@storybook/node-logger': 8.1.11
       remark-gfm: 4.0.0
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - supports-color
 
-  '@storybook/addon-measure@8.1.11':
+  '@storybook/addon-measure@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
     dependencies:
       '@storybook/global': 5.0.0
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       tiny-invariant: 1.3.3
 
-  '@storybook/addon-outline@8.1.11':
+  '@storybook/addon-outline@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
     dependencies:
       '@storybook/global': 5.0.0
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       ts-dedent: 2.2.0
 
-  '@storybook/addon-storysource@8.1.11':
+  '@storybook/addon-storysource@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
     dependencies:
-      '@storybook/source-loader': 8.1.11
+      '@storybook/source-loader': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       estraverse: 5.3.0
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       tiny-invariant: 1.3.3
 
-  '@storybook/addon-toolbars@8.1.11': {}
+  '@storybook/addon-toolbars@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
+    dependencies:
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
 
-  '@storybook/addon-viewport@8.1.11':
+  '@storybook/addon-viewport@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
     dependencies:
       memoizerific: 1.11.3
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
 
-  '@storybook/blocks@8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@storybook/blocks@8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
     dependencies:
-      '@storybook/channels': 8.1.11
-      '@storybook/client-logger': 8.1.11
-      '@storybook/components': 8.1.11(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/core-events': 8.1.11
-      '@storybook/csf': 0.1.9
-      '@storybook/docs-tools': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/csf': 0.1.11
       '@storybook/global': 5.0.0
       '@storybook/icons': 1.2.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/manager-api': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/preview-api': 8.1.11
-      '@storybook/theming': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/types': 8.1.11
       '@types/lodash': 4.14.191
       color-convert: 2.0.1
       dequal: 2.0.3
       lodash: 4.17.21
-      markdown-to-jsx: 7.3.2(react@18.3.1)
+      markdown-to-jsx: 7.4.7(react@18.3.1)
       memoizerific: 1.11.3
       polished: 4.2.2
       react-colorful: 5.6.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       telejson: 7.2.0
-      tocbot: 4.21.1
       ts-dedent: 2.2.0
       util-deprecate: 1.0.2
     optionalDependencies:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
-    transitivePeerDependencies:
-      - '@types/react'
-      - '@types/react-dom'
-      - encoding
-      - prettier
-      - supports-color
 
-  '@storybook/builder-manager@8.1.11(encoding@0.1.13)(prettier@3.3.2)':
+  '@storybook/builder-manager@8.1.11(encoding@0.1.13)(prettier@3.3.3)':
     dependencies:
       '@fal-works/esbuild-plugin-global-externals': 2.1.2
-      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.3)
       '@storybook/manager': 8.1.11
       '@storybook/node-logger': 8.1.11
       '@types/ejs': 3.1.2
@@ -16151,11 +15796,11 @@ snapshots:
       - prettier
       - supports-color
 
-  '@storybook/builder-vite@8.1.11(encoding@0.1.13)(prettier@3.3.2)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))':
+  '@storybook/builder-vite@8.1.11(encoding@0.1.13)(prettier@3.3.3)(typescript@5.5.4)(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))':
     dependencies:
       '@storybook/channels': 8.1.11
       '@storybook/client-logger': 8.1.11
-      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.3)
       '@storybook/core-events': 8.1.11
       '@storybook/csf-plugin': 8.1.11
       '@storybook/node-logger': 8.1.11
@@ -16170,14 +15815,32 @@ snapshots:
       fs-extra: 11.1.1
       magic-string: 0.30.10
       ts-dedent: 2.2.0
-      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2)
+      vite: 5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3)
     optionalDependencies:
-      typescript: 5.5.3
+      typescript: 5.5.4
     transitivePeerDependencies:
       - encoding
       - prettier
       - supports-color
 
+  '@storybook/builder-vite@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))(typescript@5.5.4)(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))':
+    dependencies:
+      '@storybook/csf-plugin': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@types/find-cache-dir': 3.2.1
+      browser-assert: 1.2.1
+      es-module-lexer: 1.5.4
+      express: 4.19.2
+      find-cache-dir: 3.3.2
+      fs-extra: 11.1.1
+      magic-string: 0.30.10
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+      ts-dedent: 2.2.0
+      vite: 5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3)
+    optionalDependencies:
+      typescript: 5.5.4
+    transitivePeerDependencies:
+      - supports-color
+
   '@storybook/channels@8.1.11':
     dependencies:
       '@storybook/client-logger': 8.1.11
@@ -16186,96 +15849,35 @@ snapshots:
       telejson: 7.2.0
       tiny-invariant: 1.3.3
 
-  '@storybook/cli@8.1.11(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)':
-    dependencies:
-      '@babel/core': 7.24.7
-      '@babel/types': 7.24.7
-      '@ndelangen/get-tarball': 3.0.7
-      '@storybook/codemod': 8.1.11
-      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
-      '@storybook/core-events': 8.1.11
-      '@storybook/core-server': 8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)
-      '@storybook/csf-tools': 8.1.11
-      '@storybook/node-logger': 8.1.11
-      '@storybook/telemetry': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
-      '@storybook/types': 8.1.11
-      '@types/semver': 7.5.8
-      '@yarnpkg/fslib': 2.10.3
-      '@yarnpkg/libzip': 2.3.0
-      chalk: 4.1.2
-      commander: 6.2.1
-      cross-spawn: 7.0.3
-      detect-indent: 6.1.0
-      envinfo: 7.8.1
-      execa: 5.1.1
-      find-up: 5.0.0
-      fs-extra: 11.1.1
-      get-npm-tarball-url: 2.0.3
-      giget: 1.1.2
-      globby: 14.0.1
-      jscodeshift: 0.15.1(@babel/preset-env@7.24.7(@babel/core@7.24.7))
-      leven: 3.1.0
-      ora: 5.4.1
-      prettier: 3.3.2
-      prompts: 2.4.2
-      read-pkg-up: 7.0.1
-      semver: 7.6.0
-      strip-json-comments: 3.1.1
-      tempy: 3.1.0
-      tiny-invariant: 1.3.3
-      ts-dedent: 2.2.0
-    transitivePeerDependencies:
-      - '@babel/preset-env'
-      - bufferutil
-      - encoding
-      - react
-      - react-dom
-      - supports-color
-      - utf-8-validate
-
   '@storybook/client-logger@8.1.11':
     dependencies:
       '@storybook/global': 5.0.0
 
-  '@storybook/codemod@8.1.11':
+  '@storybook/codemod@8.2.6(bufferutil@4.0.8)(utf-8-validate@6.0.4)':
     dependencies:
       '@babel/core': 7.24.7
       '@babel/preset-env': 7.24.7(@babel/core@7.24.7)
       '@babel/types': 7.24.7
-      '@storybook/csf': 0.1.9
-      '@storybook/csf-tools': 8.1.11
-      '@storybook/node-logger': 8.1.11
-      '@storybook/types': 8.1.11
+      '@storybook/core': 8.2.6(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+      '@storybook/csf': 0.1.11
       '@types/cross-spawn': 6.0.2
       cross-spawn: 7.0.3
       globby: 14.0.1
       jscodeshift: 0.15.1(@babel/preset-env@7.24.7(@babel/core@7.24.7))
       lodash: 4.17.21
-      prettier: 3.3.2
+      prettier: 3.3.3
       recast: 0.23.6
       tiny-invariant: 1.3.3
     transitivePeerDependencies:
+      - bufferutil
       - supports-color
+      - utf-8-validate
 
-  '@storybook/components@8.1.11(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@storybook/components@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
     dependencies:
-      '@radix-ui/react-dialog': 1.1.1(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.0.28)(react@18.3.1)
-      '@storybook/client-logger': 8.1.11
-      '@storybook/csf': 0.1.9
-      '@storybook/global': 5.0.0
-      '@storybook/icons': 1.2.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/theming': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/types': 8.1.11
-      memoizerific: 1.11.3
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-      util-deprecate: 1.0.2
-    transitivePeerDependencies:
-      - '@types/react'
-      - '@types/react-dom'
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
 
-  '@storybook/core-common@8.1.11(encoding@0.1.13)(prettier@3.3.2)':
+  '@storybook/core-common@8.1.11(encoding@0.1.13)(prettier@3.3.3)':
     dependencies:
       '@storybook/core-events': 8.1.11
       '@storybook/csf-tools': 8.1.11
@@ -16292,13 +15894,13 @@ snapshots:
       find-cache-dir: 3.3.2
       find-up: 5.0.0
       fs-extra: 11.1.1
-      glob: 10.4.2
+      glob: 10.3.10
       handlebars: 4.7.7
       lazy-universal-dotenv: 4.0.0
       node-fetch: 2.7.0(encoding@0.1.13)
       picomatch: 2.3.1
       pkg-dir: 5.0.0
-      prettier-fallback: prettier@3.3.2
+      prettier-fallback: prettier@3.3.3
       pretty-hrtime: 1.0.3
       resolve-from: 5.0.0
       semver: 7.6.0
@@ -16307,7 +15909,7 @@ snapshots:
       ts-dedent: 2.2.0
       util: 0.12.5
     optionalDependencies:
-      prettier: 3.3.2
+      prettier: 3.3.3
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -16317,15 +15919,19 @@ snapshots:
       '@storybook/csf': 0.1.9
       ts-dedent: 2.2.0
 
-  '@storybook/core-server@8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)':
+  '@storybook/core-events@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
+    dependencies:
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+
+  '@storybook/core-server@8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)':
     dependencies:
       '@aw-web-design/x-default-browser': 1.4.126
       '@babel/core': 7.24.7
       '@babel/parser': 7.24.7
       '@discoveryjs/json-ext': 0.5.7
-      '@storybook/builder-manager': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/builder-manager': 8.1.11(encoding@0.1.13)(prettier@3.3.3)
       '@storybook/channels': 8.1.11
-      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.3)
       '@storybook/core-events': 8.1.11
       '@storybook/csf': 0.1.9
       '@storybook/csf-tools': 8.1.11
@@ -16335,7 +15941,7 @@ snapshots:
       '@storybook/manager-api': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@storybook/node-logger': 8.1.11
       '@storybook/preview-api': 8.1.11
-      '@storybook/telemetry': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/telemetry': 8.1.11(encoding@0.1.13)(prettier@3.3.3)
       '@storybook/types': 8.1.11
       '@types/detect-port': 1.3.2
       '@types/diff': 5.2.1
@@ -16363,7 +15969,7 @@ snapshots:
       util: 0.12.5
       util-deprecate: 1.0.2
       watchpack: 2.4.0
-      ws: 8.17.1(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+      ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4)
     transitivePeerDependencies:
       - bufferutil
       - encoding
@@ -16373,6 +15979,24 @@ snapshots:
       - supports-color
       - utf-8-validate
 
+  '@storybook/core@8.2.6(bufferutil@4.0.8)(utf-8-validate@6.0.4)':
+    dependencies:
+      '@storybook/csf': 0.1.11
+      '@types/express': 4.17.21
+      '@types/node': 18.17.15
+      browser-assert: 1.2.1
+      esbuild: 0.19.11
+      esbuild-register: 3.5.0(esbuild@0.19.11)
+      express: 4.19.2
+      process: 0.11.10
+      recast: 0.23.6
+      util: 0.12.5
+      ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+
   '@storybook/csf-plugin@8.1.11':
     dependencies:
       '@storybook/csf-tools': 8.1.11
@@ -16380,6 +16004,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@storybook/csf-plugin@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
+    dependencies:
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+      unplugin: 1.4.0
+
   '@storybook/csf-tools@8.1.11':
     dependencies:
       '@babel/generator': 7.24.7
@@ -16394,15 +16023,19 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@storybook/csf@0.1.11':
+    dependencies:
+      type-fest: 2.19.0
+
   '@storybook/csf@0.1.9':
     dependencies:
       type-fest: 2.19.0
 
   '@storybook/docs-mdx@3.1.0-next.0': {}
 
-  '@storybook/docs-tools@8.1.11(encoding@0.1.13)(prettier@3.3.2)':
+  '@storybook/docs-tools@8.1.11(encoding@0.1.13)(prettier@3.3.3)':
     dependencies:
-      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.3)
       '@storybook/core-events': 8.1.11
       '@storybook/preview-api': 8.1.11
       '@storybook/types': 8.1.11
@@ -16422,14 +16055,11 @@ snapshots:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
 
-  '@storybook/instrumenter@8.1.11':
+  '@storybook/instrumenter@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
     dependencies:
-      '@storybook/channels': 8.1.11
-      '@storybook/client-logger': 8.1.11
-      '@storybook/core-events': 8.1.11
       '@storybook/global': 5.0.0
-      '@storybook/preview-api': 8.1.11
       '@vitest/utils': 1.6.0
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       util: 0.12.5
 
   '@storybook/manager-api@8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
@@ -16453,6 +16083,10 @@ snapshots:
       - react
       - react-dom
 
+  '@storybook/manager-api@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
+    dependencies:
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+
   '@storybook/manager@8.1.11': {}
 
   '@storybook/node-logger@8.1.11': {}
@@ -16474,46 +16108,48 @@ snapshots:
       ts-dedent: 2.2.0
       util-deprecate: 1.0.2
 
+  '@storybook/preview-api@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
+    dependencies:
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+
   '@storybook/preview@8.1.11': {}
 
-  '@storybook/react-dom-shim@8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@storybook/react-dom-shim@8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
     dependencies:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
 
-  '@storybook/react-vite@8.1.11(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.18.0)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))':
+  '@storybook/react-vite@8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@4.19.1)(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))(typescript@5.5.4)(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))':
     dependencies:
-      '@joshwooding/vite-plugin-react-docgen-typescript': 0.3.1(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))
-      '@rollup/pluginutils': 5.1.0(rollup@4.18.0)
-      '@storybook/builder-vite': 8.1.11(encoding@0.1.13)(prettier@3.3.2)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))
-      '@storybook/node-logger': 8.1.11
-      '@storybook/react': 8.1.11(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.3)
-      '@storybook/types': 8.1.11
+      '@joshwooding/vite-plugin-react-docgen-typescript': 0.3.1(typescript@5.5.4)(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))
+      '@rollup/pluginutils': 5.1.0(rollup@4.19.1)
+      '@storybook/builder-vite': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))(typescript@5.5.4)(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))
+      '@storybook/react': 8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))(typescript@5.5.4)
       find-up: 5.0.0
       magic-string: 0.30.10
       react: 18.3.1
       react-docgen: 7.0.1
       react-dom: 18.3.1(react@18.3.1)
       resolve: 1.22.8
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       tsconfig-paths: 4.2.0
-      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2)
+      vite: 5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3)
     transitivePeerDependencies:
       - '@preact/preset-vite'
-      - encoding
-      - prettier
       - rollup
       - supports-color
       - typescript
       - vite-plugin-glimmerx
 
-  '@storybook/react@8.1.11(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.3)':
+  '@storybook/react@8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))(typescript@5.5.4)':
     dependencies:
-      '@storybook/client-logger': 8.1.11
-      '@storybook/docs-tools': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/components': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@storybook/global': 5.0.0
-      '@storybook/preview-api': 8.1.11
-      '@storybook/react-dom-shim': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/types': 8.1.11
+      '@storybook/manager-api': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/preview-api': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/react-dom-shim': 8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/theming': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@types/escodegen': 0.0.6
       '@types/estree': 0.0.51
       '@types/node': 18.17.15
@@ -16528,15 +16164,12 @@ snapshots:
       react-dom: 18.3.1(react@18.3.1)
       react-element-to-jsx-string: 15.0.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       semver: 7.6.0
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       ts-dedent: 2.2.0
       type-fest: 2.19.0
       util-deprecate: 1.0.2
     optionalDependencies:
-      typescript: 5.5.3
-    transitivePeerDependencies:
-      - encoding
-      - prettier
-      - supports-color
+      typescript: 5.5.4
 
   '@storybook/router@8.1.11':
     dependencies:
@@ -16544,18 +16177,18 @@ snapshots:
       memoizerific: 1.11.3
       qs: 6.11.1
 
-  '@storybook/source-loader@8.1.11':
+  '@storybook/source-loader@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
     dependencies:
-      '@storybook/csf': 0.1.9
-      '@storybook/types': 8.1.11
+      '@storybook/csf': 0.1.11
       estraverse: 5.3.0
       lodash: 4.17.21
-      prettier: 3.3.2
+      prettier: 3.3.3
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
 
-  '@storybook/telemetry@8.1.11(encoding@0.1.13)(prettier@3.3.2)':
+  '@storybook/telemetry@8.1.11(encoding@0.1.13)(prettier@3.3.3)':
     dependencies:
       '@storybook/client-logger': 8.1.11
-      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/core-common': 8.1.11(encoding@0.1.13)(prettier@3.3.3)
       '@storybook/csf-tools': 8.1.11
       chalk: 4.1.2
       detect-package-manager: 2.0.1
@@ -16567,17 +16200,16 @@ snapshots:
       - prettier
       - supports-color
 
-  '@storybook/test@8.1.11(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))':
+  '@storybook/test@8.2.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12))(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3))':
     dependencies:
-      '@storybook/client-logger': 8.1.11
-      '@storybook/core-events': 8.1.11
-      '@storybook/instrumenter': 8.1.11
-      '@storybook/preview-api': 8.1.11
+      '@storybook/csf': 0.1.11
+      '@storybook/instrumenter': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@testing-library/dom': 10.1.0
-      '@testing-library/jest-dom': 6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))
+      '@testing-library/jest-dom': 6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12))(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3))
       '@testing-library/user-event': 14.5.2(@testing-library/dom@10.1.0)
       '@vitest/expect': 1.6.0
       '@vitest/spy': 1.6.0
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       util: 0.12.5
     transitivePeerDependencies:
       - '@jest/globals'
@@ -16596,24 +16228,32 @@ snapshots:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
 
+  '@storybook/theming@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
+    dependencies:
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+
   '@storybook/types@8.1.11':
     dependencies:
       '@storybook/channels': 8.1.11
       '@types/express': 4.17.17
       file-system-cache: 2.3.0
 
-  '@storybook/vue3-vite@8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))(vue@3.4.31(typescript@5.5.3))':
+  '@storybook/types@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))':
     dependencies:
-      '@storybook/builder-vite': 8.1.11(encoding@0.1.13)(prettier@3.3.2)(typescript@5.5.3)(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))
-      '@storybook/core-server': 8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+
+  '@storybook/vue3-vite@8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))(vue@3.4.34(typescript@5.5.4))':
+    dependencies:
+      '@storybook/builder-vite': 8.1.11(encoding@0.1.13)(prettier@3.3.3)(typescript@5.5.4)(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))
+      '@storybook/core-server': 8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)
       '@storybook/types': 8.1.11
-      '@storybook/vue3': 8.1.11(encoding@0.1.13)(prettier@3.3.2)(vue@3.4.31(typescript@5.5.3))
+      '@storybook/vue3': 8.1.11(encoding@0.1.13)(prettier@3.3.3)(vue@3.4.34(typescript@5.5.4))
       find-package-json: 1.2.0
       magic-string: 0.30.10
-      typescript: 5.5.3
-      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2)
-      vue-component-meta: 2.0.16(typescript@5.5.3)
-      vue-docgen-api: 4.75.1(vue@3.4.31(typescript@5.5.3))
+      typescript: 5.5.4
+      vite: 5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3)
+      vue-component-meta: 2.0.16(typescript@5.5.4)
+      vue-docgen-api: 4.75.1(vue@3.4.34(typescript@5.5.4))
     transitivePeerDependencies:
       - '@preact/preset-vite'
       - bufferutil
@@ -16626,9 +16266,9 @@ snapshots:
       - vite-plugin-glimmerx
       - vue
 
-  '@storybook/vue3@8.1.11(encoding@0.1.13)(prettier@3.3.2)(vue@3.4.31(typescript@5.5.3))':
+  '@storybook/vue3@8.1.11(encoding@0.1.13)(prettier@3.3.3)(vue@3.4.34(typescript@5.5.4))':
     dependencies:
-      '@storybook/docs-tools': 8.1.11(encoding@0.1.13)(prettier@3.3.2)
+      '@storybook/docs-tools': 8.1.11(encoding@0.1.13)(prettier@3.3.3)
       '@storybook/global': 5.0.0
       '@storybook/preview-api': 8.1.11
       '@storybook/types': 8.1.11
@@ -16636,13 +16276,28 @@ snapshots:
       lodash: 4.17.21
       ts-dedent: 2.2.0
       type-fest: 2.19.0
-      vue: 3.4.31(typescript@5.5.3)
-      vue-component-type-helpers: 2.0.26
+      vue: 3.4.34(typescript@5.5.4)
+      vue-component-type-helpers: 2.0.29
     transitivePeerDependencies:
       - encoding
       - prettier
       - supports-color
 
+  '@storybook/vue3@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))(vue@3.4.34(typescript@5.5.4))':
+    dependencies:
+      '@storybook/components': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/global': 5.0.0
+      '@storybook/manager-api': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/preview-api': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/theming': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@vue/compiler-core': 3.4.31
+      lodash: 4.17.21
+      storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+      ts-dedent: 2.2.0
+      type-fest: 2.19.0
+      vue: 3.4.34(typescript@5.5.4)
+      vue-component-type-helpers: 2.0.29
+
   '@swc/cli@0.3.12(@swc/core@1.6.6)(chokidar@3.5.3)':
     dependencies:
       '@mole-inc/bin-wrapper': 8.0.1
@@ -16663,13 +16318,16 @@ snapshots:
       '@swc/wasm': 1.2.130
     optional: true
 
+  '@swc/core-darwin-arm64@1.3.56':
+    optional: true
+
   '@swc/core-darwin-arm64@1.6.13':
     optional: true
 
   '@swc/core-darwin-arm64@1.6.6':
     optional: true
 
-  '@swc/core-darwin-arm64@1.7.0-nightly-20240715.2':
+  '@swc/core-darwin-x64@1.3.56':
     optional: true
 
   '@swc/core-darwin-x64@1.6.13':
@@ -16678,21 +16336,21 @@ snapshots:
   '@swc/core-darwin-x64@1.6.6':
     optional: true
 
-  '@swc/core-darwin-x64@1.7.0-nightly-20240715.2':
-    optional: true
-
   '@swc/core-freebsd-x64@1.3.11':
     dependencies:
       '@swc/wasm': 1.2.130
     optional: true
 
+  '@swc/core-linux-arm-gnueabihf@1.3.56':
+    optional: true
+
   '@swc/core-linux-arm-gnueabihf@1.6.13':
     optional: true
 
   '@swc/core-linux-arm-gnueabihf@1.6.6':
     optional: true
 
-  '@swc/core-linux-arm-gnueabihf@1.7.0-nightly-20240715.2':
+  '@swc/core-linux-arm64-gnu@1.3.56':
     optional: true
 
   '@swc/core-linux-arm64-gnu@1.6.13':
@@ -16701,7 +16359,7 @@ snapshots:
   '@swc/core-linux-arm64-gnu@1.6.6':
     optional: true
 
-  '@swc/core-linux-arm64-gnu@1.7.0-nightly-20240715.2':
+  '@swc/core-linux-arm64-musl@1.3.56':
     optional: true
 
   '@swc/core-linux-arm64-musl@1.6.13':
@@ -16710,7 +16368,7 @@ snapshots:
   '@swc/core-linux-arm64-musl@1.6.6':
     optional: true
 
-  '@swc/core-linux-arm64-musl@1.7.0-nightly-20240715.2':
+  '@swc/core-linux-x64-gnu@1.3.56':
     optional: true
 
   '@swc/core-linux-x64-gnu@1.6.13':
@@ -16719,7 +16377,7 @@ snapshots:
   '@swc/core-linux-x64-gnu@1.6.6':
     optional: true
 
-  '@swc/core-linux-x64-gnu@1.7.0-nightly-20240715.2':
+  '@swc/core-linux-x64-musl@1.3.56':
     optional: true
 
   '@swc/core-linux-x64-musl@1.6.13':
@@ -16728,7 +16386,7 @@ snapshots:
   '@swc/core-linux-x64-musl@1.6.6':
     optional: true
 
-  '@swc/core-linux-x64-musl@1.7.0-nightly-20240715.2':
+  '@swc/core-win32-arm64-msvc@1.3.56':
     optional: true
 
   '@swc/core-win32-arm64-msvc@1.6.13':
@@ -16737,7 +16395,7 @@ snapshots:
   '@swc/core-win32-arm64-msvc@1.6.6':
     optional: true
 
-  '@swc/core-win32-arm64-msvc@1.7.0-nightly-20240715.2':
+  '@swc/core-win32-ia32-msvc@1.3.56':
     optional: true
 
   '@swc/core-win32-ia32-msvc@1.6.13':
@@ -16746,7 +16404,7 @@ snapshots:
   '@swc/core-win32-ia32-msvc@1.6.6':
     optional: true
 
-  '@swc/core-win32-ia32-msvc@1.7.0-nightly-20240715.2':
+  '@swc/core-win32-x64-msvc@1.3.56':
     optional: true
 
   '@swc/core-win32-x64-msvc@1.6.13':
@@ -16755,9 +16413,6 @@ snapshots:
   '@swc/core-win32-x64-msvc@1.6.6':
     optional: true
 
-  '@swc/core-win32-x64-msvc@1.7.0-nightly-20240715.2':
-    optional: true
-
   '@swc/core@1.6.13':
     dependencies:
       '@swc/counter': 0.1.3
@@ -16833,39 +16488,41 @@ snapshots:
 
   '@tabler/icons@3.3.0': {}
 
-  '@tensorflow/tfjs-backend-cpu@4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))':
+  '@tensorflow/tfjs-backend-cpu@4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))':
     dependencies:
-      '@tensorflow/tfjs-core': 4.20.0(encoding@0.1.13)
+      '@tensorflow/tfjs-core': 4.4.0(encoding@0.1.13)
       '@types/seedrandom': 2.4.34
       seedrandom: 3.0.5
 
-  '@tensorflow/tfjs-backend-webgl@4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))':
+  '@tensorflow/tfjs-backend-webgl@4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))':
     dependencies:
-      '@tensorflow/tfjs-backend-cpu': 4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))
-      '@tensorflow/tfjs-core': 4.20.0(encoding@0.1.13)
+      '@tensorflow/tfjs-backend-cpu': 4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))
+      '@tensorflow/tfjs-core': 4.4.0(encoding@0.1.13)
       '@types/offscreencanvas': 2019.3.0
       '@types/seedrandom': 2.4.34
+      '@types/webgl-ext': 0.0.30
       seedrandom: 3.0.5
 
-  '@tensorflow/tfjs-converter@4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))':
+  '@tensorflow/tfjs-converter@4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))':
     dependencies:
-      '@tensorflow/tfjs-core': 4.20.0(encoding@0.1.13)
+      '@tensorflow/tfjs-core': 4.4.0(encoding@0.1.13)
 
-  '@tensorflow/tfjs-core@4.20.0(encoding@0.1.13)':
+  '@tensorflow/tfjs-core@4.4.0(encoding@0.1.13)':
     dependencies:
       '@types/long': 4.0.2
       '@types/offscreencanvas': 2019.7.0
-      '@types/seedrandom': 2.4.30
-      '@webgpu/types': 0.1.38
+      '@types/seedrandom': 2.4.34
+      '@types/webgl-ext': 0.0.30
+      '@webgpu/types': 0.1.30
       long: 4.0.0
-      node-fetch: 2.6.11(encoding@0.1.13)
+      node-fetch: 2.6.13(encoding@0.1.13)
       seedrandom: 3.0.5
     transitivePeerDependencies:
       - encoding
 
-  '@tensorflow/tfjs-data@4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))(encoding@0.1.13)(seedrandom@3.0.5)':
+  '@tensorflow/tfjs-data@4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))(encoding@0.1.13)(seedrandom@3.0.5)':
     dependencies:
-      '@tensorflow/tfjs-core': 4.20.0(encoding@0.1.13)
+      '@tensorflow/tfjs-core': 4.4.0(encoding@0.1.13)
       '@types/node-fetch': 2.6.11
       node-fetch: 2.6.13(encoding@0.1.13)
       seedrandom: 3.0.5
@@ -16873,34 +16530,34 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  '@tensorflow/tfjs-layers@4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))':
+  '@tensorflow/tfjs-layers@4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))':
     dependencies:
-      '@tensorflow/tfjs-core': 4.20.0(encoding@0.1.13)
+      '@tensorflow/tfjs-core': 4.4.0(encoding@0.1.13)
 
-  '@tensorflow/tfjs-node@4.20.0(encoding@0.1.13)(seedrandom@3.0.5)':
+  '@tensorflow/tfjs-node@4.4.0(encoding@0.1.13)(seedrandom@3.0.5)':
     dependencies:
       '@mapbox/node-pre-gyp': 1.0.9(encoding@0.1.13)
-      '@tensorflow/tfjs': 4.20.0(encoding@0.1.13)(seedrandom@3.0.5)
+      '@tensorflow/tfjs': 4.4.0(encoding@0.1.13)(seedrandom@3.0.5)
       adm-zip: 0.5.10
       google-protobuf: 3.21.2
       https-proxy-agent: 2.2.4
       progress: 2.0.3
       rimraf: 2.7.1
-      tar: 6.2.1
+      tar: 4.4.19
     transitivePeerDependencies:
       - encoding
       - seedrandom
       - supports-color
     optional: true
 
-  '@tensorflow/tfjs@4.20.0(encoding@0.1.13)(seedrandom@3.0.5)':
+  '@tensorflow/tfjs@4.4.0(encoding@0.1.13)(seedrandom@3.0.5)':
     dependencies:
-      '@tensorflow/tfjs-backend-cpu': 4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))
-      '@tensorflow/tfjs-backend-webgl': 4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))
-      '@tensorflow/tfjs-converter': 4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))
-      '@tensorflow/tfjs-core': 4.20.0(encoding@0.1.13)
-      '@tensorflow/tfjs-data': 4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))(encoding@0.1.13)(seedrandom@3.0.5)
-      '@tensorflow/tfjs-layers': 4.20.0(@tensorflow/tfjs-core@4.20.0(encoding@0.1.13))
+      '@tensorflow/tfjs-backend-cpu': 4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))
+      '@tensorflow/tfjs-backend-webgl': 4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))
+      '@tensorflow/tfjs-converter': 4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))
+      '@tensorflow/tfjs-core': 4.4.0(encoding@0.1.13)
+      '@tensorflow/tfjs-data': 4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))(encoding@0.1.13)(seedrandom@3.0.5)
+      '@tensorflow/tfjs-layers': 4.4.0(@tensorflow/tfjs-core@4.4.0(encoding@0.1.13))
       argparse: 1.0.10
       chalk: 4.1.2
       core-js: 3.29.1
@@ -16932,11 +16589,11 @@ snapshots:
       lz-string: 1.5.0
       pretty-format: 27.5.1
 
-  '@testing-library/jest-dom@6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.9))(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))':
+  '@testing-library/jest-dom@6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.12))(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3))':
     dependencies:
       '@adobe/css-tools': 4.3.3
       '@babel/runtime': 7.23.4
-      aria-query: 5.1.3
+      aria-query: 5.3.0
       chalk: 3.0.0
       css.escape: 1.5.1
       dom-accessibility-api: 0.6.3
@@ -16945,21 +16602,21 @@ snapshots:
     optionalDependencies:
       '@jest/globals': 29.7.0
       '@types/jest': 29.5.12
-      jest: 29.7.0(@types/node@20.14.9)
-      vitest: 1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2)
+      jest: 29.7.0(@types/node@20.14.12)
+      vitest: 1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3)
 
   '@testing-library/user-event@14.5.2(@testing-library/dom@10.1.0)':
     dependencies:
       '@testing-library/dom': 10.1.0
 
-  '@testing-library/vue@8.1.0(@vue/compiler-sfc@3.4.31)(@vue/server-renderer@3.4.31(vue@3.4.31(typescript@5.5.3)))(vue@3.4.31(typescript@5.5.3))':
+  '@testing-library/vue@8.1.0(@vue/compiler-sfc@3.4.34)(@vue/server-renderer@3.4.34(vue@3.4.34(typescript@5.5.4)))(vue@3.4.34(typescript@5.5.4))':
     dependencies:
       '@babel/runtime': 7.23.4
       '@testing-library/dom': 9.3.4
-      '@vue/test-utils': 2.4.1(@vue/server-renderer@3.4.31(vue@3.4.31(typescript@5.5.3)))(vue@3.4.31(typescript@5.5.3))
-      vue: 3.4.31(typescript@5.5.3)
+      '@vue/test-utils': 2.4.1(@vue/server-renderer@3.4.34(vue@3.4.34(typescript@5.5.4)))(vue@3.4.34(typescript@5.5.4))
+      vue: 3.4.34(typescript@5.5.4)
     optionalDependencies:
-      '@vue/compiler-sfc': 3.4.31
+      '@vue/compiler-sfc': 3.4.34
     transitivePeerDependencies:
       - '@vue/server-renderer'
 
@@ -16975,7 +16632,7 @@ snapshots:
 
   '@types/accepts@1.3.7':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/archiver@6.0.2':
     dependencies:
@@ -17011,7 +16668,7 @@ snapshots:
   '@types/body-parser@1.19.5':
     dependencies:
       '@types/connect': 3.4.35
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/braces@3.0.1': {}
 
@@ -17019,7 +16676,7 @@ snapshots:
     dependencies:
       '@types/http-cache-semantics': 4.0.4
       '@types/keyv': 3.1.4
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       '@types/responselike': 1.0.0
 
   '@types/color-convert@2.0.3':
@@ -17030,26 +16687,19 @@ snapshots:
 
   '@types/connect@3.4.35':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/connect@3.4.36':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/content-disposition@0.5.8': {}
 
   '@types/cookie@0.6.0': {}
 
-  '@types/cookies@0.9.0':
-    dependencies:
-      '@types/connect': 3.4.36
-      '@types/express': 4.17.17
-      '@types/keygrip': 1.0.6
-      '@types/node': 20.14.9
-
   '@types/cross-spawn@6.0.2':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/debug@4.1.12':
     dependencies:
@@ -17084,7 +16734,7 @@ snapshots:
 
   '@types/express-serve-static-core@4.17.33':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       '@types/qs': 6.9.7
       '@types/range-parser': 1.2.4
 
@@ -17095,20 +16745,27 @@ snapshots:
       '@types/qs': 6.9.7
       '@types/serve-static': 1.15.1
 
+  '@types/express@4.17.21':
+    dependencies:
+      '@types/body-parser': 1.19.5
+      '@types/express-serve-static-core': 4.17.33
+      '@types/qs': 6.9.7
+      '@types/serve-static': 1.15.1
+
   '@types/find-cache-dir@3.2.1': {}
 
   '@types/fluent-ffmpeg@2.1.24':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/glob@7.2.0':
     dependencies:
       '@types/minimatch': 5.1.2
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/graceful-fs@4.1.6':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/hast@3.0.4':
     dependencies:
@@ -17116,15 +16773,11 @@ snapshots:
 
   '@types/htmlescape@1.1.3': {}
 
-  '@types/http-assert@1.5.5': {}
-
   '@types/http-cache-semantics@4.0.4': {}
 
-  '@types/http-errors@2.0.4': {}
-
   '@types/http-link-header@1.0.7':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/istanbul-lib-coverage@2.0.4': {}
 
@@ -17145,7 +16798,7 @@ snapshots:
 
   '@types/jsdom@21.1.7':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       '@types/tough-cookie': 4.0.2
       parse5: 7.1.2
 
@@ -17155,34 +16808,13 @@ snapshots:
 
   '@types/json5@0.0.29': {}
 
-  '@types/jsonld@1.5.14': {}
+  '@types/jsonld@1.5.15': {}
 
   '@types/jsrsasign@10.5.14': {}
 
-  '@types/keygrip@1.0.6': {}
-
   '@types/keyv@3.1.4':
     dependencies:
-      '@types/node': 20.14.9
-
-  '@types/koa-compose@3.2.8':
-    dependencies:
-      '@types/koa': 2.14.0
-
-  '@types/koa@2.14.0':
-    dependencies:
-      '@types/accepts': 1.3.7
-      '@types/content-disposition': 0.5.8
-      '@types/cookies': 0.9.0
-      '@types/http-assert': 1.5.5
-      '@types/http-errors': 2.0.4
-      '@types/keygrip': 1.0.6
-      '@types/koa-compose': 3.2.8
-      '@types/node': 20.14.9
-
-  '@types/koa__router@12.0.3':
-    dependencies:
-      '@types/koa': 2.14.0
+      '@types/node': 20.14.12
 
   '@types/lodash@4.14.191': {}
 
@@ -17190,6 +16822,8 @@ snapshots:
 
   '@types/matter-js@0.19.6': {}
 
+  '@types/matter-js@0.19.7': {}
+
   '@types/mdast@4.0.3':
     dependencies:
       '@types/unist': 3.0.2
@@ -17212,15 +16846,15 @@ snapshots:
 
   '@types/mute-stream@0.0.4':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/mysql@2.15.22':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/node-fetch@2.6.11':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       form-data: 4.0.0
 
   '@types/node@18.17.15': {}
@@ -17229,7 +16863,7 @@ snapshots:
     dependencies:
       undici-types: 5.26.5
 
-  '@types/node@20.14.9':
+  '@types/node@20.14.12':
     dependencies:
       undici-types: 5.26.5
 
@@ -17239,7 +16873,7 @@ snapshots:
 
   '@types/nodemailer@6.4.15':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/normalize-package-data@2.4.1': {}
 
@@ -17250,11 +16884,11 @@ snapshots:
   '@types/oauth2orize@1.11.5':
     dependencies:
       '@types/express': 4.17.17
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/oauth@0.9.5':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/offscreencanvas@2019.3.0': {}
 
@@ -17266,13 +16900,13 @@ snapshots:
 
   '@types/pg@8.11.6':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       pg-protocol: 1.6.1
       pg-types: 4.0.1
 
   '@types/pg@8.6.1':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       pg-protocol: 1.6.1
       pg-types: 2.2.0
 
@@ -17286,7 +16920,7 @@ snapshots:
 
   '@types/qrcode@1.5.5':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/qs@6.9.7': {}
 
@@ -17304,7 +16938,7 @@ snapshots:
 
   '@types/readdir-glob@1.1.1':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/rename@1.0.7': {}
 
@@ -17312,7 +16946,7 @@ snapshots:
 
   '@types/responselike@1.0.0':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/sanitize-html@2.11.0':
     dependencies:
@@ -17320,8 +16954,6 @@ snapshots:
 
   '@types/scheduler@0.16.2': {}
 
-  '@types/seedrandom@2.4.30': {}
-
   '@types/seedrandom@2.4.34': {}
 
   '@types/seedrandom@3.0.8': {}
@@ -17331,7 +16963,7 @@ snapshots:
   '@types/serve-static@1.15.1':
     dependencies:
       '@types/mime': 3.0.1
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/serviceworker@0.0.67': {}
 
@@ -17361,6 +16993,8 @@ snapshots:
 
   '@types/tough-cookie@4.0.2': {}
 
+  '@types/tough-cookie@4.0.5': {}
+
   '@types/unist@3.0.2': {}
 
   '@types/uuid@10.0.0': {}
@@ -17369,17 +17003,19 @@ snapshots:
 
   '@types/vary@1.1.3':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/web-push@3.6.3':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
+
+  '@types/webgl-ext@0.0.30': {}
 
   '@types/wrap-ansi@3.0.0': {}
 
-  '@types/ws@8.5.10':
+  '@types/ws@8.5.11':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
 
   '@types/yargs-parser@21.0.0': {}
 
@@ -17389,19 +17025,19 @@ snapshots:
 
   '@types/yauzl@2.10.0':
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
     optional: true
 
-  '@typescript-eslint/eslint-plugin@6.11.0(@typescript-eslint/parser@6.11.0(eslint@9.7.0)(typescript@5.3.3))(eslint@9.7.0)(typescript@5.3.3)':
+  '@typescript-eslint/eslint-plugin@6.11.0(@typescript-eslint/parser@6.11.0(eslint@9.8.0)(typescript@5.3.3))(eslint@9.8.0)(typescript@5.3.3)':
     dependencies:
       '@eslint-community/regexpp': 4.6.2
-      '@typescript-eslint/parser': 6.11.0(eslint@9.7.0)(typescript@5.3.3)
+      '@typescript-eslint/parser': 6.11.0(eslint@9.8.0)(typescript@5.3.3)
       '@typescript-eslint/scope-manager': 6.11.0
-      '@typescript-eslint/type-utils': 6.11.0(eslint@9.7.0)(typescript@5.3.3)
-      '@typescript-eslint/utils': 6.11.0(eslint@9.7.0)(typescript@5.3.3)
+      '@typescript-eslint/type-utils': 6.11.0(eslint@9.8.0)(typescript@5.3.3)
+      '@typescript-eslint/utils': 6.11.0(eslint@9.8.0)(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 6.11.0
       debug: 4.3.4(supports-color@5.5.0)
-      eslint: 9.7.0
+      eslint: 9.8.0
       graphemer: 1.4.0
       ignore: 5.2.4
       natural-compare: 1.4.0
@@ -17412,16 +17048,16 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/eslint-plugin@7.1.0(@typescript-eslint/parser@7.1.0(eslint@9.7.0)(typescript@5.3.3))(eslint@9.7.0)(typescript@5.3.3)':
+  '@typescript-eslint/eslint-plugin@7.1.0(@typescript-eslint/parser@7.1.0(eslint@9.8.0)(typescript@5.3.3))(eslint@9.8.0)(typescript@5.3.3)':
     dependencies:
       '@eslint-community/regexpp': 4.6.2
-      '@typescript-eslint/parser': 7.1.0(eslint@9.7.0)(typescript@5.3.3)
+      '@typescript-eslint/parser': 7.1.0(eslint@9.8.0)(typescript@5.3.3)
       '@typescript-eslint/scope-manager': 7.1.0
-      '@typescript-eslint/type-utils': 7.1.0(eslint@9.7.0)(typescript@5.3.3)
-      '@typescript-eslint/utils': 7.1.0(eslint@9.7.0)(typescript@5.3.3)
+      '@typescript-eslint/type-utils': 7.1.0(eslint@9.8.0)(typescript@5.3.3)
+      '@typescript-eslint/utils': 7.1.0(eslint@9.8.0)(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 7.1.0
       debug: 4.3.4(supports-color@5.5.0)
-      eslint: 9.7.0
+      eslint: 9.8.0
       graphemer: 1.4.0
       ignore: 5.2.4
       natural-compare: 1.4.0
@@ -17432,91 +17068,60 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/eslint-plugin@7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0)(typescript@5.5.3)':
+  '@typescript-eslint/eslint-plugin@7.17.0(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0)(typescript@5.5.4)':
     dependencies:
-      '@eslint-community/regexpp': 4.10.0
-      '@typescript-eslint/parser': 7.15.0(eslint@9.6.0)(typescript@5.5.3)
-      '@typescript-eslint/scope-manager': 7.15.0
-      '@typescript-eslint/type-utils': 7.15.0(eslint@9.6.0)(typescript@5.5.3)
-      '@typescript-eslint/utils': 7.15.0(eslint@9.6.0)(typescript@5.5.3)
-      '@typescript-eslint/visitor-keys': 7.15.0
-      eslint: 9.6.0
+      '@eslint-community/regexpp': 4.11.0
+      '@typescript-eslint/parser': 7.17.0(eslint@9.8.0)(typescript@5.5.4)
+      '@typescript-eslint/scope-manager': 7.17.0
+      '@typescript-eslint/type-utils': 7.17.0(eslint@9.8.0)(typescript@5.5.4)
+      '@typescript-eslint/utils': 7.17.0(eslint@9.8.0)(typescript@5.5.4)
+      '@typescript-eslint/visitor-keys': 7.17.0
+      eslint: 9.8.0
       graphemer: 1.4.0
       ignore: 5.3.1
       natural-compare: 1.4.0
-      ts-api-utils: 1.3.0(typescript@5.5.3)
+      ts-api-utils: 1.3.0(typescript@5.5.4)
     optionalDependencies:
-      typescript: 5.5.3
+      typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/eslint-plugin@7.15.0(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint@9.7.0)(typescript@5.5.3)':
-    dependencies:
-      '@eslint-community/regexpp': 4.10.0
-      '@typescript-eslint/parser': 7.15.0(eslint@9.7.0)(typescript@5.5.3)
-      '@typescript-eslint/scope-manager': 7.15.0
-      '@typescript-eslint/type-utils': 7.15.0(eslint@9.7.0)(typescript@5.5.3)
-      '@typescript-eslint/utils': 7.15.0(eslint@9.7.0)(typescript@5.5.3)
-      '@typescript-eslint/visitor-keys': 7.15.0
-      eslint: 9.7.0
-      graphemer: 1.4.0
-      ignore: 5.3.1
-      natural-compare: 1.4.0
-      ts-api-utils: 1.3.0(typescript@5.5.3)
-    optionalDependencies:
-      typescript: 5.5.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/parser@6.11.0(eslint@9.7.0)(typescript@5.3.3)':
+  '@typescript-eslint/parser@6.11.0(eslint@9.8.0)(typescript@5.3.3)':
     dependencies:
       '@typescript-eslint/scope-manager': 6.11.0
       '@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)
-      eslint: 9.7.0
+      eslint: 9.8.0
     optionalDependencies:
       typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@7.1.0(eslint@9.7.0)(typescript@5.3.3)':
+  '@typescript-eslint/parser@7.1.0(eslint@9.8.0)(typescript@5.3.3)':
     dependencies:
       '@typescript-eslint/scope-manager': 7.1.0
       '@typescript-eslint/types': 7.1.0
       '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 7.1.0
       debug: 4.3.4(supports-color@5.5.0)
-      eslint: 9.7.0
+      eslint: 9.8.0
     optionalDependencies:
       typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3)':
+  '@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4)':
     dependencies:
-      '@typescript-eslint/scope-manager': 7.15.0
-      '@typescript-eslint/types': 7.15.0
-      '@typescript-eslint/typescript-estree': 7.15.0(typescript@5.5.3)
-      '@typescript-eslint/visitor-keys': 7.15.0
+      '@typescript-eslint/scope-manager': 7.17.0
+      '@typescript-eslint/types': 7.17.0
+      '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.5.4)
+      '@typescript-eslint/visitor-keys': 7.17.0
       debug: 4.3.5(supports-color@8.1.1)
-      eslint: 9.6.0
+      eslint: 9.8.0
     optionalDependencies:
-      typescript: 5.5.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3)':
-    dependencies:
-      '@typescript-eslint/scope-manager': 7.15.0
-      '@typescript-eslint/types': 7.15.0
-      '@typescript-eslint/typescript-estree': 7.15.0(typescript@5.5.3)
-      '@typescript-eslint/visitor-keys': 7.15.0
-      debug: 4.3.5(supports-color@8.1.1)
-      eslint: 9.7.0
-    optionalDependencies:
-      typescript: 5.5.3
+      typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
 
@@ -17530,56 +17135,44 @@ snapshots:
       '@typescript-eslint/types': 7.1.0
       '@typescript-eslint/visitor-keys': 7.1.0
 
-  '@typescript-eslint/scope-manager@7.15.0':
+  '@typescript-eslint/scope-manager@7.17.0':
     dependencies:
-      '@typescript-eslint/types': 7.15.0
-      '@typescript-eslint/visitor-keys': 7.15.0
+      '@typescript-eslint/types': 7.17.0
+      '@typescript-eslint/visitor-keys': 7.17.0
 
-  '@typescript-eslint/type-utils@6.11.0(eslint@9.7.0)(typescript@5.3.3)':
+  '@typescript-eslint/type-utils@6.11.0(eslint@9.8.0)(typescript@5.3.3)':
     dependencies:
       '@typescript-eslint/typescript-estree': 6.11.0(typescript@5.3.3)
-      '@typescript-eslint/utils': 6.11.0(eslint@9.7.0)(typescript@5.3.3)
+      '@typescript-eslint/utils': 6.11.0(eslint@9.8.0)(typescript@5.3.3)
       debug: 4.3.5(supports-color@8.1.1)
-      eslint: 9.7.0
+      eslint: 9.8.0
       ts-api-utils: 1.0.1(typescript@5.3.3)
     optionalDependencies:
       typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/type-utils@7.1.0(eslint@9.7.0)(typescript@5.3.3)':
+  '@typescript-eslint/type-utils@7.1.0(eslint@9.8.0)(typescript@5.3.3)':
     dependencies:
       '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
-      '@typescript-eslint/utils': 7.1.0(eslint@9.7.0)(typescript@5.3.3)
+      '@typescript-eslint/utils': 7.1.0(eslint@9.8.0)(typescript@5.3.3)
       debug: 4.3.4(supports-color@5.5.0)
-      eslint: 9.7.0
+      eslint: 9.8.0
       ts-api-utils: 1.0.1(typescript@5.3.3)
     optionalDependencies:
       typescript: 5.3.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/type-utils@7.15.0(eslint@9.6.0)(typescript@5.5.3)':
+  '@typescript-eslint/type-utils@7.17.0(eslint@9.8.0)(typescript@5.5.4)':
     dependencies:
-      '@typescript-eslint/typescript-estree': 7.15.0(typescript@5.5.3)
-      '@typescript-eslint/utils': 7.15.0(eslint@9.6.0)(typescript@5.5.3)
+      '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.5.4)
+      '@typescript-eslint/utils': 7.17.0(eslint@9.8.0)(typescript@5.5.4)
       debug: 4.3.5(supports-color@8.1.1)
-      eslint: 9.6.0
-      ts-api-utils: 1.3.0(typescript@5.5.3)
+      eslint: 9.8.0
+      ts-api-utils: 1.3.0(typescript@5.5.4)
     optionalDependencies:
-      typescript: 5.5.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/type-utils@7.15.0(eslint@9.7.0)(typescript@5.5.3)':
-    dependencies:
-      '@typescript-eslint/typescript-estree': 7.15.0(typescript@5.5.3)
-      '@typescript-eslint/utils': 7.15.0(eslint@9.7.0)(typescript@5.5.3)
-      debug: 4.3.5(supports-color@8.1.1)
-      eslint: 9.7.0
-      ts-api-utils: 1.3.0(typescript@5.5.3)
-    optionalDependencies:
-      typescript: 5.5.3
+      typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
 
@@ -17587,7 +17180,7 @@ snapshots:
 
   '@typescript-eslint/types@7.1.0': {}
 
-  '@typescript-eslint/types@7.15.0': {}
+  '@typescript-eslint/types@7.17.0': {}
 
   '@typescript-eslint/typescript-estree@6.11.0(typescript@5.3.3)':
     dependencies:
@@ -17618,67 +17211,56 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@7.15.0(typescript@5.5.3)':
+  '@typescript-eslint/typescript-estree@7.17.0(typescript@5.5.4)':
     dependencies:
-      '@typescript-eslint/types': 7.15.0
-      '@typescript-eslint/visitor-keys': 7.15.0
+      '@typescript-eslint/types': 7.17.0
+      '@typescript-eslint/visitor-keys': 7.17.0
       debug: 4.3.5(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.4
       semver: 7.6.0
-      ts-api-utils: 1.3.0(typescript@5.5.3)
+      ts-api-utils: 1.3.0(typescript@5.5.4)
     optionalDependencies:
-      typescript: 5.5.3
+      typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@6.11.0(eslint@9.7.0)(typescript@5.3.3)':
+  '@typescript-eslint/utils@6.11.0(eslint@9.8.0)(typescript@5.3.3)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@9.7.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.8.0)
       '@types/json-schema': 7.0.12
       '@types/semver': 7.5.8
       '@typescript-eslint/scope-manager': 6.11.0
       '@typescript-eslint/types': 6.11.0
       '@typescript-eslint/typescript-estree': 6.11.0(typescript@5.3.3)
-      eslint: 9.7.0
+      eslint: 9.8.0
       semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  '@typescript-eslint/utils@7.1.0(eslint@9.7.0)(typescript@5.3.3)':
+  '@typescript-eslint/utils@7.1.0(eslint@9.8.0)(typescript@5.3.3)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@9.7.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.8.0)
       '@types/json-schema': 7.0.12
       '@types/semver': 7.5.8
       '@typescript-eslint/scope-manager': 7.1.0
       '@typescript-eslint/types': 7.1.0
       '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
-      eslint: 9.7.0
+      eslint: 9.8.0
       semver: 7.6.0
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  '@typescript-eslint/utils@7.15.0(eslint@9.6.0)(typescript@5.5.3)':
+  '@typescript-eslint/utils@7.17.0(eslint@9.8.0)(typescript@5.5.4)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@9.6.0)
-      '@typescript-eslint/scope-manager': 7.15.0
-      '@typescript-eslint/types': 7.15.0
-      '@typescript-eslint/typescript-estree': 7.15.0(typescript@5.5.3)
-      eslint: 9.6.0
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  '@typescript-eslint/utils@7.15.0(eslint@9.7.0)(typescript@5.5.3)':
-    dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@9.7.0)
-      '@typescript-eslint/scope-manager': 7.15.0
-      '@typescript-eslint/types': 7.15.0
-      '@typescript-eslint/typescript-estree': 7.15.0(typescript@5.5.3)
-      eslint: 9.7.0
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.8.0)
+      '@typescript-eslint/scope-manager': 7.17.0
+      '@typescript-eslint/types': 7.17.0
+      '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.5.4)
+      eslint: 9.8.0
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -17693,19 +17275,19 @@ snapshots:
       '@typescript-eslint/types': 7.1.0
       eslint-visitor-keys: 3.4.3
 
-  '@typescript-eslint/visitor-keys@7.15.0':
+  '@typescript-eslint/visitor-keys@7.17.0':
     dependencies:
-      '@typescript-eslint/types': 7.15.0
+      '@typescript-eslint/types': 7.17.0
       eslint-visitor-keys: 3.4.3
 
   '@ungap/structured-clone@1.2.0': {}
 
-  '@vitejs/plugin-vue@5.0.5(vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2))(vue@3.4.31(typescript@5.5.3))':
+  '@vitejs/plugin-vue@5.1.0(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))(vue@3.4.34(typescript@5.5.4))':
     dependencies:
-      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2)
-      vue: 3.4.31(typescript@5.5.3)
+      vite: 5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3)
+      vue: 3.4.34(typescript@5.5.4)
 
-  '@vitest/coverage-v8@1.6.0(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2))':
+  '@vitest/coverage-v8@1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3))':
     dependencies:
       '@ampproject/remapping': 2.2.1
       '@bcoe/v8-coverage': 0.2.3
@@ -17720,7 +17302,7 @@ snapshots:
       std-env: 3.7.0
       strip-literal: 2.1.0
       test-exclude: 6.0.0
-      vitest: 1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2)
+      vitest: 1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -17757,24 +17339,24 @@ snapshots:
     dependencies:
       '@volar/source-map': 2.2.0
 
-  '@volar/language-core@2.4.0-alpha.11':
+  '@volar/language-core@2.4.0-alpha.18':
     dependencies:
-      '@volar/source-map': 2.4.0-alpha.11
+      '@volar/source-map': 2.4.0-alpha.18
 
   '@volar/source-map@2.2.0':
     dependencies:
       muggle-string: 0.4.1
 
-  '@volar/source-map@2.4.0-alpha.11': {}
+  '@volar/source-map@2.4.0-alpha.18': {}
 
   '@volar/typescript@2.2.0':
     dependencies:
       '@volar/language-core': 2.2.0
       path-browserify: 1.0.1
 
-  '@volar/typescript@2.4.0-alpha.11':
+  '@volar/typescript@2.4.0-alpha.18':
     dependencies:
-      '@volar/language-core': 2.4.0-alpha.11
+      '@volar/language-core': 2.4.0-alpha.18
       path-browserify: 1.0.1
       vscode-uri: 3.0.8
 
@@ -17794,6 +17376,14 @@ snapshots:
       estree-walker: 2.0.2
       source-map-js: 1.2.0
 
+  '@vue/compiler-core@3.4.34':
+    dependencies:
+      '@babel/parser': 7.24.7
+      '@vue/shared': 3.4.34
+      entities: 4.5.0
+      estree-walker: 2.0.2
+      source-map-js: 1.2.0
+
   '@vue/compiler-dom@3.4.29':
     dependencies:
       '@vue/compiler-core': 3.4.29
@@ -17804,90 +17394,102 @@ snapshots:
       '@vue/compiler-core': 3.4.31
       '@vue/shared': 3.4.31
 
-  '@vue/compiler-sfc@3.4.31':
+  '@vue/compiler-dom@3.4.34':
+    dependencies:
+      '@vue/compiler-core': 3.4.34
+      '@vue/shared': 3.4.34
+
+  '@vue/compiler-sfc@3.4.34':
     dependencies:
       '@babel/parser': 7.24.7
-      '@vue/compiler-core': 3.4.31
-      '@vue/compiler-dom': 3.4.31
-      '@vue/compiler-ssr': 3.4.31
-      '@vue/shared': 3.4.31
+      '@vue/compiler-core': 3.4.34
+      '@vue/compiler-dom': 3.4.34
+      '@vue/compiler-ssr': 3.4.34
+      '@vue/shared': 3.4.34
       estree-walker: 2.0.2
       magic-string: 0.30.10
-      postcss: 8.4.38
+      postcss: 8.4.40
       source-map-js: 1.2.0
 
-  '@vue/compiler-ssr@3.4.31':
+  '@vue/compiler-ssr@3.4.34':
     dependencies:
-      '@vue/compiler-dom': 3.4.31
-      '@vue/shared': 3.4.31
+      '@vue/compiler-dom': 3.4.34
+      '@vue/shared': 3.4.34
+
+  '@vue/compiler-vue2@2.7.16':
+    dependencies:
+      de-indent: 1.0.2
+      he: 1.2.0
 
   '@vue/devtools-api@6.6.1': {}
 
-  '@vue/language-core@2.0.16(typescript@5.5.3)':
+  '@vue/language-core@2.0.16(typescript@5.5.4)':
     dependencies:
       '@volar/language-core': 2.2.0
-      '@vue/compiler-dom': 3.4.29
-      '@vue/shared': 3.4.29
+      '@vue/compiler-dom': 3.4.31
+      '@vue/shared': 3.4.31
       computeds: 0.0.1
       minimatch: 9.0.4
       path-browserify: 1.0.1
       vue-template-compiler: 2.7.14
     optionalDependencies:
-      typescript: 5.5.3
+      typescript: 5.5.4
 
-  '@vue/language-core@2.0.24(typescript@5.5.3)':
+  '@vue/language-core@2.0.29(typescript@5.5.4)':
     dependencies:
-      '@volar/language-core': 2.4.0-alpha.11
-      '@vue/compiler-dom': 3.4.29
-      '@vue/shared': 3.4.29
+      '@volar/language-core': 2.4.0-alpha.18
+      '@vue/compiler-dom': 3.4.31
+      '@vue/compiler-vue2': 2.7.16
+      '@vue/shared': 3.4.31
       computeds: 0.0.1
       minimatch: 9.0.4
       muggle-string: 0.4.1
       path-browserify: 1.0.1
-      vue-template-compiler: 2.7.14
     optionalDependencies:
-      typescript: 5.5.3
+      typescript: 5.5.4
 
-  '@vue/reactivity@3.4.31':
+  '@vue/reactivity@3.4.34':
     dependencies:
-      '@vue/shared': 3.4.31
+      '@vue/shared': 3.4.34
 
-  '@vue/runtime-core@3.4.31':
+  '@vue/runtime-core@3.4.34':
     dependencies:
-      '@vue/reactivity': 3.4.31
-      '@vue/shared': 3.4.31
+      '@vue/reactivity': 3.4.34
+      '@vue/shared': 3.4.34
 
-  '@vue/runtime-dom@3.4.31':
+  '@vue/runtime-dom@3.4.34':
     dependencies:
-      '@vue/reactivity': 3.4.31
-      '@vue/runtime-core': 3.4.31
-      '@vue/shared': 3.4.31
+      '@vue/reactivity': 3.4.34
+      '@vue/runtime-core': 3.4.34
+      '@vue/shared': 3.4.34
       csstype: 3.1.3
 
-  '@vue/server-renderer@3.4.31(vue@3.4.31(typescript@5.5.3))':
+  '@vue/server-renderer@3.4.34(vue@3.4.34(typescript@5.5.4))':
     dependencies:
-      '@vue/compiler-ssr': 3.4.31
-      '@vue/shared': 3.4.31
-      vue: 3.4.31(typescript@5.5.3)
+      '@vue/compiler-ssr': 3.4.34
+      '@vue/shared': 3.4.34
+      vue: 3.4.34(typescript@5.5.4)
 
   '@vue/shared@3.4.29': {}
 
   '@vue/shared@3.4.31': {}
 
-  '@vue/test-utils@2.4.1(@vue/server-renderer@3.4.31(vue@3.4.31(typescript@5.5.3)))(vue@3.4.31(typescript@5.5.3))':
+  '@vue/shared@3.4.34': {}
+
+  '@vue/test-utils@2.4.1(@vue/server-renderer@3.4.34(vue@3.4.34(typescript@5.5.4)))(vue@3.4.34(typescript@5.5.4))':
     dependencies:
       js-beautify: 1.14.9
-      vue: 3.4.31(typescript@5.5.3)
+      vue: 3.4.34(typescript@5.5.4)
       vue-component-type-helpers: 1.8.4
     optionalDependencies:
-      '@vue/server-renderer': 3.4.31(vue@3.4.31(typescript@5.5.3))
+      '@vue/server-renderer': 3.4.34(vue@3.4.34(typescript@5.5.4))
 
-  '@webgpu/types@0.1.38': {}
+  '@webgpu/types@0.1.30': {}
 
   '@yarnpkg/esbuild-plugin-pnp@3.0.0-rc.15(esbuild@0.19.11)':
     dependencies:
       esbuild: 0.19.11
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   '@yarnpkg/fslib@2.10.3':
     dependencies:
@@ -17914,22 +17516,22 @@ snapshots:
       mime-types: 2.1.35
       negotiator: 0.6.3
 
-  acorn-import-assertions@1.9.0(acorn@8.12.0):
+  acorn-import-assertions@1.9.0(acorn@8.12.1):
     dependencies:
-      acorn: 8.12.0
+      acorn: 8.12.1
     optional: true
 
-  acorn-import-attributes@1.9.5(acorn@8.12.0):
+  acorn-import-attributes@1.9.5(acorn@8.12.1):
     dependencies:
-      acorn: 8.12.0
+      acorn: 8.12.1
 
   acorn-jsx@5.3.2(acorn@7.4.1):
     dependencies:
       acorn: 7.4.1
 
-  acorn-jsx@5.3.2(acorn@8.12.0):
+  acorn-jsx@5.3.2(acorn@8.12.1):
     dependencies:
-      acorn: 8.12.0
+      acorn: 8.12.1
 
   acorn-walk@7.2.0: {}
 
@@ -17937,7 +17539,7 @@ snapshots:
 
   acorn@7.4.1: {}
 
-  acorn@8.12.0: {}
+  acorn@8.12.1: {}
 
   address@1.2.2: {}
 
@@ -17980,13 +17582,13 @@ snapshots:
     optionalDependencies:
       ajv: 8.13.0
 
-  ajv-draft-04@1.0.0(ajv@8.16.0):
+  ajv-draft-04@1.0.0(ajv@8.17.1):
     optionalDependencies:
-      ajv: 8.16.0
+      ajv: 8.17.1
 
-  ajv-formats@2.1.1(ajv@8.16.0):
+  ajv-formats@2.1.1(ajv@8.17.1):
     optionalDependencies:
-      ajv: 8.16.0
+      ajv: 8.17.1
 
   ajv-formats@3.0.1(ajv@8.13.0):
     optionalDependencies:
@@ -18013,12 +17615,12 @@ snapshots:
       require-from-string: 2.0.2
       uri-js: 4.4.1
 
-  ajv@8.16.0:
+  ajv@8.17.1:
     dependencies:
       fast-deep-equal: 3.1.3
+      fast-uri: 3.0.1
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
-      uri-js: 4.4.1
 
   ansi-colors@4.1.3: {}
 
@@ -18062,7 +17664,7 @@ snapshots:
 
   archiver-utils@5.0.2:
     dependencies:
-      glob: 10.4.2
+      glob: 10.3.10
       graceful-fs: 4.2.11
       is-stream: 2.0.1
       lazystream: 1.0.1
@@ -18096,10 +17698,6 @@ snapshots:
 
   argparse@2.0.1: {}
 
-  aria-hidden@1.2.4:
-    dependencies:
-      tslib: 2.6.2
-
   aria-query@5.1.3:
     dependencies:
       deep-equal: 2.2.0
@@ -18175,7 +17773,7 @@ snapshots:
     dependencies:
       pvtsutils: 1.3.5
       pvutils: 1.1.3
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   assert-never@1.2.1: {}
 
@@ -18193,7 +17791,7 @@ snapshots:
 
   ast-types@0.16.1:
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   astral-regex@2.0.0: {}
 
@@ -18435,10 +18033,6 @@ snapshots:
 
   browser-assert@1.2.1: {}
 
-  browserify-zlib@0.1.4:
-    dependencies:
-      pako: 0.2.9
-
   browserslist@4.22.2:
     dependencies:
       caniuse-lite: 1.0.30001566
@@ -18480,19 +18074,24 @@ snapshots:
       base64-js: 1.5.1
       ieee754: 1.2.1
 
+  bufferutil@4.0.7:
+    dependencies:
+      node-gyp-build: 4.6.0
+    optional: true
+
   bufferutil@4.0.8:
     dependencies:
       node-gyp-build: 4.6.0
     optional: true
 
-  bullmq@5.8.3:
+  bullmq@5.10.4:
     dependencies:
       cron-parser: 4.8.1
       ioredis: 5.4.1
       msgpackr: 1.10.1
       node-abort-controller: 3.1.1
       semver: 7.6.0
-      tslib: 2.6.2
+      tslib: 2.6.3
       uuid: 9.0.1
     transitivePeerDependencies:
       - supports-color
@@ -18513,7 +18112,7 @@ snapshots:
     dependencies:
       '@npmcli/fs': 3.1.0
       fs-minipass: 3.0.3
-      glob: 10.4.2
+      glob: 10.3.10
       lru-cache: 10.2.2
       minipass: 7.1.2
       minipass-collect: 1.0.2
@@ -18701,11 +18300,12 @@ snapshots:
     optionalDependencies:
       fsevents: 2.3.3
 
-  chownr@1.1.4: {}
+  chownr@1.1.4:
+    optional: true
 
   chownr@2.0.0: {}
 
-  chromatic@11.5.4: {}
+  chromatic@11.5.6: {}
 
   ci-info@3.7.1: {}
 
@@ -18832,7 +18432,7 @@ snapshots:
 
   commondir@1.0.1: {}
 
-  compare-versions@6.1.0: {}
+  compare-versions@6.1.1: {}
 
   compress-commons@6.0.2:
     dependencies:
@@ -18922,13 +18522,13 @@ snapshots:
       crc-32: 1.2.2
       readable-stream: 4.3.0
 
-  create-jest@29.7.0(@types/node@20.14.9):
+  create-jest@29.7.0(@types/node@20.14.12):
     dependencies:
       '@jest/types': 29.6.3
       chalk: 4.1.2
       exit: 0.1.2
       graceful-fs: 4.2.11
-      jest-config: 29.7.0(@types/node@20.14.9)
+      jest-config: 29.7.0(@types/node@20.14.12)
       jest-util: 29.7.0
       prompts: 2.4.2
     transitivePeerDependencies:
@@ -18941,10 +18541,10 @@ snapshots:
     dependencies:
       luxon: 3.3.0
 
-  cropperjs@2.0.0-beta.5:
+  cropperjs@2.0.0-rc.1:
     dependencies:
-      '@cropper/elements': 2.0.0-beta.5
-      '@cropper/utils': 2.0.0-beta.5
+      '@cropper/elements': 2.0.0-rc.1
+      '@cropper/utils': 2.0.0-rc.1
 
   cross-env@7.0.3:
     dependencies:
@@ -18978,9 +18578,9 @@ snapshots:
     dependencies:
       type-fest: 1.4.0
 
-  css-declaration-sorter@7.2.0(postcss@8.4.38):
+  css-declaration-sorter@7.2.0(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
 
   css-select@5.1.0:
     dependencies:
@@ -19006,49 +18606,49 @@ snapshots:
 
   cssesc@3.0.0: {}
 
-  cssnano-preset-default@6.1.2(postcss@8.4.38):
+  cssnano-preset-default@6.1.2(postcss@8.4.40):
     dependencies:
       browserslist: 4.23.0
-      css-declaration-sorter: 7.2.0(postcss@8.4.38)
-      cssnano-utils: 4.0.2(postcss@8.4.38)
-      postcss: 8.4.38
-      postcss-calc: 9.0.1(postcss@8.4.38)
-      postcss-colormin: 6.1.0(postcss@8.4.38)
-      postcss-convert-values: 6.1.0(postcss@8.4.38)
-      postcss-discard-comments: 6.0.2(postcss@8.4.38)
-      postcss-discard-duplicates: 6.0.3(postcss@8.4.38)
-      postcss-discard-empty: 6.0.3(postcss@8.4.38)
-      postcss-discard-overridden: 6.0.2(postcss@8.4.38)
-      postcss-merge-longhand: 6.0.5(postcss@8.4.38)
-      postcss-merge-rules: 6.1.1(postcss@8.4.38)
-      postcss-minify-font-values: 6.1.0(postcss@8.4.38)
-      postcss-minify-gradients: 6.0.3(postcss@8.4.38)
-      postcss-minify-params: 6.1.0(postcss@8.4.38)
-      postcss-minify-selectors: 6.0.4(postcss@8.4.38)
-      postcss-normalize-charset: 6.0.2(postcss@8.4.38)
-      postcss-normalize-display-values: 6.0.2(postcss@8.4.38)
-      postcss-normalize-positions: 6.0.2(postcss@8.4.38)
-      postcss-normalize-repeat-style: 6.0.2(postcss@8.4.38)
-      postcss-normalize-string: 6.0.2(postcss@8.4.38)
-      postcss-normalize-timing-functions: 6.0.2(postcss@8.4.38)
-      postcss-normalize-unicode: 6.1.0(postcss@8.4.38)
-      postcss-normalize-url: 6.0.2(postcss@8.4.38)
-      postcss-normalize-whitespace: 6.0.2(postcss@8.4.38)
-      postcss-ordered-values: 6.0.2(postcss@8.4.38)
-      postcss-reduce-initial: 6.1.0(postcss@8.4.38)
-      postcss-reduce-transforms: 6.0.2(postcss@8.4.38)
-      postcss-svgo: 6.0.3(postcss@8.4.38)
-      postcss-unique-selectors: 6.0.4(postcss@8.4.38)
+      css-declaration-sorter: 7.2.0(postcss@8.4.40)
+      cssnano-utils: 4.0.2(postcss@8.4.40)
+      postcss: 8.4.40
+      postcss-calc: 9.0.1(postcss@8.4.40)
+      postcss-colormin: 6.1.0(postcss@8.4.40)
+      postcss-convert-values: 6.1.0(postcss@8.4.40)
+      postcss-discard-comments: 6.0.2(postcss@8.4.40)
+      postcss-discard-duplicates: 6.0.3(postcss@8.4.40)
+      postcss-discard-empty: 6.0.3(postcss@8.4.40)
+      postcss-discard-overridden: 6.0.2(postcss@8.4.40)
+      postcss-merge-longhand: 6.0.5(postcss@8.4.40)
+      postcss-merge-rules: 6.1.1(postcss@8.4.40)
+      postcss-minify-font-values: 6.1.0(postcss@8.4.40)
+      postcss-minify-gradients: 6.0.3(postcss@8.4.40)
+      postcss-minify-params: 6.1.0(postcss@8.4.40)
+      postcss-minify-selectors: 6.0.4(postcss@8.4.40)
+      postcss-normalize-charset: 6.0.2(postcss@8.4.40)
+      postcss-normalize-display-values: 6.0.2(postcss@8.4.40)
+      postcss-normalize-positions: 6.0.2(postcss@8.4.40)
+      postcss-normalize-repeat-style: 6.0.2(postcss@8.4.40)
+      postcss-normalize-string: 6.0.2(postcss@8.4.40)
+      postcss-normalize-timing-functions: 6.0.2(postcss@8.4.40)
+      postcss-normalize-unicode: 6.1.0(postcss@8.4.40)
+      postcss-normalize-url: 6.0.2(postcss@8.4.40)
+      postcss-normalize-whitespace: 6.0.2(postcss@8.4.40)
+      postcss-ordered-values: 6.0.2(postcss@8.4.40)
+      postcss-reduce-initial: 6.1.0(postcss@8.4.40)
+      postcss-reduce-transforms: 6.0.2(postcss@8.4.40)
+      postcss-svgo: 6.0.3(postcss@8.4.40)
+      postcss-unique-selectors: 6.0.4(postcss@8.4.40)
 
-  cssnano-utils@4.0.2(postcss@8.4.38):
+  cssnano-utils@4.0.2(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
 
-  cssnano@6.1.2(postcss@8.4.38):
+  cssnano@6.1.2(postcss@8.4.40):
     dependencies:
-      cssnano-preset-default: 6.1.2(postcss@8.4.38)
+      cssnano-preset-default: 6.1.2(postcss@8.4.40)
       lilconfig: 3.1.1
-      postcss: 8.4.38
+      postcss: 8.4.40
 
   csso@5.0.5:
     dependencies:
@@ -19064,7 +18664,7 @@ snapshots:
     dependencies:
       uniq: 1.0.1
 
-  cypress@13.13.0:
+  cypress@13.13.1:
     dependencies:
       '@cypress/request': 3.0.0
       '@cypress/xvfb': 1.2.4(supports-color@8.1.1)
@@ -19254,15 +18854,10 @@ snapshots:
 
   detect-indent@6.1.0: {}
 
-  detect-libc@2.0.2:
-    optional: true
-
   detect-libc@2.0.3: {}
 
   detect-newline@3.1.0: {}
 
-  detect-node-es@1.1.0: {}
-
   detect-package-manager@2.0.1:
     dependencies:
       execa: 5.1.1
@@ -19332,13 +18927,6 @@ snapshots:
 
   duplexer@0.1.2: {}
 
-  duplexify@3.7.1:
-    dependencies:
-      end-of-stream: 1.4.4
-      inherits: 2.0.4
-      readable-stream: 2.3.7
-      stream-shift: 1.0.1
-
   eastasianwidth@0.2.0: {}
 
   ecc-jsbn@0.1.2:
@@ -19570,32 +19158,32 @@ snapshots:
       '@esbuild/win32-ia32': 0.21.5
       '@esbuild/win32-x64': 0.21.5
 
-  esbuild@0.22.0:
+  esbuild@0.23.0:
     optionalDependencies:
-      '@esbuild/aix-ppc64': 0.22.0
-      '@esbuild/android-arm': 0.22.0
-      '@esbuild/android-arm64': 0.22.0
-      '@esbuild/android-x64': 0.22.0
-      '@esbuild/darwin-arm64': 0.22.0
-      '@esbuild/darwin-x64': 0.22.0
-      '@esbuild/freebsd-arm64': 0.22.0
-      '@esbuild/freebsd-x64': 0.22.0
-      '@esbuild/linux-arm': 0.22.0
-      '@esbuild/linux-arm64': 0.22.0
-      '@esbuild/linux-ia32': 0.22.0
-      '@esbuild/linux-loong64': 0.22.0
-      '@esbuild/linux-mips64el': 0.22.0
-      '@esbuild/linux-ppc64': 0.22.0
-      '@esbuild/linux-riscv64': 0.22.0
-      '@esbuild/linux-s390x': 0.22.0
-      '@esbuild/linux-x64': 0.22.0
-      '@esbuild/netbsd-x64': 0.22.0
-      '@esbuild/openbsd-arm64': 0.22.0
-      '@esbuild/openbsd-x64': 0.22.0
-      '@esbuild/sunos-x64': 0.22.0
-      '@esbuild/win32-arm64': 0.22.0
-      '@esbuild/win32-ia32': 0.22.0
-      '@esbuild/win32-x64': 0.22.0
+      '@esbuild/aix-ppc64': 0.23.0
+      '@esbuild/android-arm': 0.23.0
+      '@esbuild/android-arm64': 0.23.0
+      '@esbuild/android-x64': 0.23.0
+      '@esbuild/darwin-arm64': 0.23.0
+      '@esbuild/darwin-x64': 0.23.0
+      '@esbuild/freebsd-arm64': 0.23.0
+      '@esbuild/freebsd-x64': 0.23.0
+      '@esbuild/linux-arm': 0.23.0
+      '@esbuild/linux-arm64': 0.23.0
+      '@esbuild/linux-ia32': 0.23.0
+      '@esbuild/linux-loong64': 0.23.0
+      '@esbuild/linux-mips64el': 0.23.0
+      '@esbuild/linux-ppc64': 0.23.0
+      '@esbuild/linux-riscv64': 0.23.0
+      '@esbuild/linux-s390x': 0.23.0
+      '@esbuild/linux-x64': 0.23.0
+      '@esbuild/netbsd-x64': 0.23.0
+      '@esbuild/openbsd-arm64': 0.23.0
+      '@esbuild/openbsd-x64': 0.23.0
+      '@esbuild/sunos-x64': 0.23.0
+      '@esbuild/win32-arm64': 0.23.0
+      '@esbuild/win32-ia32': 0.23.0
+      '@esbuild/win32-x64': 0.23.0
 
   escalade@3.1.1: {}
 
@@ -19638,27 +19226,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.8.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint-import-resolver-node@0.3.9)(eslint@9.6.0):
+  eslint-module-utils@2.8.0(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint@9.8.0):
     dependencies:
       debug: 3.2.7(supports-color@8.1.1)
     optionalDependencies:
-      '@typescript-eslint/parser': 7.15.0(eslint@9.6.0)(typescript@5.5.3)
-      eslint: 9.6.0
+      '@typescript-eslint/parser': 7.17.0(eslint@9.8.0)(typescript@5.5.4)
+      eslint: 9.8.0
       eslint-import-resolver-node: 0.3.9
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.8.0(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint-import-resolver-node@0.3.9)(eslint@9.7.0):
-    dependencies:
-      debug: 3.2.7(supports-color@8.1.1)
-    optionalDependencies:
-      '@typescript-eslint/parser': 7.15.0(eslint@9.7.0)(typescript@5.5.3)
-      eslint: 9.7.0
-      eslint-import-resolver-node: 0.3.9
-    transitivePeerDependencies:
-      - supports-color
-
-  eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint@9.6.0):
+  eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0):
     dependencies:
       array-includes: 3.1.7
       array.prototype.findlastindex: 1.2.3
@@ -19666,9 +19244,9 @@ snapshots:
       array.prototype.flatmap: 1.3.2
       debug: 3.2.7(supports-color@8.1.1)
       doctrine: 2.1.0
-      eslint: 9.6.0
+      eslint: 9.8.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.15.0(eslint@9.6.0)(typescript@5.5.3))(eslint-import-resolver-node@0.3.9)(eslint@9.6.0)
+      eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint@9.8.0)
       hasown: 2.0.0
       is-core-module: 2.13.1
       is-glob: 4.0.3
@@ -19679,49 +19257,22 @@ snapshots:
       semver: 6.3.1
       tsconfig-paths: 3.15.0
     optionalDependencies:
-      '@typescript-eslint/parser': 7.15.0(eslint@9.6.0)(typescript@5.5.3)
+      '@typescript-eslint/parser': 7.17.0(eslint@9.8.0)(typescript@5.5.4)
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint@9.7.0):
+  eslint-plugin-vue@9.27.0(eslint@9.8.0):
     dependencies:
-      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: 9.7.0
-      eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.15.0(eslint@9.7.0)(typescript@5.5.3))(eslint-import-resolver-node@0.3.9)(eslint@9.7.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
-    optionalDependencies:
-      '@typescript-eslint/parser': 7.15.0(eslint@9.7.0)(typescript@5.5.3)
-    transitivePeerDependencies:
-      - eslint-import-resolver-typescript
-      - eslint-import-resolver-webpack
-      - supports-color
-
-  eslint-plugin-vue@9.26.0(eslint@9.7.0):
-    dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@9.7.0)
-      eslint: 9.7.0
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.8.0)
+      eslint: 9.8.0
       globals: 13.24.0
       natural-compare: 1.4.0
       nth-check: 2.1.1
       postcss-selector-parser: 6.0.16
       semver: 7.6.0
-      vue-eslint-parser: 9.4.3(eslint@9.7.0)
+      vue-eslint-parser: 9.4.3(eslint@9.8.0)
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
       - supports-color
@@ -19733,11 +19284,6 @@ snapshots:
       esrecurse: 4.3.0
       estraverse: 5.3.0
 
-  eslint-scope@8.0.1:
-    dependencies:
-      esrecurse: 4.3.0
-      estraverse: 5.3.0
-
   eslint-scope@8.0.2:
     dependencies:
       esrecurse: 4.3.0
@@ -19747,52 +19293,13 @@ snapshots:
 
   eslint-visitor-keys@4.0.0: {}
 
-  eslint@9.6.0:
+  eslint@9.8.0:
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@9.6.0)
-      '@eslint-community/regexpp': 4.10.0
-      '@eslint/config-array': 0.17.0
-      '@eslint/eslintrc': 3.1.0
-      '@eslint/js': 9.6.0
-      '@humanwhocodes/module-importer': 1.0.1
-      '@humanwhocodes/retry': 0.3.0
-      '@nodelib/fs.walk': 1.2.8
-      ajv: 6.12.6
-      chalk: 4.1.2
-      cross-spawn: 7.0.3
-      debug: 4.3.5(supports-color@8.1.1)
-      escape-string-regexp: 4.0.0
-      eslint-scope: 8.0.1
-      eslint-visitor-keys: 4.0.0
-      espree: 10.1.0
-      esquery: 1.5.0
-      esutils: 2.0.3
-      fast-deep-equal: 3.1.3
-      file-entry-cache: 8.0.0
-      find-up: 5.0.0
-      glob-parent: 6.0.2
-      ignore: 5.3.1
-      imurmurhash: 0.1.4
-      is-glob: 4.0.3
-      is-path-inside: 3.0.3
-      json-stable-stringify-without-jsonify: 1.0.1
-      levn: 0.4.1
-      lodash.merge: 4.6.2
-      minimatch: 3.1.2
-      natural-compare: 1.4.0
-      optionator: 0.9.3
-      strip-ansi: 6.0.1
-      text-table: 0.2.0
-    transitivePeerDependencies:
-      - supports-color
-
-  eslint@9.7.0:
-    dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@9.7.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@9.8.0)
       '@eslint-community/regexpp': 4.11.0
-      '@eslint/config-array': 0.17.0
+      '@eslint/config-array': 0.17.1
       '@eslint/eslintrc': 3.1.0
-      '@eslint/js': 9.7.0
+      '@eslint/js': 9.8.0
       '@humanwhocodes/module-importer': 1.0.1
       '@humanwhocodes/retry': 0.3.0
       '@nodelib/fs.walk': 1.2.8
@@ -19827,14 +19334,14 @@ snapshots:
 
   espree@10.1.0:
     dependencies:
-      acorn: 8.12.0
-      acorn-jsx: 5.3.2(acorn@8.12.0)
+      acorn: 8.12.1
+      acorn-jsx: 5.3.2(acorn@8.12.1)
       eslint-visitor-keys: 4.0.0
 
   espree@9.6.1:
     dependencies:
-      acorn: 8.12.0
-      acorn-jsx: 5.3.2(acorn@8.12.0)
+      acorn: 8.12.1
+      acorn-jsx: 5.3.2(acorn@8.12.1)
       eslint-visitor-keys: 3.4.3
 
   esprima@4.0.1: {}
@@ -19843,10 +19350,6 @@ snapshots:
     dependencies:
       estraverse: 5.3.0
 
-  esquery@1.5.0:
-    dependencies:
-      estraverse: 5.3.0
-
   esquery@1.6.0:
     dependencies:
       estraverse: 5.3.0
@@ -19928,7 +19431,7 @@ snapshots:
       human-signals: 3.0.1
       is-stream: 3.0.0
       merge-stream: 2.0.0
-      npm-run-path: 5.1.0
+      npm-run-path: 5.3.0
       onetime: 6.0.0
       signal-exit: 3.0.7
       strip-final-newline: 3.0.0
@@ -19945,7 +19448,7 @@ snapshots:
       signal-exit: 4.1.0
       strip-final-newline: 3.0.0
 
-  execa@9.2.0:
+  execa@9.3.0:
     dependencies:
       '@sindresorhus/merge-streams': 4.0.0
       cross-spawn: 7.0.3
@@ -20056,8 +19559,8 @@ snapshots:
   fast-json-stringify@5.8.0:
     dependencies:
       '@fastify/deepmerge': 1.3.0
-      ajv: 8.16.0
-      ajv-formats: 2.1.1(ajv@8.16.0)
+      ajv: 8.17.1
+      ajv-formats: 2.1.1(ajv@8.17.1)
       fast-deep-equal: 3.1.3
       fast-uri: 2.2.0
       rfdc: 1.3.0
@@ -20074,6 +19577,8 @@ snapshots:
 
   fast-uri@2.2.0: {}
 
+  fast-uri@3.0.1: {}
+
   fast-xml-parser@4.2.5:
     dependencies:
       strnum: 1.0.5
@@ -20115,6 +19620,10 @@ snapshots:
     dependencies:
       bser: 2.1.1
 
+  fd-package-json@1.2.0:
+    dependencies:
+      walk-up-path: 3.0.1
+
   fd-slicer@1.1.0:
     dependencies:
       pend: 1.2.0
@@ -20153,11 +19662,11 @@ snapshots:
       strtok3: 7.0.0
       token-types: 5.0.1
 
-  file-type@19.0.0:
+  file-type@19.3.0:
     dependencies:
-      readable-web-to-node-stream: 3.0.2
-      strtok3: 7.0.0
-      token-types: 5.0.1
+      strtok3: 8.0.1
+      token-types: 6.0.0
+      uint8array-extras: 1.4.0
 
   filelist@1.0.4:
     dependencies:
@@ -20293,8 +19802,6 @@ snapshots:
 
   from@0.1.7: {}
 
-  fs-constants@1.0.0: {}
-
   fs-extra@11.1.1:
     dependencies:
       graceful-fs: 4.2.11
@@ -20320,6 +19827,11 @@ snapshots:
       jsonfile: 6.1.0
       universalify: 2.0.0
 
+  fs-minipass@1.2.7:
+    dependencies:
+      minipass: 2.9.0
+    optional: true
+
   fs-minipass@2.1.0:
     dependencies:
       minipass: 3.3.6
@@ -20370,10 +19882,6 @@ snapshots:
       has-proto: 1.0.1
       has-symbols: 1.0.3
 
-  get-nonce@1.0.1: {}
-
-  get-npm-tarball-url@2.0.3: {}
-
   get-package-type@0.1.0: {}
 
   get-pixels-frame-info-update@3.3.2:
@@ -20463,14 +19971,6 @@ snapshots:
       minipass: 7.0.4
       path-scurry: 1.10.1
 
-  glob@10.3.12:
-    dependencies:
-      foreground-child: 3.1.1
-      jackspeak: 2.3.6
-      minimatch: 9.0.3
-      minipass: 7.0.4
-      path-scurry: 1.10.2
-
   glob@10.4.2:
     dependencies:
       foreground-child: 3.1.1
@@ -20480,6 +19980,15 @@ snapshots:
       package-json-from-dist: 1.0.0
       path-scurry: 1.11.1
 
+  glob@11.0.0:
+    dependencies:
+      foreground-child: 3.1.1
+      jackspeak: 4.0.1
+      minimatch: 10.0.1
+      minipass: 7.1.2
+      package-json-from-dist: 1.0.0
+      path-scurry: 2.0.0
+
   glob@7.2.3:
     dependencies:
       fs.realpath: 1.0.0
@@ -20509,7 +20018,7 @@ snapshots:
 
   globals@14.0.0: {}
 
-  globals@15.7.0: {}
+  globals@15.8.0: {}
 
   globalthis@1.0.3:
     dependencies:
@@ -20568,15 +20077,14 @@ snapshots:
       p-cancelable: 3.0.0
       responselike: 3.0.0
 
-  got@14.4.1:
+  got@14.4.2:
     dependencies:
-      '@sindresorhus/is': 6.3.1
+      '@sindresorhus/is': 7.0.0
       '@szmarczak/http-timer': 5.0.1
       cacheable-lookup: 7.0.0
       cacheable-request: 12.0.1
       decompress-response: 6.0.0
       form-data-encoder: 4.0.2
-      get-stream: 8.0.1
       http2-wrapper: 2.2.1
       lowercase-keys: 3.0.0
       p-cancelable: 4.0.1
@@ -20591,15 +20099,6 @@ snapshots:
 
   graphql@16.8.1: {}
 
-  gunzip-maybe@1.4.2:
-    dependencies:
-      browserify-zlib: 0.1.4
-      is-deflate: 1.0.0
-      is-gzip: 1.0.0
-      peek-stream: 1.1.3
-      pumpify: 1.5.1
-      through2: 2.0.5
-
   hammerjs@2.0.8: {}
 
   handlebars@4.7.7:
@@ -20721,17 +20220,10 @@ snapshots:
 
   http-link-header@1.1.3: {}
 
-  http-proxy-agent@7.0.0:
-    dependencies:
-      agent-base: 7.1.0
-      debug: 4.3.5(supports-color@8.1.1)
-    transitivePeerDependencies:
-      - supports-color
-
   http-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -20784,7 +20276,14 @@ snapshots:
   https-proxy-agent@7.0.4:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
+    transitivePeerDependencies:
+      - supports-color
+
+  https-proxy-agent@7.0.5:
+    dependencies:
+      agent-base: 7.1.0
+      debug: 4.3.5(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -20812,9 +20311,9 @@ snapshots:
 
   ignore-by-default@1.0.1: {}
 
-  ignore-walk@6.0.4:
+  ignore-walk@6.0.5:
     dependencies:
-      minimatch: 9.0.3
+      minimatch: 9.0.4
 
   ignore@5.2.4: {}
 
@@ -20827,21 +20326,21 @@ snapshots:
       parent-module: 1.0.1
       resolve-from: 4.0.0
 
-  import-in-the-middle@1.4.2:
+  import-in-the-middle@1.10.0:
     dependencies:
-      acorn: 8.12.0
-      acorn-import-assertions: 1.9.0(acorn@8.12.0)
+      acorn: 8.12.1
+      acorn-import-attributes: 1.9.5(acorn@8.12.1)
+      cjs-module-lexer: 1.2.2
+      module-details-from-path: 1.0.3
+
+  import-in-the-middle@1.7.1:
+    dependencies:
+      acorn: 8.12.1
+      acorn-import-assertions: 1.9.0(acorn@8.12.1)
       cjs-module-lexer: 1.2.2
       module-details-from-path: 1.0.3
     optional: true
 
-  import-in-the-middle@1.8.1:
-    dependencies:
-      acorn: 8.12.0
-      acorn-import-attributes: 1.9.5(acorn@8.12.0)
-      cjs-module-lexer: 1.2.2
-      module-details-from-path: 1.0.3
-
   import-lazy@4.0.0: {}
 
   import-local@3.1.0:
@@ -20878,10 +20377,6 @@ snapshots:
 
   intersection-observer@0.12.2: {}
 
-  invariant@2.2.4:
-    dependencies:
-      loose-envify: 1.4.0
-
   ioredis@5.4.1:
     dependencies:
       '@ioredis/commands': 1.2.0
@@ -20963,8 +20458,6 @@ snapshots:
     dependencies:
       has-tostringtag: 1.0.0
 
-  is-deflate@1.0.0: {}
-
   is-docker@2.2.1: {}
 
   is-expression@4.0.0:
@@ -20988,8 +20481,6 @@ snapshots:
     dependencies:
       is-extglob: 2.1.1
 
-  is-gzip@1.0.0: {}
-
   is-installed-globally@0.4.0:
     dependencies:
       global-dirs: 3.0.1
@@ -21173,6 +20664,12 @@ snapshots:
     optionalDependencies:
       '@pkgjs/parseargs': 0.11.0
 
+  jackspeak@4.0.1:
+    dependencies:
+      '@isaacs/cliui': 8.0.2
+    optionalDependencies:
+      '@pkgjs/parseargs': 0.11.0
+
   jake@10.8.5:
     dependencies:
       async: 3.2.4
@@ -21192,7 +20689,7 @@ snapshots:
       '@jest/expect': 29.7.0
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       chalk: 4.1.2
       co: 4.6.0
       dedent: 1.3.0
@@ -21212,16 +20709,16 @@ snapshots:
       - babel-plugin-macros
       - supports-color
 
-  jest-cli@29.7.0(@types/node@20.14.9):
+  jest-cli@29.7.0(@types/node@20.14.12):
     dependencies:
       '@jest/core': 29.7.0
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
       chalk: 4.1.2
-      create-jest: 29.7.0(@types/node@20.14.9)
+      create-jest: 29.7.0(@types/node@20.14.12)
       exit: 0.1.2
       import-local: 3.1.0
-      jest-config: 29.7.0(@types/node@20.14.9)
+      jest-config: 29.7.0(@types/node@20.14.12)
       jest-util: 29.7.0
       jest-validate: 29.7.0
       yargs: 17.7.2
@@ -21231,7 +20728,7 @@ snapshots:
       - supports-color
       - ts-node
 
-  jest-config@29.7.0(@types/node@20.14.9):
+  jest-config@29.7.0(@types/node@20.14.12):
     dependencies:
       '@babel/core': 7.23.5
       '@jest/test-sequencer': 29.7.0
@@ -21256,7 +20753,7 @@ snapshots:
       slash: 3.0.0
       strip-json-comments: 3.1.1
     optionalDependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
     transitivePeerDependencies:
       - babel-plugin-macros
       - supports-color
@@ -21285,7 +20782,7 @@ snapshots:
       '@jest/environment': 29.7.0
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       jest-mock: 29.7.0
       jest-util: 29.7.0
 
@@ -21302,7 +20799,7 @@ snapshots:
     dependencies:
       '@jest/types': 29.6.3
       '@types/graceful-fs': 4.1.6
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.11
@@ -21341,7 +20838,7 @@ snapshots:
   jest-mock@29.7.0:
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       jest-util: 29.7.0
 
   jest-pnp-resolver@1.2.3(jest-resolve@29.7.0):
@@ -21376,7 +20873,7 @@ snapshots:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       chalk: 4.1.2
       emittery: 0.13.1
       graceful-fs: 4.2.11
@@ -21404,7 +20901,7 @@ snapshots:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       chalk: 4.1.2
       cjs-module-lexer: 1.2.2
       collect-v8-coverage: 1.0.1
@@ -21450,7 +20947,7 @@ snapshots:
   jest-util@29.7.0:
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       chalk: 4.1.2
       ci-info: 3.7.1
       graceful-fs: 4.2.11
@@ -21469,7 +20966,7 @@ snapshots:
     dependencies:
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.13.1
@@ -21483,17 +20980,17 @@ snapshots:
 
   jest-worker@29.7.0:
     dependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       jest-util: 29.7.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
-  jest@29.7.0(@types/node@20.14.9):
+  jest@29.7.0(@types/node@20.14.12):
     dependencies:
       '@jest/core': 29.7.0
       '@jest/types': 29.6.3
       import-local: 3.1.0
-      jest-cli: 29.7.0(@types/node@20.14.9)
+      jest-cli: 29.7.0(@types/node@20.14.12)
     transitivePeerDependencies:
       - '@types/node'
       - babel-plugin-macros
@@ -21567,7 +21064,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4):
+  jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3):
     dependencies:
       cssstyle: 4.0.1
       data-urls: 5.0.0
@@ -21575,9 +21072,9 @@ snapshots:
       form-data: 4.0.0
       html-encoding-sniffer: 4.0.0
       http-proxy-agent: 7.0.2
-      https-proxy-agent: 7.0.4
+      https-proxy-agent: 7.0.5
       is-potential-custom-element-name: 1.0.1
-      nwsapi: 2.2.10
+      nwsapi: 2.2.12
       parse5: 7.1.2
       rrweb-cssom: 0.7.1
       saxes: 6.0.0
@@ -21588,13 +21085,42 @@ snapshots:
       whatwg-encoding: 3.1.1
       whatwg-mimetype: 4.0.0
       whatwg-url: 14.0.0
-      ws: 8.17.1(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+      ws: 8.18.0(bufferutil@4.0.7)(utf-8-validate@6.0.3)
       xml-name-validator: 5.0.0
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
 
+  jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4):
+    dependencies:
+      cssstyle: 4.0.1
+      data-urls: 5.0.0
+      decimal.js: 10.4.3
+      form-data: 4.0.0
+      html-encoding-sniffer: 4.0.0
+      http-proxy-agent: 7.0.2
+      https-proxy-agent: 7.0.5
+      is-potential-custom-element-name: 1.0.1
+      nwsapi: 2.2.12
+      parse5: 7.1.2
+      rrweb-cssom: 0.7.1
+      saxes: 6.0.0
+      symbol-tree: 3.2.4
+      tough-cookie: 4.1.4
+      w3c-xmlserializer: 5.0.0
+      webidl-conversions: 7.0.0
+      whatwg-encoding: 3.1.1
+      whatwg-mimetype: 4.0.0
+      whatwg-url: 14.0.0
+      ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+      xml-name-validator: 5.0.0
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+    optional: true
+
   jsesc@0.5.0: {}
 
   jsesc@2.5.2: {}
@@ -21817,6 +21343,8 @@ snapshots:
 
   lru-cache@10.2.2: {}
 
+  lru-cache@11.0.0: {}
+
   lru-cache@4.1.5:
     dependencies:
       pseudomap: 1.0.2
@@ -21895,7 +21423,7 @@ snapshots:
 
   markdown-table@3.0.3: {}
 
-  markdown-to-jsx@7.3.2(react@18.3.1):
+  markdown-to-jsx@7.4.7(react@18.3.1):
     dependencies:
       react: 18.3.1
 
@@ -22269,6 +21797,10 @@ snapshots:
 
   minimalistic-assert@1.0.1: {}
 
+  minimatch@10.0.1:
+    dependencies:
+      brace-expansion: 2.0.1
+
   minimatch@3.0.8:
     dependencies:
       brace-expansion: 1.1.11
@@ -22325,6 +21857,12 @@ snapshots:
     dependencies:
       minipass: 3.3.6
 
+  minipass@2.9.0:
+    dependencies:
+      safe-buffer: 5.2.1
+      yallist: 3.1.1
+    optional: true
+
   minipass@3.3.6:
     dependencies:
       yallist: 4.0.0
@@ -22335,13 +21873,16 @@ snapshots:
 
   minipass@7.1.2: {}
 
+  minizlib@1.3.3:
+    dependencies:
+      minipass: 2.9.0
+    optional: true
+
   minizlib@2.1.2:
     dependencies:
       minipass: 3.3.6
       yallist: 4.0.0
 
-  mkdirp-classic@0.5.3: {}
-
   mkdirp@0.5.6:
     dependencies:
       minimist: 1.2.8
@@ -22352,7 +21893,7 @@ snapshots:
 
   mlly@1.5.0:
     dependencies:
-      acorn: 8.12.0
+      acorn: 8.12.1
       pathe: 1.1.2
       pkg-types: 1.0.3
       ufo: 1.3.2
@@ -22391,17 +21932,17 @@ snapshots:
     optionalDependencies:
       msgpackr-extract: 3.0.2
 
-  msw-storybook-addon@2.0.2(msw@2.3.1(typescript@5.5.3)):
+  msw-storybook-addon@2.0.3(msw@2.3.4(typescript@5.5.4)):
     dependencies:
       is-node-process: 1.2.0
-      msw: 2.3.1(typescript@5.5.3)
+      msw: 2.3.4(typescript@5.5.4)
 
-  msw@2.3.1(typescript@5.5.3):
+  msw@2.3.4(typescript@5.5.4):
     dependencies:
       '@bundled-es-modules/cookie': 2.0.0
       '@bundled-es-modules/statuses': 1.0.1
+      '@bundled-es-modules/tough-cookie': 0.1.6
       '@inquirer/confirm': 3.1.6
-      '@mswjs/cookies': 1.1.0
       '@mswjs/interceptors': 0.29.1
       '@open-draft/until': 2.1.0
       '@types/cookie': 0.6.0
@@ -22413,10 +21954,10 @@ snapshots:
       outvariant: 1.4.2
       path-to-regexp: 6.2.1
       strict-event-emitter: 0.5.1
-      type-fest: 4.9.0
+      type-fest: 4.20.1
       yargs: 17.7.2
     optionalDependencies:
-      typescript: 5.5.3
+      typescript: 5.5.4
 
   muggle-string@0.4.1: {}
 
@@ -22520,12 +22061,6 @@ snapshots:
 
   node-fetch-native@1.0.2: {}
 
-  node-fetch@2.6.11(encoding@0.1.13):
-    dependencies:
-      whatwg-url: 5.0.0
-    optionalDependencies:
-      encoding: 0.1.13
-
   node-fetch@2.6.13(encoding@0.1.13):
     dependencies:
       whatwg-url: 5.0.0
@@ -22554,7 +22089,7 @@ snapshots:
     dependencies:
       env-paths: 2.2.1
       exponential-backoff: 3.1.1
-      glob: 10.4.2
+      glob: 10.3.10
       graceful-fs: 4.2.11
       make-fetch-happen: 13.0.0
       nopt: 7.2.0
@@ -22662,16 +22197,16 @@ snapshots:
       set-blocking: 2.0.0
     optional: true
 
-  nsfwjs@2.4.2(@tensorflow/tfjs@4.20.0(encoding@0.1.13)(seedrandom@3.0.5)):
+  nsfwjs@2.4.2(@tensorflow/tfjs@4.4.0(encoding@0.1.13)(seedrandom@3.0.5)):
     dependencies:
       '@nsfw-filter/gif-frames': 1.0.2
-      '@tensorflow/tfjs': 4.20.0(encoding@0.1.13)(seedrandom@3.0.5)
+      '@tensorflow/tfjs': 4.4.0(encoding@0.1.13)(seedrandom@3.0.5)
 
   nth-check@2.1.1:
     dependencies:
       boolbase: 1.0.0
 
-  nwsapi@2.2.10: {}
+  nwsapi@2.2.12: {}
 
   oauth-sign@0.9.0: {}
 
@@ -22769,24 +22304,15 @@ snapshots:
       undici: 5.28.2
       yargs-parser: 21.1.1
 
-  opentelemetry-instrumentation-fetch-node@1.2.0:
+  opentelemetry-instrumentation-fetch-node@1.2.3(@opentelemetry/api@1.9.0):
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.43.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.46.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.25.1
     transitivePeerDependencies:
       - supports-color
     optional: true
 
-  optionator@0.9.3:
-    dependencies:
-      '@aashutoshrathi/word-wrap': 1.2.6
-      deep-is: 0.1.4
-      fast-levenshtein: 2.0.6
-      levn: 0.4.1
-      prelude-ls: 1.2.1
-      type-check: 0.4.0
-
   optionator@0.9.4:
     dependencies:
       deep-is: 0.1.4
@@ -22871,8 +22397,6 @@ snapshots:
 
   package-json-from-dist@1.0.0: {}
 
-  pako@0.2.9: {}
-
   parent-module@1.0.1:
     dependencies:
       callsites: 3.1.0
@@ -22883,7 +22407,7 @@ snapshots:
 
   parse-json@5.2.0:
     dependencies:
-      '@babel/code-frame': 7.23.5
+      '@babel/code-frame': 7.24.7
       error-ex: 1.3.2
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
@@ -22932,16 +22456,16 @@ snapshots:
       lru-cache: 10.0.2
       minipass: 7.0.4
 
-  path-scurry@1.10.2:
-    dependencies:
-      lru-cache: 10.2.2
-      minipass: 7.0.4
-
   path-scurry@1.11.1:
     dependencies:
       lru-cache: 10.2.2
       minipass: 7.1.2
 
+  path-scurry@2.0.0:
+    dependencies:
+      lru-cache: 11.0.0
+      minipass: 7.1.2
+
   path-to-regexp@0.1.7: {}
 
   path-to-regexp@1.8.0:
@@ -22966,11 +22490,7 @@ snapshots:
 
   peek-readable@5.0.0: {}
 
-  peek-stream@1.1.3:
-    dependencies:
-      buffer-from: 1.1.2
-      duplexify: 3.7.1
-      through2: 2.0.5
+  peek-readable@5.1.3: {}
 
   pend@1.2.0: {}
 
@@ -23027,6 +22547,8 @@ snapshots:
 
   picocolors@1.0.0: {}
 
+  picocolors@1.0.1: {}
+
   picomatch@2.3.1: {}
 
   pid-port@1.0.0:
@@ -23102,140 +22624,140 @@ snapshots:
     dependencies:
       '@babel/runtime': 7.23.4
 
-  postcss-calc@9.0.1(postcss@8.4.38):
+  postcss-calc@9.0.1(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
       postcss-selector-parser: 6.0.15
       postcss-value-parser: 4.2.0
 
-  postcss-colormin@6.1.0(postcss@8.4.38):
+  postcss-colormin@6.1.0(postcss@8.4.40):
     dependencies:
       browserslist: 4.23.0
       caniuse-api: 3.0.0
       colord: 2.9.3
-      postcss: 8.4.38
+      postcss: 8.4.40
       postcss-value-parser: 4.2.0
 
-  postcss-convert-values@6.1.0(postcss@8.4.38):
+  postcss-convert-values@6.1.0(postcss@8.4.40):
     dependencies:
       browserslist: 4.23.0
-      postcss: 8.4.38
+      postcss: 8.4.40
       postcss-value-parser: 4.2.0
 
-  postcss-discard-comments@6.0.2(postcss@8.4.38):
+  postcss-discard-comments@6.0.2(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
 
-  postcss-discard-duplicates@6.0.3(postcss@8.4.38):
+  postcss-discard-duplicates@6.0.3(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
 
-  postcss-discard-empty@6.0.3(postcss@8.4.38):
+  postcss-discard-empty@6.0.3(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
 
-  postcss-discard-overridden@6.0.2(postcss@8.4.38):
+  postcss-discard-overridden@6.0.2(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
 
-  postcss-merge-longhand@6.0.5(postcss@8.4.38):
+  postcss-merge-longhand@6.0.5(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
       postcss-value-parser: 4.2.0
-      stylehacks: 6.1.1(postcss@8.4.38)
+      stylehacks: 6.1.1(postcss@8.4.40)
 
-  postcss-merge-rules@6.1.1(postcss@8.4.38):
+  postcss-merge-rules@6.1.1(postcss@8.4.40):
     dependencies:
       browserslist: 4.23.0
       caniuse-api: 3.0.0
-      cssnano-utils: 4.0.2(postcss@8.4.38)
-      postcss: 8.4.38
+      cssnano-utils: 4.0.2(postcss@8.4.40)
+      postcss: 8.4.40
       postcss-selector-parser: 6.0.16
 
-  postcss-minify-font-values@6.1.0(postcss@8.4.38):
+  postcss-minify-font-values@6.1.0(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
       postcss-value-parser: 4.2.0
 
-  postcss-minify-gradients@6.0.3(postcss@8.4.38):
+  postcss-minify-gradients@6.0.3(postcss@8.4.40):
     dependencies:
       colord: 2.9.3
-      cssnano-utils: 4.0.2(postcss@8.4.38)
-      postcss: 8.4.38
+      cssnano-utils: 4.0.2(postcss@8.4.40)
+      postcss: 8.4.40
       postcss-value-parser: 4.2.0
 
-  postcss-minify-params@6.1.0(postcss@8.4.38):
+  postcss-minify-params@6.1.0(postcss@8.4.40):
     dependencies:
       browserslist: 4.23.0
-      cssnano-utils: 4.0.2(postcss@8.4.38)
-      postcss: 8.4.38
+      cssnano-utils: 4.0.2(postcss@8.4.40)
+      postcss: 8.4.40
       postcss-value-parser: 4.2.0
 
-  postcss-minify-selectors@6.0.4(postcss@8.4.38):
+  postcss-minify-selectors@6.0.4(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
       postcss-selector-parser: 6.0.16
 
-  postcss-normalize-charset@6.0.2(postcss@8.4.38):
+  postcss-normalize-charset@6.0.2(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
 
-  postcss-normalize-display-values@6.0.2(postcss@8.4.38):
+  postcss-normalize-display-values@6.0.2(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
       postcss-value-parser: 4.2.0
 
-  postcss-normalize-positions@6.0.2(postcss@8.4.38):
+  postcss-normalize-positions@6.0.2(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
       postcss-value-parser: 4.2.0
 
-  postcss-normalize-repeat-style@6.0.2(postcss@8.4.38):
+  postcss-normalize-repeat-style@6.0.2(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
       postcss-value-parser: 4.2.0
 
-  postcss-normalize-string@6.0.2(postcss@8.4.38):
+  postcss-normalize-string@6.0.2(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
       postcss-value-parser: 4.2.0
 
-  postcss-normalize-timing-functions@6.0.2(postcss@8.4.38):
+  postcss-normalize-timing-functions@6.0.2(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
       postcss-value-parser: 4.2.0
 
-  postcss-normalize-unicode@6.1.0(postcss@8.4.38):
+  postcss-normalize-unicode@6.1.0(postcss@8.4.40):
     dependencies:
       browserslist: 4.23.0
-      postcss: 8.4.38
+      postcss: 8.4.40
       postcss-value-parser: 4.2.0
 
-  postcss-normalize-url@6.0.2(postcss@8.4.38):
+  postcss-normalize-url@6.0.2(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
       postcss-value-parser: 4.2.0
 
-  postcss-normalize-whitespace@6.0.2(postcss@8.4.38):
+  postcss-normalize-whitespace@6.0.2(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
       postcss-value-parser: 4.2.0
 
-  postcss-ordered-values@6.0.2(postcss@8.4.38):
+  postcss-ordered-values@6.0.2(postcss@8.4.40):
     dependencies:
-      cssnano-utils: 4.0.2(postcss@8.4.38)
-      postcss: 8.4.38
+      cssnano-utils: 4.0.2(postcss@8.4.40)
+      postcss: 8.4.40
       postcss-value-parser: 4.2.0
 
-  postcss-reduce-initial@6.1.0(postcss@8.4.38):
+  postcss-reduce-initial@6.1.0(postcss@8.4.40):
     dependencies:
       browserslist: 4.23.0
       caniuse-api: 3.0.0
-      postcss: 8.4.38
+      postcss: 8.4.40
 
-  postcss-reduce-transforms@6.0.2(postcss@8.4.38):
+  postcss-reduce-transforms@6.0.2(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
       postcss-value-parser: 4.2.0
 
   postcss-selector-parser@6.0.15:
@@ -23248,15 +22770,15 @@ snapshots:
       cssesc: 3.0.0
       util-deprecate: 1.0.2
 
-  postcss-svgo@6.0.3(postcss@8.4.38):
+  postcss-svgo@6.0.3(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
       postcss-value-parser: 4.2.0
       svgo: 3.2.0
 
-  postcss-unique-selectors@6.0.4(postcss@8.4.38):
+  postcss-unique-selectors@6.0.4(postcss@8.4.40):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.40
       postcss-selector-parser: 6.0.16
 
   postcss-value-parser@4.2.0: {}
@@ -23267,6 +22789,12 @@ snapshots:
       picocolors: 1.0.0
       source-map-js: 1.2.0
 
+  postcss@8.4.40:
+    dependencies:
+      nanoid: 3.3.7
+      picocolors: 1.0.1
+      source-map-js: 1.2.0
+
   postgres-array@2.0.0: {}
 
   postgres-array@3.0.2: {}
@@ -23291,7 +22819,7 @@ snapshots:
 
   prelude-ls@1.2.1: {}
 
-  prettier@3.3.2: {}
+  prettier@3.3.3: {}
 
   pretty-bytes@5.6.0: {}
 
@@ -23461,29 +22989,18 @@ snapshots:
       pug-runtime: 3.0.1
       pug-strip-comments: 2.0.0
 
-  pump@2.0.1:
-    dependencies:
-      end-of-stream: 1.4.4
-      once: 1.4.0
-
   pump@3.0.0:
     dependencies:
       end-of-stream: 1.4.4
       once: 1.4.0
 
-  pumpify@1.5.1:
-    dependencies:
-      duplexify: 3.7.1
-      inherits: 2.0.4
-      pump: 2.0.1
-
   punycode@2.3.1: {}
 
   pure-rand@6.0.0: {}
 
   pvtsutils@1.3.5:
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   pvutils@1.1.3: {}
 
@@ -23556,9 +23073,9 @@ snapshots:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
 
-  react-docgen-typescript@2.2.2(typescript@5.5.3):
+  react-docgen-typescript@2.2.2(typescript@5.5.4):
     dependencies:
-      typescript: 5.5.3
+      typescript: 5.5.4
 
   react-docgen@7.0.1:
     dependencies:
@@ -23597,34 +23114,6 @@ snapshots:
 
   react-is@18.2.0: {}
 
-  react-remove-scroll-bar@2.3.6(@types/react@18.0.28)(react@18.3.1):
-    dependencies:
-      react: 18.3.1
-      react-style-singleton: 2.2.1(@types/react@18.0.28)(react@18.3.1)
-      tslib: 2.6.2
-    optionalDependencies:
-      '@types/react': 18.0.28
-
-  react-remove-scroll@2.5.7(@types/react@18.0.28)(react@18.3.1):
-    dependencies:
-      react: 18.3.1
-      react-remove-scroll-bar: 2.3.6(@types/react@18.0.28)(react@18.3.1)
-      react-style-singleton: 2.2.1(@types/react@18.0.28)(react@18.3.1)
-      tslib: 2.6.2
-      use-callback-ref: 1.3.2(@types/react@18.0.28)(react@18.3.1)
-      use-sidecar: 1.1.2(@types/react@18.0.28)(react@18.3.1)
-    optionalDependencies:
-      '@types/react': 18.0.28
-
-  react-style-singleton@2.2.1(@types/react@18.0.28)(react@18.3.1):
-    dependencies:
-      get-nonce: 1.0.1
-      invariant: 2.2.4
-      react: 18.3.1
-      tslib: 2.6.2
-    optionalDependencies:
-      '@types/react': 18.0.28
-
   react@18.3.1:
     dependencies:
       loose-envify: 1.4.0
@@ -23692,7 +23181,7 @@ snapshots:
       esprima: 4.0.1
       source-map: 0.6.1
       tiny-invariant: 1.3.3
-      tslib: 2.6.2
+      tslib: 2.6.3
 
   reconnecting-websocket@4.4.0: {}
 
@@ -23895,26 +23384,26 @@ snapshots:
       glob: 7.2.3
     optional: true
 
-  rollup@4.18.0:
+  rollup@4.19.1:
     dependencies:
       '@types/estree': 1.0.5
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.18.0
-      '@rollup/rollup-android-arm64': 4.18.0
-      '@rollup/rollup-darwin-arm64': 4.18.0
-      '@rollup/rollup-darwin-x64': 4.18.0
-      '@rollup/rollup-linux-arm-gnueabihf': 4.18.0
-      '@rollup/rollup-linux-arm-musleabihf': 4.18.0
-      '@rollup/rollup-linux-arm64-gnu': 4.18.0
-      '@rollup/rollup-linux-arm64-musl': 4.18.0
-      '@rollup/rollup-linux-powerpc64le-gnu': 4.18.0
-      '@rollup/rollup-linux-riscv64-gnu': 4.18.0
-      '@rollup/rollup-linux-s390x-gnu': 4.18.0
-      '@rollup/rollup-linux-x64-gnu': 4.18.0
-      '@rollup/rollup-linux-x64-musl': 4.18.0
-      '@rollup/rollup-win32-arm64-msvc': 4.18.0
-      '@rollup/rollup-win32-ia32-msvc': 4.18.0
-      '@rollup/rollup-win32-x64-msvc': 4.18.0
+      '@rollup/rollup-android-arm-eabi': 4.19.1
+      '@rollup/rollup-android-arm64': 4.19.1
+      '@rollup/rollup-darwin-arm64': 4.19.1
+      '@rollup/rollup-darwin-x64': 4.19.1
+      '@rollup/rollup-linux-arm-gnueabihf': 4.19.1
+      '@rollup/rollup-linux-arm-musleabihf': 4.19.1
+      '@rollup/rollup-linux-arm64-gnu': 4.19.1
+      '@rollup/rollup-linux-arm64-musl': 4.19.1
+      '@rollup/rollup-linux-powerpc64le-gnu': 4.19.1
+      '@rollup/rollup-linux-riscv64-gnu': 4.19.1
+      '@rollup/rollup-linux-s390x-gnu': 4.19.1
+      '@rollup/rollup-linux-x64-gnu': 4.19.1
+      '@rollup/rollup-linux-x64-musl': 4.19.1
+      '@rollup/rollup-win32-arm64-msvc': 4.19.1
+      '@rollup/rollup-win32-ia32-msvc': 4.19.1
+      '@rollup/rollup-win32-x64-msvc': 4.19.1
       fsevents: 2.3.3
 
   rrweb-cssom@0.6.0: {}
@@ -23968,7 +23457,7 @@ snapshots:
       parse-srcset: 1.0.2
       postcss: 8.4.38
 
-  sass@1.77.6:
+  sass@1.77.8:
     dependencies:
       chokidar: 3.5.3
       immutable: 4.2.2
@@ -24088,9 +23577,10 @@ snapshots:
 
   shebang-regex@3.0.0: {}
 
-  shiki@1.10.0:
+  shiki@1.12.0:
     dependencies:
-      '@shikijs/core': 1.10.0
+      '@shikijs/core': 1.12.0
+      '@types/hast': 3.0.4
 
   shimmer@1.2.1: {}
 
@@ -24106,11 +23596,11 @@ snapshots:
 
   signal-exit@4.1.0: {}
 
-  simple-oauth2@5.0.1:
+  simple-oauth2@5.1.0:
     dependencies:
       '@hapi/hoek': 11.0.4
       '@hapi/wreck': 18.0.1
-      debug: 4.3.4(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
       joi: 17.11.0
     transitivePeerDependencies:
       - supports-color
@@ -24325,28 +23815,52 @@ snapshots:
 
   store2@2.14.2: {}
 
-  storybook-addon-misskey-theme@https://codeload.github.com/misskey-dev/storybook-addon-misskey-theme/tar.gz/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/components@8.1.11(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/core-events@8.1.11)(@storybook/manager-api@8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/preview-api@8.1.11)(@storybook/theming@8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@storybook/types@8.1.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+  storybook-addon-misskey-theme@https://codeload.github.com/misskey-dev/storybook-addon-misskey-theme/tar.gz/cf583db098365b2ccc81a82f63ca9c93bc32b640(3rvqj7p7l43ansgshs3zbslm7u):
     dependencies:
-      '@storybook/blocks': 8.1.11(@types/react@18.0.28)(encoding@0.1.13)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/components': 8.1.11(@types/react@18.0.28)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/core-events': 8.1.11
-      '@storybook/manager-api': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/preview-api': 8.1.11
-      '@storybook/theming': 8.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@storybook/types': 8.1.11
+      '@storybook/blocks': 8.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/components': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/core-events': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/manager-api': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/preview-api': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/theming': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
+      '@storybook/types': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
     optionalDependencies:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
 
-  storybook@8.1.11(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4):
+  storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4):
     dependencies:
-      '@storybook/cli': 8.1.11(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)
+      '@babel/core': 7.24.7
+      '@babel/types': 7.24.7
+      '@storybook/codemod': 8.2.6(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+      '@storybook/core': 8.2.6(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+      '@types/semver': 7.5.8
+      '@yarnpkg/fslib': 2.10.3
+      '@yarnpkg/libzip': 2.3.0
+      chalk: 4.1.2
+      commander: 6.2.1
+      cross-spawn: 7.0.3
+      detect-indent: 6.1.0
+      envinfo: 7.8.1
+      execa: 5.1.1
+      fd-package-json: 1.2.0
+      find-up: 5.0.0
+      fs-extra: 11.1.1
+      giget: 1.1.2
+      globby: 14.0.1
+      jscodeshift: 0.15.1(@babel/preset-env@7.24.7(@babel/core@7.24.7))
+      leven: 3.1.0
+      ora: 5.4.1
+      prettier: 3.3.3
+      prompts: 2.4.2
+      semver: 7.6.0
+      strip-json-comments: 3.1.1
+      tempy: 3.1.0
+      tiny-invariant: 1.3.3
+      ts-dedent: 2.2.0
     transitivePeerDependencies:
       - '@babel/preset-env'
       - bufferutil
-      - encoding
-      - react
-      - react-dom
       - supports-color
       - utf-8-validate
 
@@ -24365,8 +23879,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  stream-shift@1.0.1: {}
-
   stream-wormhole@1.1.0: {}
 
   streamsearch@1.1.0: {}
@@ -24474,10 +23986,15 @@ snapshots:
       '@tokenizer/token': 0.3.0
       peek-readable: 5.0.0
 
-  stylehacks@6.1.1(postcss@8.4.38):
+  strtok3@8.0.1:
+    dependencies:
+      '@tokenizer/token': 0.3.0
+      peek-readable: 5.1.3
+
+  stylehacks@6.1.1(postcss@8.4.40):
     dependencies:
       browserslist: 4.23.0
-      postcss: 8.4.38
+      postcss: 8.4.40
       postcss-selector-parser: 6.0.16
 
   supports-color@5.5.0:
@@ -24515,27 +24032,23 @@ snapshots:
 
   systeminformation@5.22.11: {}
 
-  tar-fs@2.1.1:
-    dependencies:
-      chownr: 1.1.4
-      mkdirp-classic: 0.5.3
-      pump: 3.0.0
-      tar-stream: 2.2.0
-
-  tar-stream@2.2.0:
-    dependencies:
-      bl: 4.1.0
-      end-of-stream: 1.4.4
-      fs-constants: 1.0.0
-      inherits: 2.0.4
-      readable-stream: 3.6.0
-
   tar-stream@3.1.6:
     dependencies:
       b4a: 1.6.4
       fast-fifo: 1.3.0
       streamx: 2.15.0
 
+  tar@4.4.19:
+    dependencies:
+      chownr: 1.1.4
+      fs-minipass: 1.2.7
+      minipass: 2.9.0
+      minizlib: 1.3.3
+      mkdirp: 0.5.6
+      safe-buffer: 5.2.1
+      yallist: 3.1.1
+    optional: true
+
   tar@6.2.1:
     dependencies:
       chownr: 2.0.0
@@ -24566,20 +24079,12 @@ snapshots:
       type-fest: 2.19.0
       unique-string: 3.0.0
 
-  terser@5.31.1:
-    dependencies:
-      '@jridgewell/source-map': 0.3.5
-      acorn: 8.12.0
-      commander: 2.20.3
-      source-map-support: 0.5.21
-
-  terser@5.31.2:
+  terser@5.31.3:
     dependencies:
       '@jridgewell/source-map': 0.3.6
-      acorn: 8.12.0
+      acorn: 8.12.1
       commander: 2.20.3
       source-map-support: 0.5.21
-    optional: true
 
   test-exclude@6.0.0:
     dependencies:
@@ -24603,17 +24108,12 @@ snapshots:
     dependencies:
       real-require: 0.2.0
 
-  three@0.165.0: {}
+  three@0.167.0: {}
 
   throttle-debounce@5.0.2: {}
 
   throttleit@1.0.0: {}
 
-  through2@2.0.5:
-    dependencies:
-      readable-stream: 2.3.7
-      xtend: 4.0.2
-
   through@2.3.4: {}
 
   through@2.3.8: {}
@@ -24644,8 +24144,6 @@ snapshots:
 
   toad-cache@3.7.0: {}
 
-  tocbot@4.21.1: {}
-
   toidentifier@1.0.1: {}
 
   token-stream@1.0.0: {}
@@ -24655,6 +24153,11 @@ snapshots:
       '@tokenizer/token': 0.3.0
       ieee754: 1.2.1
 
+  token-types@6.0.0:
+    dependencies:
+      '@tokenizer/token': 0.3.0
+      ieee754: 1.2.1
+
   touch@3.1.0:
     dependencies:
       nopt: 1.0.10
@@ -24691,9 +24194,9 @@ snapshots:
     dependencies:
       typescript: 5.3.3
 
-  ts-api-utils@1.3.0(typescript@5.5.3):
+  ts-api-utils@1.3.0(typescript@5.5.4):
     dependencies:
-      typescript: 5.5.3
+      typescript: 5.5.4
 
   ts-case-convert@2.0.2: {}
 
@@ -24774,8 +24277,6 @@ snapshots:
 
   type-fest@4.20.1: {}
 
-  type-fest@4.9.0: {}
-
   type-is@1.6.18:
     dependencies:
       media-typer: 0.3.0
@@ -24837,7 +24338,7 @@ snapshots:
 
   typescript@5.4.2: {}
 
-  typescript@5.5.3: {}
+  typescript@5.5.4: {}
 
   ufo@1.3.2: {}
 
@@ -24850,6 +24351,8 @@ snapshots:
     dependencies:
       '@lukeed/csprng': 1.0.1
 
+  uint8array-extras@1.4.0: {}
+
   ulid@2.3.0: {}
 
   unbox-primitive@1.0.2:
@@ -24935,7 +24438,7 @@ snapshots:
 
   unplugin@1.4.0:
     dependencies:
-      acorn: 8.12.0
+      acorn: 8.12.1
       chokidar: 3.5.3
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.5.0
@@ -24963,20 +24466,10 @@ snapshots:
       querystringify: 2.2.0
       requires-port: 1.0.0
 
-  use-callback-ref@1.3.2(@types/react@18.0.28)(react@18.3.1):
+  utf-8-validate@6.0.3:
     dependencies:
-      react: 18.3.1
-      tslib: 2.6.2
-    optionalDependencies:
-      '@types/react': 18.0.28
-
-  use-sidecar@1.1.2(@types/react@18.0.28)(react@18.3.1):
-    dependencies:
-      detect-node-es: 1.1.0
-      react: 18.3.1
-      tslib: 2.6.2
-    optionalDependencies:
-      '@types/react': 18.0.28
+      node-gyp-build: 4.6.0
+    optional: true
 
   utf-8-validate@6.0.4:
     dependencies:
@@ -25003,14 +24496,14 @@ snapshots:
 
   uuid@9.0.1: {}
 
-  v-code-diff@1.12.0(vue@3.4.31(typescript@5.5.3)):
+  v-code-diff@1.12.0(vue@3.4.34(typescript@5.5.4)):
     dependencies:
       diff: 5.1.0
       diff-match-patch: 1.0.5
       highlight.js: 11.9.0
-      vue: 3.4.31(typescript@5.5.3)
-      vue-demi: 0.14.7(vue@3.4.31(typescript@5.5.3))
-      vue-i18n: 9.13.1(vue@3.4.31(typescript@5.5.3))
+      vue: 3.4.34(typescript@5.5.4)
+      vue-demi: 0.14.7(vue@3.4.34(typescript@5.5.4))
+      vue-i18n: 9.13.1(vue@3.4.34(typescript@5.5.4))
 
   v8-to-istanbul@9.2.0:
     dependencies:
@@ -25042,13 +24535,13 @@ snapshots:
       unist-util-stringify-position: 4.0.0
       vfile-message: 4.0.2
 
-  vite-node@1.6.0(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2):
+  vite-node@1.6.0(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3):
     dependencies:
       cac: 6.7.14
       debug: 4.3.5(supports-color@8.1.1)
       pathe: 1.1.2
       picocolors: 1.0.0
-      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2)
+      vite: 5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -25061,25 +24554,25 @@ snapshots:
 
   vite-plugin-turbosnap@1.0.3: {}
 
-  vite@5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2):
+  vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3):
     dependencies:
       esbuild: 0.21.5
-      postcss: 8.4.38
-      rollup: 4.18.0
+      postcss: 8.4.40
+      rollup: 4.19.1
     optionalDependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       fsevents: 2.3.3
-      sass: 1.77.6
-      terser: 5.31.2
+      sass: 1.77.8
+      terser: 5.31.3
 
-  vitest-fetch-mock@0.2.2(encoding@0.1.13)(vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2)):
+  vitest-fetch-mock@0.2.2(encoding@0.1.13)(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3)):
     dependencies:
       cross-fetch: 3.1.6(encoding@0.1.13)
-      vitest: 1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2)
+      vitest: 1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3)
     transitivePeerDependencies:
       - encoding
 
-  vitest@1.6.0(@types/node@20.14.9)(happy-dom@10.0.3)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.6)(terser@5.31.2):
+  vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3):
     dependencies:
       '@vitest/expect': 1.6.0
       '@vitest/runner': 1.6.0
@@ -25098,13 +24591,13 @@ snapshots:
       strip-literal: 2.1.0
       tinybench: 2.6.0
       tinypool: 0.8.4
-      vite: 5.3.2(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2)
-      vite-node: 1.6.0(@types/node@20.14.9)(sass@1.77.6)(terser@5.31.2)
+      vite: 5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3)
+      vite-node: 1.6.0(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3)
       why-is-node-running: 2.2.2
     optionalDependencies:
-      '@types/node': 20.14.9
+      '@types/node': 20.14.12
       happy-dom: 10.0.3
-      jsdom: 24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+      jsdom: 24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4)
     transitivePeerDependencies:
       - less
       - lightningcss
@@ -25139,46 +24632,44 @@ snapshots:
 
   vscode-uri@3.0.8: {}
 
-  vue-component-meta@2.0.16(typescript@5.5.3):
+  vue-component-meta@2.0.16(typescript@5.5.4):
     dependencies:
       '@volar/typescript': 2.2.0
-      '@vue/language-core': 2.0.16(typescript@5.5.3)
+      '@vue/language-core': 2.0.16(typescript@5.5.4)
       path-browserify: 1.0.1
       vue-component-type-helpers: 2.0.16
     optionalDependencies:
-      typescript: 5.5.3
+      typescript: 5.5.4
 
   vue-component-type-helpers@1.8.4: {}
 
   vue-component-type-helpers@2.0.16: {}
 
-  vue-component-type-helpers@2.0.24: {}
+  vue-component-type-helpers@2.0.29: {}
 
-  vue-component-type-helpers@2.0.26: {}
-
-  vue-demi@0.14.7(vue@3.4.31(typescript@5.5.3)):
+  vue-demi@0.14.7(vue@3.4.34(typescript@5.5.4)):
     dependencies:
-      vue: 3.4.31(typescript@5.5.3)
+      vue: 3.4.34(typescript@5.5.4)
 
-  vue-docgen-api@4.75.1(vue@3.4.31(typescript@5.5.3)):
+  vue-docgen-api@4.75.1(vue@3.4.34(typescript@5.5.4)):
     dependencies:
       '@babel/parser': 7.24.7
       '@babel/types': 7.24.7
       '@vue/compiler-dom': 3.4.29
-      '@vue/compiler-sfc': 3.4.31
+      '@vue/compiler-sfc': 3.4.34
       ast-types: 0.16.1
       hash-sum: 2.0.0
       lru-cache: 8.0.4
       pug: 3.0.3
       recast: 0.23.6
       ts-map: 1.0.3
-      vue: 3.4.31(typescript@5.5.3)
-      vue-inbrowser-compiler-independent-utils: 4.71.1(vue@3.4.31(typescript@5.5.3))
+      vue: 3.4.34(typescript@5.5.4)
+      vue-inbrowser-compiler-independent-utils: 4.71.1(vue@3.4.34(typescript@5.5.4))
 
-  vue-eslint-parser@9.4.3(eslint@9.7.0):
+  vue-eslint-parser@9.4.3(eslint@9.8.0):
     dependencies:
       debug: 4.3.4(supports-color@5.5.0)
-      eslint: 9.7.0
+      eslint: 9.8.0
       eslint-scope: 7.2.2
       eslint-visitor-keys: 3.4.3
       espree: 9.6.1
@@ -25188,43 +24679,43 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vue-i18n@9.13.1(vue@3.4.31(typescript@5.5.3)):
+  vue-i18n@9.13.1(vue@3.4.34(typescript@5.5.4)):
     dependencies:
       '@intlify/core-base': 9.13.1
       '@intlify/shared': 9.13.1
       '@vue/devtools-api': 6.6.1
-      vue: 3.4.31(typescript@5.5.3)
+      vue: 3.4.34(typescript@5.5.4)
 
-  vue-inbrowser-compiler-independent-utils@4.71.1(vue@3.4.31(typescript@5.5.3)):
+  vue-inbrowser-compiler-independent-utils@4.71.1(vue@3.4.34(typescript@5.5.4)):
     dependencies:
-      vue: 3.4.31(typescript@5.5.3)
+      vue: 3.4.34(typescript@5.5.4)
 
   vue-template-compiler@2.7.14:
     dependencies:
       de-indent: 1.0.2
       he: 1.2.0
 
-  vue-tsc@2.0.24(typescript@5.5.3):
+  vue-tsc@2.0.29(typescript@5.5.4):
     dependencies:
-      '@volar/typescript': 2.4.0-alpha.11
-      '@vue/language-core': 2.0.24(typescript@5.5.3)
+      '@volar/typescript': 2.4.0-alpha.18
+      '@vue/language-core': 2.0.29(typescript@5.5.4)
       semver: 7.6.0
-      typescript: 5.5.3
+      typescript: 5.5.4
 
-  vue@3.4.31(typescript@5.5.3):
+  vue@3.4.34(typescript@5.5.4):
     dependencies:
-      '@vue/compiler-dom': 3.4.31
-      '@vue/compiler-sfc': 3.4.31
-      '@vue/runtime-dom': 3.4.31
-      '@vue/server-renderer': 3.4.31(vue@3.4.31(typescript@5.5.3))
-      '@vue/shared': 3.4.31
+      '@vue/compiler-dom': 3.4.34
+      '@vue/compiler-sfc': 3.4.34
+      '@vue/runtime-dom': 3.4.34
+      '@vue/server-renderer': 3.4.34(vue@3.4.34(typescript@5.5.4))
+      '@vue/shared': 3.4.34
     optionalDependencies:
-      typescript: 5.5.3
+      typescript: 5.5.4
 
-  vuedraggable@4.1.0(vue@3.4.31(typescript@5.5.3)):
+  vuedraggable@4.1.0(vue@3.4.34(typescript@5.5.4)):
     dependencies:
       sortablejs: 1.14.0
-      vue: 3.4.31(typescript@5.5.3)
+      vue: 3.4.34(typescript@5.5.4)
 
   w3c-xmlserializer@5.0.0:
     dependencies:
@@ -25240,6 +24731,8 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
+  walk-up-path@3.0.1: {}
+
   walker@1.0.8:
     dependencies:
       makeerror: 1.0.12
@@ -25387,7 +24880,12 @@ snapshots:
       imurmurhash: 0.1.4
       signal-exit: 3.0.7
 
-  ws@8.17.1(bufferutil@4.0.8)(utf-8-validate@6.0.4):
+  ws@8.18.0(bufferutil@4.0.7)(utf-8-validate@6.0.3):
+    optionalDependencies:
+      bufferutil: 4.0.7
+      utf-8-validate: 6.0.3
+
+  ws@8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4):
     optionalDependencies:
       bufferutil: 4.0.8
       utf-8-validate: 6.0.4

From 61f4a03e6cd65af4a825f666acd31f4853c5bbad Mon Sep 17 00:00:00 2001
From: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
Date: Sun, 28 Jul 2024 11:19:32 +0900
Subject: [PATCH 105/221] =?UTF-8?q?Fix(frontend):=20=E4=B8=8B=E6=9B=B8?=
 =?UTF-8?q?=E3=81=8D/=E5=89=8A=E9=99=A4=E3=81=97=E3=81=A6=E7=B7=A8?=
 =?UTF-8?q?=E9=9B=86=E3=81=A7=E4=BF=9D=E6=8C=81=E3=81=95=E3=82=8C=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E9=A0=85=E7=9B=AE=E3=81=8C=E3=81=82=E3=81=A3=E3=81=9F?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(#14285)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(frontend): reorder assignments

* fix(frontend): visibleUserIds is not kept when deleteAndEdit

* fix(frontend): quoteId is not kept on draft

* fix(frontend): reactionAcceptance is not kept for draft/deleteAndEdit

* docs(changelog): update changelog
---
 CHANGELOG.md                                  |  3 +++
 .../backend/src/models/json-schema/note.ts    |  1 +
 .../frontend/src/components/MkPostForm.vue    | 20 +++++++++++++++----
 packages/misskey-js/src/autogen/types.ts      |  3 ++-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d48d14c71..4b35034cc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,9 @@
 - Fix: リアクションしたユーザー一覧のユーザー名がはみ出る問題を修正  
   (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/672)
 - Fix: `/share`ページにおいて絵文字ピッカーを開くことができない問題を修正
+- Fix: ダイレクト投稿の"削除して編集"において、宛先が保持されていなかった問題を修正
+- Fix: 投稿フォームへのURL貼り付けによる引用が下書きに保存されていなかった問題を修正
+- Fix: "削除して編集"や下書きにおいて、リアクションの受け入れ設定が保持/保存されていなかった問題を修正
 
 ### Server
 - Feat: レートリミット制限に引っかかったときに`Retry-After`ヘッダーを返すように (#13949)
diff --git a/packages/backend/src/models/json-schema/note.ts b/packages/backend/src/models/json-schema/note.ts
index 2641161c8b..61f62dce60 100644
--- a/packages/backend/src/models/json-schema/note.ts
+++ b/packages/backend/src/models/json-schema/note.ts
@@ -204,6 +204,7 @@ export const packedNoteSchema = {
 		reactionAcceptance: {
 			type: 'string',
 			optional: false, nullable: true,
+			enum: ['likeOnly', 'likeOnlyForRemote', 'nonSensitiveOnly', 'nonSensitiveOnlyForLocalLikeOnlyForRemote'],
 		},
 		reactionEmojis: {
 			type: 'object',
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index d057d197ec..64ad60ae85 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -367,6 +367,8 @@ function watchForDraft() {
 	watch(files, () => saveDraft(), { deep: true });
 	watch(visibility, () => saveDraft());
 	watch(localOnly, () => saveDraft());
+	watch(quoteId, () => saveDraft());
+	watch(reactionAcceptance, () => saveDraft());
 }
 
 function checkMissingMention() {
@@ -703,6 +705,8 @@ function saveDraft() {
 			files: files.value,
 			poll: poll.value,
 			visibleUserIds: visibility.value === 'specified' ? visibleUsers.value.map(x => x.id) : undefined,
+			quoteId: quoteId.value,
+			reactionAcceptance: reactionAcceptance.value,
 		},
 	};
 
@@ -991,6 +995,8 @@ onMounted(() => {
 						users.forEach(u => pushVisibleUser(u));
 					});
 				}
+				quoteId.value = draft.data.quoteId;
+				reactionAcceptance.value = draft.data.reactionAcceptance;
 			}
 		}
 
@@ -998,9 +1004,11 @@ onMounted(() => {
 		if (props.initialNote) {
 			const init = props.initialNote;
 			text.value = init.text ? init.text : '';
-			files.value = init.files ?? [];
-			cw.value = init.cw ?? null;
 			useCw.value = init.cw != null;
+			cw.value = init.cw ?? null;
+			visibility.value = init.visibility;
+			localOnly.value = init.localOnly ?? false;
+			files.value = init.files ?? [];
 			if (init.poll) {
 				poll.value = {
 					choices: init.poll.choices.map(x => x.text),
@@ -1009,9 +1017,13 @@ onMounted(() => {
 					expiredAfter: null,
 				};
 			}
-			visibility.value = init.visibility;
-			localOnly.value = init.localOnly ?? false;
+			if (init.visibleUserIds) {
+				misskeyApi('users/show', { userIds: init.visibleUserIds }).then(users => {
+					users.forEach(u => pushVisibleUser(u));
+				});
+			}
 			quoteId.value = init.renote ? init.renote.id : null;
+			reactionAcceptance.value = init.reactionAcceptance;
 		}
 
 		nextTick(() => watchForDraft());
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index d3c857219b..b2b8938baa 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4089,7 +4089,8 @@ export type components = {
         userId: string | null;
       }) | null;
       localOnly?: boolean;
-      reactionAcceptance: string | null;
+      /** @enum {string|null} */
+      reactionAcceptance: 'likeOnly' | 'likeOnlyForRemote' | 'nonSensitiveOnly' | 'nonSensitiveOnlyForLocalLikeOnlyForRemote';
       reactionEmojis: {
         [key: string]: string;
       };

From efa80f9ad4ae8f50c8f6b3ccb554506f10418b59 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 28 Jul 2024 02:23:46 +0000
Subject: [PATCH 106/221] Bump version to 2024.7.0-beta.3

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 8c04c6a806..ab7835c1f6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.7.0-beta.2",
+	"version": "2024.7.0-beta.3",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index a047e50063..1e1a239bf3 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.7.0-beta.2",
+	"version": "2024.7.0-beta.3",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 865b3039ccf6eec4f277dbb33296ab767d2ed7ce Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Sun, 28 Jul 2024 14:44:15 +0900
Subject: [PATCH 107/221] =?UTF-8?q?fix:=20deck=20ui=E3=81=AE=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E9=9F=B3=E3=81=8C=E9=87=8D=E3=81=AA=E3=82=8B=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C=20(#14029)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: deck uiの通知音が重なる

* docs: Fix: deck uiの通知音が重なる問題

* unexport internal function

* fix

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>

* chore: improve condition

* docs: move js dco comment

---------

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
 CHANGELOG.md                           |  1 +
 packages/frontend/src/scripts/sound.ts | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b35034cc8..c2e9c8e258 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@
 - Fix: リアクションしたユーザー一覧のユーザー名がはみ出る問題を修正  
   (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/672)
 - Fix: `/share`ページにおいて絵文字ピッカーを開くことができない問題を修正
+- Fix: deck uiの通知音が重なる問題 (#14029)
 - Fix: ダイレクト投稿の"削除して編集"において、宛先が保持されていなかった問題を修正
 - Fix: 投稿フォームへのURL貼り付けによる引用が下書きに保存されていなかった問題を修正
 - Fix: "削除して編集"や下書きにおいて、リアクションの受け入れ設定が保持/保存されていなかった問題を修正
diff --git a/packages/frontend/src/scripts/sound.ts b/packages/frontend/src/scripts/sound.ts
index bba855cd64..814e080811 100644
--- a/packages/frontend/src/scripts/sound.ts
+++ b/packages/frontend/src/scripts/sound.ts
@@ -124,10 +124,23 @@ export async function loadAudio(url: string, options?: { useCache?: boolean; })
  */
 export function playMisskeySfx(operationType: OperationType) {
 	const sound = defaultStore.state[`sound_${operationType}`];
-	if (sound.type == null || !canPlay || ('userActivation' in navigator && !navigator.userActivation.hasBeenActive)) return;
+	playMisskeySfxFile(sound);
+}
+
+/**
+ * サウンド設定形式で指定された音声を再生する
+ * @param soundStore サウンド設定
+ */
+export function playMisskeySfxFile(soundStore: SoundStore) {
+	// 連続して再生しない
+	if (!canPlay) return;
+	// ユーザーアクティベーションが必要な場合はそれがない場合は再生しない
+	if ('userActivation' in navigator && !navigator.userActivation.hasBeenActive) return;
+	// サウンドがない場合は再生しない
+	if (soundStore.type === null || soundStore.type === '_driveFile_' && !soundStore.fileUrl) return;
 
 	canPlay = false;
-	playMisskeySfxFile(sound).finally(() => {
+	playMisskeySfxFileInternal(soundStore).finally(() => {
 		// ごく短時間に音が重複しないように
 		setTimeout(() => {
 			canPlay = true;
@@ -135,11 +148,7 @@ export function playMisskeySfx(operationType: OperationType) {
 	});
 }
 
-/**
- * サウンド設定形式で指定された音声を再生する
- * @param soundStore サウンド設定
- */
-export async function playMisskeySfxFile(soundStore: SoundStore) {
+async function playMisskeySfxFileInternal(soundStore: SoundStore) {
 	if (soundStore.type === null || (soundStore.type === '_driveFile_' && !soundStore.fileUrl)) {
 		return;
 	}

From 0f0660d49eee3fabc4f98fc2a4ee687cb691d6a6 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 28 Jul 2024 14:55:28 +0900
Subject: [PATCH 108/221] New Crowdin updates (#13916)

* 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 (Korean)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Indonesian)

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

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Italian)

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

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Polish)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Romanian)

* New translations ja-jp.yml (Arabic)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Norwegian)

* 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 Traditional)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Bengali)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Uzbek)

* New translations ja-jp.yml (Lao)

* New translations ja-jp.yml (Kabyle)

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

* 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 (Korean)

* New translations ja-jp.yml (Korean)

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

* New translations ja-jp.yml (English)

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

* New translations ja-jp.yml (Korean)

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

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

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (English)

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

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

* New translations ja-jp.yml (Vietnamese)

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

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

* New translations ja-jp.yml (English)

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

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (French)

* 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 (Russian)

* New translations ja-jp.yml (Slovak)

* New translations ja-jp.yml (Swedish)

* New translations ja-jp.yml (Ukrainian)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Bengali)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Italian)

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

* New translations ja-jp.yml (Spanish)

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

* 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 (Italian)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Indonesian)

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

* New translations ja-jp.yml (Italian)

* 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 (English)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (English)

* 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 (Indonesian)

* 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 (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)
---
 locales/ar-SA.yml   |   6 +-
 locales/bn-BD.yml   |   6 +-
 locales/ca-ES.yml   |   6 +-
 locales/cs-CZ.yml   |   6 +-
 locales/de-DE.yml   |   6 +-
 locales/el-GR.yml   |   2 -
 locales/en-US.yml   |  51 +++++-
 locales/es-ES.yml   |   8 +-
 locales/fr-FR.yml   |   6 +-
 locales/id-ID.yml   |  16 +-
 locales/it-IT.yml   |  63 ++++++-
 locales/ja-KS.yml   |  12 +-
 locales/kab-KAB.yml |   4 +
 locales/ko-GS.yml   |   4 +
 locales/ko-KR.yml   | 116 ++++++++----
 locales/lo-LA.yml   | 196 +++++++++++----------
 locales/no-NO.yml   |   4 +
 locales/pl-PL.yml   |   6 +-
 locales/pt-PT.yml   |   4 +
 locales/ro-RO.yml   |   4 +
 locales/ru-RU.yml   |   6 +-
 locales/sk-SK.yml   |   6 +-
 locales/sv-SE.yml   |   5 +-
 locales/th-TH.yml   | 420 ++++++++++++++++++++++++--------------------
 locales/uk-UA.yml   |   6 +-
 locales/uz-UZ.yml   |   4 +
 locales/vi-VN.yml   |   9 +-
 locales/zh-CN.yml   |  70 ++++++--
 locales/zh-TW.yml   |  54 ++++--
 29 files changed, 722 insertions(+), 384 deletions(-)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index 955d672c1d..b6bfbfa682 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -1262,8 +1262,6 @@ _sfx:
   note: "الملاحظات"
   noteMy: "ملاحظتي"
   notification: "الإشعارات"
-  antenna: "الهوائيات"
-  channel: "إشعارات القنات"
 _ago:
   future: "المستقبَل"
   justNow: "اللحظة"
@@ -1566,6 +1564,10 @@ _webhookSettings:
   active: "مُفعّل"
   _events:
     reaction: "عند التفاعل"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "البريد الإلكتروني "
 _moderationLogTypes:
   suspend: "علِق"
   deleteDriveFile: "حُذف الملف"
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index abcf07da83..6fb51ea5d8 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -1033,8 +1033,6 @@ _sfx:
   note: "নোটগুলি"
   noteMy: "নোট (আপনার)"
   notification: "বিজ্ঞপ্তি"
-  antenna: "অ্যান্টেনাগুলি"
-  channel: "চ্যানেলের বিজ্ঞপ্তি"
 _ago:
   future: "ভবিষ্যৎ"
   justNow: "এইমাত্র"
@@ -1346,6 +1344,10 @@ _deck:
 _webhookSettings:
   name: "নাম"
   active: "চালু"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "ইমেইল"
 _moderationLogTypes:
   suspend: "স্থগিত করা"
   resetPassword: "পাসওয়ার্ড রিসেট করুন"
diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index 0345ee0326..7bd9a1bb32 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -1893,8 +1893,6 @@ _sfx:
   note: "Notes"
   noteMy: "Nota (per mi)"
   notification: "Notificacions"
-  antenna: "Antenes"
-  channel: "Notificacions dels canals"
   reaction: "Quan se selecciona una reacció "
 _soundSettings:
   driveFile: "Fer servir un fitxer d'àudio del disc"
@@ -2225,6 +2223,10 @@ _deck:
 _webhookSettings:
   name: "Nom"
   active: "Activat"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "Correu electrònic"
 _moderationLogTypes:
   suspend: "Suspèn"
   resetPassword: "Restableix la contrasenya"
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index c8a0b0cb28..aa970f823a 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -1645,8 +1645,6 @@ _sfx:
   note: "Poznámky"
   noteMy: "Moje poznámka"
   notification: "Oznámení"
-  antenna: "Antény"
-  channel: "Oznámení kanálu"
 _ago:
   future: "Budoucí"
   justNow: "Teď"
@@ -2022,6 +2020,10 @@ _webhookSettings:
     renote: "Při renotaci poznámky"
     reaction: "Při obdržení reakce"
     mention: "Při zmínce"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "Email"
 _moderationLogTypes:
   suspend: "Zmrazit"
   resetPassword: "Resetovat heslo"
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 9e42e01252..a319af56cb 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -1800,8 +1800,6 @@ _sfx:
   note: "Notizen"
   noteMy: "Meine Notizen"
   notification: "Benachrichtigungen"
-  antenna: "Antennen"
-  channel: "Kanalbenachrichtigung"
 _ago:
   future: "Zukunft"
   justNow: "Gerade eben"
@@ -2203,6 +2201,10 @@ _webhookSettings:
     renote: "Wenn du ein Renote erhältst"
     reaction: "Wenn du eine Reaktion erhältst"
     mention: "Wenn du erwähnt wirst"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "Email"
 _moderationLogTypes:
   createRole: "Rolle erstellt"
   deleteRole: "Rolle gelöscht"
diff --git a/locales/el-GR.yml b/locales/el-GR.yml
index 2098c7ef50..5eca348e18 100644
--- a/locales/el-GR.yml
+++ b/locales/el-GR.yml
@@ -301,8 +301,6 @@ _theme:
 _sfx:
   note: "Σημειώματα"
   notification: "Ειδοποιήσεις"
-  antenna: "Αντένες"
-  channel: "Ειδοποιήσεις καναλιών"
 _ago:
   future: "Μελλοντικό"
   justNow: "Μόλις τώρα"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index c20a1ac7d8..b751b039e6 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -108,7 +108,7 @@ enterEmoji: "Enter an emoji"
 renote: "Renote"
 unrenote: "Remove renote"
 renoted: "Renoted."
-renotedToX: "Renote from {name} users。"
+renotedToX: "Renote to {name}."
 cantRenote: "This post can't be renoted."
 cantReRenote: "A renote can't be renoted."
 quote: "Quote"
@@ -125,8 +125,8 @@ add: "Add"
 reaction: "Reactions"
 reactions: "Reactions"
 emojiPicker: "Emoji picker"
-pinnedEmojisForReactionSettingDescription: "Set the emojis which should be pinned and displayed immediately when reacting."
-pinnedEmojisSettingDescription: "Set the emojis to be pinned and displayed when viewing emoji picker"
+pinnedEmojisForReactionSettingDescription: "Set the emojis to be pinned and displayed when reacting."
+pinnedEmojisSettingDescription: "Set the emojis to be pinned and displayed when viewing emoji picker."
 emojiPickerDisplay: "Emoji picker display"
 overwriteFromPinnedEmojisForReaction: "Override from reaction settings"
 overwriteFromPinnedEmojis: "Override from general settings"
@@ -180,6 +180,10 @@ addAccount: "Add account"
 reloadAccountsList: "Reload account list"
 loginFailed: "Failed to sign in"
 showOnRemote: "View on remote instance"
+continueOnRemote: "リモートで続行"
+chooseServerOnMisskeyHub: "Choose a server from the Misskey Hub"
+specifyServerHost: "Specify a server host directly"
+inputHostName: "Enter the domain"
 general: "General"
 wallpaper: "Wallpaper"
 setWallpaper: "Set wallpaper"
@@ -316,6 +320,7 @@ selectFile: "Select a file"
 selectFiles: "Select files"
 selectFolder: "Select a folder"
 selectFolders: "Select folders"
+fileNotSelected: ""
 renameFile: "Rename file"
 folderName: "Folder name"
 createFolder: "Create a folder"
@@ -476,6 +481,7 @@ noMessagesYet: "No messages yet"
 newMessageExists: "There are new messages"
 onlyOneFileCanBeAttached: "You can only attach one file to a message"
 signinRequired: "Please register or sign in before continuing"
+signinOrContinueOnRemote: "To continue, you  need to move your server or sign up / log in to this server."
 invitations: "Invites"
 invitationCode: "Invitation code"
 checking: "Checking..."
@@ -836,6 +842,7 @@ administration: "Management"
 accounts: "Accounts"
 switch: "Switch"
 noMaintainerInformationWarning: "Maintainer information is not configured."
+noInquiryUrlWarning: "Inquiry URL isn’t set"
 noBotProtectionWarning: "Bot protection is not configured."
 configure: "Configure"
 postToGallery: "Create new gallery post"
@@ -1025,6 +1032,7 @@ thisPostMayBeAnnoyingHome: "Post to home timeline"
 thisPostMayBeAnnoyingCancel: "Cancel"
 thisPostMayBeAnnoyingIgnore: "Post anyway"
 collapseRenotes: "Collapse renotes you've already seen"
+collapseRenotesDescription: "Collapse notes that you've reacted to or renoted before."
 internalServerError: "Internal Server Error"
 internalServerErrorDescription: "The server has run into an unexpected error."
 copyErrorInfo: "Copy error details"
@@ -1239,6 +1247,9 @@ keepOriginalFilenameDescription: "If you turn off this setting, files names will
 noDescription: "There is not the explanation"
 alwaysConfirmFollow: "Always confirm when following"
 inquiry: "Contact"
+tryAgain: "Please try again later"
+confirmWhenRevealingSensitiveMedia: "Confirm when revealing sensitive media"
+sensitiveMediaRevealConfirm: "This might be a sensitive media. Are you sure to reveal?"
 _delivery:
   status: "Delivery status"
   stop: "Suspended"
@@ -1373,6 +1384,8 @@ _serverSettings:
   fanoutTimelineDescription: "Greatly increases performance of timeline retrieval and reduces load on the database when enabled. In exchange, memory usage of Redis will increase. Consider disabling this in case of low server memory or server instability."
   fanoutTimelineDbFallback: "Fallback to database"
   fanoutTimelineDbFallbackDescription: "When enabled, the timeline will fall back to the database for additional queries if the timeline is not cached. Disabling it further reduces the server load by eliminating the fallback process, but limits the range of timelines that can be retrieved."
+  inquiryUrl: "Query URL"
+  inquiryUrlDescription: "Specify a URL for the inquiry form to the server maintainer or a web page for the contact information."
 _accountMigration:
   moveFrom: "Migrate another account to this one"
   moveFromSub: "Create alias to another account"
@@ -1689,6 +1702,7 @@ _role:
     canManageAvatarDecorations: "Manage avatar decorations"
     driveCapacity: "Drive capacity"
     alwaysMarkNsfw: "Always mark files as NSFW"
+    canUpdateBioMedia: "Allow to edit an icon or a banner image"
     pinMax: "Maximum number of pinned notes"
     antennaMax: "Maximum number of antennas"
     wordMuteMax: "Maximum number of characters allowed in word mutes"
@@ -1932,8 +1946,6 @@ _sfx:
   note: "New note"
   noteMy: "Own note"
   notification: "Notifications"
-  antenna: "Antennas"
-  channel: "Channel notifications"
   reaction: "On choosing a reaction"
 _soundSettings:
   driveFile: "Use an audio file in Drive."
@@ -2059,7 +2071,7 @@ _permissions:
   "read:admin:invite-codes": "View invite codes"
   "write:admin:announcements": "Manage announcements"
   "read:admin:announcements": "View announcements"
-  "write:admin:avatar-decorations": "Manage avatar decorations"
+  "write:admin:avatar-decorations": "Can manage avatar decorations"
   "read:admin:avatar-decorations": "View avatar decorations"
   "write:admin:federation": "Manage federation data"
   "write:admin:account": "Manage user account"
@@ -2358,6 +2370,7 @@ _deck:
   alwaysShowMainColumn: "Always show main column"
   columnAlign: "Align columns"
   addColumn: "Add column"
+  newNoteNotificationSettings: "Notification setting for new notes"
   configureColumn: "Column settings"
   swapLeft: "Swap with the left column"
   swapRight: "Swap with the right column"
@@ -2396,6 +2409,7 @@ _drivecleaner:
   orderByCreatedAtAsc: "Ascending Dates"
 _webhookSettings:
   createWebhook: "Create Webhook"
+  modifyWebhook: "Modify Webhook"
   name: "Name"
   secret: "Secret"
   events: "Webhook Events"
@@ -2408,6 +2422,25 @@ _webhookSettings:
     renote: "When renoted"
     reaction: "When receiving a reaction"
     mention: "When being mentioned"
+  _systemEvents:
+    abuseReport: "When received a new abuse report"
+    abuseReportResolved: "When resolved abuse reports"
+  deleteConfirm: "Are you sure you want to delete the Webhook?"
+_abuseReport:
+  _notificationRecipient:
+    createRecipient: "Add a recipient for abuse reports"
+    modifyRecipient: "Edit a recipient for abuse reports"
+    recipientType: "Notification type"
+    _recipientType:
+      mail: "Email"
+      webhook: "Webhook"
+      _captions:
+        mail: "Send the email to moderators' email addresses when you receive abuse."
+        webhook: "Send a notification to SystemWebhook when you receive or resolve abuse."
+    keywords: "Keywords"
+    notifiedUser: "Users to notify"
+    notifiedWebhook: "Webhook to use"
+    deleteConfirm: "Are you sure that you want to delete the notification recipient?"
 _moderationLogTypes:
   createRole: "Role created"
   deleteRole: "Role deleted"
@@ -2445,6 +2478,12 @@ _moderationLogTypes:
   deleteAvatarDecoration: "Avatar decoration deleted"
   unsetUserAvatar: "Unset this user's avatar"
   unsetUserBanner: "Unset this user's banner"
+  createSystemWebhook: "Create SystemWebhook"
+  updateSystemWebhook: "Update SystemWebHook"
+  deleteSystemWebhook: "Delete SystemWebhook"
+  createAbuseReportNotificationRecipient: "Create a recipient for abuse reports"
+  updateAbuseReportNotificationRecipient: "Update recipients for abuse reports"
+  deleteAbuseReportNotificationRecipient: "Delete a recipient for abuse reports"
 _fileViewer:
   title: "File details"
   type: "File type"
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 5c8249ded5..3ae3ba3b8a 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -302,7 +302,7 @@ location: "Lugar"
 theme: "Tema"
 themeForLightMode: "Tema para usar en Modo Linterna"
 themeForDarkMode: "Tema para usar en Modo Oscuro"
-light: "Linterna"
+light: "Claro"
 dark: "Oscuro"
 lightThemes: "Tema claro"
 darkThemes: "Tema oscuro"
@@ -1920,8 +1920,6 @@ _sfx:
   note: "Notas"
   noteMy: "Nota (a mí mismo)"
   notification: "Notificaciones"
-  antenna: "Antena receptora"
-  channel: "Notificaciones del canal"
   reaction: "Al seleccionar una reacción"
 _soundSettings:
   driveFile: "Usar un archivo de audio en Drive"
@@ -2394,6 +2392,10 @@ _webhookSettings:
     renote: "Cuando reciba un \"re-note\""
     reaction: "Cuando se recibe una reacción"
     mention: "Cuando hay una mención"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "Correo"
 _moderationLogTypes:
   createRole: "Rol creado"
   deleteRole: "Rol eliminado"
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index 8d66c3d375..ee08dfddf1 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -1712,8 +1712,6 @@ _sfx:
   note: "Nouvelle note"
   noteMy: "Ma note"
   notification: "Notifications"
-  antenna: "Réception de l’antenne"
-  channel: "Notifications de canal"
   reaction: "Lors de la sélection de la réaction"
 _soundSettings:
   driveFile: "Utiliser un effet sonore sur le Disque"
@@ -2073,6 +2071,10 @@ _drivecleaner:
 _webhookSettings:
   name: "Nom"
   active: "Activé"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "E-mail "
 _moderationLogTypes:
   createRole: "Rôle créé"
   deleteRole: "Rôle supprimé"
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index 7f509afa50..de50569e89 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -180,6 +180,10 @@ addAccount: "Tambahkan akun"
 reloadAccountsList: "Muat ulang daftar akun"
 loginFailed: "Gagal untuk masuk"
 showOnRemote: "Lihat profil asli"
+continueOnRemote: "Lihat di peladen asal"
+chooseServerOnMisskeyHub: "Pilih peladen dari Misskey Hub"
+specifyServerHost: "Tentukan domain peladen"
+inputHostName: "Masukkan nama domain"
 general: "Umum"
 wallpaper: "Wallpaper"
 setWallpaper: "Atur wallpaper"
@@ -316,6 +320,7 @@ selectFile: "Pilih berkas"
 selectFiles: "Pilih berkas"
 selectFolder: "Pilih folder"
 selectFolders: "Pilih folder"
+fileNotSelected: "Tidak ada file yang dipilih"
 renameFile: "Ubah nama berkas"
 folderName: "Nama folder"
 createFolder: "Buat folder"
@@ -1239,6 +1244,7 @@ keepOriginalFilenameDescription: "Apabila pengaturan ini dimatikan, nama berkas
 noDescription: "Tidak ada deskripsi"
 alwaysConfirmFollow: "Selalu konfirmasi ketika mengikuti"
 inquiry: "Hubungi kami"
+tryAgain: "Silahkan coba lagi."
 _delivery:
   status: "Status pengiriman"
   stop: "Ditangguhkan"
@@ -1739,7 +1745,7 @@ _emailUnavailable:
   smtp: "Peladen alamat surel ini tidak merespon"
   banned: "Kamu tidak dapat mendaftar dengan alamat surel ini"
 _ffVisibility:
-  public: "Terbitkan"
+  public: "Publik"
   followers: "Tampil untuk pengikut saja"
   private: "Tersembunyi"
 _signup:
@@ -1932,8 +1938,6 @@ _sfx:
   note: "Catatan"
   noteMy: "Catatan (Saya)"
   notification: "Notifikasi"
-  antenna: "Penerimaan Antenna"
-  channel: "Notifikasi Kanal"
   reaction: "Ketika memilih reaksi"
 _soundSettings:
   driveFile: "Menggunakan berkas audio dalam Drive"
@@ -2396,6 +2400,7 @@ _drivecleaner:
   orderByCreatedAtAsc: "Tanggal (Naik)"
 _webhookSettings:
   createWebhook: "Buat Webhook"
+  modifyWebhook: "Sunting Webhook"
   name: "Nama"
   secret: "Secret"
   events: "Webhook Events"
@@ -2408,6 +2413,11 @@ _webhookSettings:
     renote: "Ketika direnote"
     reaction: "Ketika menerima reaksi"
     mention: "Ketika sedang disebut"
+  deleteConfirm: "Apakah kamu yakin ingin menghapus Webhook?"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "Surel"
 _moderationLogTypes:
   createRole: "Peran telah dibuat"
   deleteRole: "Peran telah dihapus"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index 1d12a62cca..64cd26878e 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -108,11 +108,14 @@ enterEmoji: "Inserisci emoji"
 renote: "Rinota"
 unrenote: "Elimina la Rinota"
 renoted: "Rinotata!"
+renotedToX: "Rinota da {name}."
 cantRenote: "È impossibile rinotare questa nota."
 cantReRenote: "È impossibile rinotare una Rinota."
 quote: "Citazione"
 inChannelRenote: "Rinota nel canale"
 inChannelQuote: "Cita nel canale"
+renoteToChannel: "Rinota al canale"
+renoteToOtherChannel: "Rinota a un altro canale"
 pinnedNote: "Nota in primo piano"
 pinned: "Fissa sul profilo"
 you: "Tu"
@@ -177,6 +180,10 @@ addAccount: "Aggiungi profilo"
 reloadAccountsList: "Ricarica l'elenco dei profili"
 loginFailed: "Accesso non riuscito"
 showOnRemote: "Leggi sull'istanza remota"
+continueOnRemote: "Continua da remoto"
+chooseServerOnMisskeyHub: "Scegli l'istanza sul sito Misskey Hub"
+specifyServerHost: "Indica l'indirizzo dell'istanza"
+inputHostName: "Digita il nome del dominio "
 general: "Generali"
 wallpaper: "Sfondo"
 setWallpaper: "Imposta sfondo"
@@ -313,6 +320,7 @@ selectFile: "Scelta allegato"
 selectFiles: "Scelta allegato"
 selectFolder: "Seleziona cartella"
 selectFolders: "Seleziona cartella"
+fileNotSelected: "Nessun file selezionato"
 renameFile: "Rinomina file"
 folderName: "Nome della cartella"
 createFolder: "Nuova cartella"
@@ -468,10 +476,12 @@ retype: "Conferma"
 noteOf: "Note di {user}"
 quoteAttached: "Citazione allegata"
 quoteQuestion: "Vuoi aggiungere una citazione?"
+attachAsFileQuestion: "Il testo copiato eccede le dimensioni, vuoi allegarlo?"
 noMessagesYet: "Ancora nessuna chat"
 newMessageExists: "Hai ricevuto un nuovo messaggio"
 onlyOneFileCanBeAttached: "È possibile allegare al messaggio soltanto uno file"
 signinRequired: "Occorre avere un profilo registrato su questa istanza"
+signinOrContinueOnRemote: "Per continuare, devi accedere alla tua istanza o registrarti su questa e poi accedere"
 invitations: "Invita"
 invitationCode: "Codice di invito"
 checking: "Confermando"
@@ -695,7 +705,7 @@ reporterOrigin: "Segnalazione da"
 forwardReport: "Inoltro di un report a un'istanza remota."
 forwardReportIsAnonymous: "L'istanza remota non vedrà le tue informazioni, apparirai come profilo di sistema, anonimo."
 send: "Inviare"
-abuseMarkAsResolved: "Contrassegna la segnalazione come risolta"
+abuseMarkAsResolved: "Risolvi segnalazione"
 openInNewTab: "Apri in una nuova scheda"
 openInSideView: "Apri in vista laterale"
 defaultNavigationBehaviour: "Navigazione preimpostata"
@@ -832,6 +842,7 @@ administration: "Gestione"
 accounts: "Profilo"
 switch: "Cambia"
 noMaintainerInformationWarning: "Mancano le informazioni sull'amministratore."
+noInquiryUrlWarning: "Non è stata impostata la URL di contatto"
 noBotProtectionWarning: "Non è stata impostata alcuna protezione dai Bot"
 configure: "Imposta"
 postToGallery: "Pubblicare nella galleria"
@@ -1021,6 +1032,7 @@ thisPostMayBeAnnoyingHome: "Pubblica sulla timeline principale"
 thisPostMayBeAnnoyingCancel: "Annulla"
 thisPostMayBeAnnoyingIgnore: "Pubblica lo stesso"
 collapseRenotes: "Comprimi le Rinota già viste"
+collapseRenotesDescription: "Comprimi le Note con cui hai già interagito."
 internalServerError: "Errore interno del server"
 internalServerErrorDescription: "Si è verificato un errore imprevisto all'interno del server"
 copyErrorInfo: "Copia le informazioni sull'errore"
@@ -1233,10 +1245,20 @@ useNativeUIForVideoAudioPlayer: "Riprodurre audio/video usando le funzionalità
 keepOriginalFilename: "Mantieni il nome file originale"
 keepOriginalFilenameDescription: "Disattivandola, i file verranno caricati usando nomi casuali."
 noDescription: "Manca la descrizione"
+alwaysConfirmFollow: "Richiedi conferma per i Follow"
+inquiry: "Contattaci"
+tryAgain: "Per favore riprova"
+confirmWhenRevealingSensitiveMedia: "Richiedi conferma prima di mostrare gli allegati espliciti"
+sensitiveMediaRevealConfirm: "Questo allegato è esplicito, vuoi vederlo?"
 _delivery:
+  status: "Stato della consegna"
   stop: "Sospensione"
+  resume: "Riprendi la consegna"
   _type:
     none: "Pubblicazione"
+    manuallySuspended: "Sospesa manualmente"
+    goneSuspended: "Sospensione server a causa dell'eliminazione"
+    autoSuspendedForNotResponding: "Sospensione del server a causa di mancata risposta"
 _bubbleGame:
   howToPlay: "Come giocare"
   hold: "Tieni"
@@ -1362,6 +1384,8 @@ _serverSettings:
   fanoutTimelineDescription: "Attivando questa funzionalità migliori notevolmente la capacità delle Timeline di collezionare Note, riducendo il carico sul database. Tuttavia, aumenterà l'impiego di memoria RAM per Redis. Disattiva se il tuo server ha poca RAM o la funzionalità è irregolare."
   fanoutTimelineDbFallback: "Elaborazione dati alternativa"
   fanoutTimelineDbFallbackDescription: "Attivando l'elaborazione alternativa, verrà interrogato ulteriormente il database se la timeline non è nella cache. \nDisattivando, si può ridurre ulteriormente il carico del server, evitando l'elaborazione alternativa, ma limitando l'intervallo recuperabile delle timeline."
+  inquiryUrl: "URL di contatto"
+  inquiryUrlDescription: "Specificare l'URL al modulo di contatto, oppure le informazioni con i dati di contatto dell'amministrazione."
 _accountMigration:
   moveFrom: "Migra un altro profilo dentro a questo"
   moveFromSub: "Crea un alias verso un altro profilo remoto"
@@ -1678,6 +1702,7 @@ _role:
     canManageAvatarDecorations: "Gestisce le decorazioni di immagini del profilo"
     driveCapacity: "Capienza del Drive"
     alwaysMarkNsfw: "Impostare sempre come esplicito (NSFW)"
+    canUpdateBioMedia: "Può aggiornare foto profilo e di testata"
     pinMax: "Quantità massima di Note in primo piano"
     antennaMax: "Quantità massima di Antenne"
     wordMuteMax: "Lunghezza massima del filtro parole"
@@ -1696,6 +1721,11 @@ _role:
     roleAssignedTo: "Assegnato a ruoli manualmente"
     isLocal: "Profilo locale"
     isRemote: "Profilo remoto"
+    isCat: "È un gattino"
+    isBot: "È un bot"
+    isSuspended: "È sospeso"
+    isLocked: "È in stato privato"
+    isExplorable: "Autorizza la pubblicazione nei cataloghi"
     createdLessThan: "Profilo creato da meno di N"
     createdMoreThan: "Profilo creato da più di N"
     followersLessThanOrEq: "Profilo con N follower o meno"
@@ -1916,8 +1946,6 @@ _sfx:
   note: "Nota"
   noteMy: "Mia nota"
   notification: "Notifiche"
-  antenna: "Ricezione dell'antenna"
-  channel: "Notifiche di canale"
   reaction: "Quando seleziono una reazione"
 _soundSettings:
   driveFile: "Suoni del Drive"
@@ -2342,6 +2370,7 @@ _deck:
   alwaysShowMainColumn: "Mostra sempre la colonna principale"
   columnAlign: "Allineare colonne"
   addColumn: "Aggiungi colonna"
+  newNoteNotificationSettings: "Preferenze per le notifiche di nuove Note"
   configureColumn: "Impostazioni colonna"
   swapLeft: "Sposta a sinistra"
   swapRight: "Sposta a destra"
@@ -2380,6 +2409,7 @@ _drivecleaner:
   orderByCreatedAtAsc: "Dal più vecchio al più recente"
 _webhookSettings:
   createWebhook: "Creazione Webhook"
+  modifyWebhook: "Modifica Webhook"
   name: "Nome"
   secret: "Segreto"
   events: "Quando eseguire il Webhook"
@@ -2392,6 +2422,25 @@ _webhookSettings:
     renote: "Quando la Nota è Rinotata"
     reaction: "Quando ricevo una reazione"
     mention: "Quando mi menzionano"
+  _systemEvents:
+    abuseReport: "Quando arriva una segnalazione"
+    abuseReportResolved: "Quando una segnalazione è risolta"
+  deleteConfirm: "Vuoi davvero eliminare il Webhook?"
+_abuseReport:
+  _notificationRecipient:
+    createRecipient: "Aggiungi destinatario della segnalazione"
+    modifyRecipient: "Modifica destinatario della segnalazione"
+    recipientType: "Tipo di notifica"
+    _recipientType:
+      mail: "Email"
+      webhook: "Webhook"
+      _captions:
+        mail: "Quando ricevi un abuso, notifica l'amministrazione via email"
+        webhook: "Spedire una notifica al SystemWebhook specificato (sia quando si riceve una segnalazione, che quando viene risolta)"
+    keywords: "Parole chiave"
+    notifiedUser: "Profili da notificare"
+    notifiedWebhook: "Webhook da usare"
+    deleteConfirm: "Vuoi davvero rimuovere il destinatario della notifica?"
 _moderationLogTypes:
   createRole: "Ruolo creato"
   deleteRole: "Ruolo eliminato"
@@ -2429,6 +2478,12 @@ _moderationLogTypes:
   deleteAvatarDecoration: "Eliminazione decorazione della foto profilo"
   unsetUserAvatar: "Rimossa foto profilo"
   unsetUserBanner: "Rimossa intestazione profilo"
+  createSystemWebhook: "Crea un SystemWebhook"
+  updateSystemWebhook: "Modifica SystemWebhook"
+  deleteSystemWebhook: "Elimina SystemWebhook"
+  createAbuseReportNotificationRecipient: "Crea destinatario per le notifiche di segnalazioni"
+  updateAbuseReportNotificationRecipient: "Aggiorna destinatario notifiche di segnalazioni"
+  deleteAbuseReportNotificationRecipient: "Elimina destinatario notifiche di segnalazioni"
 _fileViewer:
   title: "Dettagli del file"
   type: "Tipo di file"
@@ -2554,6 +2609,8 @@ _urlPreviewSetting:
   userAgent: "User-Agent"
   userAgentDescription: "Definire con quale User-Agent si intende identificarsi durante l'acquisizione di un'anteprima. Se è vuoto, useremo il valore predefinito."
   summaryProxy: "Endpoint proxy che genera l'anteprima"
+  summaryProxyDescription: "Genera anteprime utilizzando un proxy Summaly anziché Misskey."
+  summaryProxyDescription2: "I parametri sono collegano al proxy come stringa query. Se il proxy non li supporta, verranno ignorati."
 _mediaControls:
   pip: "Sovraimpressione"
   playbackRate: "Velocità di riproduzione"
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index 7a33968e9e..774031f6f5 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -108,6 +108,7 @@ enterEmoji: "絵文字を入れてや"
 renote: "リノート"
 unrenote: "リノートやめる"
 renoted: "リノートしたで。"
+renotedToX: "{name}にリノートしたで"
 cantRenote: "この投稿はリノートできへんっぽい。"
 cantReRenote: "リノート自体はリノートできへんで。"
 quote: "引用"
@@ -313,6 +314,7 @@ selectFile: "ファイル選んでや"
 selectFiles: "ファイル選んでや"
 selectFolder: "フォルダ選んでや"
 selectFolders: "フォルダ選んでや"
+fileNotSelected: "ファイルが選択されてへんで"
 renameFile: "ファイル名をいらう"
 folderName: "フォルダー名"
 createFolder: "フォルダー作る"
@@ -468,6 +470,7 @@ retype: "もっかい入力"
 noteOf: "{user}はんのノート"
 quoteAttached: "引用付いとるで"
 quoteQuestion: "引用として添付してもええか？"
+attachAsFileQuestion: "クリップボードのテキストが長すぎるからテキストファイルとして添付してもええか？"
 noMessagesYet: "まだチャットはあらへんで"
 newMessageExists: "新しいメッセージがきたで"
 onlyOneFileCanBeAttached: "ごめんな、メッセージに添付できるファイルはひとつだけなんよ。"
@@ -832,6 +835,7 @@ administration: "管理"
 accounts: "アカウント"
 switch: "切り替え"
 noMaintainerInformationWarning: "管理者情報が設定されてへんで"
+noInquiryUrlWarning: "問い合わせ先URLが設定されてへんで。"
 noBotProtectionWarning: "Botプロテクションが設定されてへんで。"
 configure: "設定する"
 postToGallery: "ギャラリーへ投稿"
@@ -1923,8 +1927,6 @@ _sfx:
   note: "ノート"
   noteMy: "ノート(自分)"
   notification: "通知"
-  antenna: "アンテナ受信"
-  channel: "チャンネル通知"
   reaction: "ツッコミ選んどるとき"
 _soundSettings:
   driveFile: "ドライブん中の音使う"
@@ -2399,6 +2401,12 @@ _webhookSettings:
     renote: "リノートされるとき～！"
     reaction: "ツッコまれたとき～！"
     mention: "メンションがあるとき～！"
+  deleteConfirm: "ほんまにWebhookをほかしてもええんか？"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "メール"
+    deleteConfirm: "通知先を削除してもええか？"
 _moderationLogTypes:
   createRole: "ロールを追加すんで"
   deleteRole: "ロールほかす"
diff --git a/locales/kab-KAB.yml b/locales/kab-KAB.yml
index 22e24d3baa..d4aa36fa70 100644
--- a/locales/kab-KAB.yml
+++ b/locales/kab-KAB.yml
@@ -104,3 +104,7 @@ _deck:
   _columns:
     notifications: "Ilɣuyen"
     list: "Tibdarin"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "Imayl"
diff --git a/locales/ko-GS.yml b/locales/ko-GS.yml
index 9466aff01f..9323ed2a26 100644
--- a/locales/ko-GS.yml
+++ b/locales/ko-GS.yml
@@ -805,6 +805,10 @@ _deck:
     mentions: "받언 멘션"
 _webhookSettings:
   name: "이럼"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "전자우펜"
 _moderationLogTypes:
   suspend: "얼우기"
   deleteNote: "노트 뭉캐기"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 294a5a1520..e3b6d31910 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -52,14 +52,14 @@ deleteAndEditConfirm: "이 노트를 삭제한 뒤 다시 편집하시겠습니
 addToList: "리스트에 추가"
 addToAntenna: "안테나에 추가"
 sendMessage: "메시지 보내기"
-copyRSS: "RSS 복사"
-copyUsername: "사용자 이름 복사"
-copyUserId: "사용자 ID 복사"
+copyRSS: "RSS 주소 복사"
+copyUsername: "유저명 복사"
+copyUserId: "유저 ID 복사"
 copyNoteId: "노트 ID 복사"
 copyFileId: "파일 ID 복사"
 copyFolderId: "폴더 ID 복사"
 copyProfileUrl: "프로필 URL 복사"
-searchUser: "사용자 검색"
+searchUser: "유저 검색"
 reply: "답글"
 loadMore: "더 보기"
 showMore: "더 보기"
@@ -108,22 +108,25 @@ enterEmoji: "이모지 입력"
 renote: "리노트"
 unrenote: "리노트 취소"
 renoted: "리노트했습니다"
+renotedToX: "{name}명이 리노트했습니다."
 cantRenote: "이 게시물은 리노트 할 수 없습니다."
-cantReRenote: "리노트를 리노트할 수 없습니다."
+cantReRenote: "리노트를 리노트 할 수 없습니다."
 quote: "인용"
 inChannelRenote: "채널 내 리노트"
 inChannelQuote: "채널 내 인용"
+renoteToChannel: "채널에 리노트"
+renoteToOtherChannel: "다른 채널에 리노트"
 pinnedNote: "고정된 노트"
 pinned: "고정하기"
 you: "나"
 clickToShow: "클릭하여 보기"
 sensitive: "열람 주의"
 add: "추가"
-reaction: "반응"
-reactions: "반응"
+reaction: "리액션"
+reactions: "리액션"
 emojiPicker: "이모지 선택기"
-pinnedEmojisForReactionSettingDescription: "리액션을 할 때 프로필에 고정하여 표시할 이모지를 설정할 수 있습니다"
-pinnedEmojisSettingDescription: "이모지를 입력할 때 프로필에 고정하여 표시할 이모지를 설정할 수 있습니다"
+pinnedEmojisForReactionSettingDescription: "리액션을 할 때 이모지 선택기 상단에 표시할 이모지를 설정할 수 있습니다."
+pinnedEmojisSettingDescription: "이모지를 입력할 때 이모지 선택기 상단에 표시할 이모지를 설정할 수 있습니다."
 emojiPickerDisplay: "선택기 표시"
 overwriteFromPinnedEmojisForReaction: "리액션 설정을 덮어쓰기"
 overwriteFromPinnedEmojis: "일반 설정을 덮어쓰기"
@@ -136,7 +139,7 @@ unmarkAsSensitive: "열람주의 해제"
 enterFileName: "파일명을 입력"
 mute: "뮤트"
 unmute: "뮤트 해제"
-renoteMute: "리노트 뮤트하기"
+renoteMute: "리노트 뮤트"
 renoteUnmute: "리노트 뮤트 해제"
 block: "차단"
 unblock: "차단 해제"
@@ -174,12 +177,12 @@ flagShowTimelineReplies: "타임라인에 노트의 답글을 표시하기"
 flagShowTimelineRepliesDescription: "이 설정을 활성화하면 타임라인에 다른 유저 간의 답글을 표시합니다."
 autoAcceptFollowed: "팔로우 중인 유저로부터의 팔로우 요청을 자동 수락"
 addAccount: "계정 추가"
-reloadAccountsList: "계정 리스트 정보 갱신"
+reloadAccountsList: "계정 목록 새로고침"
 loginFailed: "로그인에 실패했습니다"
 showOnRemote: "리모트에서 보기"
 general: "일반"
 wallpaper: "배경"
-setWallpaper: "배경화면 설정"
+setWallpaper: "배경 설정"
 removeWallpaper: "배경 제거"
 searchWith: "검색: {q}"
 youHaveNoLists: "리스트가 없습니다"
@@ -187,7 +190,7 @@ followConfirm: "{name}님을 팔로우 하시겠습니까?"
 proxyAccount: "프록시 계정"
 proxyAccountDescription: "프록시 계정은 특정 조건 하에서 유저의 리모트 팔로우를 대행하는 계정입니다. 예를 들면, 유저가 리모트 유저를 리스트에 넣었을 때, 리스트에 들어간 유저를 아무도 팔로우한 적이 없다면 액티비티가 서버로 배달되지 않기 때문에, 대신 프록시 계정이 해당 유저를 팔로우하도록 합니다."
 host: "호스트"
-selectUser: "사용자 선택"
+selectUser: "유저 선택"
 recipient: "수신인"
 annotation: "내용에 대한 주석"
 federation: "연합"
@@ -230,7 +233,7 @@ noUsers: "아무도 없습니다"
 editProfile: "프로필 수정"
 noteDeleteConfirm: "이 노트를 삭제하시겠습니까?"
 pinLimitExceeded: "더 이상 고정할 수 없습니다."
-intro: "Misskey의 설치를 완료했습니다! 관리자 계정을 만들어 주세요."
+intro: "Misskey의 설치가 완료되었습니다! 관리자 계정을 생성해주세요."
 done: "완료"
 processing: "처리중"
 preview: "미리보기"
@@ -247,7 +250,7 @@ publishing: "배포 중"
 notResponding: "응답 없음"
 instanceFollowing: "서버의 팔로잉"
 instanceFollowers: "서버의 팔로워"
-instanceUsers: "서버의 유저"
+instanceUsers: "서버의 사용자"
 changePassword: "비밀번호 변경"
 security: "보안"
 retypedNotMatch: "입력이 일치하지 않습니다."
@@ -263,12 +266,12 @@ lookup: "찾아보기"
 announcements: "공지사항"
 imageUrl: "이미지 URL"
 remove: "삭제"
-removed: "삭제하였습니다"
+removed: "삭제했습니다"
 removeAreYouSure: "\"{x}\" 을(를) 삭제하시겠습니까?"
 deleteAreYouSure: "\"{x}\" 을(를) 삭제하시겠습니까?"
 resetAreYouSure: "초기화 하시겠습니까?"
 areYouSure: "계속 진행하시겠습니까?"
-saved: "저장하였습니다"
+saved: "저장했습니다"
 messaging: "대화"
 upload: "업로드"
 keepOriginalUploading: "원본 이미지를 유지"
@@ -296,7 +299,7 @@ activity: "활동"
 images: "이미지"
 image: "이미지"
 birthday: "생일"
-yearsOld: "만 {age} 세"
+yearsOld: "{age}세"
 registeredDate: "등록일"
 location: "장소"
 theme: "테마"
@@ -313,6 +316,7 @@ selectFile: "파일 선택"
 selectFiles: "파일 선택"
 selectFolder: "폴더 선택"
 selectFolders: "폴더 선택"
+fileNotSelected: "파일을 선택하지 않았습니다"
 renameFile: "파일 이름 변경"
 folderName: "폴더 이름"
 createFolder: "폴더 만들기"
@@ -370,7 +374,7 @@ inMb: "메가바이트 단위"
 bannerUrl: "배너 이미지 URL"
 backgroundImageUrl: "배경 이미지 URL"
 basicInfo: "기본 정보"
-pinnedUsers: "고정된 유저"
+pinnedUsers: "고정한 사용자"
 pinnedUsersDescription: "\"발견하기\" 페이지 등에 고정하고 싶은 유저를 한 줄에 한 명씩 적습니다."
 pinnedPages: "고정한 페이지"
 pinnedPagesDescription: "서버의 대문에 고정하고 싶은 페이지의 경로를 한 줄에 하나씩 적습니다."
@@ -437,13 +441,13 @@ moderationNote: "조정 기록"
 addModerationNote: "조정 기록 추가하기"
 moderationLogs: "모더레이션 로그"
 nUsersMentioned: "{n}명이 언급함"
-securityKeyAndPasskey: "보안 키 또는 패스 키"
+securityKeyAndPasskey: "보안 키 또는 패스키"
 securityKey: "보안 키"
 lastUsed: "마지막 사용"
 lastUsedAt: "마지막 사용: {t}"
 unregister: "등록 해제"
 passwordLessLogin: "비밀번호 없이 로그인"
-passwordLessLoginDescription: "비밀번호를 사용하지 않고 보안 키 또는 패스 키 등으로만 로그인합니다."
+passwordLessLoginDescription: "비밀번호 없이 보안 키 또는 패스키만 사용해서 로그인합니다."
 resetPassword: "비밀번호 재설정"
 newPasswordIs: "새로운 비밀번호는 \"{password}\" 입니다"
 reduceUiAnimation: "UI의 애니메이션을 줄이기"
@@ -468,6 +472,7 @@ retype: "다시 입력"
 noteOf: "{user}의 노트"
 quoteAttached: "인용함"
 quoteQuestion: "인용해서 작성하시겠습니까?"
+attachAsFileQuestion: "붙여넣으려는 글이 너무 깁니다. 텍스트 파일로 첨부하시겠습니까?"
 noMessagesYet: "아직 대화가 없습니다"
 newMessageExists: "새 메시지가 있습니다"
 onlyOneFileCanBeAttached: "메시지에 첨부할 수 있는 파일은 하나까지입니다"
@@ -486,7 +491,7 @@ strongPassword: "강한 비밀번호"
 passwordMatched: "일치합니다"
 passwordNotMatched: "일치하지 않습니다"
 signinWith: "{x}로 로그인"
-signinFailed: "로그인할 수 없습니다. 사용자명과 비밀번호를 확인하여 주십시오."
+signinFailed: "로그인할 수 없습니다. 사용자 이름과 비밀번호를 확인해 주십시오."
 or: "혹은"
 language: "언어"
 uiLanguage: "UI 표시 언어"
@@ -494,7 +499,7 @@ aboutX: "{x}에 대하여"
 emojiStyle: "이모지 스타일"
 native: "기본"
 disableDrawer: "드로어 메뉴를 사용하지 않기"
-showNoteActionsOnlyHover: "노트 액션 버튼을 마우스를 올렸을 때에만 표시"
+showNoteActionsOnlyHover: "마우스가 올라간 때에만 노트 동작 버튼을 표시하기"
 showReactionsCount: "노트의 반응 수를 표시하기"
 noHistory: "기록이 없습니다"
 signinHistory: "로그인 기록"
@@ -559,7 +564,7 @@ popout: "새 창으로 열기"
 volume: "음량"
 masterVolume: "마스터 볼륨"
 notUseSound: "음소거 하기"
-useSoundOnlyWhenActive: "Misskey가 활성화 되어져 있을 때만 소리 출력하기"
+useSoundOnlyWhenActive: "Misskey를 활성화한 때에만 소리를 출력하기"
 details: "자세히"
 chooseEmoji: "이모지 선택"
 unableToProcess: "작업을 완료할 수 없습니다"
@@ -588,7 +593,7 @@ deleteAllFiles: "모든 파일 삭제"
 deleteAllFilesConfirm: "모든 파일을 삭제하시겠습니까?"
 removeAllFollowing: "모든 팔로잉 해제"
 removeAllFollowingDescription: "{host} 서버의 모든 팔로잉을 해제합니다. 해당 서버가 더 이상 존재하지 않는 경우 등에 실행해 주세요."
-userSuspended: "이 계정은 정지된 상태입니다."
+userSuspended: "이 사용자는 정지되었습니다."
 userSilenced: "이 계정은 사일런스된 상태입니다."
 yourAccountSuspendedTitle: "계정이 정지되었습니다"
 yourAccountSuspendedDescription: "이 계정은 서버의 이용 약관을 위반하거나, 기타 다른 이유로 인해 정지되었습니다. 자세한 사항은 관리자에게 문의해 주십시오. 계정을 새로 생성하지 마십시오."
@@ -752,7 +757,7 @@ experimentalFeatures: "실험실"
 experimental: "실험실"
 thisIsExperimentalFeature: "이 기능은 실험적인 기능입니다. 사양이 변경되거나 정상적으로 동작하지 않을 가능성이 있습니다."
 developer: "개발자"
-makeExplorable: "\"발견하기\"에 내 계정 보이기"
+makeExplorable: "계정을 쉽게 발견하도록 하기"
 makeExplorableDescription: "비활성화하면 \"발견하기\"에 나의 계정을 표시하지 않습니다."
 showGapBetweenNotesInTimeline: "타임라인의 노트 사이를 띄워서 표시"
 duplicate: "복제"
@@ -798,7 +803,7 @@ emailNotification: "메일 알림"
 publish: "게시"
 inChannelSearch: "채널에서 검색"
 useReactionPickerForContextMenu: "우클릭하여 리액션 선택기 열기"
-typingUsers: "{users} 님이 입력하고 있어요.."
+typingUsers: "{users}님이 입력 중"
 jumpToSpecifiedDate: "특정 날짜로 이동"
 showingPastTimeline: "과거의 타임라인을 표시하고 있어요"
 clear: "지우기"
@@ -832,6 +837,7 @@ administration: "관리"
 accounts: "계정"
 switch: "전환"
 noMaintainerInformationWarning: "관리자 정보가 설정되어 있지 않습니다."
+noInquiryUrlWarning: "문의처 주소를 설정하지 않았습니다."
 noBotProtectionWarning: "Bot 방어가 설정되어 있지 않습니다."
 configure: "설정하기"
 postToGallery: "갤러리에 업로드"
@@ -1021,6 +1027,7 @@ thisPostMayBeAnnoyingHome: "홈에 게시"
 thisPostMayBeAnnoyingCancel: "그만두기"
 thisPostMayBeAnnoyingIgnore: "이대로 게시"
 collapseRenotes: "이미 본 리노트를 간략화하기"
+collapseRenotesDescription: "반응이나 리노트를 한 노트를 접어서 표시합니다."
 internalServerError: "내부 서버 오류"
 internalServerErrorDescription: "내부 서버에서 예기치 않은 오류가 발생했습니다."
 copyErrorInfo: "오류 정보 복사"
@@ -1090,7 +1097,7 @@ serverRules: "서버 규칙"
 pleaseConfirmBelowBeforeSignup: "이 서버에 가입하기 전에 아래 사항을 확인하여 주십시오."
 pleaseAgreeAllToContinue: "계속하시려면 모든 항목에 동의하십시오."
 continue: "계속"
-preservedUsernames: "예약된 사용자명"
+preservedUsernames: "예약한 사용자 이름"
 preservedUsernamesDescription: "예약할 사용자명을 한 줄에 하나씩 입력합니다. 여기에서 지정한 사용자명으로는 계정을 생성할 수 없게 됩니다. 단, 관리자 권한으로 계정을 생성할 때에는 해당되지 않으며, 이미 존재하는 계정도 영향을 받지 않습니다."
 createNoteFromTheFile: "이 파일로 노트를 작성"
 archive: "아카이브"
@@ -1230,10 +1237,20 @@ useTotp: "일회용 비밀번호 사용"
 useBackupCode: "백업 코드 사용"
 launchApp: "앱 실행"
 useNativeUIForVideoAudioPlayer: "브라우저 UI에서 미디어 재생"
+keepOriginalFilename: "원본 파일 이름을 유지"
+keepOriginalFilenameDescription: "이 설정을 끄면 업로드를 할 때 파일 이름이 자동으로 무작위 문자열로 바뀝니다."
+noDescription: "설명문이 없습니다"
+alwaysConfirmFollow: "팔로우일 때 항상 확인하기"
+inquiry: "문의하기"
 _delivery:
+  status: "전송 상태"
   stop: "정지됨"
+  resume: "전송 다시 시작"
   _type:
     none: "배포 중"
+    manuallySuspended: "수동 정지 중"
+    goneSuspended: "서버 삭제를 이유로 정지 중"
+    autoSuspendedForNotResponding: "서버 응답 없음을 이유로 정지 중"
 _bubbleGame:
   howToPlay: "설명"
   hold: "홀드"
@@ -1359,6 +1376,8 @@ _serverSettings:
   fanoutTimelineDescription: "활성화하면 각종 타임라인을 가져올 때의 성능을 대폭 향상하며, 데이터베이스의 부하를 줄일 수 있습니다. 단, Redis의 메모리 사용량이 증가합니다. 서버의 메모리 용량이 작거나, 서비스가 불안정해지는 경우 비활성화할 수 있습니다."
   fanoutTimelineDbFallback: "데이터베이스를 예비로 사용하기"
   fanoutTimelineDbFallbackDescription: "활성화하면 타임라인의 캐시되어 있지 않은 부분에 대해 DB에 질의하여 정보를 가져옵니다. 비활성화하면 이를 실행하지 않음으로써 서버의 부하를 줄일 수 있지만, 타임라인에서 가져올 수 있는 게시물 범위가 한정됩니다."
+  inquiryUrl: "문의처 URL"
+  inquiryUrlDescription: "서버 운영자에게 보내는 문의 양식의 URL이나 운영자의 연락처 등이 적힌 웹 페이지의 URL을 설정합니다."
 _accountMigration:
   moveFrom: "다른 계정에서 이 계정으로 이사"
   moveFromSub: "다른 계정에 대한 별칭을 생성"
@@ -1678,7 +1697,7 @@ _role:
     pinMax: "고정할 수 있는 노트 수"
     antennaMax: "만들 수 있는 안테나 수"
     wordMuteMax: "단어 뮤트할 수 있는 문자 수"
-    webhookMax: "만들 수 있는 웹후크 수"
+    webhookMax: "만들 수 있는 Webhook 수"
     clipMax: "만들 수 있는 클립 수"
     noteEachClipsMax: "클립에 넣을 수 있는 노트 수"
     userListMax: "만들 수 있는 사용자 리스트 수"
@@ -1693,6 +1712,11 @@ _role:
     roleAssignedTo: "수동 역할에 이미 할당됨"
     isLocal: "로컬 사용자"
     isRemote: "리모트 사용자"
+    isCat: "고양이 사용자"
+    isBot: "봇 사용자"
+    isSuspended: "정지된 사용자"
+    isLocked: "잠금 계정 사용자"
+    isExplorable: "‘계정을 쉽게 발견하도록 하기’를 활성화한 사용자"
     createdLessThan: "가입한 지 다음 일수 이내인 유저"
     createdMoreThan: "가입한 지 다음 일수 이상인 유저"
     followersLessThanOrEq: "팔로워 수가 다음 이하인 유저"
@@ -1913,8 +1937,6 @@ _sfx:
   note: "새 노트"
   noteMy: "내 노트"
   notification: "알림"
-  antenna: "안테나 수신"
-  channel: "채널 알림"
   reaction: "리액션 선택"
 _soundSettings:
   driveFile: "드라이브에 있는 오디오를 사용"
@@ -1975,6 +1997,7 @@ _2fa:
   backupCodesDescription: "인증 앱을 사용할 수 없게 된 경우 아래 백업 코드를 사용하여 계정에 액세스 할 수 있습니다.이 코드들은 반드시 안전한 장소에 보관하십시오.각 코드는 한 번만 사용할 수 있습니다."
   backupCodeUsedWarning: "백업 코드가 사용되었습니다.인증 앱을 사용할 수 없게 된 경우, 조속히 인증 앱을 다시 설정해 주십시오."
   backupCodesExhaustedWarning: "백업 코드가 모두 사용되었습니다.인증 앱을 사용할 수 없는 경우 더 이상 계정에 액세스하는 것이 불가능합니다.인증 앱을 다시 등록해 주세요."
+  moreDetailedGuideHere: "여기에 자세한 설명이 있습니다"
 _permissions:
   "read:account": "계정의 정보를 봅니다"
   "write:account": "계정의 정보를 변경합니다"
@@ -2163,7 +2186,7 @@ _postForm:
     c: "무엇을 생각하고 있나요?"
     d: "말하고 싶은 게 있나요?"
     e: "여기에 적어 주세요"
-    f: "글 쓰기를 기다려요…"
+    f: "작성해주시길 기다리고 있어요..."
 _profile:
   name: "이름"
   username: "사용자 이름"
@@ -2338,6 +2361,7 @@ _deck:
   alwaysShowMainColumn: "메인 칼럼 항상 표시"
   columnAlign: "칼럼 정렬"
   addColumn: "칼럼 추가"
+  newNoteNotificationSettings: "새 노트 알림 설정"
   configureColumn: "칼럼 설정"
   swapLeft: "왼쪽으로 이동"
   swapRight: "오른쪽으로 이동"
@@ -2376,6 +2400,7 @@ _drivecleaner:
   orderByCreatedAtAsc: "등록일이 오래된 순"
 _webhookSettings:
   createWebhook: "Webhook 생성"
+  modifyWebhook: "Webhook 수정"
   name: "이름"
   secret: "시크릿"
   events: "Webhook을 실행할 타이밍"
@@ -2388,6 +2413,25 @@ _webhookSettings:
     renote: "누군가 내 글을 리노트했을 때"
     reaction: "누군가 내 노트에 리액션했을 때"
     mention: "누군가 나를 멘션했을 때"
+  _systemEvents:
+    abuseReport: "유저로부터 신고를 받았을 때"
+    abuseReportResolved: "받은 신고를 처리했을 때"
+  deleteConfirm: "Webhook을 삭제할까요?"
+_abuseReport:
+  _notificationRecipient:
+    createRecipient: "신고 수신자 추가"
+    modifyRecipient: "신고 수신자 편집"
+    recipientType: "알림 수신 유형"
+    _recipientType:
+      mail: "이메일"
+      webhook: "Webhook"
+      _captions:
+        mail: "모더레이터 권한을 가진 사용자의 이메일 주소에 알림을 보냅니다 (신고를 받은 때에만)"
+        webhook: "지정한 SystemWebhook에 알림을 보냅니다 (신고를 받은 때와 해결했을 때에 송신)"
+    keywords: "키워드"
+    notifiedUser: "신고 알림을 보낼 유저"
+    notifiedWebhook: "사용할 Webhook"
+    deleteConfirm: "수신자를 삭제하시겠습니까?"
 _moderationLogTypes:
   createRole: "역할 생성"
   deleteRole: "역할 삭제"
@@ -2403,7 +2447,7 @@ _moderationLogTypes:
   updateUserNote: "조정 기록 갱신"
   deleteDriveFile: "파일 삭제"
   deleteNote: "노트 삭제"
-  createGlobalAnnouncement: "모든 공지사항 만들기"
+  createGlobalAnnouncement: "전역 공지사항 생성"
   createUserAnnouncement: "사용자 공지사항 만들기"
   updateGlobalAnnouncement: "모든 공지사항 수정"
   updateUserAnnouncement: "사용자 공지사항 수정"
@@ -2425,6 +2469,12 @@ _moderationLogTypes:
   deleteAvatarDecoration: "아바타 장식 삭제"
   unsetUserAvatar: "유저 아바타 제거"
   unsetUserBanner: "유저 배너 제거"
+  createSystemWebhook: "SystemWebhook을 생성"
+  updateSystemWebhook: "SystemWebhook을 수정"
+  deleteSystemWebhook: "SystemWebhook을 삭제"
+  createAbuseReportNotificationRecipient: "신고 알림 수신자 생성"
+  updateAbuseReportNotificationRecipient: "신고 알림 수신자 편집"
+  deleteAbuseReportNotificationRecipient: "신고 알림 수신자 삭제"
 _fileViewer:
   title: "파일 상세"
   type: "파일 유형"
diff --git a/locales/lo-LA.yml b/locales/lo-LA.yml
index 087bac3745..1bead5635d 100644
--- a/locales/lo-LA.yml
+++ b/locales/lo-LA.yml
@@ -18,15 +18,15 @@ enterUsername: "ປ້ອນຊື່ຜູ້ໃຊ້"
 renotedBy: "Renoted ໂດຍ {user}"
 noNotes: "ບໍ່ມີ note"
 noNotifications: "ບໍ່ມີການແຈ້ງເຕືອນ"
-instance: "ອີນສະແຕນ"
-settings: "ກຳນົດຄ່າ"
+instance: "ເຊີຟເວີຣ໌"
+settings: "ຕັ້ງຄ່າ"
 notificationSettings: "ຕັ້ງຄ່າການແຈ້ງເຕືອນ"
 basicSettings: "ການຕັ້ງຄ່າພື້ນຖານ"
 otherSettings: "ການຕັ້ງຄ່າອື່ນໆ"
-openInWindow: "ເປີດໃນປ່ອງຢ້ຽມ"
-profile: "ໂພຼຟາຍ"
+openInWindow: "ເປີດໃນ window"
+profile: "ໂປຣໄຟລ໌"
 timeline: "ໄທມ໌ໄລນ໌"
-noAccountDescription: "ຜູ້ໃຊ້ນີ້ຍັງບໍ່ໄດ້ຂຽນໃນຊີວະປະຫວັດຂອງເຂົາເຈົ້າເທື່ອ"
+noAccountDescription: "ຜູ້ໃຊ້ຄົນນີ້ຍັງບໍ່ໄດ້ຂຽນຄຳແນະນຳໂຕ"
 login: "ເຂົ້າ​ສູ່​ລະ​ບົບ"
 loggingIn: "ກຳລັງເຂົ້າສູ່ລະບົບ..."
 logout: "ອອກ​ຈາກ​ລະ​ບົບ"
@@ -37,7 +37,7 @@ users: "ຜູ້ໃຊ້"
 addUser: "ເພີ່ມຜູ້ໃຊ້"
 favorite: "ເພີ່ມໃສ່ລາຍການທີ່ມັກ"
 favorites: "ລາຍການທີ່ມັກ"
-unfavorite: "ລຶບອອກຈາກລາຍການທີ່ມັກ"
+unfavorite: "ເອົາອອກຈາກລາຍການທີ່ມັກ"
 favorited: "ເພີ່ມໃສ່ລາຍການທີ່ມັກແລ້ວ"
 alreadyFavorited: "ເພີ່ມເຂົ້າໃນລາຍການທີ່ມັກແລ້ວ."
 cantFavorite: "ບໍ່ສາມາດເພີ່ມໃສ່ລາຍການທີ່ມັກໄດ້."
@@ -48,41 +48,41 @@ copyLink: "ຄັດລອກລິ້ງ"
 copyLinkRenote: "ຄັດລອກລິ້ງຂອງ renote"
 delete: "ລຶບ"
 deleteAndEdit: "ລຶບ​ແລະ​ແກ້​ໄຂ​"
-deleteAndEditConfirm: "ເຈົ້າ​ແນ່​ໃຈ​ບໍ່? ທີ່ທ່ານຕ້ອງການທີ່ຈະລຶບ note ນີ້ ແລະແກ້ໄຂມັນ ທ່ານອາດຈະສູນເສຍ reaction, renote, ແລະການຕອບກັບທັງໝົດ"
+deleteAndEditConfirm: "ຕ້ອງການລຶບ note ນີ້ແລະແກ້ໄຂໃໝ່ແມ່ນບໍ່? reaction, renote ແລະການຕອບກັບຕໍ່ note ນີ້ ທັງເບິດຈະຖືກລຶບອອກ"
 addToList: "ເພີ່ມໃສ່ລາຍຊື່"
 addToAntenna: "ເພີ່ມໃສ່ເສົາອາກາດ"
 sendMessage: "ສົ່ງຂໍ້ຄວາມ"
-copyRSS: "ສຳເນົາ RSS"
-copyUsername: "ສຳເນົາຊື່ຜູ້ໃຊ້"
-copyUserId: "ສຳເນົາ ID ຜູ້ໃຊ້"
-copyNoteId: "ສຳເນົາ ID ບັນທຶກ"
-copyFileId: "ສຳເນົາ ID ໄຟລ໌"
-copyFolderId: "ສຳເນົາ ID ໂຟນເດີ"
-copyProfileUrl: "ສຳເນົາ URL ໂປຣໄຟລ໌"
+copyRSS: "ຄັດລອກ RSS"
+copyUsername: "ຄັດລອກຊື່ຜູ້ໃຊ້"
+copyUserId: "ຄັດລອກ ID ຜູ້ໃຊ້"
+copyNoteId: "ຄັດລອກ ID ຂອງ note"
+copyFileId: "ຄັດລອກ ID ໄຟລ໌"
+copyFolderId: "ຄັດລອກ ID ໂຟລ໌ເດີຣ໌"
+copyProfileUrl: "ຄັດລອກ URL ໂປຣໄຟລ໌"
 searchUser: "ຄົ້ນຫາຜູ້ໃຊ້"
-reply: "ຕອບ​ໄປ​ທີ"
+reply: "ຕອບ​ກັບ"
 loadMore: "ໂຫຼດເພີ່ມເຕີມ"
 showMore: "ໂຫຼດເພີ່ມເຕີມ"
 showLess: "ປິດ"
-youGotNewFollower: "ໄດ້ຕິດຕາມທ່ານ"
-receiveFollowRequest: "ປະຕິບັດຕາມຄໍາຮ້ອງຂໍທີ່ໄດ້ຮັບ"
-followRequestAccepted: "ຜູ້ຕິດຕາມໄດ້ຍອມຮັບຄໍາຮ້ອງຂໍຂອງທ່ານ"
-mention: "ກ່າວຖືງ"
-mentions: "ກ່າວເຖິງ"
+youGotNewFollower: "ໄດ້ຕິດຕາມເຈົ້າ"
+receiveFollowRequest: "ມີຄຳຂໍຕິດຕາມສົ່ງມາ"
+followRequestAccepted: "ການຕິດຕາມໄດ້ຮັບອນຸຍາດແລ້ວ"
+mention: "ເວົ້າເຖີງ"
+mentions: "ເວົ້າເຖີງເຈົ້າ"
 directNotes: "ໂພສ Direct note"
 importAndExport: "ນໍາເຂົ້າ / ສົ່ງອອກ"
 import: "ນຳເຂົ້າ"
 export: "ສົ່ງອອກ"
 files: "ໄຟລ໌"
 download: "ດາວໂຫລດ"
-driveFileDeleteConfirm: "ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການລຶບໄຟລ໌ \"{name}\"? note ທີ່ມີໄຟລ໌ແນບນີ້ຈະຖືກລຶບຖິ້ມ"
-unfollowConfirm: "ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການເຊົາຕິດຕາມ {name}?"
-exportRequested: "ໃນເວລາທີ່ທ່ານໄດ້ຮ້ອງຂໍການສົ່ງອອກ ມັນອາດຈະໃຊ້ເວລາບາງເວລາ ແລະມັນຈະຖືກເພີ່ມໃສ່ drive ຂອງທ່ານເມື່ອມັນສຳເລັດແລ້ວ"
-importRequested: "ໃນເວລາທີ່ທ່ານໄດ້ຮ້ອງຂໍການນໍາເຂົ້າ ມັນອາດຈະໃຊ້ເວລາບາງເວລາ"
+driveFileDeleteConfirm: "ຕ້ອງການລຶບໄຟລ໌ “{name}” ແມ່ນບໍ່? Note ທີ່ແນບມາກັບໄຟລ໌ນີ້ຈະຖືກລຶບອອກ"
+unfollowConfirm: "ຕ້ອງການເລີກຕິດຕາມ {name} ແມ່ນບໍ່?"
+exportRequested: "ເຈົ້າໄດ້ຮ້ອງຂໍການສົ່ງອອກ ອາດໃຊ້ເວລາຈັກໜ່ອຍ ເມື່ອແລ້ວຈະຖືກເພີ່ມໃສ່ drive"
+importRequested: "ເຈົ້າໄດ້ຮ້ອງຂໍການນຳເຂົ້າ ການດຳເນິນການນີ້ອາດໃຊ້ເວລາຈັກໜ່ອຍ"
 lists: "ລາຍການ"
-noLists: "ທ່ານ​ບໍ່​ມີ​ລາຍ​ການ​ໃດໆ​"
-note: "ບັນທຶກ"
-notes: "ບັນທຶກ"
+noLists: "ບໍ່​ມີ​ລາຍ​ການ​ໃດໆ​"
+note: "Note"
+notes: "Note"
 following: "ກຳລັງຕິດຕາມ"
 followers: "ຜູ້ຕິດຕາມ"
 followsYou: "ຕິດ​ຕາມ​ເຈົ້າ"
@@ -124,11 +124,11 @@ reactions: "reaction"
 attachCancel: "ເອົາໄຟລ໌ແນບ"
 mute: "ປີດສຽງ"
 unmute: "ເປີດສຽງ"
-block: "ບ໋ອກ"
-unblock: "ຍົກເລີກກາຮົບລັອກ"
+block: "ບລັອກ"
+unblock: "ເລີກບລັອກ"
 suspend: "ລະງັບ"
 unsuspend: "ເຊົາ​ລະ​ງັບ"
-selectList: "ເລືອກບັນຊີລາຍການ"
+selectList: "ເລືອກລາຍຊື່"
 editList: "ແກ້ໄຂລາຍຊື່"
 selectChannel: "ເລືອກຊ່ອງ"
 selectAntenna: "ເລືອກເສົາອາກາດ"
@@ -151,30 +151,30 @@ flagShowTimelineRepliesDescription: "ສະແດງການຕອບກັບ
 autoAcceptFollowed: "ອະນຸມັດອັດຕະໂນມັດຕາມຄຳຮ້ອງຂໍຈາກຜູ້ໃຊ້ທີ່ທ່ານກຳລັງຕິດຕາມຢູ່"
 addAccount: "ເພີ່ມບັນຊີ"
 loginFailed: "ການເຂົ້າສູ່ລະບົບບໍ່ສຳເລັດ"
-showOnRemote: "ເບິ່ງຢູ່ໃນຕົວຢ່າງໄລຍະໄກ"
+showOnRemote: "ເບິ່ງໃນເຊີຟເວີຣ໌ໄລຍະໄກ"
 general: "ທົ່ວໄປ"
 wallpaper: "ພາບພື້ນຫລັງ"
 setWallpaper: "ຕັ້ງເປັນພາບພື້ນຫຼັງ"
 removeWallpaper: "ລຶບຮູບວໍເປເປີອອກ"
 searchWith: "ຊອກຫາ: {q}"
-youHaveNoLists: "ທ່ານ​ບໍ່​ມີ​ລາຍ​ການ​ໃດໆ​"
+youHaveNoLists: "ເຈົ້າບໍ່ມີລາຍຊື່ໃດໆ"
 proxyAccount: "ບັນຊີພຣັອກຊີ"
-host: "ໂຮດສ"
+host: "ໂຮສຕ໌"
 selectUser: "ເລືອກຜູ້ໃຊ້"
 recipient: "ເຖິງ"
 annotation: "ຄຳເຫັນ"
 federation: "ສະຫະພັນ"
-instances: "ອີນສະແຕນ"
+instances: "ເຊີຟເວີຣ໌"
 registeredAt: "ລົງທະບຽນຢູ່"
 storageUsage: "ບ່ອນ​ຈັດ​ເກັບ​ຂໍ້​ມູນທີ່ໃຊ້"
-charts: "ອັນດັບເພງ"
+charts: "ແຜນພູມ"
 perHour: "ຕໍ່ຊົ່ວໂມງ"
 perDay: "ຕໍ່​ມື້"
 stopActivityDelivery: "ຢຸດເຊົາການສົ່ງກິດຈະກໍາ"
 blockThisInstance: "ຂັດຂວາງຕົວຢ່າງນີ້"
 operations: "ການດຳເນີນງານ"
 software: "ຊອບແວ"
-version: "ສະບັບ"
+version: "ເວີຣ໌ຊັນ"
 metadata: "Metadata"
 withNFiles: "{n} ໄຟລ໌(s)"
 monitor: "ຈໍພາບ"
@@ -199,15 +199,15 @@ federating: "ສະຫະພັນ"
 blocked: "ບລັອກແລ້ວ "
 suspended: "ໂຈະ"
 all: "ທັງໝົດ"
-subscribing: "ສະໝັກສະມາຊິກແລັວ"
-publishing: "ການ​ພິມ​ເຜີຍ​ແຜ່"
+subscribing: "ກຳລັງສະມັກສະມາຊິກ"
+publishing: "ກຳລັງ​ເຜີຍ​ແພ່"
 notResponding: "ບໍ່ຕອບສະໜອງ"
-instanceFollowing: "ກຳລັງຕິດຕາມສຸດຕົວຢ່າງ"
-instanceFollowers: "ຜູ້ຕິດຕາມຕົວຢ່າງ"
-instanceUsers: "ຜູ້​ຊົມ​ໃຊ້​ຂອງ​ຕົວ​ຢ່າງ​ນີ້​"
+instanceFollowing: "ກຳລັງຕິດຕາມບົນເຊີຟເວີຣ໌"
+instanceFollowers: "ຜູ້ຕິດຕາມຂອງເຊີຟເວີຣ໌"
+instanceUsers: "ຜູ້​ໃຊ້​ຂອງ​ເຊີຟເວີຣ໌ນີ້"
 changePassword: "ປ່ຽນ​ລະ​ຫັດ​ຜ່ານ"
 security: "ຄວາມປອດໄພ"
-retypedNotMatch: "ວັດສະດຸປ້ອນບໍ່ກົງກັນ"
+retypedNotMatch: "ປ້ອນຂໍ້ມູນບໍ່ກົງກັນ"
 currentPassword: "ລະຫັດຜ່ານປະຈຸບັນ"
 newPassword: "ລະຫັດຜ່ານໃໝ່"
 newPasswordRetype: "ໃສ່ລະຫັດຜ່ານໃໝ່ອີກເທື່ອໜຶ່ງ"
@@ -223,14 +223,14 @@ remove: "ລຶບ"
 removed: "ລຶບແລ້ວ"
 resetAreYouSure: "ຣີ​ເຊັດບໍ?"
 saved: "ບັນທຶກແລ້ວ"
-messaging: "ແຊ໋ດ"
+messaging: "ແຊັຕ"
 upload: "ອັບໂຫຼດ"
 keepOriginalUploading: "ຮັກສາຮູບພາບຕົ້ນສະບັບ"
 fromDrive: "ຈາກ Drive"
 fromUrl: "ຈາກ URL"
 uploadFromUrl: "ອັບໂຫຼດຈາກ URL"
 uploadFromUrlDescription: "URL ຂອງໄຟລ໌ທີ່ທ່ານຕ້ອງການອັບໂຫລດ"
-uploadFromUrlRequested: "ຮ້ອງຂໍການອັບໂຫລດ"
+uploadFromUrlRequested: "ຮ້ອງຂໍການອັບໂຫລດແລ້ວ"
 explore: "ສຳຫຼວດ"
 messageRead: "ອ່ານແລ້ວ"
 startMessaging: "ເລີ່ມການສົນທະນາໃໝ່"
@@ -244,47 +244,47 @@ images: "ຮູບພາບ"
 image: "ຮູບພາບ"
 birthday: "ວັນເກີດ"
 yearsOld: "{age} ປີ"
-registeredDate: "ວັນທີ່ເປັນສະມາຊິກ"
+registeredDate: "ວັນທີ່ລົງທະບຽນ"
 location: "ທີ່ຕັ້ງ"
-theme: "ແທ໋ມ"
-themeForLightMode: "ຮູບແບບສີສັນເພື່ອໃຊ້ໃນໂໝດແສງ"
-themeForDarkMode: "ຮູບແບບສີສັນທີ່ຈະໃຊ້ຢູ່ໃນໂໝດມືດ"
+theme: "Theme"
+themeForLightMode: "Theme ໃຊ້ໃນໂໝດສະຫວ່າງ"
+themeForDarkMode: "Theme ໃຊ້ໃນໂໝດມືດ"
 light: "ສະຫວ່າງ"
 dark: "ມືດ"
 lightThemes: "ຊຸດຮູບແບບສະຫວ່າງ"
 darkThemes: "ຮູບແບບສີສັນມືດ"
 syncDeviceDarkMode: "ຊິງຄ໌ໂໝດມືດກັບການຕັ້ງຄ່າທົ່ວອຸປະກອນ"
-drive: "ຂັບ"
+drive: "Drive"
 fileName: "ຊື່ໄຟລ໌"
 selectFile: "ເລືອກໄຟລ໌"
 selectFiles: "ເລືອກໄຟລ໌"
 selectFolder: "ເລືອກໂຟລເດີ"
 selectFolders: "ເລືອກໂຟລເດີ"
 renameFile: "ປ່ຽນຊື່ໄຟລ໌"
-folderName: "ຊື່ໂຟນເດີ"
+folderName: "ຊື່ໂຟລເດີຣ໌"
 createFolder: "​ສ້າງ​ໂຟ​ລ​ເດີ"
 renameFolder: "ປ່ຽນຊື່ໂຟນເດີນີ້"
 deleteFolder: "ລົບໂຟ​ລ​ເດີ​"
 addFile: "ເພີ່ມໄຟລ໌"
 emptyDrive: "Drive ຂອງທ່ານຫວ່າງເປົ່າ"
-emptyFolder: "ໂຟນເດີນີ້ເປົ່າຫວ່າງ"
+emptyFolder: "ໂຟລເດີຣ໌ນີ້ວ່າງເປົ່າ"
 unableToDelete: "ບໍ່​ສາ​ມາດລົບໄດ້"
 inputNewFileName: "ໃສ່ຊື່ໄຟລ໌ໃໝ່"
 inputNewDescription: "ໃສ່ຄຳບັນຍາຍໃໝ່"
 inputNewFolderName: "ໃສ່ຊື່ໂຟນເດີໃໝ່"
 circularReferenceFolder: "ໂຟນເດີປາຍທາງແມ່ນໂຟນເດີຍ່ອຍຂອງໂຟນເດີທີ່ທ່ານຕ້ອງການຍ້າຍ"
 rename: "ປ່ຽນຊື່"
-doNothing: "ບໍ່ສົນໃຈ"
-watch: "ເບິ່ງ"
-unwatch: "ຢຸດເບິ່ງ"
+doNothing: "ຢ່າມັນ"
+watch: "ເພັ່ງເລັງ"
+unwatch: "ຢຸດເພັ່ງເລັງ"
 accept: "ອະນຸຍາດ"
 reject: "ປະຕິເສດ"
 normal: "ປົກກະຕິ"
 instanceName: "ຊື່ເຊີເວີ້"
-instanceDescription: "ຄໍາອະທິບາຍຕົວຢ່າງ"
+instanceDescription: "ຄຳອະທິບາຍແນະນຳເຊີຟເວີຣ໌"
 maintainerName: "ຜູ້ດູແລ"
-maintainerEmail: "ອີເມວ admin"
-tosUrl: "ເງື່ອນໄຂການໃຫ້ບໍລິການ URL"
+maintainerEmail: "ອີເມລຜູ້ດູແລ"
+tosUrl: " URL ເງື່ອນໄຂການໃຫ້ບໍລິການ"
 thisYear: "ປີນີ້"
 thisMonth: "ເດືອນນີ້"
 today: "ມື້ນີ້"
@@ -292,34 +292,34 @@ dayX: "ວັນ {day}"
 monthX: "ເດືອນ {month}"
 yearX: "ປີ {year}"
 pages: "ໜ້າ"
-integration: "ຄວາມສຳພັນຂອງ"
+integration: "ເຊື່ອມໂຍງ"
 connectService: "ເຊື່ອມຕໍ່"
 disconnectService: "ຕັດການເຊື່ອມຕໍ່"
 enableLocalTimeline: "ເປີດໃຊ້ທາມລາຍທ້ອງຖິ່ນ"
 enableGlobalTimeline: "ເປີດໃຊ້ທາມລາຍທົ່ວໂລກ"
-disablingTimelinesInfo: "ຜູ້ເບິ່ງແຍງລະບົບ ແລະຜູ້ຄວບຄຸມຈະມີການເຂົ້າເຖິງທຸກກຳນົດເວລາ, ເຖິງແມ່ນວ່າຈະບໍ່ໄດ້ເປີດໃຊ້ງານກໍຕາມ"
+disablingTimelinesInfo: "ຜູ້ດູແລລະບບແລະຜູ້ຄວບຄຸມຈະສາມາດເຂົ້າເຖີງໄທມ໌ໄລນ໌ທັ້ງເບີດ ເຖີງວ່າຈະບໍ່ໄດ້ເປີດໃຊ້ງານກໍ່ຕາມ"
 registration: "ລົງທະບຽນ"
 enableRegistration: "ເປີດໃຊ້ການລົງທະບຽນຜູ້ໃຊ້ໃໝ່"
 invite: "ເຊີນ"
-driveCapacityPerLocalAccount: "ຄວາມອາດສາມາດຂັບຕໍ່ຜູ້ໃຊ້ທ້ອງຖິ່ນ"
-driveCapacityPerRemoteAccount: "ໄດຣຟ໌ຄວາມອາດສາມາດຕໍ່ຜູ້ໃຊ້ທາງໄກ"
+driveCapacityPerLocalAccount: "ຄວາມຈຸຂອງ drive ຕໍ່ຜູ້ໃຊ້ທ້ອງຖິ່ນ"
+driveCapacityPerRemoteAccount: "ຄວາມຈຸຂອງ drive ຕໍ່ຜູ້ໃຊ້ໄລຍະໄກ"
 basicInfo: "ຂໍ້ມຸນເບື້ອງຕົ້ນ"
-pinnedNotes: "ບັນທຶກທີ່ປັກໝຸດໄວ້"
-hcaptchaSiteKey: "ກະແຈໄຊທ໌"
-hcaptchaSecretKey: "ກະແຈລັບ"
-mcaptchaSiteKey: "ກະແຈໄຊທ໌"
-mcaptchaSecretKey: "ກະແຈລັບ"
+pinnedNotes: "Note ທີ່ປັກໝຸດໄວ້"
+hcaptchaSiteKey: "Site key"
+hcaptchaSecretKey: "Secret key"
+mcaptchaSiteKey: "Site key"
+mcaptchaSecretKey: "Secret Key"
 recaptcha: "reCAPTCHA"
-enableRecaptcha: "ເປີດໃຊ້ງານລີແຄ໋ບຈາ"
-recaptchaSiteKey: "ກະແຈໄຊທ໌"
-recaptchaSecretKey: "ກະແຈລັບ"
-turnstileSiteKey: "ກະແຈໄຊທ໌"
-turnstileSecretKey: "ກະແຈລັບ"
+enableRecaptcha: "ເປີດໃຊ້ງານ reCAPTCHA"
+recaptchaSiteKey: "Site key"
+recaptchaSecretKey: "Secret key"
+turnstileSiteKey: "Site key"
+turnstileSecretKey: "Secret key"
 name: "ຊື່"
 userList: "ລາຍການ"
 about: "ກ່ຽວກັບ"
 aboutMisskey: "ກ່ຽວກັບ Misskey"
-administrator: "ຜູ້ບໍລິຫານ"
+administrator: "ຜູ້ດູແລ"
 token: "ໂທເຄັນ"
 share: "ແບ່ງປັນ"
 notFound: "ບໍ່ພົບ"
@@ -332,27 +332,27 @@ title: "ຫົວຂໍ້"
 text: "ຂໍ້ຄວາມ"
 enable: "ເປີດໃຊ້"
 next: "ຕໍ່ໄປ"
-retype: "ເຂົ້າໄປອີກຄັ້ງ"
-quoteAttached: "ວົງຢືມ"
+retype: "ລອງພິມລະຫັດອີກເທື່ອໜຶ່ງ"
+quoteAttached: "ອ້າງອິງ"
 invitations: "ເຊີນ"
 unavailable: "ບໍ່​ສາ​ມາດ​ໃຊ້​ໄດ້"
 language: "ພາສາ"
 aboutX: "ກ່ຽວກັບ {x}"
 emojiStyle: "ຮູບແບບອີໂມຈິ"
 native: "ພາ​ສາ​ແມ່"
-noHistory: "​ບໍ່​ມີ​ລາຍ​ການ​ຢູ່​ບ່ອນ​ນີ້"
+noHistory: "​ບໍ່​ມີປະຫວັດ"
 doing: "ກຳລັງປະມວນຜົນ..."
 category: "ຫມວດຫມູ່"
-tags: "ແທ໋ກ"
+tags: "Aliases"
 createAccount: "ສ້າງບັນຊີ"
-existingAccount: "ທີ່ມີຢູ່"
-dashboard: "ໜ້າປັດ"
+existingAccount: "ບັນຊີທີ່ມີຢູ່ແລ້ວ"
+dashboard: "Dashboard"
 local: "ທ້ອງຖິ່ນ"
 numberOfDays: "ຈຳນວນມື້"
 objectStorageBucket: "Bucket"
 objectStoragePrefix: "Prefix"
 objectStorageEndpoint: "Endpoint"
-objectStorageRegion: "ພາກ​ພື້ນ"
+objectStorageRegion: "ພູມິພາກ"
 deleteAll: "ລຶບທັງໝົດ"
 sounds: "ສຽງ"
 sound: "ສຽງ"
@@ -365,11 +365,11 @@ state: "ສະຖານະ"
 sort: "ຈັດຮຽງໂດຍ"
 ascendingOrder: "ນ້ອຍໄປຫາໃຫຍ່"
 descendingOrder: "ໃຫຍ່ຫານ້ອຍ"
-output: "ຜົນຜະລິດ"
-script: "ບົດ​ຄວາມ"
+output: "Output"
+script: "Script"
 menu: "ເມນູ"
-rearrange: "ຈັດລຽງຄືນ"
-poll: "ການພູນ"
+rearrange: "ຈັດລຽງໃໝ່"
+poll: "Poll"
 description: "ລາຍລະອຽດ"
 author: "ຜູ້ຂຽນ"
 manage: "ການຈັດການ"
@@ -383,7 +383,7 @@ permission: "ການອະນຸຍາດ"
 notificationType: "​ປະເພດການ​ແຈ້ງ​ເຕືອນ"
 edit: "ແກ້ໄຂ"
 email: "ອີເມວ"
-smtpHost: "ໂຮດສ"
+smtpHost: "ໂຮສຕ໌"
 smtpUser: "ຊື່ຜູ້ໃຊ້"
 smtpPass: "ລະຫັດຜ່ານ"
 clearCache: "ລຶບລ້າງແຄສ"
@@ -393,12 +393,12 @@ administration: "ການຈັດການ"
 middle: "ປານກາງ"
 searchByGoogle: "ຄົ້ນຫາ"
 file: "ໄຟລ໌"
-replies: "ຕອບ​ໄປ​ທີ"
+replies: "ຕອບ​ກັບ"
 renotes: "Renote"
 _delivery:
   stop: "ໂຈະ"
   _type:
-    none: "ການ​ພິມ​ເຜີຍ​ແຜ່"
+    none: "ກຳລັງ​ເຜີຍ​ແພ່"
 _role:
   _priority:
     middle: "ປານກາງ"
@@ -416,8 +416,8 @@ _sfx:
 _2fa:
   renewTOTPCancel: "ບໍ່​ແມ່ນ​ຕອນ​ນີ້"
 _widgets:
-  profile: "ໂພຼຟາຍ"
-  instanceInfo: "ອີນສະແຕນ"
+  profile: "ໂປຣໄຟລ໌"
+  instanceInfo: "ຂໍ້ມູລເຊີຟເວີຣ໌"
   notifications: "ການແຈ້ງເຕືອນ"
   timeline: "​ເສັ້ນກຳ​ນົດ​ເວ​ລາ​"
   activity: "ກິດຈະກຳ"
@@ -436,28 +436,28 @@ _profile:
 _exportOrImport:
   followingList: "ກຳລັງຕິດຕາມ"
   muteList: "ປີດສຽງ"
-  blockingList: "ບ໋ອກ"
+  blockingList: "ບລັອກ"
   userLists: "ລາຍການ"
 _charts:
   federation: "ສະຫະພັນ"
 _timelines:
   home: "ໜ້າຫຼັກ"
 _play:
-  script: "ບົດ​ຄວາມ"
+  script: "Script"
   summary: "ລາຍລະອຽດ"
 _pages:
   blocks:
     image: "ຮູບພາບ"
 _notification:
-  youWereFollowed: "ໄດ້ຕິດຕາມທ່ານ"
+  youWereFollowed: "ໄດ້ຕິດຕາມເຈົ້າ"
   _types:
     follow: "ກຳລັງຕິດຕາມ"
-    mention: "ໄດ້ກ່າວມາ"
+    mention: "ໄດ້ກ່າວເຖິງ"
     renote: "Renote"
-    quote: "ລວມຂໍ້ຄວາມອ້າງອີງ"
-    reaction: "ປະຕິກິລິຍາ"
+    quote: "ອ້າງອີງ"
+    reaction: "Reaction"
   _actions:
-    reply: "ຕອບ​ໄປ​ທີ"
+    reply: "ຕອບ​ກັບ"
     renote: "Renote"
 _deck:
   _columns:
@@ -465,8 +465,12 @@ _deck:
     tl: "​ເສັ້ນກຳ​ນົດ​ເວ​ລາ​"
     list: "ລາຍການ"
     channel: "ຊ່ອງ"
-    mentions: "ກ່າວເຖິງ"
+    mentions: "ກ່າວເຖິງເຈົ້າ"
 _webhookSettings:
   name: "ຊື່"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "ອີເມວ"
 _moderationLogTypes:
   suspend: "ລະງັບ"
diff --git a/locales/no-NO.yml b/locales/no-NO.yml
index 2b4c9b7776..cd00ecf9ab 100644
--- a/locales/no-NO.yml
+++ b/locales/no-NO.yml
@@ -721,5 +721,9 @@ _deck:
     direct: "Direkte"
 _webhookSettings:
   name: "Navn"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "E-post"
 _moderationLogTypes:
   suspend: "Suspender"
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index 9d75f7a9d7..7513d056b4 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1221,8 +1221,6 @@ _sfx:
   note: "Wpisy"
   noteMy: "Mój wpis"
   notification: "Powiadomienia"
-  antenna: "Anteny"
-  channel: "Powiadomienia kanału"
 _ago:
   future: "W przyszłości"
   justNow: "Przed chwilą"
@@ -1556,6 +1554,10 @@ _webhookSettings:
     renote: "Po udostępnieniu wpisu"
     reaction: "Po otrzymaniu reakcji"
     mention: "Po zostaniu wspomnianym"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "Adres e-mail"
 _moderationLogTypes:
   suspend: "Zawieś"
   resetPassword: "Zresetuj hasło"
diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml
index cfc576b6e1..2e26f6d12a 100644
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@@ -1500,6 +1500,10 @@ _webhookSettings:
     follow: "Quando seguindo um usuário"
     followed: "Quando sendo seguido"
     renote: "Quando repostado"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "E-mail"
 _moderationLogTypes:
   suspend: "Suspender"
   resetPassword: "Redefinir senha"
diff --git a/locales/ro-RO.yml b/locales/ro-RO.yml
index 328d34405e..b4c9b90de9 100644
--- a/locales/ro-RO.yml
+++ b/locales/ro-RO.yml
@@ -728,6 +728,10 @@ _deck:
     mentions: "Mențiuni"
 _webhookSettings:
   name: "Nume"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "Email"
 _moderationLogTypes:
   suspend: "Suspendă"
   resetPassword: "Resetează parola"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 71f5cad601..88f59155d6 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -1612,8 +1612,6 @@ _sfx:
   note: "Заметки"
   noteMy: "Собственные заметки"
   notification: "Уведомления"
-  antenna: "Антенна"
-  channel: "Канал"
 _ago:
   future: "Из будущего"
   justNow: "Только что"
@@ -1983,6 +1981,10 @@ _webhookSettings:
   createWebhook: "Создать вебхук"
   name: "Название"
   active: "Вкл."
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "Электронная почта"
 _moderationLogTypes:
   suspend: "Заморозить"
   addCustomEmoji: "Добавлено эмодзи"
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index 52f6bf142c..41f8949196 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -1124,8 +1124,6 @@ _sfx:
   note: "Poznámky"
   noteMy: "Vlastná poznámka"
   notification: "Oznámenia"
-  antenna: "Antény"
-  channel: "Upozornenia kanála"
 _ago:
   future: "Budúcnosť"
   justNow: "Teraz"
@@ -1447,6 +1445,10 @@ _deck:
 _webhookSettings:
   name: "Názov"
   active: "Zapnuté"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "Email"
 _moderationLogTypes:
   suspend: "Zmraziť"
   resetPassword: "Resetovať heslo"
diff --git a/locales/sv-SE.yml b/locales/sv-SE.yml
index 089dc3949f..c1a998b8fb 100644
--- a/locales/sv-SE.yml
+++ b/locales/sv-SE.yml
@@ -512,7 +512,6 @@ _theme:
 _sfx:
   note: "Noter"
   notification: "Notifikationer"
-  antenna: "Antenner"
 _2fa:
   renewTOTPCancel: "Nej tack"
 _antennaSources:
@@ -577,6 +576,10 @@ _deck:
 _webhookSettings:
   name: "Namn"
   active: "Aktiverad"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "E-post"
 _moderationLogTypes:
   suspend: "Suspendera"
   resetPassword: "Återställ Lösenord"
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index ab09ac4d5a..117920e88d 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -2,10 +2,10 @@
 _lang_: "ภาษาไทย"
 headlineMisskey: "เชื่อมต่อเครือข่ายโดยโน้ต"
 introMisskey: "ยินดีต้อนรับทุกคนจ้า! Misskey คือ ซอฟต์แวร์โอเพนซอร์สสำหรับบริการไมโครบล็อกกิ้ง (MicroBlogging) แบบกระจายศูนย์อำนาจ (Decentralized) \n\nเขียน “โน้ต (Note)” เพื่อส่งต่อเรื่องราวของคุณให้ทั้งโลกได้รับรู้📡\nและอย่าลืมที่จะ “รีแอคชั่น” กับเรื่องราวของคนอื่น ๆ ด้วยนะ! 👍\n\nท่องสำรวจโลกใบใหม่กันเถอะ🚀"
-poweredByMisskeyDescription: "{name} เป็นส่วนหนึ่งในบริการที่ถูกขับเคลื่อนโดยแพลตฟอร์มโอเพ่นซอร์ส <b>Misskey</b> (เรียกว่า \"อินสแตนซ์ Misskey\")"
+poweredByMisskeyDescription: "{name} เป็นหนึ่งในเซิร์ฟเวอร์ของแพลตฟอร์มโอเพ่นซอร์ส <b>Misskey</b>"
 monthAndDay: "{month}/{day}"
 search: "ค้นหา"
-notifications: "การเเจ้งเตือน"
+notifications: "เเจ้งเตือน"
 username: "ชื่อผู้ใช้"
 password: "รหัสผ่าน"
 forgotPassword: "ลืมรหัสผ่าน"
@@ -18,7 +18,7 @@ enterUsername: "กรอกชื่อผู้ใช้"
 renotedBy: "รีโน้ตโดย {user}"
 noNotes: "ไม่มีโน้ต"
 noNotifications: "ไม่มีการแจ้งเตือน"
-instance: "อินสแตนซ์"
+instance: "เซิร์ฟเวอร์"
 settings: "การตั้งค่า"
 notificationSettings: "ตั้งค่าการแจ้งเตือน"
 basicSettings: "การตั้งค่าพื้นฐาน"
@@ -48,7 +48,7 @@ copyLink: "คัดลอกลิงก์"
 copyLinkRenote: "คัดลอกลิงก์รีโน้ต"
 delete: "ลบ"
 deleteAndEdit: "ลบและแก้ไข"
-deleteAndEditConfirm: "คุณต้องการลบโน้ตนี้และแก้ไขใหม่ใช่ไหม? รีแอคชั่น รีโน้ต และการตอบกลับต่อโน้ตนี้ทั้งหมดจะถูกลบออกด้วย"
+deleteAndEditConfirm: "ต้องการลบโน้ตนี้และแก้ไขใหม่ใช่ไหม? รีแอคชั่น รีโน้ต และการตอบกลับต่อโน้ตนี้ทั้งหมดจะถูกลบออกด้วย"
 addToList: "เพิ่มลงรายชื่อ"
 addToAntenna: "เพิ่มไปยังเสาอากาศ"
 sendMessage: "ส่งข้อความ"
@@ -68,7 +68,7 @@ youGotNewFollower: "ได้ติดตามคุณ"
 receiveFollowRequest: "มีคำขอติดตามส่งมาหา"
 followRequestAccepted: "การติดตามได้รับการอนุมัติแล้ว"
 mention: "กล่าวถึง"
-mentions: "พูดถึง"
+mentions: "กล่าวถึงคุณ"
 directNotes: "โพสต์แบบไดเร็กต์"
 importAndExport: "นำเข้า / ส่งออก"
 import: "นำเข้า"
@@ -92,7 +92,7 @@ error: "ผิดพลาด!"
 somethingHappened: "อุ๊ย ! มีอะไรบางอย่างผิดพลาด"
 retry: "ลองใหม่อีกครั้ง"
 pageLoadError: "เกิดข้อผิดพลาดในการโหลดหน้านี้"
-pageLoadErrorDescription: "โดยปกติแล้วมักจะเกิดจากข้อผิดพลาดของเครือข่ายหรือแคชของเบราว์เซอร์ ลองล้างแคชแล้วลองใหม่อีกครั้งหลังจากรอสักครู่ "
+pageLoadErrorDescription: "ปัญหานี้มักเกิดจากแคชของเครือข่ายหรือเบราว์เซอร์ ควรล้างแคช, รอสักครู่ แล้วลองใหม่อีกครั้ง"
 serverIsDead: "เซิร์ฟเวอร์นี้ไม่มีการตอบสนอง โปรดกรุณารอสักครู่แล้วลองใหม่อีกครั้ง"
 youShouldUpgradeClient: "หากต้องการดูหน้านี้ กรุณาโหลดหน้าใหม่เพื่ออัปเดตไคลเอ็นต์ของคุณ"
 enterListName: "ป้อนนามเรียกของรายชื่อชุดนี้"
@@ -108,11 +108,14 @@ enterEmoji: "พิมพ์เอโมจิ"
 renote: "รีโน้ต"
 unrenote: "เลิกรีโน้ต"
 renoted: "รีโน้ตแล้ว"
+renotedToX: "รีโน้ตให้ {name} แล้ว"
 cantRenote: "โพสต์นี้ไม่สามารถรีโน้ตใหม่ได้"
 cantReRenote: "รีโน้ตไม่สามารถรีโน้ตซ้ำได้"
 quote: "อ้างอิง"
 inChannelRenote: "รีโน้ตในช่องเท่านั้น"
 inChannelQuote: "อ้างอิงในช่องเท่านั้น"
+renoteToChannel: "รีโน้ตไปที่ช่อง"
+renoteToOtherChannel: "รีโน้ตไปยังช่องอื่น"
 pinnedNote: "โน้ตที่ปักหมุดไว้"
 pinned: "ปักหมุด"
 you: "คุณ"
@@ -163,20 +166,24 @@ addEmoji: "แทรกเอโมจิ"
 settingGuide: "การตั้งค่าที่แนะนำ"
 cacheRemoteFiles: "แคชไฟล์ระยะไกล"
 cacheRemoteFilesDescription: "หากเปิดใช้งาน ไฟล์ระยะไกลจะถูกแคชไว้ ทำให้แสดงภาพเร็วขึ้น แต่ก็ใช้พื้นที่เก็บข้อมูลของเซิร์ฟเวอร์มากขึ้นเช่นกัน สำหรับขีดจำกัดที่ผู้ใช้ระยะไกลถูกแคชไว้จะขึ้นอยู่กับความจุไดรฟ์ตามบทบาทของเขา เมื่อเกินแล้วไฟล์เก่าจะถูกลบออกและเก็บเป็นลิงก์แทน หากปิดใช้งาน ไฟล์ระยะไกลจะถูกเก็บเป็นลิงก์ตั้งแต่ต้น เราแนะนำให้ตั้งค่า proxyRemoteFiles ใน default.yml เป็น true เพื่อสร้างธัมบ์เนลและปกป้องความเป็นส่วนตัวของผู้ใช้"
-youCanCleanRemoteFilesCache: "คุณสามารถล้างแคชได้โดยคลิกที่ปุ่ม 🗑️ ในมุมมองการจัดการไฟล์"
+youCanCleanRemoteFilesCache: "สามารถลบแคชทั้งหมดได้โดยใช้ปุ่ม 🗑️ ในหน้าการจัดการไฟล์"
 cacheRemoteSensitiveFiles: "แคชไฟล์ระยะไกลที่มีเนื้อหาละเอียดอ่อน"
-cacheRemoteSensitiveFilesDescription: "เมื่อปิดการใช้งานการตั้งค่านี้ ไฟล์ระยะไกลที่มีเครื่องหมายว่ามีเนื้อหาละเอียดอ่อนนั้นจะถูกโหลดโดยตรงจากอินสแตนซ์ระยะไกลโดยที่ไม่มีการแคช"
+cacheRemoteSensitiveFilesDescription: "เมื่อปิดการใช้งานการตั้งค่านี้ ไฟล์ระยะไกลที่มีเนื้อหาละเอียดอ่อนจะถูกโหลดโดยตรงจากเซิร์ฟเวอร์ระยะไกลโดยไม่มีการแคช"
 flagAsBot: "ทำเครื่องหมายบอกว่าบัญชีนี้เป็นบอต"
-flagAsBotDescription: "การเปิดใช้งานตัวเลือกนี้หากบัญชีนี้ถูกควบคุมโดยนักเขียนโปรแกรม หรือ ถ้าหากเปิดใช้งาน มันจะทำหน้าที่เป็นแฟล็กสำหรับนักพัฒนารายอื่นๆ และเพื่อป้องกันการโต้ตอบแบบไม่มีที่สิ้นสุดกับบอทตัวอื่นๆ และยังสามารถปรับเปลี่ยนระบบภายในของ Misskey เพื่อปฏิบัติต่อบัญชีนี้เป็นบอท"
+flagAsBotDescription: "เปิดใช้งานตัวเลือกนี้หากบัญชีนี้ถูกควบคุมโดยโปรแกรม เมื่อเปิดใช้งาน มันจะทำหน้าที่เป็นแฟล็กสำหรับนักพัฒนารายอื่นในการป้องกันการสร้างห่วงโซ่การโต้ตอบแบบอนันต์กับบอตตัวอื่น และปรับระบบภายในของ Misskey เพื่อจัดการบัญชีนี้ในฐานะบอต"
 flagAsCat: "เมี้ยววววววววววววววว!!!!!!!!!!!"
 flagAsCatDescription: "เหมียวเหมียวเมี้ยว??"
-flagShowTimelineReplies: "แสดงตอบกลับ ในไทม์ไลน์"
-flagShowTimelineRepliesDescription: "แสดงการตอบกลับของผู้ใช้งานไปยังโน้ตของผู้ใช้งานรายอื่นๆในไทม์ไลน์หากได้เปิดเอาไว้"
-autoAcceptFollowed: "อนุมัติคำขอติดตามโดยอัตโนมัติทันที จากผู้ใช้งานที่คุณกำลังติดตาม"
+flagShowTimelineReplies: "แสดงตอบกลับโน้ตลงไทม์ไลน์"
+flagShowTimelineRepliesDescription: "เมื่อเปิดใช้งาน จะแสดงการตอบกลับของผู้ใช้คนนั้นต่อโน้ตอื่นๆ ในไทม์ไลน์ด้วย"
+autoAcceptFollowed: "อนุมัติคำขอติดตามจากผู้ใช้ที่คุณติดตามอยู่โดยอัตโนมัติ"
 addAccount: "เพิ่มบัญชี"
 reloadAccountsList: "รีโหลดรายการบัญชีใหม่"
 loginFailed: "การเข้าสู่ระบบไม่สำเร็จ"
-showOnRemote: "ดูบนอินสแตนซ์ระยะไกล"
+showOnRemote: "ดูบนเซิร์ฟเวอร์ฝั่งระยะไกล"
+continueOnRemote: "ดำเนินการต่อบนเซิร์ฟเวอร์ฝั่งระยะไกล"
+chooseServerOnMisskeyHub: "เลือกเซิร์ฟเวอร์จาก Misskey Hub"
+specifyServerHost: "ระบุโดเมนของเซิร์ฟเวอร์โดยตรง"
+inputHostName: "โปรดป้อนโดเมน"
 general: "ทั่วไป"
 wallpaper: "ภาพพื้นหลัง"
 setWallpaper: "ตั้งค่าภาพพื้นหลัง"
@@ -185,23 +192,23 @@ searchWith: "ค้นหา: {q}"
 youHaveNoLists: "คุณไม่มีรายชื่อใดๆ "
 followConfirm: "ต้องการติดตาม {name} ใช่ไหม?"
 proxyAccount: "บัญชีพร็อกซี่"
-proxyAccountDescription: "บัญชีพร็อกซี่ คือ บัญชีที่จะทำหน้าที่เป็นผู้ติดตามระยะไกลสำหรับผู้ใช้งานที่อยู่ภายใต้ด้วยเงื่อนไขบางอย่าง ยกตัวอย่าง เช่น เมื่อมีผู้ใช้งานนั้นได้เพิ่มผู้ใช้งานจากระยะไกลลงในรายการ แต่กิจกรรมของผู้ใช้ในระยะไกลนั้นจะไม่ถูกส่งไปยังอินสแตนซ์หากไม่มีผู้ใช้งานในพื้นที่ติดตามผู้ใช้รายนั้น ดังนั้นบัญชีพร็อกซีนี้จะติดตามแทน"
+proxyAccountDescription: "บัญชีพร็อกซี คือ บัญชีที่ทำหน้าที่ติดตาม(ผู้ใช้)ระยะไกลภายใต้เงื่อนไขบางประการ ตัวอย่างเช่น เมื่อผู้ใช้ท้องถิ่นเพิ่มผู้ใช้ระยะไกลลงรายชื่อ หากไม่มีใครติดตามผู้ใช้ระยะไกลในรายชื่อนั้น กิจกรรมก็จะไม่ถูกส่งมายังเซิร์ฟเวอร์ ดังนั้นจึงมีบัญชีพร็อกซีไว้ติดตามผู้ใช้ระยะไกลเหล่านั้น"
 host: "โฮสต์"
 selectUser: "เลือกผู้ใช้งาน"
 recipient: "ผู้รับ"
 annotation: "หมายเหตุประกอบ"
 federation: "สหพันธ์"
-instances: "อินสแตนซ์"
+instances: "เซิร์ฟเวอร์"
 registeredAt: "วันที่ลงทะเบียน"
 latestRequestReceivedAt: "คำขอล่าสุดที่ได้รับ"
 latestStatus: "สถานะล่าสุด"
 storageUsage: "พื้นที่จัดเก็บข้อมูลที่ใช้ไป"
-charts: "โดดเด่น"
-perHour: "ทุกชั่วโมง"
+charts: "แผนภูมิ"
+perHour: "ต่อชั่วโมง"
 perDay: "ต่อวัน"
 stopActivityDelivery: "หยุดส่งกิจกรรม"
-blockThisInstance: "บล็อกอินสแตนซ์นี้"
-silenceThisInstance: "ปิดปากอินสแตนซ์นี้"
+blockThisInstance: "บล็อกเซิร์ฟเวอร์นี้"
+silenceThisInstance: "ปิดปากเซิร์ฟเวอร์นี้"
 operations: "ดำเนินการ"
 software: "ซอฟต์แวร์"
 version: "เวอร์ชั่น"
@@ -212,17 +219,17 @@ jobQueue: "คิวงาน"
 cpuAndMemory: "ซีพียู และ หน่วยความจำ"
 network: "เครือข่าย"
 disk: "ดิสก์"
-instanceInfo: "ข้อมูลอินสแตนซ์"
+instanceInfo: "ข้อมูลเซิร์ฟเวอร์"
 statistics: "สถิติการใช้งาน"
 clearQueue: "ล้างคิว"
 clearQueueConfirmTitle: "ต้องการล้างคิวใช่ไหม?"
 clearQueueConfirmText: "โพสต์ที่ยังค้างในคิวจะไม่ถูกจัดส่งอีกต่อไป โดยปกติแล้วการดำเนินการนี้ไม่จำเป็น"
 clearCachedFiles: "ล้างแคช"
 clearCachedFilesConfirm: "ต้องการลบไฟล์ระยะไกลที่แคชไว้ทั้งหมดใช่ไหม?"
-blockedInstances: "อินสแตนซ์ที่ถูกบล็อก"
-blockedInstancesDescription: "ระบุชื่อโฮสต์ของอินสแตนซ์ที่คุณต้องการบล็อก อินสแตนซ์ที่อยู่ในรายการนั้นจะไม่สามารถพูดคุยกับอินสแตนซ์นี้ได้อีกต่อไป"
-silencedInstances: "ปิดปากอินสแตนซ์นี้แล้ว"
-silencedInstancesDescription: "ตั้งค่ารายชื่อโฮสต์ของอินสแตนซ์ที่คุณต้องการปิดปาก บัญชีทั้งหมดของอินสแตนซ์ที่อยู่ในรายชื่อนั้นๆ จะถือว่าถูกปิดปากเช่นกัน ทำได้เฉพาะคำขอติดตามเท่านั้น และไม่สามารถกล่าวถึงบัญชีในพื้นที่ได้หากไม่ได้ติดตาม | สิ่งนี้ไม่มีผลต่ออินสแตนซ์ที่ถูกบล็อก"
+blockedInstances: "เซิร์ฟเวอร์ที่ถูกบล็อก"
+blockedInstancesDescription: "ระบุโฮสต์ของเซิร์ฟเวอร์ที่ต้องการบล็อก คั่นด้วยการขึ้นบรรทัดใหม่ เซิร์ฟเวอร์ที่ถูกบล็อกจะไม่สามารถติดต่อกับอินสแตนซ์นี้ได้"
+silencedInstances: "ปิดปากเซิร์ฟเวอร์นี้แล้ว"
+silencedInstancesDescription: "ระบุโฮสต์ของเซิร์ฟเวอร์ที่ต้องการปิดปาก คั่นด้วยการขึ้นบรรทัดใหม่, บัญชีทั้งหมดของเซิร์ฟเวอร์ดังกล่าวจะถือว่าถูกปิดปากเช่นกัน ทำได้เฉพาะคำขอติดตามเท่านั้น และไม่สามารถกล่าวถึงบัญชีในเซิร์ฟเวอร์นี้ได้หากไม่ได้ถูกติดตามกลับ | สิ่งนี้ไม่มีผลต่ออินสแตนซ์ที่ถูกบล็อก"
 muteAndBlock: "ปิดเสียงและบล็อก"
 mutedUsers: "ผู้ใช้ที่ถูกปิดเสียง"
 blockedUsers: "ผู้ใช้ที่ถูกบล็อก"
@@ -240,14 +247,14 @@ noCustomEmojis: "ไม่มีเอโมจิ"
 noJobs: "ไม่มีงาน"
 federating: "สหพันธ์"
 blocked: "ถูกบล็อก"
-suspended: "ถูกระงับ"
+suspended: "ระงับการส่ง"
 all: "ทั้งหมด"
-subscribing: "สมัครแล้ว"
+subscribing: "กำลังสมัครสมาชิก"
 publishing: "กำลังเผยแพร่"
 notResponding: "ไม่มีการตอบสนอง"
-instanceFollowing: "กำลังติดตามบนอินสแตนซ์"
-instanceFollowers: "ผู้ติดตามของอินสแตนซ์"
-instanceUsers: "ผู้ใช้งานของอินสแตนซ์นี้"
+instanceFollowing: "กำลังติดตามบนเซิร์ฟเวอร์"
+instanceFollowers: "ผู้ติดตามของเซิร์ฟเวอร์"
+instanceUsers: "ผู้ใช้ของเซิร์ฟเวอร์นี้"
 changePassword: "เปลี่ยนรหัสผ่าน"
 security: "ความปลอดภัย"
 retypedNotMatch: "ทั้งสองป้อนข้อมูลไม่สอดคล้องกัน"
@@ -284,20 +291,20 @@ messageRead: "อ่านแล้ว"
 noMoreHistory: "ไม่มีประวัติเพิ่มเติม"
 startMessaging: "เริ่มการสนทนา"
 nUsersRead: "อ่านโดย {n}"
-agreeTo: "ฉันยอมรับที่จะ {0}"
+agreeTo: "ฉันยอมรับ {0}"
 agree: "ยอมรับ"
-agreeBelow: "ฉันยอมรับถึงด้านล่าง"
+agreeBelow: "ยอมรับตามที่ระบุด้านล่าง"
 basicNotesBeforeCreateAccount: "หมายเหตุสำคัญ"
 termsOfService: "เงื่อนไขการให้บริการ"
 start: "เริ่ม"
-home: "หน้าแรก"
-remoteUserCaution: "ข้อมูลอาจไม่สมบูรณ์เนื่องจากผู้ใช้รายนี้มาจากอินสแตนซ์ระยะไกล"
+home: "หน้าหลัก"
+remoteUserCaution: "ข้อมูลอาจไม่สมบูรณ์เนื่องจากผู้ใช้รายนี้มาจากเซิร์ฟเวอร์ระยะไกล"
 activity: "กิจกรรม"
 images: "รูปภาพ"
 image: "รูปภาพ"
 birthday: "วันเกิด"
 yearsOld: "{age} ปี"
-registeredDate: "วันที่สมัครสมาชิก"
+registeredDate: "วันที่ลงทะเบียน"
 location: "ตำแหน่งที่ตั้ง"
 theme: "ธีม"
 themeForLightMode: "ธีมที่จะใช้ในโหมดสว่าง"
@@ -313,6 +320,7 @@ selectFile: "เลือกไฟล์"
 selectFiles: "เลือกไฟล์"
 selectFolder: "เลือกโฟลเดอร์"
 selectFolders: "เลือกโฟลเดอร์"
+fileNotSelected: "ยังไม่ได้เลือกไฟล์"
 renameFile: "เปลี่ยนชื่อไฟล์"
 folderName: "ชื่อโฟลเดอร์"
 createFolder: "สร้างโฟลเดอร์"
@@ -336,15 +344,15 @@ displayOfSensitiveMedia: "แสดงสื่อที่มีเนื้อ
 whenServerDisconnected: "เมื่อสูญเสียการเชื่อมต่อกับเซิร์ฟเวอร์"
 disconnectedFromServer: "การเชื่อมต่อเซิร์ฟเวอร์ถูกตัด"
 reload: "รีโหลด"
-doNothing: "เมิน"
+doNothing: "ช่างมัน"
 reloadConfirm: "รีโหลดเลยไหม?"
-watch: "ดู"
-unwatch: "หยุดดู"
+watch: "เพ่งเล็ง"
+unwatch: "เลิกเพ่งเล็ง"
 accept: "ยอมรับ"
 reject: "ปฏิเสธ"
 normal: "ปกติ"
-instanceName: "ชื่ออินสแตนซ์"
-instanceDescription: "คำอธิบายอินสแตนซ์"
+instanceName: "ชื่อเซิร์ฟเวอร์"
+instanceDescription: "คำอธิบายแนะนำเซิร์ฟเวอร์"
 maintainerName: "ผู้ดูแล"
 maintainerEmail: "อีเมลผู้ดูแลระบบ"
 tosUrl: "URL เงื่อนไขการให้บริการ"
@@ -355,16 +363,16 @@ dayX: "{day}"
 monthX: "เดือน {month}"
 yearX: "{year}"
 pages: "หน้าเพจ"
-integration: "รวบรวม"
+integration: "เชื่อมโยง"
 connectService: "เชื่อมต่อ"
 disconnectService: "ตัดการเชื่อมต่อ"
-enableLocalTimeline: "เปิดใช้งานไทม์ไลน์ในพื้นที่"
+enableLocalTimeline: "เปิดใช้งานไทม์ไลน์ท้องถิ่น"
 enableGlobalTimeline: "เปิดใช้งานไทม์ไลน์ทั่วโลก"
 disablingTimelinesInfo: "ผู้ดูแลระบบและผู้ควบคุมจะสามารถเข้าถึงไทม์ไลน์ทั้งหมด ถึงแม้ว่าจะไม่ได้เปิดใช้งานก็ตาม"
 registration: "ลงทะเบียน"
 enableRegistration: "เปิดใช้งานการลงทะเบียนผู้ใช้ใหม่"
 invite: "คำเชิญ"
-driveCapacityPerLocalAccount: "ความจุของไดรฟ์ต่อผู้ใช้ภายในเครื่อง"
+driveCapacityPerLocalAccount: "ความจุของไดรฟ์ต่อผู้ใช้ท้องถิ่น"
 driveCapacityPerRemoteAccount: "ความจุของไดรฟ์ต่อผู้ใช้ระยะไกล"
 inMb: "เป็นเมกะไบต์"
 bannerUrl: "URL รูปภาพแบนเนอร์"
@@ -373,7 +381,7 @@ basicInfo: "ข้อมูลเบื้องต้น"
 pinnedUsers: "ผู้ใช้ที่ถูกปักหมุด"
 pinnedUsersDescription: "ป้อนชื่อผู้ใช้ที่คุณต้องการปักหมุดในหน้า “ค้นพบ” ฯลฯ คั่นด้วยการขึ้นบรรทัดใหม่"
 pinnedPages: "หน้าเพจที่ปักหมุด"
-pinnedPagesDescription: "ป้อนเส้นทางของหน้าเพจที่คุณต้องการปักหมุดไว้ที่หน้าแรกของอินสแตนซ์นี้ คั่นด้วยขึ้นบรรทัดใหม่"
+pinnedPagesDescription: "ป้อนเส้นทางของหน้าเพจที่คุณต้องการปักหมุดไว้ที่หน้าแรกของเซิร์ฟเวอร์นี้ คั่นด้วยการขึ้นบรรทัดใหม่"
 pinnedClipId: "ID ของคลิปที่จะปักหมุด"
 pinnedNotes: "โน้ตที่ปักหมุดไว้"
 hcaptcha: "hCaptcha"
@@ -389,11 +397,11 @@ recaptcha: "reCAPTCHA"
 enableRecaptcha: "เปิดใช้ reCAPTCHA"
 recaptchaSiteKey: "คีย์ไซต์"
 recaptchaSecretKey: "คีย์ลับ"
-turnstile: "เทิร์น'สไทล"
-enableTurnstile: "เปิดใช้งาน เทิร์น'สไทล"
+turnstile: "Turnstile"
+enableTurnstile: "เปิดใช้งาน Turnstile"
 turnstileSiteKey: "คีย์ไซต์"
 turnstileSecretKey: "คีย์ลับ"
-avoidMultiCaptchaConfirm: "การใช้ระบบ Captcha หลายระบบอาจทำให้เกิดการรบกวนหรืออาจจะเกิดข้อผิดพลาดได้ หากต้องการที่จะปิดการใช้งานระบบ Captcha อื่น ๆ แนะนำให้ปิดตัวอื่นๆก่อน ถ้าหากคุณต้องการให้เปิดใช้งานต่อไป ให้ กด ยกเลิก"
+avoidMultiCaptchaConfirm: "การใช้ Captcha หลายตัวอาจทำให้เกิดการรบกวนหรือข้อผิดพลาดได้ ต้องการที่จะปิดการใช้งาน Captcha ตัวอื่นเลยไหม? หากต้องการให้เปิดใช้งานต่อไป ให้กดยกเลิก"
 antennas: "เสาอากาศ"
 manageAntennas: "จัดการเสาอากาศ"
 name: "ชื่อ"
@@ -401,7 +409,7 @@ antennaSource: "แหล่งเสาอากาศ"
 antennaKeywords: "คีย์เวิร์ดที่ควรฟัง"
 antennaExcludeKeywords: "คีย์เวิร์ดที่จะยกเว้น"
 antennaExcludeBots: "ยกเว้นบัญชีบอต"
-antennaKeywordsDescription: "คั่นด้วยช่องว่างสำหรับเงื่อนไข AND หรือด้วยการขึ้นบรรทัดใหม่สำหรับเงื่อนไข OR"
+antennaKeywordsDescription: "คั่นด้วยเว้นวรรคสำหรับเงื่อนไข AND, หรือขึ้นบรรทัดใหม่สำหรับเงื่อนไข OR"
 notifyAntenna: "แจ้งเตือนเกี่ยวกับโน้ตใหม่"
 withFileAntenna: "เฉพาะโน้ตที่มีไฟล์"
 enableServiceworker: "เปิดใช้งานการแจ้งเตือนแบบพุชไปยังเบราว์เซอร์ของคุณ"
@@ -418,7 +426,7 @@ unsilenceConfirm: "ต้องการเลิกปิดปากผู้
 popularUsers: "ผู้ใช้ที่เป็นที่นิยม"
 recentlyUpdatedUsers: "ผู้ใช้ที่เพิ่งใช้งานล่าสุด"
 recentlyRegisteredUsers: "ผู้ใช้ที่เข้าร่วมใหม่"
-recentlyDiscoveredUsers: "ผู้ใช้ที่เพิ่งค้นพบใหม่"
+recentlyDiscoveredUsers: "ผู้ใช้ที่เพิ่งค้นพบล่าสุด"
 exploreUsersCount: "มีผู้ใช้ {count} ราย"
 exploreFediverse: "สำรวจสหพันธ์"
 popularTags: "แท็กยอดนิยม"
@@ -468,33 +476,35 @@ retype: "พิมพ์รหัสอีกครั้ง"
 noteOf: "โน้ตของ {user}"
 quoteAttached: "อ้างอิง"
 quoteQuestion: "ต้องการที่จะแนบมันเพื่ออ้างอิงใช่ไหม?"
+attachAsFileQuestion: "ข้อความในคลิปบอร์ดยาวเกินไป คุณต้องการแนบเป็นไฟล์ข้อความหรือไม่?"
 noMessagesYet: "ยังไม่มีข้อความ"
 newMessageExists: "คุณมีข้อความใหม่"
 onlyOneFileCanBeAttached: "สามารถแนบไฟล์ได้เพียงไฟล์เดียวต่อ 1 ข้อความ"
-signinRequired: "กรุณาลงทะเบียนหรือลงชื่อเข้าใช้ก่อนดำเนินการต่อ"
+signinRequired: "ก่อนดำเนินการต่อ กรุณาลงทะเบียนหรือเข้าสู่ระบบ"
+signinOrContinueOnRemote: "เพื่อดำเนินการต่อได้ คุณต้องไปที่เซิร์ฟเวอร์ที่คุณใช้งานอยู่ หรือลงทะเบียน/เข้าสู่ระบบเซิร์ฟเวอร์นี้"
 invitations: "คำเชิญ"
 invitationCode: "รหัสเชิญ"
 checking: "Checking"
 available: "พร้อมใช้งาน"
 unavailable: "ไม่พร้อมใช้"
-usernameInvalidFormat: "คุณสามารถใช้อักษรตัวพิมพ์ใหญ่และตัวพิมพ์เล็ก ตัวเลข และขีดล่างได้นะ ( a-z , A-Z , 0-9 , รวมไปถึงอักษรพิเศษเช่น + * / , . - อื่นๆเป็นต้น )"
+usernameInvalidFormat: "สามารถใช้ a~z A~Z 0~9 และ _ ได้"
 tooShort: "สั้นเกินไปนะ"
 tooLong: "ยาวเกินไปนะ"
-weakPassword: "รหัสผ่าน แย่มาก"
+weakPassword: "รหัสผ่านแย่มาก"
 normalPassword: "รหัสผ่านปกติ"
 strongPassword: "รหัสผ่านรัดกุมมาก"
 passwordMatched: "ถูกต้อง!"
 passwordNotMatched: "ไม่ถูกต้อง"
-signinWith: "ลงชื่อเข้าใช้ด้วย {x}"
-signinFailed: "ไม่สามารถลงชื่อผู้เข้าใช้ได้ เนื่องจาก ชื่อผู้ใช้หรือรหัสผ่านที่คุณป้อนนั้นไม่ถูกต้องนะ"
+signinWith: "เข้าสู่ระบบด้วย {x}"
+signinFailed: "ไม่สามารถเข้าสู่ระบบได้ กรุณาตรวจสอบชื่อผู้ใช้และรหัสผ่าน"
 or: "หรือ"
 language: "ภาษา"
 uiLanguage: "ภาษาอินเทอร์เฟซผู้ใช้งาน"
 aboutX: "เกี่ยวกับ {x}"
-emojiStyle: "สไตล์เอโมจิ"
+emojiStyle: "สไตล์ของเอโมจิ"
 native: "ภาษาแม่"
-disableDrawer: "อย่าใช้ลิ้นชักสไตล์เมนู"
-showNoteActionsOnlyHover: "แสดงการดำเนินการเฉพาะโน้ตเมื่อโฮเวอร์"
+disableDrawer: "ไม่แสดงเมนูในรูปแบบลิ้นชัก"
+showNoteActionsOnlyHover: "แสดงการดำเนินการโน้ตเมื่อโฮเวอร์(วางเมาส์เหนือ)เท่านั้น"
 showReactionsCount: "แสดงจำนวนรีแอกชั่นในโน้ต"
 noHistory: "ไม่มีประวัติ"
 signinHistory: "ประวัติการเข้าสู่ระบบ"
@@ -505,7 +515,7 @@ category: "หมวดหมู่"
 tags: "นามแฝง"
 docSource: "ที่มาของเอกสารนี้"
 createAccount: "สร้างบัญชี"
-existingAccount: "บัญชีที่มีอยู่"
+existingAccount: "บัญชีที่มีอยู่แล้ว"
 regenerate: "สร้างอีกครั้ง"
 fontSize: "ขนาดตัวอักษร"
 mediaListWithOneImageAppearance: "ความสูงของรายการสื่อที่มีเพียงรูปเดียว"
@@ -513,11 +523,11 @@ limitTo: "จำกัดไว้ที่ {x}"
 noFollowRequests: "คุณไม่มีคำขอติดตามที่รอดำเนินการ"
 openImageInNewTab: "เปิดรูปภาพในแท็บใหม่"
 dashboard: "หน้ากระดานหลัก"
-local: "ในพื้นที่"
+local: "ท้องถิ่น"
 remote: "ระยะไกล"
 total: "รวมทั้งหมด"
-weekOverWeekChanges: "เปลี่ยนแปลงไปเมื่อสัปดาห์ที่แล้ว"
-dayOverDayChanges: "เปลี่ยนแปลงไปเมื่อวานนี้"
+weekOverWeekChanges: "เทียบกับสัปดาห์ก่อน"
+dayOverDayChanges: "เทียบกับเมื่อวาน"
 appearance: "ภาพลักษณ์"
 clientSettings: "การตั้งค่าไคลเอนต์"
 accountSettings: "ตั้งค่าบัญชี"
@@ -531,19 +541,19 @@ 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: "โปรดระบุชื่อที่เก็บข้อมูลที่ใช้กับผู้ให้บริการของคุณ"
+objectStorageBucketDesc: "โปรดระบุชื่อบัคเก็ตของบริการที่ใช้อยู่"
 objectStoragePrefix: "คำนำหน้า"
 objectStoragePrefixDesc: "ไฟล์ทั้งหมดจะถูกเก็บไว้ภายใต้ไดเร็กทอรีที่มีคำนำหน้านี้"
 objectStorageEndpoint: "ปลายทาง"
 objectStorageEndpointDesc: "เว้นว่างไว้หากคุณใช้ AWS S3 หรือระบุปลายทางเป็น '<host>' หรือ '<host>:<port>' ทั้งนี้ขึ้นอยู่กับผู้ให้บริการที่คุณใช้อยู่ด้วย"
 objectStorageRegion: "ภูมิภาค"
-objectStorageRegionDesc: "ระบุภูมิภาค เช่น 'xx-east-1' ถ้าหากบริการของคุณไม่ได้แยกความแตกต่างระหว่างภูมิภาคก็ให้ เว้นว่างไว้หรือป้อน 'us-east-1'"
+objectStorageRegionDesc: "ระบุภูมิภาค เช่น ‘xx-east-1’ หากบริการของคุณไม่แยกภูมิภาค ให้ระบุเป็น ‘us-east-1’ หรือเว้นวางไว้หากใช้ AWS configuration files / environment variables"
 objectStorageUseSSL: "ใช้ SSL"
 objectStorageUseSSLDesc: "ปิดการทำงานนี้ไว้ ถ้าหากคุณจะไม่ใช้ HTTPS สำหรับการเชื่อมต่อ API"
 objectStorageUseProxy: "เชื่อมต่อผ่านพร็อกซี"
 objectStorageUseProxyDesc: "ปิดสิ่งนี้ไว้ถ้าหากคุณจะไม่ใช้ Proxy สำหรับการเชื่อมต่อ API"
 objectStorageSetPublicRead: "ตั้งค่าเป็น “public-read” เมื่ออัปโหลด"
-s3ForcePathStyleDesc: "ถ้าหากเปิดใช้งาน s3ForcePathStyle ชื่อบัคเก็ตนั้นอาจจะต้องรวมอยู่ในเส้นทางของ URL ซึ่งตรงข้ามกับชื่อโฮสต์ของ URL คุณอาจจะต้องเปิดใช้งานการตั้งค่านี้เมื่อใช้บริการต่างๆ เช่น อินสแตนซ์ Minio ที่โฮสต์เองนะ"
+s3ForcePathStyleDesc: "เมื่อเปิดใช้งาน s3ForcePathStyle จะบังคับให้ ระบุชื่อบัคเก็ตเป็นส่วนหนึ่งของพาธ แทนที่จะเป็นชื่อโฮสต์ใน URL, อาจจำเป็นต้องเปิดใช้งานตัวเลือกนี้เมื่อใช้กับ Minio ที่โฮสต์เองหรือบริการที่คล้ายกัน"
 serverLogs: "ปูมของเซิร์ฟเวอร์"
 deleteAll: "ลบทั้งหมด"
 showFixedPostForm: "แสดงแบบฟอร์มการโพสต์ที่ด้านบนสุดของไทม์ไลน์"
@@ -575,7 +585,7 @@ sort: "เรียงลำดับ"
 ascendingOrder: "เรียงลำดับขึ้น"
 descendingOrder: "เรียงลำดับลง"
 scratchpad: "Scratchpad"
-scratchpadDescription: "Scratchpad เป็นการจัดเตรียมสภาพแวดล้อมสำหรับการทดลอง AiScript แต่คุณสามารถเขียน ดำเนินการ และตรวจสอบผลลัพธ์ของการโต้ตอบกับ Misskey มันได้ด้วยนะ"
+scratchpadDescription: "Scratchpad ให้สภาพแวดล้อมสำหรับการทดลอง AiScript คุณสามารถเขียนโค้ด/สั่งดำเนินการ/ตรวจสอบผลลัพธ์ ของการโต้ตอบกับ Misskey ได้"
 output: "เอาท์พุต"
 script: "สคริปต์"
 disablePagesScript: "ปิดการใช้งาน AiScript บนเพจ"
@@ -587,15 +597,15 @@ unsetUserBannerConfirm: "ต้องการเลิกตั้งแบน
 deleteAllFiles: "ลบไฟล์ทั้งหมด"
 deleteAllFilesConfirm: "ต้องการลบไฟล์ทั้งหมดใช่ไหม?"
 removeAllFollowing: "เลิกติดตามผู้ใช้ที่ติดตามทั้งหมด"
-removeAllFollowingDescription: "เลิกติดตามทั้งหมดจาก {host} โปรดเรียกใช้สิ่งนี้เมื่ออินสแตนซ์ดังกล่าวได้สูญหายตายจากไปแล้ว"
+removeAllFollowingDescription: "จะเลิกติดตามทั้งหมดจาก {host} โปรดดำเนินการสิ่งนี้เมื่อเซิร์ฟเวอร์ดังกล่าวได้สูญหายตายจากไปแล้ว"
 userSuspended: "ผู้ใช้รายนี้ถูกระงับการใช้งาน"
 userSilenced: "ผู้ใช้รายนี้ถูกปิดปากอยู่"
 yourAccountSuspendedTitle: "บัญชีนี้นั้นถูกระงับ"
 yourAccountSuspendedDescription: "บัญชีนี้ถูกระงับ เนื่องจากละเมิดข้อกำหนดในการให้บริการของเซิร์ฟเวอร์หรืออาจจะละเมิดหลักเกณฑ์ชุมชน หรือ อาจจะโดนร้องเรียนเรื่องการละเมิดลิขสิทธิ์และอื่นๆอย่างต่อเนื่องซ้ำๆ หากคุณคิดว่าไม่ได้ทำผิดจริงๆหรือตัดสินผิดพลาด ได้โปรดกรุณาติดต่อผู้ดูแลระบบหากคุณต้องการทราบเหตุผลโดยละเอียดเพิ่มเติม และขอความกรุณาอย่าสร้างบัญชีใหม่"
 tokenRevoked: "โทเค็นไม่ถูกต้อง"
-tokenRevokedDescription: "โทเค็นนี้หมดอายุแล้วนะค่ะกรุณาเข้าสู่ระบบอีกครั้งนะ"
+tokenRevokedDescription: "โทเค็นการเข้าสู่ระบบหมดอายุ กรุณาเข้าสู่ระบบใหม่อีกครั้ง"
 accountDeleted: "ลบบัญชีแล้ว"
-accountDeletedDescription: "บัญชีนี้ถูกลบไปแล้วนะ"
+accountDeletedDescription: "บัญชีนี้ถูกลบแล้ว"
 menu: "เมนู"
 divider: "ตัวแบ่ง"
 addItem: "เพิ่มรายการ"
@@ -622,7 +632,7 @@ author: "ผู้เขียน"
 leaveConfirm: "มีการเปลี่ยนแปลงที่ยังไม่ได้บันทึก ต้องการละทิ้งมันใช่ไหม?"
 manage: "การจัดการ"
 plugins: "ปลั๊กอิน"
-preferencesBackups: "ตั้งค่าการสำรองข้อมูล"
+preferencesBackups: "สำรองการตั้งค่า"
 deck: "เด็ค"
 undeck: "ออกจากเด็ค"
 useBlurEffectForModal: "ใช้เอฟเฟกต์เบลอสำหรับโมดอล"
@@ -632,21 +642,21 @@ height: "ความสูง"
 large: "ใหญ่"
 medium: "ปานกลาง"
 small: "เล็ก"
-generateAccessToken: "สร้างการเข้าถึงโทเค็น"
-permission: "การอนุญาต"
+generateAccessToken: "สร้างโทเค็นการเข้าถึง"
+permission: "สิทธิ์"
 adminPermission: "สิทธิ์ของผู้ดูแลระบบ"
 enableAll: "เปิดใช้งานทั้งหมด"
 disableAll: "ปิดการใช้งานทั้งหมด"
 tokenRequested: "ให้สิทธิ์การเข้าถึงบัญชี"
-pluginTokenRequestedDescription: "ปลั๊กอินนี้จะสามารถใช้การอนุญาตที่ตั้งค่าไว้ที่นี่นะ"
+pluginTokenRequestedDescription: "ปลั๊กอินนี้จะใช้สิทธิ์ตามที่ตั้งค่าไว้ที่นี่"
 notificationType: "ประเภทการแจ้งเตือน"
 edit: "แก้ไข"
-emailServer: "อีเมลเซิร์ฟเวอร์"
+emailServer: "เซิร์ฟเวอร์ของอีเมล"
 enableEmail: "เปิดใช้งานการกระจายอีเมล"
-emailConfigInfo: "ใช้เพื่อยืนยันอีเมลของคุณระหว่างการสมัครหรือถ้าหากคุณลืมรหัสผ่าน"
+emailConfigInfo: "ใช้สำหรับการยืนยันอีเมลหรือการรีเซ็ตรหัสผ่าน"
 email: "อีเมล"
 emailAddress: "ที่อยู่อีเมล"
-smtpConfig: "กำหนดค่าเซิร์ฟเวอร์ SMTP"
+smtpConfig: "ตั้งค่าเซิร์ฟเวอร์ SMTP"
 smtpHost: "โฮสต์"
 smtpPort: "พอร์ต"
 smtpUser: "ชื่อผู้ใช้"
@@ -657,9 +667,9 @@ smtpSecureInfo: "ปิดสิ่งนี้เมื่อใช้ STARTTLS
 testEmail: "ทดสอบการส่งอีเมล"
 wordMute: "ปิดเสียงคำ"
 hardWordMute: "ปิดเสียงคำยาก"
-regexpError: "ข้อผิดพลาดของนิพจน์ทั่วไป"
-regexpErrorDescription: "เกิดข้อผิดพลาดในนิพจน์ทั่วไปในบรรทัดที่ {line} ของการปิดเสียงคำ {tab} ของคุณ:"
-instanceMute: "ปิดเสียง อินสแตนซ์"
+regexpError: "เกิดข้อผิดพลาดใน regular expression"
+regexpErrorDescription: "เกิดข้อผิดพลาดใน regular expression บรรทัดที่ {line} ของการปิดเสียงคำ {tab} :"
+instanceMute: "ปิดเสียงเซิร์ฟเวอร์"
 userSaysSomething: "{name} พูดอะไรบางอย่าง"
 makeActive: "เปิดใช้งาน"
 display: "แสดงผล"
@@ -690,17 +700,17 @@ reportAbuseOf: "รายงาน {name}"
 fillAbuseReportDescription: "กรุณากรอกรายละเอียดเกี่ยวกับรายงานนี้ หากเป็นเรื่องเกี่ยวกับโน้ตโดยเฉพาะ ได้โปรดระบุ URL"
 abuseReported: "เราได้ส่งรายงานของคุณไปแล้ว ขอบคุณมากๆนะ"
 reporter: "ผู้รายงาน"
-reporteeOrigin: "รายงานต้นทาง"
+reporteeOrigin: "ปลายทางรายงาน"
 reporterOrigin: "แหล่งผู้รายงาน"
-forwardReport: "ส่งต่อรายงานไปยังอินสแตนซ์ระยะไกล"
-forwardReportIsAnonymous: "ข้อมูลของคุณจะไม่ปรากฏบนอินสแตนซ์ระยะไกลและปรากฏเป็นบัญชีระบบที่ไม่ระบุชื่อ"
+forwardReport: "ส่งต่อรายงานไปยังเซิร์ฟเวอร์ระยะไกล"
+forwardReportIsAnonymous: "ข้อมูลของคุณจะไม่ปรากฏบนเซิร์ฟเวอร์ระยะไกลและปรากฏเป็นบัญชีระบบที่ไม่ระบุชื่อ"
 send: "ส่ง"
 abuseMarkAsResolved: "ทำเครื่องหมายรายงานว่าแก้ไขแล้ว"
 openInNewTab: "เปิดในแท็บใหม่"
 openInSideView: "เปิดในมุมมองด้านข้าง"
 defaultNavigationBehaviour: "พฤติกรรมการนำทางที่เป็นค่าเริ่มต้น"
 editTheseSettingsMayBreakAccount: "การแก้ไขการตั้งค่าเหล่านี้อาจทำให้บัญชีของคุณเสียหายนะ"
-instanceTicker: "ข้อมูลอินสแตนซ์ของโน้ต"
+instanceTicker: "ข้อมูลเซิร์ฟเวอร์ของโน้ต"
 waitingFor: "กำลังรอ {x}"
 random: "สุ่มค่า"
 system: "ระบบ"
@@ -739,7 +749,7 @@ alwaysMarkSensitive: "ทำเครื่องหมายว่ามีเ
 loadRawImages: "โหลดภาพต้นฉบับแทนการแสดงภาพขนาดย่อ"
 disableShowingAnimatedImages: "ไม่ต้องเล่นภาพเคลื่อนไหว"
 highlightSensitiveMedia: "ไฮไลท์สื่อที่มีเนื้อหาละเอียดอ่อน"
-verificationEmailSent: "ส่งอีเมลยืนยันแล้วนะ ได้โปรดกรุณาไปที่ลิงก์ที่รวมไว้เพื่อทำการตรวจสอบให้เสร็จสิ้น"
+verificationEmailSent: "ได้ส่งอีเมลยืนยันแล้ว กรุณาเข้าลิงก์ที่ระบุในอีเมลเพื่อทำการตั้งค่าให้เสร็จสิ้น"
 notSet: "ไม่ได้ตั้งค่า"
 emailVerified: "อีเมลได้รับการยืนยันแล้ว"
 noteFavoritesCount: "จำนวนโน้ตที่ชื่นชอบ"
@@ -750,7 +760,7 @@ useSystemFont: "ใช้ฟอนต์เริ่มต้นของระ
 clips: "คลิป"
 experimentalFeatures: "ฟังก์ชั่นทดสอบ"
 experimental: "ทดลอง"
-thisIsExperimentalFeature: "นี่คือฟีเจอร์ทดลองนะค่ะ ฟังก์ชันการทำงานบางอย่างอาจเปลี่ยนแปลงได้ และอาจไม่ทำงานหรือไม่เสถียรตามที่ตั้งใจไว้นะ"
+thisIsExperimentalFeature: "นี่เป็นฟีเจอร์ทดลอง ซึ่งอาจมีการเปลี่ยนแปลงการทำงาน และอาจไม่ทำงานตามที่ตั้งใจไว้"
 developer: "สำหรับนักพัฒนา"
 makeExplorable: "ทำให้บัญชีมองเห็นใน “สำรวจ”"
 makeExplorableDescription: "ถ้าหากคุณปิดการทำงานนี้ บัญชีของคุณนั้นจะไม่แสดงในส่วน “สำรวจ”"
@@ -761,14 +771,14 @@ center: "กึ่งกลาง"
 wide: "กว้าง"
 narrow: "ชิด"
 reloadToApplySetting: "การตั้งค่านี้จะมีผลหลังจากโหลดหน้าซ้ำเท่านั้น ต้องการที่จะโหลดใหม่เลยไหม?"
-needReloadToApply: "จำเป็นต้องโหลดซ้ำถึงจะมีผลนะ"
+needReloadToApply: "ต้องรีโหลดเพื่อให้การเปลี่ยนแปลงมีผล"
 showTitlebar: "แสดงแถบชื่อ"
 clearCache: "ล้างแคช"
-onlineUsersCount: "{n} ผู้ใช้คนนี้กำลังออนไลน์"
+onlineUsersCount: "{n} รายกำลังออนไลน์"
 nUsers: "{n} ผู้ใช้งาน"
 nNotes: "{n} โน้ต"
-sendErrorReports: "ส่งรายงานว่าข้อผิดพลาด"
-sendErrorReportsDescription: "เมื่อเปิดใช้งาน ข้อมูลข้อผิดพลาดโดยรายละเอียดนั้นจะถูกแชร์ให้กับ Misskey เมื่อเกิดปัญหา ซึ่งช่วยปรับปรุงคุณภาพของ Misskey\nซึ่งจะรวมถึงข้อมูล เช่น เวอร์ชั่นของระบบปฏิบัติการ เบราว์เซอร์ที่คุณใช้ กิจกรรมของคุณใน Misskey เป็นต้น"
+sendErrorReports: "ส่งรายงานข้อผิดพลาด"
+sendErrorReportsDescription: "เมื่อเปิดใช้งาน การแจ้งข้อผิดพลาดจะถูกแชร์กับ Misskey เมื่อเกิดปัญหา ซึ่งช่วยในการปรับปรุงคุณภาพของซอฟต์แวร์ ข้อมูลข้อผิดพลาดอาจรวมถึงเวอร์ชันของระบบปฏิบัติการ ประเภทของเบราว์เซอร์ และประวัติการใช้งาน ฯลฯ"
 myTheme: "ธีมของฉัน"
 backgroundColor: "สีพื้นหลัง"
 accentColor: "สีหลัก"
@@ -780,7 +790,7 @@ value: "ค่า"
 createdAt: "สร้างเมื่อ"
 updatedAt: "อัปเดตล่าสุด"
 saveConfirm: "บันทึกเปลี่ยนแปลงมั้ย?"
-deleteConfirm: "ลบจริงๆเหรอ?"
+deleteConfirm: "ต้องการลบใช่ไหม?"
 invalidValue: "ค่านี้ไม่ถูกต้อง"
 registry: "ทะเบียน"
 closeAccount: "ปิด บัญชี"
@@ -793,7 +803,7 @@ capacity: "ความจุ"
 inUse: "ใช้แล้ว"
 editCode: "แก้ไขโค้ด"
 apply: "นำไปใช้"
-receiveAnnouncementFromInstance: "รับการแจ้งเตือนจากอินสแตนซ์นี้"
+receiveAnnouncementFromInstance: "รับการแจ้งเตือนจากเซิร์ฟเวอร์นี้"
 emailNotification: "การแจ้งเตือนทางอีเมล"
 publish: "เผยแพร่"
 inChannelSearch: "ค้นหาในช่อง"
@@ -821,7 +831,7 @@ active: "ใช้งานอยู่"
 offline: "ออฟไลน์"
 notRecommended: "ไม่แนะนำ"
 botProtection: "การป้องกัน Bot"
-instanceBlocking: "อินสแตนซ์ที่ถูกบล็อก"
+instanceBlocking: "เซิร์ฟเวอร์ที่ถูกบล็อก/ปิดปาก"
 selectAccount: "เลือกบัญชี"
 switchAccount: "สลับบัญชีผู้ใช้"
 enabled: "เปิดใช้งาน"
@@ -831,9 +841,10 @@ user: "ผู้ใช้"
 administration: "การจัดการ"
 accounts: "บัญชีผู้ใช้"
 switch: "สลับ"
-noMaintainerInformationWarning: "ข้อมูลผู้ดูแลไม่ได้รับการกำหนดค่านะ"
-noBotProtectionWarning: "ไม่ได้กำหนดค่าการป้องกันบอทนะ"
-configure: "กำหนดค่า"
+noMaintainerInformationWarning: "ยังไม่ได้ตั้งค่าข้อมูลของผู้ดูแลระบบ"
+noInquiryUrlWarning: "ยังไม่ได้ตั้งค่า URL สำหรับการติดต่อสอบถาม"
+noBotProtectionWarning: "ยังไม่ได้ตั้งค่าการป้องกันบอต"
+configure: "ตั้งค่า"
 postToGallery: "สร้างโพสต์แกลเลอรี่ใหม่"
 postToHashtag: "โพสต์ไปที่แฮชแท็กนี้"
 gallery: "แกลเลอรี่"
@@ -909,8 +920,8 @@ themeColor: "สีธีม"
 size: "ขนาด"
 numberOfColumn: "จำนวนคอลัมน์"
 searchByGoogle: "ค้นหา"
-instanceDefaultLightTheme: "ธีมสว่างตามค่าเริ่มต้นของอินสแตนซ์"
-instanceDefaultDarkTheme: "ธีมมืดตามค่าเริ่มต้นของอินสแตนซ์"
+instanceDefaultLightTheme: "ธีมสว่างตามค่าเริ่มต้นของเซิร์ฟเวอร์"
+instanceDefaultDarkTheme: "ธีมมืดตามค่าเริ่มต้นของเซิร์ฟเวอร์"
 instanceDefaultThemeDescription: "ป้อนรหัสธีมในรูปแบบออบเจ็กต์"
 mutePeriod: "ระยะเวลาปิดเสียง"
 period: "ระยะเวลา"
@@ -930,7 +941,7 @@ cropNo: "ใช้ตามที่เป็นอยู่"
 file: "ไฟล์"
 recentNHours: "ล่าสุด {n} ชั่วโมงที่แล้ว"
 recentNDays: "ล่าสุด {n} วันที่แล้ว"
-noEmailServerWarning: "ไม่ได้กำหนดค่าเซิร์ฟเวอร์อีเมลนี้"
+noEmailServerWarning: "ยังไม่ได้ตั้งค่าเซิร์ฟเวอร์ของอีเมล"
 thereIsUnresolvedAbuseReportWarning: "มีรายงานที่ยังไม่ได้แก้ไข"
 recommended: "แนะนำ"
 check: "ตรวจสอบ"
@@ -965,7 +976,7 @@ cannotUploadBecauseExceedsFileSizeLimit: "ไม่สามารถอัป
 beta: "เบต้า"
 enableAutoSensitive: "ทำเครื่องหมายว่ามีเนื้อหาที่ละเอียดอ่อนโดยอัตโนมัติ"
 enableAutoSensitiveDescription: "อนุญาตให้ตรวจหาและทำเครื่องหมายสื่อว่ามีเนื้อหาโดยละเอียดอ่อนโดยอัตโนมัติ ผ่าน Machine Learning หากเป็นไปได้ แม้ว่าคุณจะปิดคุณสมบัตินี้ ก็อาจถูกตั้งค่าโดยอัตโนมัติ ทั้งนี้ขึ้นอยู่กับเซิร์ฟเวอร์"
-activeEmailValidationDescription: "เปิดใช้งานการตรวจสอบที่อยู่อีเมลให้มีความเข้มงวดยิ่งขึ้น ซึ่งอาจจะรวมไปถึงการตรวจสอบที่อยู่อีเมล์ที่ใช้แล้วทิ้งและโดยให้พิจารณาว่าสามารถสื่อสารด้วยได้หรือไม่ เมื่อไม่เลือกระบบจะตรวจสอบเฉพาะรูปแบบของอีเมลเท่านั้น"
+activeEmailValidationDescription: "การตรวจสอบอีเมลของผู้ใช้จะเข้มงวดมากขึ้น โดยพิจารณาว่าเป็นอีเมลชั่วคราวหรือไม่ และสามารถติดต่อได้จริงหรือไม่ หากปิดการตรวจสอบนี้ จะตรวจสอบเพียงว่ารูปแบบอีเมลที่ถูกต้องหรือไม่เท่านั้น"
 navbar: "แถบนำทาง"
 shuffle: "สลับ"
 account: "บัญชีผู้ใช้"
@@ -974,7 +985,7 @@ pushNotification: "การแจ้งเตือนแบบพุช"
 subscribePushNotification: "เปิดการแจ้งเตือนแบบพุช"
 unsubscribePushNotification: "ปิดการแจ้งเตือนแบบพุช"
 pushNotificationAlreadySubscribed: "การแจ้งเตือนแบบพุชได้เปิดใช้งานแล้ว"
-pushNotificationNotSupported: "เบราว์เซอร์หรืออินสแตนซ์ของคุณนั้นไม่รองรับการแจ้งเตือนแบบพุช"
+pushNotificationNotSupported: "เบราว์เซอร์หรือเซิร์ฟเวอร์ไม่รองรับการแจ้งเตือนแบบพุช"
 sendPushNotificationReadMessage: "ลบการแจ้งเตือนแบบพุชเมื่ออ่านการแจ้งเตือนหรือข้อความที่เกี่ยวข้องแล้ว"
 sendPushNotificationReadMessageCaption: "อาจทำให้อุปกรณ์ของคุณใช้พลังงานมากขึ้น"
 windowMaximize: "ขยายใหญ่สุด"
@@ -1017,36 +1028,37 @@ achievements: "ความสำเร็จ"
 gotInvalidResponseError: "การตอบสนองเซิร์ฟเวอร์ไม่ถูกต้อง"
 gotInvalidResponseErrorDescription: "เซิร์ฟเวอร์อาจไม่สามารถเข้าถึงได้หรืออาจจะกำลังอยู่ในระหว่างปรับปรุง กรุณาลองใหม่อีกครั้งในภายหลังนะคะ"
 thisPostMayBeAnnoying: "โน้ตนี้อาจจะเป็นการรบกวนผู้อื่นนะคะ"
-thisPostMayBeAnnoyingHome: "โพสต์ไปยังไทม์ไลน์หน้าแรก"
+thisPostMayBeAnnoyingHome: "โพสต์ไปยังไทม์ไลน์หลัก"
 thisPostMayBeAnnoyingCancel: "เลิก"
 thisPostMayBeAnnoyingIgnore: "โพสต์ยังไงก็แล้วแต่"
 collapseRenotes: "ยุบรีโน้ตที่คุณเคยเห็นแล้ว"
+collapseRenotesDescription: "พับย่อโน้ตที่เคยตอบสนองหรือรีโน้ตแล้ว"
 internalServerError: "เซิร์ฟเวอร์ภายในเกิดข้อผิดพลาด"
 internalServerErrorDescription: "เซิร์ฟเวอร์รันค้นพบข้อผิดพลาดที่ไม่คาดคิด"
 copyErrorInfo: "คัดลอกรายละเอียดข้อผิดพลาด"
-joinThisServer: "ลงชื่อสมัครใช้ในอินสแตนซ์นี้"
-exploreOtherServers: "มองหาอินสแตนซ์อื่น"
+joinThisServer: "ลงทะเบียนบนเซิร์ฟเวอร์นี้"
+exploreOtherServers: "มองหาเซิร์ฟเวอร์อื่น"
 letsLookAtTimeline: "มาดูไทม์ไลน์กัน"
-disableFederationConfirm: "ปิดใช้งานสหพันธ์จริงๆหรอแน่ใจแล้วนะ?"
+disableFederationConfirm: "ปิดใช้งานสหพันธ์เลยใช่ไหม?"
 disableFederationConfirmWarn: "โพสต์จะยังคงเป็นสาธารณะต่อไป เว้นแต่จะตั้งค่าเป็นอย่างอื่น"
 disableFederationOk: "ปิดการใช้งาน"
-invitationRequiredToRegister: "อินสแตนซ์นี้เป็นแบบรับเชิญ เฉพาะผู้ที่มีรหัสเชิญเท่านั้นที่สามารถลงทะเบียนได้"
-emailNotSupported: "อินสแตนซ์นี้ไม่รองรับการส่งอีเมล"
+invitationRequiredToRegister: "ขณะนี้เซิร์ฟเวอร์นี้เปิดรับสมาชิกใหม่ผ่านระบบเชิญเท่านั้น ผู้ที่มีรหัสเชิญสามารถลงทะเบียนได้"
+emailNotSupported: "เซิร์ฟเวอร์นี้ไม่รองรับการส่งอีเมล"
 postToTheChannel: "โพสต์ลงช่อง"
 cannotBeChangedLater: "สิ่งนี้ไม่สามารถเปลี่ยนแปลงได้ในภายหลังนะ"
 reactionAcceptance: "การยอมรับรีแอคชั่น"
 likeOnly: "ที่ถูกใจเท่านั้น"
-likeOnlyForRemote: "ทั้งหมด (เฉพาะการถูกใจจากอินสแตนซ์ระยะไกล)"
+likeOnlyForRemote: "ทั้งหมด (เฉพาะการถูกใจจากเซิร์ฟเวอร์ระยะไกล)"
 nonSensitiveOnly: "เฉพาะไม่มีเนื้อหาละเอียดอ่อน"
 nonSensitiveOnlyForLocalLikeOnlyForRemote: "เฉพาะไม่มีเนื้อหาละเอียดอ่อน (เฉพาะการถูกใจจากระยะไกลเท่านั้น)"
 rolesAssignedToMe: "บทบาทที่ได้รับมอบหมายให้ฉัน"
 resetPasswordConfirm: "รีเซ็ตรหัสผ่านของคุณจริงๆหรอ?"
 sensitiveWords: "คำที่มีเนื้อหาละเอียดอ่อน"
-sensitiveWordsDescription: "การเปิดเผยโน้ตทั้งหมดที่มีคำที่กำหนดค่าไว้จะถูกตั้งค่าเป็น \"หน้าแรก\" โดยอัตโนมัติ คุณยังสามารถแสดงหลายรายการได้โดยแยกรายการโดยใช้ตัวแบ่งบรรทัดได้นะ"
-sensitiveWordsDescription2: "การใช้ช่องว่างนั้นอาจจะสร้างนิพจน์ AND และคำหลักที่มีเครื่องหมายทับล้อมรอบจะเปลี่ยนเป็นนิพจน์ทั่วไปนะ"
+sensitiveWordsDescription: "โน้ตที่มีคำที่ระบุไว้จะถูกตั้งค่าการมองเห็นของให้แสดงเฉพาะในหน้าหลักเท่านั้น คั่นคำด้วยการขึ้นบรรทัดใหม่"
+sensitiveWordsDescription2: "ถ้าแยกด้วยเว้นวรรคจะเป็นการระบุ AND และถ้าล้อมคำด้วยสแลช (/) จะเป็นการใช้ regular expression"
 prohibitedWords: "คำต้องห้าม"
 prohibitedWordsDescription: "จะแจ้งเตือนว่าเกิดข้อผิดพลาดเมื่อพยายามโพสต์โน้ตที่มีคำที่กำหนดไว้ สามารถตั้งได้หลายคำด้วยการขึ้นบรรทัดใหม่"
-prohibitedWordsDescription2: "การใช้ช่องว่างนั้นอาจจะสร้างนิพจน์ AND และคำหลักที่มีเครื่องหมายทับล้อมรอบจะเปลี่ยนเป็นนิพจน์ทั่วไปนะ"
+prohibitedWordsDescription2: "ถ้าแยกด้วยเว้นวรรคจะเป็นการระบุ AND และถ้าล้อมคำด้วยสแลช (/) จะเป็นการใช้ regular expression"
 hiddenTags: "แฮชแท็กที่ซ่อนอยู่"
 hiddenTagsDescription: "เลือกแท็กที่จะไม่แสดงในรายการเทรนด์ สามารถลงทะเบียนหลายแท็กได้โดยขึ้นบรรทัดใหม่"
 notesSearchNotAvailable: "การค้นหาโน้ตไม่พร้อมใช้งาน"
@@ -1058,7 +1070,7 @@ retryAllQueuesNow: "ลองเรียกใช้คิวทั้งหม
 retryAllQueuesConfirmTitle: "ลองใหม่ทั้งหมดจริงๆหรอแน่ใจนะ?"
 retryAllQueuesConfirmText: "สิ่งนี้จะเพิ่มการโหลดเซิร์ฟเวอร์ชั่วคราวนะ"
 enableChartsForRemoteUser: "สร้างแผนภูมิข้อมูลผู้ใช้ระยะไกล"
-enableChartsForFederatedInstances: "สร้างแผนภูมิข้อมูลอินสแตนซ์ระยะไกล"
+enableChartsForFederatedInstances: "สร้างแผนภูมิของเซิร์ฟเวอร์ระยะไกล"
 showClipButtonInNoteFooter: "เพิ่ม “คลิป” ไปยังเมนูสั่งการของโน้ต"
 reactionsDisplaySize: "ขนาดของรีแอคชั่น"
 limitWidthOfReaction: "จำกัดความกว้างสูงสุดของรีแอคชั่นและแสดงให้เล็กลง"
@@ -1077,7 +1089,7 @@ addMemo: "เพิ่มเมโม"
 editMemo: "แก้ไขเมโม"
 reactionsList: "รายการรีแอคชั่น"
 renotesList: "รายการรีโน้ต"
-notificationDisplay: "การแจ้งเตือน"
+notificationDisplay: "การแสดงการแจ้งเตือน"
 leftTop: "บนซ้าย"
 rightTop: "บนขวา"
 leftBottom: "ล่างซ้าย"
@@ -1087,7 +1099,7 @@ vertical: "แนวตั้ง"
 horizontal: "แนวนอน"
 position: "ตำแหน่ง"
 serverRules: "กฎของเซิร์ฟเวอร์"
-pleaseConfirmBelowBeforeSignup: "โปรดยืนยันที่ด้านล่างก่อนสมัครใช้งาน"
+pleaseConfirmBelowBeforeSignup: "หากต้องการลงทะเบียนบนเซิร์ฟเวอร์นี้ คุณต้องตรวจสอบและยอมรับสิ่งต่อไปนี้"
 pleaseAgreeAllToContinue: "คุณต้องยอมรับทุกช่องตรงด้านบนเพื่อดำเนินการต่อค่ะ"
 continue: "ดำเนินการต่อ"
 preservedUsernames: "ชื่อผู้ใช้ที่สงวนไว้"
@@ -1168,8 +1180,8 @@ showRepliesToOthersInTimeline: "แสดงการตอบกลับผู
 hideRepliesToOthersInTimeline: "ไม่แสดงการตอบกลับผู้อื่นลงในไทม์ไลน์"
 showRepliesToOthersInTimelineAll: "รวมตอบกลับจากทุกคนที่คุณติดตามไว้ในไทม์ไลน์ของคุณ"
 hideRepliesToOthersInTimelineAll: "ซ่อนตอบกลับจากทุกคนที่คุณติดตามไปจากไทม์ไลน์ของคุณ"
-confirmShowRepliesAll: "การดำเนินการนี้ไม่สามารถย้อนกลับได้ คุณต้องการแสดงการตอบกลับผู้อื่นจากผู้ใช้ทุกคนที่คุณติดตามอยู่ในไทม์ไลน์ของคุณหรือไม่?"
-confirmHideRepliesAll: "การดำเนินการนี้ไม่สามารถย้อนกลับได้ คุณต้องการซ่อนการตอบกลับผู้อื่นจากผู้ใช้ทุกคนที่คุณติดตามอยู่ในไทม์ไลน์ของคุณหรือไม่?"
+confirmShowRepliesAll: "การดำเนินการนี้ไม่สามารถย้อนกลับได้ คุณต้องการแสดงการตอบกลับผู้อื่นจากผู้ใช้ทุกคนที่คุณติดตามอยู่ ใส่ลงไทม์ไลน์ใช่ไหม?"
+confirmHideRepliesAll: "การดำเนินการนี้ไม่สามารถย้อนกลับได้ คุณต้องการซ่อนการตอบกลับผู้อื่นจากผู้ใช้ทุกคนที่คุณติดตามอยู่ ไปจากไทม์ไลน์ใช่ไหม?"
 externalServices: "บริการภายนอก"
 sourceCode: "ซอร์สโค้ด"
 sourceCodeIsNotYetProvided: "ซอร์สโค้ดยังไม่พร้อมใช้งาน โปรดติดต่อผู้ดูแลระบบของคุณเพื่อแก้ไขปัญหานี้"
@@ -1227,7 +1239,7 @@ surrender: "ยอมแพ้"
 gameRetry: "เริ่มเกมใหม่"
 notUsePleaseLeaveBlank: "หากไม่ได้ใช้กรุณาเว้นว่างไว้"
 useTotp: "ใช้รหัสผ่านแบบใช้ครั้งเดียว (TOTP)"
-useBackupCode: "ใช้รหัสสำรอง"
+useBackupCode: "ใช้รหัสแบ๊กอัป"
 launchApp: "เริ่มแอป"
 useNativeUIForVideoAudioPlayer: "ใช้ UI ของเบราว์เซอร์เพื่อเล่นวิดีโอ/เสียง"
 keepOriginalFilename: "คงชื่อไฟล์เดิมไว้"
@@ -1235,13 +1247,21 @@ keepOriginalFilenameDescription: "หากปิดการตั้งค่
 noDescription: "ไม่มีข้อความอธิบาย"
 alwaysConfirmFollow: "แสดงข้อความยืนยันเมื่อกดติดตาม"
 inquiry: "ติดต่อเรา"
+tryAgain: "โปรดลองอีกครั้ง"
+confirmWhenRevealingSensitiveMedia: "ตรวจสอบก่อนแสดงสื่อที่มีเนื้อหาละเอียดอ่อน"
+sensitiveMediaRevealConfirm: "สื่อนี้มีเนื้อหาละเอียดอ่อน, ต้องการแสดงใช่ไหม?"
 _delivery:
-  stop: "ถูกระงับ"
+  status: "สถานะการจัดส่ง"
+  stop: "ระงับการส่ง"
+  resume: "จัดส่งต่อ"
   _type:
     none: "กำลังเผยแพร่"
+    manuallySuspended: "หยุดชั่วคราวด้วยตนเอง"
+    goneSuspended: "เซิร์ฟเวอร์ถูกระงับเนื่องจากมีการลบเซิร์ฟเวอร์นี้"
+    autoSuspendedForNotResponding: "เซิร์ฟเวอร์ถูกระงับเนื่องจากไม่ตอบสนอง"
 _bubbleGame:
   howToPlay: "วิธีเล่น"
-  hold: "หยุดชั่วคราว"
+  hold: "ถือไว้"
   _score:
     score: "คะแนน"
     scoreYen: "จำนวนเงินที่ได้รับ"
@@ -1274,8 +1294,8 @@ _initialAccountSetting:
   profileSetting: "ตั้งค่าโปรไฟล์"
   privacySetting: "ตั้งค่าความเป็นส่วนตัว"
   theseSettingsCanEditLater: "คุณสามารถเปลี่ยนการตั้งค่าเหล่านี้ได้ในภายหลังได้ตลอดเวลานะ"
-  youCanEditMoreSettingsInSettingsPageLater: "ยังมีการตั้งค่าอื่นๆ อีกมากมายที่คุณนั้นสามารถกำหนดค่าได้จาก \"การตั้งค่า\" เพื่อให้แน่ใจว่าได้เยี่ยมชมมันได้ภายหลังนะ"
-  followUsers: "ลองติดตามผู้ใช้บางคนที่คุณอาจจะสนใจเพื่อสร้างไทม์ไลน์ของคุณสิ !"
+  youCanEditMoreSettingsInSettingsPageLater: "สามารถตั้งค่าเพิ่มเติมได้ที่หน้า “การตั้งค่า” อย่าลืมไปเยี่ยมชมภายหลังด้วย"
+  followUsers: "ลองติดตามผู้ใช้ที่สนใจเพื่อสร้างไทม์ไลน์ดูสิ"
   pushNotificationDescription: "กำลังเปิดใช้งานการแจ้งเตือนแบบพุชจะช่วยให้คุณได้รับการแจ้งเตือนจาก {name} โดยตรงบนอุปกรณ์ของคุณนะ"
   initialAccountSettingCompleted: "ตั้งค่าโปรไฟล์เสร็จสมบูรณ์แล้ว!"
   haveFun: "ขอให้สนุกกับ {name}!"
@@ -1310,7 +1330,7 @@ _initialTutorial:
     description1: "Misskey มีหลายไทม์ไลน์ขึ้นอยู่กับวิธีการใช้งานของคุณ (บางไทม์ไลน์อาจไม่สามารถใช้ได้ขึ้นอยู่กับนโยบายของเซิร์ฟเวอร์)"
     home: "คุณสามารถดูโพสต์จากบัญชีที่คุณติดตามได้"
     local: "คุณสามารถดูโพสต์จากผู้ใช้ทั้งหมดบนเซิร์ฟเวอร์นี้"
-    social: "โพสต์จากทั้งไทม์ไลน์หน้าแรกและไทม์ไลน์ในพื้นที่ของคุณจะปรากฏขึ้น"
+    social: "จะแสดงโพสต์ทั้งจากไทม์ไลน์หลักและไทม์ไลน์ท้องถิ่น"
     global: "คุณสามารถดูโพสต์จากเซิร์ฟเวอร์ที่เชื่อมต่ออื่นๆ ทั้งหมดได้"
     description2: "คุณสามารถสลับระหว่างแต่ละไทม์ไลน์ได้ตลอดเวลาได้ที่บริเวณด้านบนของหน้าจอ"
     description3: "นอกจากนี้ยังมีรายการไทม์ไลน์ ไทม์ไลน์ของช่อง ฯลฯ โปรดดู {link} สำหรับรายละเอียดเพิ่มเติม"
@@ -1320,7 +1340,7 @@ _initialTutorial:
     _visibility:
       description: "คุณสามารถจำกัดผู้ที่สามารถดูโน้ตของคุณได้นะ"
       public: "โน้ตของคุณนั้นจะปรากฏแก่ผู้ใช้งานทุกคน"
-      home: "เผยแพร่บนไทม์ไลน์หน้าแรกเท่านั้น ผู้คนที่เข้าชมโปรไฟล์ของคุณ ผ่านผู้ติดตาม และผ่านการรีโน้ตสามารถเห็นได้"
+      home: "เผยแพร่บนไทม์ไลน์หลักเท่านั้น แต่ผู้ติดตาม ผู้ที่เข้ามาดูโปรไฟล์ และผู้ที่เห็นจากรีโน้ตยังสามารถดูโพสต์นี้ได้"
       followers: "มองเห็นได้เฉพาะผู้ติดตามเท่านั้น ไม่มีใครอื่นนอกจากตัวคุณเองที่สามารถรีโน้ตได้ และมีเพียงผู้ติดตามของคุณเท่านั้นที่สามารถดูได้"
       direct: "เปิดให้เห็นเฉพาะผู้ใช้ที่ระบุเท่านั้น และพวกเขาจะได้รับแจ้งเตือนด้วย คุณสามารถใช้มันแทนข้อความโดยตรง (dm)"
       doNotSendConfidencialOnDirect1: "โปรดใช้ความระมัดระวังในการส่งข้อมูลที่ละเอียดอ่อน"
@@ -1346,17 +1366,17 @@ _initialTutorial:
     title: "บทเรียนจบลงแล้วจ้า เย่เย่เย่  🎉"
     description: "คุณสมบัติที่แนะนำในที่นี่เป็นเพียงบางส่วนเท่านั้น หากต้องการเรียนรู้เพิ่มเติมเกี่ยวกับวิธีใช้ Misskey โปรดไปที่ {link}"
 _timelineDescription:
-  home: "บนไทม์ไลน์หน้าแรก คุณสามารถดูโพสต์จากบัญชีที่คุณติดตามได้"
-  local: "ไทม์ไลน์ในพื้นที่ช่วยให้คุณเห็นโพสต์จากผู้ใช้ทั้งหมดบนเซิร์ฟเวอร์นี้"
-  social: "ไทม์ไลน์โซเชียลจะแสดงโพสต์จากทั้งไทม์ไลน์หน้าแรกและไทม์ไลน์ในพื้นที่"
+  home: "บนไทม์ไลน์หลัก คุณสามารถดูโพสต์จากบัญชีที่ติดตามอยู่ได้"
+  local: "ไทม์ไลน์ท้องถิ่นช่วยให้เห็นโพสต์จากผู้ใช้ทั้งหมดบนเซิร์ฟเวอร์นี้"
+  social: "ไทม์ไลน์โซเชียลจะแสดงโพสต์จากทั้งไทม์ไลน์หลักและไทม์ไลน์ท้องถิ่น"
   global: "ในไทม์ไลน์ทั่วโลก คุณสามารถดูโน้ตจากเซิร์ฟเวอร์ที่เชื่อมต่อทั้งหมดได้"
 _serverRules:
   description: "ชุดของกฎที่จะแสดงก่อนการลงทะเบียนเราขอแนะนำให้ตั้งค่าสรุปข้อกำหนดในการให้บริการ"
 _serverSettings:
   iconUrl: "URL ไอคอน"
   appIconDescription: "ระบุไอคอนที่จะใช้เมื่อ {host} แสดงเป็นแอป"
-  appIconUsageExample: "E.g. เป็น PWA หรือเมื่อแสดงผลเป็นบุ๊กมาร์กหน้าจอหลักบนโทรศัพท์"
-  appIconStyleRecommendation: "เนื่องจากไอคอนอาจถูกครอบตัดเป็นสี่เหลี่ยมจัตุรัสหรือวงกลม จึงแนะนำให้ใช้ไอคอนที่มีขอบสีรอบๆ เนื้อหา"
+  appIconUsageExample: "ตัวอย่างเช่น เมื่อถูกเพิ่มเป็น PWA หรือบุ๊กมาร์กบนหน้าจอหลักในสมาร์ทโฟน"
+  appIconStyleRecommendation: "เนื่องจากอาจถูกครอบตัดเป็นสี่เหลี่ยมหรือวงกลม จึงแนะนำให้ใช้ภาพที่เผื่อพื้นที่รอบๆ ตัวโลโก้ไอคอนไว้"
   appIconResolutionMustBe: "ความละเอียดขั้นต่ำไว้คือ {resolution}."
   manifestJsonOverride: "เขียนทับ manifest.json"
   shortName: "ชื่อย่อ"
@@ -1364,11 +1384,13 @@ _serverSettings:
   fanoutTimelineDescription: "เพิ่มประสิทธิภาพการดึงข้อมูลไทม์ไลน์อย่างมาก และลดภาระในฐานข้อมูลเมื่อเปิดใช้งาน ในทางกลับกัน การใช้หน่วยความจำของ Redis จะเพิ่มขึ้น ลองปิดการใช้งานนี้ในกรณีที่หน่วยความจำเซิร์ฟเวอร์เหลือน้อยหรือเซิร์ฟเวอร์ไม่เสถียร"
   fanoutTimelineDbFallback: "ฟอลแบ๊กกลับฐานข้อมูล"
   fanoutTimelineDbFallbackDescription: "เมื่อเปิดใช้งาน หากไม่ได้แคชไทม์ไลน์ ไทม์ไลน์จะฟอลแบ๊กไปยังฐานข้อมูลสำหรับการ query เพิ่มเติม การปิดใช้งานจะช่วยลดภาระของเซิร์ฟเวอร์ด้วยการกำจัดกระบวนฟอลแบ๊ก แต่มันก็จะจำกัดช่วงเวลาไทม์ไลน์ที่สามารถดึงข้อมูลได้"
+  inquiryUrl: "URL สำหรับการติดต่อสอบถาม"
+  inquiryUrlDescription: "ระบุ URL ของหน้าเว็บที่มีแบบฟอร์มสำหรับติดต่อผู้ดูแลเซิร์ฟเวอร์ หรือข้อมูลการติดต่อของผู้ดูแลเซิร์ฟเวอร์"
 _accountMigration:
   moveFrom: "ย้ายข้อมูลบัญชีอื่นไปยังอีกบัญชีนี้หนึ่ง"
   moveFromSub: "สร้างนามแฝงไปยังบัญชีอื่น"
   moveFromLabel: "บัญชีที่จะย้ายจาก #{n}"
-  moveFromDescription: "ถ้าหากคุณต้องการโอนข้อมูล คุณจำเป็นต้องสร้างบัญชีสำรองสำหรับการย้ายบัญชี  หลังจากนั้นป้อนบัญชีที่จะย้ายไปในรูปแบบต่อไปนี้: @person@instance.com"
+  moveFromDescription: "หากต้องการโอนข้อมูลจากบัญชีอื่นมายังบัญชีนี้ จำเป็นต้องสร้างบัญชีนามแฝง (alias) ไว้ที่นี่ด้วย\nกรุณากรอกบัญชีเดิมในรูปแบบ: @username@server.example.com\nหากต้องการลบ alias, ให้เว้นว่างไว้แล้วบันทึก (ไม่แนะนำ)"
   moveTo: "ย้ายข้อมูลบัญชีนี้ไปยังบัญชีอีกหนึ่ง"
   moveToLabel: "บัญชีที่จะย้ายไปที่:"
   moveCannotBeUndone: "ไม่สามารถยกเลิกการโอนย้ายบัญชีได้"
@@ -1569,10 +1591,10 @@ _achievements:
       description: "อ้างโน้ตของคุณเอง"
     _htl20npm:
       title: "ไทม์ไลน์ไหล"
-      description: "มีการทำความเร็วของไทม์ไลน์หน้าแรกเกิน 20 npm (โน้ตต่อนาที)"
+      description: "มีการทำความเร็วของไทม์ไลน์หลักเกิน 20 npm (โน้ตต่อนาที)"
     _viewInstanceChart:
       title: "วิเคราะห์"
-      description: "ดูแผนภูมิอินสแตนซ์ของคุณ"
+      description: "ดูแผนภูมิเซิร์ฟเวอร์ของคุณ"
     _outputHelloWorldOnScratchpad:
       title: "หวัดดีชาวโลก!"
       description: "เอาพุต \"hello world\" ใน Scratchpad"
@@ -1637,7 +1659,7 @@ _role:
   name: "ชื่อบทบาท"
   description: "คำอธิบายบทบาท"
   permission: "สิทธิ์ตามบทบาท"
-  descriptionOfPermission: "<b>ผู้ควบคุม</b> สามารถดำเนินการดูแลขั้นพื้นฐานได้\n<b>ผู้ดูแลระบบ</b> สามารถเปลี่ยนการตั้งค่าทั้งหมดของอินสแตนซ์ได้"
+  descriptionOfPermission: "<b>ผู้ควบคุม</b> สามารถดำเนินการดูแลขั้นพื้นฐานได้\n<b>ผู้ดูแลระบบ</b> สามารถเปลี่ยนการตั้งค่าทั้งหมดของเซิร์ฟเวอร์ได้"
   assignTarget: "มอบหมาย"
   descriptionOfAssignTarget: "แบบ<b>ปรับเอง</b> เพิ่มถอนบทบาทนี้แก่ผู้ใช้ด้วยตัวเอง\nแบบ<b>มีเงื่อนไข</b> เพิ่มถอนบทบาทนี้แก่ผู้ใช้โดยอัตโนมัติหากเข้าเงื่อนไขใดต่อไปนี้"
   manual: "ปรับเอง"
@@ -1668,11 +1690,11 @@ _role:
     middle: "ปานกลาง"
     high: "สูง"
   _options:
-    gtlAvailable: "การดูไทม์ไลน์ทั่วโลก"
-    ltlAvailable: "การดูไทม์ไลน์ในท้องถิ่น"
+    gtlAvailable: "สามารถดูไทม์ไลน์ทั่วโลกได้"
+    ltlAvailable: "สามารถดูไทม์ไลน์ท้องถิ่นได้"
     canPublicNote: "สามารถโพสต์แบบสาธารณะ"
     mentionMax: "จำนวนการกล่าวถึงสูงสุดต่อโน้ต"
-    canInvite: "สร้างรหัสเชิญอินสแตนซ์"
+    canInvite: "สร้างรหัสเชิญเข้าเซิร์ฟเวอร์"
     inviteLimit: "จำกัดการเชิญ"
     inviteLimitCycle: "คูลดาวน์ในการเชิญ"
     inviteExpirationTime: "วันหมดอายุของรหัสการเชิญ"
@@ -1680,6 +1702,7 @@ _role:
     canManageAvatarDecorations: "จัดการตกแต่งอวตาร"
     driveCapacity: "ความจุของไดรฟ์"
     alwaysMarkNsfw: "ทำเครื่องหมายไฟล์ว่าเป็น NSFW เสมอ"
+    canUpdateBioMedia: "อนุญาตให้ปรับปรุงไอคอนและแบนเนอร์"
     pinMax: "จํานวนสูงสุดของโน้ตที่ปักหมุดไว้"
     antennaMax: "จำนวนสูงสุดของเสาอากาศ"
     wordMuteMax: "จำนวนอักขระสูงสุดที่อนุญาตในการปิดเสียงคำ"
@@ -1696,7 +1719,7 @@ _role:
     avatarDecorationLimit: "จำนวนการตกแต่งไอคอนสูงสุดที่สามารถติดตั้งได้"
   _condition:
     roleAssignedTo: "มอบหมายให้มีบทบาทแบบทำมือ"
-    isLocal: "ผู้ใช้ในพื้นที่"
+    isLocal: "ผู้ใช้ท้องถิ่น"
     isRemote: "ผู้ใช้ระยะไกล"
     isCat: "ผู้ใช้ที่เป็นแมว"
     isBot: "ผู้ใช้ที่เป็นบอต"
@@ -1755,8 +1778,8 @@ _ad:
   adsTooClose: "เนื่องจากช่วงเวลาการแสดงโฆษณาสั้นมาก ประสบการณ์ผู้ใช้จึงอาจลดลงอย่างมาก"
 _forgotPassword:
   enterEmail: "ป้อนที่อยู่อีเมลที่คุณเคยใช้ในการลงทะเบียนไว้ ลิงก์ที่คุณสามารถรีเซ็ตรหัสผ่านได้นั้นจะถูกส่งไปนะ"
-  ifNoEmail: "ถ้าหากคุณไม่ได้ใช้อีเมลระหว่างการลงทะเบียน กรุณาติดต่อผู้ดูแลระบบอินสแตนซ์แทนนะ"
-  contactAdmin: "อินสแตนซ์นี้ไม่รองรับการใช้งานที่อยู่อีเมลนี้ กรุณาติดต่อผู้ดูแลระบบอินสแตนซ์เพื่อรีเซ็ตรหัสผ่านของคุณแทน"
+  ifNoEmail: "หากลงทะเบียนแบบไม่ใช้อีเมล โปรดติดต่อผู้ดูแลระบบ"
+  contactAdmin: "เนื่องจากเซิร์ฟเวอร์นี้ไม่รองรับการส่งอีเมล หากต้องการรีเซ็ตรหัสผ่าน กรุณาติดต่อผู้ดูแลระบบ"
 _gallery:
   my: "แกลลอรี่ของฉัน"
   liked: "โพสต์ที่ถูกใจ"
@@ -1774,23 +1797,23 @@ _plugin:
   viewSource: "ดูต้นฉบับ"
   viewLog: "แสดงปูม"
 _preferencesBackups:
-  list: "สร้างการสำรองข้อมูล"
-  saveNew: "บันทึกข้อมูลสำรองใหม่"
+  list: "การตั้งค่าสำรองที่สร้างไว้"
+  saveNew: "บันทึกการตั้งค่าสำรองใหม่"
   loadFile: "โหลดจากไฟล์"
   apply: "นำไปใช้กับอุปกรณ์นี้"
   save: "บันทึก"
-  inputName: "กรุณาป้อนชื่อสำหรับข้อมูลสำรองนี้"
+  inputName: "กรุณาป้อนชื่อการตั้งค่าสำรองนี้"
   cannotSave: "การบันทึกล้มเหลว"
-  nameAlreadyExists: "มีข้อมูลสำรองชื่อ \"{name}\" นี้อยู่แล้ว กรุณาป้อนชื่ออื่นนะ"
-  applyConfirm: "คุณต้องการใช้ข้อมูลสำรอง \"{name}\" กับอุปกรณ์นี้อย่างงั้นจริงหรอ การตั้งค่าที่มีอยู่ของอุปกรณ์นี้จะถูกเขียนทับนะ"
-  saveConfirm: "บันทึกข้อมูลสำรองเป็น {name} มั้ย?"
-  deleteConfirm: "ลบข้อมูลสำรอง {name} มั้ย?"
-  renameConfirm: "ต้องการเปลี่ยนชื่อข้อมูลสำรองจาก “{old}” เป็น “{new}” ใช่ไหม?"
-  noBackups: "ไม่มีข้อมูลสำรอง สามารถบันทึกการตั้งค่าไคลเอนต์ปัจจุบันไปยังเซิร์ฟเวอร์ด้วย “บันทึกข้อมูลสำรองใหม่”"
+  nameAlreadyExists: "มีการตั้งค่าสำรองชื่อ “{name}” อยู่แล้ว กรุณาป้อนชื่ออื่น"
+  applyConfirm: "ต้องการใช้การตั้งค่าสำรอง “{name}” กับอุปกรณ์นี้ใช่ไหม? การตั้งค่าที่มีอยู่บนอุปกรณ์นี้จะถูกเขียนทับ"
+  saveConfirm: "บันทึกการตั้งค่าสำรองเป็น {name} ใช่ไหม?"
+  deleteConfirm: "ต้องการลบ {name} ใช่ไหม?"
+  renameConfirm: "ต้องการเปลี่ยนชื่อจาก “{old}” เป็น “{new}” ใช่ไหม?"
+  noBackups: "ไม่มีการตั้งค่าสำรอง สามารถบันทึกการตั้งค่าไคลเอนต์ปัจจุบันไปยังเซิร์ฟเวอร์ด้วย “บันทึกการตั้งค่าสำรองใหม่”"
   createdAt: "สร้างเมื่อ: {date} {time}"
   updatedAt: "อัปเดตเมื่อ: {date} {time}"
   cannotLoad: "การโหลดล้มเหลว"
-  invalidFile: "รูปแบบไฟล์ไม่ถูกต้องนะ"
+  invalidFile: "รูปแบบไฟล์ไม่ถูกต้อง"
 _registry:
   scope: "สโคป"
   key: "คีย์"
@@ -1844,10 +1867,10 @@ _wordMute:
   muteWordsDescription: "คั่นด้วยช่องว่างสำหรับเงื่อนไข AND หรือด้วยการขึ้นบรรทัดใหม่สำหรับเงื่อนไข OR นะ"
   muteWordsDescription2: "ล้อมรอบคีย์เวิร์ดด้วยเครื่องหมายทับเพื่อใช้นิพจน์ทั่วไป"
 _instanceMute:
-  instanceMuteDescription: "การดำเนินการนี้จะปิดเสียง\"โน้ต/รีโน้ต\"จากอินสแตนซ์ที่อยู่ในรายการ รวมถึงบันทึกของผู้ใช้ที่ตอบกลับผู้ใช้จากอินสแตนซ์ที่ปิดเสียง"
+  instanceMuteDescription: "ปิดเสียง “โน้ต/รีโน้ต” ทั้งหมดจากเซิร์ฟเวอร์ที่ระบุไว้ รวมถึงโน้ตของผู้ใช้ที่ตอบกลับผู้ใช้จากเซิร์ฟเวอร์ที่ถูกปิดเสียง"
   instanceMuteDescription2: "คั่นด้วยการขึ้นบรรทัดใหม่"
-  title: "ซ่อนโน้ตจากอินสแตนซ์ที่มีอยู่ในรายชื่อ"
-  heading: "รายชื่ออินสแตนซ์ที่ถูกปิดเสียง"
+  title: "ซ่อนโน้ตจากเซิร์ฟเวอร์ที่มีระบุไว้"
+  heading: "เซิร์ฟเวอร์ที่ถูกปิดเสียง"
 _theme:
   explore: "สำรวจธีม"
   install: "ติดตั้งธีม"
@@ -1923,8 +1946,6 @@ _sfx:
   note: "โน้ต"
   noteMy: "โน้ตของตัวเอง"
   notification: "การเเจ้งเตือน"
-  antenna: "เสาอากาศ"
-  channel: "การแจ้งเตือนช่อง"
   reaction: "เมื่อเลือกรีแอคชั่น"
 _soundSettings:
   driveFile: "ใช้เสียงจากไดรฟ์"
@@ -1932,7 +1953,7 @@ _soundSettings:
   driveFileTypeWarn: "ไม่รองรับไฟล์นี้"
   driveFileTypeWarnDescription: "กรุณาเลือกไฟล์เสียง"
   driveFileDurationWarn: "เสียงยาวเกินไป"
-  driveFileDurationWarnDescription: "การใช้เสียงที่ยาวอาจรบกวนการใช้งาน Misskey, ต้องการดำเนินการต่อหรือไม่?"
+  driveFileDurationWarnDescription: "การใช้เสียงที่ยาว อาจรบกวนการใช้งาน Misskey, ต้องการดำเนินการต่อใช่ไหม?"
 _ago:
   future: "อนาคต"
   justNow: "เมื่อกี๊นี้"
@@ -1976,15 +1997,15 @@ _2fa:
   removeKey: "ลบคีย์ความปลอดภัยออก"
   removeKeyConfirm: "ลบข้อมูลสำรอง {name} มั้ย?"
   whyTOTPOnlyRenew: "ไม่สามารถลบแอปตัวรับรองความถูกต้องได้ตราบใดที่มีการลงทะเบียนคีย์ความปลอดภัยไว้แล้ว"
-  renewTOTP: "กำหนดค่าแอพตัวตรวจสอบสิทธิ์ใหม่"
+  renewTOTP: "ตั้งค่าแอปยืนยันตัวตน"
   renewTOTPConfirm: "วิธีการแบบนี้จะทําให้รหัสยืนยันจากแอพก่อนหน้าของคุณหยุดทํางานเลยนะ"
   renewTOTPOk: "ตั้งค่าคอนฟิกใหม่"
   renewTOTPCancel: "ไม่เป็นไร"
-  checkBackupCodesBeforeCloseThisWizard: "โปรดตรวจสอบรหัสสำรองด้านล่างก่อนที่จะปิดวิซาร์ดนี้"
-  backupCodes: "รหัสสำรองข้อมูล"
+  checkBackupCodesBeforeCloseThisWizard: "โปรดตรวจสอบรหัสแบ๊กอัปด้านล่างก่อนที่จะปิดวิซาร์ดนี้"
+  backupCodes: "รหัสแบ๊กอัป"
   backupCodesDescription: "หากแอปยืนยันตัวตนของคุณไม่พร้อมใช้งาน คุณสามารถใช้รหัสสำรองด้านล่างเพื่อเข้าถึงบัญชีของคุณได้ อย่าลืมเก็บรหัสเหล่านี้ไว้ในที่ปลอดภัย แต่ละรหัสสามารถใช้ได้เพียงครั้งเดียวเท่านั้น"
-  backupCodeUsedWarning: "มีการใช้รหัสสำรองแล้ว โปรดกรุณากำหนดค่าการตรวจสอบสิทธิ์แบบสองปัจจัยโดยเร็วที่สุดถ้าหากคุณยังไม่สามารถใช้งานได้อีก"
-  backupCodesExhaustedWarning: "รหัสสำรองทั้งหมดถูกใช้แล้ว ถ้าหากคุณยังสูญเสียการเข้าถึงแอปการตรวจสอบสิทธิ์แบบสองปัจจัยคุณจะยังไม่สามารถเข้าถึงบัญชีนี้ได้ กรุณากำหนดค่าการรับรองความถูกต้องด้วยการยืนยันสองชั้น"
+  backupCodeUsedWarning: "รหัสแบ๊กอัปถูกใช้งานแล้ว หากแอปพลิเคชันการยืนยันตัวตนไม่สามารถใช้งานได้ ให้รีบทำการตั้งค่าแอปฯใหม่โดยเร็วที่สุด"
+  backupCodesExhaustedWarning: "รหัสแบ๊กอัปทั้งหมดถูกใช้งานแล้ว หากยังไม่สามารถใช้แอปพลิเคชันการยืนยันตัวตนได้ก็จะไม่สามารถเข้าถึงบัญชีนี้ได้อีกต่อไป กรุณาลงทะเบียนแอปพลิเคชันการยืนยันตัวตนใหม่"
   moreDetailedGuideHere: "คลิกที่นี่เพื่อดูคำแนะนำโดยละเอียด"
 _permissions:
   "read:account": "ดูข้อมูลบัญชีของคุณ"
@@ -2074,7 +2095,7 @@ _permissions:
 _auth:
   shareAccessTitle: "การให้สิทธิ์แอปพลิเคชัน"
   shareAccess: "คุณต้องการอนุญาตให้ \"{name}\" เข้าถึงบัญชีนี้เลยมั้ย?"
-  shareAccessAsk: "ต้องการอนุญาตให้แอปพลิเคชันนี้เข้าถึงบัญชีของคุณหรือไม่?"
+  shareAccessAsk: "ต้องการอนุญาตให้แอปพลิเคชันนี้เข้าถึงบัญชีของคุณใช่ไหม?"
   permission: "{name} ได้ขอสิทธิ์การเข้าถึงดังต่อไปนี้"
   permissionAsk: "แอปพลิเคชันนี้ขอสิทธิ์ดังต่อไปนี้"
   pleaseGoBack: "กรุณากลับไปที่แอปพลิเคชัน"
@@ -2097,7 +2118,7 @@ _weekday:
   saturday: "วันเสาร์"
 _widgets:
   profile: "โปรไฟล์"
-  instanceInfo: "ข้อมูล อินสแตนซ์"
+  instanceInfo: "ข้อมูลเซิร์ฟเวอร์"
   memo: "โน้ตแปะ"
   notifications: "การเเจ้งเตือน"
   timeline: "ไทม์ไลน์"
@@ -2111,7 +2132,7 @@ _widgets:
   digitalClock: "นาฬิกาดิจิตอล"
   unixClock: "นาฬิกา UNIX"
   federation: "สหพันธ์"
-  instanceCloud: "อินสแตนซ์คลาวด์"
+  instanceCloud: "กลุ่มเมฆเซิร์ฟเวอร์"
   postForm: "แบบฟอร์มการโพสต์"
   slideshow: "แสดงภาพนิ่ง"
   button: "ปุ่ม"
@@ -2156,14 +2177,14 @@ _poll:
 _visibility:
   public: "สาธารณะ"
   publicDescription: "โน้ตของคุณจะปรากฏแก่ผู้ใช้ทุกคน"
-  home: "หน้าแรก"
-  homeDescription: "โพสลงไทม์ไลน์ที่บ้านเท่านั้น"
+  home: "หน้าหลัก"
+  homeDescription: "โพสต์ลงไทม์ไลน์หลักเท่านั้น"
   followers: "ผู้ติดตาม"
   followersDescription: "เฉพาะผู้ติดตามเท่านั้นที่มองเห็นได้"
   specified: "ไดเร็ค"
   specifiedDescription: "ทำให้มองเห็นได้เฉพาะผู้ใช้ที่ระบุเท่านั้น"
   disableFederation: "ไม่มีสหพันธ์"
-  disableFederationDescription: "อย่าส่งไปยังอินสแตนซ์อื่น"
+  disableFederationDescription: "อย่าส่งข้อมูลไปยังเซิร์ฟเวอร์อื่น"
 _postForm:
   replyPlaceholder: "ตอบกลับโน้ตนี้..."
   quotePlaceholder: "อ้างโน้ตนี้..."
@@ -2199,37 +2220,37 @@ _exportOrImport:
   userLists: "รายชื่อ"
   excludeMutingUsers: "ยกเว้นผู้ใช้ที่ปิดเสียง"
   excludeInactiveUsers: "ยกเว้นผู้ใช้ที่ไม่ได้ใช้งาน"
-  withReplies: "รวมการตอบกลับจากผู้ใช้ที่นำเข้าไว้ในไทม์ไลน์"
+  withReplies: "รวมการตอบกลับจากผู้ใช้ที่ถูกนำเข้า ลงไทม์ไลน์"
 _charts:
   federation: "สหพันธ์"
   apRequest: "คำขอ"
-  usersIncDec: "ความแตกต่างของจำนวนผู้ใช้งาน"
+  usersIncDec: "การเพิ่มลดของจำนวนผู้ใช้"
   usersTotal: "จำนวนผู้ใช้งานทั้งหมด"
   activeUsers: "จำนวนผู้ใช้งานที่ยังมีความเคลื่อนไหวอยู่"
-  notesIncDec: "ความแตกต่างของจำนวนโน้ต"
-  localNotesIncDec: "ความแตกต่างของจำนวนโน้ตท้องถิ่น"
-  remoteNotesIncDec: "ความแตกต่างของจำนวนโน้ตระยะไกล"
+  notesIncDec: "การเพิ่มลดของจำนวนโน้ต"
+  localNotesIncDec: "การเพิ่มลดของจำนวนโน้ตท้องถิ่น"
+  remoteNotesIncDec: "การเพิ่มลดของจำนวนโน้ตระยะไกล"
   notesTotal: "จำนวนโน้ตทั้งหมด"
-  filesIncDec: "ความแตกต่างของจำนวนไฟล์"
+  filesIncDec: "การเพิ่มลดของจำนวนไฟล์"
   filesTotal: "จำนวนไฟล์ทั้งหมด"
-  storageUsageIncDec: "ความแตกต่างในการใช้พื้นที่เก็บข้อมูล"
+  storageUsageIncDec: "การเพิ่มลดในการใช้พื้นที่เก็บข้อมูล"
   storageUsageTotal: "การใช้พื้นที่เก็บข้อมูลทั้งหมด"
 _instanceCharts:
   requests: "คำขอ"
-  users: "ความแตกต่างของจำนวนผู้ใช้งาน"
+  users: "การเพิ่มลดของจำนวนผู้ใช้งาน"
   usersTotal: "จำนวนผู้ใช้งานสะสม"
-  notes: "ความแตกต่างของจำนวนโน้ต"
+  notes: "การเพิ่มลดของจำนวนโน้ต"
   notesTotal: "จำนวนโน้ตสะสม"
-  ff: "ความแตกต่างของจำนวนผู้ใช้ที่ติดตาม / ผู้ติดตาม"
-  ffTotal: "จำนวนผู้ใช้งานที่ติดตามสะสม / ผู้ติดตาม"
-  cacheSize: "ความแตกต่างในขนาดของแคช"
-  cacheSizeTotal: "ขนาดแคชรวมที่สะสม"
-  files: "ความแตกต่างของจำนวนไฟล์"
+  ff: "การเพิ่มลดของการติดตาม/ผู้ติดตาม"
+  ffTotal: "จำนวนสะสมของการติดตาม/ผู้ติดตาม"
+  cacheSize: "การเพิ่มลดขนาดของแคช"
+  cacheSizeTotal: "ขนาดแคชสะสม"
+  files: "การเพิ่มลดของจำนวนไฟล์"
   filesTotal: "จำนวนไฟล์สะสม"
 _timelines:
-  home: "หน้าแรก"
-  local: "ในพื้นที่"
-  social: "โซเชี่ยล"
+  home: "หน้าหลัก"
+  local: "ท้องถิ่น"
+  social: "โซเชียล"
   global: "ทั่วโลก"
 _play:
   new: "สร้าง Play"
@@ -2333,7 +2354,7 @@ _notification:
     mention: "กล่าวถึง"
     reply: "ตอบกลับ"
     renote: "รีโน้ต"
-    quote: "อ้างคำพูด"
+    quote: "อ้างอิง"
     reaction: "รีแอคชั่น"
     pollEnded: "โพลสิ้นสุดแล้ว"
     receiveFollowRequest: "ได้รับคำร้องขอติดตาม"
@@ -2349,6 +2370,7 @@ _deck:
   alwaysShowMainColumn: "แสดงคอลัมน์หลักเสมอ"
   columnAlign: "จัดแนวคอลัมน์"
   addColumn: "เพิ่มคอลัมน์"
+  newNoteNotificationSettings: "ตั้งค่าการแจ้งเตือนเมื่อมีโน้ตใหม่"
   configureColumn: "ตั้งค่าคอลัมน์"
   swapLeft: "ขยับไปทางซ้าย"
   swapRight: "ขยับไปทางขวา"
@@ -2373,7 +2395,7 @@ _deck:
     antenna: "เสาอากาศ"
     list: "รายการ"
     channel: "ช่อง"
-    mentions: "พูดถึง"
+    mentions: "กล่าวถึงคุณ"
     direct: "ไดเร็กต์"
     roleTimeline: "บทบาทไทม์ไลน์"
 _dialog:
@@ -2387,6 +2409,7 @@ _drivecleaner:
   orderByCreatedAtAsc: "วันที่จากน้อยไปหามาก"
 _webhookSettings:
   createWebhook: "สร้าง Webhook"
+  modifyWebhook: "แก้ไข Webhook"
   name: "ชื่อ"
   secret: "ความลับ"
   events: "อีเว้นท์ Webhook"
@@ -2399,6 +2422,25 @@ _webhookSettings:
     renote: "รีโน้ตแล้วเมื่อ"
     reaction: "เมื่อได้รับรีแอคชั่น"
     mention: "เมื่อกำลังถูกกล่าวถึง"
+  _systemEvents:
+    abuseReport: "เมื่อมีการรายงานจากผู้ใช้"
+    abuseReportResolved: "เมื่อมีการจัดการกับการรายงานจากผู้ใช้"
+  deleteConfirm: "ต้องการลบ Webhook ใช่ไหม?"
+_abuseReport:
+  _notificationRecipient:
+    createRecipient: "เพิ่มปลายทางการแจ้งเตือนการรายงาน"
+    modifyRecipient: "แก้ไขปลายทางการแจ้งเตือนการรายงาน"
+    recipientType: "ประเภทของปลายทางการแจ้งเตือน\n"
+    _recipientType:
+      mail: "อีเมล"
+      webhook: "Webhook"
+      _captions:
+        mail: "ส่งการแจ้งเตือนไปยังที่อยู่อีเมลของผู้ควบคุม (เฉพาะเมื่อได้รับการรายงาน)"
+        webhook: "ส่งการแจ้งเตือนไปยัง SystemWebhook ที่กำหนด (จะส่งเมื่อได้รับการรายงานและเมื่อการรายงานได้รับการแก้ไข)"
+    keywords: "คีย์เวิร์ด"
+    notifiedUser: "ผู้ใช้ที่ได้รับการแจ้งเตือน"
+    notifiedWebhook: "Webhook ที่ใช้"
+    deleteConfirm: "ต้องการลบปลายทางการแจ้งเตือนใช่ไหม?"
 _moderationLogTypes:
   createRole: "สร้างบทบาทแล้ว"
   deleteRole: "ลบบทบาทแล้ว"
@@ -2421,9 +2463,9 @@ _moderationLogTypes:
   deleteGlobalAnnouncement: "ลบประกาศทั่วโลกออกแล้ว"
   deleteUserAnnouncement: "ลบประกาศผู้ใช้ออกแล้ว"
   resetPassword: "รีเซ็ตรหัสผ่าน"
-  suspendRemoteInstance: "ระงับอินสแตนซ์ระยะไกล"
-  unsuspendRemoteInstance: "เลิกระงับอินสแตนซ์ระยะไกล"
-  updateRemoteInstanceNote: "อัปเดตโน้ตการกลั่นกรองของอินสแตนซ์ระยะไกลแล้ว"
+  suspendRemoteInstance: "ระงับเซิร์ฟเวอร์ระยะไกล"
+  unsuspendRemoteInstance: "เลิกระงับเซิร์ฟเวอร์ระยะไกล"
+  updateRemoteInstanceNote: "อัปเดตโน้ตการกลั่นกรองสำหรับเซิร์ฟเวอร์ระยะไกลแล้ว"
   markSensitiveDriveFile: "ทำเครื่องหมายไฟล์ว่ามีเนื้อหาละเอียดอ่อน"
   unmarkSensitiveDriveFile: "ยกเลิกทำเครื่องหมายไฟล์ว่ามีเนื้อหาละเอียดอ่อน"
   resolveAbuseReport: "รายงานได้รับการแก้ไขแล้ว"
@@ -2436,6 +2478,12 @@ _moderationLogTypes:
   deleteAvatarDecoration: "ลบการตกแต่งไอคอนแล้ว"
   unsetUserAvatar: "ลบไอคอนผู้ใช้"
   unsetUserBanner: "ลบแบนเนอร์ผู้ใช้"
+  createSystemWebhook: "สร้าง SystemWebhook"
+  updateSystemWebhook: "อัปเดต SystemWebhook"
+  deleteSystemWebhook: "ลบ SystemWebhook"
+  createAbuseReportNotificationRecipient: "สร้างปลายทางการแจ้งเตือนการรายงาน"
+  updateAbuseReportNotificationRecipient: "อัปเดตปลายทางการแจ้งเตือนการรายงาน"
+  deleteAbuseReportNotificationRecipient: "ลบปลายทางการแจ้งเตือนการรายงาน"
 _fileViewer:
   title: "รายละเอียดไฟล์"
   type: "ประเภทไฟล์"
@@ -2448,10 +2496,10 @@ _externalResourceInstaller:
   title: "ติดตั้งจากไซต์ภายนอก"
   checkVendorBeforeInstall: "โปรดตรวจสอบให้แน่ใจว่าแหล่งแจกหน่ายมีความน่าเชื่อถือก่อนทำการติดตั้ง"
   _plugin:
-    title: "ต้องการติดตั้งปลั๊กอินนี้หรือไม่?"
+    title: "ต้องการติดตั้งปลั๊กอินนี้ใช่ไหม?"
     metaTitle: "ข้อมูลส่วนเสริม"
   _theme:
-    title: "ต้องการติดตั้งธีมนี้หรือไม่?"
+    title: "ต้องการติดตั้งธีมนี้ใช่ไหม?"
     metaTitle: "ข้อมูลธีม"
   _meta:
     base: "โทนสีพื้นฐาน"
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index 661ecf19d7..36d741d30e 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -1318,8 +1318,6 @@ _sfx:
   note: "Нотатки"
   noteMy: "Мої нотатки"
   notification: "Сповіщення"
-  antenna: "Прийом антени"
-  channel: "Повідомлення каналу"
 _ago:
   future: "Майбутнє"
   justNow: "Щойно"
@@ -1622,6 +1620,10 @@ _deck:
 _webhookSettings:
   name: "Ім'я"
   active: "Увімкнено"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "E-mail"
 _moderationLogTypes:
   suspend: "Призупинити"
   resetPassword: "Скинути пароль"
diff --git a/locales/uz-UZ.yml b/locales/uz-UZ.yml
index 4a930626f4..ee4ab83ce7 100644
--- a/locales/uz-UZ.yml
+++ b/locales/uz-UZ.yml
@@ -1089,6 +1089,10 @@ _webhookSettings:
   _events:
     renote: "Qayta qayd qilinganda"
     mention: "Eslanganda"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "Email"
 _moderationLogTypes:
   suspend: "To'xtatish"
   resetPassword: "Parolni tiklash"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index acc2e0c6a9..317dea5150 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -376,6 +376,7 @@ mcaptcha: "mCaptcha"
 enableMcaptcha: "Bật mCaptcha"
 mcaptchaSiteKey: "Khóa của trang"
 mcaptchaSecretKey: "Khóa bí mật"
+mcaptchaInstanceUrl: "URL mCaptcha máy chủ"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Bật reCAPTCHA"
 recaptchaSiteKey: "Khóa của trang"
@@ -426,6 +427,7 @@ moderator: "Kiểm duyệt viên"
 moderation: "Kiểm duyệt"
 moderationNote: "Ghi chú kiểm duyệt"
 addModerationNote: "Thêm ghi chú kiểm duyệt"
+moderationLogs: "Nhật kí quản trị"
 nUsersMentioned: "Dùng bởi {n} người"
 securityKeyAndPasskey: "Mã bảo mật・Passkey"
 securityKey: "Khóa bảo mật"
@@ -458,6 +460,7 @@ retype: "Nhập lại"
 noteOf: "Tút của {user}"
 quoteAttached: "Trích dẫn"
 quoteQuestion: "Trích dẫn lại?"
+attachAsFileQuestion: "Văn bản ở trong bộ nhớ tạm rất dài. Bạn có muốn đăng nó dưới dạng một tệp văn bản không?"
 noMessagesYet: "Chưa có tin nhắn"
 newMessageExists: "Bạn có tin nhắn mới"
 onlyOneFileCanBeAttached: "Bạn chỉ có thể đính kèm một tập tin"
@@ -1559,8 +1562,6 @@ _sfx:
   note: "Tút"
   noteMy: "Tút của tôi"
   notification: "Thông báo"
-  antenna: "Trạm phát sóng"
-  channel: "Kênh"
 _ago:
   future: "Tương lai"
   justNow: "Vừa xong"
@@ -1922,6 +1923,10 @@ _webhookSettings:
   _events:
     reaction: "Khi nhận được sự kiện"
     mention: "Khi có người nhắc tới bạn"
+_abuseReport:
+  _notificationRecipient:
+    _recipientType:
+      mail: "Email"
 _moderationLogTypes:
   suspend: "Vô hiệu hóa"
   resetPassword: "Đặt lại mật khẩu"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index f92d997b5a..6f10788743 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -180,6 +180,10 @@ addAccount: "添加账户"
 reloadAccountsList: "更新账户列表"
 loginFailed: "登录失败"
 showOnRemote: "转到所在服务器显示"
+continueOnRemote: "转到所在服务器继续"
+chooseServerOnMisskeyHub: "从 Misskey Hub 选择服务器"
+specifyServerHost: "直接输入服务器域名"
+inputHostName: "请输入域名"
 general: "常规设置"
 wallpaper: "壁纸"
 setWallpaper: "设置壁纸"
@@ -351,7 +355,7 @@ instanceName: "服务器名称"
 instanceDescription: "服务器简介"
 maintainerName: "管理员名称"
 maintainerEmail: "管理员电子邮箱"
-tosUrl: "服务条款 URL"
+tosUrl: "服务条款地址"
 thisYear: "今年"
 thisMonth: "本月"
 today: "今天"
@@ -433,8 +437,8 @@ administrator: "管理员"
 token: "Token (令牌)"
 2fa: "双因素认证"
 setupOf2fa: "设置双因素认证"
-totp: "身份验证应用"
-totpDescription: "使用认证应用输入一次性密码。"
+totp: "验证器"
+totpDescription: "使用验证器输入一次性密码"
 moderator: "监察员"
 moderation: "管理"
 moderationNote: "管理笔记"
@@ -477,6 +481,7 @@ noMessagesYet: "现在没有新的聊天"
 newMessageExists: "新信息"
 onlyOneFileCanBeAttached: "只能添加一个附件"
 signinRequired: "请先登录"
+signinOrContinueOnRemote: "若要继续，需要转到您所使用的实例，或者在此服务器上注册或登录。"
 invitations: "邀请"
 invitationCode: "邀请码"
 checking: "正在确认"
@@ -837,6 +842,7 @@ administration: "管理"
 accounts: "账户"
 switch: "切换"
 noMaintainerInformationWarning: "管理人员信息未设置。"
+noInquiryUrlWarning: "尚未设置联络地址。"
 noBotProtectionWarning: "Bot 防御未设置。"
 configure: "设置"
 postToGallery: "发送到图库"
@@ -848,7 +854,7 @@ shareWithNote: "在帖子中分享"
 ads: "广告"
 expiration: "截止时间"
 startingperiod: "开始时间"
-memo: "便笺"
+memo: "备注"
 priority: "优先级"
 high: "高"
 middle: "中"
@@ -1180,7 +1186,7 @@ externalServices: "外部服务"
 sourceCode: "源代码"
 sourceCodeIsNotYetProvided: "还未提供源代码。要解决此问题请联系管理员。"
 repositoryUrl: "仓库地址"
-repositoryUrlDescription: "若源代码所在的仓库是公开的，请填入对应的 URL。若是按原样使用 Misskey（并未追加或者修改代码）的情况请填入 https://github.com/misskey-dev/misskey。"
+repositoryUrlDescription: "若源代码所在的仓库是公开的，请填入对应的 URL。若并未追加或者修改 Misskey 的代码，请填入 https://github.com/misskey-dev/misskey。"
 repositoryUrlOrTarballRequired: "若仓库并未公开，则需要提供 tarball 作为替代。详情请看 .config/example.yml。"
 feedback: "反馈"
 feedbackUrl: "反馈地址"
@@ -1241,6 +1247,9 @@ keepOriginalFilenameDescription: "若关闭此设置，上传文件时文件名
 noDescription: "没有描述"
 alwaysConfirmFollow: "总是确认关注"
 inquiry: "联系我们"
+tryAgain: "请再试一次"
+confirmWhenRevealingSensitiveMedia: "显示敏感内容前需要确认"
+sensitiveMediaRevealConfirm: "这是敏感内容。是否显示？"
 _delivery:
   status: "投递状态"
   stop: "停止投递"
@@ -1375,6 +1384,8 @@ _serverSettings:
   fanoutTimelineDescription: "当启用时，可显著提高获取各种时间线时的性能，并减轻数据库的负荷。但是相对的 Redis 的内存使用量将会增加。如果服务器的内存不是很大，又或者运行不稳定的话可以把它关掉。"
   fanoutTimelineDbFallback: "回退到数据库"
   fanoutTimelineDbFallbackDescription: "当启用时，若时间线未被缓存，则将额外查询数据库。禁用该功能可通过不执行回退处理进一步减少服务器负载，但会限制可检索的时间线范围。"
+  inquiryUrl: "联络地址"
+  inquiryUrlDescription: "用来指定诸如向服务运营商咨询的论坛地址，或记载了运营商联系方式之类的网页地址。"
 _accountMigration:
   moveFrom: "从别的账号迁移到此账户"
   moveFromSub: "为另一个账户建立别名"
@@ -1670,8 +1681,8 @@ _role:
   descriptionOfIsExplorable: "打开后将公开角色时间线。如果角色不是公开的，就无法公开时间线。"
   displayOrder: "显示顺序"
   descriptionOfDisplayOrder: "数字越大，显示位置越靠前。"
-  canEditMembersByModerator: "允许监察者编辑成员"
-  descriptionOfCanEditMembersByModerator: "如果选中，监察者和管理员都能够为用户分配/取消分配角色。如果未选中，则只有管理员可以执行此操作。"
+  canEditMembersByModerator: "允许监察员编辑成员"
+  descriptionOfCanEditMembersByModerator: "如果选中，监察员和管理员都能够为用户分配/取消分配角色。如果未选中，则只有管理员可以执行此操作。"
   priority: "优先级"
   _priority:
     low: "低"
@@ -1690,6 +1701,7 @@ _role:
     canManageAvatarDecorations: "管理头像挂件"
     driveCapacity: "网盘容量"
     alwaysMarkNsfw: "总是将文件标记为 NSFW"
+    canUpdateBioMedia: "可以更新头像和横幅"
     pinMax: "帖子置顶数量限制"
     antennaMax: "可创建的最大天线数量"
     wordMuteMax: "屏蔽词的字数限制"
@@ -1933,8 +1945,6 @@ _sfx:
   note: "帖子"
   noteMy: "我的帖子"
   notification: "通知"
-  antenna: "天线接收"
-  channel: "频道通知"
   reaction: "选择回应时"
 _soundSettings:
   driveFile: "使用网盘内的音频"
@@ -1969,7 +1979,7 @@ _time:
   day: "日"
 _2fa:
   alreadyRegistered: "此设备已被注册"
-  registerTOTP: "开始设置认证应用"
+  registerTOTP: "开始设置验证器"
   step1: "首先，在您的设备上安装验证应用，例如 {a} 或 {b}。"
   step2: "然后，扫描屏幕上显示的二维码。"
   step2Uri: "如果使用桌面应用程序的话，请输入下面的 URI"
@@ -1978,23 +1988,23 @@ _2fa:
   setupCompleted: "设置完成"
   step4: "从现在开始，任何登录操作都将要求您提供动态口令。"
   securityKeyNotSupported: "您的浏览器不支持安全密钥。"
-  registerTOTPBeforeKey: "要注册安全密钥或 Passkey，请先设置验证器应用程序。"
+  registerTOTPBeforeKey: "要注册安全密钥或 Passkey，请先设置验证器。"
   securityKeyInfo: "注册兼容 WebAuthn 的密钥，例如支持 FIDO2 的硬件安全密钥、设备上的生物识别功能、PIN 码以及 Passkey 等。"
   registerSecurityKey: "注册安全密钥或 Passkey"
   securityKeyName: "输入密钥名称"
   tapSecurityKey: "请按照浏览器说明操作来注册安全密钥或 Passkey。"
   removeKey: "删除安全密钥"
   removeKeyConfirm: "您确定要删除 {name} 吗？"
-  whyTOTPOnlyRenew: "如果注册了安全密钥，则无法取消验证器应用程序上的设置。"
-  renewTOTP: "重置验证器应用程序"
-  renewTOTPConfirm: "当前验证器应用程序的验证码将不再有效"
+  whyTOTPOnlyRenew: "当注册了安全密钥时，无法取消使用验证器。"
+  renewTOTP: "重置验证器"
+  renewTOTPConfirm: "当前验证器的验证码及备用代码已失效"
   renewTOTPOk: "重新配置"
   renewTOTPCancel: "不用，谢谢"
   checkBackupCodesBeforeCloseThisWizard: "在关闭此窗口前，请确认下面的备用代码"
   backupCodes: "备用代码"
-  backupCodesDescription: "如果无法使用认证应用，可以使用以下的备用代码来访问账户。请务必将这些代码保存在安全的地方。每个代码仅可使用一次。"
-  backupCodeUsedWarning: "已使用备用代码。如果无法使用认证应用，请尽快重新设定。"
-  backupCodesExhaustedWarning: "已使用完所有的备用代码。如果无法使用认证应用，将无法再访问您的账户。请再次设定认证应用。"
+  backupCodesDescription: "如果无法使用验证器，可以使用以下的备用代码来访问账户。请务必将这些代码保存在安全的地方。每个代码仅可使用一次。"
+  backupCodeUsedWarning: "已使用备用代码。若验证器无法使用，请尽快重置验证器。"
+  backupCodesExhaustedWarning: "已使用完所有的备用代码。若验证器无法使用，则无法再访问您的账户。请重置验证器。"
   moreDetailedGuideHere: "此处为详细指南"
 _permissions:
   "read:account": "查看账户信息"
@@ -2398,6 +2408,7 @@ _drivecleaner:
   orderByCreatedAtAsc: "按添加日期降序排列"
 _webhookSettings:
   createWebhook: "创建 Webhook"
+  modifyWebhook: "编辑 webhook"
   name: "名称"
   secret: "密钥"
   events: "何时运行 Webhook"
@@ -2410,6 +2421,25 @@ _webhookSettings:
     renote: "被转发时"
     reaction: "被回应时"
     mention: "被提及时"
+  _systemEvents:
+    abuseReport: "当收到举报时"
+    abuseReportResolved: "当举报被处理时"
+  deleteConfirm: "要删除 webhook 吗？"
+_abuseReport:
+  _notificationRecipient:
+    createRecipient: "新建举报通知"
+    modifyRecipient: "编辑举报通知"
+    recipientType: "通知类型"
+    _recipientType:
+      mail: "邮箱"
+      webhook: "Webhook"
+      _captions:
+        mail: "当收到新举报时，向持有监察员权限的用户发送通知邮件"
+        webhook: "当收到新举报及举报被处理时，使用指定的 SystemWebhook 发送通知"
+    keywords: "关键字"
+    notifiedUser: "通知的用户"
+    notifiedWebhook: "使用的 webhook"
+    deleteConfirm: "要删除通知吗？"
 _moderationLogTypes:
   createRole: "创建角色"
   deleteRole: "删除角色"
@@ -2447,6 +2477,12 @@ _moderationLogTypes:
   deleteAvatarDecoration: "删除头像挂件"
   unsetUserAvatar: "清除用户头像"
   unsetUserBanner: "清除用户横幅"
+  createSystemWebhook: "新建了 SystemWebhook"
+  updateSystemWebhook: "更新了 SystemWebhook"
+  deleteSystemWebhook: "删除了 SystemWebhook"
+  createAbuseReportNotificationRecipient: "新建了举报通知"
+  updateAbuseReportNotificationRecipient: "更新了举报通知"
+  deleteAbuseReportNotificationRecipient: "删除了举报通知"
 _fileViewer:
   title: "文件信息"
   type: "文件类型"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index aac3f7662c..0929984252 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -180,6 +180,10 @@ addAccount: "新增帳戶"
 reloadAccountsList: "更新帳戶清單的資訊"
 loginFailed: "登入失敗"
 showOnRemote: "轉到所在實例顯示"
+continueOnRemote: "在遠端伺服器繼續"
+chooseServerOnMisskeyHub: "從 Misskey Hub 選擇伺服器"
+specifyServerHost: "直接指定伺服器網域"
+inputHostName: "請輸入域名"
 general: "一般"
 wallpaper: "桌布"
 setWallpaper: "設定桌布"
@@ -243,10 +247,10 @@ noCustomEmojis: "沒有自訂的表情符號"
 noJobs: "沒有任務"
 federating: "聯邦運作中"
 blocked: "已封鎖"
-suspended: "已凍結"
+suspended: "停止發送"
 all: "全部"
 subscribing: "訂閱中"
-publishing: "直播中"
+publishing: "發送中"
 notResponding: "沒有回應"
 instanceFollowing: "追隨的伺服器"
 instanceFollowers: "伺服器的追隨者"
@@ -343,7 +347,7 @@ reload: "重新整理"
 doNothing: "無視"
 reloadConfirm: "確定要重新整理嗎？"
 watch: "關注"
-unwatch: "取消追隨"
+unwatch: "取消關注"
 accept: "接受"
 reject: "拒絕"
 normal: "正常"
@@ -477,6 +481,7 @@ noMessagesYet: "沒有訊息"
 newMessageExists: "有新的訊息"
 onlyOneFileCanBeAttached: "只能加入一個附件"
 signinRequired: "請先登入"
+signinOrContinueOnRemote: "若要繼續，需前往您所在的伺服器，或者註冊並登入此伺服器"
 invitations: "邀請"
 invitationCode: "邀請碼"
 checking: "確認中"
@@ -837,6 +842,7 @@ administration: "管理"
 accounts: "帳戶"
 switch: "切換"
 noMaintainerInformationWarning: "尚未設定管理員訊息。"
+noInquiryUrlWarning: "尚未設定聯絡表單網址。"
 noBotProtectionWarning: "尚未設定 Bot 防護。"
 configure: "設定"
 postToGallery: "發佈到相簿"
@@ -1241,12 +1247,15 @@ keepOriginalFilenameDescription: "如果關閉此設置，上傳時檔案名稱
 noDescription: "沒有說明文字"
 alwaysConfirmFollow: "點擊追隨時總是顯示確認訊息"
 inquiry: "聯絡我們"
+tryAgain: "請再試一次。"
+confirmWhenRevealingSensitiveMedia: "要顯示敏感媒體時需確認"
+sensitiveMediaRevealConfirm: "這是敏感媒體。確定要顯示嗎？"
 _delivery:
   status: "傳送狀態"
-  stop: "停止傳送"
-  resume: "恢復傳送"
+  stop: "停止發送"
+  resume: "恢復發送"
   _type:
-    none: "直播中"
+    none: "發送中"
     manuallySuspended: "手動暫停中"
     goneSuspended: "因為伺服器刪除所以暫停中"
     autoSuspendedForNotResponding: "因為伺服器沒有回應所以暫停中"
@@ -1376,7 +1385,7 @@ _serverSettings:
   fanoutTimelineDbFallback: "資料庫的回退"
   fanoutTimelineDbFallbackDescription: "若啟用，在時間軸沒有快取的情況下將執行回退處理以額外查詢資料庫。若停用，可以透過不執行回退處理來進一步減少伺服器的負荷，但會限制可取得的時間軸範圍。"
   inquiryUrl: "聯絡表單網址"
-  inquiryUrlDescription: "指定伺服器運營者的聯絡表單網址或包含運營者聯絡資訊網頁的網址。"
+  inquiryUrlDescription: "指定伺服器運營者的聯絡表單網址，或包含運營者聯絡資訊網頁的網址。"
 _accountMigration:
   moveFrom: "從其他帳戶遷移到這個帳戶"
   moveFromSub: "為另一個帳戶建立別名"
@@ -1693,6 +1702,7 @@ _role:
     canManageAvatarDecorations: "管理頭像裝飾"
     driveCapacity: "雲端硬碟容量"
     alwaysMarkNsfw: "總是將檔案標記為NSFW"
+    canUpdateBioMedia: "允許更新大頭貼和橫幅"
     pinMax: "置頂貼文的最大數量"
     antennaMax: "可建立的天線數量"
     wordMuteMax: "靜音文字的最大字數"
@@ -1936,8 +1946,6 @@ _sfx:
   note: "貼文"
   noteMy: "我的貼文"
   notification: "通知"
-  antenna: "天線接收"
-  channel: "頻道通知"
   reaction: "選擇反應時"
 _soundSettings:
   driveFile: "使用雲端硬碟的音效檔案"
@@ -2217,7 +2225,7 @@ _charts:
   federation: "聯邦宇宙"
   apRequest: "請求"
   usersIncDec: "使用者增減"
-  usersTotal: "使用者總數"
+  usersTotal: "使用者合計"
   activeUsers: "活躍使用者"
   notesIncDec: "貼文増減"
   localNotesIncDec: "本地貼文増減"
@@ -2401,6 +2409,7 @@ _drivecleaner:
   orderByCreatedAtAsc: "按新增日期降序排列"
 _webhookSettings:
   createWebhook: "建立 Webhook"
+  modifyWebhook: "編輯 Webhook"
   name: "名字"
   secret: "密鑰"
   events: "何時運行 Webhook"
@@ -2413,6 +2422,25 @@ _webhookSettings:
     renote: "當被轉發時"
     reaction: "當獲得反應時"
     mention: "當被提到時"
+  _systemEvents:
+    abuseReport: "當使用者檢舉時"
+    abuseReportResolved: "當處理了使用者的檢舉時"
+  deleteConfirm: "請問是否要刪除 Webhook？"
+_abuseReport:
+  _notificationRecipient:
+    createRecipient: "新增接收檢舉的通知對象"
+    modifyRecipient: "編輯接收檢舉的通知對象"
+    recipientType: "通知對象的種類"
+    _recipientType:
+      mail: "電子郵件"
+      webhook: "Webhook"
+      _captions:
+        mail: "寄送到擁有監察員權限的使用者電子郵件地址（僅在收到檢舉時）"
+        webhook: "向指定的 SystemWebhook 發送通知（在收到檢舉和解決檢舉時發送）"
+    keywords: "關鍵字"
+    notifiedUser: "被通知的使用者"
+    notifiedWebhook: "使用的 Webhook"
+    deleteConfirm: "確定要刪除通知對象嗎？"
 _moderationLogTypes:
   createRole: "新增角色"
   deleteRole: "刪除角色 "
@@ -2450,6 +2478,12 @@ _moderationLogTypes:
   deleteAvatarDecoration: "刪除頭像裝飾"
   unsetUserAvatar: "移除使用者的大頭貼"
   unsetUserBanner: "移除使用者的橫幅圖像"
+  createSystemWebhook: "建立 SystemWebhook"
+  updateSystemWebhook: "更新 SystemWebhook"
+  deleteSystemWebhook: "刪除 SystemWebhook"
+  createAbuseReportNotificationRecipient: "建立接收檢舉的通知對象"
+  updateAbuseReportNotificationRecipient: "更新接收檢舉的通知對象"
+  deleteAbuseReportNotificationRecipient: "刪除接收檢舉的通知對象"
 _fileViewer:
   title: "檔案詳細資訊"
   type: "檔案類型 "

From 72bc78974657b22ab6b1f5a36f6144c294e36de3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8A=E3=81=95=E3=82=80=E3=81=AE=E3=81=B2=E3=81=A8?=
 <46447427+samunohito@users.noreply.github.com>
Date: Mon, 29 Jul 2024 21:31:32 +0900
Subject: [PATCH 109/221] =?UTF-8?q?feature:=20=E3=83=A6=E3=83=BC=E3=82=B6?=
 =?UTF-8?q?=E4=BD=9C=E6=88=90=E6=99=82=E3=81=ABSystemWebhook=E3=82=92?=
 =?UTF-8?q?=E7=99=BA=E4=BF=A1=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B=20(#14321)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feature: ユーザ作成時にSystemWebhookを発信できるようにする

* fix CHANGELOG.md
---
 CHANGELOG.md                                  |   1 +
 locales/index.d.ts                            |   4 +
 locales/ja-JP.yml                             |   1 +
 .../core/AbuseReportNotificationService.ts    |   2 +-
 packages/backend/src/core/SignupService.ts    |   5 +-
 packages/backend/src/core/UserService.ts      |  24 +++-
 packages/backend/src/models/SystemWebhook.ts  |   2 +
 .../backend/test/e2e/synalio/abuse-report.ts  |  61 ++------
 .../backend/test/e2e/synalio/user-create.ts   | 130 ++++++++++++++++++
 packages/backend/test/utils.ts                |  55 +++++++-
 .../src/components/MkSystemWebhookEditor.vue  |   6 +
 packages/misskey-js/src/autogen/types.ts      |   8 +-
 12 files changed, 237 insertions(+), 62 deletions(-)
 create mode 100644 packages/backend/test/e2e/synalio/user-create.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2e9c8e258..17c233e358 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Feat: 通報を受けた際、または解決した際に、予め登録した宛先に通知を飛ばせるように(mail or webhook) #13705
 - Feat: ユーザーのアイコン/バナーの変更可否をロールで設定可能に
   - 変更不可となっていても、設定済みのものを解除してデフォルト画像に戻すことは出来ます
+- Feat: ユーザ作成時にSystemWebhookを送信可能に #14281
 - Fix: 配信停止したインスタンス一覧が見れなくなる問題を修正
 - Fix: Dockerコンテナの立ち上げ時に`pnpm`のインストールで固まることがある問題
 - Fix: デフォルトテーマに無効なテーマコードを入力するとUIが使用できなくなる問題を修正
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 55c65f2aed..2b340ecbb5 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -9392,6 +9392,10 @@ export interface Locale extends ILocale {
              * ユーザーからの通報を処理したとき
              */
             "abuseReportResolved": string;
+            /**
+             * ユーザーが作成されたとき
+             */
+            "userCreated": string;
         };
         /**
          * Webhookを削除しますか？
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 3ca4b46682..f0f849fb38 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2491,6 +2491,7 @@ _webhookSettings:
   _systemEvents:
     abuseReport: "ユーザーから通報があったとき"
     abuseReportResolved: "ユーザーからの通報を処理したとき"
+    userCreated: "ユーザーが作成されたとき"
   deleteConfirm: "Webhookを削除しますか？"
 
 _abuseReport:
diff --git a/packages/backend/src/core/AbuseReportNotificationService.ts b/packages/backend/src/core/AbuseReportNotificationService.ts
index 42e5931212..7be5335885 100644
--- a/packages/backend/src/core/AbuseReportNotificationService.ts
+++ b/packages/backend/src/core/AbuseReportNotificationService.ts
@@ -44,7 +44,7 @@ export class AbuseReportNotificationService implements OnApplicationShutdown {
 
 	/**
 	 * 管理者用Redisイベントを用いて{@link abuseReports}の内容を管理者各位に通知する.
-	 * 通知先ユーザは{@link RoleService.getModeratorIds}の取得結果に依る.
+	 * 通知先ユーザは{@link getModeratorIds}の取得結果に依る.
 	 *
 	 * @see RoleService.getModeratorIds
 	 * @see GlobalEventService.publishAdminStream
diff --git a/packages/backend/src/core/SignupService.ts b/packages/backend/src/core/SignupService.ts
index 5522ecd6cc..de45898328 100644
--- a/packages/backend/src/core/SignupService.ts
+++ b/packages/backend/src/core/SignupService.ts
@@ -21,6 +21,7 @@ import { bindThis } from '@/decorators.js';
 import UsersChart from '@/core/chart/charts/users.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { MetaService } from '@/core/MetaService.js';
+import { UserService } from '@/core/UserService.js';
 
 @Injectable()
 export class SignupService {
@@ -35,6 +36,7 @@ export class SignupService {
 		private usedUsernamesRepository: UsedUsernamesRepository,
 
 		private utilityService: UtilityService,
+		private userService: UserService,
 		private userEntityService: UserEntityService,
 		private idService: IdService,
 		private metaService: MetaService,
@@ -148,7 +150,8 @@ export class SignupService {
 			}));
 		});
 
-		this.usersChart.update(account, true);
+		this.usersChart.update(account, true).then();
+		this.userService.notifySystemWebhook(account, 'userCreated').then();
 
 		return { account, secret };
 	}
diff --git a/packages/backend/src/core/UserService.ts b/packages/backend/src/core/UserService.ts
index 72fa4d928d..9b1961c631 100644
--- a/packages/backend/src/core/UserService.ts
+++ b/packages/backend/src/core/UserService.ts
@@ -8,15 +8,18 @@ import type { FollowingsRepository, UsersRepository } from '@/models/_.js';
 import type { MiUser } from '@/models/User.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
+import { SystemWebhookService } from '@/core/SystemWebhookService.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
 
 @Injectable()
 export class UserService {
 	constructor(
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
-
 		@Inject(DI.followingsRepository)
 		private followingsRepository: FollowingsRepository,
+		private systemWebhookService: SystemWebhookService,
+		private userEntityService: UserEntityService,
 	) {
 	}
 
@@ -50,4 +53,23 @@ export class UserService {
 			});
 		}
 	}
+
+	/**
+	 * SystemWebhookを用いてユーザに関する操作内容を管理者各位に通知する.
+	 * ここではJobQueueへのエンキューのみを行うため、即時実行されない.
+	 *
+	 * @see SystemWebhookService.enqueueSystemWebhook
+	 */
+	@bindThis
+	public async notifySystemWebhook(user: MiUser, type: 'userCreated') {
+		const packedUser = await this.userEntityService.pack(user, null, { schema: 'UserLite' });
+		const recipientWebhookIds = await this.systemWebhookService.fetchSystemWebhooks({ isActive: true, on: [type] });
+		for (const webhookId of recipientWebhookIds) {
+			await this.systemWebhookService.enqueueSystemWebhook(
+				webhookId,
+				type,
+				packedUser,
+			);
+		}
+	}
 }
diff --git a/packages/backend/src/models/SystemWebhook.ts b/packages/backend/src/models/SystemWebhook.ts
index 86fb323d1d..d6c27eae51 100644
--- a/packages/backend/src/models/SystemWebhook.ts
+++ b/packages/backend/src/models/SystemWebhook.ts
@@ -12,6 +12,8 @@ export const systemWebhookEventTypes = [
 	'abuseReport',
 	// 通報を処理したとき
 	'abuseReportResolved',
+	// ユーザが作成された時
+	'userCreated',
 ] as const;
 export type SystemWebhookEventType = typeof systemWebhookEventTypes[number];
 
diff --git a/packages/backend/test/e2e/synalio/abuse-report.ts b/packages/backend/test/e2e/synalio/abuse-report.ts
index b0cc3d13ec..6ce6e47781 100644
--- a/packages/backend/test/e2e/synalio/abuse-report.ts
+++ b/packages/backend/test/e2e/synalio/abuse-report.ts
@@ -5,65 +5,24 @@
 
 import { entities } from 'misskey-js';
 import { beforeEach, describe, test } from '@jest/globals';
-import Fastify from 'fastify';
-import { api, randomString, role, signup, startJobQueue, UserToken } from '../../utils.js';
+import {
+	api,
+	captureWebhook,
+	randomString,
+	role,
+	signup,
+	startJobQueue,
+	UserToken,
+	WEBHOOK_HOST,
+} from '../../utils.js';
 import type { INestApplicationContext } from '@nestjs/common';
 
-const WEBHOOK_HOST = 'http://localhost:15080';
-const WEBHOOK_PORT = 15080;
-process.env.NODE_ENV = 'test';
-
 describe('[シナリオ] ユーザ通報', () => {
 	let queue: INestApplicationContext;
 	let admin: entities.SignupResponse;
 	let alice: entities.SignupResponse;
 	let bob: entities.SignupResponse;
 
-	type SystemWebhookPayload = {
-		server: string;
-		hookId: string;
-		eventId: string;
-		createdAt: string;
-		type: string;
-		body: any;
-	}
-
-	// -------------------------------------------------------------------------------------------
-
-	async function captureWebhook<T = SystemWebhookPayload>(postAction: () => Promise<void>): Promise<T> {
-		const fastify = Fastify();
-
-		let timeoutHandle: NodeJS.Timeout | null = null;
-		const result = await new Promise<string>(async (resolve, reject) => {
-			fastify.all('/', async (req, res) => {
-				timeoutHandle && clearTimeout(timeoutHandle);
-
-				const body = JSON.stringify(req.body);
-				res.status(200).send('ok');
-				await fastify.close();
-				resolve(body);
-			});
-
-			await fastify.listen({ port: WEBHOOK_PORT });
-
-			timeoutHandle = setTimeout(async () => {
-				await fastify.close();
-				reject(new Error('timeout'));
-			}, 3000);
-
-			try {
-				await postAction();
-			} catch (e) {
-				await fastify.close();
-				reject(e);
-			}
-		});
-
-		await fastify.close();
-
-		return JSON.parse(result) as T;
-	}
-
 	async function createSystemWebhook(args?: Partial<entities.AdminSystemWebhookCreateRequest>, credential?: UserToken): Promise<entities.AdminSystemWebhookCreateResponse> {
 		const res = await api(
 			'admin/system-webhook/create',
diff --git a/packages/backend/test/e2e/synalio/user-create.ts b/packages/backend/test/e2e/synalio/user-create.ts
new file mode 100644
index 0000000000..cb0f68dfea
--- /dev/null
+++ b/packages/backend/test/e2e/synalio/user-create.ts
@@ -0,0 +1,130 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { setTimeout } from 'node:timers/promises';
+import { entities } from 'misskey-js';
+import { beforeEach, describe, test } from '@jest/globals';
+import {
+	api,
+	captureWebhook,
+	randomString,
+	role,
+	signup,
+	startJobQueue,
+	UserToken,
+	WEBHOOK_HOST,
+} from '../../utils.js';
+import type { INestApplicationContext } from '@nestjs/common';
+
+describe('[シナリオ] ユーザ作成', () => {
+	let queue: INestApplicationContext;
+	let admin: entities.SignupResponse;
+
+	async function createSystemWebhook(args?: Partial<entities.AdminSystemWebhookCreateRequest>, credential?: UserToken): Promise<entities.AdminSystemWebhookCreateResponse> {
+		const res = await api(
+			'admin/system-webhook/create',
+			{
+				isActive: true,
+				name: randomString(),
+				on: ['userCreated'],
+				url: WEBHOOK_HOST,
+				secret: randomString(),
+				...args,
+			},
+			credential ?? admin,
+		);
+		return res.body;
+	}
+
+	// -------------------------------------------------------------------------------------------
+
+	beforeAll(async () => {
+		queue = await startJobQueue();
+		admin = await signup({ username: 'admin' });
+
+		await role(admin, { isAdministrator: true });
+	}, 1000 * 60 * 2);
+
+	afterAll(async () => {
+		await queue.close();
+	});
+
+	// -------------------------------------------------------------------------------------------
+
+	describe('SystemWebhook', () => {
+		beforeEach(async () => {
+			const webhooks = await api('admin/system-webhook/list', {}, admin);
+			for (const webhook of webhooks.body) {
+				await api('admin/system-webhook/delete', { id: webhook.id }, admin);
+			}
+		});
+
+		test('ユーザが作成された -> userCreatedが送出される', async () => {
+			const webhook = await createSystemWebhook({
+				on: ['userCreated'],
+				isActive: true,
+			});
+
+			let alice: any = null;
+			const webhookBody = await captureWebhook(async () => {
+				alice = await signup({ username: 'alice' });
+			});
+
+			// webhookの送出後にいろいろやってるのでちょっと待つ必要がある
+			await setTimeout(2000);
+
+			console.log(alice);
+			console.log(JSON.stringify(webhookBody, null, 2));
+
+			expect(webhookBody.hookId).toBe(webhook.id);
+			expect(webhookBody.type).toBe('userCreated');
+
+			const body = webhookBody.body as entities.UserLite;
+			expect(alice.id).toBe(body.id);
+			expect(alice.name).toBe(body.name);
+			expect(alice.username).toBe(body.username);
+			expect(alice.host).toBe(body.host);
+			expect(alice.avatarUrl).toBe(body.avatarUrl);
+			expect(alice.avatarBlurhash).toBe(body.avatarBlurhash);
+			expect(alice.avatarDecorations).toEqual(body.avatarDecorations);
+			expect(alice.isBot).toBe(body.isBot);
+			expect(alice.isCat).toBe(body.isCat);
+			expect(alice.instance).toEqual(body.instance);
+			expect(alice.emojis).toEqual(body.emojis);
+			expect(alice.onlineStatus).toBe(body.onlineStatus);
+			expect(alice.badgeRoles).toEqual(body.badgeRoles);
+		});
+
+		test('ユーザ作成 -> userCreatedが未許可の場合は送出されない', async () => {
+			await createSystemWebhook({
+				on: [],
+				isActive: true,
+			});
+
+			let alice: any = null;
+			const webhookBody = await captureWebhook(async () => {
+				alice = await signup({ username: 'alice' });
+			}).catch(e => e.message);
+
+			expect(webhookBody).toBe('timeout');
+			expect(alice.id).not.toBeNull();
+		});
+
+		test('ユーザ作成 -> Webhookが無効の場合は送出されない', async () => {
+			await createSystemWebhook({
+				on: ['userCreated'],
+				isActive: false,
+			});
+
+			let alice: any = null;
+			const webhookBody = await captureWebhook(async () => {
+				alice = await signup({ username: 'alice' });
+			}).catch(e => e.message);
+
+			expect(webhookBody).toBe('timeout');
+			expect(alice.id).not.toBeNull();
+		});
+	});
+});
diff --git a/packages/backend/test/utils.ts b/packages/backend/test/utils.ts
index e70befeebe..26de19eaf1 100644
--- a/packages/backend/test/utils.ts
+++ b/packages/backend/test/utils.ts
@@ -12,13 +12,14 @@ import WebSocket, { ClientOptions } from 'ws';
 import fetch, { File, RequestInit, type Headers } from 'node-fetch';
 import { DataSource } from 'typeorm';
 import { JSDOM } from 'jsdom';
-import { DEFAULT_POLICIES } from '@/core/RoleService.js';
-import { validateContentTypeSetAsActivityPub } from '@/core/activitypub/misc/validator.js';
+import { type Response } from 'node-fetch';
+import Fastify from 'fastify';
 import { entities } from '../src/postgres.js';
 import { loadConfig } from '../src/config.js';
 import type * as misskey from 'misskey-js';
-import { type Response } from 'node-fetch';
-import { ApiError } from "@/server/api/error.js";
+import { DEFAULT_POLICIES } from '@/core/RoleService.js';
+import { validateContentTypeSetAsActivityPub } from '@/core/activitypub/misc/validator.js';
+import { ApiError } from '@/server/api/error.js';
 
 export { server as startServer, jobQueue as startJobQueue } from '@/boot/common.js';
 
@@ -27,11 +28,23 @@ export interface UserToken {
 	bearer?: boolean;
 }
 
+export type SystemWebhookPayload = {
+	server: string;
+	hookId: string;
+	eventId: string;
+	createdAt: string;
+	type: string;
+	body: any;
+}
+
 const config = loadConfig();
 export const port = config.port;
 export const origin = config.url;
 export const host = new URL(config.url).host;
 
+export const WEBHOOK_HOST = 'http://localhost:15080';
+export const WEBHOOK_PORT = 15080;
+
 export const cookie = (me: UserToken): string => {
 	return `token=${me.token};`;
 };
@@ -645,3 +658,37 @@ export async function sendEnvResetRequest() {
 export function castAsError(obj: Record<string, unknown>): { error: ApiError } {
 	return obj as { error: ApiError };
 }
+
+export async function captureWebhook<T = SystemWebhookPayload>(postAction: () => Promise<void>, port = WEBHOOK_PORT): Promise<T> {
+	const fastify = Fastify();
+
+	let timeoutHandle: NodeJS.Timeout | null = null;
+	const result = await new Promise<string>(async (resolve, reject) => {
+		fastify.all('/', async (req, res) => {
+			timeoutHandle && clearTimeout(timeoutHandle);
+
+			const body = JSON.stringify(req.body);
+			res.status(200).send('ok');
+			await fastify.close();
+			resolve(body);
+		});
+
+		await fastify.listen({ port });
+
+		timeoutHandle = setTimeout(async () => {
+			await fastify.close();
+			reject(new Error('timeout'));
+		}, 3000);
+
+		try {
+			await postAction();
+		} catch (e) {
+			await fastify.close();
+			reject(e);
+		}
+	});
+
+	await fastify.close();
+
+	return JSON.parse(result) as T;
+}
diff --git a/packages/frontend/src/components/MkSystemWebhookEditor.vue b/packages/frontend/src/components/MkSystemWebhookEditor.vue
index 3e6a015018..0beb0a8163 100644
--- a/packages/frontend/src/components/MkSystemWebhookEditor.vue
+++ b/packages/frontend/src/components/MkSystemWebhookEditor.vue
@@ -40,6 +40,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkSwitch v-model="events.abuseReportResolved" :disabled="disabledEvents.abuseReportResolved">
 						<template #label>{{ i18n.ts._webhookSettings._systemEvents.abuseReportResolved }}</template>
 					</MkSwitch>
+					<MkSwitch v-model="events.userCreated" :disabled="disabledEvents.userCreated">
+						<template #label>{{ i18n.ts._webhookSettings._systemEvents.userCreated }}</template>
+					</MkSwitch>
 				</div>
 			</MkFolder>
 
@@ -78,6 +81,7 @@ import * as os from '@/os.js';
 type EventType = {
 	abuseReport: boolean;
 	abuseReportResolved: boolean;
+	userCreated: boolean;
 }
 
 const emit = defineEmits<{
@@ -100,12 +104,14 @@ const secret = ref<string>('');
 const events = ref<EventType>({
 	abuseReport: true,
 	abuseReportResolved: true,
+	userCreated: true,
 });
 const isActive = ref<boolean>(true);
 
 const disabledEvents = ref<EventType>({
 	abuseReport: false,
 	abuseReportResolved: false,
+	userCreated: false,
 });
 
 const disableSubmitButton = computed(() => {
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index b2b8938baa..bf35d0f421 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4970,7 +4970,7 @@ export type components = {
       latestSentAt: string | null;
       latestStatus: number | null;
       name: string;
-      on: ('abuseReport' | 'abuseReportResolved')[];
+      on: ('abuseReport' | 'abuseReportResolved' | 'userCreated')[];
       url: string;
       secret: string;
     };
@@ -10042,7 +10042,7 @@ export type operations = {
         'application/json': {
           isActive: boolean;
           name: string;
-          on: ('abuseReport' | 'abuseReportResolved')[];
+          on: ('abuseReport' | 'abuseReportResolved' | 'userCreated')[];
           url: string;
           secret: string;
         };
@@ -10152,7 +10152,7 @@ export type operations = {
       content: {
         'application/json': {
           isActive?: boolean;
-          on?: ('abuseReport' | 'abuseReportResolved')[];
+          on?: ('abuseReport' | 'abuseReportResolved' | 'userCreated')[];
         };
       };
     };
@@ -10265,7 +10265,7 @@ export type operations = {
           id: string;
           isActive: boolean;
           name: string;
-          on: ('abuseReport' | 'abuseReportResolved')[];
+          on: ('abuseReport' | 'abuseReportResolved' | 'userCreated')[];
           url: string;
           secret: string;
         };

From 1991a02aa9ca191639ebd84eeae984ea7ec01cc1 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 30 Jul 2024 09:17:06 +0900
Subject: [PATCH 110/221] update node version

---
 .devcontainer/devcontainer.json          | 2 +-
 .github/workflows/get-api-diff.yml       | 2 +-
 .github/workflows/on-release-created.yml | 2 +-
 .github/workflows/test-backend.yml       | 4 ++--
 .github/workflows/test-frontend.yml      | 4 ++--
 .github/workflows/test-misskey-js.yml    | 2 +-
 .github/workflows/test-production.yml    | 2 +-
 .github/workflows/validate-api-json.yml  | 2 +-
 .node-version                            | 2 +-
 Dockerfile                               | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 7ea23e314e..fbf959d449 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,7 +5,7 @@
 	"workspaceFolder": "/workspace",
 	"features": {
 		"ghcr.io/devcontainers/features/node:1": {
-			"version": "20.12.2"
+			"version": "20.16.0"
 		},
 		"ghcr.io/devcontainers-contrib/features/corepack:1": {}
 	},
diff --git a/.github/workflows/get-api-diff.yml b/.github/workflows/get-api-diff.yml
index 4afafabf2e..af0ab8dde4 100644
--- a/.github/workflows/get-api-diff.yml
+++ b/.github/workflows/get-api-diff.yml
@@ -18,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.12.2]
+        node-version: [20.16.0]
         api-json-name: [api-base.json, api-head.json]
         include:
           - api-json-name: api-base.json
diff --git a/.github/workflows/on-release-created.yml b/.github/workflows/on-release-created.yml
index 22c04ff297..8dd9ed2513 100644
--- a/.github/workflows/on-release-created.yml
+++ b/.github/workflows/on-release-created.yml
@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.12.2]
+        node-version: [20.16.0]
 
     steps:
       - uses: actions/checkout@v4.1.1
diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index bfb79ef090..026550025c 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -22,7 +22,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.12.2]
+        node-version: [20.16.0]
 
     services:
       postgres:
@@ -71,7 +71,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.12.2]
+        node-version: [20.16.0]
 
     services:
       postgres:
diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml
index c17a9fd387..fcaef52969 100644
--- a/.github/workflows/test-frontend.yml
+++ b/.github/workflows/test-frontend.yml
@@ -26,7 +26,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.12.2]
+        node-version: [20.16.0]
 
     steps:
     - uses: actions/checkout@v4.1.1
@@ -61,7 +61,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [20.12.2]
+        node-version: [20.16.0]
         browser: [chrome]
 
     services:
diff --git a/.github/workflows/test-misskey-js.yml b/.github/workflows/test-misskey-js.yml
index 6ee67e8735..9ad71919df 100644
--- a/.github/workflows/test-misskey-js.yml
+++ b/.github/workflows/test-misskey-js.yml
@@ -21,7 +21,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.12.2]
+        node-version: [20.16.0]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
diff --git a/.github/workflows/test-production.yml b/.github/workflows/test-production.yml
index 18d02ec030..8ad8a64766 100644
--- a/.github/workflows/test-production.yml
+++ b/.github/workflows/test-production.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.12.2]
+        node-version: [20.16.0]
 
     steps:
     - uses: actions/checkout@v4.1.1
diff --git a/.github/workflows/validate-api-json.yml b/.github/workflows/validate-api-json.yml
index 90f2929a25..06e987f27e 100644
--- a/.github/workflows/validate-api-json.yml
+++ b/.github/workflows/validate-api-json.yml
@@ -18,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.12.2]
+        node-version: [20.16.0]
 
     steps:
     - uses: actions/checkout@v4.1.1
diff --git a/.node-version b/.node-version
index 87834047a6..8ce7030825 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-20.12.2
+20.16.0
diff --git a/Dockerfile b/Dockerfile
index d6ca6b8cdf..e247bbcd77 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.4
 
-ARG NODE_VERSION=20.12.2-bullseye
+ARG NODE_VERSION=20.16.0-bullseye
 
 # build assets & compile TypeScript
 

From c3437b19083722b7fc506fabe2c9c86107bad23c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2024 00:20:09 +0000
Subject: [PATCH 111/221] Bump version to 2024.7.0-rc.4

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ab7835c1f6..e33383916c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.7.0-beta.3",
+	"version": "2024.7.0-rc.4",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 1e1a239bf3..dcddc8087c 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.7.0-beta.3",
+	"version": "2024.7.0-rc.4",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 1a79f0dc2adfef82da63136ed4b7ae0182006d29 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 30 Jul 2024 09:47:31 +0900
Subject: [PATCH 112/221] :art:

---
 .../src/components/MkSystemWebhookEditor.vue  | 85 ++++++++++---------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/packages/frontend/src/components/MkSystemWebhookEditor.vue b/packages/frontend/src/components/MkSystemWebhookEditor.vue
index 0beb0a8163..f6ce2ccc9f 100644
--- a/packages/frontend/src/components/MkSystemWebhookEditor.vue
+++ b/packages/frontend/src/components/MkSystemWebhookEditor.vue
@@ -18,47 +18,49 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #header>
 		{{ mode === 'create' ? i18n.ts._webhookSettings.createWebhook : i18n.ts._webhookSettings.modifyWebhook }}
 	</template>
-	<MkSpacer :marginMin="20" :marginMax="28">
-		<MkLoading v-if="loading !== 0"/>
-		<div v-else :class="$style.root" class="_gaps_m">
-			<MkInput v-model="title">
-				<template #label>{{ i18n.ts._webhookSettings.name }}</template>
-			</MkInput>
-			<MkInput v-model="url">
-				<template #label>URL</template>
-			</MkInput>
-			<MkInput v-model="secret">
-				<template #label>{{ i18n.ts._webhookSettings.secret }}</template>
-			</MkInput>
-			<MkFolder :defaultOpen="true">
-				<template #label>{{ i18n.ts._webhookSettings.events }}</template>
 
-				<div class="_gaps_s">
-					<MkSwitch v-model="events.abuseReport" :disabled="disabledEvents.abuseReport">
-						<template #label>{{ i18n.ts._webhookSettings._systemEvents.abuseReport }}</template>
-					</MkSwitch>
-					<MkSwitch v-model="events.abuseReportResolved" :disabled="disabledEvents.abuseReportResolved">
-						<template #label>{{ i18n.ts._webhookSettings._systemEvents.abuseReportResolved }}</template>
-					</MkSwitch>
-					<MkSwitch v-model="events.userCreated" :disabled="disabledEvents.userCreated">
-						<template #label>{{ i18n.ts._webhookSettings._systemEvents.userCreated }}</template>
-					</MkSwitch>
-				</div>
-			</MkFolder>
+	<div>
+		<MkSpacer :marginMin="20" :marginMax="28">
+			<MkLoading v-if="loading !== 0"/>
+			<div v-else :class="$style.root" class="_gaps_m">
+				<MkInput v-model="title">
+					<template #label>{{ i18n.ts._webhookSettings.name }}</template>
+				</MkInput>
+				<MkInput v-model="url">
+					<template #label>URL</template>
+				</MkInput>
+				<MkInput v-model="secret">
+					<template #label>{{ i18n.ts._webhookSettings.secret }}</template>
+				</MkInput>
+				<MkFolder :defaultOpen="true">
+					<template #label>{{ i18n.ts._webhookSettings.events }}</template>
 
-			<MkSwitch v-model="isActive">
-				<template #label>{{ i18n.ts.enable }}</template>
-			</MkSwitch>
+					<div class="_gaps_s">
+						<MkSwitch v-model="events.abuseReport" :disabled="disabledEvents.abuseReport">
+							<template #label>{{ i18n.ts._webhookSettings._systemEvents.abuseReport }}</template>
+						</MkSwitch>
+						<MkSwitch v-model="events.abuseReportResolved" :disabled="disabledEvents.abuseReportResolved">
+							<template #label>{{ i18n.ts._webhookSettings._systemEvents.abuseReportResolved }}</template>
+						</MkSwitch>
+						<MkSwitch v-model="events.userCreated" :disabled="disabledEvents.userCreated">
+							<template #label>{{ i18n.ts._webhookSettings._systemEvents.userCreated }}</template>
+						</MkSwitch>
+					</div>
+				</MkFolder>
 
-			<div :class="$style.footer" class="_buttonsCenter">
-				<MkButton primary :disabled="disableSubmitButton" @click="onSubmitClicked">
-					<i class="ti ti-check"></i>
-					{{ i18n.ts.ok }}
-				</MkButton>
-				<MkButton @click="onCancelClicked"><i class="ti ti-x"></i> {{ i18n.ts.cancel }}</MkButton>
+				<MkSwitch v-model="isActive">
+					<template #label>{{ i18n.ts.enable }}</template>
+				</MkSwitch>
 			</div>
+		</MkSpacer>
+		<div :class="$style.footer" class="_buttonsCenter">
+			<MkButton primary rounded :disabled="disableSubmitButton" @click="onSubmitClicked">
+				<i class="ti ti-check"></i>
+				{{ i18n.ts.ok }}
+			</MkButton>
+			<MkButton rounded @click="onCancelClicked"><i class="ti ti-x"></i> {{ i18n.ts.cancel }}</MkButton>
 		</div>
-	</MkSpacer>
+	</div>
 </MkModalWindow>
 </template>
 
@@ -223,9 +225,12 @@ onMounted(async () => {
 }
 
 .footer {
-	display: flex;
-	justify-content: center;
-	align-items: flex-end;
-	margin-top: 20px;
+	position: sticky;
+	bottom: 0;
+	left: 0;
+	padding: 12px;
+	border-top: solid 0.5px var(--divider);
+	-webkit-backdrop-filter: var(--blur, blur(15px));
+	backdrop-filter: var(--blur, blur(15px));
 }
 </style>

From b44313fe3c559badc7b0bf76ba3868f945122f0b Mon Sep 17 00:00:00 2001
From: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
Date: Tue, 30 Jul 2024 12:32:03 +0900
Subject: [PATCH 113/221] fix(backend): type(schema) of reactionAcceptance was
 wrong (#14317)

---
 packages/backend/src/models/json-schema/note.ts | 2 +-
 packages/misskey-js/src/autogen/types.ts        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/models/json-schema/note.ts b/packages/backend/src/models/json-schema/note.ts
index 61f62dce60..432c096e48 100644
--- a/packages/backend/src/models/json-schema/note.ts
+++ b/packages/backend/src/models/json-schema/note.ts
@@ -204,7 +204,7 @@ export const packedNoteSchema = {
 		reactionAcceptance: {
 			type: 'string',
 			optional: false, nullable: true,
-			enum: ['likeOnly', 'likeOnlyForRemote', 'nonSensitiveOnly', 'nonSensitiveOnlyForLocalLikeOnlyForRemote'],
+			enum: ['likeOnly', 'likeOnlyForRemote', 'nonSensitiveOnly', 'nonSensitiveOnlyForLocalLikeOnlyForRemote', null],
 		},
 		reactionEmojis: {
 			type: 'object',
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index bf35d0f421..52a571b694 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4090,7 +4090,7 @@ export type components = {
       }) | null;
       localOnly?: boolean;
       /** @enum {string|null} */
-      reactionAcceptance: 'likeOnly' | 'likeOnlyForRemote' | 'nonSensitiveOnly' | 'nonSensitiveOnlyForLocalLikeOnlyForRemote';
+      reactionAcceptance: 'likeOnly' | 'likeOnlyForRemote' | 'nonSensitiveOnly' | 'nonSensitiveOnlyForLocalLikeOnlyForRemote' | null;
       reactionEmojis: {
         [key: string]: string;
       };

From de3ddb5b4403d02b8cb7671b9cf26e87ce9a2d17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 30 Jul 2024 13:02:03 +0900
Subject: [PATCH 114/221] =?UTF-8?q?enhance:=20=E7=AE=A1=E7=90=86=E7=94=BB?=
 =?UTF-8?q?=E9=9D=A2=E3=81=A7=E3=82=A2=E3=83=BC=E3=82=AB=E3=82=A4=E3=83=96?=
 =?UTF-8?q?=E3=81=AB=E3=81=97=E3=81=9F=E3=81=8A=E7=9F=A5=E3=82=89=E3=81=9B?=
 =?UTF-8?q?=E3=82=92=E8=A1=A8=E7=A4=BA=E3=83=BB=E7=B7=A8=E9=9B=86=E3=81=A7?=
 =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(#14286)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance: 管理画面でアーカイブにしたお知らせを表示できるように

* Update Changelog
---
 CHANGELOG.md                                  |   1 +
 locales/index.d.ts                            |   8 +
 locales/ja-JP.yml                             |   2 +
 .../api/endpoints/admin/announcements/list.ts |   9 +-
 .../frontend/src/pages/admin/_header_.vue     |   5 +-
 .../src/pages/admin/announcements.vue         | 160 +++++++++++-------
 packages/misskey-js/src/autogen/types.ts      |   5 +
 7 files changed, 127 insertions(+), 63 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17c233e358..8da94f3749 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Feat: ユーザーのアイコン/バナーの変更可否をロールで設定可能に
   - 変更不可となっていても、設定済みのものを解除してデフォルト画像に戻すことは出来ます
 - Feat: ユーザ作成時にSystemWebhookを送信可能に #14281
+- Enhance: 管理画面でアーカイブにしたお知らせを表示・編集できるように
 - Fix: 配信停止したインスタンス一覧が見れなくなる問題を修正
 - Fix: Dockerコンテナの立ち上げ時に`pnpm`のインストールで固まることがある問題
 - Fix: デフォルトテーマに無効なテーマコードを入力するとUIが使用できなくなる問題を修正
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 2b340ecbb5..d54b752312 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -4440,6 +4440,14 @@ export interface Locale extends ILocale {
      * アーカイブ
      */
     "archive": string;
+    /**
+     * アーカイブ済み
+     */
+    "archived": string;
+    /**
+     * アーカイブ解除
+     */
+    "unarchive": string;
     /**
      * {name}をアーカイブしますか？
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index f0f849fb38..d8531070fe 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1106,6 +1106,8 @@ preservedUsernames: "予約ユーザー名"
 preservedUsernamesDescription: "予約するユーザー名を改行で列挙します。ここで指定されたユーザー名はアカウント作成時に使えなくなりますが、管理者によるアカウント作成時はこの制限を受けません。また、既に存在するアカウントも影響を受けません。"
 createNoteFromTheFile: "このファイルからノートを作成"
 archive: "アーカイブ"
+archived: "アーカイブ済み"
+unarchive: "アーカイブ解除"
 channelArchiveConfirmTitle: "{name}をアーカイブしますか？"
 channelArchiveConfirmDescription: "アーカイブすると、チャンネル一覧や検索結果に表示されなくなり、新たな書き込みもできなくなります。"
 thisChannelArchived: "このチャンネルはアーカイブされています。"
diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
index 87eaad31a3..7596bf44e3 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
@@ -69,6 +69,7 @@ export const paramDef = {
 		sinceId: { type: 'string', format: 'misskey:id' },
 		untilId: { type: 'string', format: 'misskey:id' },
 		userId: { type: 'string', format: 'misskey:id', nullable: true },
+		status: { type: 'string', enum: ['all', 'active', 'archived'], default: 'active' },
 	},
 	required: [],
 } as const;
@@ -87,7 +88,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const query = this.queryService.makePaginationQuery(this.announcementsRepository.createQueryBuilder('announcement'), ps.sinceId, ps.untilId);
-			query.andWhere('announcement.isActive = true');
+
+			if (ps.status === 'archived') {
+				query.andWhere('announcement.isActive = false');
+			} else if (ps.status === 'active') {
+				query.andWhere('announcement.isActive = true');
+			}
+
 			if (ps.userId) {
 				query.andWhere('announcement.userId = :userId', { userId: ps.userId });
 			} else {
diff --git a/packages/frontend/src/pages/admin/_header_.vue b/packages/frontend/src/pages/admin/_header_.vue
index c5a9609e6e..b88f078598 100644
--- a/packages/frontend/src/pages/admin/_header_.vue
+++ b/packages/frontend/src/pages/admin/_header_.vue
@@ -24,8 +24,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<div class="buttons right">
 		<template v-if="actions">
 			<template v-for="action in actions">
-				<MkButton v-if="action.asFullButton" class="fullButton" primary @click.stop="action.handler"><i :class="action.icon" style="margin-right: 6px;"></i>{{ action.text }}</MkButton>
-				<button v-else v-tooltip.noDelay="action.text" class="_button button" :class="{ highlighted: action.highlighted }" @click.stop="action.handler" @touchstart="preventDrag"><i :class="action.icon"></i></button>
+				<MkButton v-if="action.asFullButton" class="fullButton" primary :disabled="action.disabled" @click.stop="action.handler"><i :class="action.icon" style="margin-right: 6px;"></i>{{ action.text }}</MkButton>
+				<button v-else v-tooltip.noDelay="action.text" class="_button button" :class="{ highlighted: action.highlighted }" :disabled="action.disabled" @click.stop="action.handler" @touchstart="preventDrag"><i :class="action.icon"></i></button>
 			</template>
 		</template>
 	</div>
@@ -56,6 +56,7 @@ const props = defineProps<{
 		text: string;
 		icon: string;
 		asFullButton?: boolean;
+		disabled?: boolean;
 		handler: (ev: MouseEvent) => void;
 	}[];
 	thin?: boolean;
diff --git a/packages/frontend/src/pages/admin/announcements.vue b/packages/frontend/src/pages/admin/announcements.vue
index e7fb62ec1d..b9e09c8d03 100644
--- a/packages/frontend/src/pages/admin/announcements.vue
+++ b/packages/frontend/src/pages/admin/announcements.vue
@@ -11,70 +11,83 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkInfo>{{ i18n.ts._announcement.shouldNotBeUsedToPresentPermanentInfo }}</MkInfo>
 			<MkInfo v-if="announcements.length > 5" warn>{{ i18n.ts._announcement.tooManyActiveAnnouncementDescription }}</MkInfo>
 
-			<MkFolder v-for="announcement in announcements" :key="announcement.id ?? announcement._id" :defaultOpen="announcement.id == null">
-				<template #label>{{ announcement.title }}</template>
-				<template #icon>
-					<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>
-				</template>
-				<template #caption>{{ announcement.text }}</template>
+			<MkSelect v-model="announcementsStatus">
+				<template #label>{{ i18n.ts.filter }}</template>
+				<option value="active">{{ i18n.ts.active }}</option>
+				<option value="archived">{{ i18n.ts.archived }}</option>
+			</MkSelect>
 
-				<div class="_gaps_m">
-					<MkInput v-model="announcement.title">
-						<template #label>{{ i18n.ts.title }}</template>
-					</MkInput>
-					<MkTextarea v-model="announcement.text" mfmAutocomplete :mfmPreview="true">
-						<template #label>{{ i18n.ts.text }}</template>
-					</MkTextarea>
-					<MkInput v-model="announcement.imageUrl" type="url">
-						<template #label>{{ i18n.ts.imageUrl }}</template>
-					</MkInput>
-					<MkRadios v-model="announcement.icon">
-						<template #label>{{ i18n.ts.icon }}</template>
-						<option value="info"><i class="ti ti-info-circle"></i></option>
-						<option value="warning"><i class="ti ti-alert-triangle" style="color: var(--warn);"></i></option>
-						<option value="error"><i class="ti ti-circle-x" style="color: var(--error);"></i></option>
-						<option value="success"><i class="ti ti-check" style="color: var(--success);"></i></option>
-					</MkRadios>
-					<MkRadios v-model="announcement.display">
-						<template #label>{{ i18n.ts.display }}</template>
-						<option value="normal">{{ i18n.ts.normal }}</option>
-						<option value="banner">{{ i18n.ts.banner }}</option>
-						<option value="dialog">{{ i18n.ts.dialog }}</option>
-					</MkRadios>
-					<MkInfo v-if="announcement.display === 'dialog'" warn>{{ i18n.ts._announcement.dialogAnnouncementUxWarn }}</MkInfo>
-					<MkSwitch v-model="announcement.forExistingUsers" :helpText="i18n.ts._announcement.forExistingUsersDescription">
-						{{ i18n.ts._announcement.forExistingUsers }}
-					</MkSwitch>
-					<MkSwitch v-model="announcement.silence" :helpText="i18n.ts._announcement.silenceDescription">
-						{{ i18n.ts._announcement.silence }}
-					</MkSwitch>
-					<MkSwitch v-model="announcement.needConfirmationToRead" :helpText="i18n.ts._announcement.needConfirmationToReadDescription">
-						{{ i18n.ts._announcement.needConfirmationToRead }}
-					</MkSwitch>
-					<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>
-						<MkButton v-if="announcement.id != null" class="button" inline danger @click="del(announcement)"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
+			<MkLoading v-if="loading"/>
+
+			<template v-else>
+				<MkFolder v-for="announcement in announcements" :key="announcement.id ?? announcement._id" :defaultOpen="announcement.id == null">
+					<template #label>{{ announcement.title }}</template>
+					<template #icon>
+						<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>
+					</template>
+					<template #caption>{{ announcement.text }}</template>
+
+					<div class="_gaps_m">
+						<MkInput v-model="announcement.title">
+							<template #label>{{ i18n.ts.title }}</template>
+						</MkInput>
+						<MkTextarea v-model="announcement.text" mfmAutocomplete :mfmPreview="true">
+							<template #label>{{ i18n.ts.text }}</template>
+						</MkTextarea>
+						<MkInput v-model="announcement.imageUrl" type="url">
+							<template #label>{{ i18n.ts.imageUrl }}</template>
+						</MkInput>
+						<MkRadios v-model="announcement.icon">
+							<template #label>{{ i18n.ts.icon }}</template>
+							<option value="info"><i class="ti ti-info-circle"></i></option>
+							<option value="warning"><i class="ti ti-alert-triangle" style="color: var(--warn);"></i></option>
+							<option value="error"><i class="ti ti-circle-x" style="color: var(--error);"></i></option>
+							<option value="success"><i class="ti ti-check" style="color: var(--success);"></i></option>
+						</MkRadios>
+						<MkRadios v-model="announcement.display">
+							<template #label>{{ i18n.ts.display }}</template>
+							<option value="normal">{{ i18n.ts.normal }}</option>
+							<option value="banner">{{ i18n.ts.banner }}</option>
+							<option value="dialog">{{ i18n.ts.dialog }}</option>
+						</MkRadios>
+						<MkInfo v-if="announcement.display === 'dialog'" warn>{{ i18n.ts._announcement.dialogAnnouncementUxWarn }}</MkInfo>
+						<MkSwitch v-model="announcement.forExistingUsers" :helpText="i18n.ts._announcement.forExistingUsersDescription">
+							{{ i18n.ts._announcement.forExistingUsers }}
+						</MkSwitch>
+						<MkSwitch v-model="announcement.silence" :helpText="i18n.ts._announcement.silenceDescription">
+							{{ i18n.ts._announcement.silence }}
+						</MkSwitch>
+						<MkSwitch v-model="announcement.needConfirmationToRead" :helpText="i18n.ts._announcement.needConfirmationToReadDescription">
+							{{ i18n.ts._announcement.needConfirmationToRead }}
+						</MkSwitch>
+						<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 && announcement.isActive" class="button" inline @click="archive(announcement)"><i class="ti ti-check"></i> {{ i18n.ts._announcement.end }} ({{ i18n.ts.archive }})</MkButton>
+							<MkButton v-if="announcement.id != null && !announcement.isActive" class="button" inline @click="unarchive(announcement)"><i class="ti ti-restore"></i> {{ i18n.ts.unarchive }}</MkButton>
+							<MkButton v-if="announcement.id != null" class="button" inline danger @click="del(announcement)"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
+						</div>
 					</div>
-				</div>
-			</MkFolder>
-			<MkButton class="button" @click="more()">
-				<i class="ti ti-reload"></i>{{ i18n.ts.more }}
-			</MkButton>
+				</MkFolder>
+				<MkLoading v-if="loadingMore"/>
+				<MkButton class="button" @click="more()">
+					<i class="ti ti-reload"></i>{{ i18n.ts.more }}
+				</MkButton>
+			</template>
 		</div>
 	</MkSpacer>
 </MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue';
+import { ref, computed, watch } from 'vue';
 import XHeader from './_header_.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/MkInput.vue';
+import MkSelect from '@/components/MkSelect.vue';
 import MkSwitch from '@/components/MkSwitch.vue';
 import MkRadios from '@/components/MkRadios.vue';
 import MkInfo from '@/components/MkInfo.vue';
@@ -85,11 +98,22 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
 import MkFolder from '@/components/MkFolder.vue';
 import MkTextarea from '@/components/MkTextarea.vue';
 
+const announcementsStatus = ref<'active' | 'archived'>('active');
+
+const loading = ref(true);
+const loadingMore = ref(false);
+
 const announcements = ref<any[]>([]);
 
-misskeyApi('admin/announcements/list').then(announcementResponse => {
-	announcements.value = announcementResponse;
-});
+watch(announcementsStatus, (to) => {
+	loading.value = true;
+	misskeyApi('admin/announcements/list', {
+		status: to,
+	}).then(announcementResponse => {
+		announcements.value = announcementResponse;
+		loading.value = false;
+	});
+}, { immediate: true });
 
 function add() {
 	announcements.value.unshift({
@@ -125,6 +149,14 @@ async function archive(announcement) {
 	refresh();
 }
 
+async function unarchive(announcement) {
+	await os.apiWithDialog('admin/announcements/update', {
+		...announcement,
+		isActive: true,
+	});
+	refresh();
+}
+
 async function save(announcement) {
 	if (announcement.id == null) {
 		await os.apiWithDialog('admin/announcements/create', announcement);
@@ -135,24 +167,32 @@ async function save(announcement) {
 }
 
 function more() {
-	misskeyApi('admin/announcements/list', { untilId: announcements.value.reduce((acc, announcement) => announcement.id != null ? announcement : acc).id }).then(announcementResponse => {
+	loadingMore.value = true;
+	misskeyApi('admin/announcements/list', {
+		status: announcementsStatus.value,
+		untilId: announcements.value.reduce((acc, announcement) => announcement.id != null ? announcement : acc).id
+	}).then(announcementResponse => {
 		announcements.value = announcements.value.concat(announcementResponse);
+		loadingMore.value = false;
 	});
 }
 
 function refresh() {
-	misskeyApi('admin/announcements/list').then(announcementResponse => {
+	loading.value = true;
+	misskeyApi('admin/announcements/list', {
+		status: announcementsStatus.value,
+	}).then(announcementResponse => {
 		announcements.value = announcementResponse;
+		loading.value = false;
 	});
 }
 
-refresh();
-
 const headerActions = computed(() => [{
 	asFullButton: true,
 	icon: 'ti ti-plus',
 	text: i18n.ts.add,
 	handler: add,
+	disabled: announcementsStatus.value === 'archived',
 }]);
 
 const headerTabs = computed(() => []);
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 52a571b694..4cfe92147a 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -6091,6 +6091,11 @@ export type operations = {
           untilId?: string;
           /** Format: misskey:id */
           userId?: string | null;
+          /**
+           * @default active
+           * @enum {string}
+           */
+          status?: 'all' | 'active' | 'archived';
         };
       };
     };

From 738b3ea43b059b103deca0b1a33071ae256ef79f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 30 Jul 2024 13:11:06 +0900
Subject: [PATCH 115/221] =?UTF-8?q?enhance(frontend):=20=E3=83=87=E3=83=83?=
 =?UTF-8?q?=E3=82=AD=E3=81=AE=E3=82=A2=E3=83=B3=E3=83=86=E3=83=8A=E3=83=BB?=
 =?UTF-8?q?=E3=83=AA=E3=82=B9=E3=83=88=E9=81=B8=E6=8A=9E=E7=94=BB=E9=9D=A2?=
 =?UTF-8?q?=E3=81=8B=E3=82=89=E3=81=9D=E3=82=8C=E3=81=9E=E3=82=8C=E3=82=92?=
 =?UTF-8?q?=E6=96=B0=E8=A6=8F=E4=BD=9C=E6=88=90=E3=81=A7=E3=81=8D=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=20(#14104)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance(frontend): デッキのアンテナ・リスト選択画面からそれぞれを新規作成できるように

* Update Changelog

* fix

* fix

* lint

* add story

* typo

ねぼけていた

* Update antenna-column.vue

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
 CHANGELOG.md                                  |  1 +
 locales/index.d.ts                            | 12 ++++
 locales/ja-JP.yml                             |  3 +
 .../MkAntennaEditor.stories.impl.ts           | 62 ++++++++++++++++
 .../MkAntennaEditor.vue}                      | 71 +++++++++++++------
 .../MkAntennaEditorDialog.stories.impl.ts     | 63 ++++++++++++++++
 .../src/components/MkAntennaEditorDialog.vue  | 63 ++++++++++++++++
 packages/frontend/src/components/MkDialog.vue | 20 ++++--
 packages/frontend/src/os.ts                   | 31 ++++----
 .../frontend/src/pages/my-antennas/create.vue | 32 +++------
 .../frontend/src/pages/my-antennas/edit.vue   | 17 +++--
 packages/frontend/src/scripts/merge.ts        |  2 +-
 packages/frontend/src/ui/deck.vue             | 29 +++-----
 .../frontend/src/ui/deck/antenna-column.vue   | 38 ++++++++--
 .../frontend/src/ui/deck/channel-column.vue   |  3 +-
 packages/frontend/src/ui/deck/deck-store.ts   | 21 +++++-
 .../frontend/src/ui/deck/direct-column.vue    |  2 +-
 packages/frontend/src/ui/deck/list-column.vue | 41 ++++++++---
 .../frontend/src/ui/deck/mentions-column.vue  |  2 +-
 .../src/ui/deck/notifications-column.vue      |  2 +-
 .../src/ui/deck/role-timeline-column.vue      |  4 +-
 packages/frontend/src/ui/deck/tl-column.vue   |  3 +-
 22 files changed, 409 insertions(+), 113 deletions(-)
 create mode 100644 packages/frontend/src/components/MkAntennaEditor.stories.impl.ts
 rename packages/frontend/src/{pages/my-antennas/editor.vue => components/MkAntennaEditor.vue} (66%)
 create mode 100644 packages/frontend/src/components/MkAntennaEditorDialog.stories.impl.ts
 create mode 100644 packages/frontend/src/components/MkAntennaEditorDialog.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8da94f3749..f3ea5ca2d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 - Enhance: AiScriptを0.19.0にアップデート
 - Enhance: Allow negative delay for MFM animation elements (`tada`, `jelly`, `twitch`, `shake`, `spin`, `jump`, `bounce`, `rainbow`)
 - Enhance: センシティブなメディアを開く際に確認ダイアログを出せるように
+- Enhance: デッキのアンテナ・リスト選択画面からそれぞれを新規作成できるように
 - Fix: `/about#federation` ページなどで各インスタンスのチャートが表示されなくなっていた問題を修正
 - Fix: ユーザーページの追加情報のラベルを投稿者のサーバーの絵文字で表示する (#13968)
 - Fix: リバーシの対局を正しく共有できないことがある問題を修正
diff --git a/locales/index.d.ts b/locales/index.d.ts
index d54b752312..848050583b 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -632,6 +632,10 @@ export interface Locale extends ILocale {
      * アンテナを編集
      */
     "editAntenna": string;
+    /**
+     * アンテナを作成
+     */
+    "createAntenna": string;
     /**
      * ウィジェットを選択
      */
@@ -5024,6 +5028,14 @@ export interface Locale extends ILocale {
      * センシティブなメディアです。表示しますか？
      */
     "sensitiveMediaRevealConfirm": string;
+    /**
+     * 作成したリスト
+     */
+    "createdLists": string;
+    /**
+     * 作成したアンテナ
+     */
+    "createdAntennas": string;
     "_delivery": {
         /**
          * 配信状態
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index d8531070fe..22228f9254 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -154,6 +154,7 @@ editList: "リストを編集"
 selectChannel: "チャンネルを選択"
 selectAntenna: "アンテナを選択"
 editAntenna: "アンテナを編集"
+createAntenna: "アンテナを作成"
 selectWidget: "ウィジェットを選択"
 editWidgets: "ウィジェットを編集"
 editWidgetsExit: "編集を終了"
@@ -1252,6 +1253,8 @@ inquiry: "お問い合わせ"
 tryAgain: "もう一度お試しください。"
 confirmWhenRevealingSensitiveMedia: "センシティブなメディアを表示するとき確認する"
 sensitiveMediaRevealConfirm: "センシティブなメディアです。表示しますか？"
+createdLists: "作成したリスト"
+createdAntennas: "作成したアンテナ"
 
 _delivery:
   status: "配信状態"
diff --git a/packages/frontend/src/components/MkAntennaEditor.stories.impl.ts b/packages/frontend/src/components/MkAntennaEditor.stories.impl.ts
new file mode 100644
index 0000000000..1749e07a4e
--- /dev/null
+++ b/packages/frontend/src/components/MkAntennaEditor.stories.impl.ts
@@ -0,0 +1,62 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+import { action } from '@storybook/addon-actions';
+import { StoryObj } from '@storybook/vue3';
+import { HttpResponse, http } from 'msw';
+import { commonHandlers } from '../../.storybook/mocks.js';
+import MkAntennaEditor from './MkAntennaEditor.vue';
+export const Default = {
+	render(args) {
+		return {
+			components: {
+				MkAntennaEditor,
+			},
+			setup() {
+				return {
+					args,
+				};
+			},
+			computed: {
+				props() {
+					return {
+						...this.args,
+					};
+				},
+				events() {
+					return {
+						created: action('created'),
+						updated: action('updated'),
+						deleted: action('deleted'),
+					};
+				},
+			},
+			template: '<MkAntennaEditor v-bind="props" v-on="events" />',
+		};
+	},
+	args: {
+	},
+	parameters: {
+		layout: 'fullscreen',
+		msw: {
+			handlers: [
+				...commonHandlers,
+				http.post('/api/antennas/create', async ({ request }) => {
+					action('POST /api/antennas/create')(await request.json());
+					return HttpResponse.json({});
+				}),
+				http.post('/api/antennas/update', async ({ request }) => {
+					action('POST /api/antennas/update')(await request.json());
+					return HttpResponse.json({});
+				}),
+				http.post('/api/antennas/delete', async ({ request }) => {
+					action('POST /api/antennas/delete')(await request.json());
+					return HttpResponse.json();
+				}),
+			],
+		},
+	},
+} satisfies StoryObj<typeof MkAntennaEditor>;
diff --git a/packages/frontend/src/pages/my-antennas/editor.vue b/packages/frontend/src/components/MkAntennaEditor.vue
similarity index 66%
rename from packages/frontend/src/pages/my-antennas/editor.vue
rename to packages/frontend/src/components/MkAntennaEditor.vue
index 02e8f98265..cb7ee3d6ca 100644
--- a/packages/frontend/src/pages/my-antennas/editor.vue
+++ b/packages/frontend/src/components/MkAntennaEditor.vue
@@ -43,7 +43,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<div :class="$style.actions">
 			<div class="_buttons">
 				<MkButton inline primary @click="saveAntenna()"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton>
-				<MkButton v-if="antenna.id != null" inline danger @click="deleteAntenna()"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
+				<MkButton v-if="initialAntenna.id != null" inline danger @click="deleteAntenna()"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
 			</div>
 		</div>
 	</div>
@@ -61,28 +61,53 @@ import MkSwitch from '@/components/MkSwitch.vue';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { i18n } from '@/i18n.js';
+import { deepMerge } from '@/scripts/merge.js';
+import type { DeepPartial } from '@/scripts/merge.js';
+
+type PartialAllowedAntenna = Omit<Misskey.entities.Antenna, 'id' | 'createdAt' | 'updatedAt'> & {
+	id?: string;
+	createdAt?: string;
+	updatedAt?: string;
+};
 
 const props = defineProps<{
-	antenna: Misskey.entities.Antenna
+	antenna?: DeepPartial<PartialAllowedAntenna>;
 }>();
 
+const initialAntenna = deepMerge<PartialAllowedAntenna>(props.antenna ?? {}, {
+	name: '',
+	src: 'all',
+	userListId: null,
+	users: [],
+	keywords: [],
+	excludeKeywords: [],
+	excludeBots: false,
+	withReplies: false,
+	caseSensitive: false,
+	localOnly: false,
+	withFile: false,
+	isActive: true,
+	hasUnreadNote: false,
+	notify: false,
+});
+
 const emit = defineEmits<{
-	(ev: 'created'): void,
-	(ev: 'updated'): void,
+	(ev: 'created', newAntenna: Misskey.entities.Antenna): void,
+	(ev: 'updated', editedAntenna: Misskey.entities.Antenna): void,
 	(ev: 'deleted'): void,
 }>();
 
-const name = ref<string>(props.antenna.name);
-const src = ref<Misskey.entities.AntennasCreateRequest['src']>(props.antenna.src);
-const userListId = ref<string | null>(props.antenna.userListId);
-const users = ref<string>(props.antenna.users.join('\n'));
-const keywords = ref<string>(props.antenna.keywords.map(x => x.join(' ')).join('\n'));
-const excludeKeywords = ref<string>(props.antenna.excludeKeywords.map(x => x.join(' ')).join('\n'));
-const caseSensitive = ref<boolean>(props.antenna.caseSensitive);
-const localOnly = ref<boolean>(props.antenna.localOnly);
-const excludeBots = ref<boolean>(props.antenna.excludeBots);
-const withReplies = ref<boolean>(props.antenna.withReplies);
-const withFile = ref<boolean>(props.antenna.withFile);
+const name = ref<string>(initialAntenna.name);
+const src = ref<Misskey.entities.AntennasCreateRequest['src']>(initialAntenna.src);
+const userListId = ref<string | null>(initialAntenna.userListId);
+const users = ref<string>(initialAntenna.users.join('\n'));
+const keywords = ref<string>(initialAntenna.keywords.map(x => x.join(' ')).join('\n'));
+const excludeKeywords = ref<string>(initialAntenna.excludeKeywords.map(x => x.join(' ')).join('\n'));
+const caseSensitive = ref<boolean>(initialAntenna.caseSensitive);
+const localOnly = ref<boolean>(initialAntenna.localOnly);
+const excludeBots = ref<boolean>(initialAntenna.excludeBots);
+const withReplies = ref<boolean>(initialAntenna.withReplies);
+const withFile = ref<boolean>(initialAntenna.withFile);
 const userLists = ref<Misskey.entities.UserList[] | null>(null);
 
 watch(() => src.value, async () => {
@@ -106,24 +131,26 @@ async function saveAntenna() {
 		excludeKeywords: excludeKeywords.value.trim().split('\n').map(x => x.trim().split(' ')),
 	};
 
-	if (props.antenna.id == null) {
-		await os.apiWithDialog('antennas/create', antennaData);
-		emit('created');
+	if (initialAntenna.id == null) {
+		const res = await os.apiWithDialog('antennas/create', antennaData);
+		emit('created', res);
 	} else {
-		await os.apiWithDialog('antennas/update', { ...antennaData, antennaId: props.antenna.id });
-		emit('updated');
+		const res = await os.apiWithDialog('antennas/update', { ...antennaData, antennaId: initialAntenna.id });
+		emit('updated', res);
 	}
 }
 
 async function deleteAntenna() {
+	if (initialAntenna.id == null) return;
+
 	const { canceled } = await os.confirm({
 		type: 'warning',
-		text: i18n.tsx.removeAreYouSure({ x: props.antenna.name }),
+		text: i18n.tsx.removeAreYouSure({ x: initialAntenna.name }),
 	});
 	if (canceled) return;
 
 	await misskeyApi('antennas/delete', {
-		antennaId: props.antenna.id,
+		antennaId: initialAntenna.id,
 	});
 
 	os.success();
diff --git a/packages/frontend/src/components/MkAntennaEditorDialog.stories.impl.ts b/packages/frontend/src/components/MkAntennaEditorDialog.stories.impl.ts
new file mode 100644
index 0000000000..1c6ca83b47
--- /dev/null
+++ b/packages/frontend/src/components/MkAntennaEditorDialog.stories.impl.ts
@@ -0,0 +1,63 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+import { action } from '@storybook/addon-actions';
+import { StoryObj } from '@storybook/vue3';
+import { HttpResponse, http } from 'msw';
+import { commonHandlers } from '../../.storybook/mocks.js';
+import MkAntennaEditorDialog from './MkAntennaEditorDialog.vue';
+export const Default = {
+	render(args) {
+		return {
+			components: {
+				MkAntennaEditorDialog,
+			},
+			setup() {
+				return {
+					args,
+				};
+			},
+			computed: {
+				props() {
+					return {
+						...this.args,
+					};
+				},
+				events() {
+					return {
+						created: action('created'),
+						updated: action('updated'),
+						deleted: action('deleted'),
+						closed: action('closed'),
+					};
+				},
+			},
+			template: '<MkAntennaEditorDialog v-bind="props" v-on="events" />',
+		};
+	},
+	args: {
+	},
+	parameters: {
+		layout: 'centered',
+		msw: {
+			handlers: [
+				...commonHandlers,
+				http.post('/api/antennas/create', async ({ request }) => {
+					action('POST /api/antennas/create')(await request.json());
+					return HttpResponse.json({});
+				}),
+				http.post('/api/antennas/update', async ({ request }) => {
+					action('POST /api/antennas/update')(await request.json());
+					return HttpResponse.json({});
+				}),
+				http.post('/api/antennas/delete', async ({ request }) => {
+					action('POST /api/antennas/delete')(await request.json());
+					return HttpResponse.json();
+				}),
+			],
+		},
+	},
+} satisfies StoryObj<typeof MkAntennaEditorDialog>;
diff --git a/packages/frontend/src/components/MkAntennaEditorDialog.vue b/packages/frontend/src/components/MkAntennaEditorDialog.vue
new file mode 100644
index 0000000000..6d815d29f3
--- /dev/null
+++ b/packages/frontend/src/components/MkAntennaEditorDialog.vue
@@ -0,0 +1,63 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<MkModalWindow
+	ref="dialog"
+	:withOkButton="false"
+	:width="500"
+	:height="550"
+	@close="close()"
+	@closed="emit('closed')"
+>
+	<template #header>{{ antenna == null ? i18n.ts.createAntenna : i18n.ts.editAntenna }}</template>
+	<XAntennaEditor
+		:antenna="antenna"
+		@created="onAntennaCreated"
+		@updated="onAntennaUpdated"
+		@deleted="onAntennaDeleted"
+	/>
+</MkModalWindow>
+</template>
+
+<script lang="ts" setup>
+import { shallowRef } from 'vue';
+import * as Misskey from 'misskey-js';
+import MkModalWindow from '@/components/MkModalWindow.vue';
+import XAntennaEditor from '@/components/MkAntennaEditor.vue';
+import { i18n } from '@/i18n.js';
+
+defineProps<{
+	antenna?: Misskey.entities.Antenna;
+}>();
+
+const emit = defineEmits<{
+	(ev: 'created', newAntenna: Misskey.entities.Antenna): void,
+	(ev: 'updated', editedAntenna: Misskey.entities.Antenna): void,
+	(ev: 'deleted'): void,
+	(ev: 'closed'): void,
+}>();
+
+const dialog = shallowRef<InstanceType<typeof MkModalWindow>>();
+
+function onAntennaCreated(newAntenna: Misskey.entities.Antenna) {
+	emit('created', newAntenna);
+	dialog.value?.close();
+}
+
+function onAntennaUpdated(editedAntenna: Misskey.entities.Antenna) {
+	emit('updated', editedAntenna);
+	dialog.value?.close();
+}
+
+function onAntennaDeleted() {
+	emit('deleted');
+	dialog.value?.close();
+}
+
+function close() {
+	dialog.value?.close();
+}
+</script>
diff --git a/packages/frontend/src/components/MkDialog.vue b/packages/frontend/src/components/MkDialog.vue
index 5c3c6aa51d..16cf5b1b75 100644
--- a/packages/frontend/src/components/MkDialog.vue
+++ b/packages/frontend/src/components/MkDialog.vue
@@ -36,7 +36,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</MkInput>
 		<MkSelect v-if="select" v-model="selectedValue" autofocus>
 			<template v-if="select.items">
-				<option v-for="item in select.items" :value="item.value">{{ item.text }}</option>
+				<template v-for="item in select.items">
+					<optgroup v-if="'sectionTitle' in item" :label="item.sectionTitle">
+						<option v-for="subItem in item.items" :value="subItem.value">{{ subItem.text }}</option>
+					</optgroup>
+					<option v-else :value="item.value">{{ item.text }}</option>
+				</template>
 			</template>
 		</MkSelect>
 		<div v-if="(showOkButton || showCancelButton) && !actions" :class="$style.buttons">
@@ -67,11 +72,16 @@ type Input = {
 	maxLength?: number;
 };
 
+type SelectItem = {
+	value: any;
+	text: string;
+};
+
 type Select = {
-	items: {
-		value: any;
-		text: string;
-	}[];
+	items: (SelectItem | {
+		sectionTitle: string;
+		items: SelectItem[];
+	})[];
 	default: string | null;
 };
 
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index 3085f33e21..a8dd99c854 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -447,15 +447,20 @@ export function authenticateDialog(): Promise<{
 	});
 }
 
+type SelectItem<C> = {
+	value: C;
+	text: string;
+};
+
 // default が指定されていたら result は null になり得ないことを保証する overload function
 export function select<C = any>(props: {
 	title?: string;
 	text?: string;
 	default: string;
-	items: {
-		value: C;
-		text: string;
-	}[];
+	items: (SelectItem<C> | {
+		sectionTitle: string;
+		items: SelectItem<C>[];
+	} | undefined)[];
 }): Promise<{
 	canceled: true; result: undefined;
 } | {
@@ -465,10 +470,10 @@ export function select<C = any>(props: {
 	title?: string;
 	text?: string;
 	default?: string | null;
-	items: {
-		value: C;
-		text: string;
-	}[];
+	items: (SelectItem<C> | {
+		sectionTitle: string;
+		items: SelectItem<C>[];
+	} | undefined)[];
 }): Promise<{
 	canceled: true; result: undefined;
 } | {
@@ -478,10 +483,10 @@ export function select<C = any>(props: {
 	title?: string;
 	text?: string;
 	default?: string | null;
-	items: {
-		value: C;
-		text: string;
-	}[];
+	items: (SelectItem<C> | {
+		sectionTitle: string;
+		items: SelectItem<C>[];
+	} | undefined)[];
 }): Promise<{
 	canceled: true; result: undefined;
 } | {
@@ -492,7 +497,7 @@ export function select<C = any>(props: {
 			title: props.title,
 			text: props.text,
 			select: {
-				items: props.items,
+				items: props.items.filter(x => x !== undefined),
 				default: props.default ?? null,
 			},
 		}, {
diff --git a/packages/frontend/src/pages/my-antennas/create.vue b/packages/frontend/src/pages/my-antennas/create.vue
index 2d026d2fa9..2b8518747f 100644
--- a/packages/frontend/src/pages/my-antennas/create.vue
+++ b/packages/frontend/src/pages/my-antennas/create.vue
@@ -4,43 +4,33 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div>
-	<XAntenna :antenna="draft" @created="onAntennaCreated"/>
-</div>
+<MkStickyContainer>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+
+	<MkAntennaEditor @created="onAntennaCreated"/>
+</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
-import XAntenna from './editor.vue';
+import { computed } from 'vue';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { antennasCache } from '@/cache.js';
 import { useRouter } from '@/router/supplier.js';
+import MkAntennaEditor from '@/components/MkAntennaEditor.vue';
 
 const router = useRouter();
 
-const draft = ref({
-	name: '',
-	src: 'all',
-	userListId: null,
-	users: [],
-	keywords: [],
-	excludeKeywords: [],
-	excludeBots: false,
-	withReplies: false,
-	caseSensitive: false,
-	localOnly: false,
-	withFile: false,
-	notify: false,
-});
-
 function onAntennaCreated() {
 	antennasCache.delete();
 	router.push('/my/antennas');
 }
 
+const headerActions = computed(() => []);
+const headerTabs = computed(() => []);
+
 definePageMetadata(() => ({
-	title: i18n.ts.manageAntennas,
+	title: i18n.ts.createAntenna,
 	icon: 'ti ti-antenna',
 }));
 </script>
diff --git a/packages/frontend/src/pages/my-antennas/edit.vue b/packages/frontend/src/pages/my-antennas/edit.vue
index 9471be8575..9f927cd1a0 100644
--- a/packages/frontend/src/pages/my-antennas/edit.vue
+++ b/packages/frontend/src/pages/my-antennas/edit.vue
@@ -4,15 +4,17 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div class="">
-	<XAntenna v-if="antenna" :antenna="antenna" @updated="onAntennaUpdated"/>
-</div>
+<MkStickyContainer>
+	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
+
+	<MkAntennaEditor v-if="antenna" :antenna="antenna" @updated="onAntennaUpdated"/>
+</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import * as Misskey from 'misskey-js';
-import XAntenna from './editor.vue';
+import MkAntennaEditor from '@/components/MkAntennaEditor.vue';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
@@ -36,8 +38,11 @@ misskeyApi('antennas/show', { antennaId: props.antennaId }).then((antennaRespons
 	antenna.value = antennaResponse;
 });
 
+const headerActions = computed(() => []);
+const headerTabs = computed(() => []);
+
 definePageMetadata(() => ({
-	title: i18n.ts.manageAntennas,
+	title: i18n.ts.editAntenna,
 	icon: 'ti ti-antenna',
 }));
 </script>
diff --git a/packages/frontend/src/scripts/merge.ts b/packages/frontend/src/scripts/merge.ts
index 4e39a0fa06..9794a300da 100644
--- a/packages/frontend/src/scripts/merge.ts
+++ b/packages/frontend/src/scripts/merge.ts
@@ -6,7 +6,7 @@
 import { deepClone } from './clone.js';
 import type { Cloneable } from './clone.js';
 
-type DeepPartial<T> = {
+export type DeepPartial<T> = {
 	[P in keyof T]?: T[P] extends Record<string | number | symbol, unknown> ? DeepPartial<T[P]> : T[P];
 };
 
diff --git a/packages/frontend/src/ui/deck.vue b/packages/frontend/src/ui/deck.vue
index bdb62dca15..af46b0641d 100644
--- a/packages/frontend/src/ui/deck.vue
+++ b/packages/frontend/src/ui/deck.vue
@@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					:ref="id"
 					:key="id"
 					:class="$style.column"
-					:column="columns.find(c => c.id === id)"
+					:column="columns.find(c => c.id === id)!"
 					:isStacked="ids.length > 1"
 					@headerWheel="onWheel"
 				/>
@@ -95,7 +95,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { computed, defineAsyncComponent, ref, watch, shallowRef } from 'vue';
 import { v4 as uuid } from 'uuid';
 import XCommon from './_common_/common.vue';
-import { deckStore, addColumn as addColumnToStore, loadDeck, getProfiles, deleteProfile as deleteProfile_ } from './deck/deck-store.js';
+import { deckStore, columnTypes, addColumn as addColumnToStore, loadDeck, getProfiles, deleteProfile as deleteProfile_ } from './deck/deck-store.js';
+import type { ColumnType } from './deck/deck-store.js';
 import XSidebar from '@/ui/_common_/navbar.vue';
 import XDrawerMenu from '@/ui/_common_/navbar-for-mobile.vue';
 import MkButton from '@/components/MkButton.vue';
@@ -152,10 +153,12 @@ window.addEventListener('resize', () => {
 const snapScroll = deviceKind === 'smartphone' || deviceKind === 'tablet';
 const drawerMenuShowing = ref(false);
 
+/*
 const route = 'TODO';
 watch(route, () => {
 	drawerMenuShowing.value = false;
 });
+*/
 
 const columns = deckStore.reactiveState.columns;
 const layout = deckStore.reactiveState.layout;
@@ -174,32 +177,20 @@ function showSettings() {
 const columnsEl = shallowRef<HTMLElement>();
 
 const addColumn = async (ev) => {
-	const columns = [
-		'main',
-		'widgets',
-		'notifications',
-		'tl',
-		'antenna',
-		'list',
-		'channel',
-		'mentions',
-		'direct',
-		'roleTimeline',
-	];
-
 	const { canceled, result: column } = await os.select({
 		title: i18n.ts._deck.addColumn,
-		items: columns.map(column => ({
+		items: columnTypes.map(column => ({
 			value: column, text: i18n.ts._deck._columns[column],
 		})),
 	});
-	if (canceled) return;
+	if (canceled || column == null) return;
 
 	addColumnToStore({
 		type: column,
 		id: uuid(),
 		name: i18n.ts._deck._columns[column],
 		width: 330,
+		soundSetting: { type: null, volume: 1 },
 	});
 };
 
@@ -211,7 +202,7 @@ const onContextmenu = (ev) => {
 };
 
 function onWheel(ev: WheelEvent) {
-	if (ev.deltaX === 0) {
+	if (ev.deltaX === 0 && columnsEl.value != null) {
 		columnsEl.value.scrollLeft += ev.deltaY;
 	}
 }
@@ -242,7 +233,7 @@ function changeProfile(ev: MouseEvent) {
 					title: i18n.ts._deck.profile,
 					minLength: 1,
 				});
-				if (canceled) return;
+				if (canceled || name == null) return;
 
 				deckStore.set('profile', name);
 				unisonReload();
diff --git a/packages/frontend/src/ui/deck/antenna-column.vue b/packages/frontend/src/ui/deck/antenna-column.vue
index c3dc1e4fce..987bd4db55 100644
--- a/packages/frontend/src/ui/deck/antenna-column.vue
+++ b/packages/frontend/src/ui/deck/antenna-column.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<XColumn :menu="menu" :column="column" :isStacked="isStacked" :refresher="() => timeline.reloadTimeline()">
+<XColumn :menu="menu" :column="column" :isStacked="isStacked" :refresher="async () => { await timeline?.reloadTimeline() }">
 	<template #header>
 		<i class="ti ti-antenna"></i><span style="margin-left: 8px;">{{ column.name }}</span>
 	</template>
@@ -14,7 +14,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref, shallowRef, watch } from 'vue';
+import { onMounted, ref, shallowRef, watch, defineAsyncComponent } from 'vue';
+import type { entities as MisskeyEntities } from 'misskey-js';
 import XColumn from './column.vue';
 import { updateColumn, Column } from './deck-store.js';
 import MkTimeline from '@/components/MkTimeline.vue';
@@ -22,6 +23,7 @@ import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { i18n } from '@/i18n.js';
 import { MenuItem } from '@/types/menu.js';
+import { antennasCache } from '@/cache.js';
 import { SoundStore } from '@/store.js';
 import { soundSettingsButton } from '@/ui/deck/tl-note-notification.js';
 import * as sound from '@/scripts/sound.js';
@@ -46,14 +48,36 @@ watch(soundSetting, v => {
 
 async function setAntenna() {
 	const antennas = await misskeyApi('antennas/list');
-	const { canceled, result: antenna } = await os.select({
+	const { canceled, result: antenna } = await os.select<MisskeyEntities.Antenna | '_CREATE_'>({
 		title: i18n.ts.selectAntenna,
-		items: antennas.map(x => ({
-			value: x, text: x.name,
-		})),
+		items: [
+			{ value: '_CREATE_', text: i18n.ts.createNew },
+			(antennas.length > 0 ? {
+				sectionTitle: i18n.ts.createdAntennas,
+				items: antennas.map(x => ({
+					value: x, text: x.name,
+				})),
+			} : undefined),
+		],
 		default: props.column.antennaId,
 	});
-	if (canceled) return;
+	if (canceled || antenna == null) return;
+
+	if (antenna === '_CREATE_') {
+		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAntennaEditorDialog.vue')), {}, {
+			created: (newAntenna: MisskeyEntities.Antenna) => {
+				antennasCache.delete();
+				updateColumn(props.column.id, {
+					antennaId: newAntenna.id,
+				});
+			},
+			closed: () => {
+				dispose();
+			},
+		});
+		return;
+	}
+
 	updateColumn(props.column.id, {
 		antennaId: antenna.id,
 	});
diff --git a/packages/frontend/src/ui/deck/channel-column.vue b/packages/frontend/src/ui/deck/channel-column.vue
index 7c5b13eaf1..42c07056e7 100644
--- a/packages/frontend/src/ui/deck/channel-column.vue
+++ b/packages/frontend/src/ui/deck/channel-column.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<XColumn :menu="menu" :column="column" :isStacked="isStacked" :refresher="() => timeline.reloadTimeline()">
+<XColumn :menu="menu" :column="column" :isStacked="isStacked" :refresher="async () => { await timeline?.reloadTimeline() }">
 	<template #header>
 		<i class="ti ti-device-tv"></i><span style="margin-left: 8px;">{{ column.name }}</span>
 	</template>
@@ -68,6 +68,7 @@ async function setChannel() {
 }
 
 async function post() {
+	if (props.column.channelId == null) return;
 	if (!channel.value || channel.value.id !== props.column.channelId) {
 		channel.value = await misskeyApi('channels/show', {
 			channelId: props.column.channelId,
diff --git a/packages/frontend/src/ui/deck/deck-store.ts b/packages/frontend/src/ui/deck/deck-store.ts
index bb3c04cd5c..139621cf57 100644
--- a/packages/frontend/src/ui/deck/deck-store.ts
+++ b/packages/frontend/src/ui/deck/deck-store.ts
@@ -17,9 +17,24 @@ type ColumnWidget = {
 	data: Record<string, any>;
 };
 
+export const columnTypes = [
+	'main',
+	'widgets',
+	'notifications',
+	'tl',
+	'antenna',
+	'list',
+	'channel',
+	'mentions',
+	'direct',
+	'roleTimeline',
+] as const;
+
+export type ColumnType = typeof columnTypes[number];
+
 export type Column = {
 	id: string;
-	type: 'main' | 'widgets' | 'notifications' | 'tl' | 'antenna' | 'channel' | 'list' | 'mentions' | 'direct';
+	type: ColumnType;
 	name: string | null;
 	width: number;
 	widgets?: ColumnWidget[];
@@ -265,7 +280,7 @@ export function removeColumnWidget(id: Column['id'], widget: ColumnWidget) {
 	const columns = deepClone(deckStore.state.columns);
 	const columnIndex = deckStore.state.columns.findIndex(c => c.id === id);
 	const column = deepClone(deckStore.state.columns[columnIndex]);
-	if (column == null) return;
+	if (column == null || column.widgets == null) return;
 	column.widgets = column.widgets.filter(w => w.id !== widget.id);
 	columns[columnIndex] = column;
 	deckStore.set('columns', columns);
@@ -287,7 +302,7 @@ export function updateColumnWidget(id: Column['id'], widgetId: string, widgetDat
 	const columns = deepClone(deckStore.state.columns);
 	const columnIndex = deckStore.state.columns.findIndex(c => c.id === id);
 	const column = deepClone(deckStore.state.columns[columnIndex]);
-	if (column == null) return;
+	if (column == null || column.widgets == null) return;
 	column.widgets = column.widgets.map(w => w.id === widgetId ? {
 		...w,
 		data: widgetData,
diff --git a/packages/frontend/src/ui/deck/direct-column.vue b/packages/frontend/src/ui/deck/direct-column.vue
index e011de0e3b..d12a18f760 100644
--- a/packages/frontend/src/ui/deck/direct-column.vue
+++ b/packages/frontend/src/ui/deck/direct-column.vue
@@ -34,7 +34,7 @@ const tlComponent = ref<InstanceType<typeof MkNotes>>();
 
 function reloadTimeline() {
 	return new Promise<void>((res) => {
-		tlComponent.value.pagingComponent?.reload().then(() => {
+		tlComponent.value?.pagingComponent?.reload().then(() => {
 			res();
 		});
 	});
diff --git a/packages/frontend/src/ui/deck/list-column.vue b/packages/frontend/src/ui/deck/list-column.vue
index 5369112494..9aa8f06476 100644
--- a/packages/frontend/src/ui/deck/list-column.vue
+++ b/packages/frontend/src/ui/deck/list-column.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<XColumn :menu="menu" :column="column" :isStacked="isStacked" :refresher="() => timeline.reloadTimeline()">
+<XColumn :menu="menu" :column="column" :isStacked="isStacked" :refresher="async () => { await timeline?.reloadTimeline() }">
 	<template #header>
 		<i class="ti ti-list"></i><span style="margin-left: 8px;">{{ column.name }}</span>
 	</template>
@@ -15,6 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { watch, shallowRef, ref } from 'vue';
+import type { entities as MisskeyEntities } from 'misskey-js';
 import XColumn from './column.vue';
 import { updateColumn, Column } from './deck-store.js';
 import MkTimeline from '@/components/MkTimeline.vue';
@@ -23,6 +24,7 @@ import { misskeyApi } from '@/scripts/misskey-api.js';
 import { i18n } from '@/i18n.js';
 import { MenuItem } from '@/types/menu.js';
 import { SoundStore } from '@/store.js';
+import { userListsCache } from '@/cache.js';
 import { soundSettingsButton } from '@/ui/deck/tl-note-notification.js';
 import * as sound from '@/scripts/sound.js';
 
@@ -51,17 +53,38 @@ watch(soundSetting, v => {
 
 async function setList() {
 	const lists = await misskeyApi('users/lists/list');
-	const { canceled, result: list } = await os.select({
+	const { canceled, result: list } = await os.select<MisskeyEntities.UserList | '_CREATE_'>({
 		title: i18n.ts.selectList,
-		items: lists.map(x => ({
-			value: x, text: x.name,
-		})),
+		items: [
+			{ value: '_CREATE_', text: i18n.ts.createNew },
+			(lists.length > 0 ? {
+				sectionTitle: i18n.ts.createdLists,
+				items: lists.map(x => ({
+					value: x, text: x.name,
+				})),
+			} : undefined),
+		],
 		default: props.column.listId,
 	});
-	if (canceled) return;
-	updateColumn(props.column.id, {
-		listId: list.id,
-	});
+	if (canceled || list == null) return;
+
+	if (list === '_CREATE_') {
+		const { canceled, result: name } = await os.inputText({
+			title: i18n.ts.enterListName,
+		});
+		if (canceled || name == null || name === '') return;
+
+		const res = await os.apiWithDialog('users/lists/create', { name: name });
+		userListsCache.delete();
+
+		updateColumn(props.column.id, {
+			listId: res.id,
+		});
+	} else {
+		updateColumn(props.column.id, {
+			listId: list.id,
+		});
+	}
 }
 
 function editList() {
diff --git a/packages/frontend/src/ui/deck/mentions-column.vue b/packages/frontend/src/ui/deck/mentions-column.vue
index 81926dd7cb..7b25a55ec3 100644
--- a/packages/frontend/src/ui/deck/mentions-column.vue
+++ b/packages/frontend/src/ui/deck/mentions-column.vue
@@ -26,7 +26,7 @@ const tlComponent = ref<InstanceType<typeof MkNotes>>();
 
 function reloadTimeline() {
 	return new Promise<void>((res) => {
-		tlComponent.value.pagingComponent?.reload().then(() => {
+		tlComponent.value?.pagingComponent?.reload().then(() => {
 			res();
 		});
 	});
diff --git a/packages/frontend/src/ui/deck/notifications-column.vue b/packages/frontend/src/ui/deck/notifications-column.vue
index 23b0fd4f7b..19ccfc1f7c 100644
--- a/packages/frontend/src/ui/deck/notifications-column.vue
+++ b/packages/frontend/src/ui/deck/notifications-column.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<XColumn :column="column" :isStacked="isStacked" :menu="menu" :refresher="() => notificationsComponent.reload()">
+<XColumn :column="column" :isStacked="isStacked" :menu="menu" :refresher="async () => { await notificationsComponent?.reload() }">
 	<template #header><i class="ti ti-bell" style="margin-right: 8px;"></i>{{ column.name }}</template>
 
 	<XNotifications ref="notificationsComponent" :excludeTypes="props.column.excludeTypes"/>
diff --git a/packages/frontend/src/ui/deck/role-timeline-column.vue b/packages/frontend/src/ui/deck/role-timeline-column.vue
index 32ab7527b4..a375e9c574 100644
--- a/packages/frontend/src/ui/deck/role-timeline-column.vue
+++ b/packages/frontend/src/ui/deck/role-timeline-column.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<XColumn :menu="menu" :column="column" :isStacked="isStacked" :refresher="() => timeline.reloadTimeline()">
+<XColumn :menu="menu" :column="column" :isStacked="isStacked" :refresher="async () => { await timeline?.reloadTimeline() }">
 	<template #header>
 		<i class="ti ti-badge"></i><span style="margin-left: 8px;">{{ column.name }}</span>
 	</template>
@@ -53,7 +53,7 @@ async function setRole() {
 		})),
 		default: props.column.roleId,
 	});
-	if (canceled) return;
+	if (canceled || role == null) return;
 	updateColumn(props.column.id, {
 		roleId: role.id,
 	});
diff --git a/packages/frontend/src/ui/deck/tl-column.vue b/packages/frontend/src/ui/deck/tl-column.vue
index a967335edf..b4bc8bb748 100644
--- a/packages/frontend/src/ui/deck/tl-column.vue
+++ b/packages/frontend/src/ui/deck/tl-column.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<XColumn :menu="menu" :column="column" :isStacked="isStacked" :refresher="() => timeline.reloadTimeline()">
+<XColumn :menu="menu" :column="column" :isStacked="isStacked" :refresher="async () => { await timeline?.reloadTimeline() }">
 	<template #header>
 		<i v-if="column.tl === 'home'" class="ti ti-home"></i>
 		<i v-else-if="column.tl === 'local'" class="ti ti-planet"></i>
@@ -113,6 +113,7 @@ async function setType() {
 		}
 		return;
 	}
+	if (src == null) return;
 	updateColumn(props.column.id, {
 		tl: src,
 	});

From 45f909ef33056ac8f429d2a1707d1d7da96d2970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 30 Jul 2024 14:42:46 +0900
Subject: [PATCH 116/221] =?UTF-8?q?enhance(frontend):=20=E3=83=89=E3=83=A9?=
 =?UTF-8?q?=E3=82=A4=E3=83=96=E3=81=AE=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?=
 =?UTF-8?q?=E3=83=BB=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80=E3=82=92=E3=83=89?=
 =?UTF-8?q?=E3=83=A9=E3=83=83=E3=82=B0=E3=81=97=E3=81=AA=E3=81=8F=E3=81=A6?=
 =?UTF-8?q?=E3=82=82=E7=A7=BB=E5=8B=95=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=20(#14318)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(drive): ファイルをフォルダに移動するメニューを実装

(cherry picked from commit b89c2af6945c6a9f9f10e83f54d2bcf0f240b0b4)

* tweak ui

* Update Changelog

* ファイル詳細からも移動できるように

* feat(drive) フォルダのネストを移動するメニューを実装

(cherry picked from commit 8a7d710c6acb83f50c83f050bd1423c764d60a99)

* Update Changelog

* Update Changelog

* lint

* tweak ui

---------

Co-authored-by: nafu-at <satsuki@nafusoft.dev>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
 CHANGELOG.md                                  |  2 +
 .../src/components/MkDrive.folder.vue         | 70 ++++++++++++++++---
 packages/frontend/src/components/MkDrive.vue  |  6 ++
 .../frontend/src/pages/drive.file.info.vue    | 43 ++++++++++--
 .../src/scripts/get-drive-file-menu.ts        | 13 ++++
 5 files changed, 117 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3ea5ca2d5..0be36a2cb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,8 @@
 - Enhance: AiScriptを0.19.0にアップデート
 - Enhance: Allow negative delay for MFM animation elements (`tada`, `jelly`, `twitch`, `shake`, `spin`, `jump`, `bounce`, `rainbow`)
 - Enhance: センシティブなメディアを開く際に確認ダイアログを出せるように
+- Enhance: ドライブのファイル・フォルダをドラッグしなくても移動できるように  
+  (Cherry-picked from https://github.com/nafu-at/misskey/commit/b89c2af6945c6a9f9f10e83f54d2bcf0f240b0b4, https://github.com/nafu-at/misskey/commit/8a7d710c6acb83f50c83f050bd1423c764d60a99)
 - Enhance: デッキのアンテナ・リスト選択画面からそれぞれを新規作成できるように
 - Fix: `/about#federation` ページなどで各インスタンスのチャートが表示されなくなっていた問題を修正
 - Fix: ユーザーページの追加情報のラベルを投稿者のサーバーの絵文字で表示する (#13968)
diff --git a/packages/frontend/src/components/MkDrive.folder.vue b/packages/frontend/src/components/MkDrive.folder.vue
index c940596cde..d6dfaf34e5 100644
--- a/packages/frontend/src/components/MkDrive.folder.vue
+++ b/packages/frontend/src/components/MkDrive.folder.vue
@@ -27,7 +27,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<p v-if="defaultStore.state.uploadFolder == folder.id" :class="$style.upload">
 		{{ i18n.ts.uploadFolder }}
 	</p>
-	<button v-if="selectMode" class="_button" :class="[$style.checkbox, { [$style.checked]: isSelected }]" @click.prevent.stop="checkboxClicked"></button>
+	<button v-if="selectMode" class="_button" :class="$style.checkboxWrapper" @click.prevent.stop="checkboxClicked">
+		<div :class="[$style.checkbox, { [$style.checked]: isSelected }]"></div>
+	</button>
 </div>
 </template>
 
@@ -53,6 +55,7 @@ const props = withDefaults(defineProps<{
 
 const emit = defineEmits<{
 	(ev: 'chosen', v: Misskey.entities.DriveFolder): void;
+	(ev: 'unchose', v: Misskey.entities.DriveFolder): void;
 	(ev: 'move', v: Misskey.entities.DriveFolder): void;
 	(ev: 'upload', file: File, folder: Misskey.entities.DriveFolder);
 	(ev: 'removeFile', v: Misskey.entities.DriveFile['id']): void;
@@ -68,7 +71,11 @@ const isDragging = ref(false);
 const title = computed(() => props.folder.name);
 
 function checkboxClicked() {
-	emit('chosen', props.folder);
+	if (props.isSelected) {
+		emit('unchose', props.folder);
+	} else {
+		emit('chosen', props.folder);
+	}
 }
 
 function onClick() {
@@ -222,6 +229,17 @@ function rename() {
 	});
 }
 
+function move() {
+	os.selectDriveFolder(false).then(folder => {
+		if (folder[0] && folder[0].id === props.folder.id) return;
+
+		misskeyApi('drive/folders/update', {
+			folderId: props.folder.id,
+			parentId: folder[0] ? folder[0].id : null,
+		});
+	});
+}
+
 function deleteFolder() {
 	misskeyApi('drive/folders/delete', {
 		folderId: props.folder.id,
@@ -267,6 +285,10 @@ function onContextmenu(ev: MouseEvent) {
 		text: i18n.ts.rename,
 		icon: 'ti ti-forms',
 		action: rename,
+	}, {
+		text: i18n.ts.move,
+		icon: 'ti ti ti-folder-symlink',
+		action: move,
 	}, { type: 'divider' }, {
 		text: i18n.ts.delete,
 		icon: 'ti ti-trash',
@@ -310,17 +332,43 @@ function onContextmenu(ev: MouseEvent) {
 	}
 }
 
-.checkbox {
+.checkboxWrapper {
 	position: absolute;
-	bottom: 8px;
-	right: 8px;
-	width: 16px;
-	height: 16px;
-	background: #fff;
-	border: solid 1px #000;
+	border-radius: 50%;
+	bottom: 2px;
+	right: 2px;
+	padding: 8px;
+	box-sizing: border-box;
 
-	&.checked {
-		background: var(--accent);
+	> .checkbox {
+		position: relative;
+		width: 18px;
+		height: 18px;
+		background: #fff;
+		border: solid 2px var(--divider);
+		border-radius: 4px;
+		box-sizing: border-box;
+
+		&.checked {
+			border-color: var(--accent);
+			background: var(--accent);
+
+			&::after {
+				content: "\ea5e";
+				font-family: 'tabler-icons';
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+				color: #fff;
+				font-size: 12px;
+				line-height: 22px;
+			}
+		}
+	}
+
+	&:hover {
+		background: var(--accentedBg);
 	}
 }
 
diff --git a/packages/frontend/src/components/MkDrive.vue b/packages/frontend/src/components/MkDrive.vue
index a9717b4fb7..dbb4917069 100644
--- a/packages/frontend/src/components/MkDrive.vue
+++ b/packages/frontend/src/components/MkDrive.vue
@@ -52,6 +52,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					:selectMode="select === 'folder'"
 					:isSelected="selectedFolders.some(x => x.id === f.id)"
 					@chosen="chooseFolder"
+					@unchose="unchoseFolder"
 					@move="move"
 					@upload="upload"
 					@removeFile="removeFile"
@@ -428,6 +429,11 @@ function chooseFolder(folderToChoose: Misskey.entities.DriveFolder) {
 	}
 }
 
+function unchoseFolder(folderToUnchose: Misskey.entities.DriveFolder) {
+	selectedFolders.value = selectedFolders.value.filter(f => f.id !== folderToUnchose.id);
+	emit('change-selection', selectedFolders.value);
+}
+
 function move(target?: Misskey.entities.DriveFolder | Misskey.entities.DriveFolder['id' | 'parentId']) {
 	if (!target) {
 		goRoot();
diff --git a/packages/frontend/src/pages/drive.file.info.vue b/packages/frontend/src/pages/drive.file.info.vue
index a774412f83..3026d00a2c 100644
--- a/packages/frontend/src/pages/drive.file.info.vue
+++ b/packages/frontend/src/pages/drive.file.info.vue
@@ -37,11 +37,17 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</button>
 			</div>
 		</div>
-		<div>
-			<button class="_button" :class="$style.fileAltEditBtn" @click="describe()">
+		<div class="_gaps_s">
+			<button class="_button" :class="$style.kvEditBtn" @click="move()">
+				<MkKeyValue>
+					<template #key>{{ i18n.ts.folder }}</template>
+					<template #value>{{ folderHierarchy.join(' > ') }}<i class="ti ti-pencil" :class="$style.kvEditIcon"></i></template>
+				</MkKeyValue>
+			</button>
+			<button class="_button" :class="$style.kvEditBtn" @click="describe()">
 				<MkKeyValue>
 					<template #key>{{ i18n.ts.description }}</template>
-					<template #value>{{ file.comment ? file.comment : `(${i18n.ts.none})` }}<i class="ti ti-pencil" :class="$style.fileAltEditIcon"></i></template>
+					<template #value>{{ file.comment ? file.comment : `(${i18n.ts.none})` }}<i class="ti ti-pencil" :class="$style.kvEditIcon"></i></template>
 				</MkKeyValue>
 			</button>
 			<MkKeyValue :class="$style.fileMetaDataChildren">
@@ -90,6 +96,18 @@ const props = defineProps<{
 
 const fetching = ref(true);
 const file = ref<Misskey.entities.DriveFile>();
+const folderHierarchy = computed(() => {
+	if (!file.value) return [i18n.ts.drive];
+	const folderNames = [i18n.ts.drive];
+	
+	function get(folder: Misskey.entities.DriveFolder) {
+		if (folder.parent) get(folder.parent);
+		folderNames.push(folder.name);
+	}
+	
+	if (file.value.folder) get(file.value.folder);
+	return folderNames;
+});
 const isImage = computed(() => file.value?.type.startsWith('image/'));
 
 async function fetch() {
@@ -122,6 +140,19 @@ function crop() {
 	});
 }
 
+function move() {
+	if (!file.value) return;
+
+	os.selectDriveFolder(false).then(folder => {
+		misskeyApi('drive/files/update', {
+			fileId: file.value.id,
+			folderId: folder[0] ? folder[0].id : null,
+		}).then(async () => {
+			await fetch();
+		});
+	});
+}
+
 function toggleSensitive() {
 	if (!file.value) return;
 
@@ -282,14 +313,14 @@ onMounted(async () => {
 	padding: .5rem 1rem;
 }
 
-.fileAltEditBtn {
+.kvEditBtn {
 	text-align: start;
 	display: block;
 	width: 100%;
 	padding: .5rem 1rem;
 	border-radius: var(--radius);
 
-	.fileAltEditIcon {
+	.kvEditIcon {
 		display: inline-block;
 		color: transparent;
 		visibility: hidden;
@@ -300,7 +331,7 @@ onMounted(async () => {
 		color: var(--accent);
 		background-color: var(--accentedBg);
 
-		.fileAltEditIcon {
+		.kvEditIcon {
 			color: var(--accent);
 			visibility: visible;
 		}
diff --git a/packages/frontend/src/scripts/get-drive-file-menu.ts b/packages/frontend/src/scripts/get-drive-file-menu.ts
index 7c6c4b4db4..108648d640 100644
--- a/packages/frontend/src/scripts/get-drive-file-menu.ts
+++ b/packages/frontend/src/scripts/get-drive-file-menu.ts
@@ -41,6 +41,15 @@ function describe(file: Misskey.entities.DriveFile) {
 	});
 }
 
+function move(file: Misskey.entities.DriveFile) {
+	os.selectDriveFolder(false).then(folder => {
+		misskeyApi('drive/files/update', {
+			fileId: file.id,
+			folderId: folder[0] ? folder[0].id : null,
+		});
+	});
+}
+
 function toggleSensitive(file: Misskey.entities.DriveFile) {
 	misskeyApi('drive/files/update', {
 		fileId: file.id,
@@ -88,6 +97,10 @@ export function getDriveFileMenu(file: Misskey.entities.DriveFile, folder?: Miss
 		text: i18n.ts.rename,
 		icon: 'ti ti-forms',
 		action: () => rename(file),
+	}, {
+		text: i18n.ts.move,
+		icon: 'ti ti-folder-symlink',
+		action: () => move(file),
 	}, {
 		text: file.isSensitive ? i18n.ts.unmarkAsSensitive : i18n.ts.markAsSensitive,
 		icon: file.isSensitive ? 'ti ti-eye' : 'ti ti-eye-exclamation',

From 866abff54d8e3c377361a0d75ef7ee59ba2fcd84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 30 Jul 2024 14:45:53 +0900
Subject: [PATCH 117/221] =?UTF-8?q?enhance(frontend):=20=E3=83=96=E3=83=A9?=
 =?UTF-8?q?=E3=82=A6=E3=82=B6=E3=81=AE=E3=82=B3=E3=83=B3=E3=83=86=E3=82=AD?=
 =?UTF-8?q?=E3=82=B9=E3=83=88=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=82=92?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=20(#14076)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance(frontend): ブラウザのコンテキストメニューを使用できるように

* Update Changelog

* shiftにした

* change keys

* fix

* fix

* fix

* update translation keys

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
---
 CHANGELOG.md                                   |  1 +
 locales/index.d.ts                             | 18 ++++++++++++++++++
 locales/ja-JP.yml                              |  6 ++++++
 packages/frontend/src/os.ts                    |  8 ++++++++
 .../frontend/src/pages/settings/general.vue    |  8 ++++++++
 packages/frontend/src/store.ts                 |  4 ++++
 6 files changed, 45 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0be36a2cb3..17cf4d3275 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 - Enhance: ドライブのファイル・フォルダをドラッグしなくても移動できるように  
   (Cherry-picked from https://github.com/nafu-at/misskey/commit/b89c2af6945c6a9f9f10e83f54d2bcf0f240b0b4, https://github.com/nafu-at/misskey/commit/8a7d710c6acb83f50c83f050bd1423c764d60a99)
 - Enhance: デッキのアンテナ・リスト選択画面からそれぞれを新規作成できるように
+- Enhance: ブラウザのコンテキストメニューを使用できるように
 - Fix: `/about#federation` ページなどで各インスタンスのチャートが表示されなくなっていた問題を修正
 - Fix: ユーザーページの追加情報のラベルを投稿者のサーバーの絵文字で表示する (#13968)
 - Fix: リバーシの対局を正しく共有できないことがある問題を修正
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 848050583b..30c21c92e7 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -10118,6 +10118,24 @@ export interface Locale extends ILocale {
          */
         "loop": string;
     };
+    "_contextMenu": {
+        /**
+         * コンテキストメニュー
+         */
+        "title": string;
+        /**
+         * アプリケーション
+         */
+        "app": string;
+        /**
+         * Shiftキーでアプリケーション
+         */
+        "appWithShift": string;
+        /**
+         * ブラウザのUI
+         */
+        "native": string;
+    };
 }
 declare const locales: {
     [lang: string]: Locale;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 22228f9254..ea2ffb9c0d 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2697,3 +2697,9 @@ _mediaControls:
   pip: "ピクチャインピクチャ"
   playbackRate: "再生速度"
   loop: "ループ再生"
+
+_contextMenu:
+  title: "コンテキストメニュー"
+  app: "アプリケーション"
+  appWithShift: "Shiftキーでアプリケーション"
+  native: "ブラウザのUI"
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index a8dd99c854..f42e2ed3c5 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -11,6 +11,7 @@ import * as Misskey from 'misskey-js';
 import type { ComponentProps as CP } from 'vue-component-type-helpers';
 import type { Form, GetFormResultType } from '@/scripts/form.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
+import { defaultStore } from '@/store.js';
 import { i18n } from '@/i18n.js';
 import MkPostFormDialog from '@/components/MkPostFormDialog.vue';
 import MkWaitingDialog from '@/components/MkWaitingDialog.vue';
@@ -654,6 +655,13 @@ export function popupMenu(items: MenuItem[], src?: HTMLElement | EventTarget | n
 }
 
 export function contextMenu(items: MenuItem[], ev: MouseEvent): Promise<void> {
+	if (
+		defaultStore.state.contextMenu === 'native' ||
+		(defaultStore.state.contextMenu === 'appWithShift' && !ev.shiftKey)
+	) {
+		return Promise.resolve();
+	}
+
 	let returnFocusTo = getHTMLElementOrNull(ev.currentTarget ?? ev.target) ?? getHTMLElementOrNull(document.activeElement);
 	ev.preventDefault();
 	return new Promise(resolve => nextTick(() => {
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 9e429f8dbd..94ef3b8485 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -177,6 +177,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<option value="dialog">{{ i18n.ts._serverDisconnectedBehavior.dialog }}</option>
 				<option value="quiet">{{ i18n.ts._serverDisconnectedBehavior.quiet }}</option>
 			</MkSelect>
+			<MkSelect v-model="contextMenu">
+				<template #label>{{ i18n.ts._contextMenu.title }}</template>
+				<option value="app">{{ i18n.ts._contextMenu.app }}</option>
+				<option value="appWithShift">{{ i18n.ts._contextMenu.appWithShift }}</option>
+				<option value="native">{{ i18n.ts._contextMenu.native }}</option>
+			</MkSelect>
 			<MkRange v-model="numberOfPageCache" :min="1" :max="10" :step="1" easing>
 				<template #label>{{ i18n.ts.numberOfPageCache }}</template>
 				<template #caption>{{ i18n.ts.numberOfPageCacheDescription }}</template>
@@ -317,6 +323,7 @@ const enableHorizontalSwipe = computed(defaultStore.makeGetterSetter('enableHori
 const useNativeUIForVideoAudioPlayer = computed(defaultStore.makeGetterSetter('useNativeUIForVideoAudioPlayer'));
 const alwaysConfirmFollow = computed(defaultStore.makeGetterSetter('alwaysConfirmFollow'));
 const confirmWhenRevealingSensitiveMedia = computed(defaultStore.makeGetterSetter('confirmWhenRevealingSensitiveMedia'));
+const contextMenu = computed(defaultStore.makeGetterSetter('contextMenu'));
 
 watch(lang, () => {
 	miLocalStorage.setItem('lang', lang.value as string);
@@ -360,6 +367,7 @@ watch([
 	enableSeasonalScreenEffect,
 	alwaysConfirmFollow,
 	confirmWhenRevealingSensitiveMedia,
+	contextMenu,
 ], async () => {
 	await reloadAsk();
 });
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index dbf6b8716f..437314074a 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -458,6 +458,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: false,
 	},
+  contextMenu: {
+		where: 'device',
+		default: 'app' as 'app' | 'appWithShift' | 'native',
+  },
 
 	sound_masterVolume: {
 		where: 'device',

From 5eea41b089b20017da2becb9ce0fc1d4d48a5e7f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2024 06:11:15 +0000
Subject: [PATCH 118/221] Bump version to 2024.7.0-rc.5

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e33383916c..64f7b88a9f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.7.0-rc.4",
+	"version": "2024.7.0-rc.5",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index dcddc8087c..b112975328 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.7.0-rc.4",
+	"version": "2024.7.0-rc.5",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 7e9c38d6fbdab1691056f411787801d87701c593 Mon Sep 17 00:00:00 2001
From: taichan <40626578+tai-cha@users.noreply.github.com>
Date: Tue, 30 Jul 2024 15:29:24 +0900
Subject: [PATCH 119/221] =?UTF-8?q?Fix(backend):=20=E3=83=89=E3=83=A9?=
 =?UTF-8?q?=E3=82=A4=E3=83=96=E3=81=AE=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?=
 =?UTF-8?q?=E3=81=AEurl,=20uri,=20src=20=E3=81=AE=E4=B8=8A=E9=99=90?=
 =?UTF-8?q?=E5=BC=95=E3=81=8D=E4=B8=8A=E3=81=92=20=20(#14323)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance: ドライブurlの上限文字数を引き上げ

* Fix: おそらくフォーク独自の変更のように見える部分(metaに関する変更部分)を削除

* UPDATE changelog

* Add SPDX prefixes

* Fix: インデックスの張り直しを消した

---------

Co-authored-by: slofp <phy.public@gmail.com>
---
 CHANGELOG.md                                  |  5 ++++
 .../migration/1721666053703-fixDriveUrl.js    | 24 +++++++++++++++++++
 packages/backend/src/models/DriveFile.ts      |  6 ++---
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 packages/backend/migration/1721666053703-fixDriveUrl.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17cf4d3275..33256a8674 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,6 +88,11 @@
 - Fix: リノートのミュートが適用されるまでに時間がかかることがある問題を修正  
   (Cherry-picked from https://github.com/Type4ny-Project/Type4ny/commit/e9601029b52e0ad43d9131b555b614e56c84ebc1)
 - Fix: Steaming APIが不正なデータを受けた場合の動作が不安定である問題 #14251
+- Fix: 一部のMisskey以外のソフトウェアからファイルを受け取れない問題
+  (Cherry-picked from https://github.com/Secineralyr/misskey.dream/pull/73/commits/652eaff1e8aa00b890d71d2e1e52c263c1e67c76)
+  - NOTE: `drive_file`の`url`, `uri`, `src`の上限が512から1024に変更されます
+	  Migrationではカラム定義の変更のみが行われます。
+		サーバー管理者は各サーバーの必要に応じ`drive_file` `("uri")`に対するインデックスを張りなおすことでより安定しDBの探索が行われる可能性があります。詳細 は [GitHub](https://github.com/misskey-dev/misskey/pull/14323#issuecomment-2257562228)で確認可能です
 
 ### Misskey.js
 - Feat: `/drive/files/create` のリクエストに対応（`multipart/form-data`に対応）
diff --git a/packages/backend/migration/1721666053703-fixDriveUrl.js b/packages/backend/migration/1721666053703-fixDriveUrl.js
new file mode 100644
index 0000000000..d8512fb835
--- /dev/null
+++ b/packages/backend/migration/1721666053703-fixDriveUrl.js
@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class FixDriveUrl1721666053703 {
+    name = 'FixDriveUrl1721666053703'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "drive_file" ALTER COLUMN "url" TYPE character varying(1024), ALTER COLUMN "url" SET NOT NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."url" IS 'The URL of the DriveFile.'`);
+        await queryRunner.query(`ALTER TABLE "drive_file" ALTER COLUMN "uri" TYPE character varying(1024)`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."uri" IS 'The URI of the DriveFile. it will be null when the DriveFile is local.'`);
+        await queryRunner.query(`ALTER TABLE "drive_file" ALTER COLUMN "src" TYPE character varying(1024)`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "drive_file" ALTER COLUMN "src" TYPE character varying(512)`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."uri" IS 'The URI of the DriveFile. it will be null when the DriveFile is local.'`);
+        await queryRunner.query(`ALTER TABLE "drive_file" ALTER COLUMN "uri" TYPE character varying(512)`);
+        await queryRunner.query(`COMMENT ON COLUMN "drive_file"."url" IS 'The URL of the DriveFile.'`);
+        await queryRunner.query(`ALTER TABLE "drive_file" ALTER COLUMN "url" TYPE character varying(512), ALTER COLUMN "url" SET NOT NULL`);
+    }
+}
diff --git a/packages/backend/src/models/DriveFile.ts b/packages/backend/src/models/DriveFile.ts
index 438b32f79a..7b03e3e494 100644
--- a/packages/backend/src/models/DriveFile.ts
+++ b/packages/backend/src/models/DriveFile.ts
@@ -82,7 +82,7 @@ export class MiDriveFile {
 	public storedInternal: boolean;
 
 	@Column('varchar', {
-		length: 512,
+		length: 1024,
 		comment: 'The URL of the DriveFile.',
 	})
 	public url: string;
@@ -124,13 +124,13 @@ export class MiDriveFile {
 
 	@Index()
 	@Column('varchar', {
-		length: 512, nullable: true,
+		length: 1024, nullable: true,
 		comment: 'The URI of the DriveFile. it will be null when the DriveFile is local.',
 	})
 	public uri: string | null;
 
 	@Column('varchar', {
-		length: 512, nullable: true,
+		length: 1024, nullable: true,
 	})
 	public src: string | null;
 

From bff813042e670dcb59a6b0dcc334ca44f880752b Mon Sep 17 00:00:00 2001
From: taichan <40626578+tai-cha@users.noreply.github.com>
Date: Tue, 30 Jul 2024 15:51:08 +0900
Subject: [PATCH 120/221] =?UTF-8?q?feat:=20=E3=81=93=E3=81=AE=E3=83=A6?=
 =?UTF-8?q?=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=AE=E3=83=8E=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E3=82=92=E6=A4=9C=E7=B4=A2,=20=E3=82=AF=E3=82=A8=E3=83=AA?=
 =?UTF-8?q?=E3=81=AB=E5=9F=BA=E3=81=A5=E3=81=8F=E6=A4=9C=E7=B4=A2=E3=81=AE?=
 =?UTF-8?q?=E5=88=9D=E6=9C=9F=E5=80=A4=20&=20=E3=83=8E=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E3=81=AEUI=E6=94=B9=E5=96=84=20(#14128)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor(frontend): noteSearchAvailableをaccountsに移動

* feat: searchページでのクエリの受取りとtypeによる表示タブの変更

* user検索でsearchの親から受け取った値を基に入力値を初期化

* feat(frontend): ノート検索で親(search)からの情報を基にユーザー情報を取得

* feat(frontend): ユーザーのノートを検索するページに遷移するボタン

* feat(frontend): ノート検索にホスト名指定のオプション追加
also :art:

* style: ただ照会部分を囲っただけ（可読性確保のために）

* refactor: remove unneed import
defineProps and withDefaults are compiler micro when using `<script setup>`
FYI: https://vuejs.org/api/sfc-script-setup.html#defineprops-defineemits:~:text=defineProps%20and%20defineEmits%20are%20compiler%20macros%20only%20usable%20inside%20%3Cscript%20setup%3E.%20They%20do%20not%20need%20to%20be%20imported%2C%20and%20are%20compiled%20away%20when%20%3Cscript%20setup%3E%20is%20processed.

* Update CHANGELOG

* Fix: ノート検索の初期値が常にホスト指定になってしまう

* notesSearchAvailableをaccountに持たせるのをやめる

* SDPX-Licence-Identifier

* Fix: Vitest fails due to instance.policies being undefined

* Add Storybook for search

* Fix(storybook): ノート検索が利用できないと出てしまう問題

* storybookでユーザー選択ができないのを修正

* feat: ノート検索で自分を選択可能に
& :art:

* feat(background): api/metaで検索可能なノートのスコープを参照できるように

* globalのノートが検索不可能な場合、検索オプションを表示しないように

* Update CHANGELOG.md

* config.meilisearch.scopeがstring[]を取ることがあるので修正

* meilisearchを利用かつscopeがlocalの場合、リモートユーザーのメニューで「このユーザーのノートを検索」を出さないように

* hostが空文字の時の挙動を修正

* ローカルのみしかノートがインデックスされていない場合、リモートユーザーも選択できなくした
---
 CHANGELOG.md                                  |   4 +
 locales/index.d.ts                            |  12 ++
 locales/ja-JP.yml                             |   3 +
 .../src/core/entities/MetaEntityService.ts    |   1 +
 .../backend/src/models/json-schema/meta.ts    |   6 +
 packages/frontend/.storybook/fakes.ts         |   2 +-
 packages/frontend/.storybook/generate.tsx     |   1 +
 packages/frontend/src/components/MkRadios.vue |   4 +
 packages/frontend/src/pages/search.note.vue   | 152 +++++++++++++++---
 .../frontend/src/pages/search.stories.impl.ts |  88 ++++++++++
 packages/frontend/src/pages/search.user.vue   |  20 ++-
 packages/frontend/src/pages/search.vue        |  34 ++--
 packages/frontend/src/router/definition.ts    |   3 +
 .../frontend/src/scripts/check-permissions.ts |  19 +++
 .../frontend/src/scripts/get-user-menu.ts     |  10 +-
 packages/misskey-js/src/autogen/types.ts      |   5 +
 16 files changed, 327 insertions(+), 37 deletions(-)
 create mode 100644 packages/frontend/src/pages/search.stories.impl.ts
 create mode 100644 packages/frontend/src/scripts/check-permissions.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33256a8674..f58bec42e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,9 @@
 - Fix: デフォルトテーマに無効なテーマコードを入力するとUIが使用できなくなる問題を修正
 
 ### Client
+- Feat: ユーザーページから「このユーザーのノートを検索」できるように (#14128)
+- Feat: 検索ページはクエリを受け付けるようになりました (#14128)
+- Enhance: 検索ページのUI改善 (#14128)
 - Enhance: 内蔵APIドキュメントのデザイン・パフォーマンスを改善
 - Enhance: 非ログイン時に他サーバーに遷移するアクションを追加
 - Enhance: 非ログイン時のハイライトTLのデザインを改善
@@ -61,6 +64,7 @@
 - Enhance: エンドポイント`i/webhook/update`の必須項目を`webhookId`のみに
 - Enhance: エンドポイント`admin/ad/update`の必須項目を`id`のみに
 - Enhance: `default.yml`内の`url`, `db.db`, `db.user`, `db.pass`を環境変数から読み込めるように
+- Enhance: エンドポイント`api/meta`にプロパティ`noteSearchableScope`が増え、`string`値`local`または`global`を返却します
 - Fix: チャート生成時にinstance.suspensionStateに置き換えられたinstance.isSuspendedが参照されてしまう問題を修正
 - Fix: ユーザーのフィードページのMFMをHTMLに展開するように (#14006)
 - Fix: アンテナ・クリップ・リスト・ウェブフックがロールポリシーの上限より一つ多く作れてしまうのを修正 (#14036)
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 30c21c92e7..14dc862745 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -256,6 +256,10 @@ export interface Locale extends ILocale {
      * ユーザーを検索
      */
     "searchUser": string;
+    /**
+     * ユーザーのノートを検索
+     */
+    "searchThisUsersNotes": string;
     /**
      * 返信
      */
@@ -796,6 +800,10 @@ export interface Locale extends ILocale {
      * ホスト
      */
     "host": string;
+    /**
+     * 自分を選択
+     */
+    "selectSelf": string;
     /**
      * ユーザーを選択
      */
@@ -4492,6 +4500,10 @@ export interface Locale extends ILocale {
      * ユーザー指定
      */
     "specifyUser": string;
+    /**
+     * ホスト指定
+     */
+    "specifyHost": string;
     /**
      * プレビューできません
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index ea2ffb9c0d..cd26b71d57 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -60,6 +60,7 @@ copyFileId: "ファイルIDをコピー"
 copyFolderId: "フォルダーIDをコピー"
 copyProfileUrl: "プロフィールURLをコピー"
 searchUser: "ユーザーを検索"
+searchThisUsersNotes: "ユーザーのノートを検索"
 reply: "返信"
 loadMore: "もっと見る"
 showMore: "もっと見る"
@@ -195,6 +196,7 @@ followConfirm: "{name}をフォローしますか？"
 proxyAccount: "プロキシアカウント"
 proxyAccountDescription: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
 host: "ホスト"
+selectSelf: "自分を選択"
 selectUser: "ユーザーを選択"
 recipient: "宛先"
 annotation: "注釈"
@@ -1119,6 +1121,7 @@ preventAiLearning: "生成AIによる学習を拒否"
 preventAiLearningDescription: "外部の文章生成AIや画像生成AIに対して、投稿したノートや画像などのコンテンツを学習の対象にしないように要求します。これはnoaiフラグをHTMLレスポンスに含めることによって実現されますが、この要求に従うかはそのAI次第であるため、学習を完全に防止するものではありません。"
 options: "オプション"
 specifyUser: "ユーザー指定"
+specifyHost: "ホスト指定"
 failedToPreviewUrl: "プレビューできません"
 update: "更新"
 rolesThatCanBeUsedThisEmojiAsReaction: "リアクションとして使えるロール"
diff --git a/packages/backend/src/core/entities/MetaEntityService.ts b/packages/backend/src/core/entities/MetaEntityService.ts
index 09641ce485..bcfd8ae41c 100644
--- a/packages/backend/src/core/entities/MetaEntityService.ts
+++ b/packages/backend/src/core/entities/MetaEntityService.ts
@@ -128,6 +128,7 @@ export class MetaEntityService {
 
 			mediaProxy: this.config.mediaProxy,
 			enableUrlPreview: instance.urlPreviewEnabled,
+			noteSearchableScope: this.config.meilisearch == null || this.config.meilisearch.scope === 'local' ? 'local' : 'global',
 		};
 
 		return packed;
diff --git a/packages/backend/src/models/json-schema/meta.ts b/packages/backend/src/models/json-schema/meta.ts
index e7bc6356e5..3bcf9cac92 100644
--- a/packages/backend/src/models/json-schema/meta.ts
+++ b/packages/backend/src/models/json-schema/meta.ts
@@ -247,6 +247,12 @@ export const packedMetaLiteSchema = {
 			optional: false, nullable: false,
 			ref: 'RolePolicies',
 		},
+		noteSearchableScope: {
+			type: 'string',
+			enum: ['local', 'global'],
+			optional: false, nullable: false,
+			default: 'local',
+		},
 	},
 } as const;
 
diff --git a/packages/frontend/.storybook/fakes.ts b/packages/frontend/.storybook/fakes.ts
index 9d789a34ff..01f1046609 100644
--- a/packages/frontend/.storybook/fakes.ts
+++ b/packages/frontend/.storybook/fakes.ts
@@ -154,7 +154,7 @@ export function federationInstance(): entities.FederationInstance {
 	};
 }
 
-export function userDetailed(id = 'someuserid', username = 'miskist', host = 'misskey-hub.net', name = 'Misskey User'): entities.UserDetailed {
+export function userDetailed(id = 'someuserid', username = 'miskist', host:entities.UserDetailed['host'] = 'misskey-hub.net', name:entities.UserDetailed['name'] = 'Misskey User'): entities.UserDetailed {
 	return {
 		id,
 		username,
diff --git a/packages/frontend/.storybook/generate.tsx b/packages/frontend/.storybook/generate.tsx
index 7b6c86447e..b94dfc53e3 100644
--- a/packages/frontend/.storybook/generate.tsx
+++ b/packages/frontend/.storybook/generate.tsx
@@ -405,6 +405,7 @@ function toStories(component: string): Promise<string> {
 		glob('src/components/MkUserSetupDialog.*.vue'),
 		glob('src/components/MkInstanceCardMini.vue'),
 		glob('src/components/MkInviteCode.vue'),
+		glob('src/pages/search.vue'),
 		glob('src/pages/user/home.vue'),
 	]);
 	const components = globs.flat();
diff --git a/packages/frontend/src/components/MkRadios.vue b/packages/frontend/src/components/MkRadios.vue
index 549438f61b..705c93f770 100644
--- a/packages/frontend/src/components/MkRadios.vue
+++ b/packages/frontend/src/components/MkRadios.vue
@@ -29,6 +29,9 @@ export default defineComponent({
 		// なぜかFragmentになることがあるため
 		if (options.length === 1 && options[0].props == null) options = options[0].children as VNode[];
 
+		// vnodeのうちv-if=falseなものを除外する(trueになるものはoptionなど他typeになる)
+		options = options.filter(vnode => !(typeof vnode.type === 'symbol' && vnode.type.description === 'v-cmt' && vnode.children === 'v-if'));
+
 		return () => h('div', {
 			class: 'novjtcto',
 		}, [
@@ -40,6 +43,7 @@ export default defineComponent({
 			}, options.map(option => h(MkRadio, {
 				key: option.key as string,
 				value: option.props?.value,
+				disabled: option.props?.disabled,
 				modelValue: value.value,
 				'onUpdate:modelValue': _v => value.value = _v,
 			}, () => option.children)),
diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue
index d68bbaeeca..05dc77b94b 100644
--- a/packages/frontend/src/pages/search.note.vue
+++ b/packages/frontend/src/pages/search.note.vue
@@ -9,26 +9,35 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkInput v-model="searchQuery" :large="true" :autofocus="true" type="search" @enter="search">
 			<template #prefix><i class="ti ti-search"></i></template>
 		</MkInput>
-		<MkFolder>
-			<template #label>{{ i18n.ts.options }}</template>
+		<MkFoldableSection :expanded="true">
+			<template #header>{{ i18n.ts.options }}</template>
 
 			<div class="_gaps_m">
-				<MkSwitch v-model="isLocalOnly">{{ i18n.ts.localOnly }}</MkSwitch>
+				<MkRadios v-model="hostSelect">
+					<template #label>{{ i18n.ts.host }}</template>
+					<option value="all" default>{{ i18n.ts.all }}</option>
+					<option value="local">{{ i18n.ts.local }}</option>
+					<option v-if="noteSearchableScope === 'global'" value="specified">{{ i18n.ts.specifyHost }}</option>
+				</MkRadios>
+				<MkInput v-if="noteSearchableScope === 'global'" v-model="hostInput" :disabled="hostSelect !== 'specified'" :large="true" type="search">
+					<template #prefix><i class="ti ti-server"></i></template>
+				</MkInput>
 
 				<MkFolder :defaultOpen="true">
 					<template #label>{{ i18n.ts.specifyUser }}</template>
-					<template v-if="user" #suffix>@{{ user.username }}</template>
+					<template v-if="user" #suffix>@{{ user.username }}{{ user.host ? `@${user.host}` : "" }}</template>
 
-					<div style="text-align: center;" class="_gaps">
-						<div v-if="user">@{{ user.username }}</div>
-						<div>
-							<MkButton v-if="user == null" primary rounded inline @click="selectUser">{{ i18n.ts.selectUser }}</MkButton>
-							<MkButton v-else danger rounded inline @click="user = null">{{ i18n.ts.remove }}</MkButton>
+					<div class="_gaps">
+						<div :class="$style.userItem">
+							<MkUserCardMini v-if="user" :class="$style.userCard" :user="user" :withChart="false"/>
+							<MkButton v-if="user == null && $i != null" transparent :class="$style.addMeButton" @click="selectSelf"><div :class="$style.addUserButtonInner"><span><i class="ti ti-plus"></i><i class="ti ti-user"></i></span><span>{{ i18n.ts.selectSelf }}</span></div></MkButton>
+							<MkButton v-if="user == null" transparent :class="$style.addUserButton" @click="selectUser"><div :class="$style.addUserButtonInner"><i class="ti ti-plus"></i><span>{{ i18n.ts.selectUser }}</span></div></MkButton>
+							<button class="_button" :class="$style.remove" :disabled="user == null" @click="removeUser"><i class="ti ti-x"></i></button>
 						</div>
 					</div>
 				</MkFolder>
 			</div>
-		</MkFolder>
+		</MkFoldableSection>
 		<div>
 			<MkButton large primary gradate rounded style="margin: 0 auto;" @click="search">{{ i18n.ts.search }}</MkButton>
 		</div>
@@ -42,31 +51,90 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { computed, ref, toRef, watch } from 'vue';
+import type { UserDetailed } from 'misskey-js/entities.js';
+import type { Paging } from '@/components/MkPagination.vue';
 import MkNotes from '@/components/MkNotes.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkButton from '@/components/MkButton.vue';
-import MkSwitch from '@/components/MkSwitch.vue';
 import { i18n } from '@/i18n.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import MkFoldableSection from '@/components/MkFoldableSection.vue';
 import MkFolder from '@/components/MkFolder.vue';
 import { useRouter } from '@/router/supplier.js';
+import MkUserCardMini from '@/components/MkUserCardMini.vue';
+import MkRadios from '@/components/MkRadios.vue';
+import { $i } from '@/account.js';
+import { instance } from '@/instance.js';
+
+const props = withDefaults(defineProps<{
+	query?: string;
+	userId?: string;
+	username?: string;
+	host?: string | null;
+}>(), {
+	query: '',
+	userId: undefined,
+	username: undefined,
+	host: '',
+});
 
 const router = useRouter();
-
 const key = ref(0);
-const searchQuery = ref('');
-const searchOrigin = ref('combined');
-const notePagination = ref();
-const user = ref<any>(null);
-const isLocalOnly = ref(false);
+const searchQuery = ref(toRef(props, 'query').value);
+const notePagination = ref<Paging>();
+const user = ref<UserDetailed | null>(null);
+const hostInput = ref(toRef(props, 'host').value);
 
-function selectUser() {
-	os.selectUser({ includeSelf: true }).then(_user => {
+const noteSearchableScope = instance.noteSearchableScope ?? 'local';
+
+const hostSelect = ref<'all' | 'local' | 'specified'>('all');
+
+const setHostSelectWithInput = (after:string|undefined|null, before:string|undefined|null) => {
+	if (before === after) return;
+	if (after === '') hostSelect.value = 'all';
+	else hostSelect.value = 'specified';
+};
+
+setHostSelectWithInput(hostInput.value, undefined);
+
+watch(hostInput, setHostSelectWithInput);
+
+const searchHost = computed(() => {
+	if (hostSelect.value === 'local') return '.';
+	if (hostSelect.value === 'specified') return hostInput.value;
+	return null;
+});
+
+if (props.userId != null) {
+	misskeyApi('users/show', { userId: props.userId }).then(_user => {
 		user.value = _user;
 	});
+} else if (props.username != null) {
+	misskeyApi('users/show', {
+		username: props.username,
+		...(props.host != null && props.host !== '') ? { host: props.host } : {},
+	}).then(_user => {
+		user.value = _user;
+	});
+}
+
+function selectUser() {
+	os.selectUser({ includeSelf: true, localOnly: instance.noteSearchableScope === 'local' }).then(_user => {
+		user.value = _user;
+		hostInput.value = _user.host ?? '';
+	});
+}
+
+function selectSelf() {
+	user.value = $i as UserDetailed | null;
+	hostInput.value = null;
+}
+
+function removeUser() {
+	user.value = null;
+	hostInput.value = '';
 }
 
 async function search() {
@@ -74,6 +142,7 @@ async function search() {
 
 	if (query == null || query === '') return;
 
+	//#region AP lookup
 	if (query.startsWith('https://')) {
 		const promise = misskeyApi('ap/show', {
 			uri: query,
@@ -91,6 +160,7 @@ async function search() {
 
 		return;
 	}
+	//#endregion
 
 	notePagination.value = {
 		endpoint: 'notes/search',
@@ -98,11 +168,49 @@ async function search() {
 		params: {
 			query: searchQuery.value,
 			userId: user.value ? user.value.id : null,
+			...(searchHost.value ? { host: searchHost.value } : {}),
 		},
 	};
 
-	if (isLocalOnly.value) notePagination.value.params.host = '.';
-
 	key.value++;
 }
 </script>
+<style lang="scss" module>
+.userItem {
+	display: flex;
+	justify-content: center;
+}
+.addMeButton {
+  border: 2px dashed var(--fgTransparent);
+	padding: 12px;
+	margin-right: 16px;
+}
+.addUserButton {
+  border: 2px dashed var(--fgTransparent);
+	padding: 12px;
+	flex-grow: 1;
+}
+.addUserButtonInner {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: space-between;
+	min-height: 38px;
+}
+.userCard {
+	flex-grow: 1;
+}
+.remove {
+	width: 32px;
+	height: 32px;
+	align-self: center;
+
+	& > i:before {
+		color: #ff2a2a;
+	}
+
+	&:disabled {
+		opacity: 0;
+	}
+}
+</style>
diff --git a/packages/frontend/src/pages/search.stories.impl.ts b/packages/frontend/src/pages/search.stories.impl.ts
new file mode 100644
index 0000000000..0110a7ab8e
--- /dev/null
+++ b/packages/frontend/src/pages/search.stories.impl.ts
@@ -0,0 +1,88 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { StoryObj } from '@storybook/vue3';
+import { HttpResponse, http } from 'msw';
+import search_ from './search.vue';
+import { userDetailed } from '@/../.storybook/fakes.js';
+import { commonHandlers } from '@/../.storybook/mocks.js';
+
+const localUser = userDetailed('someuserid', 'miskist', null, 'Local Misskey User');
+
+export const Default = {
+	render(args) {
+		return {
+			components: {
+				search_,
+			},
+			setup() {
+				return {
+					args,
+				};
+			},
+			computed: {
+				props() {
+					return {
+						...this.args,
+					};
+				},
+			},
+			template: '<search_ v-bind="props" />',
+		};
+	},
+	args: {
+		ignoreNotesSearchAvailable: true,
+	},
+	parameters: {
+		layout: 'fullscreen',
+		msw: {
+			handlers: [
+				...commonHandlers,
+				http.post('/api/users/show', () => {
+					return HttpResponse.json(userDetailed());
+				}),
+				http.post('/api/users/search', () => {
+					return HttpResponse.json([userDetailed(), localUser]);
+				}),
+			],
+		},
+	},
+} satisfies StoryObj<typeof search_>;
+
+export const NoteSearchDisabled = {
+	...Default,
+	args: {},
+} satisfies StoryObj<typeof search_>;
+
+export const WithUsernameLocal = {
+	...Default,
+
+	args: {
+		...Default.args,
+		username: localUser.username,
+		host: localUser.host,
+	},
+	parameters: {
+		layout: 'fullscreen',
+		msw: {
+			handlers: [
+				...commonHandlers,
+				http.post('/api/users/show', () => {
+					return HttpResponse.json(localUser);
+				}),
+				http.post('/api/users/search', () => {
+					return HttpResponse.json([userDetailed(), localUser]);
+				}),
+			],
+		},
+	},
+} satisfies StoryObj<typeof search_>;
+
+export const WithUserType = {
+	...Default,
+	args: {
+		type: 'user',
+	},
+} satisfies StoryObj<typeof search_>;
diff --git a/packages/frontend/src/pages/search.user.vue b/packages/frontend/src/pages/search.user.vue
index b9c2704bc7..85d869d9cb 100644
--- a/packages/frontend/src/pages/search.user.vue
+++ b/packages/frontend/src/pages/search.user.vue
@@ -25,7 +25,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { ref, toRef } from 'vue';
+import type { Endpoints } from 'misskey-js';
+import type { Paging } from '@/components/MkPagination.vue';
 import MkUserList from '@/components/MkUserList.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkRadios from '@/components/MkRadios.vue';
@@ -36,18 +38,27 @@ import MkFoldableSection from '@/components/MkFoldableSection.vue';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { useRouter } from '@/router/supplier.js';
 
+const props = withDefaults(defineProps<{
+	query?: string,
+	origin?: Endpoints['users/search']['req']['origin'],
+}>(), {
+	query: '',
+	origin: 'combined',
+});
+
 const router = useRouter();
 
 const key = ref('');
-const searchQuery = ref('');
-const searchOrigin = ref('combined');
-const userPagination = ref();
+const searchQuery = ref(toRef(props, 'query').value);
+const searchOrigin = ref(toRef(props, 'origin').value);
+const userPagination = ref<Paging>();
 
 async function search() {
 	const query = searchQuery.value.toString().trim();
 
 	if (query == null || query === '') return;
 
+	//#region AP lookup
 	if (query.startsWith('https://')) {
 		const promise = misskeyApi('ap/show', {
 			uri: query,
@@ -65,6 +76,7 @@ async function search() {
 
 		return;
 	}
+	//#endregion
 
 	userPagination.value = {
 		endpoint: 'users/search',
diff --git a/packages/frontend/src/pages/search.vue b/packages/frontend/src/pages/search.vue
index a3dcda77be..38d7548fa8 100644
--- a/packages/frontend/src/pages/search.vue
+++ b/packages/frontend/src/pages/search.vue
@@ -9,8 +9,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 	<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
 		<MkSpacer v-if="tab === 'note'" key="note" :contentMax="800">
-			<div v-if="notesSearchAvailable">
-				<XNote/>
+			<div v-if="notesSearchAvailable || ignoreNotesSearchAvailable">
+				<XNote v-bind="props"/>
 			</div>
 			<div v-else>
 				<MkInfo warn>{{ i18n.ts.notesSearchNotAvailable }}</MkInfo>
@@ -18,27 +18,43 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</MkSpacer>
 
 		<MkSpacer v-else-if="tab === 'user'" key="user" :contentMax="800">
-			<XUser/>
+			<XUser v-bind="props"/>
 		</MkSpacer>
 	</MkHorizontalSwipe>
 </MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent, ref } from 'vue';
+import { computed, defineAsyncComponent, ref, toRef } from 'vue';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
-import { $i } from '@/account.js';
-import { instance } from '@/instance.js';
+import { notesSearchAvailable } from '@/scripts/check-permissions.js';
 import MkInfo from '@/components/MkInfo.vue';
 import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 
+const props = withDefaults(defineProps<{
+	query?: string,
+	userId?: string,
+	username?: string,
+	host?: string | null,
+	type?: 'note' | 'user',
+	origin?: 'combined' | 'local' | 'remote',
+	// For storybook only
+	ignoreNotesSearchAvailable?: boolean,
+}>(), {
+	query: '',
+	userId: undefined,
+	username: undefined,
+	host: undefined,
+	type: 'note',
+	origin: 'combined',
+	ignoreNotesSearchAvailable: false,
+});
+
 const XNote = defineAsyncComponent(() => import('./search.note.vue'));
 const XUser = defineAsyncComponent(() => import('./search.user.vue'));
 
-const tab = ref('note');
-
-const notesSearchAvailable = (($i == null && instance.policies.canSearchNotes) || ($i != null && $i.policies.canSearchNotes));
+const tab = ref(toRef(props, 'type').value);
 
 const headerActions = computed(() => []);
 
diff --git a/packages/frontend/src/router/definition.ts b/packages/frontend/src/router/definition.ts
index f7a219c57e..995a2055b8 100644
--- a/packages/frontend/src/router/definition.ts
+++ b/packages/frontend/src/router/definition.ts
@@ -232,6 +232,9 @@ const routes: RouteDef[] = [{
 	component: page(() => import('@/pages/search.vue')),
 	query: {
 		q: 'query',
+		userId: 'userId',
+		username: 'username',
+		host: 'host',
 		channel: 'channel',
 		type: 'type',
 		origin: 'origin',
diff --git a/packages/frontend/src/scripts/check-permissions.ts b/packages/frontend/src/scripts/check-permissions.ts
new file mode 100644
index 0000000000..ed86529d5b
--- /dev/null
+++ b/packages/frontend/src/scripts/check-permissions.ts
@@ -0,0 +1,19 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { instance } from '@/instance.js';
+import { $i } from '@/account.js';
+
+export const notesSearchAvailable = (
+	// FIXME: instance.policies would be null in Vitest
+	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+	($i == null && instance.policies != null && instance.policies.canSearchNotes) ||
+	($i != null && $i.policies.canSearchNotes) ||
+	false
+) as boolean;
+
+export const canSearchNonLocalNotes = (
+	instance.noteSearchableScope === 'global'
+);
diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts
index dacafb859f..e9e7ae771d 100644
--- a/packages/frontend/src/scripts/get-user-menu.ts
+++ b/packages/frontend/src/scripts/get-user-menu.ts
@@ -13,6 +13,7 @@ import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { defaultStore, userActions } from '@/store.js';
 import { $i, iAmModerator } from '@/account.js';
+import { notesSearchAvailable, canSearchNonLocalNotes } from '@/scripts/check-permissions.js';
 import { IRouter } from '@/nirax.js';
 import { antennasCache, rolesCache, userListsCache } from '@/cache.js';
 import { mainRouter } from '@/router/main.js';
@@ -160,7 +161,14 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
 		action: () => {
 			copyToClipboard(`@${user.username}@${user.host ?? host}`);
 		},
-	}, ...(iAmModerator ? [{
+	}, ...( notesSearchAvailable && (user.host == null || canSearchNonLocalNotes) ? [{
+		icon: 'ti ti-search',
+		text: i18n.ts.searchThisUsersNotes,
+		action: () => {
+			router.push(`/search?username=${encodeURIComponent(user.username)}${user.host != null ? '&host=' + encodeURIComponent(user.host) : ''}`);
+		},
+	}] : [])
+	, ...(iAmModerator ? [{
 		icon: 'ti ti-user-exclamation',
 		text: i18n.ts.moderation,
 		action: () => {
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 4cfe92147a..cb7d82d2d8 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4939,6 +4939,11 @@ export type components = {
       serverRules: string[];
       themeColor: string | null;
       policies: components['schemas']['RolePolicies'];
+      /**
+       * @default local
+       * @enum {string}
+       */
+      noteSearchableScope: 'local' | 'global';
     };
     MetaDetailedOnly: {
       features?: {

From 7135da7887abeab88789235f715d0396c87d99cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 30 Jul 2024 16:16:20 +0900
Subject: [PATCH 121/221] refactor(actions): remove duplicated paths

---
 .github/workflows/get-api-diff.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/get-api-diff.yml b/.github/workflows/get-api-diff.yml
index af0ab8dde4..81e8134fb7 100644
--- a/.github/workflows/get-api-diff.yml
+++ b/.github/workflows/get-api-diff.yml
@@ -9,7 +9,6 @@ on:
     paths:
       - packages/backend/**
       - .github/workflows/get-api-diff.yml
-      - .github/workflows/get-api-diff.yml
 jobs:
   get-from-misskey:
     runs-on: ubuntu-latest

From 6bd46e790beb8f5afedbd2c4599d6aa918e05a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 30 Jul 2024 16:18:18 +0900
Subject: [PATCH 122/221] refactor(backend): remove unrelated comments

---
 packages/backend/src/const.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/backend/src/const.ts b/packages/backend/src/const.ts
index 4dc689238b..a238f4973a 100644
--- a/packages/backend/src/const.ts
+++ b/packages/backend/src/const.ts
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-// dummy
 export const MAX_NOTE_TEXT_LENGTH = 3000;
 
 export const USER_ONLINE_THRESHOLD = 1000 * 60 * 10; // 10min

From b359e3c95beee5acd1d32abee112f34ec602bcee Mon Sep 17 00:00:00 2001
From: taichan <40626578+tai-cha@users.noreply.github.com>
Date: Tue, 30 Jul 2024 16:51:50 +0900
Subject: [PATCH 123/221] Fix condition of noteSearchableScope (#14325)

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

diff --git a/packages/backend/src/core/entities/MetaEntityService.ts b/packages/backend/src/core/entities/MetaEntityService.ts
index bcfd8ae41c..44ec0d6a7b 100644
--- a/packages/backend/src/core/entities/MetaEntityService.ts
+++ b/packages/backend/src/core/entities/MetaEntityService.ts
@@ -128,7 +128,7 @@ export class MetaEntityService {
 
 			mediaProxy: this.config.mediaProxy,
 			enableUrlPreview: instance.urlPreviewEnabled,
-			noteSearchableScope: this.config.meilisearch == null || this.config.meilisearch.scope === 'local' ? 'local' : 'global',
+			noteSearchableScope: (this.config.meilisearch == null || this.config.meilisearch.scope !== 'local') ? 'global' : 'local',
 		};
 
 		return packed;

From f0ec68c3cf0381acb518f5518b4f30c123cd1815 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 30 Jul 2024 16:56:07 +0900
Subject: [PATCH 124/221] :art:

---
 packages/frontend/src/components/MkSystemWebhookEditor.vue | 1 +
 packages/frontend/src/pages/emoji-edit-dialog.vue          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/frontend/src/components/MkSystemWebhookEditor.vue b/packages/frontend/src/components/MkSystemWebhookEditor.vue
index f6ce2ccc9f..a141b4ff74 100644
--- a/packages/frontend/src/components/MkSystemWebhookEditor.vue
+++ b/packages/frontend/src/components/MkSystemWebhookEditor.vue
@@ -230,6 +230,7 @@ onMounted(async () => {
 	left: 0;
 	padding: 12px;
 	border-top: solid 0.5px var(--divider);
+	background: var(--acrylicBg);
 	-webkit-backdrop-filter: var(--blur, blur(15px));
 	backdrop-filter: var(--blur, blur(15px));
 }
diff --git a/packages/frontend/src/pages/emoji-edit-dialog.vue b/packages/frontend/src/pages/emoji-edit-dialog.vue
index 16769ef360..d0a6bba47b 100644
--- a/packages/frontend/src/pages/emoji-edit-dialog.vue
+++ b/packages/frontend/src/pages/emoji-edit-dialog.vue
@@ -243,6 +243,7 @@ async function del() {
 	left: 0;
 	padding: 12px;
 	border-top: solid 0.5px var(--divider);
+	background: var(--acrylicBg);
 	-webkit-backdrop-filter: var(--blur, blur(15px));
 	backdrop-filter: var(--blur, blur(15px));
 }

From cb3106cdc6ed6598736aae2273f116a9c01cfeb8 Mon Sep 17 00:00:00 2001
From: taichan <40626578+tai-cha@users.noreply.github.com>
Date: Tue, 30 Jul 2024 16:57:41 +0900
Subject: [PATCH 125/221] =?UTF-8?q?enhance(frontend):=20=E9=80=A3=E5=90=88?=
 =?UTF-8?q?=E3=81=AE=E3=80=8C=E9=80=A3=E5=90=88=E4=B8=AD=E3=80=8D,?=
 =?UTF-8?q?=E3=80=8C=E8=B3=BC=E8=AA=AD=E4=B8=AD=E3=80=8D,=E3=80=8C?=
 =?UTF-8?q?=E9=85=8D=E4=BF=A1=E4=B8=AD=E3=80=8D=E3=81=AB=E5=AF=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E3=83=96=E3=83=AD=E3=83=83=E3=82=AF=E3=81=97=E3=81=A6?=
 =?UTF-8?q?=E3=81=84=E3=82=8B=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC=E3=80=81?=
 =?UTF-8?q?=E9=85=8D=E4=BF=A1=E5=81=9C=E6=AD=A2=E3=81=97=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=82=8B=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC=E3=82=92=E5=90=AB?=
 =?UTF-8?q?=E3=82=81=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=20(#1432?=
 =?UTF-8?q?4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance(frontend): 連合の「連合中」,「購読中」,「配信中」に対してブロックしているサーバー、配信停止しているサーバーを含めないように

* update CHANGELOG.md
---
 CHANGELOG.md                                     | 1 +
 packages/frontend/src/pages/about.federation.vue | 6 +++---
 packages/frontend/src/pages/admin/federation.vue | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f58bec42e6..527c0e0b6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
   (Cherry-picked from https://github.com/nafu-at/misskey/commit/b89c2af6945c6a9f9f10e83f54d2bcf0f240b0b4, https://github.com/nafu-at/misskey/commit/8a7d710c6acb83f50c83f050bd1423c764d60a99)
 - Enhance: デッキのアンテナ・リスト選択画面からそれぞれを新規作成できるように
 - Enhance: ブラウザのコンテキストメニューを使用できるように
+- Enhance: 連合の「連合中」,「購読中」,「配信中」に対してブロックしているサーバー、配信停止しているサーバーを含めないように
 - Fix: `/about#federation` ページなどで各インスタンスのチャートが表示されなくなっていた問題を修正
 - Fix: ユーザーページの追加情報のラベルを投稿者のサーバーの絵文字で表示する (#13968)
 - Fix: リバーシの対局を正しく共有できないことがある問題を修正
diff --git a/packages/frontend/src/pages/about.federation.vue b/packages/frontend/src/pages/about.federation.vue
index 24e96b4f4e..b3776c67e6 100644
--- a/packages/frontend/src/pages/about.federation.vue
+++ b/packages/frontend/src/pages/about.federation.vue
@@ -71,9 +71,9 @@ const pagination = {
 		sort: sort.value,
 		host: host.value !== '' ? host.value : null,
 		...(
-			state.value === 'federating' ? { federating: true } :
-			state.value === 'subscribing' ? { subscribing: true } :
-			state.value === 'publishing' ? { publishing: true } :
+			state.value === 'federating' ? { federating: true, suspended: false, blocked: false } :
+			state.value === 'subscribing' ? { subscribing: true, suspended: false, blocked: false } :
+			state.value === 'publishing' ? { publishing: true, suspended: false, blocked: false } :
 			state.value === 'suspended' ? { suspended: true } :
 			state.value === 'blocked' ? { blocked: true } :
 			state.value === 'silenced' ? { silenced: true } :
diff --git a/packages/frontend/src/pages/admin/federation.vue b/packages/frontend/src/pages/admin/federation.vue
index 0aaa398584..debf684c9b 100644
--- a/packages/frontend/src/pages/admin/federation.vue
+++ b/packages/frontend/src/pages/admin/federation.vue
@@ -80,9 +80,9 @@ const pagination = {
 		sort: sort.value,
 		host: host.value !== '' ? host.value : null,
 		...(
-			state.value === 'federating' ? { federating: true } :
-			state.value === 'subscribing' ? { subscribing: true } :
-			state.value === 'publishing' ? { publishing: true } :
+			state.value === 'federating' ? { federating: true, suspended: false, blocked: false } :
+			state.value === 'subscribing' ? { subscribing: true, suspended: false, blocked: false } :
+			state.value === 'publishing' ? { publishing: true, suspended: false, blocked: false } :
 			state.value === 'suspended' ? { suspended: true } :
 			state.value === 'blocked' ? { blocked: true } :
 			state.value === 'silenced' ? { silenced: true } :

From f965f65dcd03fe93042d90a25fb3ad54b07baf4f Mon Sep 17 00:00:00 2001
From: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
Date: Tue, 30 Jul 2024 17:23:29 +0900
Subject: [PATCH 126/221] fix(frontend): pure renote cannot create with url
 based quote (#14270)

* fix(frontend): pure renote cannot create with url based quote

* docs(changelog): update changelog
---
 CHANGELOG.md                                    | 1 +
 packages/frontend/src/components/MkPostForm.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 527c0e0b6b..0d7f50519a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,7 @@
 - Fix: ダイレクト投稿の"削除して編集"において、宛先が保持されていなかった問題を修正
 - Fix: 投稿フォームへのURL貼り付けによる引用が下書きに保存されていなかった問題を修正
 - Fix: "削除して編集"や下書きにおいて、リアクションの受け入れ設定が保持/保存されていなかった問題を修正
+- Fix: 投稿フォームにノートのURLを貼り付けて"引用として添付"した場合、投稿文を空にすることによるRenote化が出来なかった問題を修正
 
 ### Server
 - Feat: レートリミット制限に引っかかったときに`Retry-After`ヘッダーを返すように (#13949)
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 64ad60ae85..fa3e2b90b0 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -259,7 +259,7 @@ const canPost = computed((): boolean => {
 			1 <= files.value.length ||
 			poll.value != null ||
 			props.renote != null ||
-			(props.reply != null && quoteId.value != null)
+			quoteId.value != null
 		) &&
 		(textLength.value <= maxTextLength.value) &&
 		(!poll.value || poll.value.choices.length >= 2);

From 3548ffba26a23537772f6d91bd48830266a41dde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 30 Jul 2024 17:24:36 +0900
Subject: [PATCH 127/221] =?UTF-8?q?enhance(frontend):=20=E8=87=AA=E5=88=86?=
 =?UTF-8?q?=E3=81=AE=E3=82=AF=E3=83=AA=E3=83=83=E3=83=97=E4=B8=80=E8=A6=A7?=
 =?UTF-8?q?=E3=81=A7=E3=81=AF=E3=82=A2=E3=83=90=E3=82=BF=E3=83=BC=E3=82=92?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=20(#14256)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance(frontend): 自分のクリップ一覧ではアバターを表示しないように

* Update Changelog

* rename

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
 .../components/MkClipPreview.stories.impl.ts    |  1 +
 .../frontend/src/components/MkClipPreview.vue   | 17 +++++++++++------
 packages/frontend/src/pages/my-clips/index.vue  |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/frontend/src/components/MkClipPreview.stories.impl.ts b/packages/frontend/src/components/MkClipPreview.stories.impl.ts
index 1011254e7a..62503fb98a 100644
--- a/packages/frontend/src/components/MkClipPreview.stories.impl.ts
+++ b/packages/frontend/src/components/MkClipPreview.stories.impl.ts
@@ -31,6 +31,7 @@ export const Default = {
 	},
 	args: {
 		clip: clip(),
+		noUserInfo: false,
 	},
 	parameters: {
 		layout: 'fullscreen',
diff --git a/packages/frontend/src/components/MkClipPreview.vue b/packages/frontend/src/components/MkClipPreview.vue
index 2e9a172c23..dd550733cb 100644
--- a/packages/frontend/src/components/MkClipPreview.vue
+++ b/packages/frontend/src/components/MkClipPreview.vue
@@ -12,10 +12,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<div v-if="clip.lastClippedAt">{{ i18n.ts.updatedAt }}: <MkTime :time="clip.lastClippedAt" mode="detail"/></div>
 			<div v-if="clip.notesCount != null">{{ i18n.ts.notesCount }}: {{ number(clip.notesCount) }} / {{ $i?.policies.noteEachClipsLimit }} ({{ i18n.tsx.remainingN({ n: remaining }) }})</div>
 		</div>
-		<div :class="$style.divider"></div>
-		<div>
-			<MkAvatar :user="clip.user" :class="$style.userAvatar" indicator link preview/> <MkUserName :user="clip.user" :nowrap="false"/>
-		</div>
+		<template v-if="!props.noUserInfo">
+			<div :class="$style.divider"></div>
+			<div>
+				<MkAvatar :user="clip.user" :class="$style.userAvatar" indicator link preview/> <MkUserName :user="clip.user" :nowrap="false"/>
+			</div>
+		</template>
 	</div>
 </MkA>
 </template>
@@ -27,9 +29,12 @@ import { i18n } from '@/i18n.js';
 import { $i } from '@/account.js';
 import number from '@/filters/number.js';
 
-const props = defineProps<{
+const props = withDefaults(defineProps<{
 	clip: Misskey.entities.Clip;
-}>();
+	noUserInfo?: boolean;
+}>(), {
+	noUserInfo: false,
+});
 
 const remaining = computed(() => {
 	return ($i?.policies && props.clip.notesCount != null) ? ($i.policies.noteEachClipsLimit - props.clip.notesCount) : i18n.ts.unknown;
diff --git a/packages/frontend/src/pages/my-clips/index.vue b/packages/frontend/src/pages/my-clips/index.vue
index 1a0d7177fc..ece998a7a5 100644
--- a/packages/frontend/src/pages/my-clips/index.vue
+++ b/packages/frontend/src/pages/my-clips/index.vue
@@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<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">
-					<MkClipPreview v-for="item in items" :key="item.id" :clip="item"/>
+					<MkClipPreview v-for="item in items" :key="item.id" :clip="item" :noUserInfo="true"/>
 				</MkPagination>
 			</div>
 			<div v-else-if="tab === 'favorites'" key="favorites" class="_gaps">

From 9181eb277ea2a04a52eb53e8e3a81c8de9bbbce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 30 Jul 2024 17:28:08 +0900
Subject: [PATCH 128/221] =?UTF-8?q?fix(frontend):=20emojiPicker=E3=82=92?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=97=E3=81=A6=E7=B5=B5=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E3=82=92=E6=8C=BF=E5=85=A5=E3=81=99=E3=82=8B=E9=9A=9B=E3=80=81?=
 =?UTF-8?q?ref=E3=81=AB=E7=9B=B4=E6=8E=A5=E6=8C=BF=E5=85=A5=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(#14282)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): emojiPickerを使用して絵文字を挿入する際、refに直接挿入するように

* add comment
---
 packages/frontend/src/components/MkPostForm.vue | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index fa3e2b90b0..51ec941c97 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -906,10 +906,23 @@ async function insertEmoji(ev: MouseEvent) {
 	textAreaReadOnly.value = true;
 	const target = ev.currentTarget ?? ev.target;
 	if (target == null) return;
+
+	// emojiPickerはダイアログが閉じずにtextareaとやりとりするので、
+	// focustrapをかけているとinsertTextAtCursorが効かない
+	// そのため、投稿フォームのテキストに直接注入する
+	// See: https://github.com/misskey-dev/misskey/pull/14282
+	//      https://github.com/misskey-dev/misskey/issues/14274
+
+	let pos = textareaEl.value?.selectionStart ?? 0;
+	let posEnd = textareaEl.value?.selectionEnd ?? text.value.length;
 	emojiPicker.show(
 		target as HTMLElement,
 		emoji => {
-			insertTextAtCursor(textareaEl.value, emoji);
+			const textBefore = text.value.substring(0, pos);
+			const textAfter = text.value.substring(posEnd);
+			text.value = textBefore + emoji + textAfter;
+			pos += emoji.length;
+			posEnd += emoji.length;
 		},
 		() => {
 			textAreaReadOnly.value = false;

From d1eb10af24b930c68c2e89f649da1a57217d1b41 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 30 Jul 2024 17:28:28 +0900
Subject: [PATCH 129/221] New Crowdin updates (#14316)

* 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 Simplified)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (English)

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

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

* New translations ja-jp.yml (Chinese Simplified)
---
 locales/en-US.yml |   2 +-
 locales/ko-KR.yml |   9 ++++
 locales/th-TH.yml | 131 +++++++++++++++++++++++-----------------------
 locales/zh-CN.yml |  14 +++++
 locales/zh-TW.yml |  12 +++++
 5 files changed, 102 insertions(+), 66 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index b751b039e6..95227357d7 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1384,7 +1384,7 @@ _serverSettings:
   fanoutTimelineDescription: "Greatly increases performance of timeline retrieval and reduces load on the database when enabled. In exchange, memory usage of Redis will increase. Consider disabling this in case of low server memory or server instability."
   fanoutTimelineDbFallback: "Fallback to database"
   fanoutTimelineDbFallbackDescription: "When enabled, the timeline will fall back to the database for additional queries if the timeline is not cached. Disabling it further reduces the server load by eliminating the fallback process, but limits the range of timelines that can be retrieved."
-  inquiryUrl: "Query URL"
+  inquiryUrl: "Inquiry URL"
   inquiryUrlDescription: "Specify a URL for the inquiry form to the server maintainer or a web page for the contact information."
 _accountMigration:
   moveFrom: "Migrate another account to this one"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index e3b6d31910..7fcb681c9a 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -180,6 +180,10 @@ addAccount: "계정 추가"
 reloadAccountsList: "계정 목록 새로고침"
 loginFailed: "로그인에 실패했습니다"
 showOnRemote: "리모트에서 보기"
+continueOnRemote: "리모트에서 계속"
+chooseServerOnMisskeyHub: "Misskey Hub에서 서버 찾아보기"
+specifyServerHost: "서버 도메인 직접 지정"
+inputHostName: "도메인을 입력하세요"
 general: "일반"
 wallpaper: "배경"
 setWallpaper: "배경 설정"
@@ -477,6 +481,7 @@ noMessagesYet: "아직 대화가 없습니다"
 newMessageExists: "새 메시지가 있습니다"
 onlyOneFileCanBeAttached: "메시지에 첨부할 수 있는 파일은 하나까지입니다"
 signinRequired: "진행하기 전에 로그인을 해 주세요"
+signinOrContinueOnRemote: "계속하려면 사용하는 서버로 이동하거나 이 서버에 로그인해야 합니다."
 invitations: "초대"
 invitationCode: "초대 코드"
 checking: "확인하는 중입니다"
@@ -1242,6 +1247,8 @@ keepOriginalFilenameDescription: "이 설정을 끄면 업로드를 할 때 파
 noDescription: "설명문이 없습니다"
 alwaysConfirmFollow: "팔로우일 때 항상 확인하기"
 inquiry: "문의하기"
+tryAgain: "다시 시도해 주세요."
+confirmWhenRevealingSensitiveMedia: "민감한 미디어를 열 때 두 번 확인"
 _delivery:
   status: "전송 상태"
   stop: "정지됨"
@@ -1694,6 +1701,7 @@ _role:
     canManageAvatarDecorations: "아바타 꾸미기 관리"
     driveCapacity: "드라이브 용량"
     alwaysMarkNsfw: "파일을 항상 NSFW로 지정"
+    canUpdateBioMedia: "아바타 및 배너 이미지 변경 허용"
     pinMax: "고정할 수 있는 노트 수"
     antennaMax: "만들 수 있는 안테나 수"
     wordMuteMax: "단어 뮤트할 수 있는 문자 수"
@@ -2416,6 +2424,7 @@ _webhookSettings:
   _systemEvents:
     abuseReport: "유저로부터 신고를 받았을 때"
     abuseReportResolved: "받은 신고를 처리했을 때"
+    userCreated: "유저가 생성되었을 때"
   deleteConfirm: "Webhook을 삭제할까요?"
 _abuseReport:
   _notificationRecipient:
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index 117920e88d..eb7cdc2365 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -443,7 +443,7 @@ moderator: "ผู้ควบคุม"
 moderation: "การกลั่นกรอง"
 moderationNote: "โน้ตการกลั่นกรอง"
 addModerationNote: "เพิ่มโน้ตการกลั่นกรอง"
-moderationLogs: "ปูมการแก้ไข"
+moderationLogs: "ปูมการควบคุมดูแล"
 nUsersMentioned: "กล่าวถึงโดยผู้ใช้ {n} ราย"
 securityKeyAndPasskey: "ความปลอดภัยและรหัสผ่าน"
 securityKey: "กุญแจความปลอดภัย"
@@ -509,7 +509,7 @@ showReactionsCount: "แสดงจำนวนรีแอกชั่นใ
 noHistory: "ไม่มีประวัติ"
 signinHistory: "ประวัติการเข้าสู่ระบบ"
 enableAdvancedMfm: "เปิดใช้งาน MFM ขั้นสูง"
-enableAnimatedMfm: "เปิดการใช้งาน MFM ด้วยแอนิเมชั่น"
+enableAnimatedMfm: "เปิดการใช้งาน MFM แบบเคลื่อนไหว"
 doing: "กำลังประมวลผล......"
 category: "หมวดหมู่"
 tags: "นามแฝง"
@@ -625,7 +625,7 @@ enablePlayer: "เปิดเครื่องเล่นวิดีโอ"
 disablePlayer: "ปิดเครื่องเล่นวิดีโอ"
 expandTweet: "ขยายทวีต"
 themeEditor: "ตัวแก้ไขธีม"
-description: "รายละเอียด"
+description: "คำอธิบาย"
 describeFile: "เพิ่มแคปชั่น"
 enterFileDescription: "ใส่แคปชั่น"
 author: "ผู้เขียน"
@@ -666,7 +666,7 @@ smtpSecure: "ใช้โดยนัย SSL/TLS สำหรับการเ
 smtpSecureInfo: "ปิดสิ่งนี้เมื่อใช้ STARTTLS"
 testEmail: "ทดสอบการส่งอีเมล"
 wordMute: "ปิดเสียงคำ"
-hardWordMute: "ปิดเสียงคำยาก"
+hardWordMute: "ปิดเสียงคำแบบแข็งโป๊ก"
 regexpError: "เกิดข้อผิดพลาดใน regular expression"
 regexpErrorDescription: "เกิดข้อผิดพลาดใน regular expression บรรทัดที่ {line} ของการปิดเสียงคำ {tab} :"
 instanceMute: "ปิดเสียงเซิร์ฟเวอร์"
@@ -1034,7 +1034,7 @@ thisPostMayBeAnnoyingIgnore: "โพสต์ยังไงก็แล้ว
 collapseRenotes: "ยุบรีโน้ตที่คุณเคยเห็นแล้ว"
 collapseRenotesDescription: "พับย่อโน้ตที่เคยตอบสนองหรือรีโน้ตแล้ว"
 internalServerError: "เซิร์ฟเวอร์ภายในเกิดข้อผิดพลาด"
-internalServerErrorDescription: "เซิร์ฟเวอร์รันค้นพบข้อผิดพลาดที่ไม่คาดคิด"
+internalServerErrorDescription: "เกิดข้อผิดพลาดที่ไม่คาดคิดภายในเซิร์ฟเวอร์"
 copyErrorInfo: "คัดลอกรายละเอียดข้อผิดพลาด"
 joinThisServer: "ลงทะเบียนบนเซิร์ฟเวอร์นี้"
 exploreOtherServers: "มองหาเซิร์ฟเวอร์อื่น"
@@ -1042,7 +1042,7 @@ letsLookAtTimeline: "มาดูไทม์ไลน์กัน"
 disableFederationConfirm: "ปิดใช้งานสหพันธ์เลยใช่ไหม?"
 disableFederationConfirmWarn: "โพสต์จะยังคงเป็นสาธารณะต่อไป เว้นแต่จะตั้งค่าเป็นอย่างอื่น"
 disableFederationOk: "ปิดการใช้งาน"
-invitationRequiredToRegister: "ขณะนี้เซิร์ฟเวอร์นี้เปิดรับสมาชิกใหม่ผ่านระบบเชิญเท่านั้น ผู้ที่มีรหัสเชิญสามารถลงทะเบียนได้"
+invitationRequiredToRegister: "เซิร์ฟเวอร์นี้เป็นแบบรับเชิญ เฉพาะผู้มีรหัสเชิญเท่านั้นถึงสามารถลงทะเบียนได้"
 emailNotSupported: "เซิร์ฟเวอร์นี้ไม่รองรับการส่งอีเมล"
 postToTheChannel: "โพสต์ลงช่อง"
 cannotBeChangedLater: "สิ่งนี้ไม่สามารถเปลี่ยนแปลงได้ในภายหลังนะ"
@@ -1052,7 +1052,7 @@ likeOnlyForRemote: "ทั้งหมด (เฉพาะการถูกใ
 nonSensitiveOnly: "เฉพาะไม่มีเนื้อหาละเอียดอ่อน"
 nonSensitiveOnlyForLocalLikeOnlyForRemote: "เฉพาะไม่มีเนื้อหาละเอียดอ่อน (เฉพาะการถูกใจจากระยะไกลเท่านั้น)"
 rolesAssignedToMe: "บทบาทที่ได้รับมอบหมายให้ฉัน"
-resetPasswordConfirm: "รีเซ็ตรหัสผ่านของคุณจริงๆหรอ?"
+resetPasswordConfirm: "ต้องการรีเซ็ตรหัสผ่านใช่ไหม?"
 sensitiveWords: "คำที่มีเนื้อหาละเอียดอ่อน"
 sensitiveWordsDescription: "โน้ตที่มีคำที่ระบุไว้จะถูกตั้งค่าการมองเห็นของให้แสดงเฉพาะในหน้าหลักเท่านั้น คั่นคำด้วยการขึ้นบรรทัดใหม่"
 sensitiveWordsDescription2: "ถ้าแยกด้วยเว้นวรรคจะเป็นการระบุ AND และถ้าล้อมคำด้วยสแลช (/) จะเป็นการใช้ regular expression"
@@ -1169,7 +1169,7 @@ notifyNotes: "แจ้งเตือนเกี่ยวกับโพสต
 unnotifyNotes: "หยุดการแจ้งเตือนเกี่ยวกับโน้ตใหม่"
 authentication: "การตรวจสอบสิทธิ์"
 authenticationRequiredToContinue: "กรุณายืนยันตัวตนทางอิเล็กทรอนิกส์เพื่อดำเนินการต่อ"
-dateAndTime: "เวลาประทับ"
+dateAndTime: "วันเวลา"
 showRenotes: "แสดงรีโน้ต"
 edited: "แก้ไขแล้ว"
 notificationRecieveConfig: "การตั้งค่าการแจ้งเตือน"
@@ -1184,7 +1184,7 @@ confirmShowRepliesAll: "การดำเนินการนี้ไม่
 confirmHideRepliesAll: "การดำเนินการนี้ไม่สามารถย้อนกลับได้ คุณต้องการซ่อนการตอบกลับผู้อื่นจากผู้ใช้ทุกคนที่คุณติดตามอยู่ ไปจากไทม์ไลน์ใช่ไหม?"
 externalServices: "บริการภายนอก"
 sourceCode: "ซอร์สโค้ด"
-sourceCodeIsNotYetProvided: "ซอร์สโค้ดยังไม่พร้อมใช้งาน โปรดติดต่อผู้ดูแลระบบของคุณเพื่อแก้ไขปัญหานี้"
+sourceCodeIsNotYetProvided: "ซอร์สโค้ดยังไม่พร้อมใช้งาน โปรดติดต่อผู้ดูแลระบบเพื่อแก้ไขปัญหานี้"
 repositoryUrl: "URL ของ repository"
 repositoryUrlDescription: "หากมีที่เก็บซอร์สโค้ดที่เปิดเผยต่อสาธารณะ ให้ป้อน URL ที่เก็บซอร์สโค้ดนั้น แต่หากคุณใช้ Misskey ตามต้นฉบับ (ไม่มีการเปลี่ยนแปลงซอร์สโค้ด) ให้ป้อน https://github.com/misskey-dev/misskey"
 repositoryUrlOrTarballRequired: "หากคุณไม่มี repository สาธารณะ คุณจะต้องจัดเตรียม tarball แทน ดู .config/example.yml สำหรับรายละเอียด"
@@ -1275,20 +1275,20 @@ _bubbleGame:
     section2: "เมื่อวัตถุประเภทเดียวกันมารวมกัน พวกมันจะกลายเป็นวัตถุใหม่และคุณจะได้รับคะแนน"
     section3: "หากวัตถุล้นออกมาจากกล่อง เกมก็จะจบลง ตั้งเป้าทำคะแนนให้สูงด้วยการหลอมวัตถุต่าง ๆ โดยไม่ทำให้ล้นกล่อง!"
 _announcement:
-  forExistingUsers: "ผู้ใช้งานที่มีอยู่เท่านั้น"
-  forExistingUsersDescription: "การประกาศนี้จะแสดงต่อผู้ใช้ที่มีอยู่ ณ จุดที่เผยแพร่นั้นๆถ้าหากเปิดใช้งาน ถ้าหากปิดใช้งานผู้ที่กำลังสมัครใหม่หลังจากโพสต์แล้วนั้นก็จะเห็นเช่นกัน"
+  forExistingUsers: "ผู้ใช้งานที่มีอยู่ตอนนี้เท่านั้น"
+  forExistingUsersDescription: "หากเปิดใช้งาน การประกาศนี้จะแสดงเฉพาะกับผู้ใช้ที่สร้างบัญชีก่อน/ที่มีอยู่ในขณะที่สร้างประกาศนี้เท่านั้น หากปิดใช้งาน การประกาศนี้จะแสดงกับผู้ใช้ที่สร้างบัญชีหลังจากสร้างประกาศนี้ด้วย"
   needConfirmationToRead: "จำเป็นต้องยืนยันว่าอ่านแล้ว"
   needConfirmationToReadDescription: "กล่องโต้ตอบการยืนยันจะปรากฏขึ้นเมื่อจะทำเครื่องหมายว่าอ่านแล้ว นอกจากนี้ยังทำให้ประกาศนี้ยังไม่ถูกอ่านเมื่อใช้ฟังก์ชั่น “ทำเครื่องหมายฯ ทั้งหมดว่าอ่านแล้ว”"
   end: "เก็บประกาศ"
-  tooManyActiveAnnouncementDescription: "การมีประกาศที่ใช้งานมากเกินไปนั้นอาจจะทำให้ประสบการณ์ของผู้ใช้งานนั้นดูแย่ลง โปรดกรุณาพิจารณาการเก็บประกาศที่ล้าสมัยด้วยนะค่ะ"
+  tooManyActiveAnnouncementDescription: "เนื่องจากมีการประกาศที่ยังใช้งานอยู่จำนวนมาก อาจทำให้ UX ลดลง แนะนำให้พิจารณาการเก็บประกาศที่สิ้นสุดไปแล้ว"
   readConfirmTitle: "ทำเครื่องหมายว่าอ่านแล้วเลยไหม?"
   readConfirmText: "จะทำเครื่องหมายใส่ “{title}” ว่าอ่านแล้ว"
-  shouldNotBeUsedToPresentPermanentInfo: "เราขอแนะนำให้ใช้ประกาศเพื่อโพสต์ข้อมูลแบบ flow มากกว่าข้อมูลแบบ stock เนื่องจากมีแนวโน้มที่จะส่งผลเสียต่อ UX โดยเฉพาะสำหรับผู้ใช้ใหม่"
+  shouldNotBeUsedToPresentPermanentInfo: "เนื่องจากมีความเป็นไปได้สูงที่จะส่งผลเสียต่อง UX ของผู้ใช้ใหม่ จึงขอแนะนำให้ใช้ประกาศสำหรับข้อมูลที่ต้องการการตอบสนองในทันที ไม่ใช่ข้อมูลที่ต้องการแสดงตลอดเวลา"
   dialogAnnouncementUxWarn: "เราขอแนะนำให้ใช้ด้วยความระมัดระวัง เนื่องจากการแจ้งเตือนแบบกล่องโต้ตอบตั้งแต่ 2 รายการขึ้นไปพร้อมกันอาจส่งผลเสียต่อ UX ได้อย่างมาก"
   silence: "ไม่มีการแจ้งเตือน"
   silenceDescription: "หากเปิดใช้งาน จะไม่มีการแจ้งเตือนประกาศนี้ และผู้ใช้จะไม่จำเป็นต้องทำเครื่องหมายว่าอ่านแล้ว"
 _initialAccountSetting:
-  accountCreated: "คุณได้สร้างบัญชีของคุณสำเร็จเรียบร้อยแล้ว!"
+  accountCreated: "สร้างบัญชีเสร็จสมบูรณ์!"
   letsStartAccountSetup: "สำหรับผู้เริ่มต้นมาตั้งค่าโปรไฟล์ของคุณกันเถอะ"
   letsFillYourProfile: "ก่อนอื่นมาตั้งค่าโปรไฟล์ของคุณ"
   profileSetting: "ตั้งค่าโปรไฟล์"
@@ -1387,26 +1387,26 @@ _serverSettings:
   inquiryUrl: "URL สำหรับการติดต่อสอบถาม"
   inquiryUrlDescription: "ระบุ URL ของหน้าเว็บที่มีแบบฟอร์มสำหรับติดต่อผู้ดูแลเซิร์ฟเวอร์ หรือข้อมูลการติดต่อของผู้ดูแลเซิร์ฟเวอร์"
 _accountMigration:
-  moveFrom: "ย้ายข้อมูลบัญชีอื่นไปยังอีกบัญชีนี้หนึ่ง"
+  moveFrom: "ย้ายจากบัญชีอื่นมาที่บัญชีนี้"
   moveFromSub: "สร้างนามแฝงไปยังบัญชีอื่น"
   moveFromLabel: "บัญชีที่จะย้ายจาก #{n}"
   moveFromDescription: "หากต้องการโอนข้อมูลจากบัญชีอื่นมายังบัญชีนี้ จำเป็นต้องสร้างบัญชีนามแฝง (alias) ไว้ที่นี่ด้วย\nกรุณากรอกบัญชีเดิมในรูปแบบ: @username@server.example.com\nหากต้องการลบ alias, ให้เว้นว่างไว้แล้วบันทึก (ไม่แนะนำ)"
-  moveTo: "ย้ายข้อมูลบัญชีนี้ไปยังบัญชีอีกหนึ่ง"
+  moveTo: "ย้ายบัญชีนี้ไปยังบัญชีใหม่"
   moveToLabel: "บัญชีที่จะย้ายไปที่:"
   moveCannotBeUndone: "ไม่สามารถยกเลิกการโอนย้ายบัญชีได้"
   moveAccountDescription: "การดำเนินการนี้จะย้ายบัญชีของคุณไปยังบัญชีอื่น\n・ผู้ที่กำลังติดตามคุณจากบัญชีนี้จะถูกย้ายไปยังบัญชีใหม่โดยอัตโนมัติ\n・บัญชีนี้จะเลิกติดตามผู้ใช้ทั้งหมดที่กำลังติดตามอยู่\n・คุณจะไม่สามารถสร้างโน้ต ฯลฯ ในบัญชีนี้ได้\n\nแม้ว่าการย้ายผู้ที่ติดตามคุณจะเป็นไปโดยอัตโนมัติ แต่คุณต้องเตรียมขั้นตอนบางอย่างด้วยตนเอง เพื่อย้ายรายชื่อผู้ใช้ที่คุณกำลังติดตาม โดยดำเนินการส่งออกรายชื่อแล้วค่อยนำเข้ามาภายหลังในเมนูการตั้งค่าของบัญชีใหม่ ใช้ขั้นตอนเดียวกันนี้ใช้รายชื่อผู้ใช้ที่ถูกปิดเสียงและถูกบล็อก\n\n(คำอธิบายนี้ใช้กับ Misskey v13.12.0 ขึ้นไป, ซอฟต์แวร์ ActivityPub อื่นๆ เช่น Mastodon อาจทำงานแตกต่างออกไป)"
-  moveAccountHowTo: "หากต้องการย้ายข้อมูลก่อนอื่นให้สร้างชื่อแทนสำหรับบัญชีนี้ ในบัญชีที่จะต้องการย้ายไป\nหลังจากที่คุณสร้างนามแฝงนั้นแล้ว ให้ป้อนบัญชีที่ต้องการจะย้ายไปในรูปแบบดังต่อไปนี้: @username@server.example.com"
+  moveAccountHowTo: "การย้ายบัญชีจะเริ่มต้นโดยการสร้างบัญชีนามแฝง (alias) ของบัญชีนี้ ณ บัญชีที่เป็นปลายทาง หลังจากสร้างนามแฝงแล้ว ให้ป้อนบัญชีปลายทางในรูปแบบดังนี้: @username@server.example.com"
   startMigration: "โอนย้าย"
   migrationConfirm: "ยืนยันการย้ายข้อมูลบัญชีนี้ไปที่ {account} เมื่อเริ่มแล้วจะไม่สามารถหยุดหรือนำกลับคืนมาได้ และคุณจะไม่สามารถใช้บัญชีนี้ในสถานะดั้งเดิมได้อีกต่อไป\n\nนอกจากนี้ คุณจำเป็นต้องสร้างบัญชีสำรองสำหรับการย้ายบัญชี"
-  movedAndCannotBeUndone: "\nบัญชีนี้ถูกโอนย้ายไปแล้ว\nไม่สามารถย้อนกลับโอนย้ายข้อมูลได้"
-  postMigrationNote: "บัญชีนี้จะถูกเลิกติดตามบัญชีทั้งหมดที่กำลังติดตามภายใน 24 ชั่วโมงหลังจากการย้ายข้อมูลนั้นเสร็จสิ้น ทั้งจำนวนผู้ติดตามและผู้ติดตามนั้นจะกลายเป็นศูนย์ เพื่อหลีกเลี่ยงป้องกันไม่ให้ผู้ติดตามของคุณนั้นไม่สามารถเห็นโพสต์เฉพาะผู้ติดตามของบัญชีนี้ได้ แต่อย่างไรก็ตามแล้วพวกเขาจะยังคงติดตามบัญชีนี้ต่อไป"
-  movedTo: "บัญชีที่จะย้ายไปที่:"
+  movedAndCannotBeUndone: "\nบัญชีนี้ถูกโอนย้ายไปแล้ว\nไม่สามารถยกเลิกการโอนย้ายได้"
+  postMigrationNote: "บัญชีนี้จะดำเนินการยกเลิกการติดตามทั้งหมดหลังจากการย้ายข้อมูลไปแล้ว 24 ชั่วโมง จำนวนกำลังติดตามและจำนวนผู้ติดตามของบัญชีนี้จะเป็น 0 และเพื่อหลีกเลี่ยงไม่ให้ผู้ติดตามคุณนั้นไม่สามารถเห็นโพสต์เฉพาะผู้ติดตามฯได้  การยกเลิกการติดตามจะไม่กระทบกับผู้ติดตามคุณ ดังนั้นผู้ติดตามคุณยังคงสามารถดูโพสต์ของบัญชีนี้ได้"
+  movedTo: "บัญชีที่จะย้ายไป:"
 _achievements:
   earnedAt: "ได้รับเมื่อ"
   _types:
     _notes1:
       title: "just setting up my msky"
-      description: "โพสต์โน้ตแรกของคุณ"
+      description: "โพสต์โน้ตเป็นครั้งแรก"
       flavor: "ขอให้มีช่วงเวลาที่ดีกับ Misskey นะคะ!"
     _notes10:
       title: "โน้ตไม่กี่ชิ้น"
@@ -1506,19 +1506,19 @@ _achievements:
       flavor: "ขอบคุณที่ใช้ Misskey นะ !"
     _noteClipped1:
       title: "อดไม่ได้ที่จะต้องคลิปมันเอาไว้"
-      description: "คลิปโน้ตตัวแรกของคุณ"
+      description: "คลิปโน้ตเป็นครั้งแรก"
     _noteFavorited1:
       title: "สตาร์เกเซอร์"
-      description: "ชื่นชอบโน้ตแรกของคุณ"
+      description: "ใส่โน้ตเป็นรายการโปรดเป็นครั้งแรก"
     _myNoteFavorited1:
       title: "แสวงหาดวงดาว"
-      description: "มีคนอื่นๆที่ชื่นชอบหนึ่งในโน้ตของคุณ"
+      description: "โน้ตตัวเองถูกคนอื่นเพิ่มลงรายการโปรดของเขา"
     _profileFilled:
       title: "เตรียมตัวอย่างดี"
-      description: "ตั้งค่าโปรไฟล์ของคุณ"
+      description: "ตั้งค่าโปรไฟล์"
     _markedAsCat:
       title: "ฉันเป็นแมว"
-      description: "ทำเครื่องหมายบัญชีของคุณว่าเป็นแมว"
+      description: "ตั้งค่าบัญชีเป็นแมวเมี้ยวเมี้ยว"
       flavor: "แมวน้อยไร้ชื่อ"
     _following1:
       title: "ก้าวแรกสู่...กดติดตาม"
@@ -1561,7 +1561,7 @@ _achievements:
       description: "ได้รับความสำเร็จ 30 ครั้ง"
     _viewAchievements3min:
       title: "ชอบบรรลุความสําเร็จ"
-      description: "มองดูรายการความสำเร็จของคุณเป็นเวลาอย่างน้อย 3 นาที"
+      description: "มองดูรายการความสำเร็จเป็นเวลานานกว่า 3 นาที"
     _iLoveMisskey:
       title: "ฉันรัก Misskey"
       description: "โพสต์ “I ❤ #Misskey”"
@@ -1588,13 +1588,13 @@ _achievements:
       flavor: "โป๊ะ โป๊ะ โป๊ะ ปิ้งงงงง"
     _selfQuote:
       title: "อ้างอิงตนเอง"
-      description: "อ้างโน้ตของคุณเอง"
+      description: "อ้างอิงโน้ตตัวเอง"
     _htl20npm:
       title: "ไทม์ไลน์ไหล"
       description: "มีการทำความเร็วของไทม์ไลน์หลักเกิน 20 npm (โน้ตต่อนาที)"
     _viewInstanceChart:
       title: "วิเคราะห์"
-      description: "ดูแผนภูมิเซิร์ฟเวอร์ของคุณ"
+      description: "ดูแผนภูมิของเซิร์ฟเวอร์"
     _outputHelloWorldOnScratchpad:
       title: "หวัดดีชาวโลก!"
       description: "เอาพุต \"hello world\" ใน Scratchpad"
@@ -1615,16 +1615,16 @@ _achievements:
       description: "มีโอกาสที่จะได้รับด้วยความน่าจะเป็นไปได้ 0.005% ทุก ๆ 10 วินาที"
     _setNameToSyuilo:
       title: "คอมเพล็กซ์ของพระเจ้า"
-      description: "ตั้งชื่อของคุณเป็น “syuilo”"
+      description: "ตั้งชื่อเป็น “syuilo”"
     _passedSinceAccountCreated1:
       title: "ครบรอบหนึ่งปี"
-      description: "ผ่านไปหนึ่งปีแล้วนะตั้งแต่บัญชีของคุณถูกสร้างขึ้นมาน่ะ"
+      description: "ผ่านไป 1 ปีนับตั้งแต่สร้างบัญชี"
     _passedSinceAccountCreated2:
       title: "ครบรอบสองปี"
-      description: "ผ่านไปสองปีแล้วนะตั้งแต่บัญชีของคุณถูกสร้างขึ้นมาน่ะ"
+      description: "ผ่านไป 2 ปีนับตั้งแต่สร้างบัญชี"
     _passedSinceAccountCreated3:
       title: "ครบรอบสามปี"
-      description: "ผ่านไปสามปีแล้วนะตั้งแต่บัญชีของคุณถูกสร้างขึ้นมาน่ะ"
+      description: "ผ่านไป 3 ปีนับตั้งแต่สร้างบัญชี"
     _loggedInOnBirthday:
       title: "สุขสันต์วันเกิด"
       description: "เข้าสู่ระบบในวันเกิดของคุณ"
@@ -1672,8 +1672,8 @@ _role:
   descriptionOfIsPublic: "บทบาทจะปรากฏบนโปรไฟล์ของผู้ใช้และเปิดเผยต่อสาธารณะ (ทุกคนสามารถเห็นได้ว่าผู้ใช้รายนี้มีบทบาทนี้)"
   options: "ตัวเลือกบทบาท"
   policies: "นโยบาย"
-  baseRole: "เทมเพลตบทบาท"
-  useBaseValue: "ใช้ตามเทมเพลตบทบาท"
+  baseRole: "แม่แบบบทบาท"
+  useBaseValue: "ใช้ตามแม่แบบบทบาท"
   chooseRoleToAssign: "เลือกบทบาทที่ต้องการกำหนด"
   iconUrl: "URL ไอคอน"
   asBadge: "แสดงเป็นตรา"
@@ -1797,7 +1797,7 @@ _plugin:
   viewSource: "ดูต้นฉบับ"
   viewLog: "แสดงปูม"
 _preferencesBackups:
-  list: "การตั้งค่าสำรองที่สร้างไว้"
+  list: "การตั้งค่าที่สำรองไว้"
   saveNew: "บันทึกการตั้งค่าสำรองใหม่"
   loadFile: "โหลดจากไฟล์"
   apply: "นำไปใช้กับอุปกรณ์นี้"
@@ -1864,7 +1864,7 @@ _menuDisplay:
   hide: "ซ่อน"
 _wordMute:
   muteWords: "ปิดเสียงคำ"
-  muteWordsDescription: "คั่นด้วยช่องว่างสำหรับเงื่อนไข AND หรือด้วยการขึ้นบรรทัดใหม่สำหรับเงื่อนไข OR นะ"
+  muteWordsDescription: "คั่นด้วยเว้นวรรคสำหรับเงื่อนไข AND, หรือขึ้นบรรทัดใหม่สำหรับเงื่อนไข OR"
   muteWordsDescription2: "ล้อมรอบคีย์เวิร์ดด้วยเครื่องหมายทับเพื่อใช้นิพจน์ทั่วไป"
 _instanceMute:
   instanceMuteDescription: "ปิดเสียง “โน้ต/รีโน้ต” ทั้งหมดจากเซิร์ฟเวอร์ที่ระบุไว้ รวมถึงโน้ตของผู้ใช้ที่ตอบกลับผู้ใช้จากเซิร์ฟเวอร์ที่ถูกปิดเสียง"
@@ -2008,38 +2008,38 @@ _2fa:
   backupCodesExhaustedWarning: "รหัสแบ๊กอัปทั้งหมดถูกใช้งานแล้ว หากยังไม่สามารถใช้แอปพลิเคชันการยืนยันตัวตนได้ก็จะไม่สามารถเข้าถึงบัญชีนี้ได้อีกต่อไป กรุณาลงทะเบียนแอปพลิเคชันการยืนยันตัวตนใหม่"
   moreDetailedGuideHere: "คลิกที่นี่เพื่อดูคำแนะนำโดยละเอียด"
 _permissions:
-  "read:account": "ดูข้อมูลบัญชีของคุณ"
-  "write:account": "แก้ไขข้อมูลบัญชีของคุณ"
-  "read:blocks": "ดูรายชื่อผู้ใช้ที่ถูกบล็อกของคุณ"
-  "write:blocks": "แก้ไขรายชื่อผู้ใช้ที่ถูกบล็อกของคุณ"
-  "read:drive": "เข้าถึงไฟล์และโฟลเดอร์ในไดรฟ์ของคุณ"
-  "write:drive": "แก้ไขหรือลบไฟล์และโฟลเดอร์ในไดรฟ์ของคุณ"
+  "read:account": "ดูข้อมูลบัญชี"
+  "write:account": "แก้ไขข้อมูลบัญชี"
+  "read:blocks": "ดูรายชื่อผู้ใช้ที่ถูกบล็อก"
+  "write:blocks": "แก้ไขรายชื่อผู้ใช้ที่ถูกบล็อก"
+  "read:drive": "เข้าถึงไดรฟ์"
+  "write:drive": "จัดการไดรฟ์"
   "read:favorites": "ดูรายการโปรด"
   "write:favorites": "แก้ไขรายการโปรด"
   "read:following": "ดูข้อมูลว่าใครที่คุณติดตาม"
   "write:following": "ติดตามหรือเลิกติดตามบัญชีอื่น"
-  "read:messaging": "ดูแชทของคุณ"
+  "read:messaging": "ดูแชท"
   "write:messaging": "เขียนหรือลบข้อความแชท"
-  "read:mutes": "ดูรายชื่อผู้ใช้ที่ปิดเสียงของคุณ"
+  "read:mutes": "ดูรายชื่อผู้ใช้ที่ถูกปิดเสียง"
   "write:mutes": "แก้ไขรายชื่อผู้ใช้ที่ถูกปิดเสียง"
   "write:notes": "เขียนหรือลบโน้ต"
-  "read:notifications": "ดูการแจ้งเตือนของคุณ"
-  "write:notifications": "จัดการแจ้งเตือนของคุณ"
-  "read:reactions": "ดูรีแอคชั่นของคุณ"
-  "write:reactions": "แก้ไขรีแอคชั่นของคุณ"
+  "read:notifications": "ดูการแจ้งเตือน"
+  "write:notifications": "จัดการแจ้งเตือน"
+  "read:reactions": "ดูรีแอคชั่น"
+  "write:reactions": "แก้ไขรีแอคชั่น"
   "write:votes": "โหวตบนสำรวจความคิดเห็น"
   "read:pages": "ดูหน้าเพจ"
-  "write:pages": "แก้ไขหรือลบเพจของคุณ"
+  "write:pages": "แก้ไขหรือลบเพจ"
   "read:page-likes": "ดูรายการเพจที่ถูกใจไว้"
   "write:page-likes": "แก้ไขรายการเพจที่ถูกใจ"
-  "read:user-groups": "ดูกลุ่มผู้ใช้ของคุณ"
-  "write:user-groups": "แก้ไขหรือลบกลุ่มผู้ใช้ของคุณ"
-  "read:channels": "ดูแชนแนลของคุณ"
-  "write:channels": "แก้ไขแชนแนลของคุณ"
+  "read:user-groups": "ดูกลุ่มผู้ใช้"
+  "write:user-groups": "แก้ไขหรือลบกลุ่มผู้ใช้"
+  "read:channels": "ดูช่อง"
+  "write:channels": "แก้ไขช่อง"
   "read:gallery": "ดูแกลเลอรี่"
-  "write:gallery": "แก้ไขแกลเลอรี่ของคุณ"
-  "read:gallery-likes": "ดูรายการโพสต์แกลเลอรีที่ถูกใจไว้"
-  "write:gallery-likes": "แก้ไขรายการโพสต์แกลเลอรีที่ถูกใจไว้"
+  "write:gallery": "แก้ไขแกลเลอรี"
+  "read:gallery-likes": "ดูแกลเลอรีที่ถูกใจไว้"
+  "write:gallery-likes": "จัดการแกลเลอรีที่ถูกใจไว้"
   "read:flash": "ดู Play"
   "write:flash": "แก้ไข Play"
   "read:flash-likes": "ดูรายการ  play ที่ถูกใจไว้"
@@ -2048,20 +2048,20 @@ _permissions:
   "write:admin:delete-account": "ลบบัญชีผู้ใช้"
   "write:admin:delete-all-files-of-a-user": "ลบไฟล์ทั้งหมดของผู้ใช้"
   "read:admin:index-stats": "ดูข้อมูลเกี่ยวกับดัชนีฐานข้อมูล"
-  "read:admin:table-stats": "ดูข้อมูลเกี่ยวกับตารางฐานข้อมูล"
+  "read:admin:table-stats": "ดูข้อมูลเกี่ยวกับตารางในฐานข้อมูล"
   "read:admin:user-ips": "ดูที่อยู่ IP ของผู้ใช้"
-  "read:admin:meta": "ดูข้อมูลเมตาของอินสแตนซ์"
+  "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-moderation-log": "ดูปูมการควบคุมดูแล"
   "read:admin:show-user": "ดูข้อมูลส่วนตัวของผู้ใช้"
   "write:admin:suspend-user": "ระงับผู้ใช้"
   "write:admin:unset-user-avatar": "ลบอวตารผู้ใช้"
   "write:admin:unset-user-banner": "ลบแบนเนอร์ผู้ใช้"
   "write:admin:unsuspend-user": "ยกเลิกการระงับผู้ใช้"
-  "write:admin:meta": "จัดการข้อมูลเมตาของอินสแตนซ์"
+  "write:admin:meta": "จัดการข้อมูลอภิพันธุ์ของอินสแตนซ์"
   "write:admin:user-note": "จัดการโน้ตการกลั่นกรอง"
   "write:admin:roles": "จัดการบทบาท"
   "read:admin:roles": "ดูบทบาท"
@@ -2088,8 +2088,8 @@ _permissions:
   "read:admin:ad": "ดูโฆษณา"
   "write:invite-codes": "สร้างรหัสเชิญ"
   "read:invite-codes": "รับรหัสเชิญ"
-  "write:clip-favorite": "ควบคุมการถูกใจของคลิป"
-  "read:clip-favorite": "ดูการถูกใจของคลิป"
+  "write:clip-favorite": "จัดการคลิปที่ถูกใจ"
+  "read:clip-favorite": "ดูคลิปที่ถูกใจ"
   "read:federation": "รับข้อมูลเกี่ยวกับสหพันธ์"
   "write:report-abuse": "รายงานการละเมิด"
 _auth:
@@ -2165,7 +2165,7 @@ _poll:
   deadlineTime: "เวลา"
   duration: "ระยะเวลา"
   votesCount: "{n} คะแนนเสียง"
-  totalVotes: "{n} คะแนนเสียงทั้งหมด"
+  totalVotes: "ทั้งหมด {n} คะแนนเสียง"
   vote: "โหวต"
   showResult: "ดูผลลัพธ์"
   voted: "โหวตแล้ว"
@@ -2266,7 +2266,7 @@ _play:
   featured: "เป็นที่นิยม"
   title: "หัวข้อ"
   script: "สคริปต์"
-  summary: "รายละเอียด"
+  summary: "คำอธิบาย"
   visibilityDescription: "หากตั้งค่าเป็นส่วนตัว มันจะไม่ปรากฏในโปรไฟล์อีกต่อไป แต่ผู้ที่ทราบ URL ของมันจะยังสามารถเข้าถึงได้"
 _pages:
   newPage: "สร้างหน้าเพจใหม่"
@@ -2425,6 +2425,7 @@ _webhookSettings:
   _systemEvents:
     abuseReport: "เมื่อมีการรายงานจากผู้ใช้"
     abuseReportResolved: "เมื่อมีการจัดการกับการรายงานจากผู้ใช้"
+    userCreated: "เมื่อผู้ใช้ถูกสร้างขึ้น"
   deleteConfirm: "ต้องการลบ Webhook ใช่ไหม?"
 _abuseReport:
   _notificationRecipient:
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 6f10788743..8eae32ca32 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -60,6 +60,7 @@ copyFileId: "复制文件ID"
 copyFolderId: "复制文件夹ID"
 copyProfileUrl: "复制个人资料URL"
 searchUser: "搜索用户"
+searchThisUsersNotes: "搜索用户帖子"
 reply: "回复"
 loadMore: "查看更多"
 showMore: "查看更多"
@@ -154,6 +155,7 @@ editList: "编辑列表"
 selectChannel: "选择频道"
 selectAntenna: "选择天线"
 editAntenna: "编辑天线"
+createAntenna: "创建天线"
 selectWidget: "选择小工具"
 editWidgets: "编辑部件"
 editWidgetsExit: "完成编辑"
@@ -194,6 +196,7 @@ followConfirm: "你确定要关注 {name} 吗？"
 proxyAccount: "代理账户"
 proxyAccountDescription: "代理账户是在某些情况下替代用户进行远程关注用的账户。 例如说，当用户将一位远程用户放入一个列表中时，如果本地服务器上没有任何人关注这位远程用户，则这位远程用户的账户活动将不会被送到本地服务器上。作为替代，此时将使用代理账户进行关注。"
 host: "主机名"
+selectSelf: "选择自己"
 selectUser: "选择用户"
 recipient: "收件人"
 annotation: "注解"
@@ -1106,6 +1109,8 @@ preservedUsernames: "保留的用户名"
 preservedUsernamesDescription: "列出需要保留的用户名，使用换行来作为分割。被指定的用户名在建立账户时无法使用，但由管理员所创建的账户不受该限制。此外，现有的账户也不会受到影响。"
 createNoteFromTheFile: "从文件创建帖子"
 archive: "归档"
+archived: "已归档"
+unarchive: "取消归档"
 channelArchiveConfirmTitle: "要将 {name} 归档吗？"
 channelArchiveConfirmDescription: "归档后，在频道列表与搜索结果中不会显示，也无法发布新的贴文。"
 thisChannelArchived: "该频道已被归档。"
@@ -1116,6 +1121,7 @@ preventAiLearning: "拒绝接受生成式 AI 的学习"
 preventAiLearningDescription: "要求文章生成 AI 或图像生成 AI 不能够以发布的帖子和图像等内容作为学习对象。这是通过在 HTML 响应中包含 noai 标志来实现的，这不能完全阻止 AI 学习你的发布内容，并不是所有 AI 都会遵守这类请求。"
 options: "选项"
 specifyUser: "用户指定"
+specifyHost: "指定主机名"
 failedToPreviewUrl: "无法预览"
 update: "更新"
 rolesThatCanBeUsedThisEmojiAsReaction: "可以使用表情作为回应的角色"
@@ -1250,6 +1256,8 @@ inquiry: "联系我们"
 tryAgain: "请再试一次"
 confirmWhenRevealingSensitiveMedia: "显示敏感内容前需要确认"
 sensitiveMediaRevealConfirm: "这是敏感内容。是否显示？"
+createdLists: "已创建的列表"
+createdAntennas: "已创建的天线"
 _delivery:
   status: "投递状态"
   stop: "停止投递"
@@ -2424,6 +2432,7 @@ _webhookSettings:
   _systemEvents:
     abuseReport: "当收到举报时"
     abuseReportResolved: "当举报被处理时"
+    userCreated: "当用户被创建时"
   deleteConfirm: "要删除 webhook 吗？"
 _abuseReport:
   _notificationRecipient:
@@ -2614,3 +2623,8 @@ _mediaControls:
   pip: "画中画"
   playbackRate: "播放速度"
   loop: "循环播放"
+_contextMenu:
+  title: "上下文菜单"
+  app: "应用"
+  appWithShift: "Shift 键应用"
+  native: "浏览器的用户界面"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 0929984252..8b53273c3b 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -60,6 +60,7 @@ copyFileId: "複製檔案 ID"
 copyFolderId: "複製資料夾ID"
 copyProfileUrl: "複製個人資料網址"
 searchUser: "搜尋使用者"
+searchThisUsersNotes: "搜尋這個使用者的貼文"
 reply: "回覆"
 loadMore: "載入更多"
 showMore: "載入更多"
@@ -154,6 +155,7 @@ editList: "編輯清單"
 selectChannel: "選擇頻道"
 selectAntenna: "選擇天線"
 editAntenna: "編輯天線"
+createAntenna: "建立天線"
 selectWidget: "選擇小工具"
 editWidgets: "編輯小工具"
 editWidgetsExit: "完成"
@@ -194,6 +196,7 @@ followConfirm: "你真的要追隨{name}嗎？"
 proxyAccount: "代理帳戶"
 proxyAccountDescription: "代理帳戶是在特定條件下充當遠端追隨者的帳戶。例如，當使用者新增遠端使用者至其列表時，若沒有本地使用者追隨該遠端使用者，則其活動將不會傳送至伺服器，此時便會由代理帳戶代為追隨以解決問題。"
 host: "主機"
+selectSelf: "選擇自己"
 selectUser: "選取使用者"
 recipient: "收件人"
 annotation: "註解"
@@ -1106,6 +1109,8 @@ preservedUsernames: "保留的使用者名稱"
 preservedUsernamesDescription: "換行列舉要保留的使用者名稱。此處出現的名稱將在註冊時禁用，但由管理者建立帳戶則不受此限。此外，既有的帳戶也不受影響。"
 createNoteFromTheFile: "由此檔案建立貼文"
 archive: "封存"
+archived: "已封存"
+unarchive: "取消封存"
 channelArchiveConfirmTitle: "要封存{name}嗎？"
 channelArchiveConfirmDescription: "封存後，將不會在頻道列表與搜尋結果中顯示，也無法發佈新貼文。"
 thisChannelArchived: "這個頻道已被封存。"
@@ -1116,6 +1121,7 @@ preventAiLearning: "拒絕接受生成式AI的訓練"
 preventAiLearningDescription: "要求站外生成式 AI 不使用您發佈的內容訓練模型。此功能會使伺服器於 HTML 回應新增「noai」標籤，而因為要視乎 AI 會否遵守該標籤，所以此功能無法完全阻止所有 AI 使用您的內容。"
 options: "選項"
 specifyUser: "指定使用者"
+specifyHost: "指定主機"
 failedToPreviewUrl: "無法預覽"
 update: "更新"
 rolesThatCanBeUsedThisEmojiAsReaction: "可以使用此表情符號為反應的角色"
@@ -1250,6 +1256,8 @@ inquiry: "聯絡我們"
 tryAgain: "請再試一次。"
 confirmWhenRevealingSensitiveMedia: "要顯示敏感媒體時需確認"
 sensitiveMediaRevealConfirm: "這是敏感媒體。確定要顯示嗎？"
+createdLists: "已建立的清單"
+createdAntennas: "已建立的天線"
 _delivery:
   status: "傳送狀態"
   stop: "停止發送"
@@ -2615,3 +2623,7 @@ _mediaControls:
   pip: "畫中畫"
   playbackRate: "播放速度"
   loop: "循環播放"
+_contextMenu:
+  title: "內容功能表"
+  app: "應用程式"
+  native: "瀏覽器的使用者介面"

From 674a424db3c2de15a113831b8388cb84927cb531 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2024 08:39:38 +0000
Subject: [PATCH 130/221] Bump version to 2024.7.0-rc.6

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 64f7b88a9f..54fd36f11a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.7.0-rc.5",
+	"version": "2024.7.0-rc.6",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index b112975328..eec39349c5 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.7.0-rc.5",
+	"version": "2024.7.0-rc.6",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 3411b9c16c220709ddda0492d1b61c961a116b5e Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 30 Jul 2024 17:47:17 +0900
Subject: [PATCH 131/221] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d7f50519a..f074ed65e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@
 - Fix: 配信停止したインスタンス一覧が見れなくなる問題を修正
 - Fix: Dockerコンテナの立ち上げ時に`pnpm`のインストールで固まることがある問題
 - Fix: デフォルトテーマに無効なテーマコードを入力するとUIが使用できなくなる問題を修正
+- 翻訳の更新
+- 依存関係の更新
 
 ### Client
 - Feat: ユーザーページから「このユーザーのノートを検索」できるように (#14128)

From 8bae2ecabd770afe5533baec148c6e21124b9756 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8A=E3=81=95=E3=82=80=E3=81=AE=E3=81=B2=E3=81=A8?=
 <46447427+samunohito@users.noreply.github.com>
Date: Tue, 30 Jul 2024 18:37:07 +0900
Subject: [PATCH 132/221] =?UTF-8?q?fix(misskey-js):=20=E3=83=A2=E3=83=87?=
 =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=81=AE=E3=83=95=E3=82=A3=E3=83=AB=E3=82=BF?=
 =?UTF-8?q?=E3=81=AB=E8=BF=BD=E5=8A=A0=E6=BC=8F=E3=82=8C=E3=81=8C=E3=81=82?=
 =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20(#1432?=
 =?UTF-8?q?8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/misskey-js/src/consts.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/misskey-js/src/consts.ts b/packages/misskey-js/src/consts.ts
index b509d3280c..aa8eeb48cb 100644
--- a/packages/misskey-js/src/consts.ts
+++ b/packages/misskey-js/src/consts.ts
@@ -143,6 +143,12 @@ export const moderationLogTypes = [
 	'deleteAvatarDecoration',
 	'unsetUserAvatar',
 	'unsetUserBanner',
+	'createSystemWebhook',
+	'updateSystemWebhook',
+	'deleteSystemWebhook',
+	'createAbuseReportNotificationRecipient',
+	'updateAbuseReportNotificationRecipient',
+	'deleteAbuseReportNotificationRecipient',
 ] as const;
 
 // See: packages/backend/src/core/ReversiService.ts@L410

From 2307849c9ae1f4e10231479ff8e1d5556e3a3c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8A=E3=81=95=E3=82=80=E3=81=AE=E3=81=B2=E3=81=A8?=
 <46447427+samunohito@users.noreply.github.com>
Date: Tue, 30 Jul 2024 19:01:47 +0900
Subject: [PATCH 133/221] =?UTF-8?q?fix(misskey-js):=20misskey-js.api.md?=
 =?UTF-8?q?=E3=81=AE=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88=E6=BC=8F=E3=82=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(#14329)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/misskey-js/etc/misskey-js.api.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index 377dd6f658..16cb560a52 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -2481,7 +2481,7 @@ type ModerationLog = {
 });
 
 // @public (undocumented)
-export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "unsuspend", "updateUserNote", "addCustomEmoji", "updateCustomEmoji", "deleteCustomEmoji", "assignRole", "unassignRole", "createRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "suspendRemoteInstance", "unsuspendRemoteInstance", "updateRemoteInstanceNote", "markSensitiveDriveFile", "unmarkSensitiveDriveFile", "resolveAbuseReport", "createInvitation", "createAd", "updateAd", "deleteAd", "createAvatarDecoration", "updateAvatarDecoration", "deleteAvatarDecoration", "unsetUserAvatar", "unsetUserBanner"];
+export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "unsuspend", "updateUserNote", "addCustomEmoji", "updateCustomEmoji", "deleteCustomEmoji", "assignRole", "unassignRole", "createRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "suspendRemoteInstance", "unsuspendRemoteInstance", "updateRemoteInstanceNote", "markSensitiveDriveFile", "unmarkSensitiveDriveFile", "resolveAbuseReport", "createInvitation", "createAd", "updateAd", "deleteAd", "createAvatarDecoration", "updateAvatarDecoration", "deleteAvatarDecoration", "unsetUserAvatar", "unsetUserBanner", "createSystemWebhook", "updateSystemWebhook", "deleteSystemWebhook", "createAbuseReportNotificationRecipient", "updateAbuseReportNotificationRecipient", "deleteAbuseReportNotificationRecipient"];
 
 // @public (undocumented)
 type MuteCreateRequest = operations['mute___create']['requestBody']['content']['application/json'];

From d0b7c74fd15673604a682726c817c57475cfa5d4 Mon Sep 17 00:00:00 2001
From: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
Date: Tue, 30 Jul 2024 19:18:43 +0900
Subject: [PATCH 134/221] =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E3=81=8B=E3=82=89?=
 =?UTF-8?q?=E3=83=8F=E3=83=83=E3=82=B7=E3=83=A5=E3=82=BF=E3=82=B0=E3=81=AE?=
 =?UTF-8?q?=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=8C=E9=96=8B=E3=81=91=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=80=81users/search=E3=81=AB`@`?=
 =?UTF-8?q?=E3=81=8B=E3=82=89=E5=A7=8B=E3=81=BE=E3=82=8B=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E5=88=97=E3=81=8C=E4=B8=8E=E3=81=88=E3=82=89=E3=82=8C=E3=81=9F?=
 =?UTF-8?q?=E9=9A=9B=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20=E7=AD=89=20(#13858)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance(frontend): 検索からハッシュタグのページを開けるように

* fix(frontend): 照会で入力が`#`のみの場合は`/tags/`に遷移しないように

* docs(changelog): update changelog

* enhance(frontend): ユーザー検索からもハッシュタグのページを開けるように

* docs(changelog): update changelog

* enhance(frontend): 検索範囲等が指定されている時は照会/ハッシュタグページを開かないように

* enhance(frontend): 検索内容に空白が含まれている場合は照会/ハッシュタグページを開かないように

* docs(changelog): update changelog

* Revert "enhance(frontend): 検索範囲等が指定されている時は照会/ハッシュタグページを開かないように"

This reverts commit f84eecea964b90e9b115eac19ed6f19a603a6bbc.

* enhance(frontend): 検索から照会/ハッシュタグページを開くかどうか確認するように

* docs(changelog): update changelog

* chore: fix lint

* docs(changelog): update changelog insertion position

* enhance(frontend): 検索から`@user@host`の形式で照会出来るように

* fix(frontend): 照会で入力が`@`のみの場合に`/@`に遷移しないように

* fix(backend): `users/search`において`@`から始まるqueryに対する処理が正しくなかった問題を修正

* docs(changelog): update changelog

* chore(backend): fix lint error

* fix(backend): more improvements for users/search when query startswith `@`

* chore: unify common conditions

* docs(changelog): refine changelog

* chore(backend): fix lint error

* MkInputをpreventに対応させ、enterの意図せぬ伝搬を防ぐ

* chore(frontend/search.user): use .prevent to prevent the propagation of enter instead of setTimeout

---------

Co-authored-by: samunohito <46447427+samunohito@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Co-authored-by: taichanne30 <dev@taichan.site>
---
 CHANGELOG.md                                  |   8 ++
 locales/index.d.ts                            |   8 ++
 locales/ja-JP.yml                             |   2 +
 .../src/server/api/endpoints/users/search.ts  | 126 ++++++++----------
 packages/frontend/src/components/MkInput.vue  |   4 +-
 packages/frontend/src/pages/search.note.vue   |  54 ++++++--
 packages/frontend/src/pages/search.user.vue   |  58 ++++++--
 packages/frontend/src/scripts/lookup.ts       |   2 +-
 8 files changed, 159 insertions(+), 103 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f074ed65e0..4051566651 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,10 @@
 - Enhance: AiScriptを0.19.0にアップデート
 - Enhance: Allow negative delay for MFM animation elements (`tada`, `jelly`, `twitch`, `shake`, `spin`, `jump`, `bounce`, `rainbow`)
 - Enhance: センシティブなメディアを開く際に確認ダイアログを出せるように
+- Enhance: 検索(ノート/ユーザー)で `#` から始まる文字列を入力すると、そのハッシュタグのノート/ユーザー一覧ページが表示できるように
+- Enhance: 検索(ノート/ユーザー)において、入力に空白が含まれている場合は照会を行わないように
+- Enhance: 検索(ノート/ユーザー)において、照会を行うかどうか、ハッシュタグのノート/ユーザー一覧ページを表示するかどうかの確認ダイアログを出すように
+- Enhance: 検索(ノート/ユーザー)で `@` から始まる文字列(`@user@host`など)を入力すると、そのユーザーを照会できるように
 - Enhance: ドライブのファイル・フォルダをドラッグしなくても移動できるように  
   (Cherry-picked from https://github.com/nafu-at/misskey/commit/b89c2af6945c6a9f9f10e83f54d2bcf0f240b0b4, https://github.com/nafu-at/misskey/commit/8a7d710c6acb83f50c83f050bd1423c764d60a99)
 - Enhance: デッキのアンテナ・リスト選択画面からそれぞれを新規作成できるように
@@ -57,6 +61,8 @@
 - Fix: ダイレクト投稿の"削除して編集"において、宛先が保持されていなかった問題を修正
 - Fix: 投稿フォームへのURL貼り付けによる引用が下書きに保存されていなかった問題を修正
 - Fix: "削除して編集"や下書きにおいて、リアクションの受け入れ設定が保持/保存されていなかった問題を修正
+- Fix: 照会に `#` から始まる文字列を入力してそのハッシュタグのページを表示する際、入力が `#` のみの場合に「指定されたURLに該当するページはありませんでした。」が表示されてしまう問題を修正
+- Fix: 照会に `@` から始まる文字列を入力してユーザーを照会する際、入力が `@` のみの場合に「問題が発生しました」が表示されてしまう問題を修正
 - Fix: 投稿フォームにノートのURLを貼り付けて"引用として添付"した場合、投稿文を空にすることによるRenote化が出来なかった問題を修正
 
 ### Server
@@ -96,6 +102,8 @@
 - Fix: リノートのミュートが適用されるまでに時間がかかることがある問題を修正  
   (Cherry-picked from https://github.com/Type4ny-Project/Type4ny/commit/e9601029b52e0ad43d9131b555b614e56c84ebc1)
 - Fix: Steaming APIが不正なデータを受けた場合の動作が不安定である問題 #14251
+- Fix: `users/search`において `@` から始まる文字列が与えられた際の処理が正しくなかった問題を修正
+  - 名前や自己紹介に `@` から始まる文言が含まれるユーザーも検索できるようになります
 - Fix: 一部のMisskey以外のソフトウェアからファイルを受け取れない問題
   (Cherry-picked from https://github.com/Secineralyr/misskey.dream/pull/73/commits/652eaff1e8aa00b890d71d2e1e52c263c1e67c76)
   - NOTE: `drive_file`の`url`, `uri`, `src`の上限が512から1024に変更されます
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 14dc862745..aee0b6127e 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -4500,6 +4500,14 @@ export interface Locale extends ILocale {
      * ユーザー指定
      */
     "specifyUser": string;
+    /**
+     * 照会しますか？
+     */
+    "lookupConfirm": string;
+    /**
+     * ハッシュタグのページを開きますか？
+     */
+    "openTagPageConfirm": string;
     /**
      * ホスト指定
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index cd26b71d57..9b907f0971 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1121,6 +1121,8 @@ preventAiLearning: "生成AIによる学習を拒否"
 preventAiLearningDescription: "外部の文章生成AIや画像生成AIに対して、投稿したノートや画像などのコンテンツを学習の対象にしないように要求します。これはnoaiフラグをHTMLレスポンスに含めることによって実現されますが、この要求に従うかはそのAI次第であるため、学習を完全に防止するものではありません。"
 options: "オプション"
 specifyUser: "ユーザー指定"
+lookupConfirm: "照会しますか？"
+openTagPageConfirm: "ハッシュタグのページを開きますか？"
 specifyHost: "ホスト指定"
 failedToPreviewUrl: "プレビューできません"
 update: "更新"
diff --git a/packages/backend/src/server/api/endpoints/users/search.ts b/packages/backend/src/server/api/endpoints/users/search.ts
index df9d9f6312..0b0136066d 100644
--- a/packages/backend/src/server/api/endpoints/users/search.ts
+++ b/packages/backend/src/server/api/endpoints/users/search.ts
@@ -57,88 +57,66 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const activeThreshold = new Date(Date.now() - (1000 * 60 * 60 * 24 * 30)); // 30日
 
 			ps.query = ps.query.trim();
-			const isUsername = ps.query.startsWith('@');
+			const isUsername = ps.query.startsWith('@') && !ps.query.includes(' ') && ps.query.indexOf('@', 1) === -1;
 
 			let users: MiUser[] = [];
 
-			if (isUsername) {
-				const usernameQuery = this.usersRepository.createQueryBuilder('user')
-					.where('user.usernameLower LIKE :username', { username: sqlLikeEscape(ps.query.replace('@', '').toLowerCase()) + '%' })
-					.andWhere(new Brackets(qb => {
-						qb
-							.where('user.updatedAt IS NULL')
-							.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
-					}))
-					.andWhere('user.isSuspended = FALSE');
+			const nameQuery = this.usersRepository.createQueryBuilder('user')
+				.where(new Brackets(qb => {
+					qb.where('user.name ILIKE :query', { query: '%' + sqlLikeEscape(ps.query) + '%' });
 
-				if (ps.origin === 'local') {
-					usernameQuery.andWhere('user.host IS NULL');
-				} else if (ps.origin === 'remote') {
-					usernameQuery.andWhere('user.host IS NOT NULL');
-				}
-
-				users = await usernameQuery
-					.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
-					.limit(ps.limit)
-					.offset(ps.offset)
-					.getMany();
-			} else {
-				const nameQuery = this.usersRepository.createQueryBuilder('user')
-					.where(new Brackets(qb => {
-						qb.where('user.name ILIKE :query', { query: '%' + sqlLikeEscape(ps.query) + '%' });
-
-						// Also search username if it qualifies as username
-						if (this.userEntityService.validateLocalUsername(ps.query)) {
-							qb.orWhere('user.usernameLower LIKE :username', { username: '%' + sqlLikeEscape(ps.query.toLowerCase()) + '%' });
-						}
-					}))
-					.andWhere(new Brackets(qb => {
-						qb
-							.where('user.updatedAt IS NULL')
-							.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
-					}))
-					.andWhere('user.isSuspended = FALSE');
-
-				if (ps.origin === 'local') {
-					nameQuery.andWhere('user.host IS NULL');
-				} else if (ps.origin === 'remote') {
-					nameQuery.andWhere('user.host IS NOT NULL');
-				}
-
-				users = await nameQuery
-					.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
-					.limit(ps.limit)
-					.offset(ps.offset)
-					.getMany();
-
-				if (users.length < ps.limit) {
-					const profQuery = this.userProfilesRepository.createQueryBuilder('prof')
-						.select('prof.userId')
-						.where('prof.description ILIKE :query', { query: '%' + sqlLikeEscape(ps.query) + '%' });
-
-					if (ps.origin === 'local') {
-						profQuery.andWhere('prof.userHost IS NULL');
-					} else if (ps.origin === 'remote') {
-						profQuery.andWhere('prof.userHost IS NOT NULL');
+					if (isUsername) {
+						qb.orWhere('user.usernameLower LIKE :username', { username: sqlLikeEscape(ps.query.replace('@', '').toLowerCase()) + '%' });
+					} else if (this.userEntityService.validateLocalUsername(ps.query)) { // Also search username if it qualifies as username
+						qb.orWhere('user.usernameLower LIKE :username', { username: '%' + sqlLikeEscape(ps.query.toLowerCase()) + '%' });
 					}
+				}))
+				.andWhere(new Brackets(qb => {
+					qb
+						.where('user.updatedAt IS NULL')
+						.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
+				}))
+				.andWhere('user.isSuspended = FALSE');
 
-					const query = this.usersRepository.createQueryBuilder('user')
-						.where(`user.id IN (${ profQuery.getQuery() })`)
-						.andWhere(new Brackets(qb => {
-							qb
-								.where('user.updatedAt IS NULL')
-								.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
-						}))
-						.andWhere('user.isSuspended = FALSE')
-						.setParameters(profQuery.getParameters());
+			if (ps.origin === 'local') {
+				nameQuery.andWhere('user.host IS NULL');
+			} else if (ps.origin === 'remote') {
+				nameQuery.andWhere('user.host IS NOT NULL');
+			}
 
-					users = users.concat(await query
-						.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
-						.limit(ps.limit)
-						.offset(ps.offset)
-						.getMany(),
-					);
+			users = await nameQuery
+				.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
+				.limit(ps.limit)
+				.offset(ps.offset)
+				.getMany();
+
+			if (users.length < ps.limit) {
+				const profQuery = this.userProfilesRepository.createQueryBuilder('prof')
+					.select('prof.userId')
+					.where('prof.description ILIKE :query', { query: '%' + sqlLikeEscape(ps.query) + '%' });
+
+				if (ps.origin === 'local') {
+					profQuery.andWhere('prof.userHost IS NULL');
+				} else if (ps.origin === 'remote') {
+					profQuery.andWhere('prof.userHost IS NOT NULL');
 				}
+
+				const query = this.usersRepository.createQueryBuilder('user')
+					.where(`user.id IN (${ profQuery.getQuery() })`)
+					.andWhere(new Brackets(qb => {
+						qb
+							.where('user.updatedAt IS NULL')
+							.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
+					}))
+					.andWhere('user.isSuspended = FALSE')
+					.setParameters(profQuery.getParameters());
+
+				users = users.concat(await query
+					.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
+					.limit(ps.limit)
+					.offset(ps.offset)
+					.getMany(),
+				);
 			}
 
 			return await this.userEntityService.packMany(users, me, { schema: ps.detail ? 'UserDetailed' : 'UserLite' });
diff --git a/packages/frontend/src/components/MkInput.vue b/packages/frontend/src/components/MkInput.vue
index 88ef4635e6..e695564f92 100644
--- a/packages/frontend/src/components/MkInput.vue
+++ b/packages/frontend/src/components/MkInput.vue
@@ -79,7 +79,7 @@ const props = defineProps<{
 const emit = defineEmits<{
 	(ev: 'change', _ev: KeyboardEvent): void;
 	(ev: 'keydown', _ev: KeyboardEvent): void;
-	(ev: 'enter'): void;
+	(ev: 'enter', _ev: KeyboardEvent): void;
 	(ev: 'update:modelValue', value: string | number): void;
 }>();
 
@@ -111,7 +111,7 @@ const onKeydown = (ev: KeyboardEvent) => {
 	emit('keydown', ev);
 
 	if (ev.code === 'Enter') {
-		emit('enter');
+		emit('enter', ev);
 	}
 };
 
diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue
index 05dc77b94b..9cf7fbe8d8 100644
--- a/packages/frontend/src/pages/search.note.vue
+++ b/packages/frontend/src/pages/search.note.vue
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <div class="_gaps">
 	<div class="_gaps">
-		<MkInput v-model="searchQuery" :large="true" :autofocus="true" type="search" @enter="search">
+		<MkInput v-model="searchQuery" :large="true" :autofocus="true" type="search" @enter.prevent="search">
 			<template #prefix><i class="ti ti-search"></i></template>
 		</MkInput>
 		<MkFoldableSection :expanded="true">
@@ -143,25 +143,55 @@ async function search() {
 	if (query == null || query === '') return;
 
 	//#region AP lookup
-	if (query.startsWith('https://')) {
-		const promise = misskeyApi('ap/show', {
-			uri: query,
+	if (query.startsWith('https://') && !query.includes(' ')) {
+		const confirm = await os.confirm({
+			type: 'info',
+			text: i18n.ts.lookupConfirm,
 		});
+		if (!confirm.canceled) {
+			const promise = misskeyApi('ap/show', {
+				uri: query,
+			});
 
-		os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject);
+			os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject);
 
-		const res = await promise;
+			const res = await promise;
 
-		if (res.type === 'User') {
-			router.push(`/@${res.object.username}@${res.object.host}`);
-		} else if (res.type === 'Note') {
-			router.push(`/notes/${res.object.id}`);
+			if (res.type === 'User') {
+				router.push(`/@${res.object.username}@${res.object.host}`);
+			} else if (res.type === 'Note') {
+				router.push(`/notes/${res.object.id}`);
+			}
+
+			return;
 		}
-
-		return;
 	}
 	//#endregion
 
+	if (query.length > 1 && !query.includes(' ')) {
+		if (query.startsWith('@')) {
+			const confirm = await os.confirm({
+				type: 'info',
+				text: i18n.ts.lookupConfirm,
+			});
+			if (!confirm.canceled) {
+				router.push(`/${query}`);
+				return;
+			}
+		}
+
+		if (query.startsWith('#')) {
+			const confirm = await os.confirm({
+				type: 'info',
+				text: i18n.ts.openTagPageConfirm,
+			});
+			if (!confirm.canceled) {
+				router.push(`/tags/${encodeURIComponent(query.substring(1))}`);
+				return;
+			}
+		}
+	}
+
 	notePagination.value = {
 		endpoint: 'notes/search',
 		limit: 10,
diff --git a/packages/frontend/src/pages/search.user.vue b/packages/frontend/src/pages/search.user.vue
index 85d869d9cb..724fbfdfbd 100644
--- a/packages/frontend/src/pages/search.user.vue
+++ b/packages/frontend/src/pages/search.user.vue
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <div class="_gaps">
 	<div class="_gaps">
-		<MkInput v-model="searchQuery" :large="true" :autofocus="true" type="search" @enter="search">
+		<MkInput v-model="searchQuery" :large="true" :autofocus="true" type="search" @enter.prevent="search">
 			<template #prefix><i class="ti ti-search"></i></template>
 		</MkInput>
 		<MkRadios v-model="searchOrigin" @update:modelValue="search()">
@@ -39,8 +39,8 @@ import { misskeyApi } from '@/scripts/misskey-api.js';
 import { useRouter } from '@/router/supplier.js';
 
 const props = withDefaults(defineProps<{
-	query?: string,
-	origin?: Endpoints['users/search']['req']['origin'],
+  query?: string,
+  origin?: Endpoints['users/search']['req']['origin'],
 }>(), {
 	query: '',
 	origin: 'combined',
@@ -59,25 +59,55 @@ async function search() {
 	if (query == null || query === '') return;
 
 	//#region AP lookup
-	if (query.startsWith('https://')) {
-		const promise = misskeyApi('ap/show', {
-			uri: query,
+	if (query.startsWith('https://') && !query.includes(' ')) {
+		const confirm = await os.confirm({
+			type: 'info',
+			text: i18n.ts.lookupConfirm,
 		});
+		if (!confirm.canceled) {
+			const promise = misskeyApi('ap/show', {
+				uri: query,
+			});
 
-		os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject);
+			os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject);
 
-		const res = await promise;
+			const res = await promise;
 
-		if (res.type === 'User') {
-			router.push(`/@${res.object.username}@${res.object.host}`);
-		} else if (res.type === 'Note') {
-			router.push(`/notes/${res.object.id}`);
+			if (res.type === 'User') {
+				router.push(`/@${res.object.username}@${res.object.host}`);
+			} else if (res.type === 'Note') {
+				router.push(`/notes/${res.object.id}`);
+			}
+
+			return;
 		}
-
-		return;
 	}
 	//#endregion
 
+	if (query.length > 1 && !query.includes(' ')) {
+		if (query.startsWith('@')) {
+			const confirm = await os.confirm({
+				type: 'info',
+				text: i18n.ts.lookupConfirm,
+			});
+			if (!confirm.canceled) {
+				router.push(`/${query}`);
+				return;
+			}
+		}
+
+		if (query.startsWith('#')) {
+			const confirm = await os.confirm({
+				type: 'info',
+				text: i18n.ts.openTagPageConfirm,
+			});
+			if (!confirm.canceled) {
+				router.push(`/user-tags/${encodeURIComponent(query.substring(1))}`);
+				return;
+			}
+		}
+	}
+
 	userPagination.value = {
 		endpoint: 'users/search',
 		limit: 10,
diff --git a/packages/frontend/src/scripts/lookup.ts b/packages/frontend/src/scripts/lookup.ts
index 7f020b15cc..a261ec0669 100644
--- a/packages/frontend/src/scripts/lookup.ts
+++ b/packages/frontend/src/scripts/lookup.ts
@@ -16,7 +16,7 @@ export async function lookup(router?: Router) {
 		title: i18n.ts.lookup,
 	});
 	const query = temp ? temp.trim() : '';
-	if (canceled) return;
+	if (canceled || query.length <= 1) return;
 
 	if (query.startsWith('@') && !query.includes(' ')) {
 		_router.push(`/${query}`);

From 916ed49441b396e51d1c627bfcc24676903b9859 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 30 Jul 2024 19:20:37 +0900
Subject: [PATCH 135/221] New translations ja-jp.yml (English) (#14327)

---
 locales/en-US.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 95227357d7..cfb5783a95 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -60,6 +60,7 @@ copyFileId: "Copy file ID"
 copyFolderId: "Copy folder ID"
 copyProfileUrl: "Copy profile URL"
 searchUser: "Search for a user"
+searchThisUsersNotes: "Search this user’s notes"
 reply: "Reply"
 loadMore: "Load more"
 showMore: "Show more"
@@ -154,6 +155,7 @@ editList: "Edit list"
 selectChannel: "Select a channel"
 selectAntenna: "Select an antenna"
 editAntenna: "Edit antenna"
+createAntenna: "Create an antenna"
 selectWidget: "Select a widget"
 editWidgets: "Edit widgets"
 editWidgetsExit: "Done"
@@ -194,6 +196,7 @@ followConfirm: "Are you sure that you want to follow {name}?"
 proxyAccount: "Proxy account"
 proxyAccountDescription: "A proxy account is an account that acts as a remote follower for users under certain conditions. For example, when a user adds a remote user to the list, the remote user's activity will not be delivered to the instance if no local user is following that user, so the proxy account will follow instead."
 host: "Host"
+selectSelf: "Select myself"
 selectUser: "Select a user"
 recipient: "Recipient"
 annotation: "Comments"
@@ -1106,6 +1109,8 @@ preservedUsernames: "Reserved usernames"
 preservedUsernamesDescription: "List usernames to reserve separated by linebreaks. These will become unable during normal account creation, but can be used by administrators to manually create accounts. Already existing accounts using these usernames will not be affected."
 createNoteFromTheFile: "Compose note from this file"
 archive: "Archive"
+archived: "Archived"
+unarchive: "Unarchive"
 channelArchiveConfirmTitle: "Really archive {name}?"
 channelArchiveConfirmDescription: "An archived channel won't appear in the channel list or search results anymore. New posts can also not be added to it anymore."
 thisChannelArchived: "This channel has been archived."
@@ -1116,6 +1121,7 @@ preventAiLearning: "Reject usage in Machine Learning (Generative AI)"
 preventAiLearningDescription: "Requests crawlers to not use posted text or image material etc. in machine learning (Predictive / Generative AI) data sets. This is achieved by adding a \"noai\" HTML-Response flag to the respective content. A complete prevention can however not be achieved through this flag, as it may simply be ignored."
 options: "Options"
 specifyUser: "Specific user"
+specifyHost: "Specify a host"
 failedToPreviewUrl: "Could not preview"
 update: "Update"
 rolesThatCanBeUsedThisEmojiAsReaction: "Roles that can use this emoji as reaction"
@@ -1250,6 +1256,8 @@ inquiry: "Contact"
 tryAgain: "Please try again later"
 confirmWhenRevealingSensitiveMedia: "Confirm when revealing sensitive media"
 sensitiveMediaRevealConfirm: "This might be a sensitive media. Are you sure to reveal?"
+createdLists: "Created lists"
+createdAntennas: "Created antennas"
 _delivery:
   status: "Delivery status"
   stop: "Suspended"
@@ -2425,6 +2433,7 @@ _webhookSettings:
   _systemEvents:
     abuseReport: "When received a new abuse report"
     abuseReportResolved: "When resolved abuse reports"
+    userCreated: "When user is created"
   deleteConfirm: "Are you sure you want to delete the Webhook?"
 _abuseReport:
   _notificationRecipient:
@@ -2615,3 +2624,8 @@ _mediaControls:
   pip: "Picture in Picture"
   playbackRate: "Playback Speed"
   loop: "Loop playback"
+_contextMenu:
+  title: "Context menu"
+  app: "Application"
+  appWithShift: "Application with shift key"
+  native: "Native"

From 86b4f49880730256da4b281914f2be799977330f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2024 10:25:10 +0000
Subject: [PATCH 136/221] Bump version to 2024.7.0-rc.7

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 54fd36f11a..7846e5cb51 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.7.0-rc.6",
+	"version": "2024.7.0-rc.7",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index eec39349c5..8b9b0c6b44 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.7.0-rc.6",
+	"version": "2024.7.0-rc.7",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 8f40f932e4bac6b4a90a464041a00df315a3c693 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Tue, 30 Jul 2024 19:44:08 +0900
Subject: [PATCH 137/221] =?UTF-8?q?=E8=87=AA=E5=88=86=E3=81=AE=E3=83=95?=
 =?UTF-8?q?=E3=82=A9=E3=83=AD=E3=83=AF=E3=83=BC=E9=99=90=E5=AE=9A=E6=8A=95?=
 =?UTF-8?q?=E7=A8=BF=E3=81=AB=E5=AF=BE=E3=81=99=E3=82=8B=E3=83=AA=E3=83=97?=
 =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=81=8C=E3=83=9B=E3=83=BC=E3=83=A0=E3=82=BF?=
 =?UTF-8?q?=E3=82=A4=E3=83=A0=E3=83=A9=E3=82=A4=E3=83=B3=E3=81=A7=E8=A6=8B?=
 =?UTF-8?q?=E3=81=88=E3=81=AA=E3=81=84=E3=81=93=E3=81=A8=E3=81=8C=E6=9C=89?=
 =?UTF-8?q?=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(#1383?=
 =?UTF-8?q?5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: reply to my follower notes are not shown on the home timeline

* fix: reply to follower note by non-following is on social timeline

* docs: changelog

* test: add endpoint test for changes

* test(e2e): 自分のfollowers投稿に対するリプライが流れる

* test(e2e/streaming): 自分のfollowers投稿に対するリプライが流れる

* test(e2e/streaming): フォローしていないユーザによるフォロワー限定投稿に対するリプライがソーシャルタイムラインで表示されることがある問題

* test(e2e/timelines): try fixing typecheck error

---------

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
---
 CHANGELOG.md                                  |  2 +
 .../api/endpoints/notes/hybrid-timeline.ts    | 13 ++++
 .../server/api/endpoints/notes/timeline.ts    |  2 +-
 .../api/stream/channels/home-timeline.ts      |  4 +-
 .../api/stream/channels/hybrid-timeline.ts    | 12 ++-
 packages/backend/test/e2e/streaming.ts        | 62 +++++++++++++++
 packages/backend/test/e2e/timelines.ts        | 75 +++++++++++++++++++
 7 files changed, 165 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4051566651..28e4b236eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -109,6 +109,8 @@
   - NOTE: `drive_file`の`url`, `uri`, `src`の上限が512から1024に変更されます
 	  Migrationではカラム定義の変更のみが行われます。
 		サーバー管理者は各サーバーの必要に応じ`drive_file` `("uri")`に対するインデックスを張りなおすことでより安定しDBの探索が行われる可能性があります。詳細 は [GitHub](https://github.com/misskey-dev/misskey/pull/14323#issuecomment-2257562228)で確認可能です
+- Fix: 自分のフォロワー限定投稿に対するリプライがホームタイムラインで見えないことが有る問題を修正
+- Fix: フォローしていないユーザによるフォロワー限定投稿に対するリプライがソーシャルタイムラインで表示されることがある問題を修正
 
 ### Misskey.js
 - Feat: `/drive/files/create` のリクエストに対応（`multipart/form-data`に対応）
diff --git a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
index f6084b5763..2a2c659942 100644
--- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -143,6 +143,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				];
 			}
 
+			const [
+				followings,
+			] = await Promise.all([
+				this.cacheService.userFollowingsCache.fetch(me.id),
+			]);
+
 			const redisTimeline = await this.fanoutTimelineEndpointService.timeline({
 				untilId,
 				sinceId,
@@ -153,6 +159,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				useDbFallback: serverSettings.enableFanoutTimelineDbFallback,
 				alwaysIncludeMyNotes: true,
 				excludePureRenotes: !ps.withRenotes,
+				noteFilter: note => {
+					if (note.reply && note.reply.visibility === 'followers') {
+						if (!Object.hasOwn(followings, note.reply.userId) && note.reply.userId !== me.id) return false;
+					}
+
+					return true;
+				},
 				dbFallback: async (untilId, sinceId, limit) => await this.getFromDb({
 					untilId,
 					sinceId,
diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts
index 8b87908bd3..c9b43b5359 100644
--- a/packages/backend/src/server/api/endpoints/notes/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts
@@ -114,7 +114,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				excludePureRenotes: !ps.withRenotes,
 				noteFilter: note => {
 					if (note.reply && note.reply.visibility === 'followers') {
-						if (!Object.hasOwn(followings, note.reply.userId)) return false;
+						if (!Object.hasOwn(followings, note.reply.userId) && note.reply.userId !== me.id) return false;
 					}
 
 					return true;
diff --git a/packages/backend/src/server/api/stream/channels/home-timeline.ts b/packages/backend/src/server/api/stream/channels/home-timeline.ts
index 1f440732a6..66644ed58c 100644
--- a/packages/backend/src/server/api/stream/channels/home-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/home-timeline.ts
@@ -60,7 +60,7 @@ class HomeTimelineChannel extends Channel {
 			const reply = note.reply;
 			if (this.following[note.userId]?.withReplies) {
 				// 自分のフォローしていないユーザーの visibility: followers な投稿への返信は弾く
-				if (reply.visibility === 'followers' && !Object.hasOwn(this.following, reply.userId)) return;
+				if (reply.visibility === 'followers' && !Object.hasOwn(this.following, reply.userId) && reply.userId !== this.user!.id) return;
 			} else {
 				// 「チャンネル接続主への返信」でもなければ、「チャンネル接続主が行った返信」でもなければ、「投稿者の投稿者自身への返信」でもない場合
 				if (reply.userId !== this.user!.id && !isMe && reply.userId !== note.userId) return;
@@ -73,7 +73,7 @@ class HomeTimelineChannel extends Channel {
 			if (note.renote.reply) {
 				const reply = note.renote.reply;
 				// 自分のフォローしていないユーザーの visibility: followers な投稿への返信のリノートは弾く
-				if (reply.visibility === 'followers' && !Object.hasOwn(this.following, reply.userId)) return;
+				if (reply.visibility === 'followers' && !Object.hasOwn(this.following, reply.userId) && reply.userId !== this.user!.id) return;
 			}
 		}
 
diff --git a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
index 6938b6e3ea..75bd13221f 100644
--- a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
@@ -76,14 +76,22 @@ class HybridTimelineChannel extends Channel {
 			const reply = note.reply;
 			if ((this.following[note.userId]?.withReplies ?? false) || this.withReplies) {
 				// 自分のフォローしていないユーザーの visibility: followers な投稿への返信は弾く
-				if (reply.visibility === 'followers' && !Object.hasOwn(this.following, reply.userId)) return;
+				if (reply.visibility === 'followers' && !Object.hasOwn(this.following, reply.userId) && reply.userId !== this.user!.id) return;
 			} else {
 				// 「チャンネル接続主への返信」でもなければ、「チャンネル接続主が行った返信」でもなければ、「投稿者の投稿者自身への返信」でもない場合
 				if (reply.userId !== this.user!.id && !isMe && reply.userId !== note.userId) return;
 			}
 		}
 
-		if (isRenotePacked(note) && !isQuotePacked(note) && !this.withRenotes) return;
+		// 純粋なリノート（引用リノートでないリノート）の場合
+		if (isRenotePacked(note) && !isQuotePacked(note) && note.renote) {
+			if (!this.withRenotes) return;
+			if (note.renote.reply) {
+				const reply = note.renote.reply;
+				// 自分のフォローしていないユーザーの visibility: followers な投稿への返信のリノートは弾く
+				if (reply.visibility === 'followers' && !Object.hasOwn(this.following, reply.userId) && reply.userId !== this.user!.id) return;
+			}
+		}
 
 		if (this.user && note.renoteId && !note.text) {
 			if (note.renote && Object.keys(note.renote.reactions).length > 0) {
diff --git a/packages/backend/test/e2e/streaming.ts b/packages/backend/test/e2e/streaming.ts
index b0a70074c6..72f26a38e0 100644
--- a/packages/backend/test/e2e/streaming.ts
+++ b/packages/backend/test/e2e/streaming.ts
@@ -34,6 +34,7 @@ describe('Streaming', () => {
 		let kyoko: misskey.entities.SignupResponse;
 		let chitose: misskey.entities.SignupResponse;
 		let kanako: misskey.entities.SignupResponse;
+		let erin: misskey.entities.SignupResponse;
 
 		// Remote users
 		let akari: misskey.entities.SignupResponse;
@@ -53,6 +54,7 @@ describe('Streaming', () => {
 			kyoko = await signup({ username: 'kyoko' });
 			chitose = await signup({ username: 'chitose' });
 			kanako = await signup({ username: 'kanako' });
+			erin = await signup({ username: 'erin' }); // erin:  A generic fifth participant
 
 			akari = await signup({ username: 'akari', host: 'example.com' });
 			chinatsu = await signup({ username: 'chinatsu', host: 'example.com' });
@@ -71,6 +73,12 @@ describe('Streaming', () => {
 			// Follow: kyoko => chitose
 			await api('following/create', { userId: chitose.id }, kyoko);
 
+			// Follow: erin <=> ayano each other.
+			// erin => ayano: withReplies: true
+			await api('following/create', { userId: ayano.id, withReplies: true }, erin);
+			// ayano => erin: withReplies: false
+			await api('following/create', { userId: erin.id, withReplies: false }, ayano);
+
 			// Mute: chitose => kanako
 			await api('mute/create', { userId: kanako.id }, chitose);
 
@@ -297,6 +305,28 @@ describe('Streaming', () => {
 
 				assert.strictEqual(fired, true);
 			});
+
+			test('withReplies: true のとき自分のfollowers投稿に対するリプライが流れる', async () => {
+				const erinNote = await post(erin, { text: 'hi', visibility: 'followers' });
+				const fired = await waitFire(
+					erin, 'homeTimeline',	// erin:home
+					() => api('notes/create', { text: 'hello', replyId: erinNote.id }, ayano),	// ayano reply to erin's followers post
+					msg => msg.type === 'note' && msg.body.userId === ayano.id,	// wait ayano
+				);
+
+				assert.strictEqual(fired, true);
+			});
+
+			test('withReplies: false でも自分の投稿に対するリプライが流れる', async () => {
+				const ayanoNote = await post(ayano, { text: 'hi', visibility: 'followers' });
+				const fired = await waitFire(
+					ayano, 'homeTimeline',	// ayano:home
+					() => api('notes/create', { text: 'hello', replyId: ayanoNote.id }, erin),	// erin reply to ayano's followers post
+					msg => msg.type === 'note' && msg.body.userId === erin.id,	// wait erin
+				);
+
+				assert.strictEqual(fired, true);
+			});
 		});	// Home
 
 		describe('Local Timeline', () => {
@@ -475,6 +505,38 @@ describe('Streaming', () => {
 
 				assert.strictEqual(fired, false);
 			});
+
+			test('withReplies: true のとき自分のfollowers投稿に対するリプライが流れる', async () => {
+				const erinNote = await post(erin, { text: 'hi', visibility: 'followers' });
+				const fired = await waitFire(
+					erin, 'homeTimeline',	// erin:home
+					() => api('notes/create', { text: 'hello', replyId: erinNote.id }, ayano),	// ayano reply to erin's followers post
+					msg => msg.type === 'note' && msg.body.userId === ayano.id,	// wait ayano
+				);
+
+				assert.strictEqual(fired, true);
+			});
+
+			test('withReplies: false でも自分の投稿に対するリプライが流れる', async () => {
+				const ayanoNote = await post(ayano, { text: 'hi', visibility: 'followers' });
+				const fired = await waitFire(
+					ayano, 'homeTimeline',	// ayano:home
+					() => api('notes/create', { text: 'hello', replyId: ayanoNote.id }, erin),	// erin reply to ayano's followers post
+					msg => msg.type === 'note' && msg.body.userId === erin.id,	// wait erin
+				);
+
+				assert.strictEqual(fired, true);
+			});
+
+			test('withReplies: true のフォローしていない人のfollowersノートに対するリプライが流れない', async () => {
+				const fired = await waitFire(
+					erin, 'homeTimeline',	// erin:home
+					() => api('notes/create', { text: 'hello', replyId: chitose.id }, ayano),	// ayano reply to chitose's post
+					msg => msg.type === 'note' && msg.body.userId === ayano.id,	// wait ayano
+				);
+
+				assert.strictEqual(fired, false);
+			});
 		});
 
 		describe('Global Timeline', () => {
diff --git a/packages/backend/test/e2e/timelines.ts b/packages/backend/test/e2e/timelines.ts
index ab65781f70..b7069dd82c 100644
--- a/packages/backend/test/e2e/timelines.ts
+++ b/packages/backend/test/e2e/timelines.ts
@@ -127,6 +127,7 @@ describe('Timelines', () => {
 		test.concurrent('withReplies: true でフォローしているユーザーの他人の visibility: followers な投稿への返信が含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
+			await api('following/create', { userId: carol.id }, bob);
 			await api('following/create', { userId: bob.id }, alice);
 			await api('following/update', { userId: bob.id, withReplies: true }, alice);
 			await setTimeout(1000);
@@ -161,6 +162,24 @@ describe('Timelines', () => {
 			assert.strictEqual(res.body.find(note => note.id === carolNote.id)?.text, 'hi');
 		});
 
+		test.concurrent('withReplies: true でフォローしているユーザーの自分の visibility: followers な投稿への返信が含まれる', async () => {
+			const [alice, bob] = await Promise.all([signup(), signup()]);
+
+			await api('following/create', { userId: bob.id }, alice);
+			await api('following/create', { userId: alice.id }, bob);
+			await api('following/update', { userId: bob.id, withReplies: true }, alice);
+			await setTimeout(1000);
+			const aliceNote = await post(alice, { text: 'hi', visibility: 'followers' });
+			const bobNote = await post(bob, { text: 'hi', replyId: aliceNote.id });
+
+			await waitForPushToTl();
+
+			const res = await api('notes/timeline', { limit: 100 }, alice);
+
+			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
+		});
+
 		test.concurrent('withReplies: true でフォローしているユーザーの行った別のフォローしているユーザーの投稿への visibility: specified な返信が含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
@@ -768,6 +787,62 @@ describe('Timelines', () => {
 			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
+		test.concurrent('withReplies: true でフォローしているユーザーの他人の visibility: followers な投稿への返信が含まれない', async () => {
+			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
+
+			await api('following/create', { userId: carol.id }, bob);
+			await api('following/create', { userId: bob.id }, alice);
+			await api('following/update', { userId: bob.id, withReplies: true }, alice);
+			await setTimeout(1000);
+			const carolNote = await post(carol, { text: 'hi', visibility: 'followers' });
+			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
+
+			await waitForPushToTl();
+
+			const res = await api('notes/hybrid-timeline', { limit: 100 }, alice);
+
+			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
+			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), false);
+		});
+
+		test.concurrent('withReplies: true でフォローしているユーザーの行った別のフォローしているユーザーの visibility: followers な投稿への返信が含まれる', async () => {
+			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
+
+			await api('following/create', { userId: bob.id }, alice);
+			await api('following/create', { userId: carol.id }, alice);
+			await api('following/create', { userId: carol.id }, bob);
+			await api('following/update', { userId: bob.id, withReplies: true }, alice);
+			await setTimeout(1000);
+			const carolNote = await post(carol, { text: 'hi', visibility: 'followers' });
+			const bobNote = await post(bob, { text: 'hi', replyId: carolNote.id });
+
+			await waitForPushToTl();
+
+			const res = await api('notes/hybrid-timeline', { limit: 100 }, alice);
+
+			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some((note: any) => note.id === carolNote.id), true);
+			assert.strictEqual(res.body.find((note: any) => note.id === carolNote.id)?.text, 'hi');
+		});
+
+		test.concurrent('withReplies: true でフォローしているユーザーの自分の visibility: followers な投稿への返信が含まれる', async () => {
+			const [alice, bob] = await Promise.all([signup(), signup()]);
+
+			await api('following/create', { userId: bob.id }, alice);
+			await api('following/create', { userId: alice.id }, bob);
+			await api('following/update', { userId: bob.id, withReplies: true }, alice);
+			await setTimeout(1000);
+			const aliceNote = await post(alice, { text: 'hi', visibility: 'followers' });
+			const bobNote = await post(bob, { text: 'hi', replyId: aliceNote.id });
+
+			await waitForPushToTl();
+
+			const res = await api('notes/hybrid-timeline', { limit: 100 }, alice);
+
+			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some((note: any) => note.id === aliceNote.id), true);
+		});
+
 		test.concurrent('他人の他人への返信が含まれない', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 

From 5c42a0e43931f62490c44e389db893b6bfe9e349 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Tue, 30 Jul 2024 19:47:45 +0900
Subject: [PATCH 138/221] feat: media silence (#13842)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: media silence

* fix: lint

* feat: deny creating custom emoji reaction and using custom emoji from media silenced hosts

* chore: メディアサイレンスの説明にカスタム絵文字の話を追加

* Update locales/ja-JP.yml

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>

* chore: update index.d.ts

* docs(changelog): update changelog

---------

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
---
 CHANGELOG.md                                  |  2 ++
 locales/index.d.ts                            | 12 +++++++++
 locales/ja-JP.yml                             |  3 +++
 .../1716197366117-MediaSilenceForHosts.js     | 16 +++++++++++
 packages/backend/src/core/DriveService.ts     |  3 +++
 .../backend/src/core/NoteCreateService.ts     |  3 +++
 packages/backend/src/core/ReactionService.ts  |  9 +++++--
 packages/backend/src/core/UtilityService.ts   |  6 +++++
 .../core/entities/InstanceEntityService.ts    |  1 +
 packages/backend/src/models/Meta.ts           |  5 ++++
 .../models/json-schema/federation-instance.ts |  4 +++
 .../src/server/api/endpoints/admin/meta.ts    | 11 ++++++++
 .../server/api/endpoints/admin/update-meta.ts | 15 +++++++++++
 .../src/pages/admin/instance-block.vue        | 27 +++++++++++++------
 packages/frontend/src/pages/instance-info.vue | 15 ++++++++++-
 packages/misskey-js/src/autogen/types.ts      |  3 +++
 16 files changed, 124 insertions(+), 11 deletions(-)
 create mode 100644 packages/backend/migration/1716197366117-MediaSilenceForHosts.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28e4b236eb..27308cb8bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@
 - Feat: ユーザーのアイコン/バナーの変更可否をロールで設定可能に
   - 変更不可となっていても、設定済みのものを解除してデフォルト画像に戻すことは出来ます
 - Feat: ユーザ作成時にSystemWebhookを送信可能に #14281
+- Feat: メディアサイレンスを実装 #13842
+  - メディアサイレンスされたサーバーに所属するアカウントによるファイルはすべてセンシティブとして扱われ、カスタム絵文字が使用できないようになります。
 - Enhance: 管理画面でアーカイブにしたお知らせを表示・編集できるように
 - Fix: 配信停止したインスタンス一覧が見れなくなる問題を修正
 - Fix: Dockerコンテナの立ち上げ時に`pnpm`のインストールで固まることがある問題
diff --git a/locales/index.d.ts b/locales/index.d.ts
index aee0b6127e..f03207e0bd 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -864,6 +864,10 @@ export interface Locale extends ILocale {
      * サーバーをサイレンス
      */
     "silenceThisInstance": string;
+    /**
+     * サーバーをメディアサイレンス
+     */
+    "mediaSilenceThisInstance": string;
     /**
      * 操作
      */
@@ -948,6 +952,14 @@ export interface Locale extends ILocale {
      * サイレンスしたいサーバーのホストを改行で区切って設定します。サイレンスされたサーバーに所属するアカウントはすべて「サイレンス」として扱われ、フォローがすべてリクエストになります。ブロックしたインスタンスには影響しません。
      */
     "silencedInstancesDescription": string;
+    /**
+     * メディアサイレンスしたサーバー
+     */
+    "mediaSilencedInstances": string;
+    /**
+     * メディアサイレンスしたいサーバーのホストを改行で区切って設定します。メディアサイレンスされたサーバーに所属するアカウントによるファイルはすべてセンシティブとして扱われ、カスタム絵文字が使用できないようになります。ブロックしたインスタンスには影響しません。
+     */
+    "mediaSilencedInstancesDescription": string;
     /**
      * ミュートとブロック
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 9b907f0971..d4931ae90d 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -212,6 +212,7 @@ perDay: "1日ごと"
 stopActivityDelivery: "アクティビティの配送を停止"
 blockThisInstance: "このサーバーをブロック"
 silenceThisInstance: "サーバーをサイレンス"
+mediaSilenceThisInstance: "サーバーをメディアサイレンス"
 operations: "操作"
 software: "ソフトウェア"
 version: "バージョン"
@@ -233,6 +234,8 @@ blockedInstances: "ブロックしたサーバー"
 blockedInstancesDescription: "ブロックしたいサーバーのホストを改行で区切って設定します。ブロックされたサーバーは、このインスタンスとやり取りできなくなります。"
 silencedInstances: "サイレンスしたサーバー"
 silencedInstancesDescription: "サイレンスしたいサーバーのホストを改行で区切って設定します。サイレンスされたサーバーに所属するアカウントはすべて「サイレンス」として扱われ、フォローがすべてリクエストになります。ブロックしたインスタンスには影響しません。"
+mediaSilencedInstances: "メディアサイレンスしたサーバー"
+mediaSilencedInstancesDescription: "メディアサイレンスしたいサーバーのホストを改行で区切って設定します。メディアサイレンスされたサーバーに所属するアカウントによるファイルはすべてセンシティブとして扱われ、カスタム絵文字が使用できないようになります。ブロックしたインスタンスには影響しません。"
 muteAndBlock: "ミュートとブロック"
 mutedUsers: "ミュートしたユーザー"
 blockedUsers: "ブロックしたユーザー"
diff --git a/packages/backend/migration/1716197366117-MediaSilenceForHosts.js b/packages/backend/migration/1716197366117-MediaSilenceForHosts.js
new file mode 100644
index 0000000000..10bb7f0255
--- /dev/null
+++ b/packages/backend/migration/1716197366117-MediaSilenceForHosts.js
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class MediaSilenceForHosts1716197366117 {
+    name = 'MediaSilenceForHosts1716197366117'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "mediaSilencedHosts" character varying(1024) array NOT NULL DEFAULT '{}'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "mediaSilencedHosts"`);
+    }
+}
diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts
index 37c5d1adf7..8aa04b4da7 100644
--- a/packages/backend/src/core/DriveService.ts
+++ b/packages/backend/src/core/DriveService.ts
@@ -43,6 +43,7 @@ import { RoleService } from '@/core/RoleService.js';
 import { correctFilename } from '@/misc/correct-filename.js';
 import { isMimeImage } from '@/misc/is-mime-image.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { UtilityService } from '@/core/UtilityService.js';
 
 type AddFileArgs = {
 	/** User who wish to add file */
@@ -127,6 +128,7 @@ export class DriveService {
 		private driveChart: DriveChart,
 		private perUserDriveChart: PerUserDriveChart,
 		private instanceChart: InstanceChart,
+		private utilityService: UtilityService,
 	) {
 		const logger = new Logger('drive', 'blue');
 		this.registerLogger = logger.createSubLogger('register', 'yellow');
@@ -587,6 +589,7 @@ export class DriveService {
 			sensitive ?? false
 			: false;
 
+		if (user && this.utilityService.isMediaSilencedHost(instance.mediaSilencedHosts, user.host)) file.isSensitive = true;
 		if (info.sensitive && profile!.autoSensitive) file.isSensitive = true;
 		if (info.sensitive && instance.setSensitiveFlagAutomatically) file.isSensitive = true;
 		if (userRoleNSFW) file.isSensitive = true;
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index fd9fac357f..32cf3f3e26 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -364,6 +364,9 @@ export class NoteCreateService implements OnApplicationShutdown {
 			mentionedUsers = data.apMentions ?? await this.extractMentionedUsers(user, combinedTokens);
 		}
 
+		// if the host is media-silenced, custom emojis are not allowed
+		if (this.utilityService.isMediaSilencedHost(meta.mediaSilencedHosts, user.host)) emojis = [];
+
 		tags = tags.filter(tag => Array.from(tag).length <= 128).splice(0, 32);
 
 		if (data.reply && (user.id !== data.reply.userId) && !mentionedUsers.some(u => u.id === data.reply!.userId)) {
diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index 64c7b2ed03..371207c33a 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -105,6 +105,8 @@ export class ReactionService {
 
 	@bindThis
 	public async create(user: { id: MiUser['id']; host: MiUser['host']; isBot: MiUser['isBot'] }, note: MiNote, _reaction?: string | null) {
+		const meta = await this.metaService.fetch();
+
 		// Check blocking
 		if (note.userId !== user.id) {
 			const blocked = await this.userBlockingService.checkBlocked(note.userId, user.id);
@@ -148,6 +150,11 @@ export class ReactionService {
 						if ((note.reactionAcceptance === 'nonSensitiveOnly' || note.reactionAcceptance === 'nonSensitiveOnlyForLocalLikeOnlyForRemote') && emoji.isSensitive) {
 							reaction = FALLBACK;
 						}
+
+						// for media silenced host, custom emoji reactions are not allowed
+						if (reacterHost != null && this.utilityService.isMediaSilencedHost(meta.mediaSilencedHosts, reacterHost)) {
+							reaction = FALLBACK;
+						}
 					} else {
 						// リアクションとして使う権限がない
 						reaction = FALLBACK;
@@ -220,8 +227,6 @@ export class ReactionService {
 			}
 		}
 
-		const meta = await this.metaService.fetch();
-
 		if (meta.enableChartsForRemoteUser || (user.host == null)) {
 			this.perUserReactionsChart.update(user, note);
 		}
diff --git a/packages/backend/src/core/UtilityService.ts b/packages/backend/src/core/UtilityService.ts
index 652e8f7449..94729250a6 100644
--- a/packages/backend/src/core/UtilityService.ts
+++ b/packages/backend/src/core/UtilityService.ts
@@ -42,6 +42,12 @@ export class UtilityService {
 		return silencedHosts.some(x => `.${host.toLowerCase()}`.endsWith(`.${x}`));
 	}
 
+	@bindThis
+	public isMediaSilencedHost(silencedHosts: string[] | undefined, host: string | null): boolean {
+		if (!silencedHosts || host == null) return false;
+		return silencedHosts.some(x => host.toLowerCase() === x);
+	}
+
 	@bindThis
 	public concatNoteContentsForKeyWordCheck(content: {
 		cw?: string | null;
diff --git a/packages/backend/src/core/entities/InstanceEntityService.ts b/packages/backend/src/core/entities/InstanceEntityService.ts
index 9117b13914..4c45c13167 100644
--- a/packages/backend/src/core/entities/InstanceEntityService.ts
+++ b/packages/backend/src/core/entities/InstanceEntityService.ts
@@ -50,6 +50,7 @@ export class InstanceEntityService {
 			maintainerName: instance.maintainerName,
 			maintainerEmail: instance.maintainerEmail,
 			isSilenced: this.utilityService.isSilencedHost(meta.silencedHosts, instance.host),
+			isMediaSilenced: this.utilityService.isMediaSilencedHost(meta.mediaSilencedHosts, instance.host),
 			iconUrl: instance.iconUrl,
 			faviconUrl: instance.faviconUrl,
 			themeColor: instance.themeColor,
diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts
index ad306fcad6..70d41801b5 100644
--- a/packages/backend/src/models/Meta.ts
+++ b/packages/backend/src/models/Meta.ts
@@ -86,6 +86,11 @@ export class MiMeta {
 	})
 	public silencedHosts: string[];
 
+	@Column('varchar', {
+		length: 1024, array: true, default: '{}',
+	})
+	public mediaSilencedHosts: string[];
+
 	@Column('varchar', {
 		length: 1024,
 		nullable: true,
diff --git a/packages/backend/src/models/json-schema/federation-instance.ts b/packages/backend/src/models/json-schema/federation-instance.ts
index ed40d405c6..912a0399d8 100644
--- a/packages/backend/src/models/json-schema/federation-instance.ts
+++ b/packages/backend/src/models/json-schema/federation-instance.ts
@@ -88,6 +88,10 @@ export const packedFederationInstanceSchema = {
 			type: 'boolean',
 			optional: false, nullable: false,
 		},
+		isMediaSilenced: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
 		iconUrl: {
 			type: 'string',
 			optional: false, nullable: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index eee02a7123..2e7f73da73 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -128,6 +128,16 @@ export const meta = {
 					nullable: false,
 				},
 			},
+			mediaSilencedHosts: {
+				type: 'array',
+				optional: false,
+				nullable: false,
+				items: {
+					type: 'string',
+					optional: false,
+					nullable: false,
+				},
+			},
 			pinnedUsers: {
 				type: 'array',
 				optional: false, nullable: false,
@@ -552,6 +562,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				hiddenTags: instance.hiddenTags,
 				blockedHosts: instance.blockedHosts,
 				silencedHosts: instance.silencedHosts,
+				mediaSilencedHosts: instance.mediaSilencedHosts,
 				sensitiveWords: instance.sensitiveWords,
 				prohibitedWords: instance.prohibitedWords,
 				preservedUsernames: instance.preservedUsernames,
diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
index 4e28ee6877..5efdc9d8c4 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -150,6 +150,13 @@ export const paramDef = {
 				type: 'string',
 			},
 		},
+		mediaSilencedHosts: {
+			type: 'array',
+			nullable: true,
+			items: {
+				type: 'string',
+			},
+		},
 		summalyProxy: {
 			type: 'string', nullable: true,
 			description: '[Deprecated] Use "urlPreviewSummaryProxyUrl" instead.',
@@ -203,6 +210,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					return h !== '' && h !== lv && !set.blockedHosts?.includes(h);
 				});
 			}
+			if (Array.isArray(ps.mediaSilencedHosts)) {
+				let lastValue = '';
+				set.mediaSilencedHosts = ps.mediaSilencedHosts.sort().filter((h) => {
+					const lv = lastValue;
+					lastValue = h;
+					return h !== '' && h !== lv && !set.blockedHosts?.includes(h);
+				});
+			}
 			if (ps.themeColor !== undefined) {
 				set.themeColor = ps.themeColor;
 			}
diff --git a/packages/frontend/src/pages/admin/instance-block.vue b/packages/frontend/src/pages/admin/instance-block.vue
index 6b14bd42c2..e090616b26 100644
--- a/packages/frontend/src/pages/admin/instance-block.vue
+++ b/packages/frontend/src/pages/admin/instance-block.vue
@@ -8,14 +8,22 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #header><XHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
 		<FormSuspense :p="init">
-			<MkTextarea v-if="tab === 'block'" v-model="blockedHosts">
-				<span>{{ i18n.ts.blockedInstances }}</span>
-				<template #caption>{{ i18n.ts.blockedInstancesDescription }}</template>
-			</MkTextarea>
-			<MkTextarea v-else-if="tab === 'silence'" v-model="silencedHosts" class="_formBlock">
-				<span>{{ i18n.ts.silencedInstances }}</span>
-				<template #caption>{{ i18n.ts.silencedInstancesDescription }}</template>
-			</MkTextarea>
+			<template v-if="tab === 'block'">
+				<MkTextarea v-model="blockedHosts">
+					<span>{{ i18n.ts.blockedInstances }}</span>
+					<template #caption>{{ i18n.ts.blockedInstancesDescription }}</template>
+				</MkTextarea>
+			</template>
+			<template v-else-if="tab === 'silence'">
+				<MkTextarea v-model="silencedHosts" class="_formBlock">
+					<span>{{ i18n.ts.silencedInstances }}</span>
+					<template #caption>{{ i18n.ts.silencedInstancesDescription }}</template>
+				</MkTextarea>
+				<MkTextarea v-model="mediaSilencedHosts" class="_formBlock">
+					<span>{{ i18n.ts.mediaSilencedInstances }}</span>
+					<template #caption>{{ i18n.ts.mediaSilencedInstancesDescription }}</template>
+				</MkTextarea>
+			</template>
 			<MkButton primary @click="save"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton>
 		</FormSuspense>
 	</MkSpacer>
@@ -36,18 +44,21 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
 
 const blockedHosts = ref<string>('');
 const silencedHosts = ref<string>('');
+const mediaSilencedHosts = ref<string>('');
 const tab = ref('block');
 
 async function init() {
 	const meta = await misskeyApi('admin/meta');
 	blockedHosts.value = meta.blockedHosts.join('\n');
 	silencedHosts.value = meta.silencedHosts.join('\n');
+	mediaSilencedHosts.value = meta.mediaSilencedHosts.join('\n');
 }
 
 function save() {
 	os.apiWithDialog('admin/update-meta', {
 		blockedHosts: blockedHosts.value.split('\n') || [],
 		silencedHosts: silencedHosts.value.split('\n') || [],
+		mediaSilencedHosts: mediaSilencedHosts.value.split('\n') || [],
 
 	}).then(() => {
 		fetchInstance(true);
diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 26797ba85e..4ba428d536 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -47,6 +47,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<MkButton v-if="suspensionState !== 'none'" :disabled="!instance" @click="resumeDelivery">{{ i18n.ts._delivery.resume }}</MkButton>
 						<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>
+						<MkSwitch v-model="isMediaSilenced" :disabled="!meta || !instance" @update:modelValue="toggleMediaSilenced">{{ i18n.ts.mediaSilenceThisInstance }}</MkSwitch>
 						<MkButton @click="refreshMetadata"><i class="ti ti-refresh"></i> Refresh metadata</MkButton>
 						<MkTextarea v-model="moderationNote" manualSave>
 							<template #label>{{ i18n.ts.moderationNote }}</template>
@@ -167,6 +168,7 @@ const instance = ref<Misskey.entities.FederationInstance | null>(null);
 const suspensionState = ref<'none' | 'manuallySuspended' | 'goneSuspended' | 'autoSuspendedForNotResponding'>('none');
 const isBlocked = ref(false);
 const isSilenced = ref(false);
+const isMediaSilenced = ref(false);
 const faviconUrl = ref<string | null>(null);
 const moderationNote = ref('');
 
@@ -195,8 +197,9 @@ async function fetch(): Promise<void> {
 	suspensionState.value = instance.value?.suspensionState ?? 'none';
 	isBlocked.value = instance.value?.isBlocked ?? false;
 	isSilenced.value = instance.value?.isSilenced ?? false;
+	isMediaSilenced.value = instance.value?.isMediaSilenced ?? false;
 	faviconUrl.value = getProxiedImageUrlNullable(instance.value?.faviconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.value?.iconUrl, 'preview');
-	moderationNote.value = instance.value?.moderationNote;
+	moderationNote.value = instance.value?.moderationNote ?? '';
 }
 
 async function toggleBlock(): Promise<void> {
@@ -218,6 +221,16 @@ async function toggleSilenced(): Promise<void> {
 	});
 }
 
+async function toggleMediaSilenced(): Promise<void> {
+	if (!meta.value) throw new Error('No meta?');
+	if (!instance.value) throw new Error('No instance?');
+	const { host } = instance.value;
+	const mediaSilencedHosts = meta.value.mediaSilencedHosts ?? [];
+	await misskeyApi('admin/update-meta', {
+		mediaSilencedHosts: isMediaSilenced.value ? mediaSilencedHosts.concat([host]) : mediaSilencedHosts.filter(x => x !== host),
+	});
+}
+
 async function stopDelivery(): Promise<void> {
 	if (!instance.value) throw new Error('No instance?');
 	suspensionState.value = 'manuallySuspended';
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index cb7d82d2d8..db5efd4a00 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4599,6 +4599,7 @@ export type components = {
       maintainerName: string | null;
       maintainerEmail: string | null;
       isSilenced: boolean;
+      isMediaSilenced: boolean;
       /** Format: url */
       iconUrl: string | null;
       /** Format: url */
@@ -5044,6 +5045,7 @@ export type operations = {
             enableServiceWorker: boolean;
             translatorAvailable: boolean;
             silencedHosts?: string[];
+            mediaSilencedHosts: string[];
             pinnedUsers: string[];
             hiddenTags: string[];
             blockedHosts: string[];
@@ -9371,6 +9373,7 @@ export type operations = {
           perUserListTimelineCacheMax?: number;
           notesPerOneAd?: number;
           silencedHosts?: string[] | null;
+          mediaSilencedHosts?: string[] | null;
           /** @description [Deprecated] Use "urlPreviewSummaryProxyUrl" instead. */
           summalyProxy?: string | null;
           urlPreviewEnabled?: boolean;

From c7354c5e306c80d25db838ff64d4f3d26a47bd7f Mon Sep 17 00:00:00 2001
From: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
Date: Tue, 30 Jul 2024 19:48:16 +0900
Subject: [PATCH 139/221] test(#10336): add `components/Mk[D-E].*` stories
 (#14118)

* test(storybook): add `components/Mk[D-E].*` stories

* fix: mock instance name

* fix: invalid `reactionAcceptance` value

* style: missing trailing commas
---
 packages/frontend/.storybook/fakes.ts         |  52 ++++--
 packages/frontend/.storybook/generate.tsx     |   3 +-
 .../MkDateSeparatedList.stories.impl.ts       |   7 +
 .../src/components/MkDialog.stories.impl.ts   | 159 ++++++++++++++++++
 .../src/components/MkDivider.stories.impl.ts  |   7 +
 .../src/components/MkDonation.stories.impl.ts |  54 ++++++
 .../components/MkDrive.file.stories.impl.ts   |  48 ++++++
 .../components/MkDrive.folder.stories.impl.ts |  70 ++++++++
 .../MkDrive.navFolder.stories.impl.ts         |   7 +
 .../src/components/MkDrive.stories.impl.ts    |  82 +++++++++
 .../MkDriveFileThumbnail.stories.impl.ts      |  41 +++++
 .../src/components/MkDriveFileThumbnail.vue   |   2 +-
 .../MkDriveSelectDialog.stories.impl.ts       |   7 +
 .../components/MkDriveWindow.stories.impl.ts  |   7 +
 .../MkEmojiPicker.section.stories.impl.ts     |   7 +
 .../components/MkEmojiPicker.stories.impl.ts  |  54 ++++++
 .../MkEmojiPickerDialog.stories.impl.ts       |   7 +
 17 files changed, 597 insertions(+), 17 deletions(-)
 create mode 100644 packages/frontend/src/components/MkDateSeparatedList.stories.impl.ts
 create mode 100644 packages/frontend/src/components/MkDialog.stories.impl.ts
 create mode 100644 packages/frontend/src/components/MkDivider.stories.impl.ts
 create mode 100644 packages/frontend/src/components/MkDonation.stories.impl.ts
 create mode 100644 packages/frontend/src/components/MkDrive.file.stories.impl.ts
 create mode 100644 packages/frontend/src/components/MkDrive.folder.stories.impl.ts
 create mode 100644 packages/frontend/src/components/MkDrive.navFolder.stories.impl.ts
 create mode 100644 packages/frontend/src/components/MkDrive.stories.impl.ts
 create mode 100644 packages/frontend/src/components/MkDriveFileThumbnail.stories.impl.ts
 create mode 100644 packages/frontend/src/components/MkDriveSelectDialog.stories.impl.ts
 create mode 100644 packages/frontend/src/components/MkDriveWindow.stories.impl.ts
 create mode 100644 packages/frontend/src/components/MkEmojiPicker.section.stories.impl.ts
 create mode 100644 packages/frontend/src/components/MkEmojiPicker.stories.impl.ts
 create mode 100644 packages/frontend/src/components/MkEmojiPickerDialog.stories.impl.ts

diff --git a/packages/frontend/.storybook/fakes.ts b/packages/frontend/.storybook/fakes.ts
index 01f1046609..ab04d3e60c 100644
--- a/packages/frontend/.storybook/fakes.ts
+++ b/packages/frontend/.storybook/fakes.ts
@@ -47,18 +47,7 @@ export function clip(id = 'someclipid', name = 'Some Clip'): entities.Clip {
 		createdAt: '2016-12-28T22:49:51.000Z',
 		lastClippedAt: null,
 		userId: 'someuserid',
-		user: {
-			id: 'someuserid',
-			name: 'Misskey User',
-			username: 'miskist',
-			host: 'misskey-hub.net',
-			avatarUrl: 'https://github.com/misskey-dev/misskey/blob/master/packages/frontend/assets/about-icon.png?raw=true',
-			avatarBlurhash: 'eQFRshof5NWBRi},juayfPju53WB?0ofs;s*a{ofjuay^SoMEJR%ay',
-			avatarDecorations: [],
-			emojis: {},
-			badgeRoles: [],
-			onlineStatus: 'unknown',
-		},
+		user: userLite(),
 		notesCount: undefined,
 		name,
 		description: 'Some clip description',
@@ -125,6 +114,15 @@ export function file(isSensitive = false) {
 	};
 }
 
+export function folder(id = 'somefolderid', name = 'Some Folder', parentId: string | null = null): entities.DriveFolder {
+	return {
+		id,
+		createdAt: '2016-12-28T22:49:51.000Z',
+		name,
+		parentId,
+	};
+}
+
 export function federationInstance(): entities.FederationInstance {
 	return {
 		id: 'someinstanceid',
@@ -154,7 +152,27 @@ export function federationInstance(): entities.FederationInstance {
 	};
 }
 
-export function userDetailed(id = 'someuserid', username = 'miskist', host:entities.UserDetailed['host'] = 'misskey-hub.net', name:entities.UserDetailed['name'] = 'Misskey User'): entities.UserDetailed {
+export function note(id = 'somenoteid'): entities.Note {
+	return {
+		id,
+		createdAt: '2016-12-28T22:49:51.000Z',
+		deletedAt: null,
+		text: 'some note',
+		cw: null,
+		userId: 'someuserid',
+		user: userLite(),
+		visibility: 'public',
+		reactionAcceptance: 'nonSensitiveOnly',
+		reactionEmojis: {},
+		reactions: {},
+		myReaction: null,
+		reactionCount: 0,
+		renoteCount: 0,
+		repliesCount: 0,
+	};
+}
+
+export function userLite(id = 'someuserid', username = 'miskist', host: entities.UserDetailed['host'] = 'misskey-hub.net', name: entities.UserDetailed['name'] = 'Misskey User'): entities.UserLite {
 	return {
 		id,
 		username,
@@ -165,6 +183,12 @@ export function userDetailed(id = 'someuserid', username = 'miskist', host:entit
 		avatarBlurhash: 'eQFRshof5NWBRi},juayfPju53WB?0ofs;s*a{ofjuay^SoMEJR%ay',
 		avatarDecorations: [],
 		emojis: {},
+	};
+}
+
+export function userDetailed(id = 'someuserid', username = 'miskist', host: entities.UserDetailed['host'] = 'misskey-hub.net', name: entities.UserDetailed['name'] = 'Misskey User'): entities.UserDetailed {
+	return {
+		...userLite(id, username, host, name),
 		bannerBlurhash: 'eQA^IW^-MH8w9tE8I=S^o{$*R4RikXtSxutRozjEnNR.RQadoyozog',
 		bannerUrl: 'https://github.com/misskey-dev/misskey/blob/master/packages/frontend/assets/fedi.jpg?raw=true',
 		birthday: '2014-06-20',
@@ -215,7 +239,7 @@ export function userDetailed(id = 'someuserid', username = 'miskist', host:entit
 		movedTo: null,
 		alsoKnownAs: null,
 		notify: 'none',
-		memo: null
+		memo: null,
 	};
 }
 
diff --git a/packages/frontend/.storybook/generate.tsx b/packages/frontend/.storybook/generate.tsx
index b94dfc53e3..52c01aaf70 100644
--- a/packages/frontend/.storybook/generate.tsx
+++ b/packages/frontend/.storybook/generate.tsx
@@ -397,8 +397,7 @@ function toStories(component: string): Promise<string> {
 	const globs = await Promise.all([
 		glob('src/components/global/Mk*.vue'),
 		glob('src/components/global/RouterView.vue'),
-		glob('src/components/Mk[A-C]*.vue'),
-		glob('src/components/MkDigitalClock.vue'),
+		glob('src/components/Mk[A-E]*.vue'),
 		glob('src/components/MkGalleryPostPreview.vue'),
 		glob('src/components/MkSignupServerRules.vue'),
 		glob('src/components/MkUserSetupDialog.vue'),
diff --git a/packages/frontend/src/components/MkDateSeparatedList.stories.impl.ts b/packages/frontend/src/components/MkDateSeparatedList.stories.impl.ts
new file mode 100644
index 0000000000..0e5635754c
--- /dev/null
+++ b/packages/frontend/src/components/MkDateSeparatedList.stories.impl.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import MkDateSeparatedList from './MkDateSeparatedList.vue';
+void MkDateSeparatedList;
diff --git a/packages/frontend/src/components/MkDialog.stories.impl.ts b/packages/frontend/src/components/MkDialog.stories.impl.ts
new file mode 100644
index 0000000000..2d8d3661f2
--- /dev/null
+++ b/packages/frontend/src/components/MkDialog.stories.impl.ts
@@ -0,0 +1,159 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { action } from '@storybook/addon-actions';
+import { expect, userEvent, waitFor, within } from '@storybook/test';
+import { StoryObj } from '@storybook/vue3';
+import { i18n } from '@/i18n.js';
+import MkDialog from './MkDialog.vue';
+const Base = {
+	render(args) {
+		return {
+			components: {
+				MkDialog,
+			},
+			setup() {
+				return {
+					args,
+				};
+			},
+			computed: {
+				props() {
+					return {
+						...this.args,
+					};
+				},
+				events() {
+					return {
+						done: action('done'),
+						closed: action('closed'),
+					};
+				},
+			},
+			template: '<MkDialog v-bind="props" v-on="events" />',
+		};
+	},
+	args: {
+		text: 'Hello, world!',
+	},
+	parameters: {
+		layout: 'centered',
+	},
+} satisfies StoryObj<typeof MkDialog>;
+export const Success = {
+	...Base,
+	args: {
+		...Base.args,
+		type: 'success',
+	},
+} satisfies StoryObj<typeof MkDialog>;
+export const Error = {
+	...Base,
+	args: {
+		...Base.args,
+		type: 'error',
+	},
+} satisfies StoryObj<typeof MkDialog>;
+export const Warning = {
+	...Base,
+	args: {
+		...Base.args,
+		type: 'warning',
+	},
+} satisfies StoryObj<typeof MkDialog>;
+export const Info = {
+	...Base,
+	args: {
+		...Base.args,
+		type: 'info',
+	},
+} satisfies StoryObj<typeof MkDialog>;
+export const Question = {
+	...Base,
+	args: {
+		...Base.args,
+		type: 'question',
+	},
+} satisfies StoryObj<typeof MkDialog>;
+export const Waiting = {
+	...Base,
+	args: {
+		...Base.args,
+		type: 'waiting',
+	},
+} satisfies StoryObj<typeof MkDialog>;
+export const DialogWithActions = {
+	...Question,
+	args: {
+		...Question.args,
+		text: i18n.ts.areYouSure,
+		actions: [
+			{
+				text: i18n.ts.yes,
+				primary: true,
+				callback() {
+					action('YES')();
+				},
+			},
+			{
+				text: i18n.ts.no,
+				callback() {
+					action('NO')();
+				},
+			},
+		],
+	},
+} satisfies StoryObj<typeof MkDialog>;
+export const DialogWithDangerActions = {
+	...Warning,
+	args: {
+		...Warning.args,
+		text: i18n.ts.resetAreYouSure,
+		actions: [
+			{
+				text: i18n.ts.yes,
+				danger: true,
+				primary: true,
+				callback() {
+					action('YES')();
+				},
+			},
+			{
+				text: i18n.ts.no,
+				callback() {
+					action('NO')();
+				},
+			},
+		],
+	},
+} satisfies StoryObj<typeof MkDialog>;
+export const DialogWithInput = {
+	...Question,
+	args: {
+		...Question.args,
+		title: 'Hello, world!',
+		text: undefined,
+		input: {
+			placeholder: i18n.ts.inputMessageHere,
+			type: 'text',
+			default: null,
+			minLength: 2,
+			maxLength: 3,
+		},
+	},
+	async play({ canvasElement }) {
+		const canvas = within(canvasElement);
+		await expect(canvasElement).toHaveTextContent(i18n.tsx._dialog.charactersBelow({ current: 0, min: 2 }));
+		const okButton = canvas.getByRole('button', { name: i18n.ts.ok });
+		await expect(okButton).toBeDisabled();
+		const input = canvas.getByRole<HTMLInputElement>('combobox');
+		await waitFor(() => userEvent.hover(input));
+		await waitFor(() => userEvent.click(input));
+		await waitFor(() => userEvent.type(input, 'M'));
+		await expect(canvasElement).toHaveTextContent(i18n.tsx._dialog.charactersBelow({ current: 1, min: 2 }));
+		await waitFor(() => userEvent.type(input, 'i'));
+		await expect(okButton).toBeEnabled();
+	},
+} satisfies StoryObj<typeof MkDialog>;
diff --git a/packages/frontend/src/components/MkDivider.stories.impl.ts b/packages/frontend/src/components/MkDivider.stories.impl.ts
new file mode 100644
index 0000000000..a593111987
--- /dev/null
+++ b/packages/frontend/src/components/MkDivider.stories.impl.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import MkDivider from './MkDivider.vue';
+void MkDivider;
diff --git a/packages/frontend/src/components/MkDonation.stories.impl.ts b/packages/frontend/src/components/MkDonation.stories.impl.ts
new file mode 100644
index 0000000000..27d6b7df6c
--- /dev/null
+++ b/packages/frontend/src/components/MkDonation.stories.impl.ts
@@ -0,0 +1,54 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { action } from '@storybook/addon-actions';
+import { StoryObj } from '@storybook/vue3';
+import { onBeforeUnmount } from 'vue';
+import MkDonation from './MkDonation.vue';
+import { instance } from '@/instance.js';
+export const Default = {
+	render(args) {
+		return {
+			components: {
+				MkDonation,
+			},
+			setup() {
+				return {
+					args,
+				};
+			},
+			computed: {
+				props() {
+					return {
+						...this.args,
+					};
+				},
+				events() {
+					return {
+						closed: action('closed'),
+					};
+				},
+			},
+			template: '<MkDonation v-bind="props" v-on="events" />',
+		};
+	},
+	args: {
+		// @ts-expect-error name is used for mocking instance
+		name: 'Misskey Hub',
+	},
+	decorators: [
+		(_, { args }) => ({
+			setup() {
+				// @ts-expect-error name is used for mocking instance
+				instance.name = args.name;
+				onBeforeUnmount(() => instance.name = null);
+			},
+			template: '<story/>',
+		}),
+	],
+	parameters: {
+		layout: 'centered',
+	},
+} satisfies StoryObj<typeof MkDonation>;
diff --git a/packages/frontend/src/components/MkDrive.file.stories.impl.ts b/packages/frontend/src/components/MkDrive.file.stories.impl.ts
new file mode 100644
index 0000000000..5f6e6a0667
--- /dev/null
+++ b/packages/frontend/src/components/MkDrive.file.stories.impl.ts
@@ -0,0 +1,48 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { action } from '@storybook/addon-actions';
+import { StoryObj } from '@storybook/vue3';
+import MkDrive_file from './MkDrive.file.vue';
+import { file } from '../../.storybook/fakes.js';
+export const Default = {
+	render(args) {
+		return {
+			components: {
+				MkDrive_file,
+			},
+			setup() {
+				return {
+					args,
+				};
+			},
+			computed: {
+				props() {
+					return {
+						...this.args,
+					};
+				},
+				events() {
+					return {
+						chosen: action('chosen'),
+						dragstart: action('dragstart'),
+						dragend: action('dragend'),
+					};
+				},
+			},
+			template: '<MkDrive_file v-bind="props" v-on="events" />',
+		};
+	},
+	args: {
+		file: file(),
+	},
+	parameters: {
+		chromatic: {
+			// NOTE: ロードが終わるまで待つ
+			delay: 3000,
+		},
+		layout: 'centered',
+	},
+} satisfies StoryObj<typeof MkDrive_file>;
diff --git a/packages/frontend/src/components/MkDrive.folder.stories.impl.ts b/packages/frontend/src/components/MkDrive.folder.stories.impl.ts
new file mode 100644
index 0000000000..5f8ef48520
--- /dev/null
+++ b/packages/frontend/src/components/MkDrive.folder.stories.impl.ts
@@ -0,0 +1,70 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { action } from '@storybook/addon-actions';
+import { StoryObj } from '@storybook/vue3';
+import { http, HttpResponse } from 'msw';
+import * as Misskey from 'misskey-js';
+import MkDrive_folder from './MkDrive.folder.vue';
+import { folder } from '../../.storybook/fakes.js';
+import { commonHandlers } from '../../.storybook/mocks.js';
+export const Default = {
+	render(args) {
+		return {
+			components: {
+				MkDrive_folder,
+			},
+			setup() {
+				return {
+					args,
+				};
+			},
+			computed: {
+				props() {
+					return {
+						...this.args,
+					};
+				},
+				events() {
+					return {
+						chosen: action('chosen'),
+						move: action('move'),
+						upload: action('upload'),
+						removeFile: action('removeFile'),
+						removeFolder: action('removeFolder'),
+						dragstart: action('dragstart'),
+						dragend: action('dragend'),
+					};
+				},
+			},
+			template: '<MkDrive_folder v-bind="props" v-on="events" />',
+		};
+	},
+	args: {
+		folder: folder(),
+	},
+	parameters: {
+		layout: 'centered',
+		msw: {
+			handlers: [
+				...commonHandlers,
+				http.post('/api/drive/folders/delete', async ({ request }) => {
+					action('POST /api/drive/folders/delete')(await request.json());
+					return HttpResponse.json(undefined, { status: 204 });
+				}),
+				http.post('/api/drive/folders/update', async ({ request }) => {
+					const req = await request.json() as Misskey.entities.DriveFoldersUpdateRequest;
+					action('POST /api/drive/folders/update')(req);
+					return HttpResponse.json({
+						...folder(),
+						id: req.folderId,
+						name: req.name ?? folder().name,
+						parentId: req.parentId ?? folder().parentId,
+					});
+				}),
+			],
+		},
+	},
+} satisfies StoryObj<typeof MkDrive_folder>;
diff --git a/packages/frontend/src/components/MkDrive.navFolder.stories.impl.ts b/packages/frontend/src/components/MkDrive.navFolder.stories.impl.ts
new file mode 100644
index 0000000000..9d49f24fa4
--- /dev/null
+++ b/packages/frontend/src/components/MkDrive.navFolder.stories.impl.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import MkDrive_navFolder from './MkDrive.navFolder.vue';
+void MkDrive_navFolder;
diff --git a/packages/frontend/src/components/MkDrive.stories.impl.ts b/packages/frontend/src/components/MkDrive.stories.impl.ts
new file mode 100644
index 0000000000..fe20e61415
--- /dev/null
+++ b/packages/frontend/src/components/MkDrive.stories.impl.ts
@@ -0,0 +1,82 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { action } from '@storybook/addon-actions';
+import { StoryObj } from '@storybook/vue3';
+import { http, HttpResponse } from 'msw';
+import * as Misskey from 'misskey-js';
+import MkDrive from './MkDrive.vue';
+import { file, folder } from '../../.storybook/fakes.js';
+import { commonHandlers } from '../../.storybook/mocks.js';
+export const Default = {
+	render(args) {
+		return {
+			components: {
+				MkDrive,
+			},
+			setup() {
+				return {
+					args,
+				};
+			},
+			computed: {
+				props() {
+					return {
+						...this.args,
+					};
+				},
+				events() {
+					return {
+						selected: action('selected'),
+						'change-selection': action('change-selection'),
+						'move-root': action('move-root'),
+						cd: action('cd'),
+						'open-folder': action('open-folder'),
+					};
+				},
+			},
+			template: '<MkDrive v-bind="props" v-on="events" />',
+		};
+	},
+	parameters: {
+		chromatic: {
+			// NOTE: ロードが終わるまで待つ
+			delay: 3000,
+		},
+		layout: 'centered',
+		msw: {
+			handlers: [
+				...commonHandlers,
+				http.post('/api/drive/files', async ({ request }) => {
+					action('POST /api/drive/files')(await request.json());
+					return HttpResponse.json([file()]);
+				}),
+				http.post('/api/drive/folders', async ({ request }) => {
+					action('POST /api/drive/folders')(await request.json());
+					return HttpResponse.json([folder(crypto.randomUUID())]);
+				}),
+				http.post('/api/drive/folders/create', async ({ request }) => {
+					const req = await request.json() as Misskey.entities.DriveFoldersCreateRequest;
+					action('POST /api/drive/folders/create')(req);
+					return HttpResponse.json(folder(crypto.randomUUID(), req.name, req.parentId));
+				}),
+				http.post('/api/drive/folders/delete', async ({ request }) => {
+					action('POST /api/drive/folders/delete')(await request.json());
+					return HttpResponse.json(undefined, { status: 204 });
+				}),
+				http.post('/api/drive/folders/update', async ({ request }) => {
+					const req = await request.json() as Misskey.entities.DriveFoldersUpdateRequest;
+					action('POST /api/drive/folders/update')(req);
+					return HttpResponse.json({
+						...folder(),
+						id: req.folderId,
+						name: req.name ?? folder().name,
+						parentId: req.parentId ?? folder().parentId,
+					});
+				}),
+			]
+		},
+	},
+} satisfies StoryObj<typeof MkDrive>;
diff --git a/packages/frontend/src/components/MkDriveFileThumbnail.stories.impl.ts b/packages/frontend/src/components/MkDriveFileThumbnail.stories.impl.ts
new file mode 100644
index 0000000000..3fa24d7edb
--- /dev/null
+++ b/packages/frontend/src/components/MkDriveFileThumbnail.stories.impl.ts
@@ -0,0 +1,41 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { StoryObj } from '@storybook/vue3';
+import MkDriveFileThumbnail from './MkDriveFileThumbnail.vue';
+import { file } from '../../.storybook/fakes.js';
+export const Default = {
+	render(args) {
+		return {
+			components: {
+				MkDriveFileThumbnail,
+			},
+			setup() {
+				return {
+					args,
+				};
+			},
+			computed: {
+				props() {
+					return {
+						...this.args,
+					};
+				},
+			},
+			template: '<MkDriveFileThumbnail v-bind="props" />',
+		};
+	},
+	args: {
+		file: file(),
+		fit: 'contain',
+	},
+	parameters: {
+		chromatic: {
+			// NOTE: ロードが終わるまで待つ
+			delay: 3000,
+		},
+		layout: 'centered',
+	},
+} satisfies StoryObj<typeof MkDriveFileThumbnail>;
diff --git a/packages/frontend/src/components/MkDriveFileThumbnail.vue b/packages/frontend/src/components/MkDriveFileThumbnail.vue
index 706c9a55c7..2c47a70970 100644
--- a/packages/frontend/src/components/MkDriveFileThumbnail.vue
+++ b/packages/frontend/src/components/MkDriveFileThumbnail.vue
@@ -26,7 +26,7 @@ import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
 
 const props = defineProps<{
 	file: Misskey.entities.DriveFile;
-	fit: string;
+	fit: 'cover' | 'contain';
 }>();
 
 const is = computed(() => {
diff --git a/packages/frontend/src/components/MkDriveSelectDialog.stories.impl.ts b/packages/frontend/src/components/MkDriveSelectDialog.stories.impl.ts
new file mode 100644
index 0000000000..fe8f705165
--- /dev/null
+++ b/packages/frontend/src/components/MkDriveSelectDialog.stories.impl.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import MkDriveSelectDialog from './MkDriveSelectDialog.vue';
+void MkDriveSelectDialog;
diff --git a/packages/frontend/src/components/MkDriveWindow.stories.impl.ts b/packages/frontend/src/components/MkDriveWindow.stories.impl.ts
new file mode 100644
index 0000000000..faa1f7fd5f
--- /dev/null
+++ b/packages/frontend/src/components/MkDriveWindow.stories.impl.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import MkDriveWindow from './MkDriveWindow.vue';
+void MkDriveWindow;
diff --git a/packages/frontend/src/components/MkEmojiPicker.section.stories.impl.ts b/packages/frontend/src/components/MkEmojiPicker.section.stories.impl.ts
new file mode 100644
index 0000000000..69aef577de
--- /dev/null
+++ b/packages/frontend/src/components/MkEmojiPicker.section.stories.impl.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import MkEmojiPicker_section from './MkEmojiPicker.section.vue';
+void MkEmojiPicker_section;
diff --git a/packages/frontend/src/components/MkEmojiPicker.stories.impl.ts b/packages/frontend/src/components/MkEmojiPicker.stories.impl.ts
new file mode 100644
index 0000000000..d38d8de808
--- /dev/null
+++ b/packages/frontend/src/components/MkEmojiPicker.stories.impl.ts
@@ -0,0 +1,54 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { action } from '@storybook/addon-actions';
+import { expect, userEvent, waitFor, within } from '@storybook/test';
+import { StoryObj } from '@storybook/vue3';
+import { i18n } from '@/i18n.js';
+import MkEmojiPicker from './MkEmojiPicker.vue';
+export const Default = {
+	render(args) {
+		return {
+			components: {
+				MkEmojiPicker,
+			},
+			setup() {
+				return {
+					args,
+				};
+			},
+			computed: {
+				props() {
+					return {
+						...this.args,
+					};
+				},
+				events() {
+					return {
+						chosen: action('chosen'),
+					};
+				},
+			},
+			template: '<MkEmojiPicker v-bind="props" v-on="events" />',
+		};
+	},
+	async play({ canvasElement }) {
+		const canvas = within(canvasElement);
+		const faceSection = canvas.getByText(/face/i);
+		await waitFor(() => userEvent.click(faceSection));
+		const grinning = canvasElement.querySelector('[data-emoji="😀"]');
+		await expect(grinning).toBeInTheDocument();
+		if (grinning == null) throw new Error(); // NOTE: not called
+		await waitFor(() => userEvent.click(grinning));
+		const recentUsedSection = canvas.getByText(new RegExp(i18n.ts.recentUsed)).parentElement;
+		await expect(recentUsedSection).toBeInTheDocument();
+		if (recentUsedSection == null) throw new Error(); // NOTE: not called
+		await expect(within(recentUsedSection).getByAltText('😀')).toBeInTheDocument();
+		await expect(within(recentUsedSection).queryByAltText('😬')).toEqual(null);
+	},
+	parameters: {
+		layout: 'centered',
+	},
+} satisfies StoryObj<typeof MkEmojiPicker>;
diff --git a/packages/frontend/src/components/MkEmojiPickerDialog.stories.impl.ts b/packages/frontend/src/components/MkEmojiPickerDialog.stories.impl.ts
new file mode 100644
index 0000000000..131087ad45
--- /dev/null
+++ b/packages/frontend/src/components/MkEmojiPickerDialog.stories.impl.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import MkEmojiPickerDialog from './MkEmojiPickerDialog.vue';
+void MkEmojiPickerDialog;

From 0bb5ac0fca67be31ba00438fa276df433cc7c42d Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Tue, 30 Jul 2024 19:55:18 +0900
Subject: [PATCH 140/221] =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AD=E3=83=BC?=
 =?UTF-8?q?=E4=B8=AD=E3=81=AE=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=AB?=
 =?UTF-8?q?=E9=96=A2=E3=81=99=E3=82=8B"TL=E3=81=AB=E4=BB=96=E3=81=AE?=
 =?UTF-8?q?=E4=BA=BA=E3=81=B8=E3=81=AE=E8=BF=94=E4=BF=A1=E3=82=92=E5=90=AB?=
 =?UTF-8?q?=E3=82=81=E3=82=8B"=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=81=8C?=
 =?UTF-8?q?=E5=88=86=E3=81=8B=E3=82=8A=E3=81=A5=E3=82=89=E3=81=84=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(#13895)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: improve withReplies toggle for user following

* chore: improve withReplies toggle for list

* docs(changelog): フォロー中のユーザーに関する"TLに他の人への返信を含める"の設定が分かりづらい問題を修正

* Fix CHANGELOG.md

* docs(changelog): update insertion position

---------

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
---
 CHANGELOG.md                                  |  1 +
 packages/frontend/src/pages/my-lists/list.vue | 31 ++++++++++---------
 .../frontend/src/scripts/get-user-menu.ts     | 28 +++++++++--------
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27308cb8bc..89d5ac214d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,7 @@
 - Fix: 照会に `#` から始まる文字列を入力してそのハッシュタグのページを表示する際、入力が `#` のみの場合に「指定されたURLに該当するページはありませんでした。」が表示されてしまう問題を修正
 - Fix: 照会に `@` から始まる文字列を入力してユーザーを照会する際、入力が `@` のみの場合に「問題が発生しました」が表示されてしまう問題を修正
 - Fix: 投稿フォームにノートのURLを貼り付けて"引用として添付"した場合、投稿文を空にすることによるRenote化が出来なかった問題を修正
+- Fix: フォロー中のユーザーに関する"TLに他の人への返信を含める"の設定が分かりづらい問題を修正
 
 ### Server
 - Feat: レートリミット制限に引っかかったときに`Retry-After`ヘッダーを返すように (#13949)
diff --git a/packages/frontend/src/pages/my-lists/list.vue b/packages/frontend/src/pages/my-lists/list.vue
index 7492b099ea..a2ceb222fe 100644
--- a/packages/frontend/src/pages/my-lists/list.vue
+++ b/packages/frontend/src/pages/my-lists/list.vue
@@ -133,22 +133,25 @@ async function removeUser(item, ev) {
 }
 
 async function showMembershipMenu(item, ev) {
+	const withRepliesRef = ref(item.withReplies);
 	os.popupMenu([{
-		text: item.withReplies ? i18n.ts.hideRepliesToOthersInTimeline : i18n.ts.showRepliesToOthersInTimeline,
-		icon: item.withReplies ? 'ti ti-messages-off' : 'ti ti-messages',
-		action: async () => {
-			misskeyApi('users/lists/update-membership', {
-				listId: list.value.id,
-				userId: item.userId,
-				withReplies: !item.withReplies,
-			}).then(() => {
-				paginationEl.value.updateItem(item.id, (old) => ({
-					...old,
-					withReplies: !item.withReplies,
-				}));
-			});
-		},
+		type: 'switch',
+		text: i18n.ts.showRepliesToOthersInTimeline,
+		icon: 'ti ti-messages',
+		ref: withRepliesRef,
 	}], ev.currentTarget ?? ev.target);
+	watch(withRepliesRef, withReplies => {
+		misskeyApi('users/lists/update-membership', {
+			listId: list.value!.id,
+			userId: item.userId,
+			withReplies,
+		}).then(() => {
+			paginationEl.value!.updateItem(item.id, (old) => ({
+				...old,
+				withReplies,
+			}));
+		});
+	});
 }
 
 async function deleteList() {
diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts
index e9e7ae771d..33f16a68aa 100644
--- a/packages/frontend/src/scripts/get-user-menu.ts
+++ b/packages/frontend/src/scripts/get-user-menu.ts
@@ -17,6 +17,7 @@ import { notesSearchAvailable, canSearchNonLocalNotes } from '@/scripts/check-pe
 import { IRouter } from '@/nirax.js';
 import { antennasCache, rolesCache, userListsCache } from '@/cache.js';
 import { mainRouter } from '@/router/main.js';
+import { MenuItem } from '@/types/menu.js';
 
 export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter = mainRouter) {
 	const meId = $i ? $i.id : null;
@@ -82,15 +83,6 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
 		});
 	}
 
-	async function toggleWithReplies() {
-		os.apiWithDialog('following/update', {
-			userId: user.id,
-			withReplies: !user.withReplies,
-		}).then(() => {
-			user.withReplies = !user.withReplies;
-		});
-	}
-
 	async function toggleNotify() {
 		os.apiWithDialog('following/update', {
 			userId: user.id,
@@ -155,7 +147,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
 		});
 	}
 
-	let menu = [{
+	let menu: MenuItem[] = [{
 		icon: 'ti ti-at',
 		text: i18n.ts.copyUsername,
 		action: () => {
@@ -314,15 +306,25 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
 
 		// フォローしたとしても user.isFollowing はリアルタイム更新されないので不便なため
 		//if (user.isFollowing) {
+		const withRepliesRef = ref(user.withReplies);
 		menu = menu.concat([{
-			icon: user.withReplies ? 'ti ti-messages-off' : 'ti ti-messages',
-			text: user.withReplies ? i18n.ts.hideRepliesToOthersInTimeline : i18n.ts.showRepliesToOthersInTimeline,
-			action: toggleWithReplies,
+			type: 'switch',
+			icon: 'ti ti-messages',
+			text: i18n.ts.showRepliesToOthersInTimeline,
+			ref: withRepliesRef,
 		}, {
 			icon: user.notify === 'none' ? 'ti ti-bell' : 'ti ti-bell-off',
 			text: user.notify === 'none' ? i18n.ts.notifyNotes : i18n.ts.unnotifyNotes,
 			action: toggleNotify,
 		}]);
+		watch(withRepliesRef, (withReplies) => {
+			misskeyApi('following/update', {
+				userId: user.id,
+				withReplies,
+			}).then(() => {
+				user.withReplies = withReplies;
+			});
+		});
 		//}
 
 		menu = menu.concat([{ type: 'divider' }, {

From fccc5b6d620ca6893a0a5649ea9f0d0693727b3b Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Tue, 30 Jul 2024 20:13:00 +0900
Subject: [PATCH 141/221] frontend timeline fixes & improvements (#13727)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: withRepliesがオフのときにwithFilesのとぐるをいじれない問題

* fix: type errors in tl-column

* fix: deck uiでタイムラインを切り替えた際にTLの設定項目が更新されない

* refactor: タイムラインの各種知識を一つのファイルに統合

fix: ウィジェットのタイムライン選択欄に表示できないタイムラインが表示される

* docs(changelog): timeline improvements

* fix: missing license header

* chore: timeline > basic timeline

* use BasicTimelineType in deck-store

* Update CHANGELOG.md

---------

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
---
 CHANGELOG.md                                  |  3 +
 .../frontend/src/components/MkTimeline.vue    |  3 +-
 .../components/MkTutorialDialog.Timeline.vue  |  9 +--
 packages/frontend/src/pages/timeline.vue      | 73 ++++++-------------
 packages/frontend/src/timelines.ts            | 56 ++++++++++++++
 packages/frontend/src/ui/deck/deck-store.ts   |  3 +-
 packages/frontend/src/ui/deck/tl-column.vue   | 30 +++-----
 .../frontend/src/widgets/WidgetTimeline.vue   | 34 ++-------
 8 files changed, 108 insertions(+), 103 deletions(-)
 create mode 100644 packages/frontend/src/timelines.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89d5ac214d..08e75ea200 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,9 @@
 - Fix: 照会に `@` から始まる文字列を入力してユーザーを照会する際、入力が `@` のみの場合に「問題が発生しました」が表示されてしまう問題を修正
 - Fix: 投稿フォームにノートのURLを貼り付けて"引用として添付"した場合、投稿文を空にすることによるRenote化が出来なかった問題を修正
 - Fix: フォロー中のユーザーに関する"TLに他の人への返信を含める"の設定が分かりづらい問題を修正
+- Fix: タイムラインページを開いた時、`TLに他の人への返信を含める`がオフのときに`ファイル付きのみ`をオンにできない問題を修正
+- Fix: deck uiでタイムラインを切り替えた際にTLの設定項目が更新されず、`TLに他の人への返信を含める`のトグルが表示されない問題を修正
+- Fix: ウィジェットのタイムライン選択欄に無効化されたタイムラインが表示される問題を修正
 
 ### Server
 - Feat: レートリミット制限に引っかかったときに`Retry-After`ヘッダーを返すように (#13949)
diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue
index 03dccb18e9..ca87316bf7 100644
--- a/packages/frontend/src/components/MkTimeline.vue
+++ b/packages/frontend/src/components/MkTimeline.vue
@@ -19,6 +19,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { computed, watch, onUnmounted, provide, ref, shallowRef } from 'vue';
 import * as Misskey from 'misskey-js';
+import type { BasicTimelineType } from '@/timelines.js';
 import MkNotes from '@/components/MkNotes.vue';
 import MkPullToRefresh from '@/components/MkPullToRefresh.vue';
 import { useStream } from '@/stream.js';
@@ -29,7 +30,7 @@ import { defaultStore } from '@/store.js';
 import { Paging } from '@/components/MkPagination.vue';
 
 const props = withDefaults(defineProps<{
-	src: 'home' | 'local' | 'social' | 'global' | 'mentions' | 'directs' | 'list' | 'antenna' | 'channel' | 'role';
+	src: BasicTimelineType | 'mentions' | 'directs' | 'list' | 'antenna' | 'channel' | 'role';
 	list?: string;
 	antenna?: string;
 	channel?: string;
diff --git a/packages/frontend/src/components/MkTutorialDialog.Timeline.vue b/packages/frontend/src/components/MkTutorialDialog.Timeline.vue
index 6f2930ebc9..2d4da3fbd4 100644
--- a/packages/frontend/src/components/MkTutorialDialog.Timeline.vue
+++ b/packages/frontend/src/components/MkTutorialDialog.Timeline.vue
@@ -7,10 +7,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 <div class="_gaps">
 	<div style="text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._timeline.description1 }}</div>
 	<div class="_gaps_s">
-		<div><i class="ti ti-home"></i> <b>{{ i18n.ts._timelines.home }}</b> … {{ i18n.ts._initialTutorial._timeline.home }}</div>
-		<div><i class="ti ti-planet"></i> <b>{{ i18n.ts._timelines.local }}</b> … {{ i18n.ts._initialTutorial._timeline.local }}</div>
-		<div><i class="ti ti-universe"></i> <b>{{ i18n.ts._timelines.social }}</b> … {{ i18n.ts._initialTutorial._timeline.social }}</div>
-		<div><i class="ti ti-whirl"></i> <b>{{ i18n.ts._timelines.global }}</b> … {{ i18n.ts._initialTutorial._timeline.global }}</div>
+		<div v-for="tl in basicTimelineTypes">
+			<i :class="basicTimelineIconClass(tl)"></i> <b>{{ i18n.ts._timelines[tl] }}</b> … {{ i18n.ts._initialTutorial._timeline[tl] }}
+		</div>
 	</div>
 	<div class="_gaps_s">
 		<div>{{ i18n.ts._initialTutorial._timeline.description2 }}</div>
@@ -22,12 +21,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<a href="https://misskey-hub.net/docs/for-users/features/timeline/" target="_blank" class="_link">{{ i18n.ts.help }}</a>
 		</template>
 	</I18n>
-
 </div>
 </template>
 
 <script setup lang="ts">
 import { i18n } from '@/i18n.js';
+import { basicTimelineIconClass, basicTimelineTypes } from '@/timelines.js';
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index 813cc326d0..c5905c7ada 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<MkSpacer :contentMax="800">
 		<MkHorizontalSwipe v-model:tab="src" :tabs="$i ? headerTabs : headerTabsWhenNotLogin">
 			<div :key="src" ref="rootEl">
-				<MkInfo v-if="['home', 'local', 'social', 'global'].includes(src) && !defaultStore.reactiveState.timelineTutorials.value[src]" style="margin-bottom: var(--margin);" closable @close="closeTutorial()">
+				<MkInfo v-if="isBasicTimeline(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);"/>
@@ -45,7 +45,6 @@ import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { defaultStore } from '@/store.js';
 import { i18n } from '@/i18n.js';
-import { instance } from '@/instance.js';
 import { $i } from '@/account.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { antennasCache, userListsCache, favoritedChannelsCache } from '@/cache.js';
@@ -53,17 +52,15 @@ import { deviceKind } from '@/scripts/device-kind.js';
 import { deepMerge } from '@/scripts/merge.js';
 import { MenuItem } from '@/types/menu.js';
 import { miLocalStorage } from '@/local-storage.js';
+import { availableBasicTimelines, hasWithReplies, isAvailableBasicTimeline, isBasicTimeline, basicTimelineIconClass } from '@/timelines.js';
 
 provide('shouldOmitHeaderTitle', true);
 
-const isLocalTimelineAvailable = ($i == null && instance.policies.ltlAvailable) || ($i != null && $i.policies.ltlAvailable);
-const isGlobalTimelineAvailable = ($i == null && instance.policies.gtlAvailable) || ($i != null && $i.policies.gtlAvailable);
-
 const tlComponent = shallowRef<InstanceType<typeof MkTimeline>>();
 const rootEl = shallowRef<HTMLElement>();
 
 const queue = ref(0);
-const srcWhenNotSignin = ref<'local' | 'global'>(isLocalTimelineAvailable ? 'local' : 'global');
+const srcWhenNotSignin = ref<'local' | 'global'>(isAvailableBasicTimeline('local') ? 'local' : 'global');
 const src = computed<'home' | 'local' | 'social' | 'global' | `list:${string}`>({
 	get: () => ($i ? defaultStore.reactiveState.tl.value.src : srcWhenNotSignin.value),
 	set: (x) => saveSrc(x),
@@ -74,7 +71,11 @@ const withRenotes = computed<boolean>({
 });
 
 // computed内での無限ループを防ぐためのフラグ
-const localSocialTLFilterSwitchStore = ref<'withReplies' | 'onlyFiles' | false>('withReplies');
+const localSocialTLFilterSwitchStore = ref<'withReplies' | 'onlyFiles' | false>(
+	defaultStore.reactiveState.tl.value.filter.withReplies ? 'withReplies' :
+	defaultStore.reactiveState.tl.value.filter.onlyFiles ? 'onlyFiles' :
+	false,
+);
 
 const withReplies = computed<boolean>({
 	get: () => {
@@ -229,7 +230,7 @@ function focus(): void {
 }
 
 function closeTutorial(): void {
-	if (!['home', 'local', 'social', 'global'].includes(src.value)) return;
+	if (!isBasicTimeline(src.value)) return;
 	const before = defaultStore.state.timelineTutorials;
 	before[src.value] = true;
 	defaultStore.set('timelineTutorials', before);
@@ -245,7 +246,7 @@ const headerActions = computed(() => {
 					type: 'switch',
 					text: i18n.ts.showRenotes,
 					ref: withRenotes,
-				}, src.value === 'local' || src.value === 'social' ? {
+				}, isBasicTimeline(src.value) && hasWithReplies(src.value) ? {
 					type: 'switch',
 					text: i18n.ts.showRepliesToOthersInTimeline,
 					ref: withReplies,
@@ -258,7 +259,7 @@ const headerActions = computed(() => {
 					type: 'switch',
 					text: i18n.ts.fileAttachedOnly,
 					ref: onlyFiles,
-					disabled: src.value === 'local' || src.value === 'social' ? withReplies : false,
+					disabled: isBasicTimeline(src.value) && hasWithReplies(src.value) ? withReplies : false,
 				}], ev.currentTarget ?? ev.target);
 			},
 		},
@@ -280,32 +281,12 @@ const headerTabs = computed(() => [...(defaultStore.reactiveState.pinnedUserList
 	title: l.name,
 	icon: 'ti ti-star',
 	iconOnly: true,
-}))), {
-	key: 'home',
-	title: i18n.ts._timelines.home,
-	icon: 'ti ti-home',
+}))), ...availableBasicTimelines().map(tl => ({
+	key: tl,
+	title: i18n.ts._timelines[tl],
+	icon: basicTimelineIconClass(tl),
 	iconOnly: true,
-}, ...(isLocalTimelineAvailable ? [{
-	key: 'local',
-	title: i18n.ts._timelines.local,
-	icon: 'ti ti-planet',
-	iconOnly: true,
-}, {
-	key: 'social',
-	title: i18n.ts._timelines.social,
-	icon: 'ti ti-universe',
-	iconOnly: true,
-}] : []), ...(isGlobalTimelineAvailable ? [{
-	key: 'global',
-	title: i18n.ts._timelines.global,
-	icon: 'ti ti-whirl',
-	iconOnly: true,
-}] : []), {
-	icon: 'ti ti-list',
-	title: i18n.ts.lists,
-	iconOnly: true,
-	onClick: chooseList,
-}, {
+})), {
 	icon: 'ti ti-antenna',
 	title: i18n.ts.antennas,
 	iconOnly: true,
@@ -317,24 +298,16 @@ const headerTabs = computed(() => [...(defaultStore.reactiveState.pinnedUserList
 	onClick: chooseChannel,
 }] as Tab[]);
 
-const headerTabsWhenNotLogin = computed(() => [
-	...(isLocalTimelineAvailable ? [{
-		key: 'local',
-		title: i18n.ts._timelines.local,
-		icon: 'ti ti-planet',
-		iconOnly: true,
-	}] : []),
-	...(isGlobalTimelineAvailable ? [{
-		key: 'global',
-		title: i18n.ts._timelines.global,
-		icon: 'ti ti-whirl',
-		iconOnly: true,
-	}] : []),
-] as Tab[]);
+const headerTabsWhenNotLogin = computed(() => [...availableBasicTimelines().map(tl => ({
+	key: tl,
+	title: i18n.ts._timelines[tl],
+	icon: basicTimelineIconClass(tl),
+	iconOnly: true,
+}))] as Tab[]);
 
 definePageMetadata(() => ({
 	title: i18n.ts.timeline,
-	icon: src.value === 'local' ? 'ti ti-planet' : src.value === 'social' ? 'ti ti-universe' : src.value === 'global' ? 'ti ti-whirl' : 'ti ti-home',
+	icon: isBasicTimeline(src.value) ? basicTimelineIconClass(src.value) : 'ti ti-home',
 }));
 </script>
 
diff --git a/packages/frontend/src/timelines.ts b/packages/frontend/src/timelines.ts
new file mode 100644
index 0000000000..3ef95fd272
--- /dev/null
+++ b/packages/frontend/src/timelines.ts
@@ -0,0 +1,56 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { $i } from '@/account.js';
+import { instance } from '@/instance.js';
+
+export const basicTimelineTypes = [
+	'home',
+	'local',
+	'social',
+	'global',
+] as const;
+
+export type BasicTimelineType = typeof basicTimelineTypes[number];
+
+export function isBasicTimeline(timeline: string): timeline is BasicTimelineType {
+	return basicTimelineTypes.includes(timeline as BasicTimelineType);
+}
+
+export function basicTimelineIconClass(timeline: BasicTimelineType): string {
+	switch (timeline) {
+		case 'home':
+			return 'ti ti-home';
+		case 'local':
+			return 'ti ti-planet';
+		case 'social':
+			return 'ti ti-universe';
+		case 'global':
+			return 'ti ti-whirl';
+	}
+}
+
+export function isAvailableBasicTimeline(timeline: BasicTimelineType | undefined | null): boolean {
+	switch (timeline) {
+		case 'home':
+			return $i != null;
+		case 'local':
+			return ($i == null && instance.policies.ltlAvailable) || ($i != null && $i.policies.ltlAvailable);
+		case 'social':
+			return $i != null && instance.policies.ltlAvailable;
+		case 'global':
+			return ($i == null && instance.policies.gtlAvailable) || ($i != null && $i.policies.gtlAvailable);
+		default:
+			return false;
+	}
+}
+
+export function availableBasicTimelines(): BasicTimelineType[] {
+	return basicTimelineTypes.filter(isAvailableBasicTimeline);
+}
+
+export function hasWithReplies(timeline: BasicTimelineType | undefined | null): boolean {
+	return timeline === 'local' || timeline === 'social';
+}
diff --git a/packages/frontend/src/ui/deck/deck-store.ts b/packages/frontend/src/ui/deck/deck-store.ts
index 139621cf57..eb587554b9 100644
--- a/packages/frontend/src/ui/deck/deck-store.ts
+++ b/packages/frontend/src/ui/deck/deck-store.ts
@@ -6,6 +6,7 @@
 import { throttle } from 'throttle-debounce';
 import { markRaw } from 'vue';
 import { notificationTypes } from 'misskey-js';
+import type { BasicTimelineType } from '@/timelines.js';
 import { Storage } from '@/pizzax.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { deepClone } from '@/scripts/clone.js';
@@ -45,7 +46,7 @@ export type Column = {
 	channelId?: string;
 	roleId?: string;
 	excludeTypes?: typeof notificationTypes[number][];
-	tl?: 'home' | 'local' | 'social' | 'global';
+	tl?: BasicTimelineType;
 	withRenotes?: boolean;
 	withReplies?: boolean;
 	onlyFiles?: boolean;
diff --git a/packages/frontend/src/ui/deck/tl-column.vue b/packages/frontend/src/ui/deck/tl-column.vue
index b4bc8bb748..e210ee7b7a 100644
--- a/packages/frontend/src/ui/deck/tl-column.vue
+++ b/packages/frontend/src/ui/deck/tl-column.vue
@@ -6,14 +6,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <XColumn :menu="menu" :column="column" :isStacked="isStacked" :refresher="async () => { await timeline?.reloadTimeline() }">
 	<template #header>
-		<i v-if="column.tl === 'home'" class="ti ti-home"></i>
-		<i v-else-if="column.tl === 'local'" class="ti ti-planet"></i>
-		<i v-else-if="column.tl === 'social'" class="ti ti-universe"></i>
-		<i v-else-if="column.tl === 'global'" class="ti ti-whirl"></i>
+		<i v-if="column.tl != null" :class="basicTimelineIconClass(column.tl)"/>
 		<span style="margin-left: 8px;">{{ column.name }}</span>
 	</template>
 
-	<div v-if="(((column.tl === 'local' || column.tl === 'social') && !isLocalTimelineAvailable) || (column.tl === 'global' && !isGlobalTimelineAvailable))" :class="$style.disabled">
+	<div v-if="!isAvailableBasicTimeline(column.tl)" :class="$style.disabled">
 		<p :class="$style.disabledTitle">
 			<i class="ti ti-circle-minus"></i>
 			{{ i18n.ts._disabledTimeline.title }}
@@ -34,15 +31,15 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { onMounted, watch, ref, shallowRef } from 'vue';
+import { onMounted, watch, ref, shallowRef, computed } from 'vue';
 import XColumn from './column.vue';
 import { removeColumn, updateColumn, Column } from './deck-store.js';
+import type { MenuItem } from '@/types/menu.js';
 import MkTimeline from '@/components/MkTimeline.vue';
 import * as os from '@/os.js';
-import { $i } from '@/account.js';
 import { i18n } from '@/i18n.js';
+import { hasWithReplies, isAvailableBasicTimeline, basicTimelineIconClass } from '@/timelines.js';
 import { instance } from '@/instance.js';
-import { MenuItem } from '@/types/menu.js';
 import { SoundStore } from '@/store.js';
 import { soundSettingsButton } from '@/ui/deck/tl-note-notification.js';
 import * as sound from '@/scripts/sound.js';
@@ -52,11 +49,8 @@ const props = defineProps<{
 	isStacked: boolean;
 }>();
 
-const disabled = ref(false);
 const timeline = shallowRef<InstanceType<typeof MkTimeline>>();
 
-const isLocalTimelineAvailable = (($i == null && instance.policies.ltlAvailable) || ($i != null && $i.policies.ltlAvailable));
-const isGlobalTimelineAvailable = (($i == null && instance.policies.gtlAvailable) || ($i != null && $i.policies.gtlAvailable));
 const soundSetting = ref<SoundStore>(props.column.soundSetting ?? { type: null, volume: 1 });
 const withRenotes = ref(props.column.withRenotes ?? true);
 const withReplies = ref(props.column.withReplies ?? false);
@@ -87,10 +81,6 @@ watch(soundSetting, v => {
 onMounted(() => {
 	if (props.column.tl == null) {
 		setType();
-	} else if ($i) {
-		disabled.value = (
-			(!((instance.policies.ltlAvailable) || ($i.policies.ltlAvailable)) && ['local', 'social'].includes(props.column.tl)) ||
-			(!((instance.policies.gtlAvailable) || ($i.policies.gtlAvailable)) && ['global'].includes(props.column.tl)));
 	}
 });
 
@@ -115,7 +105,7 @@ async function setType() {
 	}
 	if (src == null) return;
 	updateColumn(props.column.id, {
-		tl: src,
+		tl: src ?? undefined,
 	});
 }
 
@@ -123,7 +113,7 @@ function onNote() {
 	sound.playMisskeySfxFile(soundSetting.value);
 }
 
-const menu: MenuItem[] = [{
+const menu = computed<MenuItem[]>(() => [{
 	icon: 'ti ti-pencil',
 	text: i18n.ts.timeline,
 	action: setType,
@@ -135,7 +125,7 @@ const menu: MenuItem[] = [{
 	type: 'switch',
 	text: i18n.ts.showRenotes,
 	ref: withRenotes,
-}, props.column.tl === 'local' || props.column.tl === 'social' ? {
+}, hasWithReplies(props.column.tl) ? {
 	type: 'switch',
 	text: i18n.ts.showRepliesToOthersInTimeline,
 	ref: withReplies,
@@ -144,8 +134,8 @@ const menu: MenuItem[] = [{
 	type: 'switch',
 	text: i18n.ts.fileAttachedOnly,
 	ref: onlyFiles,
-	disabled: props.column.tl === 'local' || props.column.tl === 'social' ? withReplies : false,
-}];
+	disabled: hasWithReplies(props.column.tl) ? withReplies : false,
+}]);
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/widgets/WidgetTimeline.vue b/packages/frontend/src/widgets/WidgetTimeline.vue
index 150e838582..d02f9b8e22 100644
--- a/packages/frontend/src/widgets/WidgetTimeline.vue
+++ b/packages/frontend/src/widgets/WidgetTimeline.vue
@@ -6,10 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <MkContainer :showHeader="widgetProps.showHeader" :style="`height: ${widgetProps.height}px;`" :scrollable="true" data-cy-mkw-timeline class="mkw-timeline">
 	<template #icon>
-		<i v-if="widgetProps.src === 'home'" class="ti ti-home"></i>
-		<i v-else-if="widgetProps.src === 'local'" class="ti ti-planet"></i>
-		<i v-else-if="widgetProps.src === 'social'" class="ti ti-universe"></i>
-		<i v-else-if="widgetProps.src === 'global'" class="ti ti-whirl"></i>
+		<i v-if="isBasicTimeline(widgetProps.src)" :class="basicTimelineIconClass(widgetProps.src)"></i>
 		<i v-else-if="widgetProps.src === 'list'" class="ti ti-list"></i>
 		<i v-else-if="widgetProps.src === 'antenna'" class="ti ti-antenna"></i>
 	</template>
@@ -20,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</button>
 	</template>
 
-	<div v-if="(((widgetProps.src === 'local' || widgetProps.src === 'social') && !isLocalTimelineAvailable) || (widgetProps.src === 'global' && !isGlobalTimelineAvailable))" :class="$style.disabled">
+	<div v-if="isBasicTimeline(widgetProps.src) && !isAvailableBasicTimeline(widgetProps.src)" :class="$style.disabled">
 		<p :class="$style.disabledTitle">
 			<i class="ti ti-minus"></i>
 			{{ i18n.ts._disabledTimeline.title }}
@@ -42,12 +39,9 @@ import { misskeyApi } from '@/scripts/misskey-api.js';
 import MkContainer from '@/components/MkContainer.vue';
 import MkTimeline from '@/components/MkTimeline.vue';
 import { i18n } from '@/i18n.js';
-import { $i } from '@/account.js';
-import { instance } from '@/instance.js';
+import { availableBasicTimelines, isAvailableBasicTimeline, isBasicTimeline, basicTimelineIconClass } from '@/timelines.js';
 
 const name = 'timeline';
-const isLocalTimelineAvailable = (($i == null && instance.policies.ltlAvailable) || ($i != null && $i.policies.ltlAvailable));
-const isGlobalTimelineAvailable = (($i == null && instance.policies.gtlAvailable) || ($i != null && $i.policies.gtlAvailable));
 
 const widgetPropsDef = {
 	showHeader: {
@@ -115,23 +109,11 @@ const choose = async (ev) => {
 			setSrc('list');
 		},
 	}));
-	os.popupMenu([{
-		text: i18n.ts._timelines.home,
-		icon: 'ti ti-home',
-		action: () => { setSrc('home'); },
-	}, {
-		text: i18n.ts._timelines.local,
-		icon: 'ti ti-planet',
-		action: () => { setSrc('local'); },
-	}, {
-		text: i18n.ts._timelines.social,
-		icon: 'ti ti-universe',
-		action: () => { setSrc('social'); },
-	}, {
-		text: i18n.ts._timelines.global,
-		icon: 'ti ti-whirl',
-		action: () => { setSrc('global'); },
-	}, antennaItems.length > 0 ? { type: 'divider' } : undefined, ...antennaItems, listItems.length > 0 ? { type: 'divider' } : undefined, ...listItems], ev.currentTarget ?? ev.target).then(() => {
+	os.popupMenu([...availableBasicTimelines().map(tl => ({
+		text: i18n.ts._timelines[tl],
+		icon: basicTimelineIconClass(tl),
+		action: () => { setSrc(tl); },
+	})), antennaItems.length > 0 ? { type: 'divider' } : undefined, ...antennaItems, listItems.length > 0 ? { type: 'divider' } : undefined, ...listItems], ev.currentTarget ?? ev.target).then(() => {
 		menuOpened.value = false;
 	});
 };

From 676c599e48eb48b36f67ac0a44e29f26501d1e69 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 30 Jul 2024 20:20:21 +0900
Subject: [PATCH 142/221] Update about-misskey.vue

---
 packages/frontend/src/pages/about-misskey.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index 8459f0f9d5..8db71c8881 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -258,6 +258,12 @@ const patronsWithIcon = [{
 }, {
 	name: 'えとゔぁす',
 	icon: 'https://assets.misskey-hub.net/patrons/2578f441b82a44cfaa55ba83a318b26e.jpg',
+}, {
+	name: 'Soli',
+	icon: 'https://assets.misskey-hub.net/patrons/448070c81ebd41eda4ea2328291b2efe.jpg',
+}, {
+	name: 'ささくれりょう',
+	icon: 'https://assets.misskey-hub.net/patrons/cf55022cee6c41da8e70a43587aaad9a.jpg',
 }];
 
 const patrons = [

From 8b163cd3fbae0cac43c79807ef891532de740797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 30 Jul 2024 20:30:41 +0900
Subject: [PATCH 143/221] =?UTF-8?q?fix(frontend):=20=E3=83=89=E3=83=A9?=
 =?UTF-8?q?=E3=82=A4=E3=83=96=E3=81=AE=E9=9F=B3=E5=A3=B0=E3=81=8C=E5=86=8D?=
 =?UTF-8?q?=E7=94=9F=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88?=
 =?UTF-8?q?=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92=E8=BF=BD=E5=8A=A0=20(#1407?=
 =?UTF-8?q?3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): ドライブの音声が再生できない場合の処理を追加

* Update Changelog

* fix lint

* Update packages/frontend/src/scripts/sound.ts

* lint

* Update sound.ts

* fix merge mistakes

* use shorthand operator

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
 CHANGELOG.md                                  |  1 +
 locales/index.d.ts                            |  4 ++
 locales/ja-JP.yml                             |  1 +
 .../src/pages/settings/sounds.sound.vue       | 44 ++++++++++++++++---
 .../frontend/src/pages/settings/sounds.vue    | 10 ++++-
 packages/frontend/src/scripts/sound.ts        | 35 ++++++++++-----
 6 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08e75ea200..b996216ac1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -70,6 +70,7 @@
 - Fix: タイムラインページを開いた時、`TLに他の人への返信を含める`がオフのときに`ファイル付きのみ`をオンにできない問題を修正
 - Fix: deck uiでタイムラインを切り替えた際にTLの設定項目が更新されず、`TLに他の人への返信を含める`のトグルが表示されない問題を修正
 - Fix: ウィジェットのタイムライン選択欄に無効化されたタイムラインが表示される問題を修正
+- Fix: サウンドにドライブの音声を使用している際にドライブの音声が再生できなくなると設定が変更できなくなる問題を修正
 
 ### Server
 - Feat: レートリミット制限に引っかかったときに`Retry-After`ヘッダーを返すように (#13949)
diff --git a/locales/index.d.ts b/locales/index.d.ts
index f03207e0bd..c58e4ace7b 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -7633,6 +7633,10 @@ export interface Locale extends ILocale {
          * 長い音声を使用するとMisskeyの使用に支障をきたす可能性があります。それでも続行しますか？
          */
         "driveFileDurationWarnDescription": string;
+        /**
+         * 音声が読み込めませんでした。設定を変更してください
+         */
+        "driveFileError": string;
     };
     "_ago": {
         /**
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index d4931ae90d..522ad7e22a 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2002,6 +2002,7 @@ _soundSettings:
   driveFileTypeWarnDescription: "音声ファイルを選択してください"
   driveFileDurationWarn: "音声が長すぎます"
   driveFileDurationWarnDescription: "長い音声を使用するとMisskeyの使用に支障をきたす可能性があります。それでも続行しますか？"
+  driveFileError: "音声が読み込めませんでした。設定を変更してください"
 
 _ago:
   future: "未来"
diff --git a/packages/frontend/src/pages/settings/sounds.sound.vue b/packages/frontend/src/pages/settings/sounds.sound.vue
index 113abd708b..81478fede5 100644
--- a/packages/frontend/src/pages/settings/sounds.sound.vue
+++ b/packages/frontend/src/pages/settings/sounds.sound.vue
@@ -9,7 +9,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<template #label>{{ i18n.ts.sound }}</template>
 		<option v-for="x in soundsTypes" :key="x ?? 'null'" :value="x">{{ getSoundTypeName(x) }}</option>
 	</MkSelect>
-	<div v-if="type === '_driveFile_'" :class="$style.fileSelectorRoot">
+	<div v-if="type === '_driveFile_' && driveFileError === true" :class="$style.fileSelectorRoot">
+		<MkButton :class="$style.fileSelectorButton" inline rounded primary @click="selectSound">{{ i18n.ts.selectFile }}</MkButton>
+		<div :class="$style.fileErrorRoot">
+			<MkCondensedLine>{{ i18n.ts._soundSettings.driveFileError }}</MkCondensedLine>
+		</div>
+	</div>
+	<div v-else-if="type === '_driveFile_'" :class="$style.fileSelectorRoot">
 		<MkButton :class="$style.fileSelectorButton" inline rounded primary @click="selectSound">{{ i18n.ts.selectFile }}</MkButton>
 		<div :class="['_nowrap', !fileUrl && $style.fileNotSelected]">{{ friendlyFileName }}</div>
 	</div>
@@ -19,13 +25,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 	<div class="_buttons">
 		<MkButton inline @click="listen"><i class="ti ti-player-play"></i> {{ i18n.ts.listen }}</MkButton>
-		<MkButton inline primary @click="save"><i class="ti ti-check"></i> {{ i18n.ts.save }}</MkButton>
+		<MkButton inline primary :disabled="!hasChanged || driveFileError" @click="save"><i class="ti ti-check"></i> {{ i18n.ts.save }}</MkButton>
 	</div>
 </div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue';
+import { ref, computed, watch } from 'vue';
 import type { SoundType } from '@/scripts/sound.js';
 import MkSelect from '@/components/MkSelect.vue';
 import MkButton from '@/components/MkButton.vue';
@@ -51,13 +57,18 @@ const type = ref<SoundType>(props.type);
 const fileId = ref(props.fileId);
 const fileUrl = ref(props.fileUrl);
 const fileName = ref<string>('');
+const driveFileError = ref(false);
+const hasChanged = ref(false);
 const volume = ref(props.volume);
 
 if (type.value === '_driveFile_' && fileId.value) {
-	const apiRes = await misskeyApi('drive/files/show', {
+	await misskeyApi('drive/files/show', {
 		fileId: fileId.value,
+	}).then((res) => {
+		fileName.value = res.name;
+	}).catch((res) => {
+		driveFileError.value = true;
 	});
-	fileName.value = apiRes.name;
 }
 
 function getSoundTypeName(f: SoundType): string {
@@ -107,9 +118,21 @@ function selectSound(ev) {
 		fileUrl.value = file.url;
 		fileName.value = file.name;
 		fileId.value = file.id;
+		driveFileError.value = false;
+		hasChanged.value = true;
 	});
 }
 
+watch([type, volume], ([typeTo, volumeTo], [typeFrom, volumeFrom]) => {
+	if (typeFrom !== typeTo && typeTo !== '_driveFile_') {
+		fileUrl.value = undefined;
+		fileName.value = '';
+		fileId.value = undefined;
+		driveFileError.value = false;
+	}
+	hasChanged.value = true;
+});
+
 function listen() {
 	if (type.value === '_driveFile_' && (!fileUrl.value || !fileId.value)) {
 		os.alert({
@@ -131,6 +154,10 @@ function listen() {
 }
 
 function save() {
+	if (hasChanged.value === false || driveFileError.value === true) {
+		return;
+	}
+
 	if (type.value === '_driveFile_' && !fileUrl.value) {
 		os.alert({
 			type: 'warning',
@@ -163,6 +190,13 @@ function save() {
 	gap: 8px;
 }
 
+.fileErrorRoot {
+	flex-grow: 1;
+	min-width: 0;
+	font-weight: 700;
+	color: var(--error);
+}
+
 .fileSelectorButton {
 	flex-shrink: 0;
 }
diff --git a/packages/frontend/src/pages/settings/sounds.vue b/packages/frontend/src/pages/settings/sounds.vue
index 0f1b725fae..9fcf564e55 100644
--- a/packages/frontend/src/pages/settings/sounds.vue
+++ b/packages/frontend/src/pages/settings/sounds.vue
@@ -21,8 +21,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkFolder v-for="type in operationTypes" :key="type">
 				<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)"/>
+				<Suspense>
+					<template #default>
+						<XSound :type="sounds[type].type" :volume="sounds[type].volume" :fileId="sounds[type].fileId" :fileUrl="sounds[type].fileUrl" @update="(res) => updated(type, res)"/>
+					</template>
+					<template #fallback>
+						<MkLoading/>
+					</template>
+				</Suspense>
 			</MkFolder>
 		</div>
 	</FormSection>
diff --git a/packages/frontend/src/scripts/sound.ts b/packages/frontend/src/scripts/sound.ts
index 814e080811..05f82fce7d 100644
--- a/packages/frontend/src/scripts/sound.ts
+++ b/packages/frontend/src/scripts/sound.ts
@@ -124,23 +124,33 @@ export async function loadAudio(url: string, options?: { useCache?: boolean; })
  */
 export function playMisskeySfx(operationType: OperationType) {
 	const sound = defaultStore.state[`sound_${operationType}`];
-	playMisskeySfxFile(sound);
+	playMisskeySfxFile(sound).then((succeed) => {
+		if (!succeed && sound.type === '_driveFile_') {
+			// ドライブファイルが存在しない場合はデフォルトのサウンドを再生する
+			const soundName = defaultStore.def[`sound_${operationType}`].default.type as Exclude<SoundType, '_driveFile_'>;
+			if (_DEV_) console.log(`Failed to play sound: ${sound.fileUrl}, so play default sound: ${soundName}`);
+			playMisskeySfxFileInternal({
+				type: soundName,
+				volume: sound.volume,
+			});
+		}
+	});
 }
 
 /**
  * サウンド設定形式で指定された音声を再生する
  * @param soundStore サウンド設定
  */
-export function playMisskeySfxFile(soundStore: SoundStore) {
+export async function playMisskeySfxFile(soundStore: SoundStore): Promise<boolean> {
 	// 連続して再生しない
-	if (!canPlay) return;
+	if (!canPlay) return false;
 	// ユーザーアクティベーションが必要な場合はそれがない場合は再生しない
-	if ('userActivation' in navigator && !navigator.userActivation.hasBeenActive) return;
+	if ('userActivation' in navigator && !navigator.userActivation.hasBeenActive) return false;
 	// サウンドがない場合は再生しない
-	if (soundStore.type === null || soundStore.type === '_driveFile_' && !soundStore.fileUrl) return;
+	if (soundStore.type === null || soundStore.type === '_driveFile_' && !soundStore.fileUrl) return false;
 
 	canPlay = false;
-	playMisskeySfxFileInternal(soundStore).finally(() => {
+	return await playMisskeySfxFileInternal(soundStore).finally(() => {
 		// ごく短時間に音が重複しないように
 		setTimeout(() => {
 			canPlay = true;
@@ -148,19 +158,22 @@ export function playMisskeySfxFile(soundStore: SoundStore) {
 	});
 }
 
-async function playMisskeySfxFileInternal(soundStore: SoundStore) {
+async function playMisskeySfxFileInternal(soundStore: SoundStore): Promise<boolean> {
 	if (soundStore.type === null || (soundStore.type === '_driveFile_' && !soundStore.fileUrl)) {
-		return;
+		return false;
 	}
 	const masterVolume = defaultStore.state.sound_masterVolume;
 	if (isMute() || masterVolume === 0 || soundStore.volume === 0) {
-		return;
+		return true; // ミュート時は成功として扱う
 	}
 	const url = soundStore.type === '_driveFile_' ? soundStore.fileUrl : `/client-assets/sounds/${soundStore.type}.mp3`;
-	const buffer = await loadAudio(url);
-	if (!buffer) return;
+	const buffer = await loadAudio(url).catch(() => {
+		return undefined;
+	});
+	if (!buffer) return false;
 	const volume = soundStore.volume * masterVolume;
 	createSourceNode(buffer, { volume }).soundSource.start();
+	return true;
 }
 
 export async function playUrl(url: string, opts: {

From 400ae6ef0107881c241f928b551d116a1292f4a5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2024 11:35:33 +0000
Subject: [PATCH 144/221] Bump version to 2024.7.0-rc.8

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 7846e5cb51..42751be196 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.7.0-rc.7",
+	"version": "2024.7.0-rc.8",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 8b9b0c6b44..45f42e1846 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.7.0-rc.7",
+	"version": "2024.7.0-rc.8",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 63f9c271ca9958abb00d879be01a045d25d261d1 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 30 Jul 2024 20:58:25 +0900
Subject: [PATCH 145/221] :art:

---
 .../src/components/MkSystemWebhookEditor.vue  |  5 ++-
 .../notification-recipient.editor.vue         | 43 +++++++++++--------
 .../frontend/src/pages/emoji-edit-dialog.vue  |  5 ++-
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/packages/frontend/src/components/MkSystemWebhookEditor.vue b/packages/frontend/src/components/MkSystemWebhookEditor.vue
index a141b4ff74..cad2e99e4d 100644
--- a/packages/frontend/src/components/MkSystemWebhookEditor.vue
+++ b/packages/frontend/src/components/MkSystemWebhookEditor.vue
@@ -19,8 +19,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 		{{ mode === 'create' ? i18n.ts._webhookSettings.createWebhook : i18n.ts._webhookSettings.modifyWebhook }}
 	</template>
 
-	<div>
-		<MkSpacer :marginMin="20" :marginMax="28">
+	<div style="display: flex; flex-direction: column; min-height: 100%;">
+		<MkSpacer :marginMin="20" :marginMax="28" style="flex-grow: 1;">
 			<MkLoading v-if="loading !== 0"/>
 			<div v-else :class="$style.root" class="_gaps_m">
 				<MkInput v-model="title">
@@ -226,6 +226,7 @@ onMounted(async () => {
 
 .footer {
 	position: sticky;
+	z-index: 10000;
 	bottom: 0;
 	left: 0;
 	padding: 12px;
diff --git a/packages/frontend/src/pages/admin/abuse-report/notification-recipient.editor.vue b/packages/frontend/src/pages/admin/abuse-report/notification-recipient.editor.vue
index 015109f54e..827e22e8ae 100644
--- a/packages/frontend/src/pages/admin/abuse-report/notification-recipient.editor.vue
+++ b/packages/frontend/src/pages/admin/abuse-report/notification-recipient.editor.vue
@@ -16,8 +16,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #header>
 		{{ mode === 'create' ? i18n.ts._abuseReport._notificationRecipient.createRecipient : i18n.ts._abuseReport._notificationRecipient.modifyRecipient }}
 	</template>
-	<div v-if="loading === 0">
-		<MkSpacer :marginMin="20" :marginMax="28">
+	<div v-if="loading === 0" style="display: flex; flex-direction: column; min-height: 100%;">
+		<MkSpacer :marginMin="20" :marginMax="28" style="flex-grow: 1;">
 			<div :class="$style.root" class="_gaps_m">
 				<MkInput v-model="title">
 					<template #label>{{ i18n.ts.title }}</template>
@@ -44,7 +44,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 								{{ webhook.name }}
 							</option>
 						</MkSelect>
-						<MkButton rounded @click="onEditSystemWebhookClicked">
+						<MkButton rounded :class="$style.systemWebhookEditButton" @click="onEditSystemWebhookClicked">
 							<span v-if="systemWebhookId === null" class="ti ti-plus" style="line-height: normal"/>
 							<span v-else class="ti ti-settings" style="line-height: normal"/>
 						</MkButton>
@@ -60,8 +60,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</MkSpacer>
 
 		<div :class="$style.footer" class="_buttonsCenter">
-			<MkButton primary :disabled="disableSubmitButton" @click="onSubmitClicked"><i class="ti ti-check"></i> {{ i18n.ts.ok }}</MkButton>
-			<MkButton @click="onCancelClicked"><i class="ti ti-x"></i> {{ i18n.ts.cancel }}</MkButton>
+			<MkButton primary rounded :disabled="disableSubmitButton" @click="onSubmitClicked"><i class="ti ti-check"></i> {{ i18n.ts.ok }}</MkButton>
+			<MkButton rounded @click="onCancelClicked"><i class="ti ti-x"></i> {{ i18n.ts.cancel }}</MkButton>
 		</div>
 	</div>
 	<div v-else>
@@ -289,10 +289,15 @@ onMounted(async () => {
 }
 
 .footer {
-	display: flex;
-	justify-content: center;
-	align-items: flex-end;
-	margin-top: 20px;
+	position: sticky;
+	z-index: 10000;
+	bottom: 0;
+	left: 0;
+	padding: 12px;
+	border-top: solid 0.5px var(--divider);
+	background: var(--acrylicBg);
+	-webkit-backdrop-filter: var(--blur, blur(15px));
+	backdrop-filter: var(--blur, blur(15px));
 }
 
 .systemWebhook {
@@ -301,16 +306,16 @@ onMounted(async () => {
 	justify-content: stretch;
 	align-items: flex-end;
 	gap: 8px;
+}
 
-	button {
-		min-width: 0;
-		min-height: 0;
-		width: 34px;
-		height: 34px;
-		flex-shrink: 0;
-		box-sizing: border-box;
-		margin: 1px 0;
-		padding: 6px;
-	}
+.systemWebhookEditButton {
+	min-width: 0;
+	min-height: 0;
+	width: 34px;
+	height: 34px;
+	flex-shrink: 0;
+	box-sizing: border-box;
+	margin: 1px 0;
+	padding: 6px;
 }
 </style>
diff --git a/packages/frontend/src/pages/emoji-edit-dialog.vue b/packages/frontend/src/pages/emoji-edit-dialog.vue
index d0a6bba47b..853c1d6b0b 100644
--- a/packages/frontend/src/pages/emoji-edit-dialog.vue
+++ b/packages/frontend/src/pages/emoji-edit-dialog.vue
@@ -15,8 +15,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template v-if="emoji" #header>:{{ emoji.name }}:</template>
 	<template v-else #header>New emoji</template>
 
-	<div>
-		<MkSpacer :marginMin="20" :marginMax="28">
+	<div style="display: flex; flex-direction: column; min-height: 100%;">
+		<MkSpacer :marginMin="20" :marginMax="28" style="flex-grow: 1;">
 			<div class="_gaps_m">
 				<div v-if="imgUrl != null" :class="$style.imgs">
 					<div style="background: #000;" :class="$style.imgContainer">
@@ -239,6 +239,7 @@ async function del() {
 
 .footer {
 	position: sticky;
+	z-index: 10000;
 	bottom: 0;
 	left: 0;
 	padding: 12px;

From 3137c104f23ac966340a66f7452f3a903d134633 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Wed, 31 Jul 2024 07:23:38 +0900
Subject: [PATCH 146/221] =?UTF-8?q?test:=20=E3=83=95=E3=82=A9=E3=83=AD?=
 =?UTF-8?q?=E3=83=BC=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E3=83=A6?=
 =?UTF-8?q?=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=8B=E3=82=89=E3=81=AE=E8=87=AA?=
 =?UTF-8?q?=E5=88=86=E3=81=B8=E3=81=AE=E8=BF=94=E4=BF=A1=E3=81=8C=E5=90=AB?=
 =?UTF-8?q?=E3=81=BE=E3=82=8C=E3=82=8B=E3=81=93=E3=81=A8=E3=82=92=E7=A2=BA?=
 =?UTF-8?q?=E8=AA=8D=E3=81=99=E3=82=8B=E3=83=86=E3=82=B9=E3=83=88=E3=82=92?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0=20(#14333)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/test/e2e/timelines.ts | 30 ++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/packages/backend/test/e2e/timelines.ts b/packages/backend/test/e2e/timelines.ts
index b7069dd82c..d12be2a9ac 100644
--- a/packages/backend/test/e2e/timelines.ts
+++ b/packages/backend/test/e2e/timelines.ts
@@ -703,6 +703,21 @@ describe('Timelines', () => {
 			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
+		test.concurrent('withReplies: false でフォローしていないユーザーからの自分への返信が含まれる', async () => {
+			const [alice, bob] = await Promise.all([signup(), signup()]);
+
+			await setTimeout(1000);
+			const aliceNote = await post(alice, { text: 'hi' });
+			const bobNote = await post(bob, { text: 'hi', replyId: aliceNote.id });
+
+			await waitForPushToTl();
+
+			const res = await api('notes/local-timeline', { limit: 100 }, alice);
+
+			assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+		});
+
 		test.concurrent('[withReplies: true] 他人の他人への返信が含まれる', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 
@@ -899,6 +914,21 @@ describe('Timelines', () => {
 			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
 		});
 
+		test.concurrent('withReplies: false でフォローしていないユーザーからの自分への返信が含まれる', async () => {
+			const [alice, bob] = await Promise.all([signup(), signup()]);
+
+			await setTimeout(1000);
+			const aliceNote = await post(alice, { text: 'hi' });
+			const bobNote = await post(bob, { text: 'hi', replyId: aliceNote.id });
+
+			await waitForPushToTl();
+
+			const res = await api('notes/local-timeline', { limit: 100 }, alice);
+
+			assert.strictEqual(res.body.some(note => note.id === aliceNote.id), true);
+			assert.strictEqual(res.body.some(note => note.id === bobNote.id), true);
+		});
+
 		test.concurrent('[withReplies: true] 他人の他人への返信が含まれる', async () => {
 			const [alice, bob, carol] = await Promise.all([signup(), signup(), signup()]);
 

From 9dacc20d67777185c729dd71899885db72874692 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 31 Jul 2024 07:23:58 +0900
Subject: [PATCH 147/221] New Crowdin updates (#14331)

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

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

* New translations ja-jp.yml (English)

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

* New translations ja-jp.yml (English)
---
 locales/en-US.yml | 10 ++++++++--
 locales/zh-CN.yml | 10 ++++++++--
 locales/zh-TW.yml |  6 ++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index cfb5783a95..451300d973 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -167,7 +167,7 @@ emojiUrl: "Emoji URL"
 addEmoji: "Add an emoji"
 settingGuide: "Recommended settings"
 cacheRemoteFiles: "Cache remote files"
-cacheRemoteFilesDescription: "When this setting is disabled, remote files are loaded directly from the remote instance. Disabling this will decrease storage usage, but increase traffic, as thumbnails will not be generated."
+cacheRemoteFilesDescription: "When this setting is disabled, remote files are loaded directly from the remote servers. Disabling this will decrease storage usage, but increase traffic, as thumbnails will not be generated."
 youCanCleanRemoteFilesCache: "You can clear the cache by clicking the 🗑️ button in the file management view."
 cacheRemoteSensitiveFiles: "Cache sensitive remote files"
 cacheRemoteSensitiveFilesDescription: "When this setting is disabled, sensitive remote files are loaded directly from the remote instance without caching."
@@ -212,6 +212,7 @@ perDay: "Per Day"
 stopActivityDelivery: "Stop sending activities"
 blockThisInstance: "Block this instance"
 silenceThisInstance: "Silence this instance"
+mediaSilenceThisInstance: "Media-silence this server"
 operations: "Operations"
 software: "Software"
 version: "Version"
@@ -232,7 +233,9 @@ clearCachedFilesConfirm: "Are you sure that you want to delete all cached remote
 blockedInstances: "Blocked Instances"
 blockedInstancesDescription: "List the hostnames of the instances you want to block separated by linebreaks. Listed instances will no longer be able to communicate with this instance."
 silencedInstances: "Silenced instances"
-silencedInstancesDescription: "List the hostnames of the instances that you want to silence. All accounts of the listed instances will be treated as silenced, can only make follow requests, and cannot mention local accounts if not followed. This will not affect blocked instances."
+silencedInstancesDescription: "List the host names of the servers that you want to silence, separated by a new line. All accounts belonging to the listed servers will be treated as silenced, and can only make follow requests, and cannot mention local accounts if not followed. This will not affect the blocked servers."
+mediaSilencedInstances: "Media-silenced servers"
+mediaSilencedInstancesDescription: "List the host names of the servers that you want to media-silence, separated by a new line. All accounts belonging to the listed servers will be treated as sensitive, and can't use custom emojis. This will not affect the blocked servers."
 muteAndBlock: "Mutes and Blocks"
 mutedUsers: "Muted users"
 blockedUsers: "Blocked users"
@@ -1121,6 +1124,8 @@ preventAiLearning: "Reject usage in Machine Learning (Generative AI)"
 preventAiLearningDescription: "Requests crawlers to not use posted text or image material etc. in machine learning (Predictive / Generative AI) data sets. This is achieved by adding a \"noai\" HTML-Response flag to the respective content. A complete prevention can however not be achieved through this flag, as it may simply be ignored."
 options: "Options"
 specifyUser: "Specific user"
+lookupConfirm: "Do you want to look up?"
+openTagPageConfirm: "Do you want to open a hashtag page?"
 specifyHost: "Specify a host"
 failedToPreviewUrl: "Could not preview"
 update: "Update"
@@ -1962,6 +1967,7 @@ _soundSettings:
   driveFileTypeWarnDescription: "Select an audio file"
   driveFileDurationWarn: "The audio is too long."
   driveFileDurationWarnDescription: "Long audio may disrupt using Misskey. Still continue?"
+  driveFileError: "It couldn't load the sound. Please change the setting."
 _ago:
   future: "Future"
   justNow: "Just now"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 8eae32ca32..0a868aab44 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -212,6 +212,7 @@ perDay: "每天"
 stopActivityDelivery: "停止发送活动"
 blockThisInstance: "阻止此服务器向本服务器推流"
 silenceThisInstance: "使服务器静音"
+mediaSilenceThisInstance: "隐藏此服务器的媒体文件"
 operations: "操作"
 software: "软件"
 version: "版本"
@@ -230,9 +231,11 @@ clearQueueConfirmText: "未送达的帖子将不会被投递。 通常无需执
 clearCachedFiles: "清除缓存"
 clearCachedFilesConfirm: "确定要清除所有缓存的远程文件？"
 blockedInstances: "被封锁的服务器"
-blockedInstancesDescription: "设定要封锁的服务器，以换行来进行分割。被封锁的服务器将无法与本服务器进行交换通讯。子域名也同样会被封锁。"
+blockedInstancesDescription: "设定要封锁的服务器，以换行分隔。被封锁的服务器将无法与本服务器进行交换通讯。子域名也同样会被封锁。"
 silencedInstances: "被静音的服务器"
-silencedInstancesDescription: "设置要静音的服务器，以换行符分隔。被静音的服务器内所有的账户将默认处于「静音」状态，仅能发送关注请求，并且在未关注状态下无法提及本地账户。被阻止的实例不受影响。"
+silencedInstancesDescription: "设置要静音的服务器，以换行分隔。被静音的服务器内所有的账户将默认处于「静音」状态，仅能发送关注请求，并且在未关注状态下无法提及本地账户。被阻止的实例不受影响。"
+mediaSilencedInstances: "已隐藏媒体文件的服务器"
+mediaSilencedInstancesDescription: "设置要隐藏媒体文件的服务器，以换行分隔。被设置为隐藏媒体文件服务器内所有账号的文件均按照「敏感内容」处理，且将无法使用自定义表情符号。被阻止的实例不受影响。"
 muteAndBlock: "静音/拉黑"
 mutedUsers: "已静音用户"
 blockedUsers: "已拉黑的用户"
@@ -1121,6 +1124,8 @@ preventAiLearning: "拒绝接受生成式 AI 的学习"
 preventAiLearningDescription: "要求文章生成 AI 或图像生成 AI 不能够以发布的帖子和图像等内容作为学习对象。这是通过在 HTML 响应中包含 noai 标志来实现的，这不能完全阻止 AI 学习你的发布内容，并不是所有 AI 都会遵守这类请求。"
 options: "选项"
 specifyUser: "用户指定"
+lookupConfirm: "确定查询？"
+openTagPageConfirm: "确定打开话题标签页面？"
 specifyHost: "指定主机名"
 failedToPreviewUrl: "无法预览"
 update: "更新"
@@ -1961,6 +1966,7 @@ _soundSettings:
   driveFileTypeWarnDescription: "请选择音频文件"
   driveFileDurationWarn: "音频过长"
   driveFileDurationWarnDescription: "使用长音频可能会影响 Misskey 的使用。即使这样也要继续吗？"
+  driveFileError: "无法读取声音。请更改设置。"
 _ago:
   future: "未来"
   justNow: "最近"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 8b53273c3b..476ccd8799 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -212,6 +212,7 @@ perDay: "每日"
 stopActivityDelivery: "停止發送活動"
 blockThisInstance: "封鎖此伺服器"
 silenceThisInstance: "禁言此伺服器"
+mediaSilenceThisInstance: "將這個伺服器的媒體設為禁言"
 operations: "操作"
 software: "軟體"
 version: "版本"
@@ -233,6 +234,8 @@ blockedInstances: "已封鎖的伺服器"
 blockedInstancesDescription: "請逐行輸入需要封鎖的伺服器。已封鎖的伺服器將無法與本伺服器進行通訊。"
 silencedInstances: "被禁言的伺服器"
 silencedInstancesDescription: "設定要禁言的伺服器主機名稱，以換行分隔。隸屬於禁言伺服器的所有帳戶都將被視為「禁言帳戶」，只能發出「追隨請求」，而且無法提及未追隨的本地帳戶。這不會影響已封鎖的實例。"
+mediaSilencedInstances: "媒體被禁言的伺服器"
+mediaSilencedInstancesDescription: "設定您想要對媒體設定禁言的伺服器，以換行符號區隔。來自被媒體禁言的伺服器所屬帳戶的所有檔案都會被視為敏感檔案，且自訂表情符號不能使用。被封鎖的伺服器不受影響。"
 muteAndBlock: "靜音和封鎖"
 mutedUsers: "被靜音的使用者"
 blockedUsers: "被封鎖的使用者"
@@ -1121,6 +1124,8 @@ preventAiLearning: "拒絕接受生成式AI的訓練"
 preventAiLearningDescription: "要求站外生成式 AI 不使用您發佈的內容訓練模型。此功能會使伺服器於 HTML 回應新增「noai」標籤，而因為要視乎 AI 會否遵守該標籤，所以此功能無法完全阻止所有 AI 使用您的內容。"
 options: "選項"
 specifyUser: "指定使用者"
+lookupConfirm: "要查詢嗎？"
+openTagPageConfirm: "要開啟標籤的頁面嗎？"
 specifyHost: "指定主機"
 failedToPreviewUrl: "無法預覽"
 update: "更新"
@@ -1962,6 +1967,7 @@ _soundSettings:
   driveFileTypeWarnDescription: "請選擇音效檔案"
   driveFileDurationWarn: "音效太長了"
   driveFileDurationWarnDescription: "使用長音效檔可能會影響 Misskey 的使用體驗。仍要使用此檔案嗎？"
+  driveFileError: "無法載入語音。請更改設定"
 _ago:
   future: "未來"
   justNow: "剛剛"

From d63b854f96d9437f9764f9170c3ed3537cc98a2c Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 31 Jul 2024 08:12:35 +0900
Subject: [PATCH 148/221] tweak localization

---
 locales/ja-JP.yml                                          | 2 +-
 packages/frontend/src/components/MkSystemWebhookEditor.vue | 2 +-
 packages/frontend/src/pages/settings/webhook.edit.vue      | 2 +-
 packages/frontend/src/pages/settings/webhook.new.vue       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 522ad7e22a..b493183974 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2492,7 +2492,7 @@ _webhookSettings:
   modifyWebhook: "Webhookを編集"
   name: "名前"
   secret: "シークレット"
-  events: "Webhookを実行するタイミング"
+  trigger: "トリガー"
   active: "有効"
   _events:
     follow: "フォローしたとき"
diff --git a/packages/frontend/src/components/MkSystemWebhookEditor.vue b/packages/frontend/src/components/MkSystemWebhookEditor.vue
index cad2e99e4d..f5c7a3160b 100644
--- a/packages/frontend/src/components/MkSystemWebhookEditor.vue
+++ b/packages/frontend/src/components/MkSystemWebhookEditor.vue
@@ -33,7 +33,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<template #label>{{ i18n.ts._webhookSettings.secret }}</template>
 				</MkInput>
 				<MkFolder :defaultOpen="true">
-					<template #label>{{ i18n.ts._webhookSettings.events }}</template>
+					<template #label>{{ i18n.ts._webhookSettings.trigger }}</template>
 
 					<div class="_gaps_s">
 						<MkSwitch v-model="events.abuseReport" :disabled="disabledEvents.abuseReport">
diff --git a/packages/frontend/src/pages/settings/webhook.edit.vue b/packages/frontend/src/pages/settings/webhook.edit.vue
index e9fb1e471e..058ef69c35 100644
--- a/packages/frontend/src/pages/settings/webhook.edit.vue
+++ b/packages/frontend/src/pages/settings/webhook.edit.vue
@@ -19,7 +19,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</MkInput>
 
 	<FormSection>
-		<template #label>{{ i18n.ts._webhookSettings.events }}</template>
+		<template #label>{{ i18n.ts._webhookSettings.trigger }}</template>
 
 		<div class="_gaps_s">
 			<MkSwitch v-model="event_follow">{{ i18n.ts._webhookSettings._events.follow }}</MkSwitch>
diff --git a/packages/frontend/src/pages/settings/webhook.new.vue b/packages/frontend/src/pages/settings/webhook.new.vue
index 5bf85e48f4..d62357caaf 100644
--- a/packages/frontend/src/pages/settings/webhook.new.vue
+++ b/packages/frontend/src/pages/settings/webhook.new.vue
@@ -19,7 +19,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</MkInput>
 
 	<FormSection>
-		<template #label>{{ i18n.ts._webhookSettings.events }}</template>
+		<template #label>{{ i18n.ts._webhookSettings.trigger }}</template>
 
 		<div class="_gaps_s">
 			<MkSwitch v-model="event_follow">{{ i18n.ts._webhookSettings._events.follow }}</MkSwitch>

From 4b04b2989b3c8957cee292326846b3e019b4a1c6 Mon Sep 17 00:00:00 2001
From: taichan <40626578+tai-cha@users.noreply.github.com>
Date: Wed, 31 Jul 2024 17:22:51 +0900
Subject: [PATCH 149/221] chore(locale): update index.d.ts (#14339)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/misskey-dev/misskey/commit/d63b854f96d9437f9764f9170c3ed3537cc98a2c での更新漏れ
---
 locales/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index c58e4ace7b..91d36a14a6 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -9402,9 +9402,9 @@ export interface Locale extends ILocale {
          */
         "secret": string;
         /**
-         * Webhookを実行するタイミング
+         * トリガー
          */
-        "events": string;
+        "trigger": string;
         /**
          * 有効
          */

From d6ba12e24c78611d80a005efef4340681949931b Mon Sep 17 00:00:00 2001
From: taichan <40626578+tai-cha@users.noreply.github.com>
Date: Wed, 31 Jul 2024 18:10:36 +0900
Subject: [PATCH 150/221] =?UTF-8?q?Fix(frontend):=20LTL=E7=84=A1=E5=8A=B9?=
 =?UTF-8?q?=E6=99=82=E3=81=AB=E3=83=98=E3=83=83=E3=83=80=E3=83=BC=E3=81=AB?=
 =?UTF-8?q?STL=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=A6?=
 =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=86=20&=20=E3=83=87=E3=83=95=E3=82=A9?=
 =?UTF-8?q?=E3=83=AB=E3=83=88=E3=80=81=E3=82=AF=E3=83=A9=E3=82=B7=E3=83=83?=
 =?UTF-8?q?=E3=82=AF=E3=81=A7=E3=83=AA=E3=82=B9=E3=83=88=E3=81=8C=E6=B6=88?=
 =?UTF-8?q?=E3=81=88=E3=81=A6=E3=81=84=E3=82=8B=20(#14337)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix condition of STL available

* Fix: condition of stl

* Listがタイムラインのヘッダーから消えている
---
 packages/frontend/src/pages/timeline.vue | 5 +++++
 packages/frontend/src/timelines.ts       | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index c5905c7ada..32f6dd0e5a 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -287,6 +287,11 @@ const headerTabs = computed(() => [...(defaultStore.reactiveState.pinnedUserList
 	icon: basicTimelineIconClass(tl),
 	iconOnly: true,
 })), {
+	icon: 'ti ti-list',
+	title: i18n.ts.lists,
+	iconOnly: true,
+	onClick: chooseList,
+}, {
 	icon: 'ti ti-antenna',
 	title: i18n.ts.antennas,
 	iconOnly: true,
diff --git a/packages/frontend/src/timelines.ts b/packages/frontend/src/timelines.ts
index 3ef95fd272..94eda3545e 100644
--- a/packages/frontend/src/timelines.ts
+++ b/packages/frontend/src/timelines.ts
@@ -39,7 +39,7 @@ export function isAvailableBasicTimeline(timeline: BasicTimelineType | undefined
 		case 'local':
 			return ($i == null && instance.policies.ltlAvailable) || ($i != null && $i.policies.ltlAvailable);
 		case 'social':
-			return $i != null && instance.policies.ltlAvailable;
+			return $i != null && $i.policies.ltlAvailable;
 		case 'global':
 			return ($i == null && instance.policies.gtlAvailable) || ($i != null && $i.policies.gtlAvailable);
 		default:

From 1a521a44c0c0e3f5a8156a2cf4b2f8001ff3d004 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 31 Jul 2024 18:13:20 +0900
Subject: [PATCH 151/221] New Crowdin updates (#14335)

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

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

* New translations ja-jp.yml (English)

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

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Spanish)

* 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 (Polish)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (English)

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

* New translations ja-jp.yml (Chinese Traditional)
---
 locales/cs-CZ.yml |  1 -
 locales/de-DE.yml |  1 -
 locales/en-US.yml |  4 ++--
 locales/es-ES.yml |  1 -
 locales/id-ID.yml |  1 -
 locales/it-IT.yml |  1 -
 locales/ja-KS.yml |  1 -
 locales/ko-KR.yml |  1 -
 locales/pl-PL.yml |  1 -
 locales/th-TH.yml | 22 ++++++++++++++++++++--
 locales/vi-VN.yml |  1 -
 locales/zh-CN.yml |  2 +-
 locales/zh-TW.yml |  2 +-
 13 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index aa970f823a..7db7424762 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -2010,7 +2010,6 @@ _webhookSettings:
   createWebhook: "Vytvořit Webhook"
   name: "Jméno"
   secret: "Tajné"
-  events: "Události Webhook"
   active: "Zapnuto"
   _events:
     follow: "Při sledování uživatele"
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index a319af56cb..8e44a3bbd4 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -2191,7 +2191,6 @@ _webhookSettings:
   createWebhook: "Webhook erstellen"
   name: "Name"
   secret: "Secret"
-  events: "Webhook-Ereignisse"
   active: "Aktiviert"
   _events:
     follow: "Wenn du jemandem folgst"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 451300d973..2cb76fa746 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -398,7 +398,7 @@ mcaptcha: "mCaptcha"
 enableMcaptcha: "Enable mCaptcha"
 mcaptchaSiteKey: "Site key"
 mcaptchaSecretKey: "Secret key"
-mcaptchaInstanceUrl: "mCaptcha instance URL"
+mcaptchaInstanceUrl: "mCaptcha server URL"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Enable reCAPTCHA"
 recaptchaSiteKey: "Site key"
@@ -2426,7 +2426,7 @@ _webhookSettings:
   modifyWebhook: "Modify Webhook"
   name: "Name"
   secret: "Secret"
-  events: "Webhook Events"
+  trigger: "Trigger"
   active: "Enabled"
   _events:
     follow: "When following a user"
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 3ae3ba3b8a..ef066a37ed 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -2382,7 +2382,6 @@ _webhookSettings:
   createWebhook: "Crear Webhook"
   name: "Nombre"
   secret: "Secreto"
-  events: "Eventos de webhook"
   active: "Activado"
   _events:
     follow: "Cuando se sigue a alguien"
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index de50569e89..24f7482fca 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -2403,7 +2403,6 @@ _webhookSettings:
   modifyWebhook: "Sunting Webhook"
   name: "Nama"
   secret: "Secret"
-  events: "Webhook Events"
   active: "Aktif"
   _events:
     follow: "Ketika mengikuti pengguna"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index 64cd26878e..2b4b1e425e 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -2412,7 +2412,6 @@ _webhookSettings:
   modifyWebhook: "Modifica Webhook"
   name: "Nome"
   secret: "Segreto"
-  events: "Quando eseguire il Webhook"
   active: "Attivo"
   _events:
     follow: "Quando segui un profilo"
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index 774031f6f5..5969082cf2 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -2391,7 +2391,6 @@ _webhookSettings:
   createWebhook: "Webhookをつくる"
   name: "名前"
   secret: "シークレット"
-  events: "Webhookを投げるタイミング"
   active: "有効"
   _events:
     follow: "フォローしたとき～！"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 7fcb681c9a..34c1cc3ebf 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -2411,7 +2411,6 @@ _webhookSettings:
   modifyWebhook: "Webhook 수정"
   name: "이름"
   secret: "시크릿"
-  events: "Webhook을 실행할 타이밍"
   active: "활성화"
   _events:
     follow: "누군가를 팔로우했을 때"
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index 7513d056b4..73eff0941a 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1544,7 +1544,6 @@ _webhookSettings:
   createWebhook: "Stwórz Webhook"
   name: "Nazwa"
   secret: "Sekret"
-  events: "Uruchomienie Webhooka"
   active: "Właczono"
   _events:
     follow: "Po zaobserwowaniu użytkownika"
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index eb7cdc2365..63f2793428 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -60,6 +60,7 @@ copyFileId: "คัดลอกไฟล์ ID"
 copyFolderId: "คัดลอกโฟลเดอร์ ID"
 copyProfileUrl: "คัดลอกโปรไฟล์ URL"
 searchUser: "ค้นหาผู้ใช้"
+searchThisUsersNotes: "ค้นหาโน้ตของผู้ใช้"
 reply: "ตอบกลับ"
 loadMore: "แสดงเพิ่มเติม"
 showMore: "แสดงเพิ่มเติม"
@@ -154,6 +155,7 @@ editList: "แก้ไขรายชื่อ"
 selectChannel: "เลือกช่อง"
 selectAntenna: "เลือกเสาอากาศ"
 editAntenna: "แก้ไขเสาอากาศ"
+createAntenna: "สร้างเสาอากาศ"
 selectWidget: "เลือกวิดเจ็ต"
 editWidgets: "แก้ไขวิดเจ็ต"
 editWidgetsExit: "เรียบร้อย"
@@ -194,6 +196,7 @@ followConfirm: "ต้องการติดตาม {name} ใช่ไห
 proxyAccount: "บัญชีพร็อกซี่"
 proxyAccountDescription: "บัญชีพร็อกซี คือ บัญชีที่ทำหน้าที่ติดตาม(ผู้ใช้)ระยะไกลภายใต้เงื่อนไขบางประการ ตัวอย่างเช่น เมื่อผู้ใช้ท้องถิ่นเพิ่มผู้ใช้ระยะไกลลงรายชื่อ หากไม่มีใครติดตามผู้ใช้ระยะไกลในรายชื่อนั้น กิจกรรมก็จะไม่ถูกส่งมายังเซิร์ฟเวอร์ ดังนั้นจึงมีบัญชีพร็อกซีไว้ติดตามผู้ใช้ระยะไกลเหล่านั้น"
 host: "โฮสต์"
+selectSelf: "เลือกตัวเอง"
 selectUser: "เลือกผู้ใช้งาน"
 recipient: "ผู้รับ"
 annotation: "หมายเหตุประกอบ"
@@ -209,6 +212,7 @@ perDay: "ต่อวัน"
 stopActivityDelivery: "หยุดส่งกิจกรรม"
 blockThisInstance: "บล็อกเซิร์ฟเวอร์นี้"
 silenceThisInstance: "ปิดปากเซิร์ฟเวอร์นี้"
+mediaSilenceThisInstance: "ปิดปากสื่อของเซิร์ฟเวอร์นี้"
 operations: "ดำเนินการ"
 software: "ซอฟต์แวร์"
 version: "เวอร์ชั่น"
@@ -230,6 +234,8 @@ blockedInstances: "เซิร์ฟเวอร์ที่ถูกบล็
 blockedInstancesDescription: "ระบุโฮสต์ของเซิร์ฟเวอร์ที่ต้องการบล็อก คั่นด้วยการขึ้นบรรทัดใหม่ เซิร์ฟเวอร์ที่ถูกบล็อกจะไม่สามารถติดต่อกับอินสแตนซ์นี้ได้"
 silencedInstances: "ปิดปากเซิร์ฟเวอร์นี้แล้ว"
 silencedInstancesDescription: "ระบุโฮสต์ของเซิร์ฟเวอร์ที่ต้องการปิดปาก คั่นด้วยการขึ้นบรรทัดใหม่, บัญชีทั้งหมดของเซิร์ฟเวอร์ดังกล่าวจะถือว่าถูกปิดปากเช่นกัน ทำได้เฉพาะคำขอติดตามเท่านั้น และไม่สามารถกล่าวถึงบัญชีในเซิร์ฟเวอร์นี้ได้หากไม่ได้ถูกติดตามกลับ | สิ่งนี้ไม่มีผลต่ออินสแตนซ์ที่ถูกบล็อก"
+mediaSilencedInstances: "เซิร์ฟเวอร์ที่ถูกปิดปากสื่อ"
+mediaSilencedInstancesDescription: "ระบุโฮสต์ของเซิร์ฟเวอร์ที่ต้องการปิดปากสื่อ คั่นด้วยการขึ้นบรรทัดใหม่, ไฟล์ที่ถูกส่งจากบัญชีของเซิร์ฟเวอร์ดังกล่าวจะถือว่าถูกปิดปาก แล้วจะถูกติดเครื่องหมายว่ามีเนื้อหาละเอียดอ่อน และเอโมจิแบบกำหนดเองก็จะใช้ไม่ได้ด้วย | สิ่งนี้ไม่มีผลต่ออินสแตนซ์ที่ถูกบล็อก"
 muteAndBlock: "ปิดเสียงและบล็อก"
 mutedUsers: "ผู้ใช้ที่ถูกปิดเสียง"
 blockedUsers: "ผู้ใช้ที่ถูกบล็อก"
@@ -1106,6 +1112,8 @@ preservedUsernames: "ชื่อผู้ใช้ที่สงวนไว
 preservedUsernamesDescription: "ระบุชื่อผู้ใช้ที่จะสงวนชื่อไว้ คั่นด้วยการขึ้นบรรทัดใหม่ ชื่อผู้ใช้ที่ระบุที่นี่จะไม่สามารถใช้งานได้อีกต่อไปเมื่อสร้างบัญชีใหม่ ยกเว้นเมื่อผู้ดูแลระบบสร้างบัญชี นอกจากนี้ บัญชีที่มีอยู่แล้วจะไม่ได้รับผลกระทบ"
 createNoteFromTheFile: "เรียบเรียงโน้ตจากไฟล์นี้"
 archive: "เก็บถาวร"
+archived: "เก็บถาวรแล้ว"
+unarchive: "เลิกการเก็บถาวร"
 channelArchiveConfirmTitle: "ต้องการเก็บถาวรเจ้า {name} ใช่ไหม?"
 channelArchiveConfirmDescription: "เมื่อเก็บถาวรแล้ว จะไม่ปรากฏในรายการช่องหรือผลการค้นหาอีกต่อไป และจะไม่สามารถโพสต์ใหม่ได้อีกต่อไป"
 thisChannelArchived: "ช่องนี้ถูกเก็บถาวรแล้วนะ"
@@ -1116,6 +1124,9 @@ preventAiLearning: "ปฏิเสธการเรียนรู้ด้ว
 preventAiLearningDescription: "ส่งคำร้องขอไม่ให้ใช้ ข้อความในโน้ตที่โพสต์, หรือเนื้อหารูปภาพ ฯลฯ ในการเรียนรู้ของเครื่อง(machine learning) / Predictive AI / Generative AI โดยการเพิ่มแฟล็ก “noai” ลง HTML-Response ให้กับเนื้อหาที่เกี่ยวข้อง แต่ทั้งนี้ ไม่ได้ป้องกัน AI จากการเรียนรู้ได้อย่างสมบูรณ์ เนื่องจากมี AI บางตัวเท่านั้นที่จะเคารพคำขอดังกล่าว"
 options: "ตัวเลือกบทบาท"
 specifyUser: "ผู้ใช้เฉพาะ"
+lookupConfirm: "ต้องการเรียกดูข้อมูลใช่ไหม?"
+openTagPageConfirm: "ต้องการเปิดหน้าแฮชแท็กใช่ไหม?"
+specifyHost: "ระบุโฮสต์"
 failedToPreviewUrl: "ไม่สามารถดูตัวอย่างได้"
 update: "อัปเดต"
 rolesThatCanBeUsedThisEmojiAsReaction: "บทบาทที่สามารถใช้เอโมจินี้เป็นรีแอคชั่นได้"
@@ -1250,6 +1261,8 @@ inquiry: "ติดต่อเรา"
 tryAgain: "โปรดลองอีกครั้ง"
 confirmWhenRevealingSensitiveMedia: "ตรวจสอบก่อนแสดงสื่อที่มีเนื้อหาละเอียดอ่อน"
 sensitiveMediaRevealConfirm: "สื่อนี้มีเนื้อหาละเอียดอ่อน, ต้องการแสดงใช่ไหม?"
+createdLists: "รายชื่อที่ถูกสร้าง"
+createdAntennas: "เสาอากาศที่ถูกสร้าง"
 _delivery:
   status: "สถานะการจัดส่ง"
   stop: "ระงับการส่ง"
@@ -1954,6 +1967,7 @@ _soundSettings:
   driveFileTypeWarnDescription: "กรุณาเลือกไฟล์เสียง"
   driveFileDurationWarn: "เสียงยาวเกินไป"
   driveFileDurationWarnDescription: "การใช้เสียงที่ยาว อาจรบกวนการใช้งาน Misskey, ต้องการดำเนินการต่อใช่ไหม?"
+  driveFileError: "ไม่สามารถโหลดไฟล์เสียงได้ กรุณาเปลี่ยนแปลงการตั้งค่า"
 _ago:
   future: "อนาคต"
   justNow: "เมื่อกี๊นี้"
@@ -2412,7 +2426,6 @@ _webhookSettings:
   modifyWebhook: "แก้ไข Webhook"
   name: "ชื่อ"
   secret: "ความลับ"
-  events: "อีเว้นท์ Webhook"
   active: "เปิดใช้งาน"
   _events:
     follow: "เมื่อกำลังติดตามผู้ใช้"
@@ -2536,7 +2549,7 @@ _externalResourceInstaller:
       description: "เกิดปัญหาระหว่างการติดตั้งธีม กรุณาลองอีกครั้ง. รายละเอียดข้อผิดพลาดสามารถดูได้ในคอนโซล Javascript"
 _dataSaver:
   _media:
-    title: "โหลดมีเดีย"
+    title: "โหลดสื่อ"
     description: "กันไม่ให้ภาพและวิดีโอโหลดโดยอัตโนมัติ แตะรูปภาพ/วิดีโอที่ซ่อนอยู่เพื่อโหลด"
   _avatar:
     title: "รูปไอคอน"
@@ -2616,3 +2629,8 @@ _mediaControls:
   pip: "รูปภาพในรูปภาม"
   playbackRate: "ความเร็วในการเล่น"
   loop: "เล่นวนซ้ำ"
+_contextMenu:
+  title: "เมนูเนื้อหา"
+  app: "แอปพลิเคชัน"
+  appWithShift: "แอปฟลิเคชันด้วยปุ่มยกแคร่ (Shift)"
+  native: "UI ของเบราว์เซอร์"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index 317dea5150..aadbf8b16f 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -1918,7 +1918,6 @@ _webhookSettings:
   createWebhook: "Tạo Webhook"
   name: "Tên"
   secret: "Mã bí mật"
-  events: "Sự kiện Webhook"
   active: "Đã bật"
   _events:
     reaction: "Khi nhận được sự kiện"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 0a868aab44..1deb0effc3 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -2425,7 +2425,7 @@ _webhookSettings:
   modifyWebhook: "编辑 webhook"
   name: "名称"
   secret: "密钥"
-  events: "何时运行 Webhook"
+  trigger: "触发器"
   active: "已启用"
   _events:
     follow: "关注时"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 476ccd8799..16dc464e35 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -2426,7 +2426,7 @@ _webhookSettings:
   modifyWebhook: "編輯 Webhook"
   name: "名字"
   secret: "密鑰"
-  events: "何時運行 Webhook"
+  trigger: "觸發器"
   active: "已啟用"
   _events:
     follow: "當你追隨時"

From 59e2e43a68ee39d40f7a95a068cb9cb4f235cfed Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 31 Jul 2024 11:20:28 +0000
Subject: [PATCH 152/221] Release: 2024.7.0

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 42751be196..4bf7b0a918 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.7.0-rc.8",
+	"version": "2024.7.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 45f42e1846..f0e8733e67 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.7.0-rc.8",
+	"version": "2024.7.0",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 008a66d73f58956b6a9c30f2d48cd554df865ac9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 31 Jul 2024 11:20:33 +0000
Subject: [PATCH 153/221] [skip ci] Update CHANGELOG.md (prepend template)

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b996216ac1..86e33a8272 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## Unreleased
+
+### General
+-
+
+### Client
+-
+
+### Server
+-
+
+
 ## 2024.7.0
 
 ### Note

From 6e3e7d7df1efb7d74d905b8ebdf704573ff2f930 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Thu, 8 Aug 2024 20:22:25 +0900
Subject: [PATCH 154/221] Update about-misskey.vue

---
 packages/frontend/src/pages/about-misskey.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index 8db71c8881..9b5b4a5000 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -264,6 +264,9 @@ const patronsWithIcon = [{
 }, {
 	name: 'ささくれりょう',
 	icon: 'https://assets.misskey-hub.net/patrons/cf55022cee6c41da8e70a43587aaad9a.jpg',
+}, {
+	name: 'Macop',
+	icon: 'https://assets.misskey-hub.net/patrons/ee052bf550014d36a643ce3dce595640.jpg',
 }];
 
 const patrons = [

From 820becb4e47ba88e181ad6a225a5a904ea821376 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Fri, 9 Aug 2024 10:51:18 +0900
Subject: [PATCH 155/221] fix import

---
 packages/backend/src/core/ModerationLogService.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/core/ModerationLogService.ts b/packages/backend/src/core/ModerationLogService.ts
index 6c155c9a62..2c02af217d 100644
--- a/packages/backend/src/core/ModerationLogService.ts
+++ b/packages/backend/src/core/ModerationLogService.ts
@@ -9,7 +9,8 @@ import type { ModerationLogsRepository } from '@/models/_.js';
 import type { MiUser } from '@/models/User.js';
 import { IdService } from '@/core/IdService.js';
 import { bindThis } from '@/decorators.js';
-import { ModerationLogPayloads, moderationLogTypes } from '@/types.js';
+import type { ModerationLogPayloads } from '@/types.js';
+import { moderationLogTypes } from '@/types.js';
 
 @Injectable()
 export class ModerationLogService {

From f244d425005ae662cfb94f2a18e38cedadfb3c0a Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Fri, 9 Aug 2024 12:05:28 +0900
Subject: [PATCH 156/221] ci: change prerelease channels to alpha, beta, and rc
 (#14376)

---
 .github/workflows/release-edit-with-push.yml |  2 +-
 .github/workflows/release-with-dispatch.yml  | 14 +++++++++++---
 .github/workflows/release-with-ready.yml     |  2 ++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release-edit-with-push.yml b/.github/workflows/release-edit-with-push.yml
index f86c1948f8..57657a4ba7 100644
--- a/.github/workflows/release-edit-with-push.yml
+++ b/.github/workflows/release-edit-with-push.yml
@@ -6,7 +6,7 @@ on:
       - develop
     paths:
       - 'CHANGELOG.md'
-      # - .github/workflows/release-edit-with-push.yml
+
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/release-with-dispatch.yml b/.github/workflows/release-with-dispatch.yml
index 0936bc0ae8..ed2f822269 100644
--- a/.github/workflows/release-with-dispatch.yml
+++ b/.github/workflows/release-with-dispatch.yml
@@ -17,6 +17,10 @@ on:
         type: boolean
         description: 'MERGE RELEASE BRANCH TO MAIN'
         default: false
+      start-rc:
+        type: boolean
+        description: 'Start Release Candidate'
+        default: false
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -56,13 +60,13 @@ jobs:
 
         ### General
         -
-
+        
         ### Client
         -
-
+        
         ### Server
         -
-
+        
       use_external_app_to_release: ${{ vars.USE_RELEASE_APP == 'true' }}
       indent: ${{ vars.INDENT }}
     secrets:
@@ -79,6 +83,9 @@ jobs:
       package_jsons_to_rewrite: ${{ vars.PACKAGE_JSONS_TO_REWRITE }}
       use_external_app_to_release: ${{ vars.USE_RELEASE_APP == 'true' }}
       indent: ${{ vars.INDENT }}
+      draft_prerelease_channel: alpha
+      ready_start_prerelease_channel: beta
+      prerelease_channel: ${{ inputs.start-rc && 'rc' || '' }}
     secrets:
       RELEASE_APP_ID: ${{ secrets.RELEASE_APP_ID }}
       RELEASE_APP_PRIVATE_KEY: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
@@ -122,6 +129,7 @@ jobs:
       use_external_app_to_release: ${{ vars.USE_RELEASE_APP == 'true' }}
       indent: ${{ vars.INDENT }}
       stable_branch: ${{ vars.STABLE_BRANCH }}
+      draft_prerelease_channel: alpha
     secrets:
       RELEASE_APP_ID: ${{ secrets.RELEASE_APP_ID }}
       RELEASE_APP_PRIVATE_KEY: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
diff --git a/.github/workflows/release-with-ready.yml b/.github/workflows/release-with-ready.yml
index 79b6ade012..e863b5e2e8 100644
--- a/.github/workflows/release-with-ready.yml
+++ b/.github/workflows/release-with-ready.yml
@@ -39,6 +39,8 @@ jobs:
       package_jsons_to_rewrite: ${{ vars.PACKAGE_JSONS_TO_REWRITE }}
       use_external_app_to_release: ${{ vars.USE_RELEASE_APP == 'true' }}
       indent: ${{ vars.INDENT }}
+      draft_prerelease_channel: alpha
+      ready_start_prerelease_channel: beta
     secrets:
       RELEASE_APP_ID: ${{ secrets.RELEASE_APP_ID }}
       RELEASE_APP_PRIVATE_KEY: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}

From 0d508db8a7a36218d38231af4e718aff0e94d9bc Mon Sep 17 00:00:00 2001
From: Daiki Mizukami <tesaguriguma@gmail.com>
Date: Fri, 9 Aug 2024 12:10:51 +0900
Subject: [PATCH 157/221] fix(backend): check visibility of following/followers
 of remote users / feat: moderators can see following/followers of all users
 (#14375)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(backend): check visibility of following/followers of remote users

Resolves https://github.com/misskey-dev/misskey/issues/13362.

* test(backend): add tests for visibility of following/followers of remote users

* docs(changelog): update CHANGELOG.md

* feat: moderators can see following/followers of all users

* docs(changelog): update CHANGELOG.md

* refactor(backend): minor refactoring

`createPerson`と`if`の条件を統一するとともに、異常系の
処理をearly returnに追い出すための変更。

* feat(backend): moderators can see following/followers count of all users

As per https://github.com/misskey-dev/misskey/pull/14375#issuecomment-2275044908.
---
 CHANGELOG.md                                  |  3 +-
 .../activitypub/models/ApPersonService.ts     | 50 ++++++++++++++++-
 packages/backend/src/core/activitypub/type.ts |  6 ++-
 .../src/core/entities/UserEntityService.ts    |  4 +-
 .../server/api/endpoints/users/followers.ts   | 34 ++++++------
 .../server/api/endpoints/users/following.ts   | 34 ++++++------
 packages/backend/test/unit/activitypub.ts     | 53 ++++++++++++++++++-
 .../frontend/src/scripts/isFfVisibleForMe.ts  |  4 +-
 8 files changed, 149 insertions(+), 39 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86e33a8272..c18cccc44e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
 ## Unreleased
 
 ### General
--
+- Fix: リモートユーザのフォロー・フォロワーの一覧が非公開設定の場合も表示できてしまう問題を修正
+- Enhance: モデレーターはすべてのユーザーのフォロー・フォロワーの一覧を見られるように
 
 ### Client
 -
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 457205e023..f3ddf3952c 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -48,7 +48,7 @@ import type { ApResolverService, Resolver } from '../ApResolverService.js';
 import type { ApLoggerService } from '../ApLoggerService.js';
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import type { ApImageService } from './ApImageService.js';
-import type { IActor, IObject } from '../type.js';
+import type { IActor, ICollection, IObject, IOrderedCollection } from '../type.js';
 
 const nameLength = 128;
 const summaryLength = 2048;
@@ -296,6 +296,21 @@ export class ApPersonService implements OnModuleInit {
 
 		const isBot = getApType(object) === 'Service' || getApType(object) === 'Application';
 
+		const [followingVisibility, followersVisibility] = await Promise.all(
+			[
+				this.isPublicCollection(person.following, resolver),
+				this.isPublicCollection(person.followers, resolver),
+			].map((p): Promise<'public' | 'private'> => p
+				.then(isPublic => isPublic ? 'public' : 'private')
+				.catch(err => {
+					if (!(err instanceof StatusError) || err.isRetryable) {
+						this.logger.error('error occurred while fetching following/followers collection', { stack: err });
+					}
+					return 'private';
+				})
+			)
+		);
+
 		const bday = person['vcard:bday']?.match(/^\d{4}-\d{2}-\d{2}/);
 
 		const url = getOneApHrefNullable(person.url);
@@ -357,6 +372,8 @@ export class ApPersonService implements OnModuleInit {
 					description: _description,
 					url,
 					fields,
+					followingVisibility,
+					followersVisibility,
 					birthday: bday?.[0] ?? null,
 					location: person['vcard:Address'] ?? null,
 					userHost: host,
@@ -464,6 +481,23 @@ export class ApPersonService implements OnModuleInit {
 
 		const tags = extractApHashtags(person.tag).map(normalizeForSearch).splice(0, 32);
 
+		const [followingVisibility, followersVisibility] = await Promise.all(
+			[
+				this.isPublicCollection(person.following, resolver),
+				this.isPublicCollection(person.followers, resolver),
+			].map((p): Promise<'public' | 'private' | undefined> => p
+				.then(isPublic => isPublic ? 'public' : 'private')
+				.catch(err => {
+					if (!(err instanceof StatusError) || err.isRetryable) {
+						this.logger.error('error occurred while fetching following/followers collection', { stack: err });
+						// Do not update the visibiility on transient errors.
+						return undefined;
+					}
+					return 'private';
+				})
+			)
+		);
+
 		const bday = person['vcard:bday']?.match(/^\d{4}-\d{2}-\d{2}/);
 
 		const url = getOneApHrefNullable(person.url);
@@ -532,6 +566,8 @@ export class ApPersonService implements OnModuleInit {
 			url,
 			fields,
 			description: _description,
+			followingVisibility,
+			followersVisibility,
 			birthday: bday?.[0] ?? null,
 			location: person['vcard:Address'] ?? null,
 		});
@@ -703,4 +739,16 @@ export class ApPersonService implements OnModuleInit {
 
 		return 'ok';
 	}
+
+	@bindThis
+	private async isPublicCollection(collection: string | ICollection | IOrderedCollection | undefined, resolver: Resolver): Promise<boolean> {
+		if (collection) {
+			const resolved = await resolver.resolveCollection(collection);
+			if (resolved.first || (resolved as ICollection).items || (resolved as IOrderedCollection).orderedItems) {
+				return true;
+			}
+		}
+
+		return false;
+	}
 }
diff --git a/packages/backend/src/core/activitypub/type.ts b/packages/backend/src/core/activitypub/type.ts
index 5b6c6c8ca6..131c518c0a 100644
--- a/packages/backend/src/core/activitypub/type.ts
+++ b/packages/backend/src/core/activitypub/type.ts
@@ -97,13 +97,15 @@ export interface IActivity extends IObject {
 export interface ICollection extends IObject {
 	type: 'Collection';
 	totalItems: number;
-	items: ApObject;
+	first?: IObject | string;
+	items?: ApObject;
 }
 
 export interface IOrderedCollection extends IObject {
 	type: 'OrderedCollection';
 	totalItems: number;
-	orderedItems: ApObject;
+	first?: IObject | string;
+	orderedItems?: ApObject;
 }
 
 export const validPost = ['Note', 'Question', 'Article', 'Audio', 'Document', 'Image', 'Page', 'Video', 'Event'];
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index 7fd093c191..9bf568bc90 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -454,12 +454,12 @@ export class UserEntityService implements OnModuleInit {
 		}
 
 		const followingCount = profile == null ? null :
-			(profile.followingVisibility === 'public') || isMe ? user.followingCount :
+			(profile.followingVisibility === 'public') || isMe || iAmModerator ? user.followingCount :
 			(profile.followingVisibility === 'followers') && (relation && relation.isFollowing) ? user.followingCount :
 			null;
 
 		const followersCount = profile == null ? null :
-			(profile.followersVisibility === 'public') || isMe ? user.followersCount :
+			(profile.followersVisibility === 'public') || isMe || iAmModerator ? user.followersCount :
 			(profile.followersVisibility === 'followers') && (relation && relation.isFollowing) ? user.followersCount :
 			null;
 
diff --git a/packages/backend/src/server/api/endpoints/users/followers.ts b/packages/backend/src/server/api/endpoints/users/followers.ts
index 7ce7734f53..a8b4319a61 100644
--- a/packages/backend/src/server/api/endpoints/users/followers.ts
+++ b/packages/backend/src/server/api/endpoints/users/followers.ts
@@ -11,6 +11,7 @@ import { QueryService } from '@/core/QueryService.js';
 import { FollowingEntityService } from '@/core/entities/FollowingEntityService.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { DI } from '@/di-symbols.js';
+import { RoleService } from '@/core/RoleService.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -81,6 +82,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private utilityService: UtilityService,
 		private followingEntityService: FollowingEntityService,
 		private queryService: QueryService,
+		private roleService: RoleService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const user = await this.usersRepository.findOneBy(ps.userId != null
@@ -93,23 +95,25 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			const profile = await this.userProfilesRepository.findOneByOrFail({ userId: user.id });
 
-			if (profile.followersVisibility === 'private') {
-				if (me == null || (me.id !== user.id)) {
-					throw new ApiError(meta.errors.forbidden);
-				}
-			} else if (profile.followersVisibility === 'followers') {
-				if (me == null) {
-					throw new ApiError(meta.errors.forbidden);
-				} else if (me.id !== user.id) {
-					const isFollowing = await this.followingsRepository.exists({
-						where: {
-							followeeId: user.id,
-							followerId: me.id,
-						},
-					});
-					if (!isFollowing) {
+			if (profile.followersVisibility !== 'public' && !await this.roleService.isModerator(me)) {
+				if (profile.followersVisibility === 'private') {
+					if (me == null || (me.id !== user.id)) {
 						throw new ApiError(meta.errors.forbidden);
 					}
+				} else if (profile.followersVisibility === 'followers') {
+					if (me == null) {
+						throw new ApiError(meta.errors.forbidden);
+					} else if (me.id !== user.id) {
+						const isFollowing = await this.followingsRepository.exists({
+							where: {
+								followeeId: user.id,
+								followerId: me.id,
+							},
+						});
+						if (!isFollowing) {
+							throw new ApiError(meta.errors.forbidden);
+						}
+					}
 				}
 			}
 
diff --git a/packages/backend/src/server/api/endpoints/users/following.ts b/packages/backend/src/server/api/endpoints/users/following.ts
index 6b3389f0b2..feda5bb353 100644
--- a/packages/backend/src/server/api/endpoints/users/following.ts
+++ b/packages/backend/src/server/api/endpoints/users/following.ts
@@ -12,6 +12,7 @@ import { QueryService } from '@/core/QueryService.js';
 import { FollowingEntityService } from '@/core/entities/FollowingEntityService.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { DI } from '@/di-symbols.js';
+import { RoleService } from '@/core/RoleService.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -90,6 +91,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private utilityService: UtilityService,
 		private followingEntityService: FollowingEntityService,
 		private queryService: QueryService,
+		private roleService: RoleService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const user = await this.usersRepository.findOneBy(ps.userId != null
@@ -102,23 +104,25 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			const profile = await this.userProfilesRepository.findOneByOrFail({ userId: user.id });
 
-			if (profile.followingVisibility === 'private') {
-				if (me == null || (me.id !== user.id)) {
-					throw new ApiError(meta.errors.forbidden);
-				}
-			} else if (profile.followingVisibility === 'followers') {
-				if (me == null) {
-					throw new ApiError(meta.errors.forbidden);
-				} else if (me.id !== user.id) {
-					const isFollowing = await this.followingsRepository.exists({
-						where: {
-							followeeId: user.id,
-							followerId: me.id,
-						},
-					});
-					if (!isFollowing) {
+			if (profile.followingVisibility !== 'public' && !await this.roleService.isModerator(me)) {
+				if (profile.followingVisibility === 'private') {
+					if (me == null || (me.id !== user.id)) {
 						throw new ApiError(meta.errors.forbidden);
 					}
+				} else if (profile.followingVisibility === 'followers') {
+					if (me == null) {
+						throw new ApiError(meta.errors.forbidden);
+					} else if (me.id !== user.id) {
+						const isFollowing = await this.followingsRepository.exists({
+							where: {
+								followeeId: user.id,
+								followerId: me.id,
+							},
+						});
+						if (!isFollowing) {
+							throw new ApiError(meta.errors.forbidden);
+						}
+					}
 				}
 			}
 
diff --git a/packages/backend/test/unit/activitypub.ts b/packages/backend/test/unit/activitypub.ts
index 6962608106..763ce2b336 100644
--- a/packages/backend/test/unit/activitypub.ts
+++ b/packages/backend/test/unit/activitypub.ts
@@ -20,7 +20,8 @@ import { CoreModule } from '@/core/CoreModule.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import type { IActor, IApDocument, ICollection, IObject, IPost } from '@/core/activitypub/type.js';
-import { MiMeta, MiNote } from '@/models/_.js';
+import { MiMeta, MiNote, UserProfilesRepository } from '@/models/_.js';
+import { DI } from '@/di-symbols.js';
 import { secureRndstr } from '@/misc/secure-rndstr.js';
 import { DownloadService } from '@/core/DownloadService.js';
 import { MetaService } from '@/core/MetaService.js';
@@ -86,6 +87,7 @@ async function createRandomRemoteUser(
 }
 
 describe('ActivityPub', () => {
+	let userProfilesRepository: UserProfilesRepository;
 	let imageService: ApImageService;
 	let noteService: ApNoteService;
 	let personService: ApPersonService;
@@ -127,6 +129,8 @@ describe('ActivityPub', () => {
 		await app.init();
 		app.enableShutdownHooks();
 
+		userProfilesRepository = app.get(DI.userProfilesRepository);
+
 		noteService = app.get<ApNoteService>(ApNoteService);
 		personService = app.get<ApPersonService>(ApPersonService);
 		rendererService = app.get<ApRendererService>(ApRendererService);
@@ -205,6 +209,53 @@ describe('ActivityPub', () => {
 		});
 	});
 
+	describe('Collection visibility', () => {
+		test('Public following/followers', async () => {
+			const actor = createRandomActor();
+			actor.following = {
+				id: `${actor.id}/following`,
+				type: 'OrderedCollection',
+				totalItems: 0,
+				first: `${actor.id}/following?page=1`,
+			};
+			actor.followers = `${actor.id}/followers`;
+
+			resolver.register(actor.id, actor);
+			resolver.register(actor.followers, {
+				id: actor.followers,
+				type: 'OrderedCollection',
+				totalItems: 0,
+				first: `${actor.followers}?page=1`,
+			});
+
+			const user = await personService.createPerson(actor.id, resolver);
+			const userProfile = await userProfilesRepository.findOneByOrFail({ userId: user.id });
+
+			assert.deepStrictEqual(userProfile.followingVisibility, 'public');
+			assert.deepStrictEqual(userProfile.followersVisibility, 'public');
+		});
+
+		test('Private following/followers', async () => {
+			const actor = createRandomActor();
+			actor.following = {
+				id: `${actor.id}/following`,
+				type: 'OrderedCollection',
+				totalItems: 0,
+				// first: …
+			};
+			actor.followers = `${actor.id}/followers`;
+
+			resolver.register(actor.id, actor);
+			//resolver.register(actor.followers, { … });
+
+			const user = await personService.createPerson(actor.id, resolver);
+			const userProfile = await userProfilesRepository.findOneByOrFail({ userId: user.id });
+
+			assert.deepStrictEqual(userProfile.followingVisibility, 'private');
+			assert.deepStrictEqual(userProfile.followersVisibility, 'private');
+		});
+	});
+
 	describe('Renderer', () => {
 		test('Render an announce with visibility: followers', () => {
 			rendererService.renderAnnounce('https://example.com/notes/00example', {
diff --git a/packages/frontend/src/scripts/isFfVisibleForMe.ts b/packages/frontend/src/scripts/isFfVisibleForMe.ts
index 406404c462..e28e5725bc 100644
--- a/packages/frontend/src/scripts/isFfVisibleForMe.ts
+++ b/packages/frontend/src/scripts/isFfVisibleForMe.ts
@@ -7,7 +7,7 @@ import * as Misskey from 'misskey-js';
 import { $i } from '@/account.js';
 
 export function isFollowingVisibleForMe(user: Misskey.entities.UserDetailed): boolean {
-	if ($i && $i.id === user.id) return true;
+	if ($i && ($i.id === user.id || $i.isAdmin || $i.isModerator)) return true;
 
 	if (user.followingVisibility === 'private') return false;
 	if (user.followingVisibility === 'followers' && !user.isFollowing) return false;
@@ -15,7 +15,7 @@ export function isFollowingVisibleForMe(user: Misskey.entities.UserDetailed): bo
 	return true;
 }
 export function isFollowersVisibleForMe(user: Misskey.entities.UserDetailed): boolean {
-	if ($i && $i.id === user.id) return true;
+	if ($i && ($i.id === user.id || $i.isAdmin || $i.isModerator)) return true;
 
 	if (user.followersVisibility === 'private') return false;
 	if (user.followersVisibility === 'followers' && !user.isFollowing) return false;

From f50941389d8724442ce2d7326afe9fbdadd3b58e Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Fri, 9 Aug 2024 16:04:41 +0900
Subject: [PATCH 158/221] fix: readAllNotifications message not working
 (#14374)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor: add and use isJsonObject

* fix: readNotification message without body is not working

* docs(changelog): WSの`readAllNotifications` メッセージが `body` を持たない場合に動作しない問題

* Update CHANGELOG.md

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>

---------

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
---
 CHANGELOG.md                                  |  4 ++-
 packages/backend/src/misc/json-value.ts       |  4 +++
 .../src/server/api/stream/Connection.ts       | 27 +++++++++++--------
 .../server/api/stream/channels/queue-stats.ts |  3 ++-
 .../api/stream/channels/reversi-game.ts       |  7 ++---
 .../api/stream/channels/server-stats.ts       |  3 ++-
 6 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c18cccc44e..fa0bc6282b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,9 @@
 -
 
 ### Server
--
+- Fix: WSの`readAllNotifications` メッセージが `body` を持たない場合に動作しない問題 #14374
+  - 通知ページや通知カラム(デッキ)を開いている状態において、新たに発生した通知が既読されない問題が修正されます。
+  - これにより、プッシュ通知が有効な同条件下の環境において、プッシュ通知が常に発生してしまう問題も修正されます。
 
 
 ## 2024.7.0
diff --git a/packages/backend/src/misc/json-value.ts b/packages/backend/src/misc/json-value.ts
index 7994441791..bd7fe12058 100644
--- a/packages/backend/src/misc/json-value.ts
+++ b/packages/backend/src/misc/json-value.ts
@@ -6,3 +6,7 @@
 export type JsonValue = JsonArray | JsonObject | string | number | boolean | null;
 export type JsonObject = {[K in string]?: JsonValue};
 export type JsonArray = JsonValue[];
+
+export function isJsonObject(value: JsonValue | undefined): value is JsonObject {
+	return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
diff --git a/packages/backend/src/server/api/stream/Connection.ts b/packages/backend/src/server/api/stream/Connection.ts
index 96082827f8..7773150b74 100644
--- a/packages/backend/src/server/api/stream/Connection.ts
+++ b/packages/backend/src/server/api/stream/Connection.ts
@@ -14,7 +14,8 @@ import { CacheService } from '@/core/CacheService.js';
 import { MiFollowing, MiUserProfile } from '@/models/_.js';
 import type { StreamEventEmitter, GlobalEvents } from '@/core/GlobalEventService.js';
 import { ChannelFollowingService } from '@/core/ChannelFollowingService.js';
-import type { JsonObject } from '@/misc/json-value.js';
+import { isJsonObject } from '@/misc/json-value.js';
+import type { JsonObject, JsonValue } from '@/misc/json-value.js';
 import type { ChannelsService } from './ChannelsService.js';
 import type { EventEmitter } from 'events';
 import type Channel from './channel.js';
@@ -112,8 +113,6 @@ export default class Connection {
 
 		const { type, body } = obj;
 
-		if (typeof body !== 'object' || body === null || Array.isArray(body)) return;
-
 		switch (type) {
 			case 'readNotification': this.onReadNotification(body); break;
 			case 'subNote': this.onSubscribeNote(body); break;
@@ -154,7 +153,8 @@ export default class Connection {
 	}
 
 	@bindThis
-	private readNote(body: JsonObject) {
+	private readNote(body: JsonValue | undefined) {
+		if (!isJsonObject(body)) return;
 		const id = body.id;
 
 		const note = this.cachedNotes.find(n => n.id === id);
@@ -166,7 +166,7 @@ export default class Connection {
 	}
 
 	@bindThis
-	private onReadNotification(payload: JsonObject) {
+	private onReadNotification(payload: JsonValue | undefined) {
 		this.notificationService.readAllNotification(this.user!.id);
 	}
 
@@ -174,7 +174,8 @@ export default class Connection {
 	 * 投稿購読要求時
 	 */
 	@bindThis
-	private onSubscribeNote(payload: JsonObject) {
+	private onSubscribeNote(payload: JsonValue | undefined) {
+		if (!isJsonObject(payload)) return;
 		if (!payload.id || typeof payload.id !== 'string') return;
 
 		const current = this.subscribingNotes[payload.id] ?? 0;
@@ -190,7 +191,8 @@ export default class Connection {
 	 * 投稿購読解除要求時
 	 */
 	@bindThis
-	private onUnsubscribeNote(payload: JsonObject) {
+	private onUnsubscribeNote(payload: JsonValue | undefined) {
+		if (!isJsonObject(payload)) return;
 		if (!payload.id || typeof payload.id !== 'string') return;
 
 		const current = this.subscribingNotes[payload.id];
@@ -216,12 +218,13 @@ export default class Connection {
 	 * チャンネル接続要求時
 	 */
 	@bindThis
-	private onChannelConnectRequested(payload: JsonObject) {
+	private onChannelConnectRequested(payload: JsonValue | undefined) {
+		if (!isJsonObject(payload)) return;
 		const { channel, id, params, pong } = payload;
 		if (typeof id !== 'string') return;
 		if (typeof channel !== 'string') return;
 		if (typeof pong !== 'boolean' && typeof pong !== 'undefined' && pong !== null) return;
-		if (typeof params !== 'undefined' && (typeof params !== 'object' || params === null || Array.isArray(params))) return;
+		if (typeof params !== 'undefined' && !isJsonObject(params)) return;
 		this.connectChannel(id, params, channel, pong ?? undefined);
 	}
 
@@ -229,7 +232,8 @@ export default class Connection {
 	 * チャンネル切断要求時
 	 */
 	@bindThis
-	private onChannelDisconnectRequested(payload: JsonObject) {
+	private onChannelDisconnectRequested(payload: JsonValue | undefined) {
+		if (!isJsonObject(payload)) return;
 		const { id } = payload;
 		if (typeof id !== 'string') return;
 		this.disconnectChannel(id);
@@ -297,7 +301,8 @@ export default class Connection {
 	 * @param data メッセージ
 	 */
 	@bindThis
-	private onChannelMessageRequested(data: JsonObject) {
+	private onChannelMessageRequested(data: JsonValue | undefined) {
+		if (!isJsonObject(data)) return;
 		if (typeof data.id !== 'string') return;
 		if (typeof data.type !== 'string') return;
 		if (typeof data.body === 'undefined') return;
diff --git a/packages/backend/src/server/api/stream/channels/queue-stats.ts b/packages/backend/src/server/api/stream/channels/queue-stats.ts
index ff7e740226..91b62255b4 100644
--- a/packages/backend/src/server/api/stream/channels/queue-stats.ts
+++ b/packages/backend/src/server/api/stream/channels/queue-stats.ts
@@ -6,6 +6,7 @@
 import Xev from 'xev';
 import { Injectable } from '@nestjs/common';
 import { bindThis } from '@/decorators.js';
+import { isJsonObject } from '@/misc/json-value.js';
 import type { JsonObject, JsonValue } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
@@ -36,7 +37,7 @@ class QueueStatsChannel extends Channel {
 	public onMessage(type: string, body: JsonValue) {
 		switch (type) {
 			case 'requestLog':
-				if (typeof body !== 'object' || body === null || Array.isArray(body)) return;
+				if (!isJsonObject(body)) return;
 				if (typeof body.id !== 'string') return;
 				if (typeof body.length !== 'number') return;
 				ev.once(`queueStatsLog:${body.id}`, statsLog => {
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 17823a164a..c6f4a4ae3b 100644
--- a/packages/backend/src/server/api/stream/channels/reversi-game.ts
+++ b/packages/backend/src/server/api/stream/channels/reversi-game.ts
@@ -9,6 +9,7 @@ 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 { isJsonObject } from '@/misc/json-value.js';
 import type { JsonObject, JsonValue } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
@@ -44,16 +45,16 @@ class ReversiGameChannel extends Channel {
 				this.ready(body);
 				break;
 			case 'updateSettings':
-				if (typeof body !== 'object' || body === null || Array.isArray(body)) return;
+				if (!isJsonObject(body)) return;
 				if (typeof body.key !== 'string') return;
-				if (typeof body.value !== 'object' || body.value === null || Array.isArray(body.value)) return;
+				if (!isJsonObject(body.value)) return;
 				this.updateSettings(body.key, body.value);
 				break;
 			case 'cancel':
 				this.cancelGame();
 				break;
 			case 'putStone':
-				if (typeof body !== 'object' || body === null || Array.isArray(body)) return;
+				if (!isJsonObject(body)) return;
 				if (typeof body.pos !== 'number') return;
 				if (typeof body.id !== 'string') return;
 				this.putStone(body.pos, body.id);
diff --git a/packages/backend/src/server/api/stream/channels/server-stats.ts b/packages/backend/src/server/api/stream/channels/server-stats.ts
index 6258afba35..ec5352d12d 100644
--- a/packages/backend/src/server/api/stream/channels/server-stats.ts
+++ b/packages/backend/src/server/api/stream/channels/server-stats.ts
@@ -6,6 +6,7 @@
 import Xev from 'xev';
 import { Injectable } from '@nestjs/common';
 import { bindThis } from '@/decorators.js';
+import { isJsonObject } from '@/misc/json-value.js';
 import type { JsonObject, JsonValue } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
@@ -36,7 +37,7 @@ class ServerStatsChannel extends Channel {
 	public onMessage(type: string, body: JsonValue) {
 		switch (type) {
 			case 'requestLog':
-				if (typeof body !== 'object' || body === null || Array.isArray(body)) return;
+				if (!isJsonObject(body)) return;
 				ev.once(`serverStatsLog:${body.id}`, statsLog => {
 					this.send('statsLog', statsLog);
 				});

From 01a815f8a716f65dbd977d533d638eb69561136a Mon Sep 17 00:00:00 2001
From: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
Date: Sat, 10 Aug 2024 09:34:49 +0900
Subject: [PATCH 159/221] fix(general): some fixes and improvements of Play
 visibility (#14384)

* fix(backend): missing `visibility` param in packing flash

* fix(frontend): use `visibility` value got from API

* enhance(frontend): change preview appearance of private Play

* Update CHANGELOG.md
---
 CHANGELOG.md                                  |  4 +-
 .../src/core/entities/FlashEntityService.ts   |  1 +
 .../backend/src/models/json-schema/flash.ts   |  5 ++
 packages/frontend/.storybook/fakes.ts         | 35 ++++++++++++
 packages/frontend/.storybook/generate.tsx     |  1 +
 .../components/MkFlashPreview.stories.impl.ts | 53 +++++++++++++++++++
 .../src/components/MkFlashPreview.vue         | 12 +++--
 .../frontend/src/pages/flash/flash-edit.vue   |  2 +-
 packages/misskey-js/src/autogen/types.ts      |  2 +
 9 files changed, 110 insertions(+), 5 deletions(-)
 create mode 100644 packages/frontend/src/components/MkFlashPreview.stories.impl.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa0bc6282b..7128499c79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,12 +5,14 @@
 - Enhance: モデレーターはすべてのユーザーのフォロー・フォロワーの一覧を見られるように
 
 ### Client
--
+- Enhance: 「自分のPlay」ページにおいてPlayが非公開かどうかが一目でわかるように
+- Fix: Play編集時に公開範囲が「パブリック」にリセットされる問題を修正
 
 ### Server
 - Fix: WSの`readAllNotifications` メッセージが `body` を持たない場合に動作しない問題 #14374
   - 通知ページや通知カラム(デッキ)を開いている状態において、新たに発生した通知が既読されない問題が修正されます。
   - これにより、プッシュ通知が有効な同条件下の環境において、プッシュ通知が常に発生してしまう問題も修正されます。
+- Fix: Play各種エンドポイントの返り値に`visibility`が含まれていない問題を修正
 
 
 ## 2024.7.0
diff --git a/packages/backend/src/core/entities/FlashEntityService.ts b/packages/backend/src/core/entities/FlashEntityService.ts
index d110f7afc6..4aa7104c1e 100644
--- a/packages/backend/src/core/entities/FlashEntityService.ts
+++ b/packages/backend/src/core/entities/FlashEntityService.ts
@@ -49,6 +49,7 @@ export class FlashEntityService {
 			title: flash.title,
 			summary: flash.summary,
 			script: flash.script,
+			visibility: flash.visibility,
 			likedCount: flash.likedCount,
 			isLiked: meId ? await this.flashLikesRepository.exists({ where: { flashId: flash.id, userId: meId } }) : undefined,
 		});
diff --git a/packages/backend/src/models/json-schema/flash.ts b/packages/backend/src/models/json-schema/flash.ts
index 952df649ad..42b2172409 100644
--- a/packages/backend/src/models/json-schema/flash.ts
+++ b/packages/backend/src/models/json-schema/flash.ts
@@ -44,6 +44,11 @@ export const packedFlashSchema = {
 			type: 'string',
 			optional: false, nullable: false,
 		},
+		visibility: {
+			type: 'string',
+			optional: false, nullable: false,
+			enum: ['private', 'public'],
+		},
 		likedCount: {
 			type: 'number',
 			optional: false, nullable: true,
diff --git a/packages/frontend/.storybook/fakes.ts b/packages/frontend/.storybook/fakes.ts
index ab04d3e60c..fc3b0334e4 100644
--- a/packages/frontend/.storybook/fakes.ts
+++ b/packages/frontend/.storybook/fakes.ts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import { AISCRIPT_VERSION } from '@syuilo/aiscript';
 import type { entities } from 'misskey-js'
 
 export function abuseUserReport() {
@@ -114,6 +115,40 @@ export function file(isSensitive = false) {
 	};
 }
 
+const script = `/// @ ${AISCRIPT_VERSION}
+
+var name = ""
+
+Ui:render([
+	Ui:C:textInput({
+		label: "Your name"
+		onInput: @(v) { name = v }
+	})
+	Ui:C:button({
+		text: "Hello"
+		onClick: @() {
+			Mk:dialog(null, \`Hello, {name}!\`)
+		}
+	})
+])
+`;
+
+export function flash(): entities.Flash {
+	return {
+		id: 'someflashid',
+		createdAt: '2016-12-28T22:49:51.000Z',
+		updatedAt: '2016-12-28T22:49:51.000Z',
+		userId: 'someuserid',
+		user: userLite(),
+		title: 'Some Play title',
+		summary: 'Some Play summary',
+		script,
+		visibility: 'public',
+		likedCount: 0,
+		isLiked: false,
+	};
+}
+
 export function folder(id = 'somefolderid', name = 'Some Folder', parentId: string | null = null): entities.DriveFolder {
 	return {
 		id,
diff --git a/packages/frontend/.storybook/generate.tsx b/packages/frontend/.storybook/generate.tsx
index 52c01aaf70..490a441b70 100644
--- a/packages/frontend/.storybook/generate.tsx
+++ b/packages/frontend/.storybook/generate.tsx
@@ -398,6 +398,7 @@ function toStories(component: string): Promise<string> {
 		glob('src/components/global/Mk*.vue'),
 		glob('src/components/global/RouterView.vue'),
 		glob('src/components/Mk[A-E]*.vue'),
+		glob('src/components/MkFlashPreview.vue'),
 		glob('src/components/MkGalleryPostPreview.vue'),
 		glob('src/components/MkSignupServerRules.vue'),
 		glob('src/components/MkUserSetupDialog.vue'),
diff --git a/packages/frontend/src/components/MkFlashPreview.stories.impl.ts b/packages/frontend/src/components/MkFlashPreview.stories.impl.ts
new file mode 100644
index 0000000000..fa5288b73d
--- /dev/null
+++ b/packages/frontend/src/components/MkFlashPreview.stories.impl.ts
@@ -0,0 +1,53 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { StoryObj } from '@storybook/vue3';
+import MkFlashPreview from './MkFlashPreview.vue';
+import { flash } from './../../.storybook/fakes.js';
+export const Public = {
+	render(args) {
+		return {
+			components: {
+				MkFlashPreview,
+			},
+			setup() {
+				return {
+					args,
+				};
+			},
+			computed: {
+				props() {
+					return {
+						...this.args,
+					};
+				},
+			},
+			template: '<MkFlashPreview v-bind="props" />',
+		};
+	},
+	args: {
+		flash: {
+			...flash(),
+			visibility: 'public',
+		},
+	},
+	parameters: {
+		layout: 'fullscreen',
+	},
+	decorators: [
+		() => ({
+			template: '<div style="display: flex; align-items: center; justify-content: center; height: 100vh"><div style="max-width: 700px; width: 100%; margin: 3rem"><story/></div></div>',
+		}),
+	],
+} satisfies StoryObj<typeof MkFlashPreview>;
+export const Private = {
+	...Public,
+	args: {
+		flash: {
+			...flash(),
+			visibility: 'private',
+		},
+	},
+} satisfies StoryObj<typeof MkFlashPreview>;
diff --git a/packages/frontend/src/components/MkFlashPreview.vue b/packages/frontend/src/components/MkFlashPreview.vue
index 6783804cc5..8a2a438624 100644
--- a/packages/frontend/src/components/MkFlashPreview.vue
+++ b/packages/frontend/src/components/MkFlashPreview.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkA :to="`/play/${flash.id}`" class="vhpxefrk _panel">
+<MkA :to="`/play/${flash.id}`" class="vhpxefrk _panel" :class="[{ gray: flash.visibility === 'private' }]">
 	<article>
 		<header>
 			<h1 :title="flash.title">{{ flash.title }}</h1>
@@ -22,11 +22,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { } from 'vue';
+import * as Misskey from 'misskey-js';
 import { userName } from '@/filters/user.js';
 
 const props = defineProps<{
-	//flash: Misskey.entities.Flash;
-	flash: any;
+	flash: Misskey.entities.Flash;
 }>();
 </script>
 
@@ -91,6 +91,12 @@ const props = defineProps<{
 		}
 	}
 
+	&:global(.gray) {
+		--c: var(--bg);
+		background-image: linear-gradient(45deg, var(--c) 16.67%, transparent 16.67%, transparent 50%, var(--c) 50%, var(--c) 66.67%, transparent 66.67%, transparent 100%);
+		background-size: 16px 16px;
+	}
+
 	@media (max-width: 700px) {
 	}
 
diff --git a/packages/frontend/src/pages/flash/flash-edit.vue b/packages/frontend/src/pages/flash/flash-edit.vue
index 0b9f4dfe58..d282ed4810 100644
--- a/packages/frontend/src/pages/flash/flash-edit.vue
+++ b/packages/frontend/src/pages/flash/flash-edit.vue
@@ -369,7 +369,6 @@ const props = defineProps<{
 }>();
 
 const flash = ref<Misskey.entities.Flash | null>(null);
-const visibility = ref<'private' | 'public'>('public');
 
 if (props.id) {
 	flash.value = await misskeyApi('flash/show', {
@@ -380,6 +379,7 @@ if (props.id) {
 const title = ref(flash.value?.title ?? 'New Play');
 const summary = ref(flash.value?.summary ?? '');
 const permissions = ref(flash.value?.permissions ?? []);
+const visibility = ref<'private' | 'public'>(flash.value?.visibility ?? 'public');
 const script = ref(flash.value?.script ?? PRESET_DEFAULT);
 
 function selectPreset(ev: MouseEvent) {
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index db5efd4a00..6d2f787767 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4672,6 +4672,8 @@ export type components = {
       title: string;
       summary: string;
       script: string;
+      /** @enum {string} */
+      visibility: 'private' | 'public';
       likedCount: number | null;
       isLiked?: boolean;
     };

From 7e3dedb0459ebe05789c3d2b117992cdd1be7063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 10 Aug 2024 09:35:50 +0900
Subject: [PATCH 160/221] =?UTF-8?q?fix(frontend):=20=E3=83=9A=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E9=81=B7=E7=A7=BB=E3=81=AB=E5=A4=B1=E6=95=97=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82=E3=82=8B=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(bump=20vue=20version)?=
 =?UTF-8?q?=20(#14380)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): ページ遷移に失敗することがある問題を修正 (bump vue version)

* Update Changelog

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
 CHANGELOG.md                   |   2 +-
 packages/frontend/package.json |   6 +-
 pnpm-lock.yaml                 | 342 ++++++++++++++-------------------
 3 files changed, 146 insertions(+), 204 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7128499c79..800161841c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Client
 - Enhance: 「自分のPlay」ページにおいてPlayが非公開かどうかが一目でわかるように
 - Fix: Play編集時に公開範囲が「パブリック」にリセットされる問題を修正
+- Fix: ページ遷移に失敗することがある問題を修正
 
 ### Server
 - Fix: WSの`readAllNotifications` メッセージが `body` を持たない場合に動作しない問題 #14374
@@ -14,7 +15,6 @@
   - これにより、プッシュ通知が有効な同条件下の環境において、プッシュ通知が常に発生してしまう問題も修正されます。
 - Fix: Play各種エンドポイントの返り値に`visibility`が含まれていない問題を修正
 
-
 ## 2024.7.0
 
 ### Note
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 244d117de2..1464be18a7 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -28,7 +28,7 @@
 		"@tabler/icons-webfont": "3.3.0",
 		"@twemoji/parser": "15.1.1",
 		"@vitejs/plugin-vue": "5.1.0",
-		"@vue/compiler-sfc": "3.4.34",
+		"@vue/compiler-sfc": "3.4.37",
 		"aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.1.11",
 		"astring": "1.8.6",
 		"broadcast-channel": "7.0.0",
@@ -72,7 +72,7 @@
 		"uuid": "10.0.0",
 		"v-code-diff": "1.12.0",
 		"vite": "5.3.5",
-		"vue": "3.4.34",
+		"vue": "3.4.37",
 		"vuedraggable": "next"
 	},
 	"devDependencies": {
@@ -111,7 +111,7 @@
 		"@typescript-eslint/eslint-plugin": "7.17.0",
 		"@typescript-eslint/parser": "7.17.0",
 		"@vitest/coverage-v8": "1.6.0",
-		"@vue/runtime-core": "3.4.34",
+		"@vue/runtime-core": "3.4.37",
 		"acorn": "8.12.1",
 		"cross-env": "7.0.3",
 		"cypress": "13.13.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index eb8047cde5..613646d1bb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -720,10 +720,10 @@ importers:
         version: 15.1.1
       '@vitejs/plugin-vue':
         specifier: 5.1.0
-        version: 5.1.0(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))(vue@3.4.34(typescript@5.5.4))
+        version: 5.1.0(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))(vue@3.4.37(typescript@5.5.4))
       '@vue/compiler-sfc':
-        specifier: 3.4.34
-        version: 3.4.34
+        specifier: 3.4.37
+        version: 3.4.37
       aiscript-vscode:
         specifier: github:aiscript-dev/aiscript-vscode#v0.1.11
         version: https://codeload.github.com/aiscript-dev/aiscript-vscode/tar.gz/e1e1b27f2f72cd28a473e004b6da0d8fc0bd40d9
@@ -849,16 +849,16 @@ importers:
         version: 10.0.0
       v-code-diff:
         specifier: 1.12.0
-        version: 1.12.0(vue@3.4.34(typescript@5.5.4))
+        version: 1.12.0(vue@3.4.37(typescript@5.5.4))
       vite:
         specifier: 5.3.5
         version: 5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3)
       vue:
-        specifier: 3.4.34
-        version: 3.4.34(typescript@5.5.4)
+        specifier: 3.4.37
+        version: 3.4.37(typescript@5.5.4)
       vuedraggable:
         specifier: next
-        version: 4.1.0(vue@3.4.34(typescript@5.5.4))
+        version: 4.1.0(vue@3.4.37(typescript@5.5.4))
     devDependencies:
       '@misskey-dev/summaly':
         specifier: 5.1.0
@@ -913,13 +913,13 @@ importers:
         version: 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@storybook/vue3':
         specifier: 8.2.6
-        version: 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))(vue@3.4.34(typescript@5.5.4))
+        version: 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))(vue@3.4.37(typescript@5.5.4))
       '@storybook/vue3-vite':
         specifier: 8.1.11
-        version: 8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))(vue@3.4.34(typescript@5.5.4))
+        version: 8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))(vue@3.4.37(typescript@5.5.4))
       '@testing-library/vue':
         specifier: 8.1.0
-        version: 8.1.0(@vue/compiler-sfc@3.4.34)(@vue/server-renderer@3.4.34(vue@3.4.34(typescript@5.5.4)))(vue@3.4.34(typescript@5.5.4))
+        version: 8.1.0(@vue/compiler-sfc@3.4.37)(@vue/server-renderer@3.4.37(vue@3.4.37(typescript@5.5.4)))(vue@3.4.37(typescript@5.5.4))
       '@types/escape-regexp':
         specifier: 0.0.3
         version: 0.0.3
@@ -966,8 +966,8 @@ importers:
         specifier: 1.6.0
         version: 1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3))
       '@vue/runtime-core':
-        specifier: 3.4.34
-        version: 3.4.34
+        specifier: 3.4.37
+        version: 3.4.37
       acorn:
         specifier: 8.12.1
         version: 8.12.1
@@ -1592,18 +1592,10 @@ packages:
     resolution: {integrity: sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-string-parser@7.23.4':
-    resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-string-parser@7.24.7':
     resolution: {integrity: sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-validator-identifier@7.22.20':
-    resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-validator-identifier@7.24.7':
     resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==}
     engines: {node: '>=6.9.0'}
@@ -1636,16 +1628,6 @@ packages:
     resolution: {integrity: sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/parser@7.23.9':
-    resolution: {integrity: sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-
-  '@babel/parser@7.24.5':
-    resolution: {integrity: sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-
   '@babel/parser@7.24.7':
     resolution: {integrity: sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==}
     engines: {node: '>=6.0.0'}
@@ -2156,14 +2138,6 @@ packages:
     resolution: {integrity: sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/types@7.23.5':
-    resolution: {integrity: sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/types@7.24.0':
-    resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/types@7.24.7':
     resolution: {integrity: sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==}
     engines: {node: '>=6.9.0'}
@@ -5403,29 +5377,26 @@ packages:
   '@volar/typescript@2.4.0-alpha.18':
     resolution: {integrity: sha512-sXh5Y8sqGUkgxpMWUGvRXggxYHAVxg0Pa1C42lQZuPDrW6vHJPR0VCK8Sr7WJsAW530HuNQT/ZIskmXtxjybMQ==}
 
-  '@vue/compiler-core@3.4.29':
-    resolution: {integrity: sha512-TFKiRkKKsRCKvg/jTSSKK7mYLJEQdUiUfykbG49rubC9SfDyvT2JrzTReopWlz2MxqeLyxh9UZhvxEIBgAhtrg==}
-
   '@vue/compiler-core@3.4.31':
     resolution: {integrity: sha512-skOiodXWTV3DxfDhB4rOf3OGalpITLlgCeOwb+Y9GJpfQ8ErigdBUHomBzvG78JoVE8MJoQsb+qhZiHfKeNeEg==}
 
   '@vue/compiler-core@3.4.34':
     resolution: {integrity: sha512-Z0izUf32+wAnQewjHu+pQf1yw00EGOmevl1kE+ljjjMe7oEfpQ+BI3/JNK7yMB4IrUsqLDmPecUrpj3mCP+yJQ==}
 
-  '@vue/compiler-dom@3.4.29':
-    resolution: {integrity: sha512-A6+iZ2fKIEGnfPJejdB7b1FlJzgiD+Y/sxxKwJWg1EbJu6ZPgzaPQQ51ESGNv0CP6jm6Z7/pO6Ia8Ze6IKrX7w==}
-
-  '@vue/compiler-dom@3.4.31':
-    resolution: {integrity: sha512-wK424WMXsG1IGMyDGyLqB+TbmEBFM78hIsOJ9QwUVLGrcSk0ak6zYty7Pj8ftm7nEtdU/DGQxAXp0/lM/2cEpQ==}
+  '@vue/compiler-core@3.4.37':
+    resolution: {integrity: sha512-ZDDT/KiLKuCRXyzWecNzC5vTcubGz4LECAtfGPENpo0nrmqJHwuWtRLxk/Sb9RAKtR9iFflFycbkjkY+W/PZUQ==}
 
   '@vue/compiler-dom@3.4.34':
     resolution: {integrity: sha512-3PUOTS1h5cskdOJMExCu2TInXuM0j60DRPpSCJDqOCupCfUZCJoyQmKtRmA8EgDNZ5kcEE7vketamRZfrEuVDw==}
 
-  '@vue/compiler-sfc@3.4.34':
-    resolution: {integrity: sha512-x6lm0UrM03jjDXTPZgD9Ad8bIVD1ifWNit2EaWQIZB5CULr46+FbLQ5RpK7AXtDHGjx9rmvC7QRCTjsiGkAwRw==}
+  '@vue/compiler-dom@3.4.37':
+    resolution: {integrity: sha512-rIiSmL3YrntvgYV84rekAtU/xfogMUJIclUMeIKEtVBFngOL3IeZHhsH3UaFEgB5iFGpj6IW+8YuM/2Up+vVag==}
 
-  '@vue/compiler-ssr@3.4.34':
-    resolution: {integrity: sha512-8TDBcLaTrFm5rnF+Qm4BlliaopJgqJ28Nsrc80qazynm5aJO+Emu7y0RWw34L8dNnTRdcVBpWzJxhGYzsoVu4g==}
+  '@vue/compiler-sfc@3.4.37':
+    resolution: {integrity: sha512-vCfetdas40Wk9aK/WWf8XcVESffsbNkBQwS5t13Y/PcfqKfIwJX2gF+82th6dOpnpbptNMlMjAny80li7TaCIg==}
+
+  '@vue/compiler-ssr@3.4.37':
+    resolution: {integrity: sha512-TyAgYBWrHlFrt4qpdACh8e9Ms6C/AZQ6A6xLJaWrCL8GCX5DxMzxyeFAEMfU/VFr4tylHm+a2NpfJpcd7+20XA==}
 
   '@vue/compiler-vue2@2.7.16':
     resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==}
@@ -5449,22 +5420,19 @@ packages:
       typescript:
         optional: true
 
-  '@vue/reactivity@3.4.34':
-    resolution: {integrity: sha512-ua+Lo+wBRlBEX9TtgPOShE2JwIO7p6BTZ7t1KZVPoaBRfqbC7N3c8Mpzicx173fXxx5VXeU6ykiHo7WgLzJQDA==}
+  '@vue/reactivity@3.4.37':
+    resolution: {integrity: sha512-UmdKXGx0BZ5kkxPqQr3PK3tElz6adTey4307NzZ3whZu19i5VavYal7u2FfOmAzlcDVgE8+X0HZ2LxLb/jgbYw==}
 
-  '@vue/runtime-core@3.4.34':
-    resolution: {integrity: sha512-PXhkiRPwcPGJ1BnyBZFI96GfInCVskd0HPNIAZn7i3YOmLbtbTZpB7/kDTwC1W7IqdGPkTVC63IS7J2nZs4Ebg==}
+  '@vue/runtime-core@3.4.37':
+    resolution: {integrity: sha512-MNjrVoLV/sirHZoD7QAilU1Ifs7m/KJv4/84QVbE6nyAZGQNVOa1HGxaOzp9YqCG+GpLt1hNDC4RbH+KtanV7w==}
 
-  '@vue/runtime-dom@3.4.34':
-    resolution: {integrity: sha512-dXqIe+RqFAK2Euak4UsvbIupalrhc67OuQKpD7HJ3W2fv8jlqvI7szfBCsAEcE8o/wyNpkloxB6J8viuF/E3gw==}
+  '@vue/runtime-dom@3.4.37':
+    resolution: {integrity: sha512-Mg2EwgGZqtwKrqdL/FKMF2NEaOHuH+Ks9TQn3DHKyX//hQTYOun+7Tqp1eo0P4Ds+SjltZshOSRq6VsU0baaNg==}
 
-  '@vue/server-renderer@3.4.34':
-    resolution: {integrity: sha512-GeyEUfMVRZMD/mZcNONEqg7MiU10QQ1DB3O/Qr6+8uXpbwdlmVgQ5Qs1/ZUAFX1X2UUtqMoGrDRbxdWfOJFT7Q==}
+  '@vue/server-renderer@3.4.37':
+    resolution: {integrity: sha512-jZ5FAHDR2KBq2FsRUJW6GKDOAG9lUTX8aBEGq4Vf6B/35I9fPce66BornuwmqmKgfiSlecwuOb6oeoamYMohkg==}
     peerDependencies:
-      vue: 3.4.34
-
-  '@vue/shared@3.4.29':
-    resolution: {integrity: sha512-hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA==}
+      vue: 3.4.37
 
   '@vue/shared@3.4.31':
     resolution: {integrity: sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA==}
@@ -5472,6 +5440,9 @@ packages:
   '@vue/shared@3.4.34':
     resolution: {integrity: sha512-x5LmiRLpRsd9KTjAB8MPKf0CDPMcuItjP0gbNqFCIgL1I8iYp4zglhj9w9FPCdIbHG2M91RVeIbArFfFTz9I3A==}
 
+  '@vue/shared@3.4.37':
+    resolution: {integrity: sha512-nIh8P2fc3DflG8+5Uw8PT/1i17ccFn0xxN/5oE9RfV5SVnd7G0XEFRwakrnNFE/jlS95fpGXDVG5zDETS26nmg==}
+
   '@vue/test-utils@2.4.1':
     resolution: {integrity: sha512-VO8nragneNzUZUah6kOjiFmD/gwRjUauG9DROh6oaOeFwX1cZRUNHhdeogE8635cISigXFTtGLUQWx5KCb0xeg==}
     peerDependencies:
@@ -6828,6 +6799,10 @@ packages:
     resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
     engines: {node: '>=0.12'}
 
+  entities@5.0.0:
+    resolution: {integrity: sha512-BeJFvFRJddxobhvEdm5GqHzRV/X+ACeuw0/BuuxsCh1EUZcAIz8+kYmBp/LrQuloy6K1f3a0M7+IhmZ7QnkISA==}
+    engines: {node: '>=0.12'}
+
   env-paths@2.2.1:
     resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
     engines: {node: '>=6'}
@@ -10687,10 +10662,6 @@ packages:
   sortablejs@1.14.0:
     resolution: {integrity: sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==}
 
-  source-map-js@1.0.2:
-    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
-    engines: {node: '>=0.10.0'}
-
   source-map-js@1.2.0:
     resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
     engines: {node: '>=0.10.0'}
@@ -11667,8 +11638,8 @@ packages:
     peerDependencies:
       typescript: '>=5.0.0'
 
-  vue@3.4.34:
-    resolution: {integrity: sha512-VZze05HWlA3ItreQ/ka7Sx7PoD0/3St8FEiSlSTVgb6l4hL+RjtP2/8g5WQBzZgyf8WG2f+g1bXzC7zggLhAJA==}
+  vue@3.4.37:
+    resolution: {integrity: sha512-3vXvNfkKTBsSJ7JP+LyR7GBuwQuckbWvuwAid3xbqK9ppsKt/DUvfqgZ48fgOLEfpy1IacL5f8QhUVl77RaI7A==}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
@@ -12478,10 +12449,10 @@ snapshots:
       '@babel/helper-compilation-targets': 7.22.15
       '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.5)
       '@babel/helpers': 7.23.5
-      '@babel/parser': 7.23.9
+      '@babel/parser': 7.24.7
       '@babel/template': 7.22.15
       '@babel/traverse': 7.23.5
-      '@babel/types': 7.23.5
+      '@babel/types': 7.24.7
       convert-source-map: 2.0.0
       debug: 4.3.5(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
@@ -12512,7 +12483,7 @@ snapshots:
 
   '@babel/generator@7.23.5':
     dependencies:
-      '@babel/types': 7.23.5
+      '@babel/types': 7.24.7
       '@jridgewell/gen-mapping': 0.3.2
       '@jridgewell/trace-mapping': 0.3.18
       jsesc: 2.5.2
@@ -12617,7 +12588,7 @@ snapshots:
 
   '@babel/helper-module-imports@7.22.15':
     dependencies:
-      '@babel/types': 7.23.5
+      '@babel/types': 7.24.7
 
   '@babel/helper-module-imports@7.24.7':
     dependencies:
@@ -12633,7 +12604,7 @@ snapshots:
       '@babel/helper-module-imports': 7.22.15
       '@babel/helper-simple-access': 7.22.5
       '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/helper-validator-identifier': 7.22.20
+      '@babel/helper-validator-identifier': 7.24.7
 
   '@babel/helper-module-transforms@7.24.7(@babel/core@7.24.7)':
     dependencies:
@@ -12674,7 +12645,7 @@ snapshots:
 
   '@babel/helper-simple-access@7.22.5':
     dependencies:
-      '@babel/types': 7.23.5
+      '@babel/types': 7.24.7
 
   '@babel/helper-simple-access@7.24.7':
     dependencies:
@@ -12692,18 +12663,14 @@ snapshots:
 
   '@babel/helper-split-export-declaration@7.22.6':
     dependencies:
-      '@babel/types': 7.23.5
+      '@babel/types': 7.24.7
 
   '@babel/helper-split-export-declaration@7.24.7':
     dependencies:
       '@babel/types': 7.24.7
 
-  '@babel/helper-string-parser@7.23.4': {}
-
   '@babel/helper-string-parser@7.24.7': {}
 
-  '@babel/helper-validator-identifier@7.22.20': {}
-
   '@babel/helper-validator-identifier@7.24.7': {}
 
   '@babel/helper-validator-option@7.23.5': {}
@@ -12723,7 +12690,7 @@ snapshots:
     dependencies:
       '@babel/template': 7.22.15
       '@babel/traverse': 7.23.5
-      '@babel/types': 7.23.5
+      '@babel/types': 7.24.7
     transitivePeerDependencies:
       - supports-color
 
@@ -12734,7 +12701,7 @@ snapshots:
 
   '@babel/highlight@7.23.4':
     dependencies:
-      '@babel/helper-validator-identifier': 7.22.20
+      '@babel/helper-validator-identifier': 7.24.7
       chalk: 2.4.2
       js-tokens: 4.0.0
 
@@ -12745,14 +12712,6 @@ snapshots:
       js-tokens: 4.0.0
       picocolors: 1.0.0
 
-  '@babel/parser@7.23.9':
-    dependencies:
-      '@babel/types': 7.23.5
-
-  '@babel/parser@7.24.5':
-    dependencies:
-      '@babel/types': 7.24.0
-
   '@babel/parser@7.24.7':
     dependencies:
       '@babel/types': 7.24.7
@@ -13432,8 +13391,8 @@ snapshots:
   '@babel/template@7.22.15':
     dependencies:
       '@babel/code-frame': 7.23.5
-      '@babel/parser': 7.23.9
-      '@babel/types': 7.23.5
+      '@babel/parser': 7.24.7
+      '@babel/types': 7.24.7
 
   '@babel/template@7.24.0':
     dependencies:
@@ -13455,8 +13414,8 @@ snapshots:
       '@babel/helper-function-name': 7.23.0
       '@babel/helper-hoist-variables': 7.22.5
       '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/parser': 7.23.9
-      '@babel/types': 7.23.5
+      '@babel/parser': 7.24.7
+      '@babel/types': 7.24.7
       debug: 4.3.5(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
@@ -13477,18 +13436,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/types@7.23.5':
-    dependencies:
-      '@babel/helper-string-parser': 7.23.4
-      '@babel/helper-validator-identifier': 7.22.20
-      to-fast-properties: 2.0.0
-
-  '@babel/types@7.24.0':
-    dependencies:
-      '@babel/helper-string-parser': 7.23.4
-      '@babel/helper-validator-identifier': 7.22.20
-      to-fast-properties: 2.0.0
-
   '@babel/types@7.24.7':
     dependencies:
       '@babel/helper-string-parser': 7.24.7
@@ -16242,18 +16189,18 @@ snapshots:
     dependencies:
       storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
 
-  '@storybook/vue3-vite@8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))(vue@3.4.34(typescript@5.5.4))':
+  '@storybook/vue3-vite@8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))(vue@3.4.37(typescript@5.5.4))':
     dependencies:
       '@storybook/builder-vite': 8.1.11(encoding@0.1.13)(prettier@3.3.3)(typescript@5.5.4)(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))
       '@storybook/core-server': 8.1.11(bufferutil@4.0.8)(encoding@0.1.13)(prettier@3.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@6.0.4)
       '@storybook/types': 8.1.11
-      '@storybook/vue3': 8.1.11(encoding@0.1.13)(prettier@3.3.3)(vue@3.4.34(typescript@5.5.4))
+      '@storybook/vue3': 8.1.11(encoding@0.1.13)(prettier@3.3.3)(vue@3.4.37(typescript@5.5.4))
       find-package-json: 1.2.0
       magic-string: 0.30.10
       typescript: 5.5.4
       vite: 5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3)
       vue-component-meta: 2.0.16(typescript@5.5.4)
-      vue-docgen-api: 4.75.1(vue@3.4.34(typescript@5.5.4))
+      vue-docgen-api: 4.75.1(vue@3.4.37(typescript@5.5.4))
     transitivePeerDependencies:
       - '@preact/preset-vite'
       - bufferutil
@@ -16266,24 +16213,24 @@ snapshots:
       - vite-plugin-glimmerx
       - vue
 
-  '@storybook/vue3@8.1.11(encoding@0.1.13)(prettier@3.3.3)(vue@3.4.34(typescript@5.5.4))':
+  '@storybook/vue3@8.1.11(encoding@0.1.13)(prettier@3.3.3)(vue@3.4.37(typescript@5.5.4))':
     dependencies:
       '@storybook/docs-tools': 8.1.11(encoding@0.1.13)(prettier@3.3.3)
       '@storybook/global': 5.0.0
       '@storybook/preview-api': 8.1.11
       '@storybook/types': 8.1.11
-      '@vue/compiler-core': 3.4.29
+      '@vue/compiler-core': 3.4.34
       lodash: 4.17.21
       ts-dedent: 2.2.0
       type-fest: 2.19.0
-      vue: 3.4.34(typescript@5.5.4)
+      vue: 3.4.37(typescript@5.5.4)
       vue-component-type-helpers: 2.0.29
     transitivePeerDependencies:
       - encoding
       - prettier
       - supports-color
 
-  '@storybook/vue3@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))(vue@3.4.34(typescript@5.5.4))':
+  '@storybook/vue3@8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))(vue@3.4.37(typescript@5.5.4))':
     dependencies:
       '@storybook/components': 8.2.6(storybook@8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4))
       '@storybook/global': 5.0.0
@@ -16295,7 +16242,7 @@ snapshots:
       storybook: 8.2.6(@babel/preset-env@7.24.7(@babel/core@7.24.7))(bufferutil@4.0.8)(utf-8-validate@6.0.4)
       ts-dedent: 2.2.0
       type-fest: 2.19.0
-      vue: 3.4.34(typescript@5.5.4)
+      vue: 3.4.37(typescript@5.5.4)
       vue-component-type-helpers: 2.0.29
 
   '@swc/cli@0.3.12(@swc/core@1.6.6)(chokidar@3.5.3)':
@@ -16609,14 +16556,14 @@ snapshots:
     dependencies:
       '@testing-library/dom': 10.1.0
 
-  '@testing-library/vue@8.1.0(@vue/compiler-sfc@3.4.34)(@vue/server-renderer@3.4.34(vue@3.4.34(typescript@5.5.4)))(vue@3.4.34(typescript@5.5.4))':
+  '@testing-library/vue@8.1.0(@vue/compiler-sfc@3.4.37)(@vue/server-renderer@3.4.37(vue@3.4.37(typescript@5.5.4)))(vue@3.4.37(typescript@5.5.4))':
     dependencies:
       '@babel/runtime': 7.23.4
       '@testing-library/dom': 9.3.4
-      '@vue/test-utils': 2.4.1(@vue/server-renderer@3.4.34(vue@3.4.34(typescript@5.5.4)))(vue@3.4.34(typescript@5.5.4))
-      vue: 3.4.34(typescript@5.5.4)
+      '@vue/test-utils': 2.4.1(@vue/server-renderer@3.4.37(vue@3.4.37(typescript@5.5.4)))(vue@3.4.37(typescript@5.5.4))
+      vue: 3.4.37(typescript@5.5.4)
     optionalDependencies:
-      '@vue/compiler-sfc': 3.4.34
+      '@vue/compiler-sfc': 3.4.37
     transitivePeerDependencies:
       - '@vue/server-renderer'
 
@@ -17282,10 +17229,10 @@ snapshots:
 
   '@ungap/structured-clone@1.2.0': {}
 
-  '@vitejs/plugin-vue@5.1.0(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))(vue@3.4.34(typescript@5.5.4))':
+  '@vitejs/plugin-vue@5.1.0(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3))(vue@3.4.37(typescript@5.5.4))':
     dependencies:
       vite: 5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3)
-      vue: 3.4.34(typescript@5.5.4)
+      vue: 3.4.37(typescript@5.5.4)
 
   '@vitest/coverage-v8@1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3))':
     dependencies:
@@ -17360,14 +17307,6 @@ snapshots:
       path-browserify: 1.0.1
       vscode-uri: 3.0.8
 
-  '@vue/compiler-core@3.4.29':
-    dependencies:
-      '@babel/parser': 7.24.7
-      '@vue/shared': 3.4.29
-      entities: 4.5.0
-      estree-walker: 2.0.2
-      source-map-js: 1.2.0
-
   '@vue/compiler-core@3.4.31':
     dependencies:
       '@babel/parser': 7.24.7
@@ -17384,37 +17323,40 @@ snapshots:
       estree-walker: 2.0.2
       source-map-js: 1.2.0
 
-  '@vue/compiler-dom@3.4.29':
+  '@vue/compiler-core@3.4.37':
     dependencies:
-      '@vue/compiler-core': 3.4.29
-      '@vue/shared': 3.4.29
-
-  '@vue/compiler-dom@3.4.31':
-    dependencies:
-      '@vue/compiler-core': 3.4.31
-      '@vue/shared': 3.4.31
+      '@babel/parser': 7.24.7
+      '@vue/shared': 3.4.37
+      entities: 5.0.0
+      estree-walker: 2.0.2
+      source-map-js: 1.2.0
 
   '@vue/compiler-dom@3.4.34':
     dependencies:
       '@vue/compiler-core': 3.4.34
       '@vue/shared': 3.4.34
 
-  '@vue/compiler-sfc@3.4.34':
+  '@vue/compiler-dom@3.4.37':
+    dependencies:
+      '@vue/compiler-core': 3.4.37
+      '@vue/shared': 3.4.37
+
+  '@vue/compiler-sfc@3.4.37':
     dependencies:
       '@babel/parser': 7.24.7
-      '@vue/compiler-core': 3.4.34
-      '@vue/compiler-dom': 3.4.34
-      '@vue/compiler-ssr': 3.4.34
-      '@vue/shared': 3.4.34
+      '@vue/compiler-core': 3.4.37
+      '@vue/compiler-dom': 3.4.37
+      '@vue/compiler-ssr': 3.4.37
+      '@vue/shared': 3.4.37
       estree-walker: 2.0.2
       magic-string: 0.30.10
       postcss: 8.4.40
       source-map-js: 1.2.0
 
-  '@vue/compiler-ssr@3.4.34':
+  '@vue/compiler-ssr@3.4.37':
     dependencies:
-      '@vue/compiler-dom': 3.4.34
-      '@vue/shared': 3.4.34
+      '@vue/compiler-dom': 3.4.37
+      '@vue/shared': 3.4.37
 
   '@vue/compiler-vue2@2.7.16':
     dependencies:
@@ -17426,8 +17368,8 @@ snapshots:
   '@vue/language-core@2.0.16(typescript@5.5.4)':
     dependencies:
       '@volar/language-core': 2.2.0
-      '@vue/compiler-dom': 3.4.31
-      '@vue/shared': 3.4.31
+      '@vue/compiler-dom': 3.4.34
+      '@vue/shared': 3.4.34
       computeds: 0.0.1
       minimatch: 9.0.4
       path-browserify: 1.0.1
@@ -17438,9 +17380,9 @@ snapshots:
   '@vue/language-core@2.0.29(typescript@5.5.4)':
     dependencies:
       '@volar/language-core': 2.4.0-alpha.18
-      '@vue/compiler-dom': 3.4.31
+      '@vue/compiler-dom': 3.4.34
       '@vue/compiler-vue2': 2.7.16
-      '@vue/shared': 3.4.31
+      '@vue/shared': 3.4.34
       computeds: 0.0.1
       minimatch: 9.0.4
       muggle-string: 0.4.1
@@ -17448,41 +17390,41 @@ snapshots:
     optionalDependencies:
       typescript: 5.5.4
 
-  '@vue/reactivity@3.4.34':
+  '@vue/reactivity@3.4.37':
     dependencies:
-      '@vue/shared': 3.4.34
+      '@vue/shared': 3.4.37
 
-  '@vue/runtime-core@3.4.34':
+  '@vue/runtime-core@3.4.37':
     dependencies:
-      '@vue/reactivity': 3.4.34
-      '@vue/shared': 3.4.34
+      '@vue/reactivity': 3.4.37
+      '@vue/shared': 3.4.37
 
-  '@vue/runtime-dom@3.4.34':
+  '@vue/runtime-dom@3.4.37':
     dependencies:
-      '@vue/reactivity': 3.4.34
-      '@vue/runtime-core': 3.4.34
-      '@vue/shared': 3.4.34
+      '@vue/reactivity': 3.4.37
+      '@vue/runtime-core': 3.4.37
+      '@vue/shared': 3.4.37
       csstype: 3.1.3
 
-  '@vue/server-renderer@3.4.34(vue@3.4.34(typescript@5.5.4))':
+  '@vue/server-renderer@3.4.37(vue@3.4.37(typescript@5.5.4))':
     dependencies:
-      '@vue/compiler-ssr': 3.4.34
-      '@vue/shared': 3.4.34
-      vue: 3.4.34(typescript@5.5.4)
-
-  '@vue/shared@3.4.29': {}
+      '@vue/compiler-ssr': 3.4.37
+      '@vue/shared': 3.4.37
+      vue: 3.4.37(typescript@5.5.4)
 
   '@vue/shared@3.4.31': {}
 
   '@vue/shared@3.4.34': {}
 
-  '@vue/test-utils@2.4.1(@vue/server-renderer@3.4.34(vue@3.4.34(typescript@5.5.4)))(vue@3.4.34(typescript@5.5.4))':
+  '@vue/shared@3.4.37': {}
+
+  '@vue/test-utils@2.4.1(@vue/server-renderer@3.4.37(vue@3.4.37(typescript@5.5.4)))(vue@3.4.37(typescript@5.5.4))':
     dependencies:
       js-beautify: 1.14.9
-      vue: 3.4.34(typescript@5.5.4)
+      vue: 3.4.37(typescript@5.5.4)
       vue-component-type-helpers: 1.8.4
     optionalDependencies:
-      '@vue/server-renderer': 3.4.34(vue@3.4.34(typescript@5.5.4))
+      '@vue/server-renderer': 3.4.37(vue@3.4.37(typescript@5.5.4))
 
   '@webgpu/types@0.1.30': {}
 
@@ -17930,7 +17872,7 @@ snapshots:
 
   babel-walk@3.0.0-canary-5:
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.7
 
   bail@2.0.2: {}
 
@@ -18481,8 +18423,8 @@ snapshots:
 
   constantinople@4.0.1:
     dependencies:
-      '@babel/parser': 7.24.5
-      '@babel/types': 7.24.0
+      '@babel/parser': 7.24.7
+      '@babel/types': 7.24.7
 
   content-disposition@0.5.4:
     dependencies:
@@ -18593,12 +18535,12 @@ snapshots:
   css-tree@2.2.1:
     dependencies:
       mdn-data: 2.0.28
-      source-map-js: 1.0.2
+      source-map-js: 1.2.0
 
   css-tree@2.3.1:
     dependencies:
       mdn-data: 2.0.30
-      source-map-js: 1.0.2
+      source-map-js: 1.2.0
 
   css-what@6.1.0: {}
 
@@ -18982,6 +18924,8 @@ snapshots:
 
   entities@4.5.0: {}
 
+  entities@5.0.0: {}
+
   env-paths@2.2.1: {}
 
   envinfo@7.8.1: {}
@@ -20925,7 +20869,7 @@ snapshots:
       '@babel/generator': 7.23.5
       '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.5)
       '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.5)
-      '@babel/types': 7.23.5
+      '@babel/types': 7.24.7
       '@jest/expect-utils': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
@@ -21374,8 +21318,8 @@ snapshots:
 
   magicast@0.3.4:
     dependencies:
-      '@babel/parser': 7.24.5
-      '@babel/types': 7.24.0
+      '@babel/parser': 7.24.7
+      '@babel/types': 7.24.7
       source-map-js: 1.2.0
 
   mailcheck@1.1.1: {}
@@ -23724,8 +23668,6 @@ snapshots:
 
   sortablejs@1.14.0: {}
 
-  source-map-js@1.0.2: {}
-
   source-map-js@1.2.0: {}
 
   source-map-support@0.5.13:
@@ -24496,14 +24438,14 @@ snapshots:
 
   uuid@9.0.1: {}
 
-  v-code-diff@1.12.0(vue@3.4.34(typescript@5.5.4)):
+  v-code-diff@1.12.0(vue@3.4.37(typescript@5.5.4)):
     dependencies:
       diff: 5.1.0
       diff-match-patch: 1.0.5
       highlight.js: 11.9.0
-      vue: 3.4.34(typescript@5.5.4)
-      vue-demi: 0.14.7(vue@3.4.34(typescript@5.5.4))
-      vue-i18n: 9.13.1(vue@3.4.34(typescript@5.5.4))
+      vue: 3.4.37(typescript@5.5.4)
+      vue-demi: 0.14.7(vue@3.4.37(typescript@5.5.4))
+      vue-i18n: 9.13.1(vue@3.4.37(typescript@5.5.4))
 
   v8-to-istanbul@9.2.0:
     dependencies:
@@ -24647,24 +24589,24 @@ snapshots:
 
   vue-component-type-helpers@2.0.29: {}
 
-  vue-demi@0.14.7(vue@3.4.34(typescript@5.5.4)):
+  vue-demi@0.14.7(vue@3.4.37(typescript@5.5.4)):
     dependencies:
-      vue: 3.4.34(typescript@5.5.4)
+      vue: 3.4.37(typescript@5.5.4)
 
-  vue-docgen-api@4.75.1(vue@3.4.34(typescript@5.5.4)):
+  vue-docgen-api@4.75.1(vue@3.4.37(typescript@5.5.4)):
     dependencies:
       '@babel/parser': 7.24.7
       '@babel/types': 7.24.7
-      '@vue/compiler-dom': 3.4.29
-      '@vue/compiler-sfc': 3.4.34
+      '@vue/compiler-dom': 3.4.34
+      '@vue/compiler-sfc': 3.4.37
       ast-types: 0.16.1
       hash-sum: 2.0.0
       lru-cache: 8.0.4
       pug: 3.0.3
       recast: 0.23.6
       ts-map: 1.0.3
-      vue: 3.4.34(typescript@5.5.4)
-      vue-inbrowser-compiler-independent-utils: 4.71.1(vue@3.4.34(typescript@5.5.4))
+      vue: 3.4.37(typescript@5.5.4)
+      vue-inbrowser-compiler-independent-utils: 4.71.1(vue@3.4.37(typescript@5.5.4))
 
   vue-eslint-parser@9.4.3(eslint@9.8.0):
     dependencies:
@@ -24679,16 +24621,16 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vue-i18n@9.13.1(vue@3.4.34(typescript@5.5.4)):
+  vue-i18n@9.13.1(vue@3.4.37(typescript@5.5.4)):
     dependencies:
       '@intlify/core-base': 9.13.1
       '@intlify/shared': 9.13.1
       '@vue/devtools-api': 6.6.1
-      vue: 3.4.34(typescript@5.5.4)
+      vue: 3.4.37(typescript@5.5.4)
 
-  vue-inbrowser-compiler-independent-utils@4.71.1(vue@3.4.34(typescript@5.5.4)):
+  vue-inbrowser-compiler-independent-utils@4.71.1(vue@3.4.37(typescript@5.5.4)):
     dependencies:
-      vue: 3.4.34(typescript@5.5.4)
+      vue: 3.4.37(typescript@5.5.4)
 
   vue-template-compiler@2.7.14:
     dependencies:
@@ -24702,20 +24644,20 @@ snapshots:
       semver: 7.6.0
       typescript: 5.5.4
 
-  vue@3.4.34(typescript@5.5.4):
+  vue@3.4.37(typescript@5.5.4):
     dependencies:
-      '@vue/compiler-dom': 3.4.34
-      '@vue/compiler-sfc': 3.4.34
-      '@vue/runtime-dom': 3.4.34
-      '@vue/server-renderer': 3.4.34(vue@3.4.34(typescript@5.5.4))
-      '@vue/shared': 3.4.34
+      '@vue/compiler-dom': 3.4.37
+      '@vue/compiler-sfc': 3.4.37
+      '@vue/runtime-dom': 3.4.37
+      '@vue/server-renderer': 3.4.37(vue@3.4.37(typescript@5.5.4))
+      '@vue/shared': 3.4.37
     optionalDependencies:
       typescript: 5.5.4
 
-  vuedraggable@4.1.0(vue@3.4.34(typescript@5.5.4)):
+  vuedraggable@4.1.0(vue@3.4.37(typescript@5.5.4)):
     dependencies:
       sortablejs: 1.14.0
-      vue: 3.4.34(typescript@5.5.4)
+      vue: 3.4.37(typescript@5.5.4)
 
   w3c-xmlserializer@5.0.0:
     dependencies:
@@ -24840,8 +24782,8 @@ snapshots:
 
   with@7.0.2:
     dependencies:
-      '@babel/parser': 7.24.5
-      '@babel/types': 7.24.0
+      '@babel/parser': 7.24.7
+      '@babel/types': 7.24.7
       assert-never: 1.2.1
       babel-walk: 3.0.0-canary-5
 

From 1532d5f3904df811143d19816c02c3a598737b10 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Sat, 10 Aug 2024 09:36:10 +0900
Subject: [PATCH 161/221] ci: skip chromatic / storybook CI for pull requests
 targets master (#14377)

---
 .github/workflows/storybook.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
index 68452aacaf..bea93f1456 100644
--- a/.github/workflows/storybook.yml
+++ b/.github/workflows/storybook.yml
@@ -7,6 +7,11 @@ on:
       - develop
       - dev/storybook8 # for testing
   pull_request_target:
+    branches-ignore:
+      # Since pull requests targets master mostly is the "develop" branch.
+      # Storybook CI is checked on the "push" event of "develop" branch so it would cause a duplicate build.
+      # This is a waste of chromatic build quota, so we don't run storybook CI on pull requests targets master.
+      - master
 
 jobs:
   build:

From cb10156f01d53e04c98639be0061f0ec25308edb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 10 Aug 2024 20:46:26 +0900
Subject: [PATCH 162/221] =?UTF-8?q?fix(frontend):=20iOS=E3=81=A7acct?=
 =?UTF-8?q?=E3=81=AA=E3=81=A9=E3=81=8C=E3=83=AA=E3=83=B3=E3=82=AF=E3=81=A8?=
 =?UTF-8?q?=E3=81=97=E3=81=A6=E8=AA=A4=E6=A4=9C=E7=9F=A5=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=82=8B=E3=81=AE=E3=82=92=E6=8A=91=E5=88=B6=20(#14354)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): iosでの自動リンク化を抑制

* Update Changelog

* typo

* typo

* Update CHANGELOG.md
---
 CHANGELOG.md                                   | 1 +
 packages/backend/src/server/web/views/base.pug | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 800161841c..d2ce0906e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Enhance: 「自分のPlay」ページにおいてPlayが非公開かどうかが一目でわかるように
 - Fix: Play編集時に公開範囲が「パブリック」にリセットされる問題を修正
 - Fix: ページ遷移に失敗することがある問題を修正
+- Fix: iOSでユーザー名などがリンクとして誤検知される現象を抑制
 
 ### Server
 - Fix: WSの`readAllNotifications` メッセージが `body` を持たない場合に動作しない問題 #14374
diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug
index ec1325e4e9..151b7bca6c 100644
--- a/packages/backend/src/server/web/views/base.pug
+++ b/packages/backend/src/server/web/views/base.pug
@@ -28,6 +28,7 @@ html
 		meta(property='og:site_name' content= instanceName || 'Misskey')
 		meta(property='instance_url' content= instanceUrl)
 		meta(name='viewport' content='width=device-width, initial-scale=1')
+		meta(name='format-detection' content='telephone=no,date=no,address=no,email=no,url=no')
 		link(rel='icon' href= icon || '/favicon.ico')
 		link(rel='apple-touch-icon' href= appleTouchIcon || '/apple-touch-icon.png')
 		link(rel='manifest' href='/manifest.json')

From 93c569c2cd506c8c18c208135904ef0ff5aae378 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 10 Aug 2024 21:07:33 +0900
Subject: [PATCH 163/221] refactor

---
 packages/backend/src/core/FileInfoService.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/core/FileInfoService.ts b/packages/backend/src/core/FileInfoService.ts
index 169285f033..6bd6cb8d9b 100644
--- a/packages/backend/src/core/FileInfoService.ts
+++ b/packages/backend/src/core/FileInfoService.ts
@@ -15,7 +15,7 @@ import isSvg from 'is-svg';
 import probeImageSize from 'probe-image-size';
 import { type predictionType } from 'nsfwjs';
 import { sharpBmp } from '@misskey-dev/sharp-read-bmp';
-import { encode } from 'blurhash';
+import * as blurhash from 'blurhash';
 import { createTempDir } from '@/misc/create-temp.js';
 import { AiService } from '@/core/AiService.js';
 import { LoggerService } from '@/core/LoggerService.js';
@@ -452,7 +452,7 @@ export class FileInfoService {
 	}
 
 	/**
-	 * Calculate average color of image
+	 * Calculate blurhash string of image
 	 */
 	@bindThis
 	private getBlurhash(path: string, type: string): Promise<string> {
@@ -467,7 +467,7 @@ export class FileInfoService {
 					let hash;
 
 					try {
-						hash = encode(new Uint8ClampedArray(buffer), info.width, info.height, 5, 5);
+						hash = blurhash.encode(new Uint8ClampedArray(buffer), info.width, info.height, 5, 5);
 					} catch (e) {
 						return reject(e);
 					}

From 046f2435b2edd6adffaf4f45bb30114d52e62b6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 11 Aug 2024 11:17:56 +0900
Subject: [PATCH 164/221] =?UTF-8?q?fix(frontend):=20mCaptcha=E3=82=92?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=97=E3=81=A6=E3=81=84=E3=81=A6=E3=82=82?=
 =?UTF-8?q?bot=E3=83=97=E3=83=AD=E3=83=86=E3=82=AF=E3=82=B7=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E3=81=AB=E9=96=A2=E3=81=99=E3=82=8B=E8=AD=A6=E5=91=8A?=
 =?UTF-8?q?=E3=81=8C=E6=B6=88=E3=81=88=E3=81=AA=E3=81=84=E3=81=AE=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(#14390)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): mCaptchaを使用していてもbotプロテクションに関する警告が消えないのを修正

* Update Changelog

* refactor
---
 CHANGELOG.md                                  |  1 +
 packages/frontend/src/pages/admin/index.vue   | 31 +++++++++----------
 .../frontend/src/pages/settings/index.vue     |  3 --
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2ce0906e2..8d5d228d17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Fix: Play編集時に公開範囲が「パブリック」にリセットされる問題を修正
 - Fix: ページ遷移に失敗することがある問題を修正
 - Fix: iOSでユーザー名などがリンクとして誤検知される現象を抑制
+- Fix: mCaptchaを使用していてもbotプロテクションに関する警告が消えないのを修正
 
 ### Server
 - Fix: WSの`readAllNotifications` メッセージが `body` を持たない場合に動作しない問題 #14374
diff --git a/packages/frontend/src/pages/admin/index.vue b/packages/frontend/src/pages/admin/index.vue
index 292f10da1a..40dec55deb 100644
--- a/packages/frontend/src/pages/admin/index.vue
+++ b/packages/frontend/src/pages/admin/index.vue
@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <div ref="el" class="hiyeyicy" :class="{ wide: !narrow }">
 	<div v-if="!narrow || currentPage?.route.name == null" class="nav">
 		<MkSpacer :contentMax="700" :marginMin="16">
-			<div class="lxpfedzu">
+			<div class="lxpfedzu _gaps">
 				<div class="banner">
 					<img :src="instance.iconUrl || '/favicon.ico'" alt="" class="icon"/>
 				</div>
@@ -61,10 +61,10 @@ const narrow = ref(false);
 const view = ref(null);
 const el = ref<HTMLDivElement | null>(null);
 const pageProps = ref({});
-let noMaintainerInformation = isEmpty(instance.maintainerName) || isEmpty(instance.maintainerEmail);
-let noBotProtection = !instance.disableRegistration && !instance.enableHcaptcha && !instance.enableRecaptcha && !instance.enableTurnstile;
-let noEmailServer = !instance.enableEmail;
-let noInquiryUrl = isEmpty(instance.inquiryUrl);
+const noMaintainerInformation = computed(() => isEmpty(instance.maintainerName) || isEmpty(instance.maintainerEmail));
+const noBotProtection = computed(() => !instance.disableRegistration && !instance.enableHcaptcha && !instance.enableRecaptcha && !instance.enableTurnstile && !instance.enableMcaptcha);
+const noEmailServer = computed(() => !instance.enableEmail);
+const noInquiryUrl = computed(() => isEmpty(instance.inquiryUrl));
 const thereIsUnresolvedAbuseReport = ref(false);
 const currentPage = computed(() => router.currentRef.value.child);
 
@@ -235,25 +235,22 @@ const menuDef = computed(() => [{
 	}],
 }]);
 
-watch(narrow.value, () => {
-	if (currentPage.value?.route.name == null && !narrow.value) {
-		router.push('/admin/overview');
-	}
-});
-
 onMounted(() => {
-	ro.observe(el.value);
-
-	narrow.value = el.value.offsetWidth < NARROW_THRESHOLD;
+	if (el.value != null) {
+		ro.observe(el.value);
+		narrow.value = el.value.offsetWidth < NARROW_THRESHOLD;
+	}
 	if (currentPage.value?.route.name == null && !narrow.value) {
-		router.push('/admin/overview');
+		router.replace('/admin/overview');
 	}
 });
 
 onActivated(() => {
-	narrow.value = el.value.offsetWidth < NARROW_THRESHOLD;
+	if (el.value != null) {
+		narrow.value = el.value.offsetWidth < NARROW_THRESHOLD;
+	}
 	if (currentPage.value?.route.name == null && !narrow.value) {
-		router.push('/admin/overview');
+		router.replace('/admin/overview');
 	}
 });
 
diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue
index 5fc1fd1bca..7d16740a3e 100644
--- a/packages/frontend/src/pages/settings/index.vue
+++ b/packages/frontend/src/pages/settings/index.vue
@@ -198,9 +198,6 @@ const menuDef = computed(() => [{
 	}],
 }]);
 
-watch(narrow, () => {
-});
-
 onMounted(() => {
 	ro.observe(el.value);
 

From 0aaf74ee22da1b8e4b690075c45c166d96f1b0aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 11 Aug 2024 11:28:07 +0900
Subject: [PATCH 165/221] =?UTF-8?q?fix(backend):=20InstanceEntityService.p?=
 =?UTF-8?q?ackMany=20=E3=81=AB=20me=20=E3=81=8C=E6=B8=A1=E3=81=A3=E3=81=A6?=
 =?UTF-8?q?=E3=81=84=E3=81=AA=E3=81=84=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20(#14360)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: pass current user into `InstanceEntityService.packMany`

(cherry picked from commit 858ba188768017764c61c4a5591bdf2524a850e7)

* Update Changelog

* origin

* Update Changelog

---------

Co-authored-by: Hazel K <acomputerdog@gmail.com>
---
 CHANGELOG.md                                                  | 2 ++
 packages/backend/src/core/entities/InstanceEntityService.ts   | 3 ++-
 .../backend/src/server/api/endpoints/federation/instances.ts  | 2 +-
 packages/backend/src/server/api/endpoints/federation/stats.ts | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d5d228d17..141d1955f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@
   - 通知ページや通知カラム(デッキ)を開いている状態において、新たに発生した通知が既読されない問題が修正されます。
   - これにより、プッシュ通知が有効な同条件下の環境において、プッシュ通知が常に発生してしまう問題も修正されます。
 - Fix: Play各種エンドポイントの返り値に`visibility`が含まれていない問題を修正
+- Fix: サーバー情報取得の際にモデレーター限定の情報が取得できないことがあるのを修正  
+  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/582)
 
 ## 2024.7.0
 
diff --git a/packages/backend/src/core/entities/InstanceEntityService.ts b/packages/backend/src/core/entities/InstanceEntityService.ts
index 4c45c13167..4956bc22ce 100644
--- a/packages/backend/src/core/entities/InstanceEntityService.ts
+++ b/packages/backend/src/core/entities/InstanceEntityService.ts
@@ -63,8 +63,9 @@ export class InstanceEntityService {
 	@bindThis
 	public packMany(
 		instances: MiInstance[],
+		me?: { id: MiUser['id']; } | null | undefined,
 	) {
-		return Promise.all(instances.map(x => this.pack(x)));
+		return Promise.all(instances.map(x => this.pack(x, me)));
 	}
 }
 
diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts
index 36f4bf5aa6..41954129e6 100644
--- a/packages/backend/src/server/api/endpoints/federation/instances.ts
+++ b/packages/backend/src/server/api/endpoints/federation/instances.ts
@@ -170,7 +170,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			const instances = await query.limit(ps.limit).offset(ps.offset).getMany();
 
-			return await this.instanceEntityService.packMany(instances);
+			return await this.instanceEntityService.packMany(instances, me);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/federation/stats.ts b/packages/backend/src/server/api/endpoints/federation/stats.ts
index bac54970ab..69900bff9a 100644
--- a/packages/backend/src/server/api/endpoints/federation/stats.ts
+++ b/packages/backend/src/server/api/endpoints/federation/stats.ts
@@ -107,9 +107,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const gotPubCount = topPubInstances.map(x => x.followingCount).reduce((a, b) => a + b, 0);
 
 			return await awaitAll({
-				topSubInstances: this.instanceEntityService.packMany(topSubInstances),
+				topSubInstances: this.instanceEntityService.packMany(topSubInstances, me),
 				otherFollowersCount: Math.max(0, allSubCount - gotSubCount),
-				topPubInstances: this.instanceEntityService.packMany(topPubInstances),
+				topPubInstances: this.instanceEntityService.packMany(topPubInstances, me),
 				otherFollowingCount: Math.max(0, allPubCount - gotPubCount),
 			});
 		});

From 93fc06d18b8520919cdf422675c4102b4851df18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 11 Aug 2024 16:25:57 +0900
Subject: [PATCH 166/221] =?UTF-8?q?fix(backend):=20getApType=E3=81=A7?=
 =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=82=92=E6=8A=95=E3=81=92=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=20(#14361)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(backend): getApTypeでエラーを投げないように

* Update Changelog

* Update Changelog

* Update type.ts

* add comment
---
 CHANGELOG.md                                  |  2 ++
 .../core/activitypub/models/ApNoteService.ts  |  5 +--
 packages/backend/src/core/activitypub/type.ts | 32 +++++++++++++------
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 141d1955f6..bb58f733b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,8 @@
 - Fix: Play各種エンドポイントの返り値に`visibility`が含まれていない問題を修正
 - Fix: サーバー情報取得の際にモデレーター限定の情報が取得できないことがあるのを修正  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/582)
+- Fix: ActivityPubのエンティティタイプ判定で不明なタイプを受け取った場合でも処理を継続するように
+  - キュー処理のつまりが改善される可能性があります
 
 ## 2024.7.0
 
diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
index fc7aa1e0b9..5b75da22a0 100644
--- a/packages/backend/src/core/activitypub/models/ApNoteService.ts
+++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -78,9 +78,10 @@ export class ApNoteService {
 	@bindThis
 	public validateNote(object: IObject, uri: string): Error | null {
 		const expectHost = this.utilityService.extractDbHost(uri);
+		const apType = getApType(object);
 
-		if (!validPost.includes(getApType(object))) {
-			return new IdentifiableError('d450b8a9-48e4-4dab-ae36-f4db763fda7c', `invalid Note: invalid object type ${getApType(object)}`);
+		if (apType == null || !validPost.includes(apType)) {
+			return new IdentifiableError('d450b8a9-48e4-4dab-ae36-f4db763fda7c', `invalid Note: invalid object type ${apType ?? 'undefined'}`);
 		}
 
 		if (object.id && this.utilityService.extractDbHost(object.id) !== expectHost) {
diff --git a/packages/backend/src/core/activitypub/type.ts b/packages/backend/src/core/activitypub/type.ts
index 131c518c0a..16812b7a4d 100644
--- a/packages/backend/src/core/activitypub/type.ts
+++ b/packages/backend/src/core/activitypub/type.ts
@@ -60,11 +60,14 @@ export function getApId(value: string | IObject): string {
 
 /**
  * Get ActivityStreams Object type
+ *
+ * タイプ判定ができなかった場合に、あえてエラーではなくnullを返すようにしている。
+ * 詳細: https://github.com/misskey-dev/misskey/issues/14239
  */
-export function getApType(value: IObject): string {
+export function getApType(value: IObject): string | null {
 	if (typeof value.type === 'string') return value.type;
 	if (Array.isArray(value.type) && typeof value.type[0] === 'string') return value.type[0];
-	throw new Error('cannot detect type');
+	return null;
 }
 
 export function getOneApHrefNullable(value: ApObject | undefined): string | undefined {
@@ -110,8 +113,10 @@ export interface IOrderedCollection extends IObject {
 
 export const validPost = ['Note', 'Question', 'Article', 'Audio', 'Document', 'Image', 'Page', 'Video', 'Event'];
 
-export const isPost = (object: IObject): object is IPost =>
-	validPost.includes(getApType(object));
+export const isPost = (object: IObject): object is IPost => {
+	const type = getApType(object);
+	return type != null && validPost.includes(type);
+};
 
 export interface IPost extends IObject {
 	type: 'Note' | 'Question' | 'Article' | 'Audio' | 'Document' | 'Image' | 'Page' | 'Video' | 'Event';
@@ -158,8 +163,10 @@ export const isTombstone = (object: IObject): object is ITombstone =>
 
 export const validActor = ['Person', 'Service', 'Group', 'Organization', 'Application'];
 
-export const isActor = (object: IObject): object is IActor =>
-	validActor.includes(getApType(object));
+export const isActor = (object: IObject): object is IActor => {
+	const type = getApType(object);
+	return type != null && validActor.includes(type);
+};
 
 export interface IActor extends IObject {
 	type: 'Person' | 'Service' | 'Organization' | 'Group' | 'Application';
@@ -242,12 +249,16 @@ export interface IKey extends IObject {
 	publicKeyPem: string | Buffer;
 }
 
+export const validDocumentTypes = ['Audio', 'Document', 'Image', 'Page', 'Video'];
+
 export interface IApDocument extends IObject {
 	type: 'Audio' | 'Document' | 'Image' | 'Page' | 'Video';
 }
 
-export const isDocument = (object: IObject): object is IApDocument =>
-	['Audio', 'Document', 'Image', 'Page', 'Video'].includes(getApType(object));
+export const isDocument = (object: IObject): object is IApDocument => {
+	const type = getApType(object);
+	return type != null && validDocumentTypes.includes(type);
+};
 
 export interface IApImage extends IApDocument {
 	type: 'Image';
@@ -325,7 +336,10 @@ export const isAccept = (object: IObject): object is IAccept => getApType(object
 export const isReject = (object: IObject): object is IReject => getApType(object) === 'Reject';
 export const isAdd = (object: IObject): object is IAdd => getApType(object) === 'Add';
 export const isRemove = (object: IObject): object is IRemove => getApType(object) === 'Remove';
-export const isLike = (object: IObject): object is ILike => getApType(object) === 'Like' || getApType(object) === 'EmojiReaction' || getApType(object) === 'EmojiReact';
+export const isLike = (object: IObject): object is ILike => {
+	const type = getApType(object);
+	return type != null && ['Like', 'EmojiReaction', 'EmojiReact'].includes(type);
+};
 export const isAnnounce = (object: IObject): object is IAnnounce => getApType(object) === 'Announce';
 export const isBlock = (object: IObject): object is IBlock => getApType(object) === 'Block';
 export const isFlag = (object: IObject): object is IFlag => getApType(object) === 'Flag';

From ab7bbd4e579743e2c47885d89778dad3ed694d9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 11 Aug 2024 16:27:08 +0900
Subject: [PATCH 167/221] =?UTF-8?q?fix(backend):=20=E3=83=80=E3=82=A4?=
 =?UTF-8?q?=E3=83=AC=E3=82=AF=E3=83=88=E6=8A=95=E7=A8=BF=E3=82=92=E3=83=A6?=
 =?UTF-8?q?=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=94=E3=81=A8=E3=81=AE=E3=83=81?=
 =?UTF-8?q?=E3=83=A3=E3=83=BC=E3=83=88=E3=81=8B=E3=82=89=E9=99=A4=E5=A4=96?=
 =?UTF-8?q?=20(#14350)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(chart): ダイレクト投稿をユーザーごとのチャートから除外 (MisskeyIO#679)

(cherry picked from commit 3db41c2d829ac18daabbdf52fe6235a874735b31)

* Update Changelog

---------

Co-authored-by: Yuuki <yukikum57@gmail.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
 CHANGELOG.md                                   | 2 ++
 packages/backend/src/core/NoteCreateService.ts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb58f733b5..8468afe795 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,8 @@
 - Fix: Play各種エンドポイントの返り値に`visibility`が含まれていない問題を修正
 - Fix: サーバー情報取得の際にモデレーター限定の情報が取得できないことがあるのを修正  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/582)
+- Fix: 公開範囲がダイレクトのノートをユーザーアクティビティのチャート生成に使用しないように  
+  (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/679)
 - Fix: ActivityPubのエンティティタイプ判定で不明なタイプを受け取った場合でも処理を継続するように
   - キュー処理のつまりが改善される可能性があります
 
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 32cf3f3e26..1d8d248322 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -509,7 +509,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		const meta = await this.metaService.fetch();
 
 		this.notesChart.update(note, true);
-		if (meta.enableChartsForRemoteUser || (user.host == null)) {
+		if (note.visibility !== 'specified' && (meta.enableChartsForRemoteUser || (user.host == null))) {
 			this.perUserNotesChart.update(user, note, true);
 		}
 

From 94b8c00c663a64cc5e265eb13ef340d4ad5536ce Mon Sep 17 00:00:00 2001
From: shika <dev.t1nyb0x@gmail.com>
Date: Sun, 11 Aug 2024 16:27:24 +0900
Subject: [PATCH 168/221] =?UTF-8?q?docker-compose.yml,=20compose.yml?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E8=B7=A1=E5=AF=BE=E8=B1=A1=E5=A4=96=E3=81=AB?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0=20(#14345)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 45170902b1..e333835715 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,8 @@ coverage
 !/.config/example.yml
 !/.config/docker_example.yml
 !/.config/docker_example.env
+docker-compose.yml
+compose.yml
 .devcontainer/compose.yml
 !/.devcontainer/compose.yml
 

From 2a2bbcd1bcaa3f213b317859ce88057662779329 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 11 Aug 2024 16:27:42 +0900
Subject: [PATCH 169/221] New Crowdin updates (#14341)

* New translations ja-jp.yml (Thai)

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

* 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 (Thai)

* New translations ja-jp.yml (Thai)

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

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

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Portuguese)
---
 locales/en-US.yml |    6 +-
 locales/fr-FR.yml |    5 +
 locales/ja-KS.yml |   52 ++
 locales/pt-PT.yml | 1250 ++++++++++++++++++++++++++++++++++++++++++---
 locales/th-TH.yml |   29 +-
 locales/zh-CN.yml |    1 +
 locales/zh-TW.yml |    4 +-
 7 files changed, 1267 insertions(+), 80 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 2cb76fa746..fe2bb08074 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1255,7 +1255,7 @@ launchApp: "Launch the app"
 useNativeUIForVideoAudioPlayer: "Use UI of browser when play video and audio"
 keepOriginalFilename: "Keep original file name"
 keepOriginalFilenameDescription: "If you turn off this setting, files names will be replaced with random string automatically when you upload files."
-noDescription: "There is not the explanation"
+noDescription: "There is no explanation"
 alwaysConfirmFollow: "Always confirm when following"
 inquiry: "Contact"
 tryAgain: "Please try again later"
@@ -1365,7 +1365,7 @@ _initialTutorial:
       _exampleNote:
         cw: "This will surely make you hungry!"
         note: "Just had a chocolate-glazed donut 🍩😋"
-      useCases: "This is used when following the server guidelines for necessary notes or for self-restriction of spoiler or sensitive text."
+      useCases: "This is used when following the server guidelines, for necessary notes, or for self-restriction of spoiler or sensitive text."
   _howToMakeAttachmentsSensitive:
     title: "How to Mark Attachments as Sensitive?"
     description: "For attachments that are required by server guidelines or that should not be left intact, add a \"sensitive\" flag."
@@ -2494,7 +2494,7 @@ _moderationLogTypes:
   unsetUserAvatar: "Unset this user's avatar"
   unsetUserBanner: "Unset this user's banner"
   createSystemWebhook: "Create SystemWebhook"
-  updateSystemWebhook: "Update SystemWebHook"
+  updateSystemWebhook: "Update SystemWebhook"
   deleteSystemWebhook: "Delete SystemWebhook"
   createAbuseReportNotificationRecipient: "Create a recipient for abuse reports"
   updateAbuseReportNotificationRecipient: "Update recipients for abuse reports"
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index ee08dfddf1..c1e2555d0d 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -1094,6 +1094,8 @@ preservedUsernames: "Noms d'utilisateur·rice réservés"
 preservedUsernamesDescription: "Énumérez les noms d'utilisateur à réserver, séparés par des nouvelles lignes. Les noms d'utilisateur spécifiés ici ne seront plus utilisables lors de la création d'un compte, sauf la création manuelle par un administrateur. De plus, les comptes existants ne seront pas affectés."
 createNoteFromTheFile: "Rédiger une note de ce fichier"
 archive: "Archive"
+archived: "Archivé"
+unarchive: "Annuler l'archivage"
 channelArchiveConfirmTitle: "Voulez-vous vraiment archiver {name} ?"
 channelArchiveConfirmDescription: "Une fois archivé, le canal n'apparaîtra plus dans la liste des canaux ni dans les résultats de recherche, et la publication des nouvelles notes sera impossible."
 thisChannelArchived: "Ce canal a été archivé."
@@ -1224,7 +1226,10 @@ enableHorizontalSwipe: "Glisser pour changer d'onglet"
 loading: "Chargement en cours"
 surrender: "Annuler"
 gameRetry: "Réessayer"
+launchApp: "Lancer l'app"
+inquiry: "Contact"
 _delivery:
+  status: "Statut de la diffusion"
   stop: "Suspendu·e"
   _type:
     none: "Publié"
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index 5969082cf2..98045b43ac 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -60,6 +60,7 @@ copyFileId: "ファイルIDをコピー"
 copyFolderId: "フォルダーIDをコピー"
 copyProfileUrl: "プロフィールURLをコピー"
 searchUser: "ユーザーを探す"
+searchThisUsersNotes: "ユーザーのノートを検索"
 reply: "返事"
 loadMore: "まだまだあるで！"
 showMore: "まだまだあるで！"
@@ -114,6 +115,8 @@ cantReRenote: "リノート自体はリノートできへんで。"
 quote: "引用"
 inChannelRenote: "チャンネルの中でリノート"
 inChannelQuote: "チャンネル内引用"
+renoteToChannel: "チャンネルにリノート"
+renoteToOtherChannel: "他のチャンネルにリノート"
 pinnedNote: "ピン留めされとるノート"
 pinned: "ピン留めしとく"
 you: "あんた"
@@ -152,6 +155,7 @@ editList: "リストいじる"
 selectChannel: "チャンネルを選ぶ"
 selectAntenna: "アンテナを選ぶ"
 editAntenna: "アンテナいじる"
+createAntenna: "アンテナを作成"
 selectWidget: "ウィジェットを選ぶ"
 editWidgets: "ウィジェットをいじる"
 editWidgetsExit: "いじるのをやめる"
@@ -178,6 +182,10 @@ addAccount: "アカウントを追加"
 reloadAccountsList: "アカウントリストの情報を更新"
 loginFailed: "ログインに失敗してもうた…"
 showOnRemote: "リモートで見る"
+continueOnRemote: "リモートで続行"
+chooseServerOnMisskeyHub: "Misskey Hubからサーバーを選択"
+specifyServerHost: "サーバーのドメインを直接指定"
+inputHostName: "ドメインを入力せえや"
 general: "全般"
 wallpaper: "壁紙"
 setWallpaper: "壁紙を設定"
@@ -188,6 +196,7 @@ followConfirm: "{name}をフォローしてええか？"
 proxyAccount: "プロキシアカウント"
 proxyAccountDescription: "プロキシアカウントは、代わりにフォローしてくれるアカウントや。例えば、551に豚まんが無いときやったり、ユーザーがリモートユーザーをアカウントに入れたとき、リストに入れられたユーザーが誰からもフォローされてないと寂しいやん。寂しいし、アクティビティも配達されへんから、プロキシアカウントがフォローしてくれるで。ええやつやん…"
 host: "ホスト"
+selectSelf: "自分を選択"
 selectUser: "ユーザーを選ぶ"
 recipient: "宛先"
 annotation: "注釈"
@@ -203,6 +212,7 @@ perDay: "1日ごと"
 stopActivityDelivery: "アクティビティの配送をやめる"
 blockThisInstance: "このサーバーをブロックすんで"
 silenceThisInstance: "サーバーサイレンスすんで？"
+mediaSilenceThisInstance: "サーバーをメディアサイレンス"
 operations: "操作"
 software: "ソフトウェア"
 version: "バージョン"
@@ -224,6 +234,8 @@ blockedInstances: "ブロックしたサーバー"
 blockedInstancesDescription: "ブロックしたいサーバーのホストを改行で区切って設定してな。ブロックされてもうたサーバーとはもう金輪際やり取りできひんくなるで。"
 silencedInstances: "サーバーサイレンスされてんねん"
 silencedInstancesDescription: "サイレンスしたいサーバーのホストを改行で区切って設定すんで。サイレンスされたサーバーに所属するアカウントはすべて「サイレンス」として扱われ、フォローがすべてリクエストになり、フォロワーでないローカルアカウントにはメンションできなくなんねん。ブロックしたインスタンスには影響せーへんで。"
+mediaSilencedInstances: "メディアサイレンスしたサーバー"
+mediaSilencedInstancesDescription: "メディアサイレンスしたいサーバーのホストを改行で区切って設定するで。メディアサイレンスされたサーバーに所属するアカウントによるファイルはすべてセンシティブとして扱われてな、カスタム絵文字が使えへんようになるで。ブロックしたインスタンスには影響せえへんで。"
 muteAndBlock: "ミュートとブロック"
 mutedUsers: "ミュートしとるユーザー"
 blockedUsers: "ブロックしとるユーザー"
@@ -475,6 +487,7 @@ noMessagesYet: "まだチャットはあらへんで"
 newMessageExists: "新しいメッセージがきたで"
 onlyOneFileCanBeAttached: "ごめんな、メッセージに添付できるファイルはひとつだけなんよ。"
 signinRequired: "ログインしてくれへん？"
+signinOrContinueOnRemote: "続行するには、お使いのサーバーに移動するか、このサーバーに登録・ログインする必要があるで"
 invitations: "来てや"
 invitationCode: "招待コード"
 checking: "確認しとるで"
@@ -1025,6 +1038,7 @@ thisPostMayBeAnnoyingHome: "ホームに投稿"
 thisPostMayBeAnnoyingCancel: "やめとく"
 thisPostMayBeAnnoyingIgnore: "このまま投稿"
 collapseRenotes: "見たことあるリノートは飛ばして表示するで"
+collapseRenotesDescription: "リアクションやリノートをしたことがあるノートをたたんで表示するで。"
 internalServerError: "サーバー内部エラー"
 internalServerErrorDescription: "サーバーでなんか変なこと起こっとるわ。"
 copyErrorInfo: "エラー情報をコピるで"
@@ -1098,6 +1112,8 @@ preservedUsernames: "予約ユーザー名"
 preservedUsernamesDescription: "予約しとくユーザー名を行ごとに挙げるで。ここで指定されたユーザー名はアカウント作るときに使えへんくなるけど、管理者は例外や。あと、もうあるアカウントも例外やな。"
 createNoteFromTheFile: "このファイル使うてノート作るで"
 archive: "アーカイブ"
+archived: "アーカイブ済み"
+unarchive: "アーカイブ解除"
 channelArchiveConfirmTitle: "{name}をアーカイブしてええか？"
 channelArchiveConfirmDescription: "アーカイブしたら、チャンネル一覧とか検索結果からなくなるし、新しく書き込みもできへんなるで。"
 thisChannelArchived: "このチャンネル、アーカイブされとるで。"
@@ -1108,6 +1124,9 @@ preventAiLearning: "生成AIの学習に使わんといて"
 preventAiLearningDescription: "他の文章生成AIとか画像生成AIに、投稿したノートとか画像なんかを勝手に使わんように頼むで。具体的にはnoaiフラグをHTMLレスポンスに含めるんやけど、これ聞いてくれるんはAIの気分次第やから、使われる可能性もちょっとはあるな。"
 options: "オプション"
 specifyUser: "ユーザー指定"
+lookupConfirm: "照会するけどええか？"
+openTagPageConfirm: "ハッシュタグのページを開くんか？"
+specifyHost: "ホスト指定"
 failedToPreviewUrl: "プレビューできへん"
 update: "更新"
 rolesThatCanBeUsedThisEmojiAsReaction: "ツッコミとして使えるロール"
@@ -1239,10 +1258,20 @@ keepOriginalFilenameDescription: "この設定をオフにすると、アップ
 noDescription: "説明文はあらへんで"
 alwaysConfirmFollow: "フォローの際常に確認する"
 inquiry: "問い合わせ"
+tryAgain: "もう一度試しいや。"
+confirmWhenRevealingSensitiveMedia: "センシティブなメディアを表示するとき確認する"
+sensitiveMediaRevealConfirm: "センシティブなメディアやで。表示するんか？"
+createdLists: "作成したリスト"
+createdAntennas: "作成したアンテナ"
 _delivery:
+  status: "配信状態"
   stop: "配信せぇへん"
+  resume: "配信再開"
   _type:
     none: "配信しとる"
+    manuallySuspended: "手動停止中"
+    goneSuspended: "サーバー削除のため停止中"
+    autoSuspendedForNotResponding: "サーバー応答せえへんから停止中"
 _bubbleGame:
   howToPlay: "遊び方"
   hold: "ホールド"
@@ -1368,6 +1397,8 @@ _serverSettings:
   fanoutTimelineDescription: "入れると、おのおのタイムラインを取得するときにめちゃめちゃ動きが良うなって、データベースが軽くなるわ。でも、Redisのメモリ使う量が増えるから注意な。サーバーのメモリが足りんときとか、動きが変なときは切れるで。"
   fanoutTimelineDbFallback: "データベースにフォールバックする"
   fanoutTimelineDbFallbackDescription: "有効にしたら、タイムラインがキャッシュん中に入ってないときにDBにもっかい問い合わせるフォールバック処理ってのをやっとくで。切ったらフォールバック処理をやらんからサーバーはもっと軽くなんねんけど、タイムラインの取得範囲がちょっと減るで。"
+  inquiryUrl: "問い合わせ先URL"
+  inquiryUrlDescription: "サーバー運営者へのお問い合わせフォームのURLや、運営者の連絡先等が記載されたWebページのURLを指定するで。"
 _accountMigration:
   moveFrom: "別のアカウントからこのアカウントに引っ越す"
   moveFromSub: "別のアカウントへエイリアスを作る"
@@ -1684,6 +1715,7 @@ _role:
     canManageAvatarDecorations: "アバターを飾るモンの管理"
     driveCapacity: "ドライブ容量"
     alwaysMarkNsfw: "勝手にファイルにNSFWをくっつける"
+    canUpdateBioMedia: "アイコンとバナーの更新を許可"
     pinMax: "ノートピン留めできる数"
     antennaMax: "アンテナ作れる数"
     wordMuteMax: "ワードミュートの最大文字数"
@@ -1935,6 +1967,7 @@ _soundSettings:
   driveFileTypeWarnDescription: "音声ファイルを選びや"
   driveFileDurationWarn: "音が長すぎるわ"
   driveFileDurationWarnDescription: "長い音使うたらMisskey使うのに良うないかもしれへんで。それでもええか？"
+  driveFileError: "音声が読み込めへんかったで。設定を変更せえや"
 _ago:
   future: "未来"
   justNow: "ついさっき"
@@ -2351,6 +2384,7 @@ _deck:
   alwaysShowMainColumn: "いつもメインカラムを表示"
   columnAlign: "カラムの寄せ"
   addColumn: "カラムを追加"
+  newNoteNotificationSettings: "新着ノート通知の設定"
   configureColumn: "カラムの設定"
   swapLeft: "左に移動"
   swapRight: "右に移動"
@@ -2389,8 +2423,10 @@ _drivecleaner:
   orderByCreatedAtAsc: "追加日の古い順"
 _webhookSettings:
   createWebhook: "Webhookをつくる"
+  modifyWebhook: "Webhookを編集"
   name: "名前"
   secret: "シークレット"
+  trigger: "トリガー"
   active: "有効"
   _events:
     follow: "フォローしたとき～！"
@@ -2400,11 +2436,25 @@ _webhookSettings:
     renote: "リノートされるとき～！"
     reaction: "ツッコまれたとき～！"
     mention: "メンションがあるとき～！"
+  _systemEvents:
+    abuseReport: "ユーザーから通報があったとき"
+    abuseReportResolved: "ユーザーからの通報を処理したとき"
+    userCreated: "ユーザーが作成されたとき"
   deleteConfirm: "ほんまにWebhookをほかしてもええんか？"
 _abuseReport:
   _notificationRecipient:
+    createRecipient: "通報の通知先を追加"
+    modifyRecipient: "通報の通知先を編集"
+    recipientType: "通知先の種類"
     _recipientType:
       mail: "メール"
+      webhook: "Webhook"
+      _captions:
+        mail: "モデレーター権限を持つユーザーのメアドに通知を送るで(通報を受けた時のみ)"
+        webhook: "指定したSystemWebhookに通知を送るで(通報を受けた時と通報を解決した時にそれぞれ発信)"
+    keywords: "キーワード"
+    notifiedUser: "通知先ユーザー"
+    notifiedWebhook: "使用するWebhook"
     deleteConfirm: "通知先を削除してもええか？"
 _moderationLogTypes:
   createRole: "ロールを追加すんで"
@@ -2443,6 +2493,8 @@ _moderationLogTypes:
   deleteAvatarDecoration: "アイコンデコレーションを削除"
   unsetUserAvatar: "この子のアイコン元に戻す"
   unsetUserBanner: "この子のバナー元に戻す"
+  createSystemWebhook: "SystemWebhookを作成"
+  updateSystemWebhook: "SystemWebhookを更新"
 _fileViewer:
   title: "ファイルの詳しい情報"
   type: "ファイルの種類"
diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml
index 2e26f6d12a..d4c07a28c5 100644
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@@ -2,7 +2,7 @@
 _lang_: "Português"
 headlineMisskey: "Uma rede ligada por notas"
 introMisskey: "Bem-vindo! O Misskey é um serviço de microblog descentralizado de código aberto.\nCrie \"notas\" para compartilhar o que está acontecendo agora ou para se expressar com todos à sua volta 📡\nVocê também pode adicionar rapidamente reações às notas de outras pessoas usando a função \"Reações\" 👍\nVamos explorar um novo mundo 🚀"
-poweredByMisskeyDescription: "{name} é um dos servidores da plataforma de código aberto <b>Misskey</b>."
+poweredByMisskeyDescription: "{name} é uma instância da plataforma de código aberto <b>Misskey</b>."
 monthAndDay: "{day}/{month}"
 search: "Pesquisar"
 notifications: "Notificações"
@@ -60,6 +60,7 @@ copyFileId: "Copiar o ID do arquivo"
 copyFolderId: "Copiar o ID da pasta"
 copyProfileUrl: "Copiar a URL do perfil"
 searchUser: "Pesquisar usuário"
+searchThisUsersNotes: "Pesquisar as notas desse usuário"
 reply: "Responder"
 loadMore: "Carregar mais"
 showMore: "Ver mais"
@@ -99,7 +100,7 @@ enterListName: "Insira um nome para a lista"
 privacy: "Privacidade"
 makeFollowManuallyApprove: "Pedidos de seguidores precisam ser aprovados"
 defaultNoteVisibility: "Visibilidade padrão"
-follow: "Seguindo"
+follow: "Seguir"
 followRequest: "Enviar pedido de seguidor"
 followRequests: "Pedidos de seguidor"
 unfollow: "Deixar de seguir"
@@ -108,11 +109,14 @@ enterEmoji: "Inserir emoji"
 renote: "Repostar"
 unrenote: "Remover repostagem"
 renoted: "Repostado"
+renotedToX: "Repostar em {name}."
 cantRenote: "Não é possível repostar esta postagem"
 cantReRenote: "Não pode repostar este repost"
 quote: "Citar"
 inChannelRenote: "Repostar no canal"
 inChannelQuote: "Citar no canal"
+renoteToChannel: "Repostar em canal"
+renoteToOtherChannel: "Repostar em outro canal"
 pinnedNote: "Nota fixada"
 pinned: "Fixar no perfil"
 you: "Você"
@@ -121,9 +125,16 @@ sensitive: "Conteúdo sensível"
 add: "Adicionar"
 reaction: "Reações"
 reactions: "Reações"
+emojiPicker: "Seleção de emoji"
+pinnedEmojisForReactionSettingDescription: "Selecionar os emojis que serão fixados e exibidos ao reagir."
+pinnedEmojisSettingDescription: "Selecionar os emojis que serão fixos e exibidos na seleção de emoji."
+emojiPickerDisplay: "Janela de seleção de emoji"
+overwriteFromPinnedEmojisForReaction: "Sobrescrever as opções de reação"
+overwriteFromPinnedEmojis: "Sobrescrever as opções gerais"
 reactionSettingDescription2: "Arraste para reordenar, clique para excluir, pressione + para adicionar."
 rememberNoteVisibility: "Lembrar das configurações de visibilidade de notas"
 attachCancel: "Remover anexo"
+deleteFile: "Excluir arquivo"
 markAsSensitive: "Marcar como sensível"
 unmarkAsSensitive: "Desmarcar como sensível"
 enterFileName: "Digite o nome do arquivo"
@@ -144,6 +155,7 @@ editList: "Editar lista"
 selectChannel: "Selecionar canal"
 selectAntenna: "Selecione uma antena"
 editAntenna: "Editar antena"
+createAntenna: "Criar  uma antena"
 selectWidget: "Selecione um widget"
 editWidgets: "Editar widgets"
 editWidgetsExit: "Pronto"
@@ -170,16 +182,21 @@ addAccount: "Adicionar Conta"
 reloadAccountsList: "Recarregar lista de contas"
 loginFailed: "Falha ao logar"
 showOnRemote: "Exibir remotamente"
+continueOnRemote: ""
+chooseServerOnMisskeyHub: "Escolher um servidor da Misskey Hub"
+specifyServerHost: "Especificar uma instância diretamente"
+inputHostName: "Insira o domínio"
 general: "Geral"
 wallpaper: "Papel de parede"
 setWallpaper: "Definir papel de parede"
 removeWallpaper: "Remover papel de parede"
 searchWith: "Buscar: {q}"
 youHaveNoLists: "Não tem nenhuma lista"
-followConfirm: "Tem certeza que quer deixar de seguir {name}?"
+followConfirm: "Tem certeza que quer seguir {name}?"
 proxyAccount: "Conta proxy"
 proxyAccountDescription: "Uma conta de proxy é uma conta que assume o acompanhamento remoto de um usuário sob certas condições específicas. Por exemplo, quando um usuário inclui um usuário remoto em uma lista, mas ninguém na lista está seguindo o usuário remoto, a atividade não é entregue ao servidor. Nesse caso, a conta de proxy entra em ação para seguir o usuário remoto em vez disso."
 host: "Host"
+selectSelf: "Escolher manualmente"
 selectUser: "Selecionar usuário"
 recipient: "Destinatário"
 annotation: "Anotação"
@@ -194,6 +211,8 @@ perHour: "Por Hora"
 perDay: "Por dia"
 stopActivityDelivery: "Parar a entrega de atividades"
 blockThisInstance: "Bloquear esta instância"
+silenceThisInstance: "Silenciar essa instância"
+mediaSilenceThisInstance: "Silenciar a mídia dessa instância"
 operations: "Operações"
 software: "Software"
 version: "Versão"
@@ -213,6 +232,10 @@ clearCachedFiles: "Limpar o cache"
 clearCachedFilesConfirm: "Deseja excluir todos os arquivos remotos em cache?"
 blockedInstances: "Instância bloqueada"
 blockedInstancesDescription: "Configure os hosts dos servidores que deseja bloquear, separando-os por quebras de linha. Os servidores bloqueados não poderão interagir com este servidor, incluindo os subdomínios."
+silencedInstances: "Instâncias silenciadas"
+silencedInstancesDescription: "Liste o nome de hospedagem dos servidores que você deseja silenciar, separados por linha. Todas as contas desses servidores serão silenciada e poderão enviar solicitações para seguir, mas não poderão mencionar usuários locais sem segui-los. Isso não afetará servidores bloqueados."
+mediaSilencedInstances: "Instâncias com mídia silenciadas"
+mediaSilencedInstancesDescription: "Liste o nome de hospedagem dos servidores cuja mídia você deseja silenciar, separados por linha. Todas as contas desses servidores serão consideradas sensíveis e não poderão utilizar emojis personalizados. Isso não afetará servidores bloqueados."
 muteAndBlock: "Silenciar e bloquear"
 mutedUsers: "Usuários silenciados"
 blockedUsers: "Usuários bloqueados"
@@ -257,6 +280,7 @@ removed: "Removido"
 removeAreYouSure: "Deseja excluir \"{x}\"?"
 deleteAreYouSure: "Deseja excluir \"{x}\"?"
 resetAreYouSure: "Deseja reiniciar?"
+areYouSure: "Tem certeza?"
 saved: "Salvo"
 messaging: "Chat"
 upload: "Fazer upload"
@@ -302,11 +326,13 @@ selectFile: "Selecione os arquivos"
 selectFiles: "Selecione os arquivos"
 selectFolder: "Selecionar uma pasta"
 selectFolders: "Selecionar uma pasta"
+fileNotSelected: "Nenhuma pasta selecionada"
 renameFile: "Renomear ficheiro"
 folderName: "Nome da pasta"
 createFolder: "Criar pasta"
 renameFolder: "Renomear Pasta"
 deleteFolder: "Excluir pasta"
+folder: "Pasta"
 addFile: "Adicionar arquivo"
 emptyDrive: "O drive está vazio"
 emptyFolder: "A pasta está vazia"
@@ -368,8 +394,11 @@ hcaptcha: "hCaptcha"
 enableHcaptcha: "Ativar hCaptcha"
 hcaptchaSiteKey: "Chave do sítio ‘web’"
 hcaptchaSecretKey: "Chave secreta"
+mcaptcha: "mCaptcha"
+enableMcaptcha: "Habilitar mCaptcha"
 mcaptchaSiteKey: "Chave do sítio ‘web’"
 mcaptchaSecretKey: "Chave secreta"
+mcaptchaInstanceUrl: "URL do servidor mCaptcha"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "Habilitar reCAPTCHA"
 recaptchaSiteKey: "Chave do sítio ‘web’"
@@ -385,6 +414,7 @@ name: "Nome"
 antennaSource: "Origem de entrada"
 antennaKeywords: "Palavras-chave recebidas"
 antennaExcludeKeywords: "Palavras-chave negativas"
+antennaExcludeBots: "Ignorar contas de bot"
 antennaKeywordsDescription: "Se você separá-lo com um espaço, será uma especificação AND, e se você separá-lo com uma quebra de linha, será uma especificação OR."
 notifyAntenna: "Notificar novas notas"
 withFileAntenna: "Apenas notas com arquivos anexados"
@@ -417,6 +447,9 @@ totp: "Aplicativo Autenticador"
 totpDescription: "Digite a senha de uso único informado pelo aplicativo autenticador"
 moderator: "Moderador"
 moderation: "Moderação"
+moderationNote: "Nota de moderação"
+addModerationNote: "Adicionar nota de moderação"
+moderationLogs: "Logs de moderação"
 nUsersMentioned: "Postado por {n} pessoas"
 securityKeyAndPasskey: "Chave de segurança / Chave de acesso"
 securityKey: "Chave de segurança"
@@ -449,10 +482,12 @@ retype: "Digite novamente"
 noteOf: "Publicação de {user}"
 quoteAttached: "Com citação"
 quoteQuestion: "Anexar como citação?"
+attachAsFileQuestion: "O texto na área de transferência é muito longo. Você gostaria de anexá-lo como um arquivo de texto?"
 noMessagesYet: "Sem conversas até o momento"
 newMessageExists: "Há uma nova mensagem"
 onlyOneFileCanBeAttached: "Apenas um arquivo pode ser anexado a uma mensagem"
 signinRequired: "É necessário se inscrever ou fazer login antes de continuar"
+signinOrContinueOnRemote: "Para continuar, você precisa mover o seu servidor ou entrar/cadastrar-se nesse servidor."
 invitations: "Convidar"
 invitationCode: "Código de convite"
 checking: "Verificando..."
@@ -476,6 +511,7 @@ emojiStyle: "Estilo de emojis"
 native: "Nativo"
 disableDrawer: "Não mostrar o menu em formato de gaveta"
 showNoteActionsOnlyHover: "Exibir as ações da nota somente ao passar o cursor sobre ela"
+showReactionsCount: "Ver o número de reações nas notas"
 noHistory: "Ainda não há histórico"
 signinHistory: "Histórico de acesso"
 enableAdvancedMfm: "Habilitar MFM avançado"
@@ -524,10 +560,11 @@ objectStorageUseProxy: "Usar proxy"
 objectStorageUseProxyDesc: "Se você não usa proxy para conexão de API, desative-o."
 objectStorageSetPublicRead: "Definir 'public-read' ao fazer o upload"
 s3ForcePathStyleDesc: "Ao habilitar s3ForcePathStyle, o nome do bucket é especificado como parte do caminho em vez de ser o nome do host na URL. Isso pode ser necessário ao usar serviços auto-hospedados como o Minio."
-serverLogs: "Registro do servidor"
+serverLogs: "Logs do servidor"
 deleteAll: "Excluir tudo"
 showFixedPostForm: "Exibir o formulário de postagem na parte superior da linha do tempo"
 showFixedPostFormInChannel: "Exibir o campo de postagem na parte superior da linha do tempo (canais)"
+withRepliesByDefaultForNewlyFollowed: "Incluir respostas por usuários recém-seguidos na linha do tempo por padrão"
 newNoteRecived: "Nova nota recebida"
 sounds: "Sons"
 sound: "Sons"
@@ -537,6 +574,8 @@ showInPage: "Ver na página"
 popout: "Sair"
 volume: "Volume"
 masterVolume: "volume principal"
+notUseSound: "Desabilitar som"
+useSoundOnlyWhenActive: "Apenas reproduzir sons quando Misskey estiver aberto."
 details: "Detalhes"
 chooseEmoji: "Selecione um emoji"
 unableToProcess: "Não é possível concluir a operação"
@@ -557,6 +596,10 @@ output: "Resultado"
 script: "Script"
 disablePagesScript: "Desabilitar scripts nas páginas"
 updateRemoteUser: "Atualizar informações do usuário remoto"
+unsetUserAvatar: "Remover avatar"
+unsetUserAvatarConfirm: "Você tem certeza de que deseja remover o avatar?"
+unsetUserBanner: "Remover banner"
+unsetUserBannerConfirm: "Você tem certeza de que deseja remover o banner?"
 deleteAllFiles: "Excluir todos os arquivos"
 deleteAllFilesConfirm: "Deseja excluir todos os arquivos?"
 removeAllFollowing: "Deseja remover todos os seguidores?"
@@ -607,6 +650,7 @@ medium: "Médio"
 small: "Pequeno"
 generateAccessToken: "Gerar token de acesso"
 permission: "Permissões"
+adminPermission: "Permissões de administrador"
 enableAll: "Habilitar tudo"
 disableAll: "Desabilitar tudo"
 tokenRequested: "Autorização de acesso à conta"
@@ -628,6 +672,7 @@ smtpSecure: "Use SSL/TLS implícito para conexões SMTP"
 smtpSecureInfo: "Desative esta opção ao utilizar STARTTLS."
 testEmail: "Testar envio de e-mail"
 wordMute: "Silenciar palavras"
+hardWordMute: "SIlenciamento pesado de palavra"
 regexpError: "Erro na expressão regular"
 regexpErrorDescription: "Ocorreu um erro na expressão regular na linha {line} da palavra mutada {tab}:"
 instanceMute: "Instâncias silenciadas"
@@ -649,6 +694,7 @@ useGlobalSettingDesc: "Ao ativar, serão utilizadas as configurações de notifi
 other: "Outros"
 regenerateLoginToken: "Gerar novo token de login"
 regenerateLoginTokenDescription: "Gera novamente o token interno usado para o login. Normalmente, isso não é necessário. Ao regenerar, você será desconectado de todos os dispositivos."
+theKeywordWhenSearchingForCustomEmoji: "Essa é a palavra-chave ao pesquisar por emojis personalizados"
 setMultipleBySeparatingWithSpace: "Você pode configurar vários itens separando-os por espaço."
 fileIdOrUrl: "ID do arquivo ou URL"
 behavior: "Comportamento"
@@ -708,6 +754,7 @@ lockedAccountInfo: "Mesmo que você defina a aprovação para seguir, a menos qu
 alwaysMarkSensitive: "Marcar como sensível por padrão"
 loadRawImages: "Exibir as imagens originais ao invés de miniaturas"
 disableShowingAnimatedImages: "Não reproduzir imagens animadas"
+highlightSensitiveMedia: "Destacar mídia sensível"
 verificationEmailSent: "Um e-mail de confirmação foi enviado. Siga o link no e-mail para concluir a verificação."
 notSet: "Não definido"
 emailVerified: "O endereço de e-mail foi confirmado"
@@ -721,7 +768,7 @@ experimentalFeatures: "Funcionalidades Experimentais"
 experimental: "Experimental"
 thisIsExperimentalFeature: "Este é um recurso experimental. As funções podem mudar ou pode não funcionar corretamente."
 developer: "Programador"
-makeExplorable: "Deixe a sua conta mais fácil de encontrar."
+makeExplorable: "Deixe a sua conta encontrável em \"Explorar\"."
 makeExplorableDescription: "Se você desativá-lo, outros usuários não poderão encontrar a sua conta na aba Descoberta."
 showGapBetweenNotesInTimeline: "Mostrar um espaço entre as notas na linha de tempo"
 duplicate: "Duplicar"
@@ -801,6 +848,7 @@ administration: "Administrar"
 accounts: "Contas"
 switch: "Trocar"
 noMaintainerInformationWarning: "A informação de administrador não foi configurada."
+noInquiryUrlWarning: "URL de consulta não está definida"
 noBotProtectionWarning: "A proteção contra bots não foi configurada."
 configure: "Configurar"
 postToGallery: "Criar publicação em galeria"
@@ -860,6 +908,8 @@ makeReactionsPublicDescription: "Isto vai deixar o histórico de todas as suas r
 classic: "Clássico"
 muteThread: "Silenciar esta conversa"
 unmuteThread: "Desativar silêncio desta conversa"
+followingVisibility: "Visibilidade dos usuários seguidos"
+followersVisibility: "Visibilidade dos seguidores"
 continueThread: "Ver mais desta conversa"
 deleteAccountConfirm: "Deseja realmente excluir a conta?"
 incorrectPassword: "Senha inválida."
@@ -925,21 +975,33 @@ fast: "Rápido"
 sensitiveMediaDetection: "Detecção de conteúdo sensível"
 localOnly: "Apenas local"
 remoteOnly: "Apenas remoto"
+failedToUpload: "Falha ao enviar"
+cannotUploadBecauseInappropriate: "Esse arquivo não pôde ser enviado porque partes dele foram detectadas como potencialmente inapropriadas."
+cannotUploadBecauseNoFreeSpace: "Envio falhou devido à falta de capacidade no Drive."
 cannotUploadBecauseExceedsFileSizeLimit: "Não é possível realizar o upload deste arquivo porque ele excede o tamanho máximo permitido."
 beta: "Beta"
 enableAutoSensitive: "Marcar automaticamente como conteúdo sensível"
 enableAutoSensitiveDescription: "Quando disponível, a marcação de mídia sensível será automaticamente atribuído ao conteúdo de mídia usando aprendizado de máquina. Mesmo que você desative essa função, em alguns servidores, isso pode ser configurado automaticamente."
 activeEmailValidationDescription: "A validação do endereço de e-mail do usuário será realizada de forma mais rigorosa, considerando se é um endereço descartável ou se é possível realizar comunicação efetiva. Se desativado, apenas a validade do formato do endereço será verificada como uma sequência de caracteres."
+navbar: "Barra de navegação"
 shuffle: "Aleatório"
 account: "Contas"
 move: "Mover"
 pushNotification: "Notificações Push"
 subscribePushNotification: "Ativar notificações push"
 unsubscribePushNotification: "Desativar notificações push"
+pushNotificationAlreadySubscribed: "Notificações push já estão habilitadas"
+pushNotificationNotSupported: "Seu navegador ou instância não tem suporte às notificações push"
+sendPushNotificationReadMessage: "Apagar notificações push quando elas foram lidas"
+sendPushNotificationReadMessageCaption: "Pode aumentar o consumo de energia do dispositivo."
+windowMaximize: "Maximizar"
 windowMinimize: "Minimizar"
 windowRestore: "Restaurar"
 caption: "legenda"
+loggedInAsBot: "Atualmente conectado como bot"
 tools: "Ferramentas"
+cannotLoad: "Não foi possível carregar"
+numberOfProfileView: "Visualizações do perfil"
 like: "Curtir"
 unlike: "Remover curtida"
 numberOfLikes: "Número de curtidas"
@@ -948,6 +1010,7 @@ neverShow: "Não exibir novamente"
 remindMeLater: "Lembrar mais tarde"
 didYouLikeMisskey: "Você gostou do Misskey?"
 pleaseDonate: "O Misskey é um software gratuito utilizado por {host}. Para que possamos continuar o desenvolvimento, pedimos que considerem fazer doações. A sua contribuição é muito importante!"
+correspondingSourceIsAvailable: "O código-fonte correspondente está disponível em {anchor}"
 roles: "Cargos"
 role: "Cargo"
 noRole: "Nenhum cargo"
@@ -957,6 +1020,7 @@ assign: "Atribuir"
 unassign: "Remover"
 color: "Cor"
 manageCustomEmojis: "Gerenciar Emojis customizados"
+manageAvatarDecorations: "Gerenciar decorações de avatar"
 youCannotCreateAnymore: "Você atingiu o limite de criação."
 cannotPerformTemporary: "Ação temporariamente indisponível"
 cannotPerformTemporaryDescription: "Esta ação não pôde ser concluída devido ao excesso de pedidos em sucessão. Tente novamente em alguns momentos."
@@ -974,218 +1038,634 @@ thisPostMayBeAnnoyingHome: "Postar na linha do tempo inicial"
 thisPostMayBeAnnoyingCancel: "Cancelar"
 thisPostMayBeAnnoyingIgnore: "Postar mesmo assim"
 collapseRenotes: "Ocultar repostagens já visualizadas"
+collapseRenotesDescription: "Colapsar notas em que você reagiu ou repostou."
 internalServerError: "Erro interno de servidor"
+internalServerErrorDescription: "Houve um erro inesperado no servidor."
+copyErrorInfo: "Copiar detalhes de erro"
+joinThisServer: "Cadastrar-se na instância"
+exploreOtherServers: "Buscar outra instância"
+letsLookAtTimeline: "Dar uma olhada na linha do tempo"
+disableFederationConfirm: "Realmente desabilitar a federação?"
+disableFederationConfirmWarn: "Mesmo se defederado, publicações continuarão sendo públicas, a menos que seja definido o contrário. Você geralmente não precisa disso."
+disableFederationOk: "Desabilitar"
+invitationRequiredToRegister: "Essa instância é apenas para convidados. Você precisa inserir um código válido para se cadastrar."
 emailNotSupported: "O envio de e-mails não é suportado nesta instância"
+postToTheChannel: "Publicar ao canal"
+cannotBeChangedLater: "Isso não pode ser alterado."
+reactionAcceptance: "Aceitação de Reações"
 likeOnly: "Apenas curtidas"
 likeOnlyForRemote: "Tudo (somente curtidas remotas)"
+nonSensitiveOnly: "Apenas não-sensível"
 nonSensitiveOnlyForLocalLikeOnlyForRemote: "Apenas não sensíveis (somente curtidas remotas)"
 rolesAssignedToMe: "Cargos atribuídos a mim"
+resetPasswordConfirm: "Deseja realmente mudar a sua senha?"
+sensitiveWords: "Palavras sensíveis"
+sensitiveWordsDescription: "A visibilidade de todas as notas contendo as palavras configuradas será colocadas como \"Início\" automaticamente. Você pode listar várias delas separando-as por linha."
+sensitiveWordsDescription2: "Utilizar espaços irá criar expressões aditivas (AND) e cercar palavras-chave com barras irá transformá-las em expressões regulares (RegEx)"
+prohibitedWords: "Palavras proibídas"
+prohibitedWordsDescription: "Habilita um erro ao tentar publicar uma nota contendo as palavras escolhidas. Várias palavras podem ser escolhidas, separando-as por linha."
+prohibitedWordsDescription2: "Utilizar espaços irá criar expressões aditivas (AND) e cercar palavras-chave com barras irá transformá-las em expressões regulares (RegEx)"
+hiddenTags: "Hashtags escondidas"
+hiddenTagsDescription: "Selecione tags que não serão exibidas na lista de destaques. Várias tags podem ser escolhidas, separadas por linha."
+notesSearchNotAvailable: "A pesquisa de notas está indisponível."
+license: "Licença"
 unfavoriteConfirm: "Deseja realmente remover dos favoritos?"
+myClips: "Meus clipes"
 drivecleaner: "Limpeza do drive"
+retryAllQueuesNow: "Tentar novamente todas as pendências"
 retryAllQueuesConfirmTitle: "Gostaria de tentar novamente agora?"
+retryAllQueuesConfirmText: "Isso irá temporariamente aumentar a carga do servidor."
+enableChartsForRemoteUser: "Gerar gráficos estatísticos de usuários remotos"
+enableChartsForFederatedInstances: "Gerar gráficos estatísticos de instâncias remotas"
+showClipButtonInNoteFooter: "Adicionar \"Clip\" ao menu de ação de notas"
 reactionsDisplaySize: "Tamanho de exibição das reações"
+limitWidthOfReaction: "Limita o comprimento máximo de reações e as exibe em tamanho reduzido"
+noteIdOrUrl: "ID ou URL de nota"
+video: "Vídeo"
+videos: "Vídeos"
+audio: "Áudio"
+audioFiles: "Áudio"
+dataSaver: "Economia de Dados"
+accountMigration: "Migração da Conta"
+accountMoved: "Esse usuário moveu-se para uma nova conta:"
+accountMovedShort: "Essa conta foi migrada."
+operationForbidden: "Operação proibída"
+forceShowAds: "Sempre mostrar propagandas"
+addMemo: "Adicionar memorando"
+editMemo: "Editar memorando"
 reactionsList: "Reações"
 renotesList: "Repostagens"
+notificationDisplay: "Notificações"
 leftTop: "Superior esquerdo"
 rightTop: "Superior direito"
 leftBottom: "Inferior esquerdo"
 rightBottom: "Inferior direito"
+stackAxis: "Eixo de empilhamento"
 vertical: "Vertical"
 horizontal: "Exibir painel lateral inteiro"
 position: "Posição"
 serverRules: "Regras do servidor"
+pleaseConfirmBelowBeforeSignup: "Para cadastrar-se no servidor, você precisa ler e concordar como seguinte:"
+pleaseAgreeAllToContinue: "Você precisa concordar com todos os campos acima para continuar."
 continue: "Continuar"
+preservedUsernames: "Nomes de usuário reservados"
 preservedUsernamesDescription: "Liste os nomes de usuário que deseja reservar, separando-os por quebras de linha. Os nomes de usuário especificados aqui não poderão ser utilizados durante a criação de contas. No entanto, esta restrição não se aplica quando a conta é criada por um administrador. Além disso, as contas que já existem não serão afetadas."
+createNoteFromTheFile: "Compor nota a partir desse arquivo"
 archive: "Arquivo"
+archived: "Arquivado"
+unarchive: "Desarquivar"
 channelArchiveConfirmTitle: "Deseja realmente arquivar {name}?"
+channelArchiveConfirmDescription: "Um canal arquivado não irá aparecer na lista de canais e nem resultados de pesquisa. Novas publicações não poderão mais ser adicionadas."
+thisChannelArchived: "Esse canal foi arquivado."
+displayOfNote: "Exibição de nota"
+initialAccountSetting: "Configuração inicial do perfil"
 youFollowing: "Seguindo"
+preventAiLearning: "Rejeitar uso de Aprendizado de Máquina (IA Generativa)"
 preventAiLearningDescription: "Solicita-se que o conteúdo de notas e imagens enviadas não seja usado como objeto de aprendizado por sistemas externos de geração de texto ou imagens. Isso é alcançado incluindo a flag 'noai' na resposta HTML. No entanto, o cumprimento dessa solicitação depende do próprio sistema de IA, portanto, não é garantia total de prevenção de aprendizado."
 options: "Opções"
+specifyUser: "Usuário específico"
+lookupConfirm: "Deseja buscar?"
+openTagPageConfirm: "Deseja abrir a uma página de hashtag?"
+specifyHost: "Especificar um hospedeiro"
+failedToPreviewUrl: "Não foi possível carregar prévia"
+update: "Atualizar"
 rolesThatCanBeUsedThisEmojiAsReaction: "Cargos que podem utilizar este emoji como reação"
 rolesThatCanBeUsedThisEmojiAsReactionEmptyDescription: "Se nenhum cargo for especificado, qualquer pessoa pode usar este emoji como reação."
 rolesThatCanBeUsedThisEmojiAsReactionPublicRoleWarn: "Estes cargos devem ser públicos."
+cancelReactionConfirm: "Realmente excluir a sua reação?"
+changeReactionConfirm: "Realmente mudar a sua reação?"
+later: "Talvez mais tarde"
+goToMisskey: "Ao Misskey"
+additionalEmojiDictionary: "Dicionários adicionais de emoji"
+installed: "Instalado"
+branding: "Marca"
+enableServerMachineStats: "Publicar estatísticas do hardware do servidor"
+enableIdenticonGeneration: "Habilitar geração de identicon de usuário"
+turnOffToImprovePerformance: "Desligar isso pode melhorar o desempenho."
+createInviteCode: "Gerar convite"
+createWithOptions: "Criar com opções"
+createCount: "Número de convites"
+inviteCodeCreated: "Convite gerado"
+inviteLimitExceeded: "Você excedeu o limite de convites que podem ser gerados."
+createLimitRemaining: "Limite de convites: {limit}"
+inviteLimitResetCycle: "Esse limite irá tornar-se {limit} em {time}."
+expirationDate: "Data de expiração"
+noExpirationDate: "Sem expiração"
+inviteCodeUsedAt: "Código de convite usado em"
+registeredUserUsingInviteCode: "Convite usado por"
 waitingForMailAuth: "Verificação de e-mail pendente "
+inviteCodeCreator: "Convite criado por"
+usedAt: "Usado em"
+unused: "Não foi usado"
+used: "Usado"
+expired: "Expirado"
+doYouAgree: "Concorda?"
+beSureToReadThisAsItIsImportant: "Por favor, leia essa informação importante."
+iHaveReadXCarefullyAndAgree: "Eu li o texto \"{x}\" e concordo."
+dialog: "Diálogo"
 icon: "Avatar"
+forYou: "Para você"
+currentAnnouncements: "Anúncios atuais"
+pastAnnouncements: "Anúncios passados"
+youHaveUnreadAnnouncements: "Há anúncios não lidos."
+useSecurityKey: "Por favor, siga as instruções do seu navegador ou dispositivo para utilizar uma chave de acesso."
 replies: "Responder"
 renotes: "Repostar"
+loadReplies: "Mostrar respostas"
+loadConversation: "Mostrar conversa"
+pinnedList: "Lista fixada"
 keepScreenOn: "Manter a tela do dispositivo sempre ligada"
+verifiedLink: "A autoria do link foi verificada"
+notifyNotes: "Notificar sobre novas notas"
+unnotifyNotes: "Deixar de notificar sobre novas notas"
+authentication: "Autenticação"
+authenticationRequiredToContinue: "Por favor, autentique-se para continuar"
+dateAndTime: "Data e Hora"
+showRenotes: "Exibir reposts"
+edited: "Editado"
+notificationRecieveConfig: "Configurações de Notificação"
+mutualFollow: "Seguidor mútuo"
+followingOrFollower: "Seguidor ou usuário seguido"
+fileAttachedOnly: "Apenas notas com arquivos"
+showRepliesToOthersInTimeline: "Mostrar respostas aos outros na linha do tempo"
+hideRepliesToOthersInTimeline: "Esconder respostas dos outros na linha do tempo"
+showRepliesToOthersInTimelineAll: "Mostrar respostas aos outros,  mas apenas de quem você segue, na linha do tempo"
+hideRepliesToOthersInTimelineAll: "Esconder respostas de todos que você segue na linha do tempo"
+confirmShowRepliesAll: "Essa operação é irreversível. Você gostaria de mostrar respostas a todos que você segue na sua linha do tempo?"
+confirmHideRepliesAll: "Essa operação é irreversível. Você gostaria de esconder respostas a todos que você segue na sua linha do tempo?"
+externalServices: "Serviços Externos"
+sourceCode: "Código-fonte"
+sourceCodeIsNotYetProvided: "Código-fonte está indisponível. Contate o administrador para resolver esse problema."
+repositoryUrl: "URL do repositório"
+repositoryUrlDescription: "Se você estiver utilizando Misskey como está (sem mudanças no código-fonte), insira https://github.com/misskey-dev/misskey"
+repositoryUrlOrTarballRequired: "Se você não publicou um repositório, você precisa providenciar uma tarball em seu lugar. Veja .config/example.yml para mais informações."
+feedback: "Feedback"
+feedbackUrl: "Link para Feedback"
+impressum: "Impressum"
+impressumUrl: "URL de 'Impressum'"
+impressumDescription: "Em alguns países, como a Alemanha, a inclusão de informação de contato do operador de um serviço é legalmente exigida para websites comerciais."
+privacyPolicy: "Política de Privacidade"
+privacyPolicyUrl: "URL da Política de Privacidade"
+tosAndPrivacyPolicy: "Termos de Serviço e Política de Privacidade"
+avatarDecorations: "Decorações de avatar"
+attach: "Anexar"
+detach: "Remover"
+detachAll: "Remover Tudo"
+angle: "Ângulo"
 flip: "Inversão"
+showAvatarDecorations: "Exibir decorações de avatar"
+releaseToRefresh: "Solte para atualizar"
+refreshing: "Atualizando..."
+pullDownToRefresh: "Puxe para baixo para atualizar"
+disableStreamingTimeline: "Desabilitar atualizações em tempo real da linha do tempo"
+useGroupedNotifications: "Agrupar notificações"
+signupPendingError: "Houve um problema ao verificar o endereço de email. O link pode ter expirado."
+cwNotationRequired: "Se \"Esconder conteúdo\" está habilitado, uma descrição deve ser adicionada."
+doReaction: "Adicionar reação"
+code: "Código"
+reloadRequiredToApplySettings: "É necessário reiniciar para aplicar as configurações."
+remainingN: "Restante: {n}"
+overwriteContentConfirm: "Você tem certeza de que deseja sobrescrever o conteúdo atual?"
+seasonalScreenEffect: "Efeito de Tela Sazonal"
+decorate: "Decorar"
+addMfmFunction: "Adicionar MFM"
+enableQuickAddMfmFunction: "Exibir seleção avançada de MFM"
+bubbleGame: "Bubble Game"
+sfx: "Efeitos Sonoros"
+soundWillBePlayed: "Sons serão reproduzidos"
+showReplay: "Ver Replay"
+replay: "Replay"
+replaying: "Mostrando Replay"
+endReplay: "Sair do Replay"
+copyReplayData: "Copiar dados de Replay"
+ranking: "Ranking"
 lastNDays: "Últimos {n} dias"
+backToTitle: "Voltar à página inicial"
+hemisphere: "Onde você se localiza"
+withSensitive: "Incluir notas com arquivos sensíveis"
+userSaysSomethingSensitive: "Publicação de {name} contém conteúdo sensível"
+enableHorizontalSwipe: "Arraste para mudar de aba"
+loading: "Carregando"
 surrender: "Cancelar"
+gameRetry: "Tentar Novamente"
+notUsePleaseLeaveBlank: "Deixe em branco caso inutilizado"
+useTotp: "Digite a senha de uso único"
+useBackupCode: "Usar códigos de “backup”"
+launchApp: "Iniciar aplicação"
+useNativeUIForVideoAudioPlayer: "Utilizar UI do navegador ao reproduzir vídeo e áudio"
+keepOriginalFilename: "Manter nome original do arquivo"
+keepOriginalFilenameDescription: "Se você desabilitar essa opção, os nomes de arquivos serão substituídos por uma sequência aleatória ao enviar arquivos."
+noDescription: "Não há descrição"
+alwaysConfirmFollow: "Sempre confirmar ao seguir"
+inquiry: "Contato"
+tryAgain: "Por favor, tente novamente mais tarde"
+confirmWhenRevealingSensitiveMedia: "Confirmar ao revelar mídia sensível"
+sensitiveMediaRevealConfirm: "Essa mídia pode ser sensível. Deseja revelá-la?"
+createdLists: "Listas criadas"
+createdAntennas: "Antenas criadas"
 _delivery:
+  status: "Estado de entrega"
   stop: "Suspenso"
+  resume: "Continuar entrega"
   _type:
     none: "Publicando"
+    manuallySuspended: "Suspenso manualmente"
+    goneSuspended: "Servidor foi suspenso devido ao seu apagamento"
+    autoSuspendedForNotResponding: "Servidor foi suspenso por não responder"
+_bubbleGame:
+  howToPlay: "Como jogar"
+  hold: "Próximos"
+  _score:
+    score: "Pontuação"
+    scoreYen: "Dinheiro recebido"
+    highScore: "Melhor pontuação"
+    maxChain: "Número máximo de encadeamentos"
+    yen: "{yen} Yen"
+    estimatedQty: "{qty} Peças"
+    scoreSweets: "{onigiriQtyWithUnit} Onigiri"
+  _howToPlay:
+    section1: "Ajuste a posição e solte o objeto na caixa."
+    section2: "Quando dois objetos do mesmo tipo tocam-se, eles tornam-se outro objeto e você ganha pontos."
+    section3: "O jogo acaba quando objetos transbordam da caixa. Busque uma pontuação alta ao fundir objetos enquanto evita transbordar a caixa."
+_announcement:
+  forExistingUsers: "Apenas aos usuários existente"
+  forExistingUsersDescription: "Se habilitado, esse anúncio será exibido apenas para usuários existentes no tempo de publicação. Se desabilitado, novos usuários também o receberão. "
+  needConfirmationToRead: "Exigir confirmação de leitura"
+  needConfirmationToReadDescription: "Um lembrete adicional será exibido para confirmar a leitura do anúncio. Esse anúncio também será excluído de qualquer forma de \"Marcar tudo como lido\"."
+  end: "Arquivar anúncio"
+  tooManyActiveAnnouncementDescription: "O excesso de anúncios pode atrapalhar a experiência do usuário. Considere arquivar anúncios obsoletos."
+  readConfirmTitle: "Marcar como lido?"
+  readConfirmText: "Isso marcará o conteúdo de \"{title}\" como lido."
+  shouldNotBeUsedToPresentPermanentInfo: "É preferível utilizar anúncios para publicar informações atuais e de curto prazo, e não informações que serão relevantes por muito tempo."
+  dialogAnnouncementUxWarn: "O uso de duas ou mais notificações de diálogo simultaneamente pode impactar significativamente a experiência de usuário. Portanto, utilize-as cuidadosamente."
+  silence: "Sem notificação"
+  silenceDescription: "Habilitar isso irá pular a notificação desse anúncio e o usuário não precisará lê-lo."
 _initialAccountSetting:
+  accountCreated: "A sua conta foi criada com sucesso!"
+  letsStartAccountSetup: "Em primeiro lugar, vamos configurar o seu perfil."
+  letsFillYourProfile: "Primeiramente, vamos configurar o seu perfil."
+  profileSetting: "Configurações do perfil"
+  privacySetting: "Configurações de privacidade"
+  theseSettingsCanEditLater: "Você pode alterar estas configurações mais tarde."
+  youCanEditMoreSettingsInSettingsPageLater: "Há mais configurações na página \"Configurações\". Não se esqueça de visitá-la mais tarde."
   followUsers: "Siga usuários que lhe interessam para criar a sua linha do tempo."
+  pushNotificationDescription: "Habilitar notificações push o possibilitará receber notificações de {name} diretamente no seu dispositivo."
+  initialAccountSettingCompleted: "Configuração de perfil completa!"
+  haveFun: "Aproveite {name}!"
+  youCanContinueTutorial: "Você pode iniciar um tutorial de como utilizar {name} (Misskey) ou pode sair da configuração e começar o uso imediatamente."
+  startTutorial: "Iniciar Tutorial"
+  skipAreYouSure: "Deseja pular a configuração de perfil?"
+  laterAreYouSure: "Deseja adiar a configuração de perfil?"
+_initialTutorial:
+  launchTutorial: "Iniciar Tutorial"
+  title: "Tutorial"
+  wellDone: "Ótimo!"
+  skipAreYouSure: "Sair do Tutorial?"
+  _landing:
+    title: "Bem-vindo ao Tutorial!"
+    description: "Aqui, você pode aprender o básico de como usar o Misskey e as suas funções."
+  _note:
+    title: "O que é uma Nota?"
+    description: "Publicações no Misskey chamam-se 'Notas'. Notas são organizadas cronologicamente na linha do tempo e atualizam em tempo real."
+    reply: "Clique nesse botão para responder a uma mensagem. Também é possível responder respostas, continuando a conversa como uma \"thread\"."
+    renote: "Você pode compartilhar essa nota na sua linha do tempo. Você também pode citá-la com os seus comentários."
+    reaction: "Você pode adicionar reações à nota. Mais detalhes serão explicados na próxima página."
+    menu: "Você pode ver detalhes da nota, copiar links e realizar outras ações."
+  _reaction:
+    title: "O que são Reações?"
+    description: "É possível reagir às notas com diversos emojis. Reações permitem que você expresse sutilezas que não são possíveis apenas com uma curtida."
+    letsTryReacting: "Reações podem ser adicionadas clicando no botão \"+\". Tente reagir à nota de exemplo."
+    reactToContinue: "Adicione uma reação para continuar."
+    reactNotification: "Você receberá notificações em tempo real quando alguém reagir à sua nota."
+    reactDone: "Você pode desfazer uma reação ao selecionar o botão \"-\"."
+  _timeline:
+    title: "O Conceito das Linhas do Tempo"
+    description1: "Misskey providencia diversas linhas do tempo baseadas na sua utilidade (algumas podem não estar disponíveis a partir das configurações da instância)."
+    home: "Você pode ver as notas das contas seguidas. "
+    local: "Você pode ver notas de todos os usuários dessa instância."
+    social: "Notas da linha do tempo Início e Local serão exibidas."
+    global: "Você pode ver notas de todos os servidores conectados."
+    description2: "Você pode alterar dentre as linhas do tempo no todo da tela a qualquer momento."
+    description3: "Adicionalmente, há \"listas\" e \"canais\". Para mais informações, acesse {link}."
+  _postNote:
+    title: "Opções de Postagem de Nota"
+    description1: "Ao postar uma nota no Misskey, diversas opções estão disponíveis. A ficha de publicação parece com isto: "
+    _visibility:
+      description: "Você pode limitar quem vê a sua nota."
+      public: "Sua nota será visível a todos os usuários."
+      home: "Publicar apenas na linha do tempo Início. Pessoas visitando seu perfil, seja seguindo ou por um repost poderão vê-los."
+      followers: "Visível apenas para seguidores. Apenas seguidores podem vê-la e mais ninguém, e ela não pode ser repostada pelos demais."
+      direct: "Visível apenas para usuários específicos, e o destinatário será notificado. Pode ser usado como uma alternativa às mensagens diretas."
+      doNotSendConfidencialOnDirect1: "Tenha cuidado ao enviar informações sensíveis!"
+      doNotSendConfidencialOnDirect2: "Administradores do servidor podem ver o que foi escrito. Cuidado, também, ao enviar notas diretas a usuários de servidores não confiáveis."
+      localOnly: "Publicar com essa opção não federará a nota com outros servidores. Usuários desses servidores não poderão ver essas notas diretamente, independente das opções de visibilidade acima. "
+    _cw:
+      title: "Aviso de Conteúdo"
+      description: "Ao invés do corpo do texto, o conteúdo escrito na caixa \"anotação\" será exibido. Apertar \"Carregar mais\" irá revelar o corpo."
+      _exampleNote:
+        cw: "Isso irá te esfomear!"
+        note: "Acabei de comer um donut coberto de chocolate! 🍩😋"
+      useCases: "Isso pode ser usado caso seja exigido, pelas diretrizes do servidor, o cuidado com algum tópico ou ao publicar conteúdo sensível ou spoilers."
+  _howToMakeAttachmentsSensitive:
+    title: "Como Marcar Anexos como Sensíveis?"
+    description: "Para anexos cujo conteúdo é considerado sensível pelas diretrizes do servidor ou quando pretende-se esconder o seu conteúdo, adicione o sinal \"sensível\"."
+    tryThisFile: "Tente marcar a imagem anexada como sensível!"
+    _exampleNote:
+      note: "Opa, me atrapalhei abrindo a tampa do natô..."
+    method: "Para marcar um anexo como sensível, clique na sua miniatura, abra o menu e clique \"Marcar como sensível\"."
+    sensitiveSucceeded: "Ao anexar arquivos, por favor atribua uma sensibilidade coerente com as diretrizes da instância."
+    doItToContinue: "Marque o anexo como sensível para prosseguir."
+  _done:
+    title: "Você completou o tutorial! 🎉"
+    description: "As funções apresentadas aqui são apenas uma pequena parte. Para um conhecimento mais detalhado do uso do Misskey, acesse {link}."
+_timelineDescription:
+  home: "Na linha do tempo Início, você verá notas dos usuários que você segue."
+  local: "Na linha do tempo Local, você verá notas de todos os usuários da instância."
+  social: "Na linha do tempo Social, você verá notas do Início e Local."
+  global: "Na linha do tempo Global, você verá notas de todas as instâncias conectadas."
+_serverRules:
+  description: "Um grupo de regras a ser exibido antes de um cadastro. É recomendado que se faça um resumo dos Termos de Serviço."
 _serverSettings:
   iconUrl: "URL do ícone"
+  appIconDescription: "Especifica o ícone utilizado quando {host} é exibido como um app."
+  appIconUsageExample: "Exemplo: Como PWA, ou quando exibido num marcador de páginas ou na tela inicial de um celular"
+  appIconStyleRecommendation: "Como o ícone pode ser cortado para um quadrado ou círculo, é recomendado adicionar um fundo colorido na imagem."
+  appIconResolutionMustBe: "A resolução mínima é {resolution}."
+  manifestJsonOverride: "Sobrescrever manifest.json"
+  shortName: "Abreviação"
+  shortNameDescription: "Uma abreviação do nome da instância que pode ser exibido caso o nome oficial completo seja muito longo."
+  fanoutTimelineDescription: "Melhora significativamente a performance do retorno da linha do tempo e reduz o impacto no banco de dados quando habilitado. Em contrapartida, o uso de memória do Redis aumentará. Considere desabilitar em casos de baixa disponibilidade de memória ou instabilidade do servidor."
+  fanoutTimelineDbFallback: "\"Fallback\" ao banco de dados"
+  fanoutTimelineDbFallbackDescription: "Quando habilitado, a linha do tempo irá recuar ao banco de dados caso consultas adicionais sejam feitas e ela não estiver em cache. Quando desabilitado, o impacto no servidor será reduzido ao eliminar o recuo, mas limita a quantidade de linhas do tempo que podem ser recebidas."
+  inquiryUrl: "URL de inquérito"
+  inquiryUrlDescription: "Especifique um URL para um formulário de inquérito para a administração ou uma página web com informações de contato."
 _accountMigration:
+  moveFrom: "Migrar outra conta para essa"
+  moveFromSub: "Criar um 'alias' a outra conta"
+  moveFromLabel: "Conta original #{n}"
   moveFromDescription: "Se você deseja migrar de outra conta para esta, é necessário criar um alias aqui. Por favor, insira a conta de origem da migração no seguinte formato: @username@server.example.com. Para excluir o alias, deixe o campo em branco e clique em salvar (não recomendado)."
+  moveTo: "Migrar dessa conta para outra"
+  moveToLabel: "Conta para a qual se mover:"
+  moveCannotBeUndone: "A migração de conta não pode ser desfeita."
   moveAccountDescription: "Você está migrando para uma nova conta.\n　・Seus seguidores irão automaticamente seguir a nova conta.\n　・Todas as suas conexões de seguidores nesta conta serão removidas.\n　・Você não poderá mais criar novas notas nesta conta.\n\nA migração dos seguidores é automática, mas a migração das pessoas que você segue deve ser feita manualmente. Antes de migrar, exporte quem você está seguindo nesta conta e, assim que migrar, importe essa lista na nova conta.\nO mesmo se aplica para listas, silenciamentos e bloqueios, que também devem ser migrados manualmente.\n\n(Esta descrição se refere ao comportamento do servidor Misskey v13.12.0 ou posterior. Outros softwares ActivityPub, como Mastodon, podem ter comportamentos diferentes.)"
   moveAccountHowTo: "Para realizar a migração da conta, primeiro crie um alias para esta conta no destino da migração. Após criar o alias, insira a conta de destino da migração no seguinte formato: @username@server.example.com."
+  startMigration: "Migrar"
   migrationConfirm: "Tem certeza de que deseja migrar esta conta para '{account}'? Uma vez migrada, não poderá ser desfeita e não será possível usar esta conta novamente em seu estado original."
+  movedAndCannotBeUndone: "Essa conta foi migrada. A migração não pode ser desfeita."
   postMigrationNote: "A remoção dos seguidores desta conta será realizada 24 horas após a operação de migração. O número de seguidores e seguidos desta conta se tornará zero. Os seguidores não serão removidos, portanto, eles continuarão a ver as postagens destinadas aos seguidores desta conta."
+  movedTo: "Conta para a qual se mover:"
 _achievements:
   earnedAt: "Data de aquisição"
   _types:
     _notes1:
       title: "Configurando o meu misskey"
-      description: "Postou uma nota pela primeira vez"
+      description: "Post uma nota pela primeira vez"
       flavor: "Divirta-se com o Misskey!"
     _notes10:
       title: "Algumas notas"
-      description: "Postou 10 notas"
+      description: "Poste 10 notas"
     _notes100:
       title: "Um monte de notas"
-      description: "Postou 100 notas"
+      description: "Poste 100 notas"
     _notes500:
       title: "Coberto por notas"
-      description: "Postou 500 notas"
+      description: "Poste 500 notas"
     _notes1000:
       title: "Uma montanha de notas"
-      description: "Postou 1000 notas"
+      description: "Poste 1 000 notas"
     _notes5000:
       title: "Enxurrada de notas"
-      description: "Postou 5000 notas"
+      description: "Poste 5000 notas"
     _notes10000:
-      title: "Super nota"
-      description: "Postou 10000 notas"
+      title: "Supernota"
+      description: "Poste 10 000 notas"
     _notes20000:
       title: "Preciso... de mais... notas..."
-      description: "Postou 20000 notas"
+      description: "Poste 20 000 notas"
     _notes30000:
       title: "Notas, Notas, NOTAS!"
-      description: "Postou 30000 notas"
+      description: "Poste 30 000 notas"
     _notes40000:
       title: "Fábrica de notas"
-      description: "Postou 40000 notas"
+      description: "Poste 40 000 notas"
     _notes50000:
       title: "Planeta de notas"
-      description: "Postou 50000 notas"
+      description: "Poste 50 000 notas"
     _notes60000:
       title: "Quasar de notas"
-      description: "Postou 60000 notas"
+      description: "Poste 60 000 notas"
     _notes70000:
       title: "Buraco negro de notas"
-      description: "Postou 70000 notas"
+      description: "Poste 70 000 notas"
     _notes80000:
       title: "Galáxia de notas"
-      description: "Postou 80000 notas"
+      description: "Poste 80 000 notas"
     _notes90000:
       title: "Universo de notas"
-      description: "Postou 90000 notas"
+      description: "Poste 90 000 notas"
     _notes100000:
       title: "ALL YOUR NOTE ARE BELONG TO US"
-      description: "Postou 100000 notas"
+      description: "Poste 100 000 notas"
       flavor: "Você realmente tem muita coisa para escrever"
     _login3:
       title: "Iniciante I"
-      description: "Fez login por um total de 3 dias"
+      description: "Faça login por um total de 3 dias"
       flavor: "De hoje em diante, me chame apenas de Misskist"
     _login7:
       title: "Iniciante II"
-      description: "Fez login por um total de 7 dias"
+      description: "Faça login por um total de 7 dias"
       flavor: "Pegando o jeito da coisa?"
     _login15:
       title: "Iniciante III"
-      description: "Fez login por um total de 15 dias"
+      description: "Faça login por um total de 15 dias"
     _login30:
       title: "Misskist I"
-      description: "Fez login por um total de 30 dias"
+      description: "Faça login por um total de 30 dias"
     _login60:
       title: "Misskist II"
-      description: "Fez login por um total de 60 dias"
+      description: "Faça login por um total de 60 dias"
     _login100:
       title: "Misskist III"
-      description: "Fez login por um total de 100 dias"
+      description: "Faça login por um total de 100 dias"
       flavor: "Misskist violento"
     _login200:
       title: "Freguês I"
-      description: "Fez login por um total de 200 dias"
+      description: "Faça login por um total de 200 dias"
     _login300:
       title: "Freguês II"
-      description: "Fez login por um total de 300 dias"
+      description: "Faça login por um total de 300 dias"
     _login400:
       title: "Freguês III"
-      description: "Fez login por um total de 400 dias"
+      description: "Faça login por um total de 400 dias"
     _login500:
       title: "Veterano I"
-      description: "Fez login por um total de 500 dias"
+      description: "Faça login por um total de 500 dias"
       flavor: "Cavalheiros, tudo o que peço são notas"
     _login600:
       title: "Veterano II"
-      description: "Fez login por um total de 600 dias"
+      description: "Faça login por um total de 600 dias"
     _login700:
       title: "Veterano III"
-      description: "Fez login por um total de 700 dias"
+      description: "Faça login por um total de 700 dias"
     _login800:
-      title: "Mestre das notas I"
-      description: "Fez login por um total de 800 dias"
+      title: "Mestre das Notas I"
+      description: "Faça login por um total de 800 dias"
     _login900:
-      title: "Mestre das notas II"
-      description: "Fez login por um total de 900 dias"
+      title: "Mestre das Notas II"
+      description: "Faça login por um total de 900 dias"
     _login1000:
-      title: "Mestre das notas III"
-      description: "Fez login por um total de 1000 dias"
+      title: "Mestre das Notas III"
+      description: "Faça login por um total de 1 000 dias"
       flavor: "Obrigado por utilizar o Misskey!"
     _noteClipped1:
-      title: "Não posso deixar de adicionar ao clipe"
-      description: "Adicionou a um clipe a sua primeira nota"
+      title: "Preciso... clipar..."
+      description: "Adicione a um clipe a sua primeira nota"
     _noteFavorited1:
-      title: "Astrônomo amador"
-      description: "Adicionou uma nota aos favoritos pela primeira vez"
+      title: "Astrônomo Amador"
+      description: "Adicione uma nota aos favoritos pela primeira vez"
     _myNoteFavorited1:
       title: "Cabeça nas estrelas"
-      description: "Teve uma das suas notas adicionada aos favoritos de alguém"
+      description: "Tenha uma das suas notas adicionada aos favoritos de alguém"
     _profileFilled:
-      title: "Tudo pronto"
-      description: "Configurou o seu perfil"
+      title: "Tudo Pronto"
+      description: "Configure o seu perfil"
     _markedAsCat:
       title: "Eu Sou Um Gato"
-      description: "Marcou a sua conta como um gato"
+      description: "Marque a sua conta como um gato"
       flavor: "Ainda não tenho um nome."
     _following1:
       title: "Primeira vez seguindo alguém"
-      description: "Seguiu um usuário pela primeira vez"
+      description: "Siga um usuário pela primeira vez"
     _following10:
       title: "Circulando, circulando"
-      description: "Seguiu 10 usuários"
+      description: "Siga 10 usuários"
     _following50:
       title: "Muitos amigos"
-      description: "Seguiu 50 usuários"
+      description: "Siga 50 usuários"
     _following100:
-      title: "100 amigos"
-      description: "Seguiu 100 usuários"
+      title: "100 Amigos"
+      description: "Siga 100 usuários"
     _following300:
       title: "Sobrecarga de amigos"
-      description: "Seguiu 300 usuários"
+      description: "Siga 300 usuários"
     _followers1:
       title: "Primeiro seguidor"
-      description: "Ganhou o seu primeiro seguidor"
+      description: "Ganhe o seu primeiro seguidor"
     _followers10:
       title: "Sigam-me os bons!"
-      description: "Ganhou 10 seguidores"
+      description: "Ganhe 10 seguidores"
     _followers50:
       title: "Aos montes"
-      description: "Ganhou 50 seguidores"
+      description: "Ganhe 50 seguidores"
     _followers100:
       title: "Popular"
-      description: "Ganhou 100 seguidores"
+      description: "Ganhe 100 seguidores"
     _followers300:
       title: "Em fila única, por favor"
-      description: "Ganhou 300 seguidores"
+      description: "Ganhe 300 seguidores"
     _followers500:
       title: "Torre de celular"
-      description: "Ganhou 500 seguidores"
+      description: "Ganhe 500 seguidores"
     _followers1000:
       title: "Influencer"
-      description: "Ganhou 1000 seguidores"
+      description: "Ganhe 1 000 seguidores"
+    _collectAchievements30:
+      title: "Coletor de Conquistas"
+      description: "Ganhe 30 conquistas"
+    _viewAchievements3min:
+      title: "Curte Conquistas"
+      description: "Olhe para a sua lista de conquistas por pelo menos 3 minutos"
+    _iLoveMisskey:
+      title: "Eu Amo Misskey"
+      description: "Poste \"I ❤ #Misskey\""
+      flavor: "A equipe de desenvolvimento do Misskey aprecia profundamente o seu apoio!"
+    _foundTreasure:
+      title: "Caça ao Tesouro"
+      description: "Você achou o tesouro escondido"
+    _client30min:
+      title: "Pausinha"
+      description: "Deixe o Misskey aberto por pelo menos 30 minutos"
+    _client60min:
+      title: "Sem falta"
+      description: "Deixe o Misskey aberto por pelo menos 60 minutos"
     _noteDeletedWithin1min:
       title: "Deixa pra lá"
-      description: "Excluí a postagem dentro de 1 minuto após ter publicado"
+      description: "Exclua a postagem dentro de 1 minuto após a ter publicado"
+    _postedAtLateNight:
+      title: "Noturno"
+      description: "Poste uma nota tarde da noite"
+      flavor: "Tá na hora de ir dormir."
+    _postedAt0min0sec:
+      title: "Relógio Falante"
+      description: "Poste uma nota à meia-noite em ponto"
+      flavor: "Tic-Tac-Tic-Tac"
+    _selfQuote:
+      title: "Autorreferência"
+      description: "Cite sua própria nota"
+    _htl20npm:
+      title: "Linha do Tempo Fluida"
+      description: "Faça a velocidade da linha do tempo exceder 20 npm (notas por minuto)"
+    _viewInstanceChart:
+      title: "Analista"
+      description: "Veja os infográficos da instância"
+    _outputHelloWorldOnScratchpad:
+      title: "Olá, Mundo!"
+      description: "Produza \"hello world\" no Scratchpad"
+    _open3windows:
+      title: "Múlti-Janelas"
+      description: "Tenha ao mínimo 3 janelas abertas simultaneamente."
     _driveFolderCircularReference:
       title: "Referência circular"
+      description: "Tente criar uma pasta recursiva no Drive."
+    _reactWithoutRead:
+      title: "Você leu tudo isso?"
+      description: "Reaja a uma nota com mais de 100 caracteres dentro de 3 segundos após a sua publicação."
+    _clickedClickHere:
+      title: "Clique aqui"
+      description: "Você clicou aqui"
+    _justPlainLucky:
+      title: "Pura Sorte"
+      description: "Tem uma chance de ser obtido com uma probabilidade de 0.005% a cada 10 segundos."
+    _setNameToSyuilo:
+      title: "Complexo de Deus"
+      description: "Colocar seu nome como \"syuilo\""
+    _passedSinceAccountCreated1:
+      title: "Aniversário de Um Ano"
+      description: "Um ano passou-se desde a criação da conta"
+    _passedSinceAccountCreated2:
+      title: "Aniversário de Dois Anos"
+      description: "Dois anos passaram-se desde a criação da conta"
+    _passedSinceAccountCreated3:
+      title: "Aniversário de Três Anos"
+      description: "Três anos passaram-se desde a criação da conta"
+    _loggedInOnBirthday:
+      title: "Feliz Aniversário"
+      description: "Entre no dia do seu aniversário"
+    _loggedInOnNewYearsDay:
+      title: "Feliz Ano Novo!"
+      description: "Entre no primeiro dia do ano"
+      flavor: "Para outro ótimo ano nessa instância"
+    _cookieClicked:
+      title: "Um jogo onde você clica em cookies"
+      description: "Clicou o cookie"
+      flavor: "Pera, você tá no website correto?"
+    _brainDiver:
+      title: "Brain Diver"
+      description: "Poste o link do Brain Diver"
+      flavor: "Misskey-Misskey La-Tu-Ma"
+    _smashTestNotificationButton:
+      title: "Teste de Transbordamento"
+      description: "Ative o teste de notificações repetidamente dentro de um curto período de tempo"
+    _tutorialCompleted:
+      title: "Diploma de Ensino Fundamental Misskey"
+      description: "Complete o tutorial"
+    _bubbleGameExplodingHead:
+      title: "🤯"
+      description: "O maior objeto no Bubble Game"
+    _bubbleGameDoubleExplodingHead:
+      title: "🤯 Duplo"
+      description: "Dois dos maiores objetos do Bubble Game ao mesmo tempo."
+      flavor: "Dá para encher uma lancheira com esses 🤯🤯."
 _role:
   new: "Novo cargo"
   edit: "Editar cargo"
@@ -1196,7 +1676,9 @@ _role:
   assignTarget: "Atribuir"
   descriptionOfAssignTarget: "<b>Manual</b> para gerenciar manualmente quem está incluído neste cargo.\n<b>Condicional</b> define uma condição e os usuários que corresponderem a ela serão incluídos automaticamente."
   manual: "Documentação"
+  manualRoles: "Cargos manuais"
   conditional: "Condicional"
+  conditionalRoles: "Cargos condicionais"
   condition: "Condição"
   isConditionalRole: "Este é um cargo condicional."
   isPublic: "Cargo público"
@@ -1224,13 +1706,16 @@ _role:
     gtlAvailable: "Visualizar Linha do Tempo Global"
     ltlAvailable: "Visualizar Linha do Tempo Local"
     canPublicNote: "Permitir postagem pública"
+    mentionMax: "Número máximo de menções em uma nota"
     canInvite: "Permitir a criação de códigos de convites para a instância"
     inviteLimit: "Limite de códigos de convite"
     inviteLimitCycle: "Intervalo de emissão do código de convite"
     inviteExpirationTime: "Prazo de validade do código de convite"
     canManageCustomEmojis: "Permitir gerenciar emojis personalizados"
+    canManageAvatarDecorations: "Gerenciar decorações de avatar"
     driveCapacity: "Capacidade do drive"
     alwaysMarkNsfw: "Sempre marcar arquivos como NSFW"
+    canUpdateBioMedia: "Permitir a edição de ícone ou imagem do banner."
     pinMax: "Número máximo de notas fixadas"
     antennaMax: "Número máximo de antenas"
     wordMuteMax: "Número máximo de caracteres nas palavras silenciadas"
@@ -1243,9 +1728,17 @@ _role:
     descriptionOfRateLimitFactor: "Valores menores são menos restritivos, valores maiores são mais restritivos."
     canHideAds: "Permitir ocultar anúncios"
     canSearchNotes: "Permitir a busca de notas"
+    canUseTranslator: "Uso do tradutor"
+    avatarDecorationLimit: "Número máximo de decorações de avatar que podem ser aplicadas"
   _condition:
+    roleAssignedTo: "Atribuído a cargos manuais"
     isLocal: "Usuário local"
     isRemote: "Usuário remoto"
+    isCat: "Usuários Gatinho"
+    isBot: "Usuários Bot"
+    isSuspended: "Usuário suspenso"
+    isLocked: "Contas privadas"
+    isExplorable: "Encontrável em \"Explorar\""
     createdLessThan: "Menos de X passados desde a criação da conta"
     createdMoreThan: "Mais de X passados desde a criação da conta"
     followersLessThanOrEq: "Possui X ou menos seguidores"
@@ -1259,13 +1752,19 @@ _role:
     not: "Não ~ (Condicional)"
 _sensitiveMediaDetection:
   description: "Use o aprendizado de máquina para detectar automaticamente mídias sensíveis para moderação. Isso pode aumentar ligeiramente a carga no servidor."
+  sensitivity: "Detecção de sensibilidade"
   sensitivityDescription: "Ao reduzir a sensibilidade, as detecções incorretas (falsos positivos) diminuem. Ao aumentar a sensibilidade, as falhas de detecção (falsos negativos) diminuem."
+  setSensitiveFlagAutomatically: "Marcar como sensível"
+  setSensitiveFlagAutomaticallyDescription: "Os resultados da detecção interna serão mantidos mesmo se essa opção estiver desligada."
+  analyzeVideos: "Habilitar análise de vídeos"
+  analyzeVideosDescription: "Analisa vídeos em adição a imagens. Isso irá aumentar levemente a carga do servidor."
 _emailUnavailable:
   used: "O endereço de e-mail informado já está sendo utilizado"
   format: "Formado de e-mail inválido"
   disposable: "Endereços de e-mail descartáveis não devem ser utilizados"
   mx: "O servidor de informado é inválido"
   smtp: "O servidor de e-mail não está respondendo"
+  banned: "Você não pode se cadastrar com esse endereço de email"
 _ffVisibility:
   public: "Público"
   followers: "Visível apenas para seguidores"
@@ -1285,10 +1784,17 @@ _ad:
   back: "Voltar"
   reduceFrequencyOfThisAd: "Diminuir frequência deste anúncio"
   hide: "Não exibir anúncios"
+  timezoneinfo: "O dia da semana é determinado pelo fuso horário do servidor."
+  adsSettings: "Configurações de propaganda"
+  notesPerOneAd: "Intervalo de notas entre o anúncio nas atualizações em tempo real."
+  setZeroToDisable: "Selecione o valor 0 para desabilitar anúncios nas atualizações em tempo real."
+  adsTooClose: "O intervalo atual de anúncio pode impactar negativamente a experiência de usuário por ser muito baixo."
 _forgotPassword:
   enterEmail: "Por favor, insira o endereço de e-mail usado no cadastro de sua conta. Um link para redefinição de senha será enviado para esse endereço."
   ifNoEmail: "Caso você não tenha registrado um endereço de e-mail, por favor, entre em contato com o administrador."
+  contactAdmin: "Essa instância não possui suporte ao uso de endereços de email, contate seu administrador para mudar a sua senha."
 _gallery:
+  my: "Minha Galeria"
   liked: "Postagens curtidas"
   like: "Curtir"
   unlike: "Remover curtida"
@@ -1297,40 +1803,224 @@ _email:
     title: "Você tem um novo seguidor"
   _receiveFollowRequest:
     title: "Você recebeu um pedido de seguidor"
+_plugin:
+  install: "Instalar plugins"
+  installWarn: "Por favor, não instale plugins duvidosos."
+  manage: "Gerenciar plugins"
+  viewSource: "Ver código-fonte"
+  viewLog: "Mostrar registo"
 _preferencesBackups:
+  list: "Backups criados"
+  saveNew: "Salvar novo backup"
+  loadFile: "Carregar de arquivo"
+  apply: "Aplicar a este dispositivo"
+  save: "Salvar mudanças"
+  inputName: "Insira um nome para esse backup"
   cannotSave: "Não foi possível salvar"
+  nameAlreadyExists: "Um backup chamado \"{name}\" já existe. Por favor, insira outro nome."
   applyConfirm: "Deseja aplicar o backup '{name}' ao dispositivo atual? As configurações atuais do dispositivo serão perdidas."
+  saveConfirm: "Salvar backup como \"{name}\"?"
   deleteConfirm: "Deseja excluir {name}?"
+  renameConfirm: "Renomear esse backup de \"{old}\" para \"{new}\"?"
+  noBackups: "Não há backups. Você pode configurar suas configurações de cliente nesse servidor ao selecionar \"Criar novo backup\"."
+  createdAt: "Criado em: {date} {time}"
+  updatedAt: "Atualizado em: {date} {time}"
   cannotLoad: "Não foi possível carregar"
+  invalidFile: "Formato de arquivo inválido"
+_registry:
+  scope: "Escopo"
+  key: "Chave"
+  keys: "Chave"
+  domain: "Domínio"
+  createKey: "Criar chave"
+_aboutMisskey:
+  about: "Misskey é um software de código aberto desenvolvido por syulio desde 2014."
+  contributors: "Contribuidores principais"
+  allContributors: "Todos os contribuidores"
+  source: "Código-fonte"
+  original: "Original"
+  thisIsModifiedVersion: "{name} utiliza uma versão modificada do Misskey original."
+  translation: "Traduza o Misskey"
+  donate: "Doe para o Misskey"
+  morePatrons: "Nós apreciamos o apoio de vários outros apoiadores não listados aqui. Obrigado! 🥰"
+  patrons: "Apoiadores"
+  projectMembers: "Membros do projeto"
+_displayOfSensitiveMedia:
+  respect: "Esconder mídia marcada como sensível"
+  ignore: "Exibir mídia marcada como sensível"
+  force: "Esconder toda mídia"
+_instanceTicker:
+  none: "Nunca mostrar"
+  remote: "Mostrar para usuários remotos"
+  always: "Sempre mostrar"
+_serverDisconnectedBehavior:
+  reload: "Recarregar automaticamente"
+  dialog: "Exibir diálogo de aviso de conteúdo"
+  quiet: "Exibir aviso de conteúdo discreto"
 _channel:
+  create: "Criar canal"
+  edit: "Editar canal"
+  setBanner: "Definir banner"
+  removeBanner: "Remover banner"
   featured: "Destaques"
+  owned: "Autoral"
   following: "Seguindo"
   usersCount: "{n} usuários ativos"
   notesCount: "{n} notas"
   nameAndDescription: "Nome e descrição"
+  nameOnly: "Apenas o nome"
+  allowRenoteToExternal: "Permitir repostagens e citações de fora do canal"
 _menuDisplay:
   sideFull: "Exibir painel lateral inteiro"
+  sideIcon: "Lateral (Ícones)"
   top: "Exibir barra superior"
   hide: "Ocultar"
+_wordMute:
+  muteWords: "Palavras silenciadas"
+  muteWordsDescription: "Separe com espaços para uma condicional AND (&&) ou por linha para uma condicional OR (||)."
+  muteWordsDescription2: "Cercar palavras-chave com barras para usar expressões regulares (RegEx)."
 _instanceMute:
   instanceMuteDescription: "Todas as notas e repostagens do servidor configurado serão silenciados, incluindo respostas aos usuários do servidor mutado."
+  instanceMuteDescription2: "Separar por linha"
+  title: "Esconder notas das instâncias listadas. "
+  heading: "Lista de instâncias a serem silenciadas"
 _theme:
+  explore: "Explorar Temas"
+  install: "Instalar um tema"
+  manage: "Gerenciar temas"
+  code: "Código do tema"
   description: "Descrição"
+  installed: "{name} foi instalado"
+  installedThemes: "Temas instalados"
+  builtinThemes: "Temas nativos"
+  alreadyInstalled: "Esse tema já foi instalado"
+  invalid: "O formato desse tema é invalido"
+  make: "Fazer um tema"
+  base: "Base"
+  addConstant: "Adicionar constante"
+  constant: "Constante"
+  defaultValue: "Valor padrão"
+  color: "Cor"
+  refProp: "Referenciar uma propriedade"
+  refConst: "Referenciar uma constante"
+  key: "Chave"
+  func: "Funções"
+  funcKind: "Tipo de função"
+  argument: "Argumento"
+  basedProp: "Propriedade referenciada"
   alpha: "Opacidade"
+  darken: "Escurecer"
+  lighten: "Esclarecer"
+  inputConstantName: "Insira um nome para essa constante"
+  importInfo: "Se você inserir o código do tema aqui, você pode importá-lo no editor de temas"
   deleteConstantConfirm: "Confirma a exclusão da constante {const}?"
   keys:
+    accent: "Cor de destaque"
+    bg: "Plano de fundo"
+    fg: "Texto"
+    focus: "Foco"
+    indicator: "Indicador"
+    panel: "Painel"
+    shadow: "Sombra"
+    header: "Cabeçalho"
+    navBg: "Plano de fundo da barra lateral"
+    navFg: "Texto da barra lateral"
+    navHoverFg: "Texto da coluna lateral (Selecionado)"
+    navActive: "Texto da coluna lateral (Ativa)"
+    navIndicator: "Indicador da coluna lateral"
+    link: "Link"
+    hashtag: "Hashtag"
     mention: "Menção"
+    mentionMe: "Menciona (a mim)"
     renote: "Repostar"
+    modalBg: "Plano de fundo modal"
     divider: "Separador"
+    scrollbarHandle: "Alça da barra de rolagem (Selecionada)"
+    scrollbarHandleHover: "Alça da barra de rolagem (Selecionada)"
+    dateLabelFg: "Texto do rótulo de data"
+    infoBg: "Plano de fundo de informações"
+    infoFg: "Texto de informações"
+    infoWarnBg: "Plano de fundo de avisos"
+    infoWarnFg: "Texto de avisos"
+    toastBg: "Plano de fundo de notificações"
+    toastFg: "Texto da notificação"
+    buttonBg: "Plano de fundo de botão"
+    buttonHoverBg: "Plano de fundo de botão (Selecionado)"
+    inputBorder: "Borda de campo digitável"
+    listItemHoverBg: "Plano de fundo do item de uma lista (Selecionado)"
+    driveFolderBg: "Plano de fundo da pasta no Drive"
+    wallpaperOverlay: "Sobreposição do papel de parede."
+    badge: "Emblema"
+    messageBg: "Plano de fundo do chat"
+    accentDarken: "Cor de destaque (Escurecida)"
+    accentLighten: "Cor de destaque (Esclarecida)"
+    fgHighlighted: "Texto Destacado"
 _sfx:
   note: "Posts"
+  noteMy: "Própria nota"
   notification: "Notificações"
+  reaction: "Ao selecionar uma reação"
+_soundSettings:
+  driveFile: "Usar um arquivo de áudio do Drive."
+  driveFileWarn: "Selecione um arquivo de áudio do Drive."
+  driveFileTypeWarn: "Esse arquivo não é compatível"
+  driveFileTypeWarnDescription: "Selecione um arquivo de áudio"
+  driveFileDurationWarn: "O áudio é muito longo."
+  driveFileDurationWarnDescription: "Áudios longos podem atrapalhar o funcionamento do Misskey. Deseja continuar?"
+  driveFileError: "Não foi possível carregar o som. Por favor, altere a configuração."
 _ago:
+  future: "Futuro"
+  justNow: "Agora mesmo"
+  secondsAgo: "{n}s atrás"
+  minutesAgo: "{n}m atrás"
+  hoursAgo: "{n}h atrás"
+  daysAgo: "{n}d atrás"
+  weeksAgo: "{n} semanas atrás"
+  monthsAgo: "{n} meses atrás"
+  yearsAgo: "{n} anos atrás"
   invalid: "Não há nada aqui"
+_timeIn:
+  seconds: "Em {n}s"
+  minutes: "Em {n}m"
+  hours: "Em {n}h"
+  days: "Em {n}d"
+  weeks: "Em {n} semanas"
+  months: "Em {n} meses"
+  years: "Em {n} anos"
+_time:
+  second: "Segundo(s)"
+  minute: "Minuto(s)"
+  hour: "Hora(s)"
+  day: "Dia(s)"
 _2fa:
+  alreadyRegistered: "Você já cadastrou um dispositivo de autenticação de dois fatores."
+  registerTOTP: "Cadastrar aplicativo autenticador"
+  step1: "Inicialmente, instale um aplicativo autenticador (como {a} ou {b}) em seu dispositivo."
+  step2: "Então, escaneie o código QR exibido na tela."
+  step2Uri: "Acesse o seguinte URI se você estiver utilizando um aplicativo no computador"
+  step3Title: "Insira o código de autenticação"
+  step3: "Insira o código de autenticação (token) providenciado pelo seu aplicativo para terminar a configuração."
+  setupCompleted: "Configuração completa"
+  step4: "De agora em diante, quaisquer solicitações de entrada pedirão pelo código."
+  securityKeyNotSupported: "O seu navegador não é compatível com chaves de segurança."
+  registerTOTPBeforeKey: "Por favor, configure um aplicativo autenticador para registrar uma chave de segurança."
   securityKeyInfo: "Além da autenticação por impressão digital ou PIN, você também pode configurar a autenticação por chaves de segurança de hardware compatível com FIDO2 para proteger ainda mais a sua conta."
+  registerSecurityKey: "Registre um código de segurança"
+  securityKeyName: "Insira um nome para a chave"
+  tapSecurityKey: "Por favor, siga as instruções do navegador para registrar o código de segurança"
+  removeKey: "Remover código de segurança"
   removeKeyConfirm: "Deseja excluir {name}?"
+  whyTOTPOnlyRenew: "O autenticador não pode ser removido enquanto há códigos de segurança registrados."
+  renewTOTP: "Reconfigurar autenticador"
+  renewTOTPConfirm: "Isso interromperá o funcionamento dos códigos de aplicativos anteriores "
+  renewTOTPOk: "Reconfigurar"
   renewTOTPCancel: "Não, obrigado"
+  checkBackupCodesBeforeCloseThisWizard: "Antes de fechar essa janela, anote os códigos de backup a seguir."
+  backupCodes: "Códigos de backup"
+  backupCodesDescription: "Você pode utilizar esses códigos para ganhar acesso à conta caso sua autenticação de dois fatores esteja indisponível. Cada código pode ser utilizado apenas uma vez. Por favor, guarde-os em um local seguro."
+  backupCodeUsedWarning: "Um código de backup foi utilizado. Por favor, reconfigure a autenticação de dois fatores o quanto antes, caso não consiga utilizá-la."
+  backupCodesExhaustedWarning: "Todos os códigos de backup foram utilizados. Caso perca acesso à autenticação de dois fatores, você perderá o acesso à conta. Por favor, reconfigure a autenticação de dois fatores."
+  moreDetailedGuideHere: "Aqui está um guia detalhado"
 _permissions:
   "read:account": "Visualizar informações da conta"
   "write:account": "Editar informações da conta"
@@ -1364,6 +2054,82 @@ _permissions:
   "write:gallery": "Editar sua galeria"
   "read:gallery-likes": "Visualizar a sua lista de curtidas da galeria"
   "write:gallery-likes": "Editar a sua lista de curtidas da galeria"
+  "read:flash": "Ver Play"
+  "write:flash": "Editar Plays"
+  "read:flash-likes": "Ver lista de Plays curtidas"
+  "write:flash-likes": "Editar lista de Plays curtidas"
+  "read:admin:abuse-user-reports": "Ver relatórios de usuário"
+  "write:admin:delete-account": "Excluir conta de usuário"
+  "write:admin:delete-all-files-of-a-user": "Excluir todos os arquivos de um usuário"
+  "read:admin:index-stats": "Ver estatísticas do índice do banco de dados"
+  "read:admin:table-stats": "Ver estatísticas da tabela do banco de dados"
+  "read:admin:user-ips": "Ver endereços IP do usuário"
+  "read:admin:meta": "Ver metadados da instância"
+  "write:admin:reset-password": "Mudar a senha do usuário"
+  "write:admin:resolve-abuse-user-report": "Resolver relatório de usuário"
+  "write:admin:send-email": "Enviar email"
+  "read:admin:server-info": "Ver informações do servidor"
+  "read:admin:show-moderation-log": "Ver log de moderação"
+  "read:admin:show-user": "Ver informações privadas do usuário"
+  "write:admin:suspend-user": "Suspender usuário"
+  "write:admin:unset-user-avatar": "Remover avatar do usuário"
+  "write:admin:unset-user-banner": "Remover banner do usuário"
+  "write:admin:unsuspend-user": "Cancelar a suspensão do usuário"
+  "write:admin:meta": "Gerenciar os metadados da instância"
+  "write:admin:user-note": "Gerenciar a nota de moderação"
+  "write:admin:roles": "Gerenciar cargos"
+  "read:admin:roles": "Ver cargos"
+  "write:admin:relays": "Gerenciar relays"
+  "read:admin:relays": "Ver relays"
+  "write:admin:invite-codes": "Gerenciar códigos de convite"
+  "read:admin:invite-codes": "Ver códigos de convite"
+  "write:admin:announcements": "Gerenciar anúncios"
+  "read:admin:announcements": "Ver anúncios"
+  "write:admin:avatar-decorations": "Gerenciar decorações de avatar"
+  "read:admin:avatar-decorations": "Ver decorações de avatar"
+  "write:admin:federation": "Gerenciar dados de federação"
+  "write:admin:account": "Gerenciar conta de usuário"
+  "read:admin:account": "Ver conta de usuário"
+  "write:admin:emoji": "Gerenciar emoji"
+  "read:admin:emoji": "Ver emoji"
+  "write:admin:queue": "Gerenciar trabalhos pendentes"
+  "read:admin:queue": "Ver informações de trabalhos pendentes"
+  "write:admin:promo": "Gerenciar notas de promoção"
+  "write:admin:drive": "Gerenciar Drive de usuário"
+  "read:admin:drive": "Ver informações de Drive de usuário"
+  "read:admin:stream": "Utilizar WebSocket API para Admin"
+  "write:admin:ad": "Gerenciar propagandas"
+  "read:admin:ad": "Ver propagandas"
+  "write:invite-codes": "Criar códigos de convite"
+  "read:invite-codes": "Obter códigos de convite"
+  "write:clip-favorite": "Gerenciar clipes favoritados"
+  "read:clip-favorite": "Ver Clipes favoritados"
+  "read:federation": "Ver dados de federação"
+  "write:report-abuse": "Reportar violação"
+_auth:
+  shareAccessTitle: "Conceder permissões do aplicativo"
+  shareAccess: "Você gostaria de autorizar \"{name}\" para acessar essa conta?"
+  shareAccessAsk: "Você tem certeza de que gostaria de conceder ao aplicativo o acesso à conta?"
+  permission: "{name} solicita as seguintes permissões"
+  permissionAsk: "O aplicativo solicita as seguintes permissões"
+  pleaseGoBack: "Por favor, volte ao aplicativo"
+  callback: "Retornando ao aplicativo"
+  denied: "Acesso negado"
+  pleaseLogin: "Por favor, entre para autorizar aplicativos."
+_antennaSources:
+  all: "Todas as notas"
+  homeTimeline: "Notas de usuários seguidos"
+  users: "Notas de usuários específicos"
+  userList: "Notas de uma lista específica de usuários"
+  userBlacklist: "Todas as notas, exceto as de um ou mais usuários específicos"
+_weekday:
+  sunday: "Domingo"
+  monday: "Segunda-feira"
+  tuesday: "Terça-feira"
+  wednesday: "Quarta-feira"
+  thursday: "Quinta-feira"
+  friday: "Sexta-feira"
+  saturday: "Sábado"
 _widgets:
   profile: "Perfil"
   instanceInfo: "Informações da instância"
@@ -1394,29 +2160,112 @@ _widgets:
   _userList:
     chooseList: "Selecione uma lista"
   clicker: "Clicker"
+  birthdayFollowings: "Usuários de aniversário hoje"
 _cw:
+  hide: "Esconder"
   show: "Carregar mais"
+  chars: "{count} caracteres"
+  files: "{count} arquivo(s)"
 _poll:
+  noOnlyOneChoice: "São necessárias, no mínimo, duas escolhas"
+  choiceN: "Escolha {n}"
+  noMore: "Você não pode adicionar mais escolhas"
   canMultipleVote: "Permitir múltipla seleção"
+  expiration: "Encerrar enquete"
+  infinite: "Nunca"
+  at: "Terminar em..."
+  after: "Terminar após..."
+  deadlineDate: "Data de término"
+  deadlineTime: "Tempo"
+  duration: "Duração"
+  votesCount: "{n} votos"
+  totalVotes: "{n} votos totais"
   vote: "Votar em enquetes"
+  showResult: "Ver resultados"
+  voted: "Votada"
+  closed: "Encerrada"
+  remainingDays: "{d} dia(s) {h} hora(s) restantes"
+  remainingHours: "{h} hora(s) {m} minuto(s) restantes"
+  remainingMinutes: "{m} minuto(s) {s} segundo(s) restantes"
+  remainingSeconds: "{s} segundo(s) restantes"
 _visibility:
+  public: "Público"
+  publicDescription: "Sua nota será visível para todos os usuários"
   home: "Início"
+  homeDescription: "Publicar apenas na linha do tempo Início"
   followers: "Seguidores"
   followersDescription: "Tornar visível apenas para os meus seguidores"
+  specified: "Mensagem Direta"
+  specifiedDescription: "Tornar visível apenas para usuários específicos"
+  disableFederation: "Defederar"
+  disableFederationDescription: "Não transmitir às outras instâncias"
+_postForm:
+  replyPlaceholder: "Responder a essa nota..."
+  quotePlaceholder: "Citar essa nota..."
+  channelPlaceholder: "Postar em canal..."
+  _placeholders:
+    a: "Como vão as coisas?"
+    b: "O que está rolando por aí?"
+    c: "No que está pensando?"
+    d: "Do que você quer falar?"
+    e: "Comece a digitar..."
+    f: "Esperando você digitar..."
 _profile:
   name: "Nome"
   username: "Nome de usuário"
+  description: "Bio"
+  youCanIncludeHashtags: "Você pode incluir hashtags em sua bio."
+  metadata: "Informações Adicionais"
+  metadataEdit: "Editar informações adicionais"
+  metadataDescription: "Aqui, você pode exibir campos adicionais de informação no seu perfil."
+  metadataLabel: "Rótulo"
+  metadataContent: "Conteúdo"
+  changeAvatar: "Mudar avatar"
+  changeBanner: "Mudar banner"
+  verifiedLinkDescription: "Ao inserir um URL que contém um link para essa conta, um ícone de verificação será exibido ao lado do campo"
+  avatarDecorationMax: "Você pode adicionar até {max} decorações."
 _exportOrImport:
+  allNotes: "Todas as notas"
   favoritedNotes: "Notas nos favoritos"
   clips: "Clipe"
   followingList: "Seguindo"
   muteList: "Silenciar"
   blockingList: "Bloquear"
   userLists: "Listas"
+  excludeMutingUsers: "Excluir usuários silenciados"
+  excludeInactiveUsers: "Excluir usuários inativos"
+  withReplies: "Incluir respostas de usuários importados na linha do tempo"
 _charts:
   federation: "União"
+  apRequest: "Solicitações"
+  usersIncDec: "Diferença no número de usuários"
+  usersTotal: "Número total de usuários"
+  activeUsers: "Usuários ativos"
+  notesIncDec: "Diferença no número de notas"
+  localNotesIncDec: "Diferença no número de notas locais"
+  remoteNotesIncDec: "Diferença no número de notas remotas"
+  notesTotal: "Número total de notas"
+  filesIncDec: "Diferença no número de arquivos"
+  filesTotal: "Número total de arquivos"
+  storageUsageIncDec: "Diferença no uso de armazenamento"
+  storageUsageTotal: "Uso total de armazenamento"
+_instanceCharts:
+  requests: "Solicitações"
+  users: "Diferença no número de usuários"
+  usersTotal: "Número cumulativo de usuários"
+  notes: "Diferença no número de notas"
+  notesTotal: "Número cumulativo de notas"
+  ff: "Diferença entre número de usuários seguidos/seguidores"
+  ffTotal: "Número cumulativo de usuários seguidos/seguidores"
+  cacheSize: "Diferença do tamanho do cache"
+  cacheSizeTotal: "Tamanho cumulativo do cache"
+  files: "Diferença no número de arquivos"
+  filesTotal: "Número cumulativo de arquivos"
 _timelines:
   home: "Início"
+  local: "Local"
+  social: "Social"
+  global: "Global"
 _play:
   new: "Criar  Play"
   edit: "Editar Play"
@@ -1425,18 +2274,65 @@ _play:
   deleted: "Play foi excluído"
   pageSetting: "Configurações do Play"
   editThisPage: "Editar este Play"
+  viewSource: "Ver fonte"
   my: "Meus Plays"
   liked: "Plays curtidos"
+  featured: "Popular"
+  title: "Título"
   script: "Script"
   summary: "Descrição"
+  visibilityDescription: "Pôr em privado significa que ele não será visível no perfil, mas qualquer um com o URL poderá acessar"
 _pages:
+  newPage: "Criar uma Página"
+  editPage: "Editar essa Página"
+  readPage: "Ver a fonte dessa Página"
+  created: "Página criada com sucesso"
+  updated: "Página atualizada com sucesso"
   deleted: "Página excluída com sucesso"
+  pageSetting: "Configurações da página"
+  nameAlreadyExists: "O URL de Página especificado já existe"
+  invalidNameTitle: "O URL de Página especificado é inválido"
+  invalidNameText: "Confira se o título da Página não está vazio"
+  editThisPage: "Editar essa Página"
+  viewSource: "Ver código-fonte"
   viewPage: "Visualizar as suas páginas"
   like: "Curtir"
   unlike: "Remover curtida"
+  my: "Minhas Páginas"
   liked: "Páginas curtidas"
+  featured: "Populares"
+  inspector: "Inspetor"
+  contents: "Conteúdo"
+  content: "Bloco da Página"
+  variables: "Variáveis"
+  title: "Título"
+  url: "URL da Página"
+  summary: "Resumo da página"
+  alignCenter: "Centralizar elementos"
+  hideTitleWhenPinned: "Esconder título da Página quando fixado em perfil"
+  font: "Fonte"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans Serif"
+  eyeCatchingImageSet: "Escolher miniatura"
+  eyeCatchingImageRemove: "Excluir miniatura"
+  chooseBlock: "Adicionar bloco"
+  selectType: "Selecionar um tipo"
+  contentBlocks: "Conteúdo"
+  inputBlocks: "Inserir"
+  specialBlocks: "Especial"
   blocks:
+    text: "Texto"
+    textarea: "Área do texto"
+    section: "Seção"
     image: "imagem"
+    button: "Botão"
+    dynamic: "Blocos Dinâmicos"
+    dynamicDescription: "Esse bloco foi abolido. Por favor, use {play} de agora em diante."
+    note: "Nota embutida"
+    _note:
+      id: "ID da nota"
+      idDescription: "Você também pode colar o URL da nota aqui."
+      detailed: "Visão detalhada"
 _relayStatus:
   requesting: "Pendente"
   accepted: "Aprovado"
@@ -1451,9 +2347,23 @@ _notification:
   youReceivedFollowRequest: "Você recebeu um pedido de seguidor"
   yourFollowRequestAccepted: "Seu pedido de seguidor foi aceito"
   pollEnded: "Os resultados da enquete agora estão disponíveis"
+  newNote: "Nova nota"
+  unreadAntennaNote: "Antena {name}"
+  roleAssigned: "Cargo dado"
   emptyPushNotificationMessage: "As notificações de alerta foram atualizadas"
+  achievementEarned: "Conquista desbloqueada"
+  testNotification: "Notificação teste"
+  checkNotificationBehavior: "Verificar aparência da notificação"
+  sendTestNotification: "Enviar notificação de teste"
+  notificationWillBeDisplayedLikeThis: "Notificações se parecem com isso"
+  reactedBySomeUsers: "{n} usuários reagiram"
+  likedBySomeUsers: "{n} usuários gostaram da nota"
+  renotedBySomeUsers: "{n} usuários repostaram a nota"
+  followedBySomeUsers: "{n} usuários te seguiram"
+  flushNotification: "Limpar notificações"
   _types:
     all: "Todas"
+    note: "Novas notas"
     follow: "Seguindo"
     mention: "Menção"
     reply: "Respostas"
@@ -1463,6 +2373,8 @@ _notification:
     pollEnded: "Enquetes terminando"
     receiveFollowRequest: "Recebeu pedidos de seguidor"
     followRequestAccepted: "Aceitou pedidos de seguidor"
+    roleAssigned: "Cargo dado"
+    achievementEarned: "Conquista desbloqueada"
     app: "Notificações de aplicativos conectados"
   _actions:
     followBack: "te seguiu de volta"
@@ -1472,13 +2384,23 @@ _deck:
   alwaysShowMainColumn: "Sempre mostrar a coluna principal"
   columnAlign: "Alinhar colunas"
   addColumn: "Adicionar coluna"
+  newNoteNotificationSettings: "Opções de notificação para novas notas"
+  configureColumn: "Configurar coluna"
   swapLeft: "Trocar de posição com a coluna à esquerda"
   swapRight: "Trocar de posição com a coluna à direita"
   swapUp: "Trocar de posição com a coluna acima"
   swapDown: "Trocar de posição com a coluna abaixo"
+  stackLeft: "Empilhar na coluna à esquerda"
   popRight: "Acoplar coluna à direita"
   profile: "Perfil"
+  newProfile: "Novo perfil"
   deleteProfile: "Remover perfil"
+  introduction: "Crie a interface perfeita para você arranjando as colunas livremente!"
+  introduction2: "Clique no + à direita da tela para adicionar novas colunas quando quiser."
+  widgetsIntroduction: "Por favor, selecione \"Editar widgets\" no menu em coluna e adicione um widget."
+  useSimpleUiForNonRootPages: "Usar UI simples para páginas navegadas"
+  usedAsMinWidthWhenFlexible: "A largura mínima será usada para isso quando o \"Ajuste automático da largura\" estiver ativado"
+  flexible: "Ajuste automático da largura"
   _columns:
     main: "Principal"
     widgets: "Widgets"
@@ -1490,22 +2412,226 @@ _deck:
     mentions: "Menções"
     direct: "Notas diretas"
     roleTimeline: "Linha do tempo do cargo"
+_dialog:
+  charactersExceeded: "Você excedeu o limite de caracteres! Atualmente em {current} de {max}."
+  charactersBelow: "Você está abaixo do limite mínimo de caracteres! Atualmente em {current} of {min}."
+_disabledTimeline:
+  title: "Linha do tempo desabilitada"
+  description: "Você não pode acessar essa linha do tempo sob o seu cargo atual."
 _drivecleaner:
   orderBySizeDesc: "Tamanho descendente"
   orderByCreatedAtAsc: "Data ascendente"
 _webhookSettings:
+  createWebhook: "Criar Webhook"
+  modifyWebhook: "Modificar Webhook"
   name: "Nome"
+  secret: "Segredo"
+  trigger: "Gatilho"
   active: "Ativado"
   _events:
     follow: "Quando seguindo um usuário"
     followed: "Quando sendo seguido"
+    note: "Ao postar uma nota"
+    reply: "Quando receber uma resposta"
     renote: "Quando repostado"
+    reaction: "Quando receber uma reação"
+    mention: "Quando for mencionado"
+  _systemEvents:
+    abuseReport: "Quando receber um relatório de abuso"
+    abuseReportResolved: "Quando relatórios de abuso forem resolvidos "
+    userCreated: "Quando um usuário é criado"
+  deleteConfirm: "Você tem certeza de que deseja excluir o Webhook?"
 _abuseReport:
   _notificationRecipient:
+    createRecipient: "Adicionar destinatário para relatórios de abuso"
+    modifyRecipient: "Editar destinatários para relatórios de abuso"
+    recipientType: "TIpo de notificação"
     _recipientType:
       mail: "E-mail"
+      webhook: "Webhook"
+      _captions:
+        mail: "Enviar o email aos endereços dos moderadores ao receber relatório de abuso."
+        webhook: "Enviar uma notificação ao SystemWebhook quando você receber um resolver um relatório de abuso."
+    keywords: "Palavras-chave"
+    notifiedUser: "Usuários para notificar"
+    notifiedWebhook: "Webhook usado"
+    deleteConfirm: "Você tem certeza de que quer excluir o destinatário da notificação?"
 _moderationLogTypes:
+  createRole: "Cargo criado"
+  deleteRole: "Cargo excluído"
+  updateRole: "Cargo atualizado"
+  assignRole: "Cargo atribuído"
+  unassignRole: "Cargo removido"
   suspend: "Suspender"
+  unsuspend: "Suspensão cancelada"
+  addCustomEmoji: "Emoji personalizado adicionado"
+  updateCustomEmoji: "Emoji personalizado atualizado"
+  deleteCustomEmoji: "Emoji personalizado removido"
+  updateServerSettings: "Configurações de servidor atualizadas"
+  updateUserNote: "Nota de moderação atualizada"
+  deleteDriveFile: "Arquivo excluído"
+  deleteNote: "Nota excluída"
+  createGlobalAnnouncement: "Anúncio global criado"
+  createUserAnnouncement: "Anúncio de usuário criado"
+  updateGlobalAnnouncement: "Anúncio global atualizado"
+  updateUserAnnouncement: "Anúncio de usuário atualizado"
+  deleteGlobalAnnouncement: "Anúncio global excluído"
+  deleteUserAnnouncement: "Anúncio de usuário excluído"
   resetPassword: "Redefinir senha"
+  suspendRemoteInstance: "Instância remota suspensa"
+  unsuspendRemoteInstance: "Suspensão de instância remota removida"
+  updateRemoteInstanceNote: "Nota de moderação atualizada para instância remota."
+  markSensitiveDriveFile: "Arquivo marcado como sensível"
+  unmarkSensitiveDriveFile: "Arquivo desmarcado como sensível"
+  resolveAbuseReport: "Relatório resolvido"
+  createInvitation: "Convite gerado"
+  createAd: "Propaganda criada"
+  deleteAd: "Propaganda excluída"
+  updateAd: "Propaganda atualizada"
+  createAvatarDecoration: "Decoração de avatar criada"
+  updateAvatarDecoration: "Decoração de avatar atualizada"
+  deleteAvatarDecoration: "Decoração de avatar removida"
+  unsetUserAvatar: "Remover avatar de usuário"
+  unsetUserBanner: "Remover banner de usuário"
+  createSystemWebhook: "Criar SystemWebhook"
+  updateSystemWebhook: "Atualizar SystemWebhook"
+  deleteSystemWebhook: "Remover SystemWebhook"
+  createAbuseReportNotificationRecipient: "Criar um destinatário para relatórios de abuso"
+  updateAbuseReportNotificationRecipient: "Atualizar destinatários para relatórios de abuso"
+  deleteAbuseReportNotificationRecipient: "Remover um destinatário para relatórios de abuso"
+_fileViewer:
+  title: "Detalhes do arquivo"
+  type: "Tipo de arquivo"
+  size: "Tamanho do arquivo"
+  url: "URL"
+  uploadedAt: "Adicionado em"
+  attachedNotes: "Notas anexadas"
+  thisPageCanBeSeenFromTheAuthor: "Essa página só pode ser vista pelo usuário que enviou esse arquivo."
+_externalResourceInstaller:
+  title: "Instalar de site externo"
+  checkVendorBeforeInstall: "Tenha certeza de que o distribuidor desse recurso é confiável antes da instalação."
+  _plugin:
+    title: "Deseja instalar esse plugin?"
+    metaTitle: "Informações do plugin"
+  _theme:
+    title: "Deseja instalar esse tema?"
+    metaTitle: "Informações do tema"
+  _meta:
+    base: "Paleta de cores base"
+  _vendorInfo:
+    title: "Informações do distribuidor"
+    endpoint: "Endpoint referenciado"
+    hashVerify: "Verificação de hashes"
+  _errors:
+    _invalidParams:
+      title: "Parâmetros inválidos"
+      description: "Não há informações suficientes para carregar dados do site externo. Por favor, confirme o URL inserido."
+    _resourceTypeNotSupported:
+      title: "Esse recurso externo é incompatível"
+      description: "Esse tipo de recuso externo é incompatível. Por favor, comunique o administrador do site."
+    _failedToFetch:
+      title: "Não foi possível obter dados"
+      fetchErrorDescription: "Houve um erro ao comunicar com o site externo. Se tentar novamente não resolver o problema, contate o administrador do site."
+      parseErrorDescription: "Houve um erro processando os dados do site externo. Por favor, contate o administrador do site."
+    _hashUnmatched:
+      title: "Verificação de dados falhou"
+      description: "Houve um erro verificando a integridade do conteúdo obtido. Como medida de segurança, a instalação foi interrompida. Por favor, contate o administrador do site."
+    _pluginParseFailed:
+      title: "Erro AiScript"
+      description: "Os dados solicitados foram obtidos com sucesso, mas houve um erro na leitura do AiScript. Por favor, contate o autor do plugin. Detalhes de erro podem ser vistos no console Javascript."
+    _pluginInstallFailed:
+      title: "A instalação do plugin falhou."
+      description: "Houve um problema na instalação do plugin. Por favor, tente novamente. Detalhes de erro podem ser vistos no console Javascript."
+    _themeParseFailed:
+      title: "Erro na leitura do tema"
+      description: "Os dados solicitados foram obtidos com sucesso, mas houve um erro na leitura do tema. Por favor, contate o autor do tema. Detalhes de erro podem ser vistos no console Javascript."
+    _themeInstallFailed:
+      title: "Falha ao instalar tema"
+      description: "Houve um problema na instalação do tema. Por favor, tente novamente. Detalhes do erro podem ser vistos no console Javascript."
+_dataSaver:
+  _media:
+    title: "Carregando mídia"
+    description: "Previne que mídia seja carregada automaticamente. Mídias escondidas serão carregadas quando selecionadas."
+  _avatar:
+    title: "Imagem do avatar"
+    description: "Parar animação de avatares. Imagens animadas podem ter um arquivo mais pesado do que imagens normais, potencialmente levando a reduções no tráfego de dados."
+  _urlPreview:
+    title: "Miniaturas na prévia de URLs"
+    description: "Miniaturas na prévia de URLs não serão mais carregadas."
+  _code:
+    title: "Destaque de código"
+    description: "Se as notações de formatação de código forem utilizadas em MFM, elas não irão carregar até serem selecionadas. Destaque de código exige baixar arquivos de alta definição para cada linguagem de programação. Logo, desabilitar o carregamento automático desses arquivos diminui a quantidade de informação comunicada."
+_hemisphere:
+  N: "Hemisfério Norte"
+  S: "Hemisfério Sul"
+  caption: "Utilizado em algumas configurações de aplicativo para determinar a estação do ano."
 _reversi:
+  reversi: "Reversi"
+  gameSettings: "Configurações de jogo"
+  chooseBoard: "Escolha um tabuleiro"
+  blackOrWhite: "Preto/Branco"
+  blackIs: "{name} é as peças Pretas"
+  rules: "Regras"
+  thisGameIsStartedSoon: "O jogo começará em breve"
+  waitingForOther: "Esperando o turno do oponente"
+  waitingForMe: "Esperando o seu turno"
+  waitingBoth: "Prepare-se"
+  ready: "Pronto"
+  cancelReady: "Não pronto"
+  opponentTurn: "Turno do oponente"
+  myTurn: "Seu turno"
+  turnOf: "É o turno de {name}"
+  pastTurnOf: "Turno de {name}"
+  surrender: "Desistir"
+  surrendered: "Desistiu"
+  timeout: "Fim do tempo"
+  drawn: "Empate"
+  won: "{name} venceu"
+  black: "Preto"
+  white: "Branco"
   total: "Total"
+  turnCount: "Turno {count}"
+  myGames: "Meus jogos"
+  allGames: "Todos os jogos"
+  ended: "Terminado"
+  playing: "Atualmente jogando"
+  isLlotheo: "Aquele com menos pedras vence (Llotheo)"
+  loopedMap: "Mapa em ‘loop’"
+  canPutEverywhere: "É possível pôr em qualquer lugar"
+  timeLimitForEachTurn: "Tempo limite por turno"
+  freeMatch: "Partida Livre"
+  lookingForPlayer: "À procura de adversários..."
+  gameCanceled: "A partida foi cancelada."
+  shareToTlTheGameWhenStart: "Compartilhar jogo na linha do tempo ao iniciar"
+  iStartedAGame: "O jogo começou! #MisskeyReversi"
+  opponentHasSettingsChanged: "O oponente alterou as configurações dele"
+  allowIrregularRules: "Regras irregulares (completamente livre)"
+  disallowIrregularRules: "Sem regras irregulares"
+  showBoardLabels: "Exibir numeração de linha e coluna no tabuleiro"
+  useAvatarAsStone: "Utilizar avatares de usuário como as pedras"
+_offlineScreen:
+  title: "Offline - não foi possível conectar ao servidor"
+  header: "Não foi possível conectar ao servidor"
+_urlPreviewSetting:
+  title: "Configurações da prévia de URL"
+  enable: "Habilitar prévia de URL"
+  timeout: "Tempo máximo para obter a prévia (ms)"
+  timeoutDescription: "Se demorar mais que esse valor para obter uma prévia, ela não será gerada."
+  maximumContentLength: "Content-Length máximo (em bytes)"
+  maximumContentLengthDescription: "Se o Content-Length for maior que esse valor, a prévia não será gerada."
+  requireContentLength: "Gerar previu apenas se houver cabeçalho Content-Length disponível na solicitação"
+  requireContentLengthDescription: "Se o outro servidor não retornar um cabeçalho Content-Length, a prévia não será gerada."
+  userAgent: "User-Agent"
+  userAgentDescription: "Define o User-Agent a ser usado ao gerar prévias. Se for deixado em branco, será usado o User-Agent padrão."
+  summaryProxy: "Endpoints do Proxy que geram prévias"
+  summaryProxyDescription: "Fora do Misskey, gerar prévias usando o Sumally Proxy."
+  summaryProxyDescription2: "Os parâmetros a seguir são vinculados ao proxy como um 'query string'. Se o proxy não os suportar, os valores serão ignorados."
+_mediaControls:
+  pip: "Picture-in-Picture"
+  playbackRate: "Velocidade de Reprodução"
+  loop: "Reprodução em Loop"
+_contextMenu:
+  title: "Menu de contexto"
+  app: "Aplicativo"
+  appWithShift: "Aplicativo com a tecla shift"
+  native: "Nativo"
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index 63f2793428..2fb4a5253a 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -887,7 +887,7 @@ accountDeletionInProgress: "กำลังดำเนินการลบบ
 usernameInfo: "ชื่อที่ระบุบัญชีของคุณจากผู้อื่นในเซิร์ฟเวอร์นี้ คุณสามารถใช้ตัวอักษร (a~z, A~Z), ตัวเลข (0~9) หรือขีดล่าง (_) ชื่อผู้ใช้ไม่สามารถเปลี่ยนแปลงได้ในภายหลัง"
 aiChanMode: "โหมด Ai "
 devMode: "โหมดนักพัฒนา"
-keepCw: "เก็บคำเตือนเนื้อหา"
+keepCw: "คงการเตือนเนื้อหาไว้"
 pubSub: "บัญชี Pub/Sub"
 lastCommunication: "การสื่อสารครั้งสุดท้ายล่าสุด"
 resolved: "คลี่คลายแล้ว"
@@ -1034,15 +1034,15 @@ achievements: "ความสำเร็จ"
 gotInvalidResponseError: "การตอบสนองเซิร์ฟเวอร์ไม่ถูกต้อง"
 gotInvalidResponseErrorDescription: "เซิร์ฟเวอร์อาจไม่สามารถเข้าถึงได้หรืออาจจะกำลังอยู่ในระหว่างปรับปรุง กรุณาลองใหม่อีกครั้งในภายหลังนะคะ"
 thisPostMayBeAnnoying: "โน้ตนี้อาจจะเป็นการรบกวนผู้อื่นนะคะ"
-thisPostMayBeAnnoyingHome: "โพสต์ไปยังไทม์ไลน์หลัก"
-thisPostMayBeAnnoyingCancel: "เลิก"
-thisPostMayBeAnnoyingIgnore: "โพสต์ยังไงก็แล้วแต่"
+thisPostMayBeAnnoyingHome: "โพสต์ลงไทม์ไลน์หลักเท่านั้น"
+thisPostMayBeAnnoyingCancel: "ยกเลิก"
+thisPostMayBeAnnoyingIgnore: "โพสต์ไปเลย ไม่ต้องปรับการมองเห็น"
 collapseRenotes: "ยุบรีโน้ตที่คุณเคยเห็นแล้ว"
 collapseRenotesDescription: "พับย่อโน้ตที่เคยตอบสนองหรือรีโน้ตแล้ว"
 internalServerError: "เซิร์ฟเวอร์ภายในเกิดข้อผิดพลาด"
 internalServerErrorDescription: "เกิดข้อผิดพลาดที่ไม่คาดคิดภายในเซิร์ฟเวอร์"
 copyErrorInfo: "คัดลอกรายละเอียดข้อผิดพลาด"
-joinThisServer: "ลงทะเบียนบนเซิร์ฟเวอร์นี้"
+joinThisServer: "ลงทะเบียนในเซิร์ฟเวอร์นี้"
 exploreOtherServers: "มองหาเซิร์ฟเวอร์อื่น"
 letsLookAtTimeline: "มาดูไทม์ไลน์กัน"
 disableFederationConfirm: "ปิดใช้งานสหพันธ์เลยใช่ไหม?"
@@ -1105,7 +1105,7 @@ vertical: "แนวตั้ง"
 horizontal: "แนวนอน"
 position: "ตำแหน่ง"
 serverRules: "กฎของเซิร์ฟเวอร์"
-pleaseConfirmBelowBeforeSignup: "หากต้องการลงทะเบียนบนเซิร์ฟเวอร์นี้ คุณต้องตรวจสอบและยอมรับสิ่งต่อไปนี้"
+pleaseConfirmBelowBeforeSignup: "หากต้องการลงทะเบียนในเซิร์ฟเวอร์นี้ คุณต้องตรวจสอบและยอมรับสิ่งต่อไปนี้"
 pleaseAgreeAllToContinue: "คุณต้องยอมรับทุกช่องตรงด้านบนเพื่อดำเนินการต่อค่ะ"
 continue: "ดำเนินการต่อ"
 preservedUsernames: "ชื่อผู้ใช้ที่สงวนไว้"
@@ -1361,9 +1361,9 @@ _initialTutorial:
       localOnly: "การโพสต์ด้วย flag นี้จะไม่รวมโน้ตไปยังเซิร์ฟเวอร์อื่น ผู้ใช้บนเซิร์ฟเวอร์อื่นจะไม่สามารถดูโน้ตเหล่านี้ได้โดยตรง โดยไม่คำนึงถึงการตั้งค่าการแสดงผลข้างต้น"
     _cw:
       title: "คำเตือนเกี่ยวกับเนื้อหา"
-      description: "เนื้อหาที่เขียนด้วย “คำอธิบายประกอบ” จะแสดงแทนข้อความหลัก คลิก “ดูเพิ่มเติม” เพื่อแสดงข้อความเต็ม"
+      description: "เนื้อหาที่เขียนใน “คำอธิบายประกอบ” จะแสดงแทนเนื้อหาหลัก ต้องคลิก “ดูเพิ่มเติม” เพื่อให้เนื้อหาหลักแสดง"
       _exampleNote:
-        cw: "นี่อาจจะทำให้คุณหิวอย่างแน่นอน!"
+        cw: " ห้ามดู ระวังหิว"
         note: "เพิ่งไปกินโดนัทเคลือบช็อคโกแลตมา 🍩😋"
       useCases: "ใช้สิ่งนี้เพื่อระบุโน้ตที่ต้องตามแนวทางปฏิบัติของเซิร์ฟเวอร์ หรือเพื่อควบคุมการสปอยล์และข้อความที่ละเอียดอ่อนด้วยตนเอง"
   _howToMakeAttachmentsSensitive:
@@ -1479,15 +1479,15 @@ _achievements:
       title: "มือใหม่ III"
       description: "เข้าสู่ระบบเป็นเวลารวม 15 วัน"
     _login30:
-      title: "มิสคิสท์ I"
+      title: "มิสคิสต์ I"
       description: "เข้าสู่ระบบเป็นเวลารวม 30 วัน"
     _login60:
-      title: "มิสคิสท์ II"
+      title: "มิสคิสต์ II"
       description: "เข้าสู่ระบบเป็นเวลารวม 60 วัน"
     _login100:
-      title: "มิสคิสท์ III"
+      title: "มิสคิสต์ III"
       description: "เข้าสู่ระบบเป็นเวลารวม 100 วัน"
-      flavor: "มิสคิสต์หัวรุนแรง"
+      flavor: "Violent Misskist (ทำไมเหมือนชื่อหนังสักเรื่องจังเลยนะ)"
     _login200:
       title: "ลูกค้าประจำ I"
       description: "เข้าสู่ระบบเป็นเวลารวม 200 วัน"
@@ -2155,7 +2155,7 @@ _widgets:
   serverMetric: "ตัวชี้วัดเซิร์ฟเวอร์"
   aiscript: " คอนโซล AiScript"
   aiscriptApp: "แอป AiScript"
-  aichan: "ไอ"
+  aichan: "藍 (ไอ)"
   userList: "รายชื่อผู้ใช้"
   _userList:
     chooseList: "เลือกรายชื่อ"
@@ -2197,7 +2197,7 @@ _visibility:
   followersDescription: "เฉพาะผู้ติดตามเท่านั้นที่มองเห็นได้"
   specified: "ไดเร็ค"
   specifiedDescription: "ทำให้มองเห็นได้เฉพาะผู้ใช้ที่ระบุเท่านั้น"
-  disableFederation: "ไม่มีสหพันธ์"
+  disableFederation: "การปิดใช้งานสหพันธ์"
   disableFederationDescription: "อย่าส่งข้อมูลไปยังเซิร์ฟเวอร์อื่น"
 _postForm:
   replyPlaceholder: "ตอบกลับโน้ตนี้..."
@@ -2426,6 +2426,7 @@ _webhookSettings:
   modifyWebhook: "แก้ไข Webhook"
   name: "ชื่อ"
   secret: "ความลับ"
+  trigger: "ทริกเกอร์"
   active: "เปิดใช้งาน"
   _events:
     follow: "เมื่อกำลังติดตามผู้ใช้"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 1deb0effc3..7b68a5cfdb 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1665,6 +1665,7 @@ _achievements:
     _bubbleGameDoubleExplodingHead:
       title: "两个🤯"
       description: "你合成出了2个游戏里最大的Emoji"
+      flavor: ""
 _role:
   new: "创建角色"
   edit: "编辑角色"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 16dc464e35..3f66818669 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1967,7 +1967,7 @@ _soundSettings:
   driveFileTypeWarnDescription: "請選擇音效檔案"
   driveFileDurationWarn: "音效太長了"
   driveFileDurationWarnDescription: "使用長音效檔可能會影響 Misskey 的使用體驗。仍要使用此檔案嗎？"
-  driveFileError: "無法載入語音。請更改設定"
+  driveFileError: "無法載入語音。請變更設定"
 _ago:
   future: "未來"
   justNow: "剛剛"
@@ -2439,6 +2439,7 @@ _webhookSettings:
   _systemEvents:
     abuseReport: "當使用者檢舉時"
     abuseReportResolved: "當處理了使用者的檢舉時"
+    userCreated: "使用者被新增時"
   deleteConfirm: "請問是否要刪除 Webhook？"
 _abuseReport:
   _notificationRecipient:
@@ -2632,4 +2633,5 @@ _mediaControls:
 _contextMenu:
   title: "內容功能表"
   app: "應用程式"
+  appWithShift: "Shift 鍵應用程式"
   native: "瀏覽器的使用者介面"

From 4d757865f40da285848dab3f2eea980137ceb1ad Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 11 Aug 2024 07:59:20 +0000
Subject: [PATCH 170/221] Bump version to 2024.8.0-alpha.0

---
 CHANGELOG.md                     | 2 +-
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8468afe795..89c90bb663 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Unreleased
+## 2024.8.0
 
 ### General
 - Fix: リモートユーザのフォロー・フォロワーの一覧が非公開設定の場合も表示できてしまう問題を修正
diff --git a/package.json b/package.json
index 4bf7b0a918..1b8b1cc33e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.7.0",
+	"version": "2024.8.0-alpha.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index f0e8733e67..cf4d83f4bd 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.7.0",
+	"version": "2024.8.0-alpha.0",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 41936c16c420ff75148aa0a4c5908793d4700ea5 Mon Sep 17 00:00:00 2001
From: timesince <seekseat@icloud.com>
Date: Mon, 12 Aug 2024 13:03:16 +0800
Subject: [PATCH 171/221] chore: fix some comments (#14394)

Signed-off-by: timesince <seekseat@icloud.com>
---
 packages/backend/src/core/NoteDeleteService.ts | 2 +-
 packages/misskey-js/test-d/api.ts              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index 801ed02e00..b7c01c64c8 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -92,7 +92,7 @@ export class NoteDeleteService {
 				this.deliverToConcerned(user, note, content);
 			}
 
-			// also deliever delete activity to cascaded notes
+			// also deliver delete activity to cascaded notes
 			const federatedLocalCascadingNotes = (cascadingNotes).filter(note => !note.localOnly && note.userHost == null); // filter out local-only notes
 			for (const cascadingNote of federatedLocalCascadingNotes) {
 				if (!cascadingNote.user) continue;
diff --git a/packages/misskey-js/test-d/api.ts b/packages/misskey-js/test-d/api.ts
index 4b72ff4e9d..ca6d8dcb88 100644
--- a/packages/misskey-js/test-d/api.ts
+++ b/packages/misskey-js/test-d/api.ts
@@ -11,7 +11,7 @@ describe('API', () => {
 		expectType<Misskey.entities.MetaResponse>(res);
 	});
 
-	test('conditional respose type (meta)', async () => {
+	test('conditional response type (meta)', async () => {
 		const cli = new Misskey.api.APIClient({
 			origin: 'https://misskey.test',
 			credential: 'TOKEN'
@@ -30,7 +30,7 @@ describe('API', () => {
 		expectType<Misskey.entities.MetaResponse>(res4);
 	});
 
-	test('conditional respose type (users/show)', async () => {
+	test('conditional response type (users/show)', async () => {
 		const cli = new Misskey.api.APIClient({
 			origin: 'https://misskey.test',
 			credential: 'TOKEN'

From cd210001e6ffd6232678cbc74f06f8e6d05a1d15 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 14 Aug 2024 18:08:51 +0900
Subject: [PATCH 172/221] =?UTF-8?q?enhance(backend):=20=E5=87=8D=E7=B5=90?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=9F=E3=82=A2=E3=82=AB=E3=82=A6=E3=83=B3?=
 =?UTF-8?q?=E3=83=88=E3=81=AE=E3=83=95=E3=82=A9=E3=83=AD=E3=83=BC=E3=83=AA?=
 =?UTF-8?q?=E3=82=AF=E3=82=A8=E3=82=B9=E3=83=88=E3=82=92=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 .../backend/src/core/UserSuspendService.ts    | 79 ++++++++++++++++++-
 .../api/endpoints/admin/suspend-user.ts       | 51 +-----------
 .../api/endpoints/admin/unsuspend-user.ts     | 14 +---
 4 files changed, 81 insertions(+), 64 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89c90bb663..a3abadfe3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - Fix: mCaptchaを使用していてもbotプロテクションに関する警告が消えないのを修正
 
 ### Server
+- Enhance: 凍結されたアカウントのフォローリクエストを表示しないように
 - Fix: WSの`readAllNotifications` メッセージが `body` を持たない場合に動作しない問題 #14374
   - 通知ページや通知カラム(デッキ)を開いている状態において、新たに発生した通知が既読されない問題が修正されます。
   - これにより、プッシュ通知が有効な同条件下の環境において、プッシュ通知が常に発生してしまう問題も修正されます。
diff --git a/packages/backend/src/core/UserSuspendService.ts b/packages/backend/src/core/UserSuspendService.ts
index d594a223f4..7920e58e36 100644
--- a/packages/backend/src/core/UserSuspendService.ts
+++ b/packages/backend/src/core/UserSuspendService.ts
@@ -5,7 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { Not, IsNull } from 'typeorm';
-import type { FollowingsRepository } from '@/models/_.js';
+import type { FollowingsRepository, FollowRequestsRepository, UsersRepository } from '@/models/_.js';
 import type { MiUser } from '@/models/User.js';
 import { QueueService } from '@/core/QueueService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
@@ -13,24 +13,75 @@ import { DI } from '@/di-symbols.js';
 import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
+import { RelationshipJobData } from '@/queue/types.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
 
 @Injectable()
 export class UserSuspendService {
 	constructor(
+		@Inject(DI.usersRepository)
+		private usersRepository: UsersRepository,
+
 		@Inject(DI.followingsRepository)
 		private followingsRepository: FollowingsRepository,
 
+		@Inject(DI.followRequestsRepository)
+		private followRequestsRepository: FollowRequestsRepository,
+
 		private userEntityService: UserEntityService,
 		private queueService: QueueService,
 		private globalEventService: GlobalEventService,
 		private apRendererService: ApRendererService,
+		private moderationLogService: ModerationLogService,
 	) {
 	}
 
 	@bindThis
-	public async doPostSuspend(user: { id: MiUser['id']; host: MiUser['host'] }): Promise<void> {
+	public async suspend(user: MiUser, moderator: MiUser): Promise<void> {
+		await this.usersRepository.update(user.id, {
+			isSuspended: true,
+		});
+
+		this.moderationLogService.log(moderator, 'suspend', {
+			userId: user.id,
+			userUsername: user.username,
+			userHost: user.host,
+		});
+
+		(async () => {
+			await this.postSuspend(user).catch(e => {});
+			await this.unFollowAll(user).catch(e => {});
+		})();
+	}
+
+	@bindThis
+	public async unsuspend(user: MiUser, moderator: MiUser): Promise<void> {
+		await this.usersRepository.update(user.id, {
+			isSuspended: false,
+		});
+
+		this.moderationLogService.log(moderator, 'unsuspend', {
+			userId: user.id,
+			userUsername: user.username,
+			userHost: user.host,
+		});
+
+		(async () => {
+			await this.postUnsuspend(user).catch(e => {});
+		})();
+	}
+
+	@bindThis
+	private async postSuspend(user: { id: MiUser['id']; host: MiUser['host'] }): Promise<void> {
 		this.globalEventService.publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: true });
 
+		this.followRequestsRepository.delete({
+			followeeId: user.id,
+		});
+		this.followRequestsRepository.delete({
+			followerId: user.id,
+		});
+
 		if (this.userEntityService.isLocalUser(user)) {
 			// 知り得る全SharedInboxにDelete配信
 			const content = this.apRendererService.addContext(this.apRendererService.renderDelete(this.userEntityService.genLocalUserUri(user.id), user));
@@ -58,7 +109,7 @@ export class UserSuspendService {
 	}
 
 	@bindThis
-	public async doPostUnsuspend(user: MiUser): Promise<void> {
+	private async postUnsuspend(user: MiUser): Promise<void> {
 		this.globalEventService.publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: false });
 
 		if (this.userEntityService.isLocalUser(user)) {
@@ -86,4 +137,26 @@ export class UserSuspendService {
 			}
 		}
 	}
+
+	@bindThis
+	private async unFollowAll(follower: MiUser) {
+		const followings = await this.followingsRepository.find({
+			where: {
+				followerId: follower.id,
+				followeeId: Not(IsNull()),
+			},
+		});
+
+		const jobs: RelationshipJobData[] = [];
+		for (const following of followings) {
+			if (following.followeeId && following.followerId) {
+				jobs.push({
+					from: { id: following.followerId },
+					to: { id: following.followeeId },
+					silent: true,
+				});
+			}
+		}
+		this.queueService.createUnfollowJob(jobs);
+	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
index 8a946405cc..9f7378945e 100644
--- a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
@@ -3,18 +3,13 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { IsNull, Not } from 'typeorm';
+import { } from 'typeorm';
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { UsersRepository, FollowingsRepository } from '@/models/_.js';
-import type { MiUser } from '@/models/User.js';
-import type { RelationshipJobData } from '@/queue/types.js';
-import { ModerationLogService } from '@/core/ModerationLogService.js';
+import type { UsersRepository } from '@/models/_.js';
 import { UserSuspendService } from '@/core/UserSuspendService.js';
 import { DI } from '@/di-symbols.js';
-import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
-import { QueueService } from '@/core/QueueService.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -38,13 +33,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
-		@Inject(DI.followingsRepository)
-		private followingsRepository: FollowingsRepository,
-
 		private userSuspendService: UserSuspendService,
 		private roleService: RoleService,
-		private moderationLogService: ModerationLogService,
-		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const user = await this.usersRepository.findOneBy({ id: ps.userId });
@@ -57,42 +47,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw new Error('cannot suspend moderator account');
 			}
 
-			await this.usersRepository.update(user.id, {
-				isSuspended: true,
-			});
-
-			this.moderationLogService.log(me, 'suspend', {
-				userId: user.id,
-				userUsername: user.username,
-				userHost: user.host,
-			});
-
-			(async () => {
-				await this.userSuspendService.doPostSuspend(user).catch(e => {});
-				await this.unFollowAll(user).catch(e => {});
-			})();
+			await this.userSuspendService.suspend(user, me);
 		});
 	}
-
-	@bindThis
-	private async unFollowAll(follower: MiUser) {
-		const followings = await this.followingsRepository.find({
-			where: {
-				followerId: follower.id,
-				followeeId: Not(IsNull()),
-			},
-		});
-
-		const jobs: RelationshipJobData[] = [];
-		for (const following of followings) {
-			if (following.followeeId && following.followerId) {
-				jobs.push({
-					from: { id: following.followerId },
-					to: { id: following.followeeId },
-					silent: true,
-				});
-			}
-		}
-		this.queueService.createUnfollowJob(jobs);
-	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts
index 2c2b1bf6f5..b52c638cdb 100644
--- a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts
@@ -6,7 +6,6 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { UsersRepository } from '@/models/_.js';
-import { ModerationLogService } from '@/core/ModerationLogService.js';
 import { UserSuspendService } from '@/core/UserSuspendService.js';
 import { DI } from '@/di-symbols.js';
 
@@ -33,7 +32,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private usersRepository: UsersRepository,
 
 		private userSuspendService: UserSuspendService,
-		private moderationLogService: ModerationLogService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const user = await this.usersRepository.findOneBy({ id: ps.userId });
@@ -42,17 +40,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw new Error('user not found');
 			}
 
-			await this.usersRepository.update(user.id, {
-				isSuspended: false,
-			});
-
-			this.moderationLogService.log(me, 'unsuspend', {
-				userId: user.id,
-				userUsername: user.username,
-				userHost: user.host,
-			});
-
-			this.userSuspendService.doPostUnsuspend(user);
+			await this.userSuspendService.unsuspend(user, me);
 		});
 	}
 }

From 86dd4abadcb19c3fa4e082b7ab2dc80c5d93618b Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 14 Aug 2024 20:29:06 +0900
Subject: [PATCH 173/221] =?UTF-8?q?Revert=20"enhance(backend):=20=E5=87=8D?=
 =?UTF-8?q?=E7=B5=90=E3=81=95=E3=82=8C=E3=81=9F=E3=82=A2=E3=82=AB=E3=82=A6?=
 =?UTF-8?q?=E3=83=B3=E3=83=88=E3=81=AE=E3=83=95=E3=82=A9=E3=83=AD=E3=83=BC?=
 =?UTF-8?q?=E3=83=AA=E3=82=AF=E3=82=A8=E3=82=B9=E3=83=88=E3=82=92=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cd210001e6ffd6232678cbc74f06f8e6d05a1d15.
---
 CHANGELOG.md                                  |  1 -
 .../backend/src/core/UserSuspendService.ts    | 79 +------------------
 .../api/endpoints/admin/suspend-user.ts       | 51 +++++++++++-
 .../api/endpoints/admin/unsuspend-user.ts     | 14 +++-
 4 files changed, 64 insertions(+), 81 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3abadfe3b..89c90bb663 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,6 @@
 - Fix: mCaptchaを使用していてもbotプロテクションに関する警告が消えないのを修正
 
 ### Server
-- Enhance: 凍結されたアカウントのフォローリクエストを表示しないように
 - Fix: WSの`readAllNotifications` メッセージが `body` を持たない場合に動作しない問題 #14374
   - 通知ページや通知カラム(デッキ)を開いている状態において、新たに発生した通知が既読されない問題が修正されます。
   - これにより、プッシュ通知が有効な同条件下の環境において、プッシュ通知が常に発生してしまう問題も修正されます。
diff --git a/packages/backend/src/core/UserSuspendService.ts b/packages/backend/src/core/UserSuspendService.ts
index 7920e58e36..d594a223f4 100644
--- a/packages/backend/src/core/UserSuspendService.ts
+++ b/packages/backend/src/core/UserSuspendService.ts
@@ -5,7 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { Not, IsNull } from 'typeorm';
-import type { FollowingsRepository, FollowRequestsRepository, UsersRepository } from '@/models/_.js';
+import type { FollowingsRepository } from '@/models/_.js';
 import type { MiUser } from '@/models/User.js';
 import { QueueService } from '@/core/QueueService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
@@ -13,75 +13,24 @@ import { DI } from '@/di-symbols.js';
 import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
-import { RelationshipJobData } from '@/queue/types.js';
-import { ModerationLogService } from '@/core/ModerationLogService.js';
 
 @Injectable()
 export class UserSuspendService {
 	constructor(
-		@Inject(DI.usersRepository)
-		private usersRepository: UsersRepository,
-
 		@Inject(DI.followingsRepository)
 		private followingsRepository: FollowingsRepository,
 
-		@Inject(DI.followRequestsRepository)
-		private followRequestsRepository: FollowRequestsRepository,
-
 		private userEntityService: UserEntityService,
 		private queueService: QueueService,
 		private globalEventService: GlobalEventService,
 		private apRendererService: ApRendererService,
-		private moderationLogService: ModerationLogService,
 	) {
 	}
 
 	@bindThis
-	public async suspend(user: MiUser, moderator: MiUser): Promise<void> {
-		await this.usersRepository.update(user.id, {
-			isSuspended: true,
-		});
-
-		this.moderationLogService.log(moderator, 'suspend', {
-			userId: user.id,
-			userUsername: user.username,
-			userHost: user.host,
-		});
-
-		(async () => {
-			await this.postSuspend(user).catch(e => {});
-			await this.unFollowAll(user).catch(e => {});
-		})();
-	}
-
-	@bindThis
-	public async unsuspend(user: MiUser, moderator: MiUser): Promise<void> {
-		await this.usersRepository.update(user.id, {
-			isSuspended: false,
-		});
-
-		this.moderationLogService.log(moderator, 'unsuspend', {
-			userId: user.id,
-			userUsername: user.username,
-			userHost: user.host,
-		});
-
-		(async () => {
-			await this.postUnsuspend(user).catch(e => {});
-		})();
-	}
-
-	@bindThis
-	private async postSuspend(user: { id: MiUser['id']; host: MiUser['host'] }): Promise<void> {
+	public async doPostSuspend(user: { id: MiUser['id']; host: MiUser['host'] }): Promise<void> {
 		this.globalEventService.publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: true });
 
-		this.followRequestsRepository.delete({
-			followeeId: user.id,
-		});
-		this.followRequestsRepository.delete({
-			followerId: user.id,
-		});
-
 		if (this.userEntityService.isLocalUser(user)) {
 			// 知り得る全SharedInboxにDelete配信
 			const content = this.apRendererService.addContext(this.apRendererService.renderDelete(this.userEntityService.genLocalUserUri(user.id), user));
@@ -109,7 +58,7 @@ export class UserSuspendService {
 	}
 
 	@bindThis
-	private async postUnsuspend(user: MiUser): Promise<void> {
+	public async doPostUnsuspend(user: MiUser): Promise<void> {
 		this.globalEventService.publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: false });
 
 		if (this.userEntityService.isLocalUser(user)) {
@@ -137,26 +86,4 @@ export class UserSuspendService {
 			}
 		}
 	}
-
-	@bindThis
-	private async unFollowAll(follower: MiUser) {
-		const followings = await this.followingsRepository.find({
-			where: {
-				followerId: follower.id,
-				followeeId: Not(IsNull()),
-			},
-		});
-
-		const jobs: RelationshipJobData[] = [];
-		for (const following of followings) {
-			if (following.followeeId && following.followerId) {
-				jobs.push({
-					from: { id: following.followerId },
-					to: { id: following.followeeId },
-					silent: true,
-				});
-			}
-		}
-		this.queueService.createUnfollowJob(jobs);
-	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
index 9f7378945e..8a946405cc 100644
--- a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
@@ -3,13 +3,18 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { } from 'typeorm';
+import { IsNull, Not } from 'typeorm';
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { UsersRepository } from '@/models/_.js';
+import type { UsersRepository, FollowingsRepository } from '@/models/_.js';
+import type { MiUser } from '@/models/User.js';
+import type { RelationshipJobData } from '@/queue/types.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
 import { UserSuspendService } from '@/core/UserSuspendService.js';
 import { DI } from '@/di-symbols.js';
+import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
+import { QueueService } from '@/core/QueueService.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -33,8 +38,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
+		@Inject(DI.followingsRepository)
+		private followingsRepository: FollowingsRepository,
+
 		private userSuspendService: UserSuspendService,
 		private roleService: RoleService,
+		private moderationLogService: ModerationLogService,
+		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const user = await this.usersRepository.findOneBy({ id: ps.userId });
@@ -47,7 +57,42 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw new Error('cannot suspend moderator account');
 			}
 
-			await this.userSuspendService.suspend(user, me);
+			await this.usersRepository.update(user.id, {
+				isSuspended: true,
+			});
+
+			this.moderationLogService.log(me, 'suspend', {
+				userId: user.id,
+				userUsername: user.username,
+				userHost: user.host,
+			});
+
+			(async () => {
+				await this.userSuspendService.doPostSuspend(user).catch(e => {});
+				await this.unFollowAll(user).catch(e => {});
+			})();
 		});
 	}
+
+	@bindThis
+	private async unFollowAll(follower: MiUser) {
+		const followings = await this.followingsRepository.find({
+			where: {
+				followerId: follower.id,
+				followeeId: Not(IsNull()),
+			},
+		});
+
+		const jobs: RelationshipJobData[] = [];
+		for (const following of followings) {
+			if (following.followeeId && following.followerId) {
+				jobs.push({
+					from: { id: following.followerId },
+					to: { id: following.followeeId },
+					silent: true,
+				});
+			}
+		}
+		this.queueService.createUnfollowJob(jobs);
+	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts
index b52c638cdb..2c2b1bf6f5 100644
--- a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts
@@ -6,6 +6,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { UsersRepository } from '@/models/_.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
 import { UserSuspendService } from '@/core/UserSuspendService.js';
 import { DI } from '@/di-symbols.js';
 
@@ -32,6 +33,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private usersRepository: UsersRepository,
 
 		private userSuspendService: UserSuspendService,
+		private moderationLogService: ModerationLogService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const user = await this.usersRepository.findOneBy({ id: ps.userId });
@@ -40,7 +42,17 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw new Error('user not found');
 			}
 
-			await this.userSuspendService.unsuspend(user, me);
+			await this.usersRepository.update(user.id, {
+				isSuspended: false,
+			});
+
+			this.moderationLogService.log(me, 'unsuspend', {
+				userId: user.id,
+				userUsername: user.username,
+				userHost: user.host,
+			});
+
+			this.userSuspendService.doPostUnsuspend(user);
 		});
 	}
 }

From b68b2ee8c6102ed1c67056cf122a51d87ae5b567 Mon Sep 17 00:00:00 2001
From: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
Date: Wed, 14 Aug 2024 20:29:33 +0900
Subject: [PATCH 174/221] refactor(frontend): remove stale reload method call
 on `/admin/users` page (#14406)

---
 packages/frontend/src/pages/admin/users.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/pages/admin/users.vue b/packages/frontend/src/pages/admin/users.vue
index 7d87b97a36..d1bbb5b734 100644
--- a/packages/frontend/src/pages/admin/users.vue
+++ b/packages/frontend/src/pages/admin/users.vue
@@ -33,11 +33,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</MkSelect>
 				</div>
 				<div :class="$style.inputs">
-					<MkInput v-model="searchUsername" style="flex: 1;" type="text" :spellcheck="false" @update:modelValue="$refs.users.reload()">
+					<MkInput v-model="searchUsername" style="flex: 1;" type="text" :spellcheck="false">
 						<template #prefix>@</template>
 						<template #label>{{ i18n.ts.username }}</template>
 					</MkInput>
-					<MkInput v-model="searchHost" style="flex: 1;" type="text" :spellcheck="false" :disabled="pagination.params.origin === 'local'" @update:modelValue="$refs.users.reload()">
+					<MkInput v-model="searchHost" style="flex: 1;" type="text" :spellcheck="false" :disabled="pagination.params.origin === 'local'">
 						<template #prefix>@</template>
 						<template #label>{{ i18n.ts.host }}</template>
 					</MkInput>

From 45d88574c309dcbf014e1ebc7895caca0b8dbed6 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Thu, 15 Aug 2024 20:02:53 +0900
Subject: [PATCH 175/221] enhance(frontend): improve usability

---
 packages/frontend/src/boot/main-boot.ts | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index 2a549d1e8b..3e7c4f26f8 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -231,17 +231,18 @@ export async function mainBoot() {
 			claimAchievement('client60min');
 		}, 1000 * 60 * 60);
 
-		const lastUsed = miLocalStorage.getItem('lastUsed');
-		if (lastUsed) {
-			const lastUsedDate = parseInt(lastUsed, 10);
-			// 二時間以上前なら
-			if (Date.now() - lastUsedDate > 1000 * 60 * 60 * 2) {
-				toast(i18n.tsx.welcomeBackWithName({
-					name: $i.name || $i.username,
-				}));
-			}
-		}
-		miLocalStorage.setItem('lastUsed', Date.now().toString());
+		// 邪魔
+		//const lastUsed = miLocalStorage.getItem('lastUsed');
+		//if (lastUsed) {
+		//	const lastUsedDate = parseInt(lastUsed, 10);
+		//	// 二時間以上前なら
+		//	if (Date.now() - lastUsedDate > 1000 * 60 * 60 * 2) {
+		//		toast(i18n.tsx.welcomeBackWithName({
+		//			name: $i.name || $i.username,
+		//		}));
+		//	}
+		//}
+		//miLocalStorage.setItem('lastUsed', Date.now().toString());
 
 		const latestDonationInfoShownAt = miLocalStorage.getItem('latestDonationInfoShownAt');
 		const neverShowDonationInfo = miLocalStorage.getItem('neverShowDonationInfo');

From a8810af8d9a78c0819781001ab045a9c8cf9d171 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 16 Aug 2024 21:02:12 +0900
Subject: [PATCH 176/221] =?UTF-8?q?fix(backend):=20=E3=83=AA=E3=83=90?=
 =?UTF-8?q?=E3=83=BC=E3=82=B7=E3=81=AE=E8=A8=AD=E5=AE=9A=E5=A4=89=E6=9B=B4?=
 =?UTF-8?q?=E3=81=8C=E5=8F=8D=E6=98=A0=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20(#14404)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(backend): リバーシの設定変更が反映されないのを修正

* Update Changelog

* add bindthis
---
 CHANGELOG.md                                  |  1 +
 packages/backend/src/core/ReversiService.ts   | 33 ++++++++++++++++---
 .../api/stream/channels/reversi-game.ts       |  8 +++--
 packages/misskey-js/etc/misskey-js.api.md     |  3 ++
 packages/misskey-js/src/consts.ts             | 13 +++++---
 packages/misskey-js/src/index.ts              |  1 +
 6 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89c90bb663..9385842d62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
   (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/679)
 - Fix: ActivityPubのエンティティタイプ判定で不明なタイプを受け取った場合でも処理を継続するように
   - キュー処理のつまりが改善される可能性があります
+- Fix: リバーシの対局設定の変更が反映されないのを修正
 
 ## 2024.7.0
 
diff --git a/packages/backend/src/core/ReversiService.ts b/packages/backend/src/core/ReversiService.ts
index 7f939b99c7..51dca3da59 100644
--- a/packages/backend/src/core/ReversiService.ts
+++ b/packages/backend/src/core/ReversiService.ts
@@ -6,6 +6,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
 import { ModuleRef } from '@nestjs/core';
+import { reversiUpdateKeys } from 'misskey-js';
 import * as Reversi from 'misskey-reversi';
 import { IsNull, LessThan, MoreThan } from 'typeorm';
 import type {
@@ -399,7 +400,33 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 	}
 
 	@bindThis
-	public async updateSettings(gameId: MiReversiGame['id'], user: MiUser, key: string, value: any) {
+	public isValidReversiUpdateKey(key: unknown): key is typeof reversiUpdateKeys[number] {
+		if (typeof key !== 'string') return false;
+		return (reversiUpdateKeys as string[]).includes(key);
+	}
+
+	@bindThis
+	public isValidReversiUpdateValue<K extends typeof reversiUpdateKeys[number]>(key: K, value: unknown): value is MiReversiGame[K] {
+		switch (key) {
+			case 'map':
+				return Array.isArray(value) && value.every(row => typeof row === 'string');
+			case 'bw':
+				return typeof value === 'string' && ['random', '1', '2'].includes(value);
+			case 'isLlotheo':
+				return typeof value === 'boolean';
+			case 'canPutEverywhere':
+				return typeof value === 'boolean';
+			case 'loopedBoard':
+				return typeof value === 'boolean';
+			case 'timeLimitForEachTurn':
+				return typeof value === 'number' && value >= 0;
+			default:
+				return false;
+		}
+	}
+
+	@bindThis
+	public async updateSettings<K extends typeof reversiUpdateKeys[number]>(gameId: MiReversiGame['id'], user: MiUser, key: K, value: MiReversiGame[K]) {
 		const game = await this.get(gameId);
 		if (game == null) throw new Error('game not found');
 		if (game.isStarted) return;
@@ -407,10 +434,6 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
 		if ((game.user1Id === user.id) && game.user1Ready) return;
 		if ((game.user2Id === user.id) && game.user2Ready) return;
 
-		if (!['map', 'bw', 'isLlotheo', 'canPutEverywhere', 'loopedBoard', 'timeLimitForEachTurn'].includes(key)) return;
-
-		// TODO: より厳格なバリデーション
-
 		const updatedGame = {
 			...game,
 			[key]: value,
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 c6f4a4ae3b..7597a1cfa3 100644
--- a/packages/backend/src/server/api/stream/channels/reversi-game.ts
+++ b/packages/backend/src/server/api/stream/channels/reversi-game.ts
@@ -12,6 +12,7 @@ import { ReversiGameEntityService } from '@/core/entities/ReversiGameEntityServi
 import { isJsonObject } from '@/misc/json-value.js';
 import type { JsonObject, JsonValue } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
+import { reversiUpdateKeys } from 'misskey-js';
 
 class ReversiGameChannel extends Channel {
 	public readonly chName = 'reversiGame';
@@ -46,8 +47,9 @@ class ReversiGameChannel extends Channel {
 				break;
 			case 'updateSettings':
 				if (!isJsonObject(body)) return;
-				if (typeof body.key !== 'string') return;
-				if (!isJsonObject(body.value)) return;
+				if (!this.reversiService.isValidReversiUpdateKey(body.key)) return;
+				if (!this.reversiService.isValidReversiUpdateValue(body.key, body.value)) return;
+
 				this.updateSettings(body.key, body.value);
 				break;
 			case 'cancel':
@@ -64,7 +66,7 @@ class ReversiGameChannel extends Channel {
 	}
 
 	@bindThis
-	private async updateSettings(key: string, value: JsonObject) {
+	private async updateSettings<K extends typeof reversiUpdateKeys[number]>(key: K, value: MiReversiGame[K]) {
 		if (this.user == null) return;
 
 		this.reversiService.updateSettings(this.gameId!, this.user, key, value);
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index 16cb560a52..77a3820f46 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -2829,6 +2829,9 @@ type ReversiShowGameResponse = operations['reversi___show-game']['responses']['2
 // @public (undocumented)
 type ReversiSurrenderRequest = operations['reversi___surrender']['requestBody']['content']['application/json'];
 
+// @public (undocumented)
+export const reversiUpdateKeys: ["map", "bw", "isLlotheo", "canPutEverywhere", "loopedBoard", "timeLimitForEachTurn"];
+
 // @public (undocumented)
 type ReversiVerifyRequest = operations['reversi___verify']['requestBody']['content']['application/json'];
 
diff --git a/packages/misskey-js/src/consts.ts b/packages/misskey-js/src/consts.ts
index aa8eeb48cb..5863a0b1dd 100644
--- a/packages/misskey-js/src/consts.ts
+++ b/packages/misskey-js/src/consts.ts
@@ -1,11 +1,16 @@
 import type { operations } from './autogen/types.js';
 import type {
-	AbuseReportNotificationRecipient, Ad,
+	AbuseReportNotificationRecipient,
+	Ad,
 	Announcement,
-	EmojiDetailed, InviteCode,
+	EmojiDetailed,
+	InviteCode,
 	MetaDetailed,
 	Note,
-	Role, SystemWebhook, UserLite,
+	Role,
+	ReversiGameDetailed,
+	SystemWebhook,
+	UserLite,
 } from './autogen/models.js';
 
 export const notificationTypes = ['note', 'follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app', 'roleAssigned', 'achievementEarned'] as const;
@@ -159,7 +164,7 @@ export const reversiUpdateKeys = [
 	'canPutEverywhere',
 	'loopedBoard',
 	'timeLimitForEachTurn',
-] as const;
+] as const satisfies (keyof ReversiGameDetailed)[];
 
 export type ReversiUpdateKey = typeof reversiUpdateKeys[number];
 
diff --git a/packages/misskey-js/src/index.ts b/packages/misskey-js/src/index.ts
index 28007a8ade..7e0165d20b 100644
--- a/packages/misskey-js/src/index.ts
+++ b/packages/misskey-js/src/index.ts
@@ -22,6 +22,7 @@ export const mutedNoteReasons = consts.mutedNoteReasons;
 export const followingVisibilities = consts.followingVisibilities;
 export const followersVisibilities = consts.followersVisibilities;
 export const moderationLogTypes = consts.moderationLogTypes;
+export const reversiUpdateKeys = consts.reversiUpdateKeys;
 
 // api extractor not supported yet
 //export * as api from './api.js';

From 26322048db819e294af80b6b5cf3799da10d73dc Mon Sep 17 00:00:00 2001
From: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
Date: Fri, 16 Aug 2024 21:04:08 +0900
Subject: [PATCH 177/221] fix(frontend): correct condition to displayed as
 system account on moderation page (#14407)

---
 CHANGELOG.md                               | 1 +
 packages/frontend/src/pages/admin-user.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9385842d62..4cf454bb08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Fix: ページ遷移に失敗することがある問題を修正
 - Fix: iOSでユーザー名などがリンクとして誤検知される現象を抑制
 - Fix: mCaptchaを使用していてもbotプロテクションに関する警告が消えないのを修正
+- Fix: ユーザーのモデレーションページにおいてユーザー名にドットが入っているとシステムアカウントとして表示されてしまう問題を修正
 
 ### Server
 - Fix: WSの`readAllNotifications` メッセージが `body` を持たない場合に動作しない問題 #14374
diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue
index 1459997dcb..7cab8bf8bd 100644
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@@ -22,7 +22,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</div>
 				</div>
 
-				<MkInfo v-if="user.username.includes('.')">{{ i18n.ts.isSystemAccount }}</MkInfo>
+				<MkInfo v-if="['instance.actor', 'relay.actor'].includes(user.username)">{{ i18n.ts.isSystemAccount }}</MkInfo>
 
 				<FormLink v-if="user.host" :to="`/instance-info/${user.host}`">{{ i18n.ts.instanceInfo }}</FormLink>
 

From 6db3c50e32eb985ed76543e68ef0d75ffdad6874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 16 Aug 2024 21:43:20 +0900
Subject: [PATCH 178/221] =?UTF-8?q?fix(frontend):=20Misskey=E3=81=AE?=
 =?UTF-8?q?=E5=88=A9=E7=94=A8=E4=B8=AD=E3=81=AB=E4=BD=BF=E7=94=A8=E3=81=A7?=
 =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=BF=E3=82=A4=E3=83=A0=E3=83=A9=E3=82=A4?=
 =?UTF-8?q?=E3=83=B3=E3=81=AE=E7=A8=AE=E9=A1=9E=E3=81=8C=E5=A4=89=E5=8C=96?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E5=A0=B4=E5=90=88=E3=80=81=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E3=82=BF=E3=82=A4=E3=83=A0?=
 =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=B3=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=20(#1441?=
 =?UTF-8?q?2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): Misskeyの利用中に使用できるタイムラインの種類が変化した場合、使用できないタイムラインが表示されないように

* Update timeline.vue

* Update timeline.vue
---
 packages/frontend/src/pages/timeline.vue | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index 32f6dd0e5a..258d1443d9 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -34,7 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, watch, provide, shallowRef, ref } from 'vue';
+import { computed, watch, provide, shallowRef, ref, onMounted, onActivated } from 'vue';
 import type { Tab } from '@/components/global/MkPageHeader.tabs.vue';
 import MkTimeline from '@/components/MkTimeline.vue';
 import MkInfo from '@/components/MkInfo.vue';
@@ -53,15 +53,18 @@ import { deepMerge } from '@/scripts/merge.js';
 import { MenuItem } from '@/types/menu.js';
 import { miLocalStorage } from '@/local-storage.js';
 import { availableBasicTimelines, hasWithReplies, isAvailableBasicTimeline, isBasicTimeline, basicTimelineIconClass } from '@/timelines.js';
-
+import type { BasicTimelineType } from '@/timelines.js';
+	
 provide('shouldOmitHeaderTitle', true);
 
 const tlComponent = shallowRef<InstanceType<typeof MkTimeline>>();
 const rootEl = shallowRef<HTMLElement>();
 
+type TimelinePageSrc = BasicTimelineType & `list:${string}`;
+
 const queue = ref(0);
 const srcWhenNotSignin = ref<'local' | 'global'>(isAvailableBasicTimeline('local') ? 'local' : 'global');
-const src = computed<'home' | 'local' | 'social' | 'global' | `list:${string}`>({
+const src = computed<TimelinePageSrc>({
 	get: () => ($i ? defaultStore.reactiveState.tl.value.src : srcWhenNotSignin.value),
 	set: (x) => saveSrc(x),
 });
@@ -195,7 +198,7 @@ async function chooseChannel(ev: MouseEvent): Promise<void> {
 	os.popupMenu(items, ev.currentTarget ?? ev.target);
 }
 
-function saveSrc(newSrc: 'home' | 'local' | 'social' | 'global' | `list:${string}`): void {
+function saveSrc(newSrc: TimelinePageSrc): void {
 	const out = deepMerge({ src: newSrc }, defaultStore.state.tl);
 
 	if (newSrc.startsWith('userList:')) {
@@ -236,6 +239,19 @@ function closeTutorial(): void {
 	defaultStore.set('timelineTutorials', before);
 }
 
+function switchTlIfNeeded() {
+	if (isBasicTimeline(src.value) && !availableBasicTimelines().includes(src.value)) {
+		src.value = availableBasicTimelines()[0];
+	}
+}
+
+onMounted(() => {
+	switchTlIfNeeded();
+});
+onActivated(() => {
+	switchTlIfNeeded();
+});
+
 const headerActions = computed(() => {
 	const tmp = [
 		{

From 748a7e8f6a6ac7e0b4008ef873288a8648c2c286 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Fri, 16 Aug 2024 21:47:44 +0900
Subject: [PATCH 179/221] feat: localizable dialog title for enter section
 title (#14401)

* feat: localizable dialog title for enter section title

* refactor: define `getPageBlockList` in separated file and import instead of provide/inject
---
 locales/index.d.ts                                |  4 ++++
 locales/ja-JP.yml                                 |  1 +
 packages/frontend/src/pages/page-editor/common.ts | 15 +++++++++++++++
 .../page-editor/els/page-editor.el.section.vue    |  5 ++---
 .../src/pages/page-editor/page-editor.vue         | 11 +----------
 5 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 packages/frontend/src/pages/page-editor/common.ts

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 91d36a14a6..9252b5ae10 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -8985,6 +8985,10 @@ export interface Locale extends ILocale {
          * ブロックを追加
          */
         "chooseBlock": string;
+        /**
+         * セクションタイトルを入力
+         */
+        "enterSectionTitle": string;
         /**
          * 種類を選択
          */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index b493183974..c655e4678d 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2371,6 +2371,7 @@ _pages:
   eyeCatchingImageSet: "アイキャッチ画像を設定"
   eyeCatchingImageRemove: "アイキャッチ画像を削除"
   chooseBlock: "ブロックを追加"
+  enterSectionTitle: "セクションタイトルを入力"
   selectType: "種類を選択"
   contentBlocks: "コンテンツ"
   inputBlocks: "入力"
diff --git a/packages/frontend/src/pages/page-editor/common.ts b/packages/frontend/src/pages/page-editor/common.ts
new file mode 100644
index 0000000000..420c8fc967
--- /dev/null
+++ b/packages/frontend/src/pages/page-editor/common.ts
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { i18n } from '@/i18n.js';
+
+export function getPageBlockList() {
+	return [
+		{ value: 'section', text: i18n.ts._pages.blocks.section },
+		{ value: 'text', text: i18n.ts._pages.blocks.text },
+		{ value: 'image', text: i18n.ts._pages.blocks.image },
+		{ value: 'note', text: i18n.ts._pages.blocks.note },
+	];
+}
diff --git a/packages/frontend/src/pages/page-editor/els/page-editor.el.section.vue b/packages/frontend/src/pages/page-editor/els/page-editor.el.section.vue
index 47e9c08c2c..0f8dc33143 100644
--- a/packages/frontend/src/pages/page-editor/els/page-editor.el.section.vue
+++ b/packages/frontend/src/pages/page-editor/els/page-editor.el.section.vue
@@ -29,6 +29,7 @@ import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
 import { deepClone } from '@/scripts/clone.js';
 import MkButton from '@/components/MkButton.vue';
+import { getPageBlockList } from '@/pages/page-editor/common.js';
 
 const XBlocks = defineAsyncComponent(() => import('../page-editor.blocks.vue'));
 
@@ -53,11 +54,9 @@ watch(children, () => {
 	deep: true,
 });
 
-const getPageBlockList = inject<(any) => any>('getPageBlockList');
-
 async function rename() {
 	const { canceled, result: title } = await os.inputText({
-		title: 'Enter title',
+		title: i18n.ts._pages.enterSectionTitle,
 		default: props.modelValue.title,
 	});
 	if (canceled) return;
diff --git a/packages/frontend/src/pages/page-editor/page-editor.vue b/packages/frontend/src/pages/page-editor/page-editor.vue
index af32fd2274..eaef7c337a 100644
--- a/packages/frontend/src/pages/page-editor/page-editor.vue
+++ b/packages/frontend/src/pages/page-editor/page-editor.vue
@@ -77,6 +77,7 @@ import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { $i } from '@/account.js';
 import { mainRouter } from '@/router/main.js';
+import { getPageBlockList } from '@/pages/page-editor/common.js';
 
 const props = defineProps<{
 	initPageId?: string;
@@ -101,7 +102,6 @@ const alignCenter = ref(false);
 const hideTitleWhenPinned = ref(false);
 
 provide('readonly', readonly.value);
-provide('getPageBlockList', getPageBlockList);
 
 watch(eyeCatchingImageId, async () => {
 	if (eyeCatchingImageId.value == null) {
@@ -216,15 +216,6 @@ async function add() {
 	content.value.push({ id, type });
 }
 
-function getPageBlockList() {
-	return [
-		{ value: 'section', text: i18n.ts._pages.blocks.section },
-		{ value: 'text', text: i18n.ts._pages.blocks.text },
-		{ value: 'image', text: i18n.ts._pages.blocks.image },
-		{ value: 'note', text: i18n.ts._pages.blocks.note },
-	];
-}
-
 function setEyeCatchingImage(img) {
 	selectFile(img.currentTarget ?? img.target, null).then(file => {
 		eyeCatchingImageId.value = file.id;

From 571566d47627b9612a1b341e641d3ffe11b462f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 16 Aug 2024 22:01:01 +0900
Subject: [PATCH 180/221] Update timeline.vue (fix wrong type)

---
 packages/frontend/src/pages/timeline.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index 258d1443d9..c4bff3a0b8 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -60,7 +60,7 @@ provide('shouldOmitHeaderTitle', true);
 const tlComponent = shallowRef<InstanceType<typeof MkTimeline>>();
 const rootEl = shallowRef<HTMLElement>();
 
-type TimelinePageSrc = BasicTimelineType & `list:${string}`;
+type TimelinePageSrc = BasicTimelineType | `list:${string}`;
 
 const queue = ref(0);
 const srcWhenNotSignin = ref<'local' | 'global'>(isAvailableBasicTimeline('local') ? 'local' : 'global');

From d3cdc0880274bf90541a77812deff073ed05b1bc Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 17 Aug 2024 09:30:03 +0900
Subject: [PATCH 181/221] =?UTF-8?q?fix(backend):=20=E7=84=A1=E5=88=B6?=
 =?UTF-8?q?=E9=99=90=E3=81=AB=E3=82=B9=E3=83=88=E3=83=AA=E3=83=BC=E3=83=9F?=
 =?UTF-8?q?=E3=83=B3=E3=82=B0=E3=81=AE=E3=83=81=E3=83=A3=E3=83=B3=E3=83=8D?=
 =?UTF-8?q?=E3=83=AB=E3=81=AB=E6=8E=A5=E7=B6=9A=E3=81=A7=E3=81=8D=E3=82=8B?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                         | 1 +
 packages/backend/src/server/api/stream/Connection.ts | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cf454bb08..5007acb24e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 - Fix: ActivityPubのエンティティタイプ判定で不明なタイプを受け取った場合でも処理を継続するように
   - キュー処理のつまりが改善される可能性があります
 - Fix: リバーシの対局設定の変更が反映されないのを修正
+- Fix: 無制限にストリーミングのチャンネルに接続できる問題を修正
 
 ## 2024.7.0
 
diff --git a/packages/backend/src/server/api/stream/Connection.ts b/packages/backend/src/server/api/stream/Connection.ts
index 7773150b74..0fb5238c78 100644
--- a/packages/backend/src/server/api/stream/Connection.ts
+++ b/packages/backend/src/server/api/stream/Connection.ts
@@ -20,6 +20,8 @@ import type { ChannelsService } from './ChannelsService.js';
 import type { EventEmitter } from 'events';
 import type Channel from './channel.js';
 
+const MAX_CHANNELS_PER_CONNECTION = 32;
+
 /**
  * Main stream connection
  */
@@ -255,6 +257,10 @@ export default class Connection {
 	 */
 	@bindThis
 	public connectChannel(id: string, params: JsonObject | undefined, channel: string, pong = false) {
+		if (this.channels.length >= MAX_CHANNELS_PER_CONNECTION) {
+			return;
+		}
+
 		const channelService = this.channelsService.getChannelService(channel);
 
 		if (channelService.requireCredential && this.user == null) {

From bfaf938609306dd228849e18a4fbd0c99c5ad48c Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 17 Aug 2024 09:38:16 +0900
Subject: [PATCH 182/221] update misskey-dev/eslint-plugin

---
 package.json   |  2 +-
 pnpm-lock.yaml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 1b8b1cc33e..991188b2cb 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
 		"glob": "11.0.0"
 	},
 	"devDependencies": {
-		"@misskey-dev/eslint-plugin": "2.0.2",
+		"@misskey-dev/eslint-plugin": "2.0.3",
 		"@types/node": "20.14.12",
 		"@typescript-eslint/eslint-plugin": "7.17.0",
 		"@typescript-eslint/parser": "7.17.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 613646d1bb..71ce6f6c63 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -51,8 +51,8 @@ importers:
         version: 4.4.0(encoding@0.1.13)
     devDependencies:
       '@misskey-dev/eslint-plugin':
-        specifier: 2.0.2
-        version: 2.0.2(@eslint/compat@1.1.1)(@typescript-eslint/eslint-plugin@7.17.0(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0)(typescript@5.5.4))(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0))(eslint@9.8.0)(globals@15.8.0)
+        specifier: 2.0.3
+        version: 2.0.3(@eslint/compat@1.1.1)(@typescript-eslint/eslint-plugin@7.17.0(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0)(typescript@5.5.4))(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0))(eslint@9.8.0)(globals@15.8.0)
       '@types/node':
         specifier: 20.14.12
         version: 20.14.12
@@ -3235,8 +3235,8 @@ packages:
   '@misskey-dev/browser-image-resizer@2024.1.0':
     resolution: {integrity: sha512-4EnO0zLW5NDtng3Gaz5MuT761uiuoOuplwX18wBqgj8w56LTU5BjLn/vbHwDIIe0j2gwqDYhMb7bDjmr1/Fomg==}
 
-  '@misskey-dev/eslint-plugin@2.0.2':
-    resolution: {integrity: sha512-bnTqxCSP0CIN0xSpIGib13bz+K8/3e4h8OlQjuCPlhZF7oFwtn339EZM8yJkHg6gdfciV8KOr3gzlLyG3jiVEQ==}
+  '@misskey-dev/eslint-plugin@2.0.3':
+    resolution: {integrity: sha512-Gd7chezh53Gq4BZ+Tw/uRi4t5DocXR+vTFuTSRpwrZjbyTk6tWMHLV0EtaGY/6GT+Q6WH3UMJYExsFyHFK+JPw==}
     peerDependencies:
       '@eslint/compat': '>= 1'
       '@typescript-eslint/eslint-plugin': '>= 7'
@@ -14472,7 +14472,7 @@ snapshots:
 
   '@misskey-dev/browser-image-resizer@2024.1.0': {}
 
-  '@misskey-dev/eslint-plugin@2.0.2(@eslint/compat@1.1.1)(@typescript-eslint/eslint-plugin@7.17.0(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0)(typescript@5.5.4))(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0))(eslint@9.8.0)(globals@15.8.0)':
+  '@misskey-dev/eslint-plugin@2.0.3(@eslint/compat@1.1.1)(@typescript-eslint/eslint-plugin@7.17.0(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0)(typescript@5.5.4))(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0))(eslint@9.8.0)(globals@15.8.0)':
     dependencies:
       '@eslint/compat': 1.1.1
       '@typescript-eslint/eslint-plugin': 7.17.0(@typescript-eslint/parser@7.17.0(eslint@9.8.0)(typescript@5.5.4))(eslint@9.8.0)(typescript@5.5.4)

From ef950a345bfd520a20336b55f2e7e095a4b9ebf0 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 17 Aug 2024 09:57:28 +0900
Subject: [PATCH 183/221] =?UTF-8?q?suspend=E5=91=A8=E3=82=8A=E3=81=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BF=AE=20(#14409)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance(backend): 凍結されたアカウントのフォローリクエストを表示しないように

* Update CHANGELOG.md

* wip

* Update gen-spec.ts

* Update packages/backend/src/server/api/endpoints/admin/suspend-user.ts

Co-authored-by: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>

* owa-

* revert misskey-js related changes (#14414)

---------

Co-authored-by: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>
Co-authored-by: anatawa12 <anatawa12@icloud.com>
---
 CHANGELOG.md                                  |  4 +-
 locales/index.d.ts                            |  4 +
 locales/ja-JP.yml                             |  1 +
 .../backend/src/core/DeleteAccountService.ts  | 62 ++++++++++++---
 .../backend/src/core/UserSuspendService.ts    | 79 ++++++++++++++++++-
 .../api/endpoints/admin/accounts/delete.ts    | 23 +-----
 .../api/endpoints/admin/suspend-user.ts       | 50 +-----------
 .../api/endpoints/admin/unsuspend-user.ts     | 14 +---
 packages/backend/src/types.ts                 |  6 ++
 .../src/pages/admin/modlog.ModLog.vue         |  7 +-
 packages/misskey-js/etc/misskey-js.api.md     |  5 +-
 packages/misskey-js/src/consts.ts             |  6 ++
 packages/misskey-js/src/entities.ts           |  3 +
 13 files changed, 166 insertions(+), 98 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5007acb24e..74e3cb99a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
 ## 2024.8.0
 
 ### General
-- Fix: リモートユーザのフォロー・フォロワーの一覧が非公開設定の場合も表示できてしまう問題を修正
 - Enhance: モデレーターはすべてのユーザーのフォロー・フォロワーの一覧を見られるように
+- Enhance: アカウントの削除のモデレーションログを残すように
+- Fix: リモートユーザのフォロー・フォロワーの一覧が非公開設定の場合も表示できてしまう問題を修正
 
 ### Client
 - Enhance: 「自分のPlay」ページにおいてPlayが非公開かどうかが一目でわかるように
@@ -13,6 +14,7 @@
 - Fix: ユーザーのモデレーションページにおいてユーザー名にドットが入っているとシステムアカウントとして表示されてしまう問題を修正
 
 ### Server
+- Enhance: 凍結されたアカウントのフォローリクエストを表示しないように
 - Fix: WSの`readAllNotifications` メッセージが `body` を持たない場合に動作しない問題 #14374
   - 通知ページや通知カラム(デッキ)を開いている状態において、新たに発生した通知が既読されない問題が修正されます。
   - これにより、プッシュ通知が有効な同条件下の環境において、プッシュ通知が常に発生してしまう問題も修正されます。
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 9252b5ae10..2ab5f5797e 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -9683,6 +9683,10 @@ export interface Locale extends ILocale {
          * 通報の通知先を削除
          */
         "deleteAbuseReportNotificationRecipient": string;
+        /**
+         * アカウントを削除
+         */
+        "deleteAccount": string;
     };
     "_fileViewer": {
         /**
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index c655e4678d..fac5b1e533 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2568,6 +2568,7 @@ _moderationLogTypes:
   createAbuseReportNotificationRecipient: "通報の通知先を作成"
   updateAbuseReportNotificationRecipient: "通報の通知先を更新"
   deleteAbuseReportNotificationRecipient: "通報の通知先を削除"
+  deleteAccount: "アカウントを削除"
 
 _fileViewer:
   title: "ファイルの詳細"
diff --git a/packages/backend/src/core/DeleteAccountService.ts b/packages/backend/src/core/DeleteAccountService.ts
index 79b614edba..7f1b8f3efb 100644
--- a/packages/backend/src/core/DeleteAccountService.ts
+++ b/packages/backend/src/core/DeleteAccountService.ts
@@ -4,12 +4,15 @@
  */
 
 import { Inject, Injectable } from '@nestjs/common';
-import type { UsersRepository } from '@/models/_.js';
+import { Not, IsNull } from 'typeorm';
+import type { FollowingsRepository, MiUser, UsersRepository } from '@/models/_.js';
 import { QueueService } from '@/core/QueueService.js';
-import { UserSuspendService } from '@/core/UserSuspendService.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
 
 @Injectable()
 export class DeleteAccountService {
@@ -17,9 +20,14 @@ export class DeleteAccountService {
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
-		private userSuspendService: UserSuspendService,
+		@Inject(DI.followingsRepository)
+		private followingsRepository: FollowingsRepository,
+
+		private userEntityService: UserEntityService,
+		private apRendererService: ApRendererService,
 		private queueService: QueueService,
 		private globalEventService: GlobalEventService,
+		private moderationLogService: ModerationLogService,
 	) {
 	}
 
@@ -27,16 +35,52 @@ export class DeleteAccountService {
 	public async deleteAccount(user: {
 		id: string;
 		host: string | null;
-	}): Promise<void> {
+	}, moderator?: MiUser): Promise<void> {
 		const _user = await this.usersRepository.findOneByOrFail({ id: user.id });
 		if (_user.isRoot) throw new Error('cannot delete a root account');
 
-		// 物理削除する前にDelete activityを送信する
-		await this.userSuspendService.doPostSuspend(user).catch(e => {});
+		if (moderator != null) {
+			this.moderationLogService.log(moderator, 'deleteAccount', {
+				userId: user.id,
+				userUsername: _user.username,
+				userHost: user.host,
+			});
+		}
 
-		this.queueService.createDeleteAccountJob(user, {
-			soft: false,
-		});
+		// 物理削除する前にDelete activityを送信する
+		if (this.userEntityService.isLocalUser(user)) {
+			// 知り得る全SharedInboxにDelete配信
+			const content = this.apRendererService.addContext(this.apRendererService.renderDelete(this.userEntityService.genLocalUserUri(user.id), user));
+
+			const queue: string[] = [];
+
+			const followings = await this.followingsRepository.find({
+				where: [
+					{ followerSharedInbox: Not(IsNull()) },
+					{ followeeSharedInbox: Not(IsNull()) },
+				],
+				select: ['followerSharedInbox', 'followeeSharedInbox'],
+			});
+
+			const inboxes = followings.map(x => x.followerSharedInbox ?? x.followeeSharedInbox);
+
+			for (const inbox of inboxes) {
+				if (inbox != null && !queue.includes(inbox)) queue.push(inbox);
+			}
+
+			for (const inbox of queue) {
+				this.queueService.deliver(user, content, inbox, true);
+			}
+
+			this.queueService.createDeleteAccountJob(user, {
+				soft: false,
+			});
+		} else {
+			// リモートユーザーの削除は、完全にDBから物理削除してしまうと再度連合してきてアカウントが復活する可能性があるため、soft指定する
+			this.queueService.createDeleteAccountJob(user, {
+				soft: true,
+			});
+		}
 
 		await this.usersRepository.update(user.id, {
 			isDeleted: true,
diff --git a/packages/backend/src/core/UserSuspendService.ts b/packages/backend/src/core/UserSuspendService.ts
index d594a223f4..7920e58e36 100644
--- a/packages/backend/src/core/UserSuspendService.ts
+++ b/packages/backend/src/core/UserSuspendService.ts
@@ -5,7 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { Not, IsNull } from 'typeorm';
-import type { FollowingsRepository } from '@/models/_.js';
+import type { FollowingsRepository, FollowRequestsRepository, UsersRepository } from '@/models/_.js';
 import type { MiUser } from '@/models/User.js';
 import { QueueService } from '@/core/QueueService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
@@ -13,24 +13,75 @@ import { DI } from '@/di-symbols.js';
 import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
+import { RelationshipJobData } from '@/queue/types.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
 
 @Injectable()
 export class UserSuspendService {
 	constructor(
+		@Inject(DI.usersRepository)
+		private usersRepository: UsersRepository,
+
 		@Inject(DI.followingsRepository)
 		private followingsRepository: FollowingsRepository,
 
+		@Inject(DI.followRequestsRepository)
+		private followRequestsRepository: FollowRequestsRepository,
+
 		private userEntityService: UserEntityService,
 		private queueService: QueueService,
 		private globalEventService: GlobalEventService,
 		private apRendererService: ApRendererService,
+		private moderationLogService: ModerationLogService,
 	) {
 	}
 
 	@bindThis
-	public async doPostSuspend(user: { id: MiUser['id']; host: MiUser['host'] }): Promise<void> {
+	public async suspend(user: MiUser, moderator: MiUser): Promise<void> {
+		await this.usersRepository.update(user.id, {
+			isSuspended: true,
+		});
+
+		this.moderationLogService.log(moderator, 'suspend', {
+			userId: user.id,
+			userUsername: user.username,
+			userHost: user.host,
+		});
+
+		(async () => {
+			await this.postSuspend(user).catch(e => {});
+			await this.unFollowAll(user).catch(e => {});
+		})();
+	}
+
+	@bindThis
+	public async unsuspend(user: MiUser, moderator: MiUser): Promise<void> {
+		await this.usersRepository.update(user.id, {
+			isSuspended: false,
+		});
+
+		this.moderationLogService.log(moderator, 'unsuspend', {
+			userId: user.id,
+			userUsername: user.username,
+			userHost: user.host,
+		});
+
+		(async () => {
+			await this.postUnsuspend(user).catch(e => {});
+		})();
+	}
+
+	@bindThis
+	private async postSuspend(user: { id: MiUser['id']; host: MiUser['host'] }): Promise<void> {
 		this.globalEventService.publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: true });
 
+		this.followRequestsRepository.delete({
+			followeeId: user.id,
+		});
+		this.followRequestsRepository.delete({
+			followerId: user.id,
+		});
+
 		if (this.userEntityService.isLocalUser(user)) {
 			// 知り得る全SharedInboxにDelete配信
 			const content = this.apRendererService.addContext(this.apRendererService.renderDelete(this.userEntityService.genLocalUserUri(user.id), user));
@@ -58,7 +109,7 @@ export class UserSuspendService {
 	}
 
 	@bindThis
-	public async doPostUnsuspend(user: MiUser): Promise<void> {
+	private async postUnsuspend(user: MiUser): Promise<void> {
 		this.globalEventService.publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: false });
 
 		if (this.userEntityService.isLocalUser(user)) {
@@ -86,4 +137,26 @@ export class UserSuspendService {
 			}
 		}
 	}
+
+	@bindThis
+	private async unFollowAll(follower: MiUser) {
+		const followings = await this.followingsRepository.find({
+			where: {
+				followerId: follower.id,
+				followeeId: Not(IsNull()),
+			},
+		});
+
+		const jobs: RelationshipJobData[] = [];
+		for (const following of followings) {
+			if (following.followeeId && following.followerId) {
+				jobs.push({
+					from: { id: following.followerId },
+					to: { id: following.followeeId },
+					silent: true,
+				});
+			}
+		}
+		this.queueService.createUnfollowJob(jobs);
+	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
index 4074e416b8..01dea703a3 100644
--- a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
@@ -7,9 +7,9 @@ import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { UsersRepository } from '@/models/_.js';
 import { QueueService } from '@/core/QueueService.js';
-import { UserSuspendService } from '@/core/UserSuspendService.js';
 import { DI } from '@/di-symbols.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { DeleteAccountService } from '@/core/DeleteAccountService.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -33,9 +33,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
-		private userEntityService: UserEntityService,
-		private queueService: QueueService,
-		private userSuspendService: UserSuspendService,
+		private deleteAccoountService: DeleteAccountService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const user = await this.usersRepository.findOneBy({ id: ps.userId });
@@ -48,22 +46,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw new Error('cannot delete a root account');
 			}
 
-			if (this.userEntityService.isLocalUser(user)) {
-				// 物理削除する前にDelete activityを送信する
-				await this.userSuspendService.doPostSuspend(user).catch(err => {});
-
-				this.queueService.createDeleteAccountJob(user, {
-					soft: false,
-				});
-			} else {
-				this.queueService.createDeleteAccountJob(user, {
-					soft: true, // リモートユーザーの削除は、完全にDBから物理削除してしまうと再度連合してきてアカウントが復活する可能性があるため、soft指定する
-				});
-			}
-
-			await this.usersRepository.update(user.id, {
-				isDeleted: true,
-			});
+			await this.deleteAccoountService.deleteAccount(user);
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
index 8a946405cc..bea1bdc4ed 100644
--- a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
@@ -3,18 +3,12 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { IsNull, Not } from 'typeorm';
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { UsersRepository, FollowingsRepository } from '@/models/_.js';
-import type { MiUser } from '@/models/User.js';
-import type { RelationshipJobData } from '@/queue/types.js';
-import { ModerationLogService } from '@/core/ModerationLogService.js';
+import type { UsersRepository } from '@/models/_.js';
 import { UserSuspendService } from '@/core/UserSuspendService.js';
 import { DI } from '@/di-symbols.js';
-import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
-import { QueueService } from '@/core/QueueService.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -38,13 +32,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
-		@Inject(DI.followingsRepository)
-		private followingsRepository: FollowingsRepository,
-
 		private userSuspendService: UserSuspendService,
 		private roleService: RoleService,
-		private moderationLogService: ModerationLogService,
-		private queueService: QueueService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const user = await this.usersRepository.findOneBy({ id: ps.userId });
@@ -57,42 +46,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw new Error('cannot suspend moderator account');
 			}
 
-			await this.usersRepository.update(user.id, {
-				isSuspended: true,
-			});
-
-			this.moderationLogService.log(me, 'suspend', {
-				userId: user.id,
-				userUsername: user.username,
-				userHost: user.host,
-			});
-
-			(async () => {
-				await this.userSuspendService.doPostSuspend(user).catch(e => {});
-				await this.unFollowAll(user).catch(e => {});
-			})();
+			await this.userSuspendService.suspend(user, me);
 		});
 	}
-
-	@bindThis
-	private async unFollowAll(follower: MiUser) {
-		const followings = await this.followingsRepository.find({
-			where: {
-				followerId: follower.id,
-				followeeId: Not(IsNull()),
-			},
-		});
-
-		const jobs: RelationshipJobData[] = [];
-		for (const following of followings) {
-			if (following.followeeId && following.followerId) {
-				jobs.push({
-					from: { id: following.followerId },
-					to: { id: following.followeeId },
-					silent: true,
-				});
-			}
-		}
-		this.queueService.createUnfollowJob(jobs);
-	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts
index 2c2b1bf6f5..b52c638cdb 100644
--- a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts
@@ -6,7 +6,6 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { UsersRepository } from '@/models/_.js';
-import { ModerationLogService } from '@/core/ModerationLogService.js';
 import { UserSuspendService } from '@/core/UserSuspendService.js';
 import { DI } from '@/di-symbols.js';
 
@@ -33,7 +32,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private usersRepository: UsersRepository,
 
 		private userSuspendService: UserSuspendService,
-		private moderationLogService: ModerationLogService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const user = await this.usersRepository.findOneBy({ id: ps.userId });
@@ -42,17 +40,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw new Error('user not found');
 			}
 
-			await this.usersRepository.update(user.id, {
-				isSuspended: false,
-			});
-
-			this.moderationLogService.log(me, 'unsuspend', {
-				userId: user.id,
-				userUsername: user.username,
-				userHost: user.host,
-			});
-
-			this.userSuspendService.doPostUnsuspend(user);
+			await this.userSuspendService.unsuspend(user, me);
 		});
 	}
 }
diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
index ecbbee4eff..dbeb232926 100644
--- a/packages/backend/src/types.ts
+++ b/packages/backend/src/types.ts
@@ -96,6 +96,7 @@ export const moderationLogTypes = [
 	'createAbuseReportNotificationRecipient',
 	'updateAbuseReportNotificationRecipient',
 	'deleteAbuseReportNotificationRecipient',
+	'deleteAccount',
 ] as const;
 
 export type ModerationLogPayloads = {
@@ -314,6 +315,11 @@ export type ModerationLogPayloads = {
 		recipientId: string;
 		recipient: any;
 	};
+	deleteAccount: {
+		userId: string;
+		userUsername: string;
+		userHost: string | null;
+	};
 };
 
 export type Serialized<T> = {
diff --git a/packages/frontend/src/pages/admin/modlog.ModLog.vue b/packages/frontend/src/pages/admin/modlog.ModLog.vue
index 91f1c7c5e6..eb50d068d9 100644
--- a/packages/frontend/src/pages/admin/modlog.ModLog.vue
+++ b/packages/frontend/src/pages/admin/modlog.ModLog.vue
@@ -21,12 +21,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 				].includes(log.type),
 				[$style.logYellow]: [
 					'markSensitiveDriveFile',
-					'resetPassword'
+					'resetPassword',
+					'suspendRemoteInstance',
 				].includes(log.type),
 				[$style.logRed]: [
 					'suspend',
 					'deleteRole',
-					'suspendRemoteInstance',
 					'deleteGlobalAnnouncement',
 					'deleteUserAnnouncement',
 					'deleteCustomEmoji',
@@ -36,6 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					'deleteAvatarDecoration',
 					'deleteSystemWebhook',
 					'deleteAbuseReportNotificationRecipient',
+					'deleteAccount',
 				].includes(log.type)
 			}"
 		>{{ i18n.ts._moderationLogTypes[log.type] }}</b>
@@ -72,6 +73,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<span v-else-if="log.type === 'createAbuseReportNotificationRecipient'">: {{ log.info.recipient.name }}</span>
 		<span v-else-if="log.type === 'updateAbuseReportNotificationRecipient'">: {{ log.info.before.name }}</span>
 		<span v-else-if="log.type === 'deleteAbuseReportNotificationRecipient'">: {{ log.info.recipient.name }}</span>
+		<span v-else-if="log.type === 'deleteAccount'">: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}</span>
 	</template>
 	<template #icon>
 		<MkAvatar :user="log.user" :class="$style.avatar"/>
@@ -143,7 +145,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 		</template>
 		<template v-else-if="log.type === 'updateRemoteInstanceNote'">
-			<div>{{ i18n.ts.user }}: {{ log.info.userId }}</div>
 			<div :class="$style.diff">
 				<CodeDiff :context="5" :hideHeader="true" :oldString="log.info.before ?? ''" :newString="log.info.after ?? ''" maxHeight="300px"/>
 			</div>
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index 77a3820f46..b7bb1088bd 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -2478,10 +2478,13 @@ type ModerationLog = {
 } | {
     type: 'deleteAbuseReportNotificationRecipient';
     info: ModerationLogPayloads['deleteAbuseReportNotificationRecipient'];
+} | {
+    type: 'deleteAccount';
+    info: ModerationLogPayloads['deleteAccount'];
 });
 
 // @public (undocumented)
-export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "unsuspend", "updateUserNote", "addCustomEmoji", "updateCustomEmoji", "deleteCustomEmoji", "assignRole", "unassignRole", "createRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "suspendRemoteInstance", "unsuspendRemoteInstance", "updateRemoteInstanceNote", "markSensitiveDriveFile", "unmarkSensitiveDriveFile", "resolveAbuseReport", "createInvitation", "createAd", "updateAd", "deleteAd", "createAvatarDecoration", "updateAvatarDecoration", "deleteAvatarDecoration", "unsetUserAvatar", "unsetUserBanner", "createSystemWebhook", "updateSystemWebhook", "deleteSystemWebhook", "createAbuseReportNotificationRecipient", "updateAbuseReportNotificationRecipient", "deleteAbuseReportNotificationRecipient"];
+export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "unsuspend", "updateUserNote", "addCustomEmoji", "updateCustomEmoji", "deleteCustomEmoji", "assignRole", "unassignRole", "createRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "suspendRemoteInstance", "unsuspendRemoteInstance", "updateRemoteInstanceNote", "markSensitiveDriveFile", "unmarkSensitiveDriveFile", "resolveAbuseReport", "createInvitation", "createAd", "updateAd", "deleteAd", "createAvatarDecoration", "updateAvatarDecoration", "deleteAvatarDecoration", "unsetUserAvatar", "unsetUserBanner", "createSystemWebhook", "updateSystemWebhook", "deleteSystemWebhook", "createAbuseReportNotificationRecipient", "updateAbuseReportNotificationRecipient", "deleteAbuseReportNotificationRecipient", "deleteAccount"];
 
 // @public (undocumented)
 type MuteCreateRequest = operations['mute___create']['requestBody']['content']['application/json'];
diff --git a/packages/misskey-js/src/consts.ts b/packages/misskey-js/src/consts.ts
index 5863a0b1dd..d738948491 100644
--- a/packages/misskey-js/src/consts.ts
+++ b/packages/misskey-js/src/consts.ts
@@ -154,6 +154,7 @@ export const moderationLogTypes = [
 	'createAbuseReportNotificationRecipient',
 	'updateAbuseReportNotificationRecipient',
 	'deleteAbuseReportNotificationRecipient',
+	'deleteAccount',
 ] as const;
 
 // See: packages/backend/src/core/ReversiService.ts@L410
@@ -392,4 +393,9 @@ export type ModerationLogPayloads = {
 		recipientId: string;
 		recipient: AbuseReportNotificationRecipient;
 	};
+	deleteAccount: {
+		userId: string;
+		userUsername: string;
+		userHost: string | null;
+	};
 };
diff --git a/packages/misskey-js/src/entities.ts b/packages/misskey-js/src/entities.ts
index ce58fb2970..544568db41 100644
--- a/packages/misskey-js/src/entities.ts
+++ b/packages/misskey-js/src/entities.ts
@@ -159,6 +159,9 @@ export type ModerationLog = {
 } | {
 	type: 'deleteAbuseReportNotificationRecipient';
 	info: ModerationLogPayloads['deleteAbuseReportNotificationRecipient'];
+} | {
+	type: 'deleteAccount';
+	info: ModerationLogPayloads['deleteAccount'];
 });
 
 export type ServerStats = {

From 2ab5ee81b17d00a8249045d03f4a1d233fca4cbd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 17 Aug 2024 01:25:43 +0000
Subject: [PATCH 184/221] Bump version to 2024.8.0-alpha.1

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 991188b2cb..1572ff8dab 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.8.0-alpha.0",
+	"version": "2024.8.0-alpha.1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index cf4d83f4bd..377c090981 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.8.0-alpha.0",
+	"version": "2024.8.0-alpha.1",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 61cc3b56424ff1aa9df9c9fe61c940235b2890d8 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 17 Aug 2024 10:35:41 +0900
Subject: [PATCH 185/221] New Crowdin updates (#14393)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Spanish)
---
 locales/en-US.yml | 4 ++--
 locales/es-ES.yml | 1 +
 locales/pt-PT.yml | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index fe2bb08074..32356ab4e5 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -182,7 +182,7 @@ addAccount: "Add account"
 reloadAccountsList: "Reload account list"
 loginFailed: "Failed to sign in"
 showOnRemote: "View on remote instance"
-continueOnRemote: "リモートで続行"
+continueOnRemote: "Continue on a remote server"
 chooseServerOnMisskeyHub: "Choose a server from the Misskey Hub"
 specifyServerHost: "Specify a server host directly"
 inputHostName: "Enter the domain"
@@ -487,7 +487,7 @@ noMessagesYet: "No messages yet"
 newMessageExists: "There are new messages"
 onlyOneFileCanBeAttached: "You can only attach one file to a message"
 signinRequired: "Please register or sign in before continuing"
-signinOrContinueOnRemote: "To continue, you  need to move your server or sign up / log in to this server."
+signinOrContinueOnRemote: "To continue, you need to move your server or sign up / log in to this server."
 invitations: "Invites"
 invitationCode: "Invitation code"
 checking: "Checking..."
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index ef066a37ed..2621965d1b 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -60,6 +60,7 @@ copyFileId: "Copiar ID del archivo"
 copyFolderId: "Copiar ID de carpeta"
 copyProfileUrl: "Copiar la URL del perfil"
 searchUser: "Buscar un usuario"
+searchThisUsersNotes: ""
 reply: "Responder"
 loadMore: "Ver más"
 showMore: "Ver más"
diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml
index d4c07a28c5..87f934201c 100644
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@@ -1675,7 +1675,7 @@ _role:
   descriptionOfPermission: "<b>Moderador</b> permite que você execute operações básicas relacionadas à moderação.\n<b>Administradores</b> podem alterar todas as configurações do servidor."
   assignTarget: "Atribuir"
   descriptionOfAssignTarget: "<b>Manual</b> para gerenciar manualmente quem está incluído neste cargo.\n<b>Condicional</b> define uma condição e os usuários que corresponderem a ela serão incluídos automaticamente."
-  manual: "Documentação"
+  manual: "Manual"
   manualRoles: "Cargos manuais"
   conditional: "Condicional"
   conditionalRoles: "Cargos condicionais"

From 059eb6d379cc84ee48c76bcea88dd90423f4f929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 17 Aug 2024 11:28:22 +0900
Subject: [PATCH 186/221] =?UTF-8?q?fix(frontend):=20=E3=83=AA=E3=83=8E?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=AE=E5=88=A4=E5=AE=9A=E3=81=8C=E7=94=98?=
 =?UTF-8?q?=E3=81=84=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20(#14396)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): リノートの判定が甘いのを修正

* fix

* Update Changelog

* fix

* use type assertion

* fix + add comments

* lint

* misskey-jsに移動

* PureRenote -> Renote

* isRenote -> isPureRenote
---
 CHANGELOG.md                                  |  1 +
 packages/frontend/src/components/MkNote.vue   | 12 ++-----
 .../src/components/MkNoteDetailed.vue         | 12 ++-----
 .../frontend/src/scripts/get-appear-note.ts   | 10 ++++++
 .../frontend/src/scripts/get-note-menu.ts     | 33 ++++---------------
 packages/misskey-js/etc/misskey-js.api.md     | 22 ++++++++++++-
 packages/misskey-js/src/entities.ts           | 14 ++++++++
 packages/misskey-js/src/index.ts              |  3 +-
 packages/misskey-js/src/note.ts               | 12 +++++++
 9 files changed, 73 insertions(+), 46 deletions(-)
 create mode 100644 packages/frontend/src/scripts/get-appear-note.ts
 create mode 100644 packages/misskey-js/src/note.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74e3cb99a9..caf4fab977 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - Fix: iOSでユーザー名などがリンクとして誤検知される現象を抑制
 - Fix: mCaptchaを使用していてもbotプロテクションに関する警告が消えないのを修正
 - Fix: ユーザーのモデレーションページにおいてユーザー名にドットが入っているとシステムアカウントとして表示されてしまう問題を修正
+- Fix: 特定の条件下でノートの削除ボタンが出ないのを修正
 
 ### Server
 - Enhance: 凍結されたアカウントのフォローリクエストを表示しないように
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 13273a53b4..32d1cc5640 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -200,6 +200,7 @@ import { host } from '@/config.js';
 import { isEnabledUrlPreview } from '@/instance.js';
 import { type Keymap } from '@/scripts/hotkey.js';
 import { focusPrev, focusNext } from '@/scripts/focus.js';
+import { getAppearNote } from '@/scripts/get-appear-note.js';
 
 const props = withDefaults(defineProps<{
 	note: Misskey.entities.Note;
@@ -242,14 +243,7 @@ if (noteViewInterruptors.length > 0) {
 	});
 }
 
-const isRenote = (
-	note.value.renote != null &&
-	note.value.reply == null &&
-	note.value.text == null &&
-	note.value.cw == null &&
-	note.value.fileIds && note.value.fileIds.length === 0 &&
-	note.value.poll == null
-);
+const isRenote = Misskey.note.isPureRenote(note.value);
 
 const rootEl = shallowRef<HTMLElement>();
 const menuButton = shallowRef<HTMLElement>();
@@ -257,7 +251,7 @@ const renoteButton = shallowRef<HTMLElement>();
 const renoteTime = shallowRef<HTMLElement>();
 const reactButton = shallowRef<HTMLElement>();
 const clipButton = shallowRef<HTMLElement>();
-const appearNote = computed(() => isRenote ? note.value.renote as Misskey.entities.Note : note.value);
+const appearNote = computed(() => getAppearNote(note.value));
 const galleryEl = shallowRef<InstanceType<typeof MkMediaList>>();
 const isMyRenote = $i && ($i.id === note.value.userId);
 const showContent = ref(false);
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 9a3e595789..2b7d2afa04 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -235,6 +235,7 @@ import MkPagination, { type Paging } from '@/components/MkPagination.vue';
 import MkReactionIcon from '@/components/MkReactionIcon.vue';
 import MkButton from '@/components/MkButton.vue';
 import { isEnabledUrlPreview } from '@/instance.js';
+import { getAppearNote } from '@/scripts/get-appear-note.js';
 import { type Keymap } from '@/scripts/hotkey.js';
 
 const props = withDefaults(defineProps<{
@@ -267,14 +268,7 @@ if (noteViewInterruptors.length > 0) {
 	});
 }
 
-const isRenote = (
-	note.value.renote != null &&
-	note.value.reply == null &&
-	note.value.text == null &&
-	note.value.cw == null &&
-	note.value.fileIds && note.value.fileIds.length === 0 &&
-	note.value.poll == null
-);
+const isRenote = Misskey.note.isPureRenote(note.value);
 
 const rootEl = shallowRef<HTMLElement>();
 const menuButton = shallowRef<HTMLElement>();
@@ -282,7 +276,7 @@ const renoteButton = shallowRef<HTMLElement>();
 const renoteTime = shallowRef<HTMLElement>();
 const reactButton = shallowRef<HTMLElement>();
 const clipButton = shallowRef<HTMLElement>();
-const appearNote = computed(() => isRenote ? note.value.renote as Misskey.entities.Note : note.value);
+const appearNote = computed(() => getAppearNote(note.value));
 const galleryEl = shallowRef<InstanceType<typeof MkMediaList>>();
 const isMyRenote = $i && ($i.id === note.value.userId);
 const showContent = ref(false);
diff --git a/packages/frontend/src/scripts/get-appear-note.ts b/packages/frontend/src/scripts/get-appear-note.ts
new file mode 100644
index 0000000000..40ce80eac9
--- /dev/null
+++ b/packages/frontend/src/scripts/get-appear-note.ts
@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import * as Misskey from 'misskey-js';
+
+export function getAppearNote(note: Misskey.entities.Note) {
+	return Misskey.note.isPureRenote(note) ? note.renote : note;
+}
diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
index ebb96d1746..2563b0baf3 100644
--- a/packages/frontend/src/scripts/get-note-menu.ts
+++ b/packages/frontend/src/scripts/get-note-menu.ts
@@ -20,6 +20,7 @@ import { clipsCache, favoritedChannelsCache } from '@/cache.js';
 import { MenuItem } from '@/types/menu.js';
 import MkRippleEffect from '@/components/MkRippleEffect.vue';
 import { isSupportShare } from '@/scripts/navigator.js';
+import { getAppearNote } from '@/scripts/get-appear-note.js';
 
 export async function getNoteClipMenu(props: {
 	note: Misskey.entities.Note;
@@ -34,14 +35,7 @@ export async function getNoteClipMenu(props: {
 		}
 	}
 
-	const isRenote = (
-		props.note.renote != null &&
-		props.note.text == null &&
-		props.note.fileIds.length === 0 &&
-		props.note.poll == null
-	);
-
-	const appearNote = isRenote ? props.note.renote as Misskey.entities.Note : props.note;
+	const appearNote = getAppearNote(props.note);
 
 	const clips = await clipsCache.fetch();
 	const menu: MenuItem[] = [...clips.map(clip => ({
@@ -164,14 +158,7 @@ export function getNoteMenu(props: {
 	isDeleted: Ref<boolean>;
 	currentClip?: Misskey.entities.Clip;
 }) {
-	const isRenote = (
-		props.note.renote != null &&
-		props.note.text == null &&
-		props.note.fileIds.length === 0 &&
-		props.note.poll == null
-	);
-
-	const appearNote = isRenote ? props.note.renote as Misskey.entities.Note : props.note;
+	const appearNote = getAppearNote(props.note);
 
 	const cleanups = [] as (() => void)[];
 
@@ -248,6 +235,7 @@ export function getNoteMenu(props: {
 	}
 
 	async function unclip(): Promise<void> {
+		if (!props.currentClip) return;
 		os.apiWithDialog('clips/remove-note', { clipId: props.currentClip.id, noteId: appearNote.id });
 		props.isDeleted.value = true;
 	}
@@ -267,8 +255,8 @@ export function getNoteMenu(props: {
 
 	function share(): void {
 		navigator.share({
-			title: i18n.tsx.noteOf({ user: appearNote.user.name }),
-			text: appearNote.text,
+			title: i18n.tsx.noteOf({ user: appearNote.user.name ?? appearNote.user.username }),
+			text: appearNote.text ?? '',
 			url: `${url}/notes/${appearNote.id}`,
 		});
 	}
@@ -509,14 +497,7 @@ export function getRenoteMenu(props: {
 	renoteButton: ShallowRef<HTMLElement | undefined>;
 	mock?: boolean;
 }) {
-	const isRenote = (
-		props.note.renote != null &&
-		props.note.text == null &&
-		props.note.fileIds.length === 0 &&
-		props.note.poll == null
-	);
-
-	const appearNote = isRenote ? props.note.renote as Misskey.entities.Note : props.note;
+	const appearNote = getAppearNote(props.note);
 
 	const channelRenoteItems: MenuItem[] = [];
 	const normalRenoteItems: MenuItem[] = [];
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index b7bb1088bd..1edb9203c4 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -1172,6 +1172,7 @@ declare namespace entities {
     export {
         ID,
         DateString,
+        PureRenote,
         PageEvent,
         ModerationLog,
         ServerStats,
@@ -2277,6 +2278,9 @@ type ISigninHistoryRequest = operations['i___signin-history']['requestBody']['co
 // @public (undocumented)
 type ISigninHistoryResponse = operations['i___signin-history']['responses']['200']['content']['application/json'];
 
+// @public (undocumented)
+function isPureRenote(note: Note): note is PureRenote;
+
 // @public (undocumented)
 type IUnpinRequest = operations['i___unpin']['requestBody']['content']['application/json'];
 
@@ -2513,6 +2517,13 @@ type MyAppsResponse = operations['my___apps']['responses']['200']['content']['ap
 // @public (undocumented)
 type Note = components['schemas']['Note'];
 
+declare namespace note {
+    export {
+        isPureRenote
+    }
+}
+export { note }
+
 // @public (undocumented)
 type NoteFavorite = components['schemas']['NoteFavorite'];
 
@@ -2753,6 +2764,15 @@ type PinnedUsersResponse = operations['pinned-users']['responses']['200']['conte
 // @public (undocumented)
 type PromoReadRequest = operations['promo___read']['requestBody']['content']['application/json'];
 
+// Warning: (ae-forgotten-export) The symbol "AllNullRecord" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "NonNullableRecord" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+type PureRenote = Omit<Note, 'renote' | 'renoteId' | 'reply' | 'replyId' | 'text' | 'cw' | 'files' | 'fileIds' | 'poll'> & AllNullRecord<Pick<Note, 'reply' | 'replyId' | 'text' | 'cw' | 'poll'>> & {
+    files: [];
+    fileIds: [];
+} & NonNullableRecord<Pick<Note, 'renote' | 'renoteId'>>;
+
 // @public (undocumented)
 type QueueCount = components['schemas']['QueueCount'];
 
@@ -3232,7 +3252,7 @@ type UsersUpdateMemoRequest = operations['users___update-memo']['requestBody']['
 
 // Warnings were encountered during analysis:
 //
-// src/entities.ts:35:2 - (ae-forgotten-export) The symbol "ModerationLogPayloads" needs to be exported by the entry point index.d.ts
+// src/entities.ts:49:2 - (ae-forgotten-export) The symbol "ModerationLogPayloads" needs to be exported by the entry point index.d.ts
 // src/streaming.types.ts:220:4 - (ae-forgotten-export) The symbol "ReversiUpdateKey" needs to be exported by the entry point index.d.ts
 // src/streaming.types.ts:230:4 - (ae-forgotten-export) The symbol "ReversiUpdateSettings" needs to be exported by the entry point index.d.ts
 
diff --git a/packages/misskey-js/src/entities.ts b/packages/misskey-js/src/entities.ts
index 544568db41..2a3625f56e 100644
--- a/packages/misskey-js/src/entities.ts
+++ b/packages/misskey-js/src/entities.ts
@@ -3,6 +3,7 @@ import {
 	Announcement,
 	EmojiDetailed,
 	MeDetailed,
+	Note,
 	Page,
 	Role,
 	RolePolicies,
@@ -16,6 +17,19 @@ export * from './autogen/models.js';
 export type ID = string;
 export type DateString = string;
 
+type NonNullableRecord<T> = {
+	[P in keyof T]-?: NonNullable<T[P]>;
+};
+type AllNullRecord<T> = {
+	[P in keyof T]: null;
+};
+
+export type PureRenote =
+	Omit<Note, 'renote' | 'renoteId' | 'reply' | 'replyId' | 'text' | 'cw' | 'files' | 'fileIds' | 'poll'>
+	& AllNullRecord<Pick<Note, 'reply' | 'replyId' | 'text' | 'cw' | 'poll'>>
+	& { files: []; fileIds: []; }
+	& NonNullableRecord<Pick<Note, 'renote' | 'renoteId'>>;
+
 export type PageEvent = {
 	pageId: Page['id'];
 	event: string;
diff --git a/packages/misskey-js/src/index.ts b/packages/misskey-js/src/index.ts
index 7e0165d20b..ace9738e6a 100644
--- a/packages/misskey-js/src/index.ts
+++ b/packages/misskey-js/src/index.ts
@@ -30,4 +30,5 @@ export const reversiUpdateKeys = consts.reversiUpdateKeys;
 import * as api from './api.js';
 import * as entities from './entities.js';
 import * as acct from './acct.js';
-export { api, entities, acct };
+import * as note from './note.js';
+export { api, entities, acct, note };
diff --git a/packages/misskey-js/src/note.ts b/packages/misskey-js/src/note.ts
new file mode 100644
index 0000000000..5c8298c7e4
--- /dev/null
+++ b/packages/misskey-js/src/note.ts
@@ -0,0 +1,12 @@
+import type { Note, PureRenote } from './entities.js';
+
+export function isPureRenote(note: Note): note is PureRenote {
+	return (
+		note.renote != null &&
+		note.reply == null &&
+		note.text == null &&
+		note.cw == null &&
+		(note.fileIds == null || note.fileIds.length === 0) &&
+		note.poll == null
+	);
+}

From 06684fe49b545be7dcfbf78153f8682a8a8de4e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 17 Aug 2024 12:07:00 +0900
Subject: [PATCH 187/221] =?UTF-8?q?fix(backend):=20=E3=83=99=E3=83=BC?=
 =?UTF-8?q?=E3=82=B9=E3=83=AD=E3=83=BC=E3=83=AB=E3=81=AE=E3=83=9D=E3=83=AA?=
 =?UTF-8?q?=E3=82=B7=E3=83=BC=E5=A4=89=E6=9B=B4=E6=99=82=E3=83=A2=E3=83=87?=
 =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=AD=E3=82=B0?=
 =?UTF-8?q?=E3=81=8C=E6=AE=8B=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(#1441?=
 =?UTF-8?q?8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(policies): ベースロールのポリシー変更時モデレーションログが残るように (MisskeyIO#700)

(cherry picked from commit 80389a914049f6f26237fde8da7d4e1bd41452fc)

* Update Changelog

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
---
 CHANGELOG.md                                      |  2 ++
 .../admin/roles/update-default-policies.ts        | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index caf4fab977..bade07c9d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,8 @@
   - キュー処理のつまりが改善される可能性があります
 - Fix: リバーシの対局設定の変更が反映されないのを修正
 - Fix: 無制限にストリーミングのチャンネルに接続できる問題を修正
+- Fix: ベースロールのポリシーを変更した際にモデログに記録されないのを修正  
+  (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/700)
 
 ## 2024.7.0
 
diff --git a/packages/backend/src/server/api/endpoints/admin/roles/update-default-policies.ts b/packages/backend/src/server/api/endpoints/admin/roles/update-default-policies.ts
index d7209965db..5cf49670be 100644
--- a/packages/backend/src/server/api/endpoints/admin/roles/update-default-policies.ts
+++ b/packages/backend/src/server/api/endpoints/admin/roles/update-default-policies.ts
@@ -7,6 +7,7 @@ import { Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { MetaService } from '@/core/MetaService.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
 
 export const meta = {
 	tags: ['admin', 'role'],
@@ -33,12 +34,22 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 	constructor(
 		private metaService: MetaService,
 		private globalEventService: GlobalEventService,
+		private moderationLogService: ModerationLogService,
 	) {
-		super(meta, paramDef, async (ps) => {
+		super(meta, paramDef, async (ps, me) => {
+			const before = await this.metaService.fetch(true);
+
 			await this.metaService.update({
 				policies: ps.policies,
 			});
-			this.globalEventService.publishInternalEvent('policiesUpdated', ps.policies);
+
+			const after = await this.metaService.fetch(true);
+
+			this.globalEventService.publishInternalEvent('policiesUpdated', after.policies);
+			this.moderationLogService.log(me, 'updateServerSettings', {
+				before: before.policies,
+				after: after.policies,
+			});
 		});
 	}
 }

From 68ec7450af83669dc7fec0e97d05821f2d6e13ef Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 17 Aug 2024 04:11:09 +0000
Subject: [PATCH 188/221] Bump version to 2024.8.0-beta.2

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 1572ff8dab..ccc83f91c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.8.0-alpha.1",
+	"version": "2024.8.0-beta.2",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 377c090981..4ec52a040d 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.8.0-alpha.1",
+	"version": "2024.8.0-beta.2",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 383c41bdb6851e2ff4677df02d2f374e14800ca5 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 17 Aug 2024 14:57:26 +0900
Subject: [PATCH 189/221] :art:

---
 .../frontend/src/components/MkRolePreview.vue | 71 ++++++++++++-------
 1 file changed, 44 insertions(+), 27 deletions(-)

diff --git a/packages/frontend/src/components/MkRolePreview.vue b/packages/frontend/src/components/MkRolePreview.vue
index c1b922198f..ef9fa531aa 100644
--- a/packages/frontend/src/components/MkRolePreview.vue
+++ b/packages/frontend/src/components/MkRolePreview.vue
@@ -4,25 +4,32 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkA v-adaptive-bg :to="forModeration ? `/admin/roles/${role.id}` : `/roles/${role.id}`" class="_panel" :class="$style.root" tabindex="-1" :style="{ '--color': role.color }">
-	<div :class="$style.title">
-		<span :class="$style.icon">
-			<template v-if="role.iconUrl">
-				<img :class="$style.badge" :src="role.iconUrl"/>
+<MkA :to="forModeration ? `/admin/roles/${role.id}` : `/roles/${role.id}`" :class="$style.root" tabindex="-1" :style="{ '--color': role.color }">
+	<template v-if="forModeration">
+		<i v-if="role.isPublic" class="ti ti-world" :class="$style.icon" style="color: var(--success)"></i>
+		<i v-else class="ti ti-lock" :class="$style.icon" style="color: var(--warn)"></i>
+	</template>
+
+	<div v-adaptive-bg class="_panel" :class="$style.body">
+		<div :class="$style.bodyTitle">
+			<span :class="$style.bodyIcon">
+				<template v-if="role.iconUrl">
+					<img :class="$style.bodyBadge" :src="role.iconUrl"/>
+				</template>
+				<template v-else>
+					<i v-if="role.isAdministrator" class="ti ti-crown" style="color: var(--accent);"></i>
+					<i v-else-if="role.isModerator" class="ti ti-shield" style="color: var(--accent);"></i>
+					<i v-else class="ti ti-user" style="opacity: 0.7;"></i>
+				</template>
+			</span>
+			<span :class="$style.bodyName">{{ role.name }}</span>
+			<template v-if="detailed">
+				<span v-if="role.target === 'manual'" :class="$style.bodyUsers">{{ role.usersCount }} users</span>
+				<span v-else-if="role.target === 'conditional'" :class="$style.bodyUsers">({{ i18n.ts._role.conditional }})</span>
 			</template>
-			<template v-else>
-				<i v-if="role.isAdministrator" class="ti ti-crown" style="color: var(--accent);"></i>
-				<i v-else-if="role.isModerator" class="ti ti-shield" style="color: var(--accent);"></i>
-				<i v-else class="ti ti-user" style="opacity: 0.7;"></i>
-			</template>
-		</span>
-		<span :class="$style.name">{{ role.name }}</span>
-		<template v-if="detailed">
-			<span v-if="role.target === 'manual'" :class="$style.users">{{ role.usersCount }} users</span>
-			<span v-else-if="role.target === 'conditional'" :class="$style.users">({{ i18n.ts._role.conditional }})</span>
-		</template>
+		</div>
+		<div :class="$style.bodyDescription">{{ role.description }}</div>
 	</div>
-	<div :class="$style.description">{{ role.description }}</div>
 </MkA>
 </template>
 
@@ -42,34 +49,44 @@ const props = withDefaults(defineProps<{
 
 <style lang="scss" module>
 .root {
-	display: block;
-	padding: 16px 20px;
-	border-left: solid 6px var(--color);
-}
-
-.title {
 	display: flex;
+	align-items: center;
 }
 
 .icon {
+	margin: 0 12px;
+}
+
+.body {
+	display: block;
+	padding: 16px 20px;
+	flex: 1;
+	border-left: solid 6px var(--color);
+}
+
+.bodyTitle {
+	display: flex;
+}
+
+.bodyIcon {
 	margin-right: 8px;
 }
 
-.badge {
+.bodyBadge {
 	height: 1.3em;
 	vertical-align: -20%;
 }
 
-.name {
+.bodyName {
 	font-weight: bold;
 }
 
-.users {
+.bodyUsers {
 	margin-left: auto;
 	opacity: 0.7;
 }
 
-.description {
+.bodyDescription {
 	opacity: 0.7;
 	font-size: 85%;
 }

From fd744f44c1ee7aff71d9dba6096cc9ffcb934271 Mon Sep 17 00:00:00 2001
From: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
Date: Sat, 17 Aug 2024 15:01:08 +0900
Subject: [PATCH 190/221] =?UTF-8?q?enhance(backend):=20=E3=83=9A=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=80=81=E3=82=AE=E3=83=A3=E3=83=A9=E3=83=AA=E3=83=BC?=
 =?UTF-8?q?=E3=80=81Play=E3=81=AE=E3=83=A2=E3=83=87=E3=83=AC=E3=83=BC?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E5=BC=B7=E5=8C=96=20(#13523)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance(backend): Page、ギャラリー、Playのモデレーション強化

* Update CHANGELOG.md

* fix: update misskey-js

* refactor(frontend): use `MkA`

* Update CHANGELOG.md

* fix(i18n): Page -> ページ
---
 CHANGELOG.md                                  |  2 +
 locales/index.d.ts                            | 14 +++-
 locales/ja-JP.yml                             |  5 +-
 .../src/server/api/endpoints/flash/delete.ts  | 24 +++++-
 .../api/endpoints/gallery/posts/delete.ts     | 35 +++++++--
 .../src/server/api/endpoints/pages/delete.ts  | 24 +++++-
 packages/backend/src/types.ts                 | 21 +++++
 .../src/components/MkAbuseReportWindow.vue    |  2 +-
 .../frontend/src/components/global/MkAcct.vue |  2 +-
 .../src/pages/admin/modlog.ModLog.vue         |  6 ++
 packages/frontend/src/pages/flash/flash.vue   | 49 +++++++++++-
 packages/frontend/src/pages/gallery/post.vue  | 55 +++++++++++--
 packages/frontend/src/pages/page.vue          | 77 ++++++++++++++++---
 packages/misskey-js/etc/misskey-js.api.md     | 14 +++-
 packages/misskey-js/src/consts.ts             | 21 +++++
 packages/misskey-js/src/entities.ts           | 12 +++
 16 files changed, 333 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bade07c9d3..6e98f9f193 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,10 +3,12 @@
 ### General
 - Enhance: モデレーターはすべてのユーザーのフォロー・フォロワーの一覧を見られるように
 - Enhance: アカウントの削除のモデレーションログを残すように
+- Enhance: 不適切なページ、ギャラリー、Playを管理者権限で削除できるように
 - Fix: リモートユーザのフォロー・フォロワーの一覧が非公開設定の場合も表示できてしまう問題を修正
 
 ### Client
 - Enhance: 「自分のPlay」ページにおいてPlayが非公開かどうかが一目でわかるように
+- Enhance: 不適切なページ、ギャラリー、Playを通報できるように
 - Fix: Play編集時に公開範囲が「パブリック」にリセットされる問題を修正
 - Fix: ページ遷移に失敗することがある問題を修正
 - Fix: iOSでユーザー名などがリンクとして誤検知される現象を抑制
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 2ab5f5797e..75e1703b4a 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -2829,7 +2829,7 @@ export interface Locale extends ILocale {
      */
     "reportAbuseOf": ParameterizedString<"name">;
     /**
-     * 通報理由の詳細を記入してください。対象のノートがある場合はそのURLも記入してください。
+     * 通報理由の詳細を記入してください。対象のノートやページなどがある場合はそのURLも記入してください。
      */
     "fillAbuseReportDescription": string;
     /**
@@ -9687,6 +9687,18 @@ export interface Locale extends ILocale {
          * アカウントを削除
          */
         "deleteAccount": string;
+        /**
+         * ページを削除
+         */
+        "deletePage": string;
+        /**
+         * Playを削除
+         */
+        "deleteFlash": string;
+        /**
+         * ギャラリーの投稿を削除
+         */
+        "deleteGalleryPost": string;
     };
     "_fileViewer": {
         /**
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index fac5b1e533..98e3cbfa41 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -703,7 +703,7 @@ abuseReports: "通報"
 reportAbuse: "通報"
 reportAbuseRenote: "リノートを通報"
 reportAbuseOf: "{name}を通報する"
-fillAbuseReportDescription: "通報理由の詳細を記入してください。対象のノートがある場合はそのURLも記入してください。"
+fillAbuseReportDescription: "通報理由の詳細を記入してください。対象のノートやページなどがある場合はそのURLも記入してください。"
 abuseReported: "内容が送信されました。ご報告ありがとうございました。"
 reporter: "通報者"
 reporteeOrigin: "通報先"
@@ -2569,6 +2569,9 @@ _moderationLogTypes:
   updateAbuseReportNotificationRecipient: "通報の通知先を更新"
   deleteAbuseReportNotificationRecipient: "通報の通知先を削除"
   deleteAccount: "アカウントを削除"
+  deletePage: "ページを削除"
+  deleteFlash: "Playを削除"
+  deleteGalleryPost: "ギャラリーの投稿を削除"
 
 _fileViewer:
   title: "ファイルの詳細"
diff --git a/packages/backend/src/server/api/endpoints/flash/delete.ts b/packages/backend/src/server/api/endpoints/flash/delete.ts
index d3d47e5deb..6912450abf 100644
--- a/packages/backend/src/server/api/endpoints/flash/delete.ts
+++ b/packages/backend/src/server/api/endpoints/flash/delete.ts
@@ -4,9 +4,11 @@
  */
 
 import { Inject, Injectable } from '@nestjs/common';
-import type { FlashsRepository } from '@/models/_.js';
+import type { FlashsRepository, UsersRepository } from '@/models/_.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { DI } from '@/di-symbols.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { RoleService } from '@/core/RoleService.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -44,17 +46,35 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 	constructor(
 		@Inject(DI.flashsRepository)
 		private flashsRepository: FlashsRepository,
+
+		@Inject(DI.usersRepository)
+		private usersRepository: UsersRepository,
+
+		private moderationLogService: ModerationLogService,
+		private roleService: RoleService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const flash = await this.flashsRepository.findOneBy({ id: ps.flashId });
+
 			if (flash == null) {
 				throw new ApiError(meta.errors.noSuchFlash);
 			}
-			if (flash.userId !== me.id) {
+
+			if (!await this.roleService.isModerator(me) && flash.userId !== me.id) {
 				throw new ApiError(meta.errors.accessDenied);
 			}
 
 			await this.flashsRepository.delete(flash.id);
+
+			if (flash.userId !== me.id) {
+				const user = await this.usersRepository.findOneByOrFail({ id: flash.userId });
+				this.moderationLogService.log(me, 'deleteFlash', {
+					flashId: flash.id,
+					flashUserId: flash.userId,
+					flashUserUsername: user.username,
+					flash,
+				});
+			}
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts b/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts
index 527e3fb52d..b6b94db161 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts
@@ -5,8 +5,10 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { GalleryPostsRepository } from '@/models/_.js';
+import type { GalleryPostsRepository, UsersRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { RoleService } from '@/core/RoleService.js';
 import { ApiError } from '../../../error.js';
 
 export const meta = {
@@ -22,6 +24,12 @@ export const meta = {
 			code: 'NO_SUCH_POST',
 			id: 'ae52f367-4bd7-4ecd-afc6-5672fff427f5',
 		},
+
+		accessDenied: {
+			message: 'Access denied.',
+			code: 'ACCESS_DENIED',
+			id: 'c86e09de-1c48-43ac-a435-1c7e42ed4496',
+		},
 	},
 } as const;
 
@@ -38,18 +46,35 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 	constructor(
 		@Inject(DI.galleryPostsRepository)
 		private galleryPostsRepository: GalleryPostsRepository,
+
+		@Inject(DI.usersRepository)
+		private usersRepository: UsersRepository,
+
+		private moderationLogService: ModerationLogService,
+		private roleService: RoleService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			const post = await this.galleryPostsRepository.findOneBy({
-				id: ps.postId,
-				userId: me.id,
-			});
+			const post = await this.galleryPostsRepository.findOneBy({ id: ps.postId });
 
 			if (post == null) {
 				throw new ApiError(meta.errors.noSuchPost);
 			}
 
+			if (!await this.roleService.isModerator(me) && post.userId !== me.id) {
+				throw new ApiError(meta.errors.accessDenied);
+			}
+
 			await this.galleryPostsRepository.delete(post.id);
+
+			if (post.userId !== me.id) {
+				const user = await this.usersRepository.findOneByOrFail({ id: post.userId });
+				this.moderationLogService.log(me, 'deleteGalleryPost', {
+					postId: post.id,
+					postUserId: post.userId,
+					postUserUsername: user.username,
+					post,
+				});
+			}
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/pages/delete.ts b/packages/backend/src/server/api/endpoints/pages/delete.ts
index aa2ba75a41..f2bc946788 100644
--- a/packages/backend/src/server/api/endpoints/pages/delete.ts
+++ b/packages/backend/src/server/api/endpoints/pages/delete.ts
@@ -4,9 +4,11 @@
  */
 
 import { Inject, Injectable } from '@nestjs/common';
-import type { PagesRepository } from '@/models/_.js';
+import type { PagesRepository, UsersRepository } from '@/models/_.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { DI } from '@/di-symbols.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { RoleService } from '@/core/RoleService.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -44,17 +46,35 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 	constructor(
 		@Inject(DI.pagesRepository)
 		private pagesRepository: PagesRepository,
+
+		@Inject(DI.usersRepository)
+		private usersRepository: UsersRepository,
+
+		private moderationLogService: ModerationLogService,
+		private roleService: RoleService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const page = await this.pagesRepository.findOneBy({ id: ps.pageId });
+
 			if (page == null) {
 				throw new ApiError(meta.errors.noSuchPage);
 			}
-			if (page.userId !== me.id) {
+
+			if (!await this.roleService.isModerator(me) && page.userId !== me.id) {
 				throw new ApiError(meta.errors.accessDenied);
 			}
 
 			await this.pagesRepository.delete(page.id);
+
+			if (page.userId !== me.id) {
+				const user = await this.usersRepository.findOneByOrFail({ id: page.userId });
+				this.moderationLogService.log(me, 'deletePage', {
+					pageId: page.id,
+					pageUserId: page.userId,
+					pageUserUsername: user.username,
+					page,
+				});
+			}
 		});
 	}
 }
diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
index dbeb232926..e852cf5ae2 100644
--- a/packages/backend/src/types.ts
+++ b/packages/backend/src/types.ts
@@ -97,6 +97,9 @@ export const moderationLogTypes = [
 	'updateAbuseReportNotificationRecipient',
 	'deleteAbuseReportNotificationRecipient',
 	'deleteAccount',
+	'deletePage',
+	'deleteFlash',
+	'deleteGalleryPost',
 ] as const;
 
 export type ModerationLogPayloads = {
@@ -320,6 +323,24 @@ export type ModerationLogPayloads = {
 		userUsername: string;
 		userHost: string | null;
 	};
+	deletePage: {
+		pageId: string;
+		pageUserId: string;
+		pageUserUsername: string;
+		page: any;
+	};
+	deleteFlash: {
+		flashId: string;
+		flashUserId: string;
+		flashUserUsername: string;
+		flash: any;
+	};
+	deleteGalleryPost: {
+		postId: string;
+		postUserId: string;
+		postUserUsername: string;
+		post: any;
+	};
 };
 
 export type Serialized<T> = {
diff --git a/packages/frontend/src/components/MkAbuseReportWindow.vue b/packages/frontend/src/components/MkAbuseReportWindow.vue
index b09c7bb3fb..a634a748e9 100644
--- a/packages/frontend/src/components/MkAbuseReportWindow.vue
+++ b/packages/frontend/src/components/MkAbuseReportWindow.vue
@@ -39,7 +39,7 @@ import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
 
 const props = defineProps<{
-	user: Misskey.entities.UserDetailed;
+	user: Misskey.entities.UserLite;
 	initialComment?: string;
 }>();
 
diff --git a/packages/frontend/src/components/global/MkAcct.vue b/packages/frontend/src/components/global/MkAcct.vue
index 8cb082585b..bbcb070803 100644
--- a/packages/frontend/src/components/global/MkAcct.vue
+++ b/packages/frontend/src/components/global/MkAcct.vue
@@ -21,7 +21,7 @@ import { host as hostRaw } from '@/config.js';
 import { defaultStore } from '@/store.js';
 
 defineProps<{
-	user: Misskey.entities.User;
+	user: Misskey.entities.UserLite;
 	detail?: boolean;
 }>();
 
diff --git a/packages/frontend/src/pages/admin/modlog.ModLog.vue b/packages/frontend/src/pages/admin/modlog.ModLog.vue
index eb50d068d9..64d7f25845 100644
--- a/packages/frontend/src/pages/admin/modlog.ModLog.vue
+++ b/packages/frontend/src/pages/admin/modlog.ModLog.vue
@@ -37,6 +37,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 					'deleteSystemWebhook',
 					'deleteAbuseReportNotificationRecipient',
 					'deleteAccount',
+					'deletePage',
+					'deleteFlash',
+					'deleteGalleryPost',
 				].includes(log.type)
 			}"
 		>{{ i18n.ts._moderationLogTypes[log.type] }}</b>
@@ -74,6 +77,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<span v-else-if="log.type === 'updateAbuseReportNotificationRecipient'">: {{ log.info.before.name }}</span>
 		<span v-else-if="log.type === 'deleteAbuseReportNotificationRecipient'">: {{ log.info.recipient.name }}</span>
 		<span v-else-if="log.type === 'deleteAccount'">: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}</span>
+		<span v-else-if="log.type === 'deletePage'">: @{{ log.info.pageUserUsername }}</span>
+		<span v-else-if="log.type === 'deleteFlash'">: @{{ log.info.flashUserUsername }}</span>
+		<span v-else-if="log.type === 'deleteGalleryPost'">: @{{ log.info.postUserUsername }}</span>
 	</template>
 	<template #icon>
 		<MkAvatar :user="log.user" :class="$style.avatar"/>
diff --git a/packages/frontend/src/pages/flash/flash.vue b/packages/frontend/src/pages/flash/flash.vue
index 020463a133..7b7f8bb5f2 100644
--- a/packages/frontend/src/pages/flash/flash.vue
+++ b/packages/frontend/src/pages/flash/flash.vue
@@ -23,6 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 								<MkButton v-else v-tooltip="i18n.ts.like" asLike class="button" rounded @click="like()"><i class="ti ti-heart"></i><span v-if="flash?.likedCount && flash.likedCount > 0" style="margin-left: 6px;">{{ flash.likedCount }}</span></MkButton>
 								<MkButton v-tooltip="i18n.ts.copyLink" class="button" rounded @click="copyLink"><i class="ti ti-link ti-fw"></i></MkButton>
 								<MkButton v-tooltip="i18n.ts.share" class="button" rounded @click="share"><i class="ti ti-share ti-fw"></i></MkButton>
+								<MkButton v-if="$i && $i.id !== flash.user.id" class="button" rounded @mousedown="showMenu"><i class="ti ti-dots ti-fw"></i></MkButton>
 							</div>
 						</div>
 					</div>
@@ -61,7 +62,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, onDeactivated, onUnmounted, Ref, ref, watch, shallowRef } from 'vue';
+import { computed, onDeactivated, onUnmounted, Ref, ref, watch, shallowRef, defineAsyncComponent } from 'vue';
 import * as Misskey from 'misskey-js';
 import { Interpreter, Parser, values } from '@syuilo/aiscript';
 import MkButton from '@/components/MkButton.vue';
@@ -79,6 +80,7 @@ import { defaultStore } from '@/store.js';
 import { $i } from '@/account.js';
 import { isSupportShare } from '@/scripts/navigator.js';
 import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
+import { MenuItem } from '@/types/menu';
 import { pleaseLogin } from '@/scripts/please-login.js';
 
 const props = defineProps<{
@@ -229,6 +231,51 @@ async function run() {
 	}
 }
 
+function reportAbuse() {
+	if (!flash.value) return;
+
+	const pageUrl = `${url}/play/${flash.value.id}`;
+
+	os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+		user: flash.value.user,
+		initialComment: `Play: ${pageUrl}\n-----\n`,
+	}, {}, 'closed');
+}
+
+function showMenu(ev: MouseEvent) {
+	if (!flash.value) return;
+
+	const menu: MenuItem[] = [
+		...($i && $i.id !== flash.value.userId ? [
+			{
+				icon: 'ti ti-exclamation-circle',
+				text: i18n.ts.reportAbuse,
+				action: reportAbuse,
+			},
+			...($i.isModerator || $i.isAdmin ? [
+				{
+					type: 'divider' as const,
+				},
+				{
+					icon: 'ti ti-trash',
+					text: i18n.ts.delete,
+					danger: true,
+					action: () => os.confirm({
+						type: 'warning',
+						text: i18n.ts.deleteConfirm,
+					}).then(({ canceled }) => {
+						if (canceled || !flash.value) return;
+
+						os.apiWithDialog('flash/delete', { flashId: flash.value.id });
+					}),
+				},
+			] : []),
+		] : []),
+	];
+
+	os.popupMenu(menu, ev.currentTarget ?? ev.target);
+}
+
 function reset() {
 	if (aiscript.value) aiscript.value.abort();
 	started.value = false;
diff --git a/packages/frontend/src/pages/gallery/post.vue b/packages/frontend/src/pages/gallery/post.vue
index fc2b5f810c..f7f6251702 100644
--- a/packages/frontend/src/pages/gallery/post.vue
+++ b/packages/frontend/src/pages/gallery/post.vue
@@ -31,6 +31,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 								<button v-tooltip="i18n.ts.shareWithNote" v-click-anime class="_button" @click="shareWithNote"><i class="ti ti-repeat ti-fw"></i></button>
 								<button v-tooltip="i18n.ts.copyLink" v-click-anime class="_button" @click="copyLink"><i class="ti ti-link ti-fw"></i></button>
 								<button v-if="isSupportShare()" v-tooltip="i18n.ts.share" v-click-anime class="_button" @click="share"><i class="ti ti-share ti-fw"></i></button>
+								<button v-if="$i && $i.id !== post.user.id" v-click-anime class="_button" @mousedown="showMenu"><i class="ti ti-dots ti-fw"></i></button>
 							</div>
 						</div>
 						<div class="user">
@@ -62,7 +63,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, watch, ref } from 'vue';
+import { computed, watch, ref, defineAsyncComponent } from 'vue';
 import * as Misskey from 'misskey-js';
 import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os.js';
@@ -79,6 +80,7 @@ import { $i } from '@/account.js';
 import { isSupportShare } from '@/scripts/navigator.js';
 import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
 import { useRouter } from '@/router/supplier.js';
+import { MenuItem } from '@/types/menu';
 
 const router = useRouter();
 
@@ -153,13 +155,54 @@ function edit() {
 	router.push(`/gallery/${post.value.id}/edit`);
 }
 
+function reportAbuse() {
+	if (!post.value) return;
+
+	const pageUrl = `${url}/gallery/${post.value.id}`;
+
+	os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+		user: post.value.user,
+		initialComment: `Post: ${pageUrl}\n-----\n`,
+	}, {}, 'closed');
+}
+
+function showMenu(ev: MouseEvent) {
+	if (!post.value) return;
+
+	const menu: MenuItem[] = [
+		...($i && $i.id !== post.value.userId ? [
+			{
+				icon: 'ti ti-exclamation-circle',
+				text: i18n.ts.reportAbuse,
+				action: reportAbuse,
+			},
+			...($i.isModerator || $i.isAdmin ? [
+				{
+					type: 'divider' as const,
+				},
+				{
+					icon: 'ti ti-trash',
+					text: i18n.ts.delete,
+					danger: true,
+					action: () => os.confirm({
+						type: 'warning',
+						text: i18n.ts.deleteConfirm,
+					}).then(({ canceled }) => {
+						if (canceled || !post.value) return;
+
+						os.apiWithDialog('gallery/posts/delete', { postId: post.value.id });
+					}),
+				},
+			] : []),
+		] : []),
+	];
+
+	os.popupMenu(menu, ev.currentTarget ?? ev.target);
+}
+
 watch(() => props.postId, fetchPost, { immediate: true });
 
-const headerActions = computed(() => [{
-	icon: 'ti ti-pencil',
-	text: i18n.ts.edit,
-	handler: edit,
-}]);
+const headerActions = computed(() => []);
 
 const headerTabs = computed(() => []);
 
diff --git a/packages/frontend/src/pages/page.vue b/packages/frontend/src/pages/page.vue
index 20b776aaa2..40d76f86ed 100644
--- a/packages/frontend/src/pages/page.vue
+++ b/packages/frontend/src/pages/page.vue
@@ -62,8 +62,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 							<MkButton v-else v-tooltip="i18n.ts._pages.like" class="button" asLike @click="like()"><i class="ti ti-heart"></i><span v-if="page.likedCount > 0" class="count">{{ page.likedCount }}</span></MkButton>
 						</div>
 						<div :class="$style.other">
+							<MkA v-if="page.userId === $i?.id" v-tooltip="i18n.ts._pages.editThisPage" :to="`/pages/edit/${page.id}`" class="_button" :class="$style.generalActionButton"><i class="ti ti-pencil ti-fw"></i></MkA>
 							<button v-tooltip="i18n.ts.copyLink" class="_button" :class="$style.generalActionButton" @click="copyLink"><i class="ti ti-link ti-fw"></i></button>
 							<button v-tooltip="i18n.ts.share" class="_button" :class="$style.generalActionButton" @click="share"><i class="ti ti-share ti-fw"></i></button>
+							<button v-if="$i" v-click-anime class="_button" :class="$style.generalActionButton" @mousedown="showMenu"><i class="ti ti-dots ti-fw"></i></button>
 						</div>
 					</div>
 					<div :class="$style.pageUser">
@@ -78,14 +80,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<div><i class="ti ti-clock"></i> {{ i18n.ts.createdAt }}: <MkTime :time="page.createdAt" mode="detail"/></div>
 						<div v-if="page.createdAt != page.updatedAt"><i class="ti ti-clock-edit"></i> {{ i18n.ts.updatedAt }}: <MkTime :time="page.updatedAt" mode="detail"/></div>
 					</div>
-					<div :class="$style.pageLinks">
-						<MkA v-if="!$i || $i.id !== page.userId" :to="`/@${username}/pages/${pageName}/view-source`" class="link">{{ i18n.ts._pages.viewSource }}</MkA>
-						<template v-if="$i && $i.id === page.userId">
-							<MkA :to="`/pages/edit/${page.id}`" class="link">{{ i18n.ts._pages.editThisPage }}</MkA>
-							<button v-if="$i.pinnedPageId === page.id" class="link _textButton" @click="pin(false)">{{ i18n.ts.unpin }}</button>
-							<button v-else class="link _textButton" @click="pin(true)">{{ i18n.ts.pin }}</button>
-						</template>
-					</div>
 				</div>
 				<MkAd :prefer="['horizontal', 'horizontal-big']"/>
 				<MkContainer :max-height="300" :foldable="true" class="other">
@@ -104,7 +98,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, watch, ref } from 'vue';
+import { computed, watch, ref, defineAsyncComponent } from 'vue';
 import * as Misskey from 'misskey-js';
 import XPage from '@/components/page/page.vue';
 import MkButton from '@/components/MkButton.vue';
@@ -126,6 +120,10 @@ import { isSupportShare } from '@/scripts/navigator.js';
 import { instance } from '@/instance.js';
 import { getStaticImageUrl } from '@/scripts/media-proxy.js';
 import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
+import { useRouter } from '@/router/supplier.js';
+import { MenuItem } from '@/types/menu';
+
+const router = useRouter();
 
 const props = defineProps<{
 	pageName: string;
@@ -242,6 +240,67 @@ function pin(pin) {
 	});
 }
 
+function reportAbuse() {
+	if (!page.value) return;
+
+	const pageUrl = `${url}/@${props.username}/pages/${props.pageName}`;
+
+	os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+		user: page.value.user,
+		initialComment: `Page: ${pageUrl}\n-----\n`,
+	}, {}, 'closed');
+}
+
+function showMenu(ev: MouseEvent) {
+	if (!page.value) return;
+
+	const menu: MenuItem[] = [
+		...($i && $i.id === page.value.userId ? [
+			{
+				icon: 'ti ti-code',
+				text: i18n.ts._pages.viewSource,
+				action: () => router.push(`/@${props.username}/pages/${props.pageName}/view-source`),
+			},
+			...($i.pinnedPageId === page.value.id ? [{
+				icon: 'ti ti-pinned-off',
+				text: i18n.ts.unpin,
+				action: () => pin(false),
+			}] : [{
+				icon: 'ti ti-pin',
+				text: i18n.ts.pin,
+				action: () => pin(true),
+			}]),
+		] : []),
+		...($i && $i.id !== page.value.userId ? [
+			{
+				icon: 'ti ti-exclamation-circle',
+				text: i18n.ts.reportAbuse,
+				action: reportAbuse,
+			},
+			...($i.isModerator || $i.isAdmin ? [
+				{
+					type: 'divider' as const,
+				},
+				{
+					icon: 'ti ti-trash',
+					text: i18n.ts.delete,
+					danger: true,
+					action: () => os.confirm({
+						type: 'warning',
+						text: i18n.ts.deleteConfirm,
+					}).then(({ canceled }) => {
+						if (canceled || !page.value) return;
+
+						os.apiWithDialog('pages/delete', { pageId: page.value.id });
+					}),
+				},
+			] : []),
+		] : []),
+	];
+
+	os.popupMenu(menu, ev.currentTarget ?? ev.target);
+}
+
 watch(() => path.value, fetchPage, { immediate: true });
 
 const headerActions = computed(() => []);
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index 1edb9203c4..aaaa0493ca 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -2464,6 +2464,9 @@ type ModerationLog = {
 } | {
     type: 'unsetUserAvatar';
     info: ModerationLogPayloads['unsetUserAvatar'];
+} | {
+    type: 'unsetUserBanner';
+    info: ModerationLogPayloads['unsetUserBanner'];
 } | {
     type: 'createSystemWebhook';
     info: ModerationLogPayloads['createSystemWebhook'];
@@ -2485,10 +2488,19 @@ type ModerationLog = {
 } | {
     type: 'deleteAccount';
     info: ModerationLogPayloads['deleteAccount'];
+} | {
+    type: 'deletePage';
+    info: ModerationLogPayloads['deletePage'];
+} | {
+    type: 'deleteFlash';
+    info: ModerationLogPayloads['deleteFlash'];
+} | {
+    type: 'deleteGalleryPost';
+    info: ModerationLogPayloads['deleteGalleryPost'];
 });
 
 // @public (undocumented)
-export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "unsuspend", "updateUserNote", "addCustomEmoji", "updateCustomEmoji", "deleteCustomEmoji", "assignRole", "unassignRole", "createRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "suspendRemoteInstance", "unsuspendRemoteInstance", "updateRemoteInstanceNote", "markSensitiveDriveFile", "unmarkSensitiveDriveFile", "resolveAbuseReport", "createInvitation", "createAd", "updateAd", "deleteAd", "createAvatarDecoration", "updateAvatarDecoration", "deleteAvatarDecoration", "unsetUserAvatar", "unsetUserBanner", "createSystemWebhook", "updateSystemWebhook", "deleteSystemWebhook", "createAbuseReportNotificationRecipient", "updateAbuseReportNotificationRecipient", "deleteAbuseReportNotificationRecipient", "deleteAccount"];
+export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "unsuspend", "updateUserNote", "addCustomEmoji", "updateCustomEmoji", "deleteCustomEmoji", "assignRole", "unassignRole", "createRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "suspendRemoteInstance", "unsuspendRemoteInstance", "updateRemoteInstanceNote", "markSensitiveDriveFile", "unmarkSensitiveDriveFile", "resolveAbuseReport", "createInvitation", "createAd", "updateAd", "deleteAd", "createAvatarDecoration", "updateAvatarDecoration", "deleteAvatarDecoration", "unsetUserAvatar", "unsetUserBanner", "createSystemWebhook", "updateSystemWebhook", "deleteSystemWebhook", "createAbuseReportNotificationRecipient", "updateAbuseReportNotificationRecipient", "deleteAbuseReportNotificationRecipient", "deleteAccount", "deletePage", "deleteFlash", "deleteGalleryPost"];
 
 // @public (undocumented)
 type MuteCreateRequest = operations['mute___create']['requestBody']['content']['application/json'];
diff --git a/packages/misskey-js/src/consts.ts b/packages/misskey-js/src/consts.ts
index d738948491..0972f0dd37 100644
--- a/packages/misskey-js/src/consts.ts
+++ b/packages/misskey-js/src/consts.ts
@@ -155,6 +155,9 @@ export const moderationLogTypes = [
 	'updateAbuseReportNotificationRecipient',
 	'deleteAbuseReportNotificationRecipient',
 	'deleteAccount',
+	'deletePage',
+	'deleteFlash',
+	'deleteGalleryPost',
 ] as const;
 
 // See: packages/backend/src/core/ReversiService.ts@L410
@@ -398,4 +401,22 @@ export type ModerationLogPayloads = {
 		userUsername: string;
 		userHost: string | null;
 	};
+	deletePage: {
+		pageId: string;
+		pageUserId: string;
+		pageUserUsername: string;
+		page: any;
+	};
+	deleteFlash: {
+		flashId: string;
+		flashUserId: string;
+		flashUserUsername: string;
+		flash: any;
+	};
+	deleteGalleryPost: {
+		postId: string;
+		postUserId: string;
+		postUserUsername: string;
+		post: any;
+	};
 };
diff --git a/packages/misskey-js/src/entities.ts b/packages/misskey-js/src/entities.ts
index 2a3625f56e..08d3dc5c6d 100644
--- a/packages/misskey-js/src/entities.ts
+++ b/packages/misskey-js/src/entities.ts
@@ -155,6 +155,9 @@ export type ModerationLog = {
 } | {
 	type: 'unsetUserAvatar';
 	info: ModerationLogPayloads['unsetUserAvatar'];
+} | {
+	type: 'unsetUserBanner';
+	info: ModerationLogPayloads['unsetUserBanner'];
 } | {
 	type: 'createSystemWebhook';
 	info: ModerationLogPayloads['createSystemWebhook'];
@@ -176,6 +179,15 @@ export type ModerationLog = {
 } | {
 	type: 'deleteAccount';
 	info: ModerationLogPayloads['deleteAccount'];
+} | {
+	type: 'deletePage';
+	info: ModerationLogPayloads['deletePage'];
+} | {
+	type: 'deleteFlash';
+	info: ModerationLogPayloads['deleteFlash'];
+} | {
+	type: 'deleteGalleryPost';
+	info: ModerationLogPayloads['deleteGalleryPost'];
 });
 
 export type ServerStats = {

From 9fbc1b7f7b71cf0eafadd728a6b66cb95a0c35d8 Mon Sep 17 00:00:00 2001
From: taichan <40626578+tai-cha@users.noreply.github.com>
Date: Sat, 17 Aug 2024 15:12:23 +0900
Subject: [PATCH 191/221] =?UTF-8?q?enhance(backend):=20head=E3=82=BF?=
 =?UTF-8?q?=E3=82=B0=E5=86=85=E3=81=ABrel=3Dalternate=E3=81=AE=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E3=81=AE=E3=81=82=E3=82=8Blink=E3=82=BF=E3=82=B0?=
 =?UTF-8?q?=E3=81=8C=E3=81=82=E3=82=8B=E5=A0=B4=E5=90=88=E3=80=81=E8=A8=98?=
 =?UTF-8?q?=E8=BF=B0=E3=81=95=E3=82=8C=E3=81=9FURL=E3=82=92=E5=8F=82?=
 =?UTF-8?q?=E7=85=A7=E3=81=97=E3=81=A6=E7=85=A7=E4=BC=9A=E3=81=A7=E3=81=8D?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(#14371)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* signedGet時にhttpかつalternate属性のlinkがある場合に一回だけfollowして照会する

* Fix: validation position

* Fix import

* Fix tagname

* Update CHANGELOG

* Fix code style

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
 CHANGELOG.md                                  |  1 +
 .../src/core/activitypub/ApRequestService.ts  | 24 +++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e98f9f193..0de0d40877 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - Fix: 特定の条件下でノートの削除ボタンが出ないのを修正
 
 ### Server
+- enhance: 照会時にURLがhtmlかつheadタグ内に`rel="alternate"`, `type="application/activity+json"`の`link`タグがある場合に追ってリンク先を照会できるように
 - Enhance: 凍結されたアカウントのフォローリクエストを表示しないように
 - Fix: WSの`readAllNotifications` メッセージが `body` を持たない場合に動作しない問題 #14374
   - 通知ページや通知カラム(デッキ)を開いている状態において、新たに発生した通知が既読されない問題が修正されます。
diff --git a/packages/backend/src/core/activitypub/ApRequestService.ts b/packages/backend/src/core/activitypub/ApRequestService.ts
index 93ac8ce9a7..69b09ba808 100644
--- a/packages/backend/src/core/activitypub/ApRequestService.ts
+++ b/packages/backend/src/core/activitypub/ApRequestService.ts
@@ -6,6 +6,7 @@
 import * as crypto from 'node:crypto';
 import { URL } from 'node:url';
 import { Inject, Injectable } from '@nestjs/common';
+import { Window } from 'happy-dom';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import type { MiUser } from '@/models/User.js';
@@ -180,7 +181,8 @@ export class ApRequestService {
 	 * @param url URL to fetch
 	 */
 	@bindThis
-	public async signedGet(url: string, user: { id: MiUser['id'] }): Promise<unknown> {
+	public async signedGet(url: string, user: { id: MiUser['id'] }, followAlternate?: boolean): Promise<unknown> {
+		const _followAlternate = followAlternate ?? true;
 		const keypair = await this.userKeypairService.getUserKeypair(user.id);
 
 		const req = ApRequestCreator.createSignedGet({
@@ -198,9 +200,27 @@ export class ApRequestService {
 			headers: req.request.headers,
 		}, {
 			throwErrorWhenResponseNotOk: true,
-			validators: [validateContentTypeSetAsActivityPub],
 		});
 
+		//#region リクエスト先がhtmlかつactivity+jsonへのalternate linkタグがあるとき
+		if (res.headers.get('Content-type')?.startsWith('text/html;') && _followAlternate === true) {
+			const html = await res.text();
+			const window = new Window();
+			const document = window.document;
+			document.documentElement.innerHTML = html;
+
+			const alternate = document.querySelector('head > link[rel="alternate"][type="application/activity+json"]');
+			if (alternate) {
+				const href = alternate.getAttribute('href');
+				if (href) {
+					return await this.signedGet(href, user, false);
+				}
+			}
+		}
+		//#endregion
+
+		validateContentTypeSetAsActivityPub(res);
+
 		return await res.json();
 	}
 }

From 6cdecd72ee4aa01996555b68718aad30cd7d89b2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 17 Aug 2024 06:17:02 +0000
Subject: [PATCH 192/221] Bump version to 2024.8.0-rc.3

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ccc83f91c3..254c2bee87 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.8.0-beta.2",
+	"version": "2024.8.0-rc.3",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 4ec52a040d..846f623ae1 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.8.0-beta.2",
+	"version": "2024.8.0-rc.3",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 75b0315ace7d53fb9b8fdd09297388ed0e20a1af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 17 Aug 2024 15:24:29 +0900
Subject: [PATCH 193/221] Update timeline.vue (refactor)

---
 packages/frontend/src/pages/timeline.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index c4bff3a0b8..d5943e8fbc 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -240,7 +240,7 @@ function closeTutorial(): void {
 }
 
 function switchTlIfNeeded() {
-	if (isBasicTimeline(src.value) && !availableBasicTimelines().includes(src.value)) {
+	if (isBasicTimeline(src.value) && !isAvailableBasicTimeline(src.value)) {
 		src.value = availableBasicTimelines()[0];
 	}
 }

From c0de57c08d5dfe39f7326474287f84dc38e8053d Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 17 Aug 2024 17:52:06 +0900
Subject: [PATCH 194/221] Update about-misskey.vue

---
 packages/frontend/src/pages/about-misskey.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index 9b5b4a5000..bf541b6a8a 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -267,6 +267,9 @@ const patronsWithIcon = [{
 }, {
 	name: 'Macop',
 	icon: 'https://assets.misskey-hub.net/patrons/ee052bf550014d36a643ce3dce595640.jpg',
+}, {
+	name: 'なっかあ',
+	icon: 'https://assets.misskey-hub.net/patrons/c2f5f3e394e74a64912284a2f4ca710e.jpg',
 }];
 
 const patrons = [

From 4e0d57000cd97991e286b27cb4dd1c14aeb2faab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 17 Aug 2024 18:04:52 +0900
Subject: [PATCH 195/221] =?UTF-8?q?fix(frontend):=20=E4=BB=A5=E5=89=8D?=
 =?UTF-8?q?=E3=81=AEpopup=E3=81=AE=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=97?=
 =?UTF-8?q?=E6=96=B9=E3=82=92=E4=BF=AE=E6=AD=A3=20(#14421)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/flash/flash.vue  | 6 ++++--
 packages/frontend/src/pages/gallery/post.vue | 6 ++++--
 packages/frontend/src/pages/page.vue         | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/src/pages/flash/flash.vue b/packages/frontend/src/pages/flash/flash.vue
index 7b7f8bb5f2..a6a99ba633 100644
--- a/packages/frontend/src/pages/flash/flash.vue
+++ b/packages/frontend/src/pages/flash/flash.vue
@@ -236,10 +236,12 @@ function reportAbuse() {
 
 	const pageUrl = `${url}/play/${flash.value.id}`;
 
-	os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
 		user: flash.value.user,
 		initialComment: `Play: ${pageUrl}\n-----\n`,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 }
 
 function showMenu(ev: MouseEvent) {
diff --git a/packages/frontend/src/pages/gallery/post.vue b/packages/frontend/src/pages/gallery/post.vue
index f7f6251702..5a9c978dab 100644
--- a/packages/frontend/src/pages/gallery/post.vue
+++ b/packages/frontend/src/pages/gallery/post.vue
@@ -160,10 +160,12 @@ function reportAbuse() {
 
 	const pageUrl = `${url}/gallery/${post.value.id}`;
 
-	os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
 		user: post.value.user,
 		initialComment: `Post: ${pageUrl}\n-----\n`,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 }
 
 function showMenu(ev: MouseEvent) {
diff --git a/packages/frontend/src/pages/page.vue b/packages/frontend/src/pages/page.vue
index 40d76f86ed..cb1ce9b918 100644
--- a/packages/frontend/src/pages/page.vue
+++ b/packages/frontend/src/pages/page.vue
@@ -245,10 +245,12 @@ function reportAbuse() {
 
 	const pageUrl = `${url}/@${props.username}/pages/${props.pageName}`;
 
-	os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
 		user: page.value.user,
 		initialComment: `Page: ${pageUrl}\n-----\n`,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 }
 
 function showMenu(ev: MouseEvent) {

From 0b985543192d72f6c371037196ff2a1c929c1d97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 17 Aug 2024 18:05:29 +0900
Subject: [PATCH 196/221] Update CHANGELOG.md

Co-authored-by: taichan <40626578+tai-cha@users.noreply.github.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0de0d40877..c3d6dcf535 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,7 @@
 - Fix: 特定の条件下でノートの削除ボタンが出ないのを修正
 
 ### Server
-- enhance: 照会時にURLがhtmlかつheadタグ内に`rel="alternate"`, `type="application/activity+json"`の`link`タグがある場合に追ってリンク先を照会できるように
+- Enhance: 照会時にURLがhtmlかつheadタグ内に`rel="alternate"`, `type="application/activity+json"`の`link`タグがある場合に追ってリンク先を照会できるように
 - Enhance: 凍結されたアカウントのフォローリクエストを表示しないように
 - Fix: WSの`readAllNotifications` メッセージが `body` を持たない場合に動作しない問題 #14374
   - 通知ページや通知カラム(デッキ)を開いている状態において、新たに発生した通知が既読されない問題が修正されます。

From 83c04c55add7280ff3f65816c75f08d17964c53e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 17 Aug 2024 18:15:46 +0900
Subject: [PATCH 197/221] fix(misskey-js): eliminate any (follow-up of #13523)
 (#14422)

---
 packages/misskey-js/src/consts.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/misskey-js/src/consts.ts b/packages/misskey-js/src/consts.ts
index 0972f0dd37..b4fbcffa97 100644
--- a/packages/misskey-js/src/consts.ts
+++ b/packages/misskey-js/src/consts.ts
@@ -4,9 +4,12 @@ import type {
 	Ad,
 	Announcement,
 	EmojiDetailed,
+	Flash,
+	GalleryPost,
 	InviteCode,
 	MetaDetailed,
 	Note,
+	Page,
 	Role,
 	ReversiGameDetailed,
 	SystemWebhook,
@@ -405,18 +408,18 @@ export type ModerationLogPayloads = {
 		pageId: string;
 		pageUserId: string;
 		pageUserUsername: string;
-		page: any;
+		page: Page;
 	};
 	deleteFlash: {
 		flashId: string;
 		flashUserId: string;
 		flashUserUsername: string;
-		flash: any;
+		flash: Flash;
 	};
 	deleteGalleryPost: {
 		postId: string;
 		postUserId: string;
 		postUserUsername: string;
-		post: any;
+		post: GalleryPost;
 	};
 };

From 129af061989f535ab4c79f497ba55cc5f6bf0385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 17 Aug 2024 18:25:46 +0900
Subject: [PATCH 198/221] Update
 packages/backend/src/core/activitypub/ApRequestService.ts

---
 packages/backend/src/core/activitypub/ApRequestService.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/core/activitypub/ApRequestService.ts b/packages/backend/src/core/activitypub/ApRequestService.ts
index 69b09ba808..3d1bd44648 100644
--- a/packages/backend/src/core/activitypub/ApRequestService.ts
+++ b/packages/backend/src/core/activitypub/ApRequestService.ts
@@ -203,7 +203,9 @@ export class ApRequestService {
 		});
 
 		//#region リクエスト先がhtmlかつactivity+jsonへのalternate linkタグがあるとき
-		if (res.headers.get('Content-type')?.startsWith('text/html;') && _followAlternate === true) {
+		const contentType = res.headers.get('content-type');
+		
+		if ((contentType === 'text/html' || contentType?.startsWith('text/html;')) && _followAlternate === true) {
 			const html = await res.text();
 			const window = new Window();
 			const document = window.document;

From bf8c42eecd3d645652ddd7e69b727ced2a15457d Mon Sep 17 00:00:00 2001
From: taichan <40626578+tai-cha@users.noreply.github.com>
Date: Sat, 17 Aug 2024 19:51:56 +0900
Subject: [PATCH 199/221] Fix(beckend): html content-type detection on
 signedGet (#14424)

* fix(backend): contenttype detection of html in signedGet

* code style

* fix by review
---
 packages/backend/src/core/activitypub/ApRequestService.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/activitypub/ApRequestService.ts b/packages/backend/src/core/activitypub/ApRequestService.ts
index 3d1bd44648..7cf8359212 100644
--- a/packages/backend/src/core/activitypub/ApRequestService.ts
+++ b/packages/backend/src/core/activitypub/ApRequestService.ts
@@ -204,8 +204,8 @@ export class ApRequestService {
 
 		//#region リクエスト先がhtmlかつactivity+jsonへのalternate linkタグがあるとき
 		const contentType = res.headers.get('content-type');
-		
-		if ((contentType === 'text/html' || contentType?.startsWith('text/html;')) && _followAlternate === true) {
+
+		if ((contentType ?? '').split(';')[0].trimEnd().toLowerCase() === 'text/html' && _followAlternate === true) {
 			const html = await res.text();
 			const window = new Window();
 			const document = window.document;

From e790aa0548dc981e7304a63994eebcb46d3f3e67 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 17 Aug 2024 20:25:15 +0900
Subject: [PATCH 200/221] [skip ci] New Crowdin updates (#14423)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Chinese Simplified)
---
 locales/en-US.yml | 1 +
 locales/zh-CN.yml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 32356ab4e5..a02d7fa804 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -2499,6 +2499,7 @@ _moderationLogTypes:
   createAbuseReportNotificationRecipient: "Create a recipient for abuse reports"
   updateAbuseReportNotificationRecipient: "Update recipients for abuse reports"
   deleteAbuseReportNotificationRecipient: "Delete a recipient for abuse reports"
+  deleteFlash: "Delete Play"
 _fileViewer:
   title: "File details"
   type: "File type"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 7b68a5cfdb..f55d65e343 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -2499,6 +2499,8 @@ _moderationLogTypes:
   createAbuseReportNotificationRecipient: "新建了举报通知"
   updateAbuseReportNotificationRecipient: "更新了举报通知"
   deleteAbuseReportNotificationRecipient: "删除了举报通知"
+  deletePage: "删除了页面"
+  deleteFlash: "删除了 Play"
 _fileViewer:
   title: "文件信息"
   type: "文件类型"

From ba9c5c37b83e7bf6b600aa7b7d754d8405920751 Mon Sep 17 00:00:00 2001
From: woxtu <woxtup@gmail.com>
Date: Sun, 18 Aug 2024 03:40:21 +0900
Subject: [PATCH 201/221] Remove undefined style (#14427)

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

diff --git a/packages/frontend/src/components/MkPreview.vue b/packages/frontend/src/components/MkPreview.vue
index d950d66c6e..649dee2fdb 100644
--- a/packages/frontend/src/components/MkPreview.vue
+++ b/packages/frontend/src/components/MkPreview.vue
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div :class="$style.preview">
-	<div :class="$style.preview__content1">
+	<div>
 		<MkInput v-model="text">
 			<template #label>Text</template>
 		</MkInput>

From 427f4a2cda36a2f03a604532fdd8dbacfdbcc5fc Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 18 Aug 2024 10:10:06 +0900
Subject: [PATCH 202/221] Update about-misskey.vue

---
 packages/frontend/src/pages/about-misskey.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index bf541b6a8a..a16c1eeacc 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -72,10 +72,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 							<img src="https://avatars.githubusercontent.com/u/4439005?v=4" :class="$style.contributorAvatar">
 							<span :class="$style.contributorUsername">@syuilo</span>
 						</a>
-						<a href="https://github.com/tamaina" target="_blank" :class="$style.contributor">
-							<img src="https://avatars.githubusercontent.com/u/7973572?v=4" :class="$style.contributorAvatar">
-							<span :class="$style.contributorUsername">@tamaina</span>
-						</a>
 						<a href="https://github.com/acid-chicken" target="_blank" :class="$style.contributor">
 							<img src="https://avatars.githubusercontent.com/u/20679825?v=4" :class="$style.contributorAvatar">
 							<span :class="$style.contributorUsername">@acid-chicken</span>

From 1629c0e50d85bfb36bc24979e27344e4e09ad89e Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 18 Aug 2024 10:11:50 +0900
Subject: [PATCH 203/221] New Crowdin updates (#14426)

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

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

* New translations ja-jp.yml (Chinese Simplified)
---
 locales/zh-CN.yml | 3 +++
 locales/zh-TW.yml | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index f55d65e343..d422c3afc5 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -2316,6 +2316,7 @@ _pages:
   eyeCatchingImageSet: "设置封面图片"
   eyeCatchingImageRemove: "删除封面图片"
   chooseBlock: "添加块"
+  enterSectionTitle: "输入会话标题"
   selectType: "选择类型"
   contentBlocks: "内容"
   inputBlocks: "输入"
@@ -2499,8 +2500,10 @@ _moderationLogTypes:
   createAbuseReportNotificationRecipient: "新建了举报通知"
   updateAbuseReportNotificationRecipient: "更新了举报通知"
   deleteAbuseReportNotificationRecipient: "删除了举报通知"
+  deleteAccount: "删除了账户"
   deletePage: "删除了页面"
   deleteFlash: "删除了 Play"
+  deleteGalleryPost: "删除了图库稿件"
 _fileViewer:
   title: "文件信息"
   type: "文件类型"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 3f66818669..57da480d28 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -2316,6 +2316,7 @@ _pages:
   eyeCatchingImageSet: "設定封面影像"
   eyeCatchingImageRemove: "刪除封面影像"
   chooseBlock: "新增方塊"
+  enterSectionTitle: "輸入區段的標題"
   selectType: "選擇類型"
   contentBlocks: "內容"
   inputBlocks: "輸入"
@@ -2499,6 +2500,10 @@ _moderationLogTypes:
   createAbuseReportNotificationRecipient: "建立接收檢舉的通知對象"
   updateAbuseReportNotificationRecipient: "更新接收檢舉的通知對象"
   deleteAbuseReportNotificationRecipient: "刪除接收檢舉的通知對象"
+  deleteAccount: "刪除帳戶"
+  deletePage: "刪除頁面"
+  deleteFlash: "刪除 Play"
+  deleteGalleryPost: "刪除相簿的貼文"
 _fileViewer:
   title: "檔案詳細資訊"
   type: "檔案類型 "

From 9b78ce8047f415a2bc57e1fc43c0bd54667cd119 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 18 Aug 2024 10:12:42 +0900
Subject: [PATCH 204/221] :art:

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

diff --git a/packages/frontend/src/components/MkRolePreview.vue b/packages/frontend/src/components/MkRolePreview.vue
index ef9fa531aa..ce17ae08e0 100644
--- a/packages/frontend/src/components/MkRolePreview.vue
+++ b/packages/frontend/src/components/MkRolePreview.vue
@@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<span :class="$style.bodyName">{{ role.name }}</span>
 			<template v-if="detailed">
 				<span v-if="role.target === 'manual'" :class="$style.bodyUsers">{{ role.usersCount }} users</span>
-				<span v-else-if="role.target === 'conditional'" :class="$style.bodyUsers">({{ i18n.ts._role.conditional }})</span>
+				<span v-else-if="role.target === 'conditional'" :class="$style.bodyUsers">? users</span>
 			</template>
 		</div>
 		<div :class="$style.bodyDescription">{{ role.description }}</div>

From 9ce44b24b8837b846e3170c70da13f8d0f86d581 Mon Sep 17 00:00:00 2001
From: Hazel K <acomputerdog@gmail.com>
Date: Sun, 18 Aug 2024 00:34:01 -0400
Subject: [PATCH 205/221] fix(backend): memory leak in memory caches (#14363)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* encapsulate `MemoryKVCache<T>`

* remove infinity caches

* encapsulate other caches

* add missing awaits to internally synchronize caches

* implement pull-through caching

* tune cache lifetimes

* optimize cache GC by stopping early

* summarize changes in CHANGELOG.md

* Fix timeout comments

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>

* add comments about awaiting the redis write

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
---
 CHANGELOG.md                                  |   2 +
 .../src/core/AvatarDecorationService.ts       |   2 +-
 packages/backend/src/core/CacheService.ts     |  12 +-
 .../backend/src/core/CustomEmojiService.ts    |  12 +-
 packages/backend/src/core/RelayService.ts     |   2 +-
 packages/backend/src/core/RoleService.ts      |   6 +-
 .../backend/src/core/UserKeypairService.ts    |   2 +-
 .../core/activitypub/ApDbResolverService.ts   |   4 +-
 packages/backend/src/misc/cache.ts            | 137 ++++++++++--------
 .../processors/DeliverProcessorService.ts     |   2 +-
 .../src/server/NodeinfoServerService.ts       |   2 +-
 .../src/server/api/AuthenticateService.ts     |   2 +-
 12 files changed, 101 insertions(+), 84 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3d6dcf535..7a8873ba0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,8 @@
 - Fix: 無制限にストリーミングのチャンネルに接続できる問題を修正
 - Fix: ベースロールのポリシーを変更した際にモデログに記録されないのを修正  
   (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/700)
+- Fix: Prevent memory leak from memory caches (#14310)
+- Fix: More reliable memory cache eviction (#14311)
 
 ## 2024.7.0
 
diff --git a/packages/backend/src/core/AvatarDecorationService.ts b/packages/backend/src/core/AvatarDecorationService.ts
index 8b54bbe012..4efd6122b1 100644
--- a/packages/backend/src/core/AvatarDecorationService.ts
+++ b/packages/backend/src/core/AvatarDecorationService.ts
@@ -29,7 +29,7 @@ export class AvatarDecorationService implements OnApplicationShutdown {
 		private moderationLogService: ModerationLogService,
 		private globalEventService: GlobalEventService,
 	) {
-		this.cache = new MemorySingleCache<MiAvatarDecoration[]>(1000 * 60 * 30);
+		this.cache = new MemorySingleCache<MiAvatarDecoration[]>(1000 * 60 * 30); // 30s
 
 		this.redisForSub.on('message', this.onMessage);
 	}
diff --git a/packages/backend/src/core/CacheService.ts b/packages/backend/src/core/CacheService.ts
index d008e7ec52..6725ebe75b 100644
--- a/packages/backend/src/core/CacheService.ts
+++ b/packages/backend/src/core/CacheService.ts
@@ -56,10 +56,10 @@ export class CacheService implements OnApplicationShutdown {
 	) {
 		//this.onMessage = this.onMessage.bind(this);
 
-		this.userByIdCache = new MemoryKVCache<MiUser>(Infinity);
-		this.localUserByNativeTokenCache = new MemoryKVCache<MiLocalUser | null>(Infinity);
-		this.localUserByIdCache = new MemoryKVCache<MiLocalUser>(Infinity);
-		this.uriPersonCache = new MemoryKVCache<MiUser | null>(Infinity);
+		this.userByIdCache = new MemoryKVCache<MiUser>(1000 * 60 * 5); // 5m
+		this.localUserByNativeTokenCache = new MemoryKVCache<MiLocalUser | null>(1000 * 60 * 5); // 5m
+		this.localUserByIdCache = new MemoryKVCache<MiLocalUser>(1000 * 60 * 5); // 5m
+		this.uriPersonCache = new MemoryKVCache<MiUser | null>(1000 * 60 * 5); // 5m
 
 		this.userProfileCache = new RedisKVCache<MiUserProfile>(this.redisClient, 'userProfile', {
 			lifetime: 1000 * 60 * 30, // 30m
@@ -135,14 +135,14 @@ export class CacheService implements OnApplicationShutdown {
 					if (user == null) {
 						this.userByIdCache.delete(body.id);
 						this.localUserByIdCache.delete(body.id);
-						for (const [k, v] of this.uriPersonCache.cache.entries()) {
+						for (const [k, v] of this.uriPersonCache.entries) {
 							if (v.value?.id === body.id) {
 								this.uriPersonCache.delete(k);
 							}
 						}
 					} else {
 						this.userByIdCache.set(user.id, user);
-						for (const [k, v] of this.uriPersonCache.cache.entries()) {
+						for (const [k, v] of this.uriPersonCache.entries) {
 							if (v.value?.id === user.id) {
 								this.uriPersonCache.set(k, user);
 							}
diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts
index 7e11b9cdca..5db3c5b980 100644
--- a/packages/backend/src/core/CustomEmojiService.ts
+++ b/packages/backend/src/core/CustomEmojiService.ts
@@ -24,7 +24,7 @@ const parseEmojiStrRegexp = /^([-\w]+)(?:@([\w.-]+))?$/;
 
 @Injectable()
 export class CustomEmojiService implements OnApplicationShutdown {
-	private cache: MemoryKVCache<MiEmoji | null>;
+	private emojisCache: MemoryKVCache<MiEmoji | null>;
 	public localEmojisCache: RedisSingleCache<Map<string, MiEmoji>>;
 
 	constructor(
@@ -40,7 +40,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		private moderationLogService: ModerationLogService,
 		private globalEventService: GlobalEventService,
 	) {
-		this.cache = new MemoryKVCache<MiEmoji | null>(1000 * 60 * 60 * 12);
+		this.emojisCache = new MemoryKVCache<MiEmoji | null>(1000 * 60 * 60 * 12); // 12h
 
 		this.localEmojisCache = new RedisSingleCache<Map<string, MiEmoji>>(this.redisClient, 'localEmojis', {
 			lifetime: 1000 * 60 * 30, // 30m
@@ -334,7 +334,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 			host,
 		})) ?? null;
 
-		const emoji = await this.cache.fetch(`${name} ${host}`, queryOrNull);
+		const emoji = await this.emojisCache.fetch(`${name} ${host}`, queryOrNull);
 
 		if (emoji == null) return null;
 		return emoji.publicUrl || emoji.originalUrl; // || emoji.originalUrl してるのは後方互換性のため（publicUrlはstringなので??はだめ）
@@ -361,7 +361,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 	 */
 	@bindThis
 	public async prefetchEmojis(emojis: { name: string; host: string | null; }[]): Promise<void> {
-		const notCachedEmojis = emojis.filter(emoji => this.cache.get(`${emoji.name} ${emoji.host}`) == null);
+		const notCachedEmojis = emojis.filter(emoji => this.emojisCache.get(`${emoji.name} ${emoji.host}`) == null);
 		const emojisQuery: any[] = [];
 		const hosts = new Set(notCachedEmojis.map(e => e.host));
 		for (const host of hosts) {
@@ -376,7 +376,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 			select: ['name', 'host', 'originalUrl', 'publicUrl'],
 		}) : [];
 		for (const emoji of _emojis) {
-			this.cache.set(`${emoji.name} ${emoji.host}`, emoji);
+			this.emojisCache.set(`${emoji.name} ${emoji.host}`, emoji);
 		}
 	}
 
@@ -401,7 +401,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 
 	@bindThis
 	public dispose(): void {
-		this.cache.dispose();
+		this.emojisCache.dispose();
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/RelayService.ts b/packages/backend/src/core/RelayService.ts
index 8dd3d64f5b..db32114346 100644
--- a/packages/backend/src/core/RelayService.ts
+++ b/packages/backend/src/core/RelayService.ts
@@ -35,7 +35,7 @@ export class RelayService {
 		private createSystemUserService: CreateSystemUserService,
 		private apRendererService: ApRendererService,
 	) {
-		this.relaysCache = new MemorySingleCache<MiRelay[]>(1000 * 60 * 10);
+		this.relaysCache = new MemorySingleCache<MiRelay[]>(1000 * 60 * 10); // 10m
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts
index 7966774673..0210012a03 100644
--- a/packages/backend/src/core/RoleService.ts
+++ b/packages/backend/src/core/RoleService.ts
@@ -127,10 +127,8 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 		private moderationLogService: ModerationLogService,
 		private fanoutTimelineService: FanoutTimelineService,
 	) {
-		//this.onMessage = this.onMessage.bind(this);
-
-		this.rolesCache = new MemorySingleCache<MiRole[]>(1000 * 60 * 60 * 1);
-		this.roleAssignmentByUserIdCache = new MemoryKVCache<MiRoleAssignment[]>(1000 * 60 * 60 * 1);
+		this.rolesCache = new MemorySingleCache<MiRole[]>(1000 * 60 * 60); // 1h
+		this.roleAssignmentByUserIdCache = new MemoryKVCache<MiRoleAssignment[]>(1000 * 60 * 5); // 5m
 
 		this.redisForSub.on('message', this.onMessage);
 	}
diff --git a/packages/backend/src/core/UserKeypairService.ts b/packages/backend/src/core/UserKeypairService.ts
index 51ac99179a..92d61cd103 100644
--- a/packages/backend/src/core/UserKeypairService.ts
+++ b/packages/backend/src/core/UserKeypairService.ts
@@ -25,7 +25,7 @@ export class UserKeypairService implements OnApplicationShutdown {
 	) {
 		this.cache = new RedisKVCache<MiUserKeypair>(this.redisClient, 'userKeypair', {
 			lifetime: 1000 * 60 * 60 * 24, // 24h
-			memoryCacheLifetime: Infinity,
+			memoryCacheLifetime: 1000 * 60 * 60, // 1h
 			fetcher: (key) => this.userKeypairsRepository.findOneByOrFail({ userId: key }),
 			toRedisConverter: (value) => JSON.stringify(value),
 			fromRedisConverter: (value) => JSON.parse(value),
diff --git a/packages/backend/src/core/activitypub/ApDbResolverService.ts b/packages/backend/src/core/activitypub/ApDbResolverService.ts
index f6b70ead44..4192e8659a 100644
--- a/packages/backend/src/core/activitypub/ApDbResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApDbResolverService.ts
@@ -54,8 +54,8 @@ export class ApDbResolverService implements OnApplicationShutdown {
 		private cacheService: CacheService,
 		private apPersonService: ApPersonService,
 	) {
-		this.publicKeyCache = new MemoryKVCache<MiUserPublickey | null>(Infinity);
-		this.publicKeyByUserIdCache = new MemoryKVCache<MiUserPublickey | null>(Infinity);
+		this.publicKeyCache = new MemoryKVCache<MiUserPublickey | null>(1000 * 60 * 60 * 12); // 12h
+		this.publicKeyByUserIdCache = new MemoryKVCache<MiUserPublickey | null>(1000 * 60 * 60 * 12); // 12h
 	}
 
 	@bindThis
diff --git a/packages/backend/src/misc/cache.ts b/packages/backend/src/misc/cache.ts
index bba64a06ef..f9692ce5d5 100644
--- a/packages/backend/src/misc/cache.ts
+++ b/packages/backend/src/misc/cache.ts
@@ -7,23 +7,23 @@ import * as Redis from 'ioredis';
 import { bindThis } from '@/decorators.js';
 
 export class RedisKVCache<T> {
-	private redisClient: Redis.Redis;
-	private name: string;
-	private lifetime: number;
-	private memoryCache: MemoryKVCache<T>;
-	private fetcher: (key: string) => Promise<T>;
-	private toRedisConverter: (value: T) => string;
-	private fromRedisConverter: (value: string) => T | undefined;
+	private readonly lifetime: number;
+	private readonly memoryCache: MemoryKVCache<T>;
+	private readonly fetcher: (key: string) => Promise<T>;
+	private readonly toRedisConverter: (value: T) => string;
+	private readonly fromRedisConverter: (value: string) => T | undefined;
 
-	constructor(redisClient: RedisKVCache<T>['redisClient'], name: RedisKVCache<T>['name'], opts: {
-		lifetime: RedisKVCache<T>['lifetime'];
-		memoryCacheLifetime: number;
-		fetcher: RedisKVCache<T>['fetcher'];
-		toRedisConverter: RedisKVCache<T>['toRedisConverter'];
-		fromRedisConverter: RedisKVCache<T>['fromRedisConverter'];
-	}) {
-		this.redisClient = redisClient;
-		this.name = name;
+	constructor(
+		private redisClient: Redis.Redis,
+		private name: string,
+		opts: {
+			lifetime: RedisKVCache<T>['lifetime'];
+			memoryCacheLifetime: number;
+			fetcher: RedisKVCache<T>['fetcher'];
+			toRedisConverter: RedisKVCache<T>['toRedisConverter'];
+			fromRedisConverter: RedisKVCache<T>['fromRedisConverter'];
+		},
+	) {
 		this.lifetime = opts.lifetime;
 		this.memoryCache = new MemoryKVCache(opts.memoryCacheLifetime);
 		this.fetcher = opts.fetcher;
@@ -55,7 +55,13 @@ export class RedisKVCache<T> {
 
 		const cached = await this.redisClient.get(`kvcache:${this.name}:${key}`);
 		if (cached == null) return undefined;
-		return this.fromRedisConverter(cached);
+
+		const value = this.fromRedisConverter(cached);
+		if (value !== undefined) {
+			this.memoryCache.set(key, value);
+		}
+
+		return value;
 	}
 
 	@bindThis
@@ -66,6 +72,10 @@ export class RedisKVCache<T> {
 
 	/**
 	 * キャッシュがあればそれを返し、無ければfetcherを呼び出して結果をキャッシュ&返します
+	 * This awaits the call to Redis to ensure that the write succeeded, which is important for a few reasons:
+	 *   * Other code uses this to synchronize changes between worker processes. A failed write can internally de-sync the cluster.
+	 *   * Without an `await`, consecutive calls could race. An unlucky race could result in the older write overwriting the newer value.
+	 *   * Not awaiting here makes the entire cache non-consistent. The prevents many possible uses.
 	 */
 	@bindThis
 	public async fetch(key: string): Promise<T> {
@@ -77,14 +87,14 @@ export class RedisKVCache<T> {
 
 		// Cache MISS
 		const value = await this.fetcher(key);
-		this.set(key, value);
+		await this.set(key, value);
 		return value;
 	}
 
 	@bindThis
 	public async refresh(key: string) {
 		const value = await this.fetcher(key);
-		this.set(key, value);
+		await this.set(key, value);
 
 		// TODO: イベント発行して他プロセスのメモリキャッシュも更新できるようにする
 	}
@@ -101,23 +111,23 @@ export class RedisKVCache<T> {
 }
 
 export class RedisSingleCache<T> {
-	private redisClient: Redis.Redis;
-	private name: string;
-	private lifetime: number;
-	private memoryCache: MemorySingleCache<T>;
-	private fetcher: () => Promise<T>;
-	private toRedisConverter: (value: T) => string;
-	private fromRedisConverter: (value: string) => T | undefined;
+	private readonly lifetime: number;
+	private readonly memoryCache: MemorySingleCache<T>;
+	private readonly fetcher: () => Promise<T>;
+	private readonly toRedisConverter: (value: T) => string;
+	private readonly fromRedisConverter: (value: string) => T | undefined;
 
-	constructor(redisClient: RedisSingleCache<T>['redisClient'], name: RedisSingleCache<T>['name'], opts: {
-		lifetime: RedisSingleCache<T>['lifetime'];
-		memoryCacheLifetime: number;
-		fetcher: RedisSingleCache<T>['fetcher'];
-		toRedisConverter: RedisSingleCache<T>['toRedisConverter'];
-		fromRedisConverter: RedisSingleCache<T>['fromRedisConverter'];
-	}) {
-		this.redisClient = redisClient;
-		this.name = name;
+	constructor(
+		private redisClient: Redis.Redis,
+		private name: string,
+		opts: {
+			lifetime: number;
+			memoryCacheLifetime: number;
+			fetcher: RedisSingleCache<T>['fetcher'];
+			toRedisConverter: RedisSingleCache<T>['toRedisConverter'];
+			fromRedisConverter: RedisSingleCache<T>['fromRedisConverter'];
+		},
+	) {
 		this.lifetime = opts.lifetime;
 		this.memoryCache = new MemorySingleCache(opts.memoryCacheLifetime);
 		this.fetcher = opts.fetcher;
@@ -149,7 +159,13 @@ export class RedisSingleCache<T> {
 
 		const cached = await this.redisClient.get(`singlecache:${this.name}`);
 		if (cached == null) return undefined;
-		return this.fromRedisConverter(cached);
+
+		const value = this.fromRedisConverter(cached);
+		if (value !== undefined) {
+			this.memoryCache.set(value);
+		}
+
+		return value;
 	}
 
 	@bindThis
@@ -160,6 +176,10 @@ export class RedisSingleCache<T> {
 
 	/**
 	 * キャッシュがあればそれを返し、無ければfetcherを呼び出して結果をキャッシュ&返します
+	 * This awaits the call to Redis to ensure that the write succeeded, which is important for a few reasons:
+	 *   * Other code uses this to synchronize changes between worker processes. A failed write can internally de-sync the cluster.
+	 *   * Without an `await`, consecutive calls could race. An unlucky race could result in the older write overwriting the newer value.
+	 *   * Not awaiting here makes the entire cache non-consistent. The prevents many possible uses.
 	 */
 	@bindThis
 	public async fetch(): Promise<T> {
@@ -171,14 +191,14 @@ export class RedisSingleCache<T> {
 
 		// Cache MISS
 		const value = await this.fetcher();
-		this.set(value);
+		await this.set(value);
 		return value;
 	}
 
 	@bindThis
 	public async refresh() {
 		const value = await this.fetcher();
-		this.set(value);
+		await this.set(value);
 
 		// TODO: イベント発行して他プロセスのメモリキャッシュも更新できるようにする
 	}
@@ -187,22 +207,12 @@ export class RedisSingleCache<T> {
 // TODO: メモリ節約のためあまり参照されないキーを定期的に削除できるようにする？
 
 export class MemoryKVCache<T> {
-	/**
-	 * データを持つマップ
-	 * @deprecated これを直接操作するべきではない
-	 */
-	public cache: Map<string, { date: number; value: T; }>;
-	private lifetime: number;
-	private gcIntervalHandle: NodeJS.Timeout;
+	private readonly cache = new Map<string, { date: number; value: T; }>();
+	private readonly gcIntervalHandle = setInterval(() => this.gc(), 1000 * 60 * 3); // 3m
 
-	constructor(lifetime: MemoryKVCache<never>['lifetime']) {
-		this.cache = new Map();
-		this.lifetime = lifetime;
-
-		this.gcIntervalHandle = setInterval(() => {
-			this.gc();
-		}, 1000 * 60 * 3);
-	}
+	constructor(
+		private readonly lifetime: number,
+	) {}
 
 	@bindThis
 	/**
@@ -287,10 +297,14 @@ export class MemoryKVCache<T> {
 	@bindThis
 	public gc(): void {
 		const now = Date.now();
+
 		for (const [key, { date }] of this.cache.entries()) {
-			if ((now - date) > this.lifetime) {
-				this.cache.delete(key);
-			}
+			// The map is ordered from oldest to youngest.
+			// We can stop once we find an entry that's still active, because all following entries must *also* be active.
+			const age = now - date;
+			if (age < this.lifetime) break;
+
+			this.cache.delete(key);
 		}
 	}
 
@@ -298,16 +312,19 @@ export class MemoryKVCache<T> {
 	public dispose(): void {
 		clearInterval(this.gcIntervalHandle);
 	}
+
+	public get entries() {
+		return this.cache.entries();
+	}
 }
 
 export class MemorySingleCache<T> {
 	private cachedAt: number | null = null;
 	private value: T | undefined;
-	private lifetime: number;
 
-	constructor(lifetime: MemorySingleCache<never>['lifetime']) {
-		this.lifetime = lifetime;
-	}
+	constructor(
+		private lifetime: number,
+	) {}
 
 	@bindThis
 	public set(value: T): void {
diff --git a/packages/backend/src/queue/processors/DeliverProcessorService.ts b/packages/backend/src/queue/processors/DeliverProcessorService.ts
index d665945861..4076e9da90 100644
--- a/packages/backend/src/queue/processors/DeliverProcessorService.ts
+++ b/packages/backend/src/queue/processors/DeliverProcessorService.ts
@@ -45,7 +45,7 @@ export class DeliverProcessorService {
 		private queueLoggerService: QueueLoggerService,
 	) {
 		this.logger = this.queueLoggerService.logger.createSubLogger('deliver');
-		this.suspendedHostsCache = new MemorySingleCache<MiInstance[]>(1000 * 60 * 60);
+		this.suspendedHostsCache = new MemorySingleCache<MiInstance[]>(1000 * 60 * 60); // 1h
 	}
 
 	@bindThis
diff --git a/packages/backend/src/server/NodeinfoServerService.ts b/packages/backend/src/server/NodeinfoServerService.ts
index cc18997fdc..9a641007ee 100644
--- a/packages/backend/src/server/NodeinfoServerService.ts
+++ b/packages/backend/src/server/NodeinfoServerService.ts
@@ -134,7 +134,7 @@ export class NodeinfoServerService {
 			return document;
 		};
 
-		const cache = new MemorySingleCache<Awaited<ReturnType<typeof nodeinfo2>>>(1000 * 60 * 10);
+		const cache = new MemorySingleCache<Awaited<ReturnType<typeof nodeinfo2>>>(1000 * 60 * 10); // 10m
 
 		fastify.get(nodeinfo2_1path, async (request, reply) => {
 			const base = await cache.fetch(() => nodeinfo2(21));
diff --git a/packages/backend/src/server/api/AuthenticateService.ts b/packages/backend/src/server/api/AuthenticateService.ts
index ddef8db987..690ff2e022 100644
--- a/packages/backend/src/server/api/AuthenticateService.ts
+++ b/packages/backend/src/server/api/AuthenticateService.ts
@@ -37,7 +37,7 @@ export class AuthenticateService implements OnApplicationShutdown {
 
 		private cacheService: CacheService,
 	) {
-		this.appCache = new MemoryKVCache<MiApp>(Infinity);
+		this.appCache = new MemoryKVCache<MiApp>(1000 * 60 * 60 * 24 * 7); // 1w
 	}
 
 	@bindThis

From b708b27bc890e0e4c059cff1c7e8207e16764ab5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 18 Aug 2024 04:37:19 +0000
Subject: [PATCH 206/221] Bump version to 2024.8.0-rc.4

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 254c2bee87..b1fcdb988a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.8.0-rc.3",
+	"version": "2024.8.0-rc.4",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 846f623ae1..7b450c6b90 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.8.0-rc.3",
+	"version": "2024.8.0-rc.4",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From b53ee54e4f1172a0d13ef0808b7236c176bf8d1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 18 Aug 2024 14:18:46 +0900
Subject: [PATCH 207/221] =?UTF-8?q?fix(frontend):=20focustrap=E3=81=8Czind?=
 =?UTF-8?q?ex=E3=82=92=E8=80=83=E6=85=AE=E3=81=99=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=20(#14431)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/scripts/focus-trap.ts | 64 +++++++++++++++++++--
 1 file changed, 60 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/scripts/focus-trap.ts b/packages/frontend/src/scripts/focus-trap.ts
index a5df36f520..fb7caea830 100644
--- a/packages/frontend/src/scripts/focus-trap.ts
+++ b/packages/frontend/src/scripts/focus-trap.ts
@@ -16,21 +16,57 @@ function containsFocusTrappedElements(el: HTMLElement): boolean {
 	});
 }
 
+function getZIndex(el: HTMLElement): number {
+	const zIndex = parseInt(window.getComputedStyle(el).zIndex || '0', 10);
+	if (isNaN(zIndex)) {
+		return 0;
+	}
+	return zIndex;
+}
+
+function getHighestZIndexElement(): { el: HTMLElement; zIndex: number; } | null {
+	let highestZIndexElement: HTMLElement | null = null;
+	let highestZIndex = -Infinity;
+
+	focusTrapElements.forEach((el) => {
+		const zIndex = getZIndex(el);
+		if (zIndex > highestZIndex) {
+			highestZIndex = zIndex;
+			highestZIndexElement = el;
+		}
+	});
+
+	return highestZIndexElement == null ? null : {
+		el: highestZIndexElement,
+		zIndex: highestZIndex,
+	};
+}
+
 function releaseFocusTrap(el: HTMLElement): void {
 	focusTrapElements.delete(el);
 	if (el.inert === true) {
 		el.inert = false;
 	}
+
+	const highestZIndexElement = getHighestZIndexElement();
+
 	if (el.parentElement != null && el !== document.body) {
 		el.parentElement.childNodes.forEach((siblingNode) => {
 			const siblingEl = getHTMLElementOrNull(siblingNode);
 			if (!siblingEl) return;
-			if (siblingEl !== el && (focusTrapElements.has(siblingEl) || containsFocusTrappedElements(siblingEl) || focusTrapElements.size === 0)) {
+			if (
+				siblingEl !== el &&
+				(
+					highestZIndexElement == null ||
+					siblingEl === highestZIndexElement.el ||
+					siblingEl.contains(highestZIndexElement.el)
+				)
+			) {
 				siblingEl.inert = false;
 			} else if (
-				focusTrapElements.size > 0 &&
-				!containsFocusTrappedElements(siblingEl) &&
-				!focusTrapElements.has(siblingEl) &&
+				highestZIndexElement != null &&
+				siblingEl !== highestZIndexElement.el &&
+				!siblingEl.contains(highestZIndexElement.el) &&
 				!ignoreElements.includes(siblingEl.tagName.toLowerCase())
 			) {
 				siblingEl.inert = true;
@@ -45,9 +81,29 @@ function releaseFocusTrap(el: HTMLElement): void {
 export function focusTrap(el: HTMLElement, hasInteractionWithOtherFocusTrappedEls: boolean, parent: true): void;
 export function focusTrap(el: HTMLElement, hasInteractionWithOtherFocusTrappedEls?: boolean, parent?: false): { release: () => void; };
 export function focusTrap(el: HTMLElement, hasInteractionWithOtherFocusTrappedEls = false, parent = false): { release: () => void; } | void {
+	const highestZIndexElement = getHighestZIndexElement();
+
+	const highestZIndex = highestZIndexElement == null ? -Infinity : highestZIndexElement.zIndex;
+	const zIndex = getZIndex(el);
+
+	// If the element has a lower z-index than the highest z-index element, focus trap the highest z-index element instead
+	// Focus trapping for this element will be done in the release function
+	if (!parent && zIndex < highestZIndex) {
+		focusTrapElements.add(el);
+		if (highestZIndexElement) {
+			focusTrap(highestZIndexElement.el, hasInteractionWithOtherFocusTrappedEls);
+		}
+		return {
+			release: () => {
+				releaseFocusTrap(el);
+			},
+		};
+	}
+
 	if (el.inert === true) {
 		el.inert = false;
 	}
+
 	if (el.parentElement != null && el !== document.body) {
 		el.parentElement.childNodes.forEach((siblingNode) => {
 			const siblingEl = getHTMLElementOrNull(siblingNode);

From 2e8a1029a4173138f1de3415658f7732f59cf22f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 18 Aug 2024 05:21:24 +0000
Subject: [PATCH 208/221] Bump version to 2024.8.0-rc.5

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index b1fcdb988a..ec2797ca16 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.8.0-rc.4",
+	"version": "2024.8.0-rc.5",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 7b450c6b90..f0234ebd74 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.8.0-rc.4",
+	"version": "2024.8.0-rc.5",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From f4f55ef0124337a82fdb757240e2d692ca964b74 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 18 Aug 2024 16:03:07 +0900
Subject: [PATCH 209/221] New translations ja-jp.yml (English) (#14432)

---
 locales/en-US.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index a02d7fa804..c82ea3c9a2 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -2316,6 +2316,7 @@ _pages:
   eyeCatchingImageSet: "Set thumbnail"
   eyeCatchingImageRemove: "Delete thumbnail"
   chooseBlock: "Add a block"
+  enterSectionTitle: "Enter a section title"
   selectType: "Select a type"
   contentBlocks: "Content"
   inputBlocks: "Input"
@@ -2499,7 +2500,10 @@ _moderationLogTypes:
   createAbuseReportNotificationRecipient: "Create a recipient for abuse reports"
   updateAbuseReportNotificationRecipient: "Update recipients for abuse reports"
   deleteAbuseReportNotificationRecipient: "Delete a recipient for abuse reports"
+  deleteAccount: "Delete the account"
+  deletePage: "Delete the page"
   deleteFlash: "Delete Play"
+  deleteGalleryPost: "Delete the gallery post"
 _fileViewer:
   title: "File details"
   type: "File type"

From 621626aad355c73a538ac944948e87465eda2f84 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 18 Aug 2024 08:08:38 +0000
Subject: [PATCH 210/221] Release: 2024.8.0

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ec2797ca16..310ea98214 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.8.0-rc.5",
+	"version": "2024.8.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index f0234ebd74..39e687d4af 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.8.0-rc.5",
+	"version": "2024.8.0",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 6c5593d45660de8c63331671a6a1999ddc5961bf Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 18 Aug 2024 08:08:49 +0000
Subject: [PATCH 211/221] [skip ci] Update CHANGELOG.md (prepend template)

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a8873ba0d..da204c9198 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## Unreleased
+
+### General
+-
+
+### Client
+-
+
+### Server
+-
+
+
 ## 2024.8.0
 
 ### General

From e78110a5cd7891f89682a9c58a4a3648d6940205 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 19 Aug 2024 13:13:32 +0900
Subject: [PATCH 212/221] refactor

---
 packages/frontend/src/themes/_dark.json5                | 1 -
 packages/frontend/src/themes/_light.json5               | 1 -
 packages/frontend/src/ui/_common_/navbar-for-mobile.vue | 6 ++++--
 packages/frontend/src/ui/_common_/navbar.vue            | 9 +++++----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/frontend/src/themes/_dark.json5 b/packages/frontend/src/themes/_dark.json5
index c82a956868..a310fb716f 100644
--- a/packages/frontend/src/themes/_dark.json5
+++ b/packages/frontend/src/themes/_dark.json5
@@ -89,7 +89,6 @@
 		X11: 'rgba(0, 0, 0, 0.3)',
 		X12: 'rgba(255, 255, 255, 0.1)',
 		X13: 'rgba(255, 255, 255, 0.15)',
-		X14: ':alpha<0.5<@navBg',
 		X15: ':alpha<0<@panel',
 		X16: ':alpha<0.7<@panel',
 		X17: ':alpha<0.8<@bg',
diff --git a/packages/frontend/src/themes/_light.json5 b/packages/frontend/src/themes/_light.json5
index 63bc030916..827a935a0b 100644
--- a/packages/frontend/src/themes/_light.json5
+++ b/packages/frontend/src/themes/_light.json5
@@ -89,7 +89,6 @@
 		X11: 'rgba(0, 0, 0, 0.1)',
 		X12: 'rgba(0, 0, 0, 0.1)',
 		X13: 'rgba(0, 0, 0, 0.15)',
-		X14: ':alpha<0.5<@navBg',
 		X15: ':alpha<0<@panel',
 		X16: ':alpha<0.7<@panel',
 		X17: ':alpha<0.8<@bg',
diff --git a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
index 87e9e45e63..e80d5fd399 100644
--- a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
@@ -82,6 +82,8 @@ function more() {
 
 <style lang="scss" module>
 .root {
+	--nav-bg-transparent: color-mix(in srgb, var(--navBg), transparent 50%);
+
 	display: flex;
 	flex-direction: column;
 }
@@ -91,7 +93,7 @@ function more() {
 	top: 0;
 	z-index: 1;
 	padding: 20px 0;
-	background: var(--X14);
+	background: var(--nav-bg-transparent);
 	-webkit-backdrop-filter: var(--blur, blur(8px));
 	backdrop-filter: var(--blur, blur(8px));
 }
@@ -125,7 +127,7 @@ function more() {
 	position: sticky;
 	bottom: 0;
 	padding: 20px 0;
-	background: var(--X14);
+	background: var(--nav-bg-transparent);
 	-webkit-backdrop-filter: var(--blur, blur(8px));
 	backdrop-filter: var(--blur, blur(8px));
 }
diff --git a/packages/frontend/src/ui/_common_/navbar.vue b/packages/frontend/src/ui/_common_/navbar.vue
index 8307da0d42..2b116909ba 100644
--- a/packages/frontend/src/ui/_common_/navbar.vue
+++ b/packages/frontend/src/ui/_common_/navbar.vue
@@ -111,6 +111,7 @@ function more(ev: MouseEvent) {
 .root {
 	--nav-width: 250px;
 	--nav-icon-only-width: 80px;
+	--nav-bg-transparent: color-mix(in srgb, var(--navBg), transparent 50%);
 
 	flex: 0 0 var(--nav-width);
 	width: var(--nav-width);
@@ -144,7 +145,7 @@ function more(ev: MouseEvent) {
 		top: 0;
 		z-index: 1;
 		padding: 20px 0;
-		background: var(--X14);
+		background: var(--nav-bg-transparent);
 		-webkit-backdrop-filter: var(--blur, blur(8px));
 		backdrop-filter: var(--blur, blur(8px));
 	}
@@ -187,7 +188,7 @@ function more(ev: MouseEvent) {
 		position: sticky;
 		bottom: 0;
 		padding-top: 20px;
-		background: var(--X14);
+		background: var(--nav-bg-transparent);
 		-webkit-backdrop-filter: var(--blur, blur(8px));
 		backdrop-filter: var(--blur, blur(8px));
 	}
@@ -378,7 +379,7 @@ function more(ev: MouseEvent) {
 		top: 0;
 		z-index: 1;
 		padding: 20px 0;
-		background: var(--X14);
+		background: var(--nav-bg-transparent);
 		-webkit-backdrop-filter: var(--blur, blur(8px));
 		backdrop-filter: var(--blur, blur(8px));
 	}
@@ -408,7 +409,7 @@ function more(ev: MouseEvent) {
 		position: sticky;
 		bottom: 0;
 		padding-top: 20px;
-		background: var(--X14);
+		background: var(--nav-bg-transparent);
 		-webkit-backdrop-filter: var(--blur, blur(8px));
 		backdrop-filter: var(--blur, blur(8px));
 	}

From 130ff361c34282dc1e472adff53dc04ddec28c65 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 19 Aug 2024 17:32:27 +0900
Subject: [PATCH 213/221] refactor

---
 packages/frontend/src/components/MkChannelPreview.vue | 2 +-
 packages/frontend/src/components/MkContainer.vue      | 2 +-
 packages/frontend/src/components/MkNote.vue           | 2 +-
 packages/frontend/src/components/MkOmit.vue           | 2 +-
 packages/frontend/src/components/MkSubNoteContent.vue | 2 +-
 packages/frontend/src/pages/channel.vue               | 2 +-
 packages/frontend/src/pages/welcome.timeline.note.vue | 2 +-
 packages/frontend/src/themes/_dark.json5              | 1 -
 packages/frontend/src/themes/_light.json5             | 1 -
 9 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/frontend/src/components/MkChannelPreview.vue b/packages/frontend/src/components/MkChannelPreview.vue
index c30cb66c07..3c0874a1eb 100644
--- a/packages/frontend/src/components/MkChannelPreview.vue
+++ b/packages/frontend/src/components/MkChannelPreview.vue
@@ -117,7 +117,7 @@ const bannerStyle = computed(() => {
 			left: 0;
 			width: 100%;
 			height: 64px;
-			background: linear-gradient(0deg, var(--panel), var(--X15));
+			background: linear-gradient(0deg, var(--panel), color(from var(--panel) srgb r g b / 0));
 		}
 
 		> .name {
diff --git a/packages/frontend/src/components/MkContainer.vue b/packages/frontend/src/components/MkContainer.vue
index a399acd47f..8ad653a0bf 100644
--- a/packages/frontend/src/components/MkContainer.vue
+++ b/packages/frontend/src/components/MkContainer.vue
@@ -216,7 +216,7 @@ onUnmounted(() => {
 			left: 0;
 			width: 100%;
 			height: 64px;
-			background: linear-gradient(0deg, var(--panel), var(--X15));
+			background: linear-gradient(0deg, var(--panel), color(from var(--panel) srgb r g b / 0));
 
 			> .fadeLabel {
 				display: inline-block;
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 32d1cc5640..4caafe54bf 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -859,7 +859,7 @@ function emitUpdReaction(emoji: string, delta: number) {
 	z-index: 2;
 	width: 100%;
 	height: 64px;
-	background: linear-gradient(0deg, var(--panel), var(--X15));
+	background: linear-gradient(0deg, var(--panel), color(from var(--panel) srgb r g b / 0));
 
 	&:hover > .collapsedLabel {
 		background: var(--panelHighlight);
diff --git a/packages/frontend/src/components/MkOmit.vue b/packages/frontend/src/components/MkOmit.vue
index 100a025653..ee1f15c189 100644
--- a/packages/frontend/src/components/MkOmit.vue
+++ b/packages/frontend/src/components/MkOmit.vue
@@ -62,7 +62,7 @@ onUnmounted(() => {
 			left: 0;
 			width: 100%;
 			height: 64px;
-			background: linear-gradient(0deg, var(--panel), var(--X15));
+			background: linear-gradient(0deg, var(--panel), color(from var(--panel) srgb r g b / 0));
 
 			> .fadeLabel {
 				display: inline-block;
diff --git a/packages/frontend/src/components/MkSubNoteContent.vue b/packages/frontend/src/components/MkSubNoteContent.vue
index 9a07826f1a..25412cc2e5 100644
--- a/packages/frontend/src/components/MkSubNoteContent.vue
+++ b/packages/frontend/src/components/MkSubNoteContent.vue
@@ -62,7 +62,7 @@ const collapsed = ref(isLong);
 			left: 0;
 			width: 100%;
 			height: 64px;
-			background: linear-gradient(0deg, var(--panel), var(--X15));
+			background: linear-gradient(0deg, var(--panel), color(from var(--panel) srgb r g b / 0));
 
 			> .fadeLabel {
 				display: inline-block;
diff --git a/packages/frontend/src/pages/channel.vue b/packages/frontend/src/pages/channel.vue
index 3c3ff08aee..7e7b724023 100644
--- a/packages/frontend/src/pages/channel.vue
+++ b/packages/frontend/src/pages/channel.vue
@@ -310,7 +310,7 @@ definePageMetadata(() => ({
 	left: 0;
 	width: 100%;
 	height: 64px;
-	background: linear-gradient(0deg, var(--panel), var(--X15));
+	background: linear-gradient(0deg, var(--panel), color(from var(--panel) srgb r g b / 0));
 }
 
 .bannerStatus {
diff --git a/packages/frontend/src/pages/welcome.timeline.note.vue b/packages/frontend/src/pages/welcome.timeline.note.vue
index f385938343..6a9ecd9a62 100644
--- a/packages/frontend/src/pages/welcome.timeline.note.vue
+++ b/packages/frontend/src/pages/welcome.timeline.note.vue
@@ -84,7 +84,7 @@ onUpdated(() => {
 		left: 0;
 		width: 100%;
 		height: 64px;
-		background: linear-gradient(0deg, var(--panel), var(--X15));
+		background: linear-gradient(0deg, var(--panel), color(from var(--panel) srgb r g b / 0));
 	}
 }
 
diff --git a/packages/frontend/src/themes/_dark.json5 b/packages/frontend/src/themes/_dark.json5
index a310fb716f..0dcb81e44d 100644
--- a/packages/frontend/src/themes/_dark.json5
+++ b/packages/frontend/src/themes/_dark.json5
@@ -89,7 +89,6 @@
 		X11: 'rgba(0, 0, 0, 0.3)',
 		X12: 'rgba(255, 255, 255, 0.1)',
 		X13: 'rgba(255, 255, 255, 0.15)',
-		X15: ':alpha<0<@panel',
 		X16: ':alpha<0.7<@panel',
 		X17: ':alpha<0.8<@bg',
 	},
diff --git a/packages/frontend/src/themes/_light.json5 b/packages/frontend/src/themes/_light.json5
index 827a935a0b..74063a447a 100644
--- a/packages/frontend/src/themes/_light.json5
+++ b/packages/frontend/src/themes/_light.json5
@@ -89,7 +89,6 @@
 		X11: 'rgba(0, 0, 0, 0.1)',
 		X12: 'rgba(0, 0, 0, 0.1)',
 		X13: 'rgba(0, 0, 0, 0.15)',
-		X15: ':alpha<0<@panel',
 		X16: ':alpha<0.7<@panel',
 		X17: ':alpha<0.8<@bg',
 	},

From 59e83605ac05118cfbd016bb20558e7bb56348f0 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 19 Aug 2024 19:41:06 +0900
Subject: [PATCH 214/221] refactor

---
 packages/frontend/src/components/MkButton.vue   | 8 ++++----
 packages/frontend/src/components/MkPostForm.vue | 4 ++--
 packages/frontend/src/style.scss                | 8 ++++----
 packages/frontend/src/themes/_dark.json5        | 6 ------
 packages/frontend/src/themes/_light.json5       | 6 ------
 packages/frontend/src/themes/d-astro.json5      | 7 -------
 packages/frontend/src/themes/d-u0.json5         | 3 ---
 packages/frontend/src/themes/l-u0.json5         | 3 ---
 packages/frontend/src/themes/l-vivid.json5      | 8 --------
 packages/frontend/src/ui/deck.vue               | 6 +++---
 packages/frontend/src/ui/universal.vue          | 6 +++---
 11 files changed, 16 insertions(+), 49 deletions(-)

diff --git a/packages/frontend/src/components/MkButton.vue b/packages/frontend/src/components/MkButton.vue
index 9560efb7d9..fb9c036fbc 100644
--- a/packages/frontend/src/components/MkButton.vue
+++ b/packages/frontend/src/components/MkButton.vue
@@ -171,11 +171,11 @@ function onMousedown(evt: MouseEvent): void {
 		background: var(--accent);
 
 		&:not(:disabled):hover {
-			background: var(--X8);
+			background: hsl(from var(--accent) h s calc(l + 5));
 		}
 
 		&:not(:disabled):active {
-			background: var(--X8);
+			background: hsl(from var(--accent) h s calc(l + 5));
 		}
 	}
 
@@ -220,11 +220,11 @@ function onMousedown(evt: MouseEvent): void {
 		background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB));
 
 		&:not(:disabled):hover {
-			background: linear-gradient(90deg, var(--X8), var(--X8));
+			background: linear-gradient(90deg, hsl(from var(--accent) h s calc(l + 5)), hsl(from var(--accent) h s calc(l + 5)));
 		}
 
 		&:not(:disabled):active {
-			background: linear-gradient(90deg, var(--X8), var(--X8));
+			background: linear-gradient(90deg, hsl(from var(--accent) h s calc(l + 5)), hsl(from var(--accent) h s calc(l + 5)));
 		}
 	}
 
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 51ec941c97..f0826fcf4e 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -1128,13 +1128,13 @@ defineExpose({
 
 	&:not(:disabled):hover {
 		> .inner {
-			background: linear-gradient(90deg, var(--X8), var(--X8));
+			background: linear-gradient(90deg, hsl(from var(--accent) h s calc(l + 5)), hsl(from var(--accent) h s calc(l + 5)));
 		}
 	}
 
 	&:not(:disabled):active {
 		> .inner {
-			background: linear-gradient(90deg, var(--X8), var(--X8));
+			background: linear-gradient(90deg, hsl(from var(--accent) h s calc(l + 5)), hsl(from var(--accent) h s calc(l + 5)));
 		}
 	}
 }
diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index 2feb79ef81..44ef740a2e 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -255,11 +255,11 @@ rt {
 	background: var(--accent);
 
 	&:not(:disabled):hover {
-		background: var(--X8);
+		background: hsl(from var(--accent) h s calc(l + 5));
 	}
 
 	&:not(:disabled):active {
-		background: var(--X9);
+		background: hsl(from var(--accent) h s calc(l - 5));
 	}
 }
 
@@ -269,11 +269,11 @@ rt {
 	background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB));
 
 	&:not(:disabled):hover {
-		background: linear-gradient(90deg, var(--X8), var(--X8));
+		background: linear-gradient(90deg, hsl(from var(--accent) h s calc(l + 5)), hsl(from var(--accent) h s calc(l + 5)));
 	}
 
 	&:not(:disabled):active {
-		background: linear-gradient(90deg, var(--X8), var(--X8));
+		background: linear-gradient(90deg, hsl(from var(--accent) h s calc(l + 5)), hsl(from var(--accent) h s calc(l + 5)));
 	}
 }
 
diff --git a/packages/frontend/src/themes/_dark.json5 b/packages/frontend/src/themes/_dark.json5
index 0dcb81e44d..17fb98e4ee 100644
--- a/packages/frontend/src/themes/_dark.json5
+++ b/packages/frontend/src/themes/_dark.json5
@@ -77,20 +77,14 @@
 		codeBoolean: '#c59eff',
 		deckBg: '#000',
 		htmlThemeColor: '@bg',
-		X2: ':darken<2<@panel',
 		X3: 'rgba(255, 255, 255, 0.05)',
 		X4: 'rgba(255, 255, 255, 0.1)',
 		X5: 'rgba(255, 255, 255, 0.05)',
 		X6: 'rgba(255, 255, 255, 0.15)',
 		X7: 'rgba(255, 255, 255, 0.05)',
-		X8: ':lighten<5<@accent',
-		X9: ':darken<5<@accent',
-		X10: ':alpha<0.4<@accent',
 		X11: 'rgba(0, 0, 0, 0.3)',
 		X12: 'rgba(255, 255, 255, 0.1)',
 		X13: 'rgba(255, 255, 255, 0.15)',
-		X16: ':alpha<0.7<@panel',
-		X17: ':alpha<0.8<@bg',
 	},
 
 	codeHighlighter: {
diff --git a/packages/frontend/src/themes/_light.json5 b/packages/frontend/src/themes/_light.json5
index 74063a447a..ca6c059e16 100644
--- a/packages/frontend/src/themes/_light.json5
+++ b/packages/frontend/src/themes/_light.json5
@@ -77,20 +77,14 @@
 		codeBoolean: '#62b70c',
 		deckBg: ':darken<3<@bg',
 		htmlThemeColor: '@bg',
-		X2: ':darken<2<@panel',
 		X3: 'rgba(0, 0, 0, 0.05)',
 		X4: 'rgba(0, 0, 0, 0.1)',
 		X5: 'rgba(0, 0, 0, 0.05)',
 		X6: 'rgba(0, 0, 0, 0.25)',
 		X7: 'rgba(0, 0, 0, 0.05)',
-		X8: ':lighten<5<@accent',
-		X9: ':darken<5<@accent',
-		X10: ':alpha<0.4<@accent',
 		X11: 'rgba(0, 0, 0, 0.1)',
 		X12: 'rgba(0, 0, 0, 0.1)',
 		X13: 'rgba(0, 0, 0, 0.15)',
-		X16: ':alpha<0.7<@panel',
-		X17: ':alpha<0.8<@bg',
 	},
 
 	codeHighlighter: {
diff --git a/packages/frontend/src/themes/d-astro.json5 b/packages/frontend/src/themes/d-astro.json5
index fee25cc4a4..1cbb4e519d 100644
--- a/packages/frontend/src/themes/d-astro.json5
+++ b/packages/frontend/src/themes/d-astro.json5
@@ -57,20 +57,13 @@
 		wallpaperOverlay: 'rgba(0, 0, 0, 0.5)',
 		panelHeaderDivider: 'rgba(0, 0, 0, 0)',
 		scrollbarHandleHover: 'rgba(255, 255, 255, 0.4)',
-		X2: ':darken<2<@panel',
 		X3: 'rgba(255, 255, 255, 0.05)',
 		X4: 'rgba(255, 255, 255, 0.1)',
 		X5: 'rgba(255, 255, 255, 0.05)',
 		X6: 'rgba(255, 255, 255, 0.15)',
 		X7: 'rgba(255, 255, 255, 0.05)',
-		X8: ':lighten<5<@accent',
-		X9: ':darken<5<@accent',
-		X10: ':alpha<0.4<@accent',
 		X11: 'rgba(0, 0, 0, 0.3)',
 		X12: 'rgba(255, 255, 255, 0.1)',
 		X13: 'rgba(255, 255, 255, 0.15)',
-		X14: ':alpha<0.5<@navBg',
-		X15: ':alpha<0<@panel',
-		X16: ':alpha<0.7<@panel',
 	},
 }
diff --git a/packages/frontend/src/themes/d-u0.json5 b/packages/frontend/src/themes/d-u0.json5
index 3bd0b9483c..c8a31bb1a7 100644
--- a/packages/frontend/src/themes/d-u0.json5
+++ b/packages/frontend/src/themes/d-u0.json5
@@ -3,14 +3,11 @@
 	base: 'dark',
 	name: 'Mi U0 Dark',
 	props: {
-		X2: ':darken<2<@panel',
 		X3: 'rgba(255, 255, 255, 0.05)',
 		X4: 'rgba(255, 255, 255, 0.1)',
 		X5: 'rgba(255, 255, 255, 0.05)',
 		X6: 'rgba(255, 255, 255, 0.15)',
 		X7: 'rgba(255, 255, 255, 0.05)',
-		X8: ':lighten<5<@accent',
-		X9: ':darken<5<@accent',
 		bg: '#172426',
 		fg: '#dadada',
 		X10: ':alpha<0.4<@accent',
diff --git a/packages/frontend/src/themes/l-u0.json5 b/packages/frontend/src/themes/l-u0.json5
index dbc777d493..0b952b003a 100644
--- a/packages/frontend/src/themes/l-u0.json5
+++ b/packages/frontend/src/themes/l-u0.json5
@@ -3,14 +3,11 @@
 	base: 'light',
 	name: 'Mi U0 Light',
 	props: {
-		X2: ':darken<2<@panel',
 		X3: 'rgba(255, 255, 255, 0.05)',
 		X4: 'rgba(255, 255, 255, 0.1)',
 		X5: 'rgba(255, 255, 255, 0.05)',
 		X6: 'rgba(255, 255, 255, 0.15)',
 		X7: 'rgba(255, 255, 255, 0.05)',
-		X8: ':lighten<5<@accent',
-		X9: ':darken<5<@accent',
 		bg: '#e7e7eb',
 		fg: '#5f5f5f',
 		X10: ':alpha<0.4<@accent',
diff --git a/packages/frontend/src/themes/l-vivid.json5 b/packages/frontend/src/themes/l-vivid.json5
index 3368855b5e..3da2ca28fb 100644
--- a/packages/frontend/src/themes/l-vivid.json5
+++ b/packages/frontend/src/themes/l-vivid.json5
@@ -60,21 +60,13 @@
 		fgTransparentWeak: ':alpha<0.75<@fg',
 		panelHeaderDivider: '@divider',
 		scrollbarHandleHover: 'rgba(0, 0, 0, 0.4)',
-		X2: ':darken<2<@panel',
 		X3: 'rgba(0, 0, 0, 0.05)',
 		X4: 'rgba(0, 0, 0, 0.1)',
 		X5: 'rgba(0, 0, 0, 0.05)',
 		X6: 'rgba(0, 0, 0, 0.25)',
 		X7: 'rgba(0, 0, 0, 0.05)',
-		X8: ':lighten<5<@accent',
-		X9: ':darken<5<@accent',
-		X10: ':alpha<0.4<@accent',
 		X11: 'rgba(0, 0, 0, 0.1)',
 		X12: 'rgba(0, 0, 0, 0.1)',
 		X13: 'rgba(0, 0, 0, 0.15)',
-		X14: ':alpha<0.5<@navBg',
-		X15: ':alpha<0<@panel',
-		X16: ':alpha<0.7<@panel',
-		X17: ':alpha<0.8<@bg',
 	},
 }
diff --git a/packages/frontend/src/ui/deck.vue b/packages/frontend/src/ui/deck.vue
index af46b0641d..9c3addc482 100644
--- a/packages/frontend/src/ui/deck.vue
+++ b/packages/frontend/src/ui/deck.vue
@@ -450,7 +450,7 @@ body {
 	}
 
 	&:active {
-		background: var(--X2);
+		background: hsl(from var(--panel) h s calc(l - 2));
 	}
 }
 
@@ -460,11 +460,11 @@ body {
 	color: var(--fgOnAccent);
 
 	&:hover {
-		background: linear-gradient(90deg, var(--X8), var(--X8));
+		background: linear-gradient(90deg, hsl(from var(--accent) h s calc(l + 5)), hsl(from var(--accent) h s calc(l + 5)));
 	}
 
 	&:active {
-		background: linear-gradient(90deg, var(--X8), var(--X8));
+		background: linear-gradient(90deg, hsl(from var(--accent) h s calc(l + 5)), hsl(from var(--accent) h s calc(l + 5)));
 	}
 }
 
diff --git a/packages/frontend/src/ui/universal.vue b/packages/frontend/src/ui/universal.vue
index 3cb6f598a6..073acbd4db 100644
--- a/packages/frontend/src/ui/universal.vue
+++ b/packages/frontend/src/ui/universal.vue
@@ -427,7 +427,7 @@ $widgets-hide-threshold: 1090px;
 	}
 
 	&:active {
-		background: var(--X2);
+		background: hsl(from var(--panel) h s calc(l - 2));
 	}
 }
 
@@ -437,11 +437,11 @@ $widgets-hide-threshold: 1090px;
 	color: var(--fgOnAccent);
 
 	&:hover {
-		background: linear-gradient(90deg, var(--X8), var(--X8));
+		background: linear-gradient(90deg, hsl(from var(--accent) h s calc(l + 5)), hsl(from var(--accent) h s calc(l + 5)));
 	}
 
 	&:active {
-		background: linear-gradient(90deg, var(--X8), var(--X8));
+		background: linear-gradient(90deg, hsl(from var(--accent) h s calc(l + 5)), hsl(from var(--accent) h s calc(l + 5)));
 	}
 }
 

From 1b5f0571f71dd7b50fd99bd2de0d0e168225e180 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 20 Aug 2024 10:51:02 +0900
Subject: [PATCH 215/221] :art:

---
 .../frontend/src/components/global/MkAvatar.vue | 17 +++++++++++++++--
 .../pages/settings/avatar-decoration.dialog.vue |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/global/MkAvatar.vue b/packages/frontend/src/components/global/MkAvatar.vue
index e8e1bc696b..ee224dba49 100644
--- a/packages/frontend/src/components/global/MkAvatar.vue
+++ b/packages/frontend/src/components/global/MkAvatar.vue
@@ -26,7 +26,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template v-if="showDecoration">
 		<img
 			v-for="decoration in decorations ?? user.avatarDecorations"
-			:class="[$style.decoration]"
+			:class="[$style.decoration, { [$style.decorationBlink]: decoration.blink }]"
 			:src="getDecorationUrl(decoration)"
 			:style="{
 				rotate: getDecorationAngle(decoration),
@@ -60,7 +60,7 @@ const props = withDefaults(defineProps<{
 	link?: boolean;
 	preview?: boolean;
 	indicator?: boolean;
-	decorations?: Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'>[];
+	decorations?: (Omit<Misskey.entities.UserDetailed['avatarDecorations'][number], 'id'> & { blink?: boolean; })[];
 	forceShowDecoration?: boolean;
 }>(), {
 	target: null,
@@ -330,4 +330,17 @@ watch(() => props.user.avatarBlurhash, () => {
 	width: 200%;
 	pointer-events: none;
 }
+
+.decorationBlink {
+	animation: blink 1s infinite;
+}
+
+@keyframes blink {
+	0%, 100% {
+		filter: brightness(2);
+	}
+	50% {
+		filter: brightness(1);
+	}
+}
 </style>
diff --git a/packages/frontend/src/pages/settings/avatar-decoration.dialog.vue b/packages/frontend/src/pages/settings/avatar-decoration.dialog.vue
index ce1d4e48d8..1938b8d48d 100644
--- a/packages/frontend/src/pages/settings/avatar-decoration.dialog.vue
+++ b/packages/frontend/src/pages/settings/avatar-decoration.dialog.vue
@@ -96,6 +96,7 @@ const decorationsForPreview = computed(() => {
 		flipH: flipH.value,
 		offsetX: offsetX.value,
 		offsetY: offsetY.value,
+		blink: true,
 	};
 	const decorations = [...$i.avatarDecorations];
 	if (props.usingIndex != null) {

From 21a3095eb0d0ce8f385b4450f371c2160ea18b12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 20 Aug 2024 12:39:01 +0900
Subject: [PATCH 216/221] fix button translation (#14444)

that Japanese string exactly matches that i18n key

(cherry picked from commit a408d32bb72ada9a4ad6bd1afe6e3fadb9b403db)

Co-authored-by: dakkar <dakkar@thenautilus.net>
---
 packages/frontend/src/pages/admin/abuses.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/admin/abuses.vue b/packages/frontend/src/pages/admin/abuses.vue
index 9a9fa472a5..0b9847fed3 100644
--- a/packages/frontend/src/pages/admin/abuses.vue
+++ b/packages/frontend/src/pages/admin/abuses.vue
@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<MkSpacer :contentMax="900">
 		<div :class="$style.root" class="_gaps">
 			<div :class="$style.subMenus" class="_gaps">
-				<MkButton link to="/admin/abuse-report-notification-recipient" primary>{{ "通知設定" }}</MkButton>
+				<MkButton link to="/admin/abuse-report-notification-recipient" primary>{{ i18n.ts.notificationSetting }}</MkButton>
 			</div>
 
 			<div :class="$style.inputs" class="_gaps">

From 043ab1f69b78af5caea47644a2878cae3cdbe141 Mon Sep 17 00:00:00 2001
From: atsuchan <83960488+atsu1125@users.noreply.github.com>
Date: Tue, 20 Aug 2024 13:49:42 +0900
Subject: [PATCH 217/221] fix(backend): Fix chart generation non-matching
 blockedHosts (#14441)

---
 packages/backend/src/core/chart/charts/federation.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/core/chart/charts/federation.ts b/packages/backend/src/core/chart/charts/federation.ts
index c2329a2f73..f40a26495d 100644
--- a/packages/backend/src/core/chart/charts/federation.ts
+++ b/packages/backend/src/core/chart/charts/federation.ts
@@ -65,21 +65,21 @@ export default class FederationChart extends Chart<typeof schema> { // eslint-di
 			this.followingsRepository.createQueryBuilder('following')
 				.select('COUNT(DISTINCT following.followeeHost)')
 				.where('following.followeeHost IS NOT NULL')
-				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'following.followeeHost NOT ILIKE ANY(ARRAY[:...blocked])', { blocked: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) })
+				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'following.followeeHost NOT ILIKE ALL(ARRAY[:...blocked])', { blocked: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) })
 				.andWhere(`following.followeeHost NOT IN (${ suspendedInstancesQuery.getQuery() })`)
 				.getRawOne()
 				.then(x => parseInt(x.count, 10)),
 			this.followingsRepository.createQueryBuilder('following')
 				.select('COUNT(DISTINCT following.followerHost)')
 				.where('following.followerHost IS NOT NULL')
-				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'following.followerHost NOT ILIKE ANY(ARRAY[:...blocked])', { blocked: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) })
+				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'following.followerHost NOT ILIKE ALL(ARRAY[:...blocked])', { blocked: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) })
 				.andWhere(`following.followerHost NOT IN (${ suspendedInstancesQuery.getQuery() })`)
 				.getRawOne()
 				.then(x => parseInt(x.count, 10)),
 			this.followingsRepository.createQueryBuilder('following')
 				.select('COUNT(DISTINCT following.followeeHost)')
 				.where('following.followeeHost IS NOT NULL')
-				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'following.followeeHost NOT ILIKE ANY(ARRAY[:...blocked])', { blocked: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) })
+				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'following.followeeHost NOT ILIKE ALL(ARRAY[:...blocked])', { blocked: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) })
 				.andWhere(`following.followeeHost NOT IN (${ suspendedInstancesQuery.getQuery() })`)
 				.andWhere(`following.followeeHost IN (${ pubsubSubQuery.getQuery() })`)
 				.setParameters(pubsubSubQuery.getParameters())
@@ -88,7 +88,7 @@ export default class FederationChart extends Chart<typeof schema> { // eslint-di
 			this.instancesRepository.createQueryBuilder('instance')
 				.select('COUNT(instance.id)')
 				.where(`instance.host IN (${ subInstancesQuery.getQuery() })`)
-				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'instance.host NOT ILIKE ANY(ARRAY[:...blocked])', { blocked: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) })
+				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'instance.host NOT ILIKE ALL(ARRAY[:...blocked])', { blocked: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) })
 				.andWhere('instance.suspensionState = \'none\'')
 				.andWhere('instance.isNotResponding = false')
 				.getRawOne()
@@ -96,7 +96,7 @@ export default class FederationChart extends Chart<typeof schema> { // eslint-di
 			this.instancesRepository.createQueryBuilder('instance')
 				.select('COUNT(instance.id)')
 				.where(`instance.host IN (${ pubInstancesQuery.getQuery() })`)
-				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'instance.host NOT ILIKE ANY(ARRAY[:...blocked])', { blocked: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) })
+				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'instance.host NOT ILIKE ALL(ARRAY[:...blocked])', { blocked: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) })
 				.andWhere('instance.suspensionState = \'none\'')
 				.andWhere('instance.isNotResponding = false')
 				.getRawOne()

From 1008fa32a059f4c66c17a2ab77c3d5595d998233 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Thu, 22 Aug 2024 14:03:11 +0900
Subject: [PATCH 218/221] better boot error screen

---
 packages/backend/src/server/web/boot.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js
index 4275dc9527..5e52360456 100644
--- a/packages/backend/src/server/web/boot.js
+++ b/packages/backend/src/server/web/boot.js
@@ -176,10 +176,10 @@
 				<span class="button-label-big">Reload / リロード</span>
 			</button>
 			<p><b>The following actions may solve the problem. / 以下を行うと解決する可能性があります。</b></p>
-			<p>Clear the browser cache / ブラウザのキャッシュをクリアする</p>
 			<p>Update your os and browser / ブラウザおよびOSを最新バージョンに更新する</p>
 			<p>Disable an adblocker / アドブロッカーを無効にする</p>
-	 		<p>&#40;Tor Browser&#41; Set dom.webaudio.enabled to true / dom.webaudio.enabledをtrueに設定する</p>
+	 		<p>Clear the browser cache / ブラウザのキャッシュをクリアする</p>
+			<p>&#40;Tor Browser&#41; Set dom.webaudio.enabled to true / dom.webaudio.enabledをtrueに設定する</p>
 			<details style="color: #86b300;">
 				<summary>Other options / その他のオプション</summary>
 				<a href="/flush">
@@ -212,7 +212,7 @@
 		<summary>
 			<code>ERROR CODE: ${code}</code>
 		</summary>
-		<code>${JSON.stringify(details)}</code>`;
+		<code>${details.toString()} ${JSON.stringify(details)}</code>`;
 		errorsElement.appendChild(detailsElement);
 		addStyle(`
 		* {

From f85aa7b6415eaf61d213deb370f598f603f3fe9b Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Fri, 23 Aug 2024 16:29:05 +0900
Subject: [PATCH 219/221] =?UTF-8?q?fix(backend):=20=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=8C=E3=82=B5=E3=82=A4=E3=82=BA=E3=81=AE?=
 =?UTF-8?q?=E5=88=B6=E9=99=90=E3=82=92=E8=B6=85=E3=81=88=E3=81=A6=E3=82=A2?=
 =?UTF-8?q?=E3=83=83=E3=83=97=E3=83=AD=E3=83=BC=E3=83=89=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=81=9F=E9=9A=9B=E3=81=AB=E3=82=A8=E3=83=A9=E3=83=BC=E3=82=92?=
 =?UTF-8?q?=E8=BF=94=E3=81=95=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                      |  2 +-
 packages/backend/src/server/api/ApiCallService.ts | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da204c9198..ad070cc981 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 -
 
 ### Server
--
+- ファイルがサイズの制限を超えてアップロードされた際にエラーを返さなかった問題を修正
 
 
 ## 2024.8.0
diff --git a/packages/backend/src/server/api/ApiCallService.ts b/packages/backend/src/server/api/ApiCallService.ts
index 47f64f6609..ea852d590d 100644
--- a/packages/backend/src/server/api/ApiCallService.ts
+++ b/packages/backend/src/server/api/ApiCallService.ts
@@ -199,9 +199,17 @@ export class ApiCallService implements OnApplicationShutdown {
 			return;
 		}
 
-		const [path] = await createTemp();
+		const [path, cleanup] = await createTemp();
 		await stream.pipeline(multipartData.file, fs.createWriteStream(path));
 
+		// ファイルサイズが制限を超えていた場合
+		if (multipartData.file.truncated) {
+			cleanup();
+			reply.code(413);
+			reply.send();
+			return;
+		}
+
 		const fields = {} as Record<string, unknown>;
 		for (const [k, v] of Object.entries(multipartData.fields)) {
 			fields[k] = typeof v === 'object' && 'value' in v ? v.value : undefined;

From 2f009f7d49e2468da6950c7ff8448565b095df38 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Fri, 23 Aug 2024 16:31:16 +0900
Subject: [PATCH 220/221] add note

---
 packages/backend/src/server/api/ApiCallService.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/server/api/ApiCallService.ts b/packages/backend/src/server/api/ApiCallService.ts
index ea852d590d..f95c272757 100644
--- a/packages/backend/src/server/api/ApiCallService.ts
+++ b/packages/backend/src/server/api/ApiCallService.ts
@@ -203,6 +203,7 @@ export class ApiCallService implements OnApplicationShutdown {
 		await stream.pipeline(multipartData.file, fs.createWriteStream(path));
 
 		// ファイルサイズが制限を超えていた場合
+		// なお truncated はストリームを読み切ってからでないと機能しないため、stream.pipeline より後にある必要がある
 		if (multipartData.file.truncated) {
 			cleanup();
 			reply.code(413);

From 8032a4e12ad0425b3a2b4d7a857f12de656a718d Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Fri, 23 Aug 2024 16:40:11 +0900
Subject: [PATCH 221/221] =?UTF-8?q?enhance(frontend):=20=E3=82=B5=E3=82=A4?=
 =?UTF-8?q?=E3=82=BA=E5=88=B6=E9=99=90=E3=82=92=E8=B6=85=E9=81=8E=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E3=82=A2?=
 =?UTF-8?q?=E3=83=83=E3=83=97=E3=83=AD=E3=83=BC=E3=83=89=E3=81=97=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=A8=E3=81=97=E3=81=9F=E9=9A=9B=E3=81=AB=E3=82=A8?=
 =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=82=92=E5=87=BA=E3=81=99=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                           |  2 +-
 packages/backend/src/config.ts                         |  4 ++--
 packages/backend/src/core/DownloadService.ts           |  2 +-
 .../backend/src/core/entities/MetaEntityService.ts     |  1 +
 packages/backend/src/models/json-schema/meta.ts        |  4 ++++
 packages/backend/src/server/api/ApiServerService.ts    |  2 +-
 packages/frontend/src/scripts/upload.ts                | 10 ++++++++++
 packages/misskey-js/src/autogen/types.ts               |  1 +
 8 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad070cc981..6359033c1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 -
 
 ### Client
--
+- サイズ制限を超過するファイルをアップロードしようとした際にエラーを出すように
 
 ### Server
 - ファイルがサイズの制限を超えてアップロードされた際にエラーを返さなかった問題を修正
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index 3e5a1e81cd..cff0194780 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -133,7 +133,7 @@ export type Config = {
 	proxySmtp: string | undefined;
 	proxyBypassHosts: string[] | undefined;
 	allowedPrivateNetworks: string[] | undefined;
-	maxFileSize: number | undefined;
+	maxFileSize: number;
 	clusterLimit: number | undefined;
 	id: string;
 	outgoingAddress: string | undefined;
@@ -250,7 +250,7 @@ export function loadConfig(): Config {
 		proxySmtp: config.proxySmtp,
 		proxyBypassHosts: config.proxyBypassHosts,
 		allowedPrivateNetworks: config.allowedPrivateNetworks,
-		maxFileSize: config.maxFileSize,
+		maxFileSize: config.maxFileSize ?? 262144000,
 		clusterLimit: config.clusterLimit,
 		outgoingAddress: config.outgoingAddress,
 		outgoingAddressFamily: config.outgoingAddressFamily,
diff --git a/packages/backend/src/core/DownloadService.ts b/packages/backend/src/core/DownloadService.ts
index 21ae798f9f..93f4a38246 100644
--- a/packages/backend/src/core/DownloadService.ts
+++ b/packages/backend/src/core/DownloadService.ts
@@ -42,7 +42,7 @@ export class DownloadService {
 
 		const timeout = 30 * 1000;
 		const operationTimeout = 60 * 1000;
-		const maxSize = this.config.maxFileSize ?? 262144000;
+		const maxSize = this.config.maxFileSize;
 
 		const urlObj = new URL(url);
 		let filename = urlObj.pathname.split('/').pop() ?? 'untitled';
diff --git a/packages/backend/src/core/entities/MetaEntityService.ts b/packages/backend/src/core/entities/MetaEntityService.ts
index 44ec0d6a7b..f4b1e302d0 100644
--- a/packages/backend/src/core/entities/MetaEntityService.ts
+++ b/packages/backend/src/core/entities/MetaEntityService.ts
@@ -129,6 +129,7 @@ export class MetaEntityService {
 			mediaProxy: this.config.mediaProxy,
 			enableUrlPreview: instance.urlPreviewEnabled,
 			noteSearchableScope: (this.config.meilisearch == null || this.config.meilisearch.scope !== 'local') ? 'global' : 'local',
+			maxFileSize: this.config.maxFileSize,
 		};
 
 		return packed;
diff --git a/packages/backend/src/models/json-schema/meta.ts b/packages/backend/src/models/json-schema/meta.ts
index 3bcf9cac92..99feeaa7d7 100644
--- a/packages/backend/src/models/json-schema/meta.ts
+++ b/packages/backend/src/models/json-schema/meta.ts
@@ -253,6 +253,10 @@ export const packedMetaLiteSchema = {
 			optional: false, nullable: false,
 			default: 'local',
 		},
+		maxFileSize: {
+			type: 'number',
+			optional: false, nullable: false,
+		},
 	},
 } as const;
 
diff --git a/packages/backend/src/server/api/ApiServerService.ts b/packages/backend/src/server/api/ApiServerService.ts
index 4a5935f930..13cbdfc3be 100644
--- a/packages/backend/src/server/api/ApiServerService.ts
+++ b/packages/backend/src/server/api/ApiServerService.ts
@@ -49,7 +49,7 @@ export class ApiServerService {
 
 		fastify.register(multipart, {
 			limits: {
-				fileSize: this.config.maxFileSize ?? 262144000,
+				fileSize: this.config.maxFileSize,
 				files: 1,
 			},
 		});
diff --git a/packages/frontend/src/scripts/upload.ts b/packages/frontend/src/scripts/upload.ts
index 3e947183c9..abb0e1e677 100644
--- a/packages/frontend/src/scripts/upload.ts
+++ b/packages/frontend/src/scripts/upload.ts
@@ -13,6 +13,7 @@ import { apiUrl } from '@/config.js';
 import { $i } from '@/account.js';
 import { alert } from '@/os.js';
 import { i18n } from '@/i18n.js';
+import { instance } from '@/instance.js';
 
 type Uploading = {
 	id: string;
@@ -39,6 +40,15 @@ export function uploadFile(
 
 	if (folder && typeof folder === 'object') folder = folder.id;
 
+	if (file.size > instance.maxFileSize) {
+		alert({
+			type: 'error',
+			title: i18n.ts.failedToUpload,
+			text: i18n.ts.cannotUploadBecauseExceedsFileSizeLimit,
+		});
+		return Promise.reject();
+	}
+
 	return new Promise((resolve, reject) => {
 		const id = uuid();
 
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 6d2f787767..0c50825203 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4947,6 +4947,7 @@ export type components = {
        * @enum {string}
        */
       noteSearchableScope: 'local' | 'global';
+      maxFileSize: number;
     };
     MetaDetailedOnly: {
       features?: {